diff --git a/ChangeLog b/ChangeLog index 486e09ddbc..f5467240f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Nov 18 19:37:55 2001 Nobuyoshi Nakada + + * parse.y: needless conditionals. + + * parse.y (parse_regx): parse error at unterminated regex /#{. + (ruby-bugs-ja:PR#142) + Thu Nov 15 15:29:39 2001 Nobuyoshi Nakada * array.c (rb_ary_join): non-nil separator must be converted to diff --git a/parse.y b/parse.y index 54bccbad3e..0981a4a74b 100644 --- a/parse.y +++ b/parse.y @@ -442,9 +442,7 @@ stmt : kALIAS fitem {lex_state = EXPR_FNAME;} fitem } else { $$ = n; - if ($$) { - $$->nd_value = call_op(gettable($1),$2,1,$3); - } + $$->nd_value = call_op(gettable($1),$2,1,$3); } fixpos($$, $3); } @@ -789,9 +787,7 @@ arg : lhs '=' arg } else { $$ = n; - if ($$) { - $$->nd_value = call_op(gettable($1),$2,1,$3); - } + $$->nd_value = call_op(gettable($1),$2,1,$3); } fixpos($$, $3); } @@ -2518,7 +2514,7 @@ parse_regx(term, paren) switch (c) { case '#': list = str_extend(list, term); - if (list == (NODE*)-1) return 0; + if (list == (NODE*)-1) goto unterminated; continue; case '\\': diff --git a/version.h b/version.h index 821ffe9cbe..05451be1da 100644 --- a/version.h +++ b/version.h @@ -1,4 +1,4 @@ #define RUBY_VERSION "1.7.2" -#define RUBY_RELEASE_DATE "2001-11-15" +#define RUBY_RELEASE_DATE "2001-11-18" #define RUBY_VERSION_CODE 172 -#define RUBY_RELEASE_CODE 20011115 +#define RUBY_RELEASE_CODE 20011118