From aa7be467e110de4d3757fc7e0697d89f397aea34 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 8 Jan 2012 23:47:09 +1000
Subject: Rearrange everything, to be consistant order.

---
 LuaSL/src/LuaSL_yaccer.y | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'LuaSL/src/LuaSL_yaccer.y')

diff --git a/LuaSL/src/LuaSL_yaccer.y b/LuaSL/src/LuaSL_yaccer.y
index 0b87df4..7f873c2 100644
--- a/LuaSL/src/LuaSL_yaccer.y
+++ b/LuaSL/src/LuaSL_yaccer.y
@@ -9,12 +9,11 @@
 
 %define api.pure
 
-%token <spaceValue> LSL_SPACE
-
-%nonassoc LSL_STATEMENT
 
-%token <integerValue> LSL_INTEGER
+%type <spaceValue> ignorable
+%token <spaceValue> LSL_SPACE
 
+%type <expressionValue> expr
 %left LSL_BOOL_AND
 %left LSL_BOOL_OR
 %left LSL_BIT_AND LSL_BIT_XOR LSL_BIT_OR
@@ -23,21 +22,23 @@
 %left LSL_LEFT_SHIFT LSL_RIGHT_SHIFT
 %left LSL_SUBTRACT LSL_ADD
 %left LSL_DIVIDE LSL_MODULO LSL_MULTIPLY
-
 %right LSL_BIT_NOT LSL_BOOL_NOT LSL_NEGATION
-
 %token LSL_PARENTHESIS_OPEN LSL_PARENTHESIS_CLOSE LSL_EXPRESSION
+%token <integerValue> LSL_INTEGER
 
-%type <expressionValue> expr
 %type <statementValue> statement
-%type <spaceValue> ignorable
+%nonassoc LSL_STATEMENT
 
 %%
 
 input :
-    expr { ((LuaSL_yyparseParam*)data)->ast = addOperation(LSL_EXPRESSION, $1, $1); }
+    ignorable { ((LuaSL_yyparseParam*)data)->ast = addSpace($1, ((LuaSL_yyparseParam*)data)->ast); }
+    | expr { ((LuaSL_yyparseParam*)data)->ast = addOperation(LSL_EXPRESSION, $1, $1); }
     | statement { ((LuaSL_yyparseParam*)data)->ast = addStatement($1, ((LuaSL_yyparseParam*)data)->ast); }
-    | ignorable { ((LuaSL_yyparseParam*)data)->ast = addSpace($1, ((LuaSL_yyparseParam*)data)->ast); }
+;
+
+ignorable :
+    LSL_SPACE { $$ = strdup($1); }
 ;
 
 expr :
@@ -70,9 +71,5 @@ statement :
     expr LSL_STATEMENT { $$ = createStatement(LSL_EXPRESSION, $1); }
 ;
 
-ignorable :
-    LSL_SPACE { $$ = strdup($1); }
-;
-
 %%
 
-- 
cgit v1.1