diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | parse.y | 11 | ||||
-rw-r--r-- | version.h | 4 |
3 files changed, 14 insertions, 7 deletions
@@ -1,4 +1,8 @@ -Wed Jun 6 23:02:36 2001 Keiju Ishitsuka <keiju@ishitsuka.com> +Thu Jun 7 17:28:00 2001 Yukihiro Matsumoto <matz@ruby-lang.org> + + * parse.y (yylex): exclude kDO_BLOCK too much by false condition. + +Wed Jun 6 23:02:36 2001 Keiju Ishitsuka <keiju@ishitsuka.com> * lib/sync.rb: bug fix if obj.initialize has parameters when obj.extend(Sync_m) @@ -426,6 +426,9 @@ stmt : kALIAS fitem {lex_state = EXPR_FNAME;} fitem } | lhs '=' mrhs_basic { + if (nd_type($3) == NODE_RESTARGS) { + nd_set_type($3, NODE_REXPAND); + } $$ = node_assign($1, $3); } | mlhs '=' mrhs @@ -1147,7 +1150,7 @@ mrhs_basic : args ',' arg | tSTAR arg { value_expr($2); - $$ = NEW_REXPAND($2); + $$ = NEW_RESTARGS($2); } primary : literal @@ -1212,8 +1215,9 @@ primary : literal } | tLBRACK aref_args ']' { - if ($2 == 0) + if ($2 == 0) { $$ = NEW_ZARRAY(); /* zero length array*/ + } else { $$ = $2; } @@ -3719,8 +3723,7 @@ yylex() } if (kw->id[0] == kDO) { if (COND_P()) return kDO_COND; - if (CMDARG_P() && state != EXPR_CMDARG && state != EXPR_ARG) - return kDO_BLOCK; + if (CMDARG_P()) return kDO_BLOCK; return kDO; } if (state == EXPR_BEG) @@ -1,4 +1,4 @@ #define RUBY_VERSION "1.7.1" -#define RUBY_RELEASE_DATE "2001-06-06" +#define RUBY_RELEASE_DATE "2001-06-07" #define RUBY_VERSION_CODE 171 -#define RUBY_RELEASE_CODE 20010606 +#define RUBY_RELEASE_CODE 20010607 |