summaryrefslogtreecommitdiff
path: root/defs
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-12 08:33:33 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-12 08:33:33 (GMT)
commit2c51dc50534827c79c6b5d1febb54d130167ea25 (patch)
tree7f6e2156517dc23c4067acd3a87d5ca237cb78c4 /defs
parentb2345fece09ac142e33063a0a87e4f379e68467c (diff)
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.def2
1 files changed, 2 insertions, 0 deletions
diff --git a/defs/id.def b/defs/id.def
index dd0eed9..b5815b7 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