1 files changed, 29 insertions, 22 deletions

diff --git a/LuaSL/src/LuaSL_lemon_yaccer.y b/LuaSL/src/LuaSL_lemon_yaccer.y
index 14942b7..2427456 100644
--- a/LuaSL/src/LuaSL_lemon_yaccer.y
+++ b/LuaSL/src/LuaSL_lemon_yaccer.y
@@ -15,39 +15,46 @@ program ::= script LSL_SCRIPT(A).					{ A->left = param->ast;  param->ast = A; }
 
 
 %left  LSL_BOOL_AND.
-expr(A) ::= expr(B) LSL_BOOL_AND(D) expr(C).                            { A = addOperation(D, D->token->type,           B, C); }
+expr(A) ::= expr(B) LSL_BOOL_AND(C)             expr(D).                        { A = addOperation(B, C, D); }
 %left  LSL_BOOL_OR.
-expr(A) ::= expr(B) LSL_BOOL_OR(D) expr(C).                             { A = addOperation(D, LSL_BOOL_OR,              B, C); }
+expr(A) ::= expr(B) LSL_BOOL_OR(C)              expr(D).                        { A = addOperation(B, C, D); }
+
 %left  LSL_BIT_AND LSL_BIT_XOR LSL_BIT_OR.
-expr(A) ::= expr(B) LSL_BIT_OR(D) expr(C).                              { A = addOperation(D, LSL_BIT_OR,               B, C); }
-expr(A) ::= expr(B) LSL_BIT_XOR(D) expr(C).                             { A = addOperation(D, LSL_BIT_XOR,              B, C); }
-expr(A) ::= expr(B) LSL_BIT_AND(D) expr(C).                             { A = addOperation(D, LSL_BIT_AND,              B, C); }
+expr(A) ::= expr(B) LSL_BIT_OR(C)               expr(D).                        { A = addOperation(B, C, D); }
+expr(A) ::= expr(B) LSL_BIT_XOR(C)              expr(D).                        { A = addOperation(B, C, D); }
+expr(A) ::= expr(B) LSL_BIT_AND(C)              expr(D).                        { A = addOperation(B, C, D); }
+
 %left  LSL_EQUAL LSL_NOT_EQUAL.
-expr(A) ::= expr(B) LSL_NOT_EQUAL(D) expr(C).                           { A = addOperation(D, LSL_NOT_EQUAL,            B, C); }
-expr(A) ::= expr(B) LSL_EQUAL(D) expr(C).                               { A = addOperation(D, LSL_EQUAL,                B, C); }
+expr(A) ::= expr(B) LSL_NOT_EQUAL(C)            expr(D).                        { A = addOperation(B, C, D); }
+expr(A) ::= expr(B) LSL_EQUAL(C)                expr(D).                        { A = addOperation(B, C, D); }
 %left  LSL_LESS_THAN LSL_GREATER_THAN LSL_LESS_EQUAL LSL_GREATER_EQUAL.
-expr(A) ::= expr(B) LSL_GREATER_EQUAL(D) expr(C).                       { A = addOperation(D, LSL_GREATER_EQUAL,        B, C); }
-expr(A) ::= expr(B) LSL_LESS_EQUAL(D) expr(C).                          { A = addOperation(D, LSL_LESS_EQUAL,           B, C); }
-expr(A) ::= expr(B) LSL_GREATER_THAN(D) expr(C).                        { A = addOperation(D, LSL_GREATER_THAN,         B, C); }
-expr(A) ::= expr(B) LSL_LESS_THAN(D) expr(C).                           { A = addOperation(D, LSL_LESS_THAN,            B, C); }
+expr(A) ::= expr(B) LSL_GREATER_EQUAL(C)        expr(D).                        { A = addOperation(B, C, D); }
+expr(A) ::= expr(B) LSL_LESS_EQUAL(C)           expr(D).                        { A = addOperation(B, C, D); }
+expr(A) ::= expr(B) LSL_GREATER_THAN(C)         expr(D).                        { A = addOperation(B, C, D); }
+expr(A) ::= expr(B) LSL_LESS_THAN(C)            expr(D).                        { A = addOperation(B, C, D); }
+
 %left  LSL_LEFT_SHIFT LSL_RIGHT_SHIFT.
-expr(A) ::= expr(B) LSL_RIGHT_SHIFT(D) expr(C).                         { A = addOperation(D, LSL_RIGHT_SHIFT,          B, C); }
-expr(A) ::= expr(B) LSL_LEFT_SHIFT(D) expr(C).                          { A = addOperation(D, LSL_LEFT_SHIFT,           B, C); }
+expr(A) ::= expr(B) LSL_RIGHT_SHIFT(C)          expr(D).                        { A = addOperation(B, C, D); }
+expr(A) ::= expr(B) LSL_LEFT_SHIFT(C)           expr(D).                        { A = addOperation(B, C, D); }
+
 %left  LSL_SUBTRACT LSL_ADD.
-expr(A) ::= expr(B) LSL_ADD(D) expr(C).                                 { A = addOperation(D, LSL_ADD,                  B, C); }
-expr(A) ::= expr(B) LSL_SUBTRACT(D) expr(C).                            { A = addOperation(D, LSL_SUBTRACT,             B, C); }
+expr(A) ::= expr(B) LSL_ADD(C)                  expr(D).                        { A = addOperation(B, C, D); }
+expr(A) ::= expr(B) LSL_SUBTRACT(C)             expr(D).                        { A = addOperation(B, C, D); }
 %left  LSL_DIVIDE LSL_MODULO LSL_MULTIPLY.
-expr(A) ::= expr(B) LSL_MULTIPLY(D) expr(C).                            { A = addOperation(D, LSL_MULTIPLY,             B, C); }
-expr(A) ::= expr(B) LSL_MODULO(D) expr(C).                              { A = addOperation(D, LSL_MODULO,               B, C); }
-expr(A) ::= expr(B) LSL_DIVIDE(D) expr(C).                              { A = addOperation(D, LSL_DIVIDE,               B, C); }
+expr(A) ::= expr(B) LSL_MULTIPLY(C)             expr(D).                        { A = addOperation(B, C, D); }
+expr(A) ::= expr(B) LSL_MODULO(C)               expr(D).                        { A = addOperation(B, C, D); }
+expr(A) ::= expr(B) LSL_DIVIDE(C)               expr(D).                        { A = addOperation(B, C, D); }
+
 %right LSL_BIT_NOT LSL_BOOL_NOT LSL_NEGATION.
-expr(A) ::= LSL_BIT_NOT(D) expr(B).                                     { A = addOperation(D, LSL_BIT_NOT,              NULL, B); }
-expr(A) ::= LSL_BOOL_NOT(D) expr(B).                                    { A = addOperation(D, LSL_BOOL_NOT,             NULL, B); }
-expr(A) ::= LSL_SUBTRACT(D) expr(B).            [LSL_NEGATION]          { A = addOperation(D, LSL_NEGATION,             NULL, B); }
+expr(A) ::= LSL_BIT_NOT(B)                      expr(C).                        { A = addOperation(NULL, B, C); }
+expr(A) ::= LSL_BOOL_NOT(B)                     expr(C).                        { A = addOperation(NULL, B, C); }
+expr(A) ::= LSL_SUBTRACT(B)                     expr(C).        [LSL_NEGATION]  { A = addOperation(NULL, B, C); }
+
 %left  LSL_ANGLE_OPEN LSL_ANGLE_CLOSE.
 %nonassoc LSL_BRACKET_OPEN LSL_BRACKET_CLOSE.
 %nonassoc LSL_PARENTHESIS_OPEN LSL_PARENTHESIS_CLOSE LSL_EXPRESSION.
-expr(A) ::= LSL_PARENTHESIS_OPEN(B) expr(C) LSL_PARENTHESIS_CLOSE(D).   { A = addParenthesis(B, C, D); }
+expr(A) ::= LSL_PARENTHESIS_OPEN(B)     expr(C) LSL_PARENTHESIS_CLOSE(D).       { A = addParenthesis(B, C, D); }
+
 %right LSL_ASSIGNMENT_ADD LSL_ASSIGNMENT_SUBTRACT LSL_ASSIGNMENT_MULTIPLY LSL_ASSIGNMENT_MODULO LSL_ASSIGNMENT_DIVIDE LSL_ASSIGNMENT_PLAIN.
 %right LSL_DOT.
 %right LSL_DECREMENT_PRE LSL_INCREMENT_PRE.