From 2c51dc50534827c79c6b5d1febb54d130167ea25 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 12 Feb 2017 08:33:33 +0000
Subject: 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
---
 defs/id.def | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'defs/id.def')

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
-- 
cgit v1.2.3