Fight symbol redefinition since it breaks on G5 (don't ask why it does only break...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@663 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/gras/DataDesc/ddt_parse.yy.l b/src/gras/DataDesc/ddt_parse.yy.l
index 34447b8..e27f818 100644 (file)
--- a/src/gras/DataDesc/ddt_parse.yy.l
+++ b/src/gras/DataDesc/ddt_parse.yy.l
@@ -12,8 +12,8 @@
 #include "gras/DataDesc/datadesc_private.h"
 #include "gras/DataDesc/ddt_parse.yy.h"
 #include <string.h>
-  YY_BUFFER_STATE input_buffer;
-  FILE *file_to_parse;
+  YY_BUFFER_STATE gras_ddt_input_buffer;
+  FILE *gras_ddt_file_to_parse;
 
   int gras_ddt_parse_line_pos = 1;
   int gras_ddt_parse_col_pos = 0;
@@ -197,9 +197,9 @@ int gras_ddt_parse_lex_n_dump(void) {
 }
 
 void  gras_ddt_parse_pointer_init(const char *file) {
-  file_to_parse = fopen(file,"r");
-  input_buffer = yy_create_buffer( file_to_parse, 10 );
-  yy_switch_to_buffer(input_buffer);
+  gras_ddt_file_to_parse = fopen(file,"r");
+  gras_ddt_input_buffer = yy_create_buffer( gras_ddt_file_to_parse, 10 );
+  yy_switch_to_buffer(gras_ddt_input_buffer);
 
   gras_ddt_parse_line_pos = 1;
   gras_ddt_parse_char_pos = 0;
@@ -208,8 +208,8 @@ void  gras_ddt_parse_pointer_init(const char *file) {
 }
 
 void  gras_ddt_parse_pointer_close(void) {
-  yy_delete_buffer(input_buffer);
-  fclose(file_to_parse);
+  yy_delete_buffer(gras_ddt_input_buffer);
+  fclose(gras_ddt_file_to_parse);
 
   gras_ddt_parse_line_pos = 1;
   gras_ddt_parse_char_pos = 0;
@@ -218,9 +218,9 @@ void  gras_ddt_parse_pointer_close(void) {
 
 
 void  gras_ddt_parse_pointer_string_init(const char *string_to_parse) {
-  input_buffer = yy_scan_string (string_to_parse);
+  gras_ddt_input_buffer = yy_scan_string (string_to_parse);
   definition = string_to_parse;
-  yy_switch_to_buffer(input_buffer);
+  yy_switch_to_buffer(gras_ddt_input_buffer);
 
   gras_ddt_parse_line_pos = 1;
   gras_ddt_parse_char_pos = 0;
@@ -228,7 +228,7 @@ void  gras_ddt_parse_pointer_string_init(const char *string_to_parse) {
 }
 
 void  gras_ddt_parse_pointer_string_close(void) {
-  yy_delete_buffer(input_buffer);
+  yy_delete_buffer(gras_ddt_input_buffer);
 
   gras_ddt_parse_line_pos = 1;
   gras_ddt_parse_char_pos = 0;

diff --git a/src/surf/surf_parse.l b/src/surf/surf_parse.l
index f8558f6..d0c25da 100644 (file)
--- a/src/surf/surf_parse.l
+++ b/src/surf/surf_parse.l
@@ -12,12 +12,12 @@
 #include "xbt/log.h"
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(parse, surf ,"Logging specific to the SURF  module");
 
-  YY_BUFFER_STATE input_buffer;
-  FILE *file_to_parse;
+  YY_BUFFER_STATE surf_input_buffer;
+  FILE *surf_file_to_parse;
 
-  int line_pos = 1;
-  int char_pos = 0;
-  int tok_num = 0;
+  int surf_line_pos = 1;
+  int surf_char_pos = 0;
+  int surf_tok_num = 0;
 %}
 
 %x comment foo str
@@ -44,16 +44,16 @@ digit           [0-9]
 
 <comment>[^*\n]*        /* eat anything that's not a '*' */
 <comment>"*"+[^*/\n]*   /* eat up '*'s not followed by '/'s */
-<comment>\n             {++line_pos;char_pos=0;}
+<comment>\n             {++surf_line_pos;surf_char_pos=0;}
 <comment>"*"+"/"        BEGIN(comment_caller);
 
-\"      string_buf_ptr = string_buf; char_pos++; BEGIN(str);
+\"      string_buf_ptr = string_buf; surf_char_pos++; BEGIN(str);
 
 <str>\"        { /* saw closing quote - all done */
         BEGIN(INITIAL);
         *string_buf_ptr = '\0';
        surf_parse_text=string_buf;
-       char_pos++;
+       surf_char_pos++;
        return TOKEN_WORD;
         /* return string constant token type and
          * value to parser
@@ -75,7 +75,7 @@ digit           [0-9]
                 /* error, constant is out-of-bounds */
 
         *string_buf_ptr++ = result;
-       char_pos++;
+       surf_char_pos++;
         }
 
 <str>\\[0-9]+ {
@@ -84,16 +84,16 @@ digit           [0-9]
          */
         }
 
-<str>\\n  {*string_buf_ptr++ = '\n';   char_pos++;}
-<str>\\t  {*string_buf_ptr++ = '\t';   char_pos++;}
-<str>\\r  {*string_buf_ptr++ = '\r';   char_pos++;}
-<str>\\b  {*string_buf_ptr++ = '\b';   char_pos++;}
-<str>\\f  {*string_buf_ptr++ = '\f';   char_pos++;}
+<str>\\n  {*string_buf_ptr++ = '\n';   surf_char_pos++;}
+<str>\\t  {*string_buf_ptr++ = '\t';   surf_char_pos++;}
+<str>\\r  {*string_buf_ptr++ = '\r';   surf_char_pos++;}
+<str>\\b  {*string_buf_ptr++ = '\b';   surf_char_pos++;}
+<str>\\f  {*string_buf_ptr++ = '\f';   surf_char_pos++;}
 
 <str>\\(.|\n)  {*string_buf_ptr++ = surf_parse_text[1];        
                 if(surf_parse_text[1]=='\n') {
-                 ++line_pos;char_pos=0;
-               } else { char_pos++;}
+                 ++surf_line_pos;surf_char_pos=0;
+               } else { surf_char_pos++;}
                }
 
 <str>[^\\\n\"]+        {
@@ -101,22 +101,22 @@ digit           [0-9]
 
         while ( *yptr )
          *string_buf_ptr++ = *yptr++;
-          char_pos++;
+          surf_char_pos++;
         }
 
-({letter}|{digit})*     { char_pos+= strlen(surf_parse_text); return(TOKEN_WORD);}
-"("                     { char_pos++; return(TOKEN_LP);}
-")"                     { char_pos++;return(TOKEN_RP);}
-"</"                    { char_pos+=2; return(TOKEN_END_SECTION);}
-"<"                     { char_pos++; return(TOKEN_BEGIN_SECTION);}
-">"                     { char_pos++;return(TOKEN_CLOSURE);}
-"\n"                    { line_pos++; char_pos=0; return(TOKEN_NEWLINE);}
-. { char_pos++;}
+({letter}|{digit})*     { surf_char_pos+= strlen(surf_parse_text); return(TOKEN_WORD);}
+"("                     { surf_char_pos++; return(TOKEN_LP);}
+")"                     { surf_char_pos++;return(TOKEN_RP);}
+"</"                    { surf_char_pos+=2; return(TOKEN_END_SECTION);}
+"<"                     { surf_char_pos++; return(TOKEN_BEGIN_SECTION);}
+">"                     { surf_char_pos++;return(TOKEN_CLOSURE);}
+"\n"                    { surf_line_pos++; surf_char_pos=0; return(TOKEN_NEWLINE);}
+. { surf_char_pos++;}
 %%
 /* {space}+                { return(TOKEN_SPACE);} */
 
 static void __print_val(void) {
-  switch(tok_num) {
+  switch(surf_tok_num) {
   case TOKEN_LP      : {printf("TOKEN_LP ");break;}
   case TOKEN_RP      : {printf("TOKEN_RP ");break;}
   case TOKEN_BEGIN_SECTION : {printf("TOKEN_BEGIN_SECTION ");break;}
@@ -125,21 +125,21 @@ static void __print_val(void) {
   case TOKEN_WORD    : {printf("TOKEN_WORD ");break;}
   case TOKEN_NEWLINE : {printf("TOKEN_NEWLINE\n");return;}
   case TOKEN_EMPTY : {printf("TOKEN_EMPTY\n");return;}
-  default             : {printf("Unknown token %d\n", tok_num);return;}
+  default             : {printf("Unknown token %d\n", surf_tok_num);return;}
   }
 /*   if(strcmp(surf_parse_text,"")!=0) */
-    printf("-->%s<-- [line %d, pos %d]\n",surf_parse_text,line_pos,char_pos);
+    printf("-->%s<-- [line %d, pos %d]\n",surf_parse_text,surf_line_pos,surf_char_pos);
 /*   else */
-/*     printf("--><-- [line %d, pos %d]\n",line_pos,char_pos); */
+/*     printf("--><-- [line %d, pos %d]\n",surf_line_pos,surf_char_pos); */
 
   return;
 }
 
 e_surf_token_t surf_parse(void) {
-  tok_num = surf_parse_lex();
+  surf_tok_num = surf_parse_lex();
 /*   __print_val(); */
-  char_pos += strlen(surf_parse_text);
-  return(tok_num);
+  surf_char_pos += strlen(surf_parse_text);
+  return(surf_tok_num);
 }
 
 void find_section(const char* file, const char* section_name)
@@ -153,11 +153,11 @@ void find_section(const char* file, const char* section_name)
     if(token!=TOKEN_BEGIN_SECTION) continue;
 
     token=surf_parse();
-    xbt_assert1((token==TOKEN_WORD),"Parse error line %d",line_pos);
+    xbt_assert1((token==TOKEN_WORD),"Parse error line %d",surf_line_pos);
     if(strcmp(surf_parse_text,section_name)==0) found=1;
 
     token=surf_parse();
-    xbt_assert1((token==TOKEN_CLOSURE),"Parse error line %d",line_pos);
+    xbt_assert1((token==TOKEN_CLOSURE),"Parse error line %d",surf_line_pos);
 
     if(found) return;
   }
@@ -171,35 +171,35 @@ void close_section(const char* section_name)
   e_surf_token_t token;
 
   token=surf_parse();
-  xbt_assert1((token==TOKEN_WORD),"Parse error line %d",line_pos);
+  xbt_assert1((token==TOKEN_WORD),"Parse error line %d",surf_line_pos);
   xbt_assert1((strcmp(surf_parse_text,section_name)==0), 
              "Closing section does not match the opening one (%s).", 
              section_name);
   
   token=surf_parse();
-  xbt_assert1((token==TOKEN_CLOSURE),"Parse error line %d",line_pos);
+  xbt_assert1((token==TOKEN_CLOSURE),"Parse error line %d",surf_line_pos);
 
   surf_parse_close();
 }
 
 void  surf_parse_open(const char *file) {
-  file_to_parse = fopen(file,"r");
-  xbt_assert1((file_to_parse), "Unable to open \"%s\"\n",file);
-  input_buffer = surf_parse__create_buffer( file_to_parse, 10 );
-  surf_parse__switch_to_buffer(input_buffer);
-
-  line_pos = 1;
-  char_pos = 0;
-  tok_num = 0;
+  surf_file_to_parse = fopen(file,"r");
+  xbt_assert1((surf_file_to_parse), "Unable to open \"%s\"\n",file);
+  surf_input_buffer = surf_parse__create_buffer( surf_file_to_parse, 10 );
+  surf_parse__switch_to_buffer(surf_input_buffer);
+
+  surf_line_pos = 1;
+  surf_char_pos = 0;
+  surf_tok_num = 0;
 }
 
 void  surf_parse_close(void) {
-  surf_parse__delete_buffer(input_buffer);
-  fclose(file_to_parse);
+  surf_parse__delete_buffer(surf_input_buffer);
+  fclose(surf_file_to_parse);
 
-  line_pos = 1;
-  char_pos = 0;
-  tok_num = 0;
+  surf_line_pos = 1;
+  surf_char_pos = 0;
+  surf_tok_num = 0;
 }
 
 void surf_parse_double(double *value)
@@ -208,9 +208,9 @@ void surf_parse_double(double *value)
   int ret = 0;
 
   token = surf_parse();                /* power_scale */
-  xbt_assert1((token == TOKEN_WORD), "Parse error line %d", line_pos);
+  xbt_assert1((token == TOKEN_WORD), "Parse error line %d", surf_line_pos);
   ret = sscanf(surf_parse_text, "%lg", value);
-  xbt_assert2((ret==1), "Parse error line %d : %s not a number", line_pos,
+  xbt_assert2((ret==1), "Parse error line %d : %s not a number", surf_line_pos,
              surf_parse_text);
 }
 
@@ -219,7 +219,7 @@ void surf_parse_trace(tmgr_trace_t *trace)
   e_surf_token_t token;
   
   token = surf_parse();                /* power_trace */
-  xbt_assert1((token == TOKEN_WORD), "Parse error line %d", line_pos);
+  xbt_assert1((token == TOKEN_WORD), "Parse error line %d", surf_line_pos);
   if (strcmp(surf_parse_text, "") == 0)
     *trace = NULL;
   else