diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-17 07:27:00 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-17 07:27:00 +0000 |
| commit | 046061d0332ac3bd43e5738a81f79552727a1eb4 (patch) | |
| tree | a63241e4140156b843a981d9e626356e51905210 /parse.y | |
| parent | b92ae42f564039f2723583f2cf46e0dd0e6bb4a3 (diff) | |
| download | ruby-046061d0332ac3bd43e5738a81f79552727a1eb4.tar.gz ruby-046061d0332ac3bd43e5738a81f79552727a1eb4.tar.xz ruby-046061d0332ac3bd43e5738a81f79552727a1eb4.zip | |
* object.c (rb_str_to_dbl): RString ptr might be NULL.
* object.c (rb_cstr_to_dbl): p pointer might be NULL.
* bignum.c (rb_str_to_inum): RString ptr might be NULL.
* bignum.c (rb_cstr_to_inum): str pointer might be NULL.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2965 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
| -rw-r--r-- | parse.y | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -282,11 +282,12 @@ static void top_local_setup(); * precedence table */ -%left kIF_MOD kUNLESS_MOD kWHILE_MOD kUNTIL_MOD kRESCUE_MOD +%left kIF_MOD kUNLESS_MOD kWHILE_MOD kUNTIL_MOD %left kOR kAND %right kNOT %nonassoc kDEFINED %right '=' tOP_ASGN +%left kRESCUE_MOD %right '?' ':' %nonassoc tDOT2 tDOT3 %left tOROP @@ -423,10 +424,6 @@ stmt : kALIAS fitem {lex_state = EXPR_FNAME;} fitem $$ = NEW_UNTIL(cond($3), $1, 1); } } - | stmt kRESCUE_MOD stmt - { - $$ = NEW_RESCUE($1, NEW_RESBODY(0,$3,0), 0); - } | klBEGIN { if (in_def || in_single) { @@ -1039,6 +1036,10 @@ arg : lhs '=' arg { $$ = logop(NODE_OR, $1, $3); } + | arg kRESCUE_MOD arg + { + $$ = NEW_RESCUE($1, NEW_RESBODY(0,$3,0), 0); + } | kDEFINED opt_nl {in_defined = 1;} arg { in_defined = 0; |