From 7fc84f364bcb2e37363d3e22300180ba92288811 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@gmail.com>
Date: Mon, 22 Mar 2010 22:07:29 -0400
Subject: Support the ternary operator.

---
 dimension/directives.rules | 38 ++------------------------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

(limited to 'dimension/directives.rules')

diff --git a/dimension/directives.rules b/dimension/directives.rules
index a01ab9a..b995c78 100644
--- a/dimension/directives.rules
+++ b/dimension/directives.rules
@@ -70,6 +70,7 @@ LANGUAGE_DIRECTIVE: "#include" STRING {
                     dmnsn_delete_astnode($2);
                     YYERROR;
                   }
+;
 
 RVALUE: ARITH_EXPR ";" %dprec 2 {
         $$ = dmnsn_eval($1, symtable);
@@ -88,39 +89,4 @@ RVALUE: ARITH_EXPR ";" %dprec 2 {
       | INTERIOR
       | CAMERA
       | TRANSFORMATION
-
-CONDITIONAL: ARITH_EXPR {
-             /* Force the expression to be evaluated logically */
-             dmnsn_astnode zero = dmnsn_new_ast_integer(0);
-             $$ = dmnsn_new_astnode2(DMNSN_AST_OR, @$, zero, $1);
-           }
-           | ARITH_EXPR "="  ARITH_EXPR {
-             $$ = dmnsn_new_astnode2(DMNSN_AST_EQUAL, @$, $1, $3);
-           }
-           | ARITH_EXPR "!=" ARITH_EXPR {
-             $$ = dmnsn_new_astnode2(DMNSN_AST_NOT_EQUAL, @$, $1, $3);
-           }
-           | ARITH_EXPR "<"  ARITH_EXPR {
-             $$ = dmnsn_new_astnode2(DMNSN_AST_LESS, @$, $1, $3);
-           }
-           | ARITH_EXPR "<=" ARITH_EXPR {
-             $$ = dmnsn_new_astnode2(DMNSN_AST_LESS_EQUAL, @$, $1, $3);
-           }
-           | ARITH_EXPR ">"  ARITH_EXPR {
-             $$ = dmnsn_new_astnode2(DMNSN_AST_GREATER, @$, $1, $3);
-           }
-           | ARITH_EXPR ">=" ARITH_EXPR {
-             $$ = dmnsn_new_astnode2(DMNSN_AST_GREATER_EQUAL, @$, $1, $3);
-           }
-           | CONDITIONAL "&" CONDITIONAL {
-             $$ = dmnsn_new_astnode2(DMNSN_AST_AND, @$, $1, $3);
-           }
-           | CONDITIONAL "|" CONDITIONAL {
-             $$ = dmnsn_new_astnode2(DMNSN_AST_OR, @$, $1, $3);
-           }
-           | "(" CONDITIONAL ")" {
-             $$ = $2;
-           }
-           | "!" CONDITIONAL {
-             $$ = dmnsn_new_astnode1(DMNSN_AST_NOT, @$, $2);
-           }
+;
-- 
cgit v1.2.3