diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-12 08:33:33 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-02-12 08:33:33 +0000 |
| commit | 0125c0228557a18645356aacf50f6e93ee273f70 (patch) | |
| tree | 7f6e2156517dc23c4067acd3a87d5ca237cb78c4 /defs | |
| parent | 0cc5db86e519d0ad5278358910c68abe0d4d2da2 (diff) | |
| download | ruby-0125c0228557a18645356aacf50f6e93ee273f70.tar.gz | |
parse.y: logop
* defs/id.def (predefined): add keywords `and` and `or`.
* parse.y (log_op): unify parser and ripper, and use tokens
instead of node types and symbols.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'defs')
| -rw-r--r-- | defs/id.def | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/defs/id.def b/defs/id.def index dd0eed9b7c..b5815b7f00 100644 --- a/defs/id.def +++ b/defs/id.def @@ -44,6 +44,8 @@ firstline, predefined = __LINE__+1, %[\ mesg exception not NOT + and AND + or OR _ UScore "/*NULL*/" NULL |