Make PARSE_ERROR a variadic macro too.

[simgrid.git] / src / gras / DataDesc / ddt_parse.yy.c

diff --git a/src/gras/DataDesc/ddt_parse.yy.c b/src/gras/DataDesc/ddt_parse.yy.c
index cfb0ee1..acb8213 100644 (file)
--- a/src/gras/DataDesc/ddt_parse.yy.c
+++ b/src/gras/DataDesc/ddt_parse.yy.c
@@ -1,5 +1,5 @@
 
-#line 3 "gras/DataDesc/ddt_parse.yy.c"
+#line 3 "src/gras/DataDesc/ddt_parse.yy.c"
 
 #define  YY_INT_ALIGNED short int
 
@@ -160,7 +160,15 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -507,7 +515,6 @@ int gras_ddt_parse__flex_debug = 0;
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *gras_ddt_parse_text;
-/* $Id$ */
 /* DataDesc/ddt_parse -- automatic parsing of data structures */
 /* Copyright (c) 2004 Arnaud Legrand, Martin Quinson. All rights reserved.  */
 /* This program is free software; you can redistribute it and/or modify it
@@ -524,7 +531,7 @@ char *gras_ddt_parse_text;
   int gras_ddt_parse_tok_num = 0;
   const char *definition;
   XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_ddt_lexer,gras_ddt_parse,"The crude internals of the lexer used for type parsing");
-#define SHOW_WHERE DEBUG4("%d:%d (char #%d): seen '%s'", gras_ddt_parse_line_pos,gras_ddt_parse_col_pos,gras_ddt_parse_char_pos,gras_ddt_parse_text)
+#define SHOW_WHERE XBT_DEBUG("%d:%d (char #%d): seen '%s'", gras_ddt_parse_line_pos,gras_ddt_parse_col_pos,gras_ddt_parse_char_pos,gras_ddt_parse_text)
 
 #define INITIAL 0
 #define annotate 1
@@ -608,7 +615,12 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -800,7 +812,7 @@ YY_RULE_SETUP
 case 2:
 YY_RULE_SETUP
 { /****************** ANNOTATION ************************/
-  DEBUG0("Begin annotation");
+  XBT_DEBUG("Begin annotation");
   annotate_caller = INITIAL;
   gras_ddt_parse_char_pos+= strlen(gras_ddt_parse_text);
   gras_ddt_parse_col_pos+= strlen(gras_ddt_parse_text);
@@ -810,7 +822,7 @@ YY_RULE_SETUP
 case 3:
 YY_RULE_SETUP
 { /* trim annotation */
-  DEBUG0("Begin annotation");
+  XBT_DEBUG("Begin annotation");
   annotate_caller = foo;
   gras_ddt_parse_char_pos+= strlen(gras_ddt_parse_text);
   gras_ddt_parse_col_pos+= strlen(gras_ddt_parse_text);
@@ -820,7 +832,7 @@ YY_RULE_SETUP
 case 4:
 YY_RULE_SETUP
 {
-  DEBUG0("End annotation");
+  XBT_DEBUG("End annotation");
   gras_ddt_parse_char_pos+= strlen(gras_ddt_parse_text);
   gras_ddt_parse_col_pos+= strlen(gras_ddt_parse_text);
   BEGIN(annotate_caller);
@@ -829,14 +841,14 @@ YY_RULE_SETUP
 case 5:
 YY_RULE_SETUP
 {
-  PARSE_ERROR0("``/*g'' construct closed by a regular ``*/''");
+  PARSE_ERROR("``/*g'' construct closed by a regular ``*/''");
 }
        YY_BREAK
 case 6:
 /* rule 6 can match eol */
 YY_RULE_SETUP
 {
-  PARSE_ERROR0("Type annotation cannot spread over several lines");
+  PARSE_ERROR("Type annotation cannot spread over several lines");
 }
        YY_BREAK
 case 7:
@@ -1555,7 +1567,7 @@ static void gras_ddt_parse__load_buffer_state  (void)
        gras_ddt_parse_free((void *) b  );
 }
 
-#if !defined(__cplusplus) && !defined(WIN32) 
+#ifndef __cplusplus
 extern int isatty (int );
 #endif /* __cplusplus */
     
@@ -1763,8 +1775,8 @@ YY_BUFFER_STATE gras_ddt_parse__scan_string (yyconst char * yystr )
 
 /** Setup the input buffer state to scan the given bytes. The next call to gras_ddt_parse_lex() will
  * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */