diff --git a/parser/parser.h b/parser/parser.h new file mode 100644 index 0000000..9c42d4f --- /dev/null +++ b/parser/parser.h @@ -0,0 +1,7 @@ + +#ifndef PARSER_H +#define PARSER_H PARSER_H + +#define YYSTYPE refptr + +#endif diff --git a/parser/parser.lex b/parser/parser.lex index 717351f..73ca8a7 100644 --- a/parser/parser.lex +++ b/parser/parser.lex @@ -4,7 +4,7 @@ %{ #include "nodes.h" -#define YYSTYPE refptr +#include "parser.h" #include "parser.tab.hh" %} diff --git a/parser/parser.yy b/parser/parser.yy index 540b89c..e6537a5 100644 --- a/parser/parser.yy +++ b/parser/parser.yy @@ -9,6 +9,7 @@ #include "util/refptr.h" #include "shapes/Shape.h" /* includes all shape types */ #include "nodes.h" +#include "parser.h" using namespace std; int yylex(void); @@ -25,7 +26,6 @@ int yywrap() return 1; } -#define YYSTYPE refptr static Scene * g_scene;