From c710140216e3fde8130d8a583a1e1c9582be20e9 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 14 Aug 2008 08:46:23 +0000 Subject: [PATCH] * parse.y (union tmpyystype): no longer needed, since YYSTYPE is defined in parse.h now. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18613 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ parse.y | 13 ++----------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e8bec7f2d..8dc23520be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Aug 14 17:46:21 2008 Nobuyoshi Nakada + + * parse.y (union tmpyystype): no longer needed, since YYSTYPE is + defined in parse.h now. + Thu Aug 14 17:27:07 2008 Yukihiro Matsumoto * version.c (Init_version): add RUBY_ENGINE constant. diff --git a/parse.y b/parse.y index 9debf69e9b..f08bb85d89 100644 --- a/parse.y +++ b/parse.y @@ -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);