From 152cead8f6200f6b10b002c24a416a4a86b43905 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 28 Sep 2010 08:54:23 +0000 Subject: [PATCH] Rewrite the SURFXML_START_TAG and SURFXML_END_TAG. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8278 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/surf/surfxml_parse.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h index 5d1dba5184..c66cdf7ec3 100644 --- a/include/surf/surfxml_parse.h +++ b/include/surf/surfxml_parse.h @@ -12,7 +12,6 @@ #include "xbt/function_types.h" #include "xbt/dict.h" - SG_BEGIN_DECL() /* Hook for the different tags. All the functions which pointer to are push into here are run when the tag is encountered */ @@ -70,13 +69,13 @@ 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. */ -/*WHY DELETE THIS DAVID????*/ - /* Set of macros to make the bypassing work easier. * See examples/msg/masterslave_bypass.c for an example of use */ + #define SURFXML_BUFFER_SET(key,val) do { \ AX_surfxml_##key=AX_ptr; \ strcpy(A_surfxml_##key,val); \ @@ -86,10 +85,16 @@ XBT_PUBLIC_DATA(int_f_void_t) surf_parse; /* Entry-point to the parser. Se AX_ptr = 0; \ memset(surfxml_bufferstack,0,surfxml_bufferstack_size); } while(0) -#define SURFXML_START_TAG(tag) STag_surfxml_##tag() -#define SURFXML_END_TAG(tag) do { ETag_surfxml_##tag(); SURFXML_BUFFER_RESET(); } while(0) - -/*WHY DELETE THIS DAVID????*/ +#define SURFXML_START_TAG(tag) do{ \ + surfxml_buffer_stack_stack[surfxml_buffer_stack_stack_ptr] = AX_ptr;\ + surfxml_buffer_stack_stack_ptr++;\ + STag_surfxml_##tag(); \ + }while(0) +#define SURFXML_END_TAG(tag) do{ \ + AX_ptr = surfxml_buffer_stack_stack[surfxml_buffer_stack_stack_ptr-1];\ + surfxml_buffer_stack_stack_ptr--;\ + ETag_surfxml_##tag();\ + } while(0) XBT_PUBLIC(void) surfxml_add_callback(xbt_dynar_t cb_list, void_f_void_t function); XBT_PUBLIC(void) surfxml_del_callback(xbt_dynar_t* cb_list, void_f_void_t function); -- 2.20.1