Don't conflict local parser.h with bison-generated parser.h by renaming

parser.h to parse.h.

svn path=/trunk/yasm/; revision=584

diff --git a/tools/re2c/actions.c b/tools/re2c/actions.c
index 653a4957ba1a8d88a89cbb391fe0bad573eebcc5..bd2fb9192b7c01ea41d88fd60c2d608901400cea 100644 (file)
--- a/tools/re2c/actions.c
+++ b/tools/re2c/actions.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 
 #include "globals.h"
-#include "parser.h"
+#include "parse.h"
 #include "dfa.h"
 
 static Symbol *first = NULL;

diff --git a/tools/re2c/main.c b/tools/re2c/main.c
index df0a5709383efc18d3fbc112f89da5e27f52406e..54cd35e5dfe0d354993bd75718000913c3b1d4fc 100644 (file)
--- a/tools/re2c/main.c
+++ b/tools/re2c/main.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include "globals.h"
-#include "parser.h"
+#include "parse.h"
 #include "dfa.h"
 
 char *fileName;

diff --git a/tools/re2c/parse.h b/tools/re2c/parse.h
index 7981f1fb629c7e237c8bed481e0168f6afc65a65..cd7724cb7a6af0d53a817d46e21f8779b062671c 100644 (file)
--- a/tools/re2c/parse.h
+++ b/tools/re2c/parse.h
@@ -1,5 +1,5 @@
-#ifndef re2c_parser_h
-#define re2c_parser_h
+#ifndef re2c_parse_h
+#define re2c_parse_h
 
 #include <stdio.h>
 #include "scanner.h"

diff --git a/tools/re2c/parser.h b/tools/re2c/parser.h
deleted file mode 100644 (file)
index 7981f1f..0000000
--- a/tools/re2c/parser.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef re2c_parser_h
-#define re2c_parser_h
-
-#include <stdio.h>
-#include "scanner.h"
-#include "re.h"
-
-typedef struct Symbol {
-    struct Symbol              *next;
-    Str                        name;
-    RegExp             *re;
-} Symbol;
-
-void Symbol_init(Symbol *, const SubStr*);
-static inline Symbol *Symbol_new(const SubStr*);
-Symbol *Symbol_find(const SubStr*);
-
-void parse(FILE *, FILE *);
-
-static inline Symbol *
-Symbol_new(const SubStr *str)
-{
-    Symbol *r = malloc(sizeof(Symbol));
-    Symbol_init(r, str);
-    return r;
-}
-
-#endif

diff --git a/tools/re2c/parser.y b/tools/re2c/parser.y
index 0a2e5b661cb26c8fadf5d6152ec1fb4c8750aed5..8bba2e79944fb4162f14651b562d33db79b04114 100644 (file)
--- a/tools/re2c/parser.y
+++ b/tools/re2c/parser.y
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "globals.h"
-#include "parser.h"
+#include "parse.h"
 int yyparse();
 int yylex();
 void yyerror(char*);

diff --git a/tools/re2c/re2c-parser.y b/tools/re2c/re2c-parser.y
index 0a2e5b661cb26c8fadf5d6152ec1fb4c8750aed5..8bba2e79944fb4162f14651b562d33db79b04114 100644 (file)
--- a/tools/re2c/re2c-parser.y
+++ b/tools/re2c/re2c-parser.y
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include "globals.h"
-#include "parser.h"
+#include "parse.h"
 int yyparse();
 int yylex();
 void yyerror(char*);

diff --git a/tools/re2c/re2c.c b/tools/re2c/re2c.c
index df0a5709383efc18d3fbc112f89da5e27f52406e..54cd35e5dfe0d354993bd75718000913c3b1d4fc 100644 (file)
--- a/tools/re2c/re2c.c
+++ b/tools/re2c/re2c.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 
 #include "globals.h"
-#include "parser.h"
+#include "parse.h"
 #include "dfa.h"
 
 char *fileName;

diff --git a/tools/re2c/scanner.c b/tools/re2c/scanner.c
index 1a9a3f66b85b0582f22c6773bab3323d8b6f4f29..2a7b00c15f1b8004d1c09ac975e0def88b9f7c2f 100644 (file)
--- a/tools/re2c/scanner.c
+++ b/tools/re2c/scanner.c
@@ -1,10 +1,10 @@
-/* Generated by re2c 0.9.1-C on Mon Apr  8 22:47:58 2002 */
+/* Generated by re2c 0.9.1-C on Thu Apr 11 00:10:49 2002 */
 #line 1 "scanner.re"
 #include <stdlib.h>
 #include <string.h>
 #include "scanner.h"
+#include "parse.h"
 #include "parser.h"
-#include "y.tab.h"
 
 extern YYSTYPE yylval;
 

diff --git a/tools/re2c/scanner.re b/tools/re2c/scanner.re
index 9c6352b85c7584c0dca8183a6890bae7c78c125b..146b163fc1ff9f3f99975d5918f613a4ac9f6736 100644 (file)
--- a/tools/re2c/scanner.re
+++ b/tools/re2c/scanner.re
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "scanner.h"
+#include "parse.h"
 #include "parser.h"
-#include "y.tab.h"
 
 extern YYSTYPE yylval;