summaryrefslogtreecommitdiffstats
path: root/dimension/common.terminals
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@gmail.com>2010-02-02 12:03:26 -0500
committerTavian Barnes <tavianator@gmail.com>2010-02-02 12:03:26 -0500
commit3da1fe6d2fb07f3f361482d8056e36636dcec3f5 (patch)
tree54ee1eaf680f7a97820f4a150f7d9679f3345d8b /dimension/common.terminals
parentc1f6c955de83cf35fb34cc1fcf9a276bf6dbd7c8 (diff)
downloaddimension-3da1fe6d2fb07f3f361482d8056e36636dcec3f5.tar.xz
Implement #if.
Diffstat (limited to 'dimension/common.terminals')
-rw-r--r--dimension/common.terminals9
1 files changed, 6 insertions, 3 deletions
diff --git a/dimension/common.terminals b/dimension/common.terminals
index 37d3c16..ae5ebdf 100644
--- a/dimension/common.terminals
+++ b/dimension/common.terminals
@@ -47,6 +47,9 @@
%token DMNSN_T_NOT_EQUAL "!="
/* Operators */
+%left "|"
+%left "&"
+%left "=" "!=" "<" "<=" ">" ">="
%left "+" "-"
%left "*" "/"
%left "."
@@ -491,12 +494,12 @@
%token DMNSN_T_DEBUG
%token DMNSN_T_DECLARE "#declare"
%token DMNSN_T_DEFAULT
-%token DMNSN_T_ELSE
-%token DMNSN_T_END
+%token DMNSN_T_ELSE "#else"
+%token DMNSN_T_END "#end"
%token DMNSN_T_ERROR
%token DMNSN_T_FCLOSE
%token DMNSN_T_FOPEN
-%token DMNSN_T_IF
+%token DMNSN_T_IF "#if"
%token DMNSN_T_IFDEF
%token DMNSN_T_IFNDEF
%token DMNSN_T_INCLUDE "#include"