From 3da1fe6d2fb07f3f361482d8056e36636dcec3f5 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Tue, 2 Feb 2010 12:03:26 -0500 Subject: Implement #if. --- dimension/common.terminals | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'dimension/common.terminals') 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" -- cgit v1.2.3