X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e6a0980facd9ad8dbb66e0c7ab2bdf61d2d18825..7f04fa5306f52960db709bb520c49e9f4ecec000:/include/surf/surfxml_parse.h

diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index 830b14cee7..3564ab7bf6 100644
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -1,6 +1,5 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2005 Arnaud Legrand. All rights reserved.                  */
+/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,42 +7,30 @@
 #ifndef _SURF_SURFXML_PARSE_H
 #define _SURF_SURFXML_PARSE_H
 
-#include <stdio.h> /* to have FILE */
-#include "surf/surfxml.h"
+#include <stdio.h>              /* to have FILE */
+#include "xbt/misc.h"
 #include "xbt/function_types.h"
-/* Entry-point of the surfxml parser. */
-extern int_f_void_t * XBT_PUBLIC_DATA surf_parse;
-
-/* Hook for the different tags. They can be redefined at will whereas
-   the versions without the _fun can't. */
-
-extern void_f_void_t *STag_surfxml_platform_description_fun;
-extern void_f_void_t *ETag_surfxml_platform_description_fun;
-extern void_f_void_t *STag_surfxml_cpu_fun;
-extern void_f_void_t *ETag_surfxml_cpu_fun;
-extern void_f_void_t *STag_surfxml_network_link_fun;
-extern void_f_void_t *ETag_surfxml_network_link_fun;
-extern void_f_void_t *STag_surfxml_route_fun;
-extern void_f_void_t *ETag_surfxml_route_fun;
-extern void_f_void_t *STag_surfxml_route_element_fun;
-extern void_f_void_t *ETag_surfxml_route_element_fun;
-extern void_f_void_t * XBT_PUBLIC_DATA STag_surfxml_process_fun;
-extern void_f_void_t * XBT_PUBLIC_DATA ETag_surfxml_process_fun;
-extern void_f_void_t *STag_surfxml_argument_fun;
-extern void_f_void_t * XBT_PUBLIC_DATA ETag_surfxml_argument_fun;
+#include "xbt/dict.h"
+#include "surf/simgrid_dtd.h"
+
+SG_BEGIN_DECL()
 
 XBT_PUBLIC(void) surf_parse_open(const char *file);
 XBT_PUBLIC(void) surf_parse_close(void);
-XBT_PUBLIC(void) surf_parse_reset_parser(void);
-XBT_PUBLIC(void) surf_parse_get_double(double *value,const char *string);
-
+XBT_PUBLIC(void) surf_parse_init_callbacks(void);
+XBT_PUBLIC(void) surf_parse_reset_callbacks(void);
+XBT_PUBLIC(void) surf_parse_free_callbacks(void);
+XBT_PUBLIC(void) surf_parse_error(const char *msg,...) _XBT_GNUC_PRINTF(1,2) _XBT_GNUC_NORETURN;
+XBT_PUBLIC(void) surf_parse_warn(const char *msg,...) _XBT_GNUC_PRINTF(1,2);
+XBT_PUBLIC(double) surf_parse_get_double(const char *string);
+XBT_PUBLIC(int) surf_parse_get_int(const char *string);
 /* Prototypes of the functions offered by flex */
 XBT_PUBLIC(int) surf_parse_lex(void);
 XBT_PUBLIC(int) surf_parse_get_lineno(void);
-XBT_PUBLIC(FILE*) surf_parse_get_in(void);
-XBT_PUBLIC(FILE*) surf_parse_get_out(void);
+XBT_PUBLIC(FILE *) surf_parse_get_in(void);
+XBT_PUBLIC(FILE *) surf_parse_get_out(void);
 XBT_PUBLIC(int) surf_parse_get_leng(void);
-XBT_PUBLIC(char*) surf_parse_get_text(void);
+XBT_PUBLIC(char *) surf_parse_get_text(void);
 XBT_PUBLIC(void) surf_parse_set_lineno(int line_number);
 XBT_PUBLIC(void) surf_parse_set_in(FILE * in_str);
 XBT_PUBLIC(void) surf_parse_set_out(FILE * out_str);
@@ -51,4 +38,35 @@ XBT_PUBLIC(int) surf_parse_get_debug(void);
 XBT_PUBLIC(void) surf_parse_set_debug(int bdebug);
 XBT_PUBLIC(int) surf_parse_lex_destroy(void);
 
+/* What is needed to bypass the parser. */
+XBT_PUBLIC_DATA(int_f_void_t) surf_parse;       /* Entry-point to the parser. Set this to your function. */
+
+/* Set of macros to make the bypassing work easier.
+ * See examples/msg/masterslave_bypass.c for an example of use */
+
+extern unsigned int surfxml_buffer_stack_stack_ptr;
+extern unsigned int surfxml_buffer_stack_stack[1024];
+
+#define SURFXML_BUFFER_SET(key,val) do { \
+  AX_surfxml_##key=AX_ptr; \
+  strcpy(A_surfxml_##key,val); \
+  AX_ptr+=(int)strlen(val)+1; } while(0)
+
+#define SURFXML_BUFFER_RESET() do { \
+  AX_ptr = 0; \
+  memset(surfxml_bufferstack,0,surfxml_bufferstack_size); } while(0)
+
+#define SURFXML_START_TAG(tag) \
+  do{                                                                   \
+    surfxml_buffer_stack_stack[surfxml_buffer_stack_stack_ptr++] = AX_ptr; \
+    STag_surfxml_##tag();                                               \
+  }while(0)
+
+#define SURFXML_END_TAG(tag)                                            \
+  do{                                                                   \
+    AX_ptr = surfxml_buffer_stack_stack[--surfxml_buffer_stack_stack_ptr]; \
+    ETag_surfxml_##tag();                                               \
+  } while(0)
+
+SG_END_DECL()
 #endif