1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* parse.y (open_args, arg_ambiguous, parser_warning): should not use

rb_warning in the parser.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12403 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-05-29 15:22:49 +00:00
parent 82159c813b
commit 0d2109239d
3 changed files with 12 additions and 7 deletions

View file

@ -1,3 +1,8 @@
Wed May 30 00:24:09 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (open_args, arg_ambiguous, parser_warning): should not use
rb_warning in the parser.
Tue May 29 12:31:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue May 29 12:31:33 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (rb_w32_opendir): removed duplicated code. * win32/win32.c (rb_w32_opendir): removed duplicated code.

View file

@ -2339,7 +2339,7 @@ open_args : call_args
| tLPAREN_ARG {lex_state = EXPR_ENDARG;} rparen | tLPAREN_ARG {lex_state = EXPR_ENDARG;} rparen
{ {
/*%%%*/ /*%%%*/
rb_warning("don't put space before argument parentheses"); rb_warning0("don't put space before argument parentheses");
$$ = 0; $$ = 0;
/*% /*%
$$ = dispatch1(space, dispatch1(arg_paren, arg_new())); $$ = dispatch1(space, dispatch1(arg_paren, arg_new()));
@ -2348,7 +2348,7 @@ open_args : call_args
| tLPAREN_ARG call_args2 {lex_state = EXPR_ENDARG;} rparen | tLPAREN_ARG call_args2 {lex_state = EXPR_ENDARG;} rparen
{ {
/*%%%*/ /*%%%*/
rb_warning("don't put space before argument parentheses"); rb_warning0("don't put space before argument parentheses");
$$ = $2; $$ = $2;
/*% /*%
$$ = dispatch1(space, dispatch1(arg_paren, $2)); $$ = dispatch1(space, dispatch1(arg_paren, $2));
@ -5398,7 +5398,7 @@ parser_here_document(struct parser_params *parser, NODE *here)
static void static void
arg_ambiguous(void) arg_ambiguous(void)
{ {
rb_warning("ambiguous first argument; put parentheses or even spaces"); rb_warning0("ambiguous first argument; put parentheses or even spaces");
} }
#else #else
static void static void
@ -6920,7 +6920,7 @@ parser_warning(NODE *node, const char *mesg)
{ {
int line = ruby_sourceline; int line = ruby_sourceline;
ruby_sourceline = nd_line(node); ruby_sourceline = nd_line(node);
rb_warning("%s", mesg); rb_warningS("%s", mesg);
ruby_sourceline = line; ruby_sourceline = line;
} }

View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0" #define RUBY_VERSION "1.9.0"
#define RUBY_RELEASE_DATE "2007-05-29" #define RUBY_RELEASE_DATE "2007-05-30"
#define RUBY_VERSION_CODE 190 #define RUBY_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20070529 #define RUBY_RELEASE_CODE 20070530
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 5
#define RUBY_RELEASE_DAY 29 #define RUBY_RELEASE_DAY 30
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];