From 33a981424e66e1b0ff6456eb7ab591190dff99c0 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Thu, 11 Apr 2002 07:15:07 +0000 Subject: [PATCH] Don't conflict local parser.h with bison-generated parser.h by renaming parser.h to parse.h. svn path=/trunk/yasm/; revision=584 --- tools/re2c/actions.c | 2 +- tools/re2c/main.c | 2 +- tools/re2c/parse.h | 4 ++-- tools/re2c/parser.h | 28 ---------------------------- tools/re2c/parser.y | 2 +- tools/re2c/re2c-parser.y | 2 +- tools/re2c/re2c.c | 2 +- tools/re2c/scanner.c | 4 ++-- tools/re2c/scanner.re | 2 +- 9 files changed, 10 insertions(+), 38 deletions(-) delete mode 100644 tools/re2c/parser.h diff --git a/tools/re2c/actions.c b/tools/re2c/actions.c index 653a4957..bd2fb919 100644 --- a/tools/re2c/actions.c +++ b/tools/re2c/actions.c @@ -3,7 +3,7 @@ #include #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 df0a5709..54cd35e5 100644 --- a/tools/re2c/main.c +++ b/tools/re2c/main.c @@ -2,7 +2,7 @@ #include #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 7981f1fb..cd7724cb 100644 --- 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 #include "scanner.h" diff --git a/tools/re2c/parser.h b/tools/re2c/parser.h deleted file mode 100644 index 7981f1fb..00000000 --- a/tools/re2c/parser.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef re2c_parser_h -#define re2c_parser_h - -#include -#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 0a2e5b66..8bba2e79 100644 --- a/tools/re2c/parser.y +++ b/tools/re2c/parser.y @@ -5,7 +5,7 @@ #include #include #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 0a2e5b66..8bba2e79 100644 --- a/tools/re2c/re2c-parser.y +++ b/tools/re2c/re2c-parser.y @@ -5,7 +5,7 @@ #include #include #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 df0a5709..54cd35e5 100644 --- a/tools/re2c/re2c.c +++ b/tools/re2c/re2c.c @@ -2,7 +2,7 @@ #include #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 1a9a3f66..2a7b00c1 100644 --- 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 #include #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 9c6352b8..146b163f 100644 --- a/tools/re2c/scanner.re +++ b/tools/re2c/scanner.re @@ -1,8 +1,8 @@ #include #include #include "scanner.h" +#include "parse.h" #include "parser.h" -#include "y.tab.h" extern YYSTYPE yylval; -- 2.40.0