mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* keywords, parse.y: separate EXPR_VALUE from EXPR_BEG.
fixed: [ruby-core:04310], [ruby-core:04368] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
c1f29da23d
commit
891c4aa199
4 changed files with 40 additions and 50 deletions
26
keywords
26
keywords
|
|
@ -8,27 +8,27 @@ __FILE__, {k__FILE__, k__FILE__}, EXPR_END
|
|||
BEGIN, {klBEGIN, klBEGIN}, EXPR_END
|
||||
END, {klEND, klEND}, EXPR_END
|
||||
alias, {kALIAS, kALIAS}, EXPR_FNAME
|
||||
and, {kAND, kAND}, EXPR_BEG
|
||||
and, {kAND, kAND}, EXPR_VALUE
|
||||
begin, {kBEGIN, kBEGIN}, EXPR_BEG
|
||||
break, {kBREAK, kBREAK}, EXPR_MID
|
||||
case, {kCASE, kCASE}, EXPR_BEG
|
||||
case, {kCASE, kCASE}, EXPR_VALUE
|
||||
class, {kCLASS, kCLASS}, EXPR_CLASS
|
||||
def, {kDEF, kDEF}, EXPR_FNAME
|
||||
defined?, {kDEFINED, kDEFINED}, EXPR_ARG
|
||||
do, {kDO, kDO}, EXPR_BEG
|
||||
else, {kELSE, kELSE}, EXPR_BEG
|
||||
elsif, {kELSIF, kELSIF}, EXPR_BEG
|
||||
elsif, {kELSIF, kELSIF}, EXPR_VALUE
|
||||
end, {kEND, kEND}, EXPR_END
|
||||
ensure, {kENSURE, kENSURE}, EXPR_BEG
|
||||
false, {kFALSE, kFALSE}, EXPR_END
|
||||
for, {kFOR, kFOR}, EXPR_BEG
|
||||
if, {kIF, kIF_MOD}, EXPR_BEG
|
||||
in, {kIN, kIN}, EXPR_BEG
|
||||
module, {kMODULE, kMODULE}, EXPR_BEG
|
||||
for, {kFOR, kFOR}, EXPR_VALUE
|
||||
if, {kIF, kIF_MOD}, EXPR_VALUE
|
||||
in, {kIN, kIN}, EXPR_VALUE
|
||||
module, {kMODULE, kMODULE}, EXPR_VALUE
|
||||
next, {kNEXT, kNEXT}, EXPR_MID
|
||||
nil, {kNIL, kNIL}, EXPR_END
|
||||
not, {kNOT, kNOT}, EXPR_BEG
|
||||
or, {kOR, kOR}, EXPR_BEG
|
||||
not, {kNOT, kNOT}, EXPR_VALUE
|
||||
or, {kOR, kOR}, EXPR_VALUE
|
||||
redo, {kREDO, kREDO}, EXPR_END
|
||||
rescue, {kRESCUE, kRESCUE_MOD}, EXPR_MID
|
||||
retry, {kRETRY, kRETRY}, EXPR_END
|
||||
|
|
@ -38,10 +38,10 @@ super, {kSUPER, kSUPER}, EXPR_ARG
|
|||
then, {kTHEN, kTHEN}, EXPR_BEG
|
||||
true, {kTRUE, kTRUE}, EXPR_END
|
||||
undef, {kUNDEF, kUNDEF}, EXPR_FNAME
|
||||
unless, {kUNLESS, kUNLESS_MOD}, EXPR_BEG
|
||||
until, {kUNTIL, kUNTIL_MOD}, EXPR_BEG
|
||||
when, {kWHEN, kWHEN}, EXPR_BEG
|
||||
while, {kWHILE, kWHILE_MOD}, EXPR_BEG
|
||||
unless, {kUNLESS, kUNLESS_MOD}, EXPR_VALUE
|
||||
until, {kUNTIL, kUNTIL_MOD}, EXPR_VALUE
|
||||
when, {kWHEN, kWHEN}, EXPR_VALUE
|
||||
while, {kWHILE, kWHILE_MOD}, EXPR_VALUE
|
||||
yield, {kYIELD, kYIELD}, EXPR_ARG
|
||||
%%
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue