From d63802b375c6935113fb7bf9c48551be8aa58c4a Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 12 Aug 2016 03:29:50 +0000 Subject: parse.y: const_decl_gen * parse.y (const_decl_gen): extract as a function as well as ripper. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index 3eccd0cb7a..afe56e5664 100644 --- a/parse.y +++ b/parse.y @@ -488,9 +488,8 @@ static NODE *new_const_op_assign_gen(struct parser_params *parser, NODE *lhs, ID #define const_path_field(w, n) NEW_COLON2(w, n) #define top_const_field(n) NEW_COLON3(n) -#define const_decl(path) ( \ - ((in_def || in_single) ? yyerror("dynamic constant assignment") : (void)0), \ - NEW_CDECL(0, 0, (path))) +static NODE *const_decl_gen(struct parser_params *parser, NODE* path); +#define const_decl(path) const_decl_gen(parser, path) #define var_field(n) (n) #define backref_assign_error(n, a) (rb_backref_error(n), NEW_BEGIN(0)) @@ -10232,6 +10231,15 @@ new_const_op_assign_gen(struct parser_params *parser, NODE *lhs, ID op, NODE *rh fixpos(asgn, lhs); return asgn; } + +static NODE * +const_decl_gen(struct parser_params *parser, NODE *path) +{ + if (in_def || in_single) { + yyerror("dynamic constant assignment"); + } + return NEW_CDECL(0, 0, (path)); +} #else static VALUE new_op_assign_gen(struct parser_params *parser, VALUE lhs, VALUE op, VALUE rhs) -- cgit v1.2.3