Re-implemented ?: parsing in value expressions. "a ? b : c" is implemented by

translating it into the equivalent syntax tree "(a & b) | c", since this
expression evaluates to the value of b if a is true, otherwise c.

1 files changed, 4 insertions, 1 deletions

diff --git a/token.h b/token.h
index df08b6bc..cc3ec988 100644
--- a/token.h
+++ b/token.h
@@ -71,6 +71,9 @@ struct expr_t::token_t : public noncopyable, public supports_flags<>
     KW_OR,			// |
     KW_MOD,			// %
 
+    QUERY,			// ?
+    COLON,			// :
+
     COMMA,			// ,
 
     TOK_EOF,
@@ -111,7 +114,7 @@ struct expr_t::token_t : public noncopyable, public supports_flags<>
   void rewind(std::istream& in);
   void unexpected();
 
-  static void unexpected(char c, char wanted = '\0');
+  static void expected(char wanted, char c = '\0');
 };
 
 } // namespace ledger