1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

parse.y: fix warning message

Browse Source 
* parse.y (arg_ambiguous_gen): fix warning message, "even" does
  not mean the number of spaces here.  state the place to put a
  space and the operator.  [ruby-core:64790] [Bug #10204]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-09-06 02:08:45 +00:00
parent f0ee1e67d3
commit 3fd37d0824
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Sep 6 11:08:52 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (arg_ambiguous_gen): fix warning message, "even" does
not mean the number of spaces here. state the place to put a
space and the operator. [ruby-core:64790] [Bug #10204]
Sat Sep 6 08:44:40 2014 Zachary Scott <e@zzak.io> Sat Sep 6 08:44:40 2014 Zachary Scott <e@zzak.io>
* lib/rdoc/generator/template/darkfish/js/jquery.js: Backport * lib/rdoc/generator/template/darkfish/js/jquery.js: Backport

14
parse.y
View File

@ -6588,15 +6588,15 @@ parser_here_document(struct parser_params *parser, NODE *here)
#include "lex.c" #include "lex.c"
static void static void
arg_ambiguous_gen(struct parser_params *parser) arg_ambiguous_gen(struct parser_params *parser, char c)
{ {
#ifndef RIPPER #ifndef RIPPER
rb_warning0("ambiguous first argument; put parentheses or even spaces"); rb_warningS("ambiguous first argument; put parentheses or a space even after `%c' operator", c);
#else #else
dispatch0(arg_ambiguous); dispatch1(arg_ambiguous, rb_usascii_str_new(&c, 1));
#endif #endif
} }
#define arg_ambiguous() (arg_ambiguous_gen(parser), 1) #define arg_ambiguous(c) (arg_ambiguous_gen(parser, (c)), 1)
static ID static ID
formal_argument_gen(struct parser_params *parser, ID lhs) formal_argument_gen(struct parser_params *parser, ID lhs)
@ -8012,7 +8012,7 @@ parser_yylex(struct parser_params *parser)
lex_state = EXPR_BEG; lex_state = EXPR_BEG;
return tOP_ASGN; return tOP_ASGN;
} }
if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous())) { if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous('+'))) {
lex_state = EXPR_BEG; lex_state = EXPR_BEG;
pushback(c); pushback(c);
if (c != -1 && ISDIGIT(c)) { if (c != -1 && ISDIGIT(c)) {
@ -8044,7 +8044,7 @@ parser_yylex(struct parser_params *parser)
lex_state = EXPR_ENDFN; lex_state = EXPR_ENDFN;
return tLAMBDA; return tLAMBDA;
} }
if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous())) { if (IS_BEG() || (IS_SPCARG(c) && arg_ambiguous('-'))) {
lex_state = EXPR_BEG; lex_state = EXPR_BEG;
pushback(c); pushback(c);
if (c != -1 && ISDIGIT(c)) { if (c != -1 && ISDIGIT(c)) {
@ -8134,7 +8134,7 @@ parser_yylex(struct parser_params *parser)
} }
pushback(c); pushback(c);
if (IS_SPCARG(c)) { if (IS_SPCARG(c)) {
(void)arg_ambiguous(); (void)arg_ambiguous('/');
lex_strterm = NEW_STRTERM(str_regexp, '/', 0); lex_strterm = NEW_STRTERM(str_regexp, '/', 0);
return tREGEXP_BEG; return tREGEXP_BEG;
} }