From 54870fb76b5f59cc2e6d69a8c7a8ef17853a0029 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 5 Dec 2016 15:09:04 +0200
Subject: Add comma, ternary, logical operators support in eval context

---
 build2/token | 46 +++++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

(limited to 'build2/token')

diff --git a/build2/token b/build2/token
index 3d580b9..2cc1fca 100644
--- a/build2/token
+++ b/build2/token
@@ -28,23 +28,35 @@ namespace build2
       newline,
       word,
       pair_separator,
-      colon,
-      lcbrace,       // {
-      rcbrace,       // }
-      lsbrace,       // [
-      rsbrace,       // ]
-      assign,        // =
-      prepend,       // =+
-      append,        // +=
-      equal,         // ==
-      not_equal,     // !=
-      less,          // <
-      greater,       // >
-      less_equal,    // <=
-      greater_equal, // >=
-      dollar,        // $
-      lparen,        // (
-      rparen,        // )
+
+      colon,           // :
+      dollar,          // $
+      question,        // ?
+      comma,           // ,
+
+      lparen,          // (
+      rparen,          // )
+
+      lcbrace,         // {
+      rcbrace,         // }
+
+      lsbrace,         // [
+      rsbrace,         // ]
+
+      assign,          // =
+      prepend,         // =+
+      append,          // +=
+
+      equal,           // ==
+      not_equal,       // !=
+      less,            // <
+      greater,         // >
+      less_equal,      // <=
+      greater_equal,   // >=
+
+      log_or,          // ||
+      log_and,         // &&
+      log_not,         // !
 
       value_next
     };
-- 
cgit v1.1