From 89b84543bcc6ce762c74c9b3bd4770e03cf4c773 Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 26 Apr 2003 14:59:19 +0000 Subject: * parse.y (open_args): warning message changed to "don't put space before argument parentheses". * io.c (argf_read): ARGF.read() should read all argument files. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ io.c | 11 ++--------- parse.y | 12 ++++-------- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2df1e3e24..97db6d8bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Apr 26 23:34:42 2003 Yukihiro Matsumoto + + * parse.y (open_args): warning message changed to "don't put space + before argument parentheses". + Sat Apr 26 14:25:00 2003 Takaaki Uematsu * wince/ : files removed. @@ -32,6 +37,10 @@ Sat Apr 26 14:25:00 2003 Takaaki Uematsu * wince/sys/stat.c : expand relative directory in stat. +Sat Apr 26 06:33:04 2003 Yukihiro Matsumoto + + * io.c (argf_read): ARGF.read() should read all argument files. + Fri Apr 25 18:46:00 2003 Takaaki Uematsu * gc.c: STACK_LEVEL_MAX=65535 on mswince. diff --git a/io.c b/io.c index ce9b76c1b..75008a97f 100644 --- a/io.c +++ b/io.c @@ -3715,19 +3715,12 @@ argf_read(argc, argv) if (NIL_P(tmp) && next_p != -1) { io_close(current_file); next_p = 1; - return str; + if (argc == 0) goto retry; } if (NIL_P(tmp) || RSTRING(tmp)->len == 0) return str; else if (NIL_P(str)) str = tmp; else rb_str_append(str, tmp); - if (argc == 0) { - goto retry; - } - if (RSTRING(tmp)->len < len) { - len -= RSTRING(tmp)->len; - argv[0] = LONG2FIX(len); - goto retry; - } + if (argc == 0) goto retry; return str; } diff --git a/parse.y b/parse.y index 2ee33381d..090a8b946 100644 --- a/parse.y +++ b/parse.y @@ -1340,14 +1340,12 @@ command_args : { open_args : call_args | tLPAREN_ARG {lex_state = EXPR_ENDARG;} ')' { - rb_warning("%s (...) interpreted as method call", - rb_id2name($1)); + rb_warn("don't put space before argument parentheses"); $$ = 0; } | tLPAREN_ARG call_args2 {lex_state = EXPR_ENDARG;} ')' { - rb_warning("%s (...) interpreted as method call", - rb_id2name($1)); + rb_warn("don't put space before argument parentheses"); $$ = $2; } ; @@ -3277,7 +3275,6 @@ arg_ambiguous() static int yylex() { - static ID last_id = 0; register int c; int space_seen = 0; int cmd_state; @@ -4029,7 +4026,6 @@ yylex() } else if (lex_state == EXPR_ARG) { c = tLPAREN_ARG; - yylval.id = last_id; } } COND_PUSH(0); @@ -4407,8 +4403,8 @@ yylex() } } tokfix(); - last_id = yylval.id = rb_intern(tok()); - if ((dyna_in_block() && rb_dvar_defined(last_id)) || local_id(last_id)) { + yylval.id = rb_intern(tok()); + if ((dyna_in_block() && rb_dvar_defined(yylval.id)) || local_id(yylval.id)) { lex_state = EXPR_END; } return result; -- cgit