diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 13 |
2 files changed, 7 insertions, 11 deletions
@@ -1,3 +1,8 @@ +Thu Aug 14 17:46:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (union tmpyystype): no longer needed, since YYSTYPE is + defined in parse.h now. + Thu Aug 14 17:27:07 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * version.c (Init_version): add RUBY_ENGINE constant. @@ -94,15 +94,6 @@ typedef unsigned long stack_type; #define CMDARG_LEXPOP() BITSTACK_LEXPOP(cmdarg_stack) #define CMDARG_P() BITSTACK_SET_P(cmdarg_stack) -/* must sync with real YYSTYPE */ -union tmpyystype { - VALUE val; - NODE *node; - unsigned long id; - int num; - struct RVarmap *vars; -}; - struct vtable { ID *tbl; int pos; @@ -203,7 +194,7 @@ struct parser_params { int is_ripper; NODE *heap; - union tmpyystype *parser_yylval; /* YYSTYPE not defined yet */ + YYSTYPE *parser_yylval; VALUE eofp; NODE *parser_lex_strterm; @@ -7310,7 +7301,7 @@ yylex(void *p) int t; #if YYPURE - parser->parser_yylval = (union tmpyystype*)lval; + parser->parser_yylval = lval; parser->parser_yylval->val = Qundef; #endif t = parser_yylex(parser); |