2 files changed, 17 insertions, 15 deletions

diff --git a/LuaSL/src/LuaSL_LSL_tree.c b/LuaSL/src/LuaSL_LSL_tree.c
index 8eed579..3cf880c 100644
--- a/LuaSL/src/LuaSL_LSL_tree.c
+++ b/LuaSL/src/LuaSL_LSL_tree.c
@@ -22,20 +22,21 @@ LSL_Token LSL_Tokens[] =
     // Operators, in order of precedence, low to high
     // Left to right, unless oterwise stated.
     // According to http://wiki.secondlife.com/wiki/Category:LSL_Operators
-    {LSL_BOOL_AND,                      "&&",   LSL_LEFT2RIGHT,                         NULL, NULL, evaluateOperationToken},
+    {LSL_BOOL_AND,                      "&&",   LSL_RIGHT2LEFT,                         NULL, NULL, evaluateOperationToken},
 // QUIRK - Seems to be some disagreement about BOOL_AND/BOOL_OR precedence.  Either they are equal, or OR is higher.
 // QUIRK - No boolean short circuiting.
-    {LSL_BOOL_OR,                       "||",   LSL_LEFT2RIGHT,                         NULL, NULL, evaluateOperationToken},
+// QUIRK - Booleans and conditionals are executed right to left.  Or maybe not, depending on who you believe.
+    {LSL_BOOL_OR,                       "||",   LSL_RIGHT2LEFT,                         NULL, NULL, evaluateOperationToken},
     {LSL_BIT_OR,                        "|",    LSL_LEFT2RIGHT,                         NULL, NULL, evaluateOperationToken},
     {LSL_BIT_XOR,                       "^",    LSL_LEFT2RIGHT,                         NULL, NULL, evaluateOperationToken},
     {LSL_BIT_AND,                       "&",    LSL_LEFT2RIGHT,                         NULL, NULL, evaluateOperationToken},
-// QUIRK - Conditionals are executed right to left.  Or left to right, depending on who you ask.  lol
-    {LSL_NOT_EQUAL,                     "!=",   LSL_LEFT2RIGHT,                         NULL, NULL, evaluateOperationToken},
-    {LSL_EQUAL,                         "==",   LSL_LEFT2RIGHT,                         NULL, NULL, evaluateOperationToken},
-    {LSL_GREATER_EQUAL,                 ">=",   LSL_LEFT2RIGHT,                         NULL, NULL, evaluateOperationToken},
-    {LSL_LESS_EQUAL,                    "<=",   LSL_LEFT2RIGHT,                         NULL, NULL, evaluateOperationToken},
-    {LSL_GREATER_THAN,                  ">",    LSL_LEFT2RIGHT,                         NULL, NULL, evaluateOperationToken},
-    {LSL_LESS_THAN,                     "<",    LSL_LEFT2RIGHT,                         NULL, NULL, evaluateOperationToken},
+// QUIRK - Booleans and conditionals are executed right to left.  Or maybe not, depending on who you believe.
+    {LSL_NOT_EQUAL,                     "!=",   LSL_RIGHT2LEFT,                         NULL, NULL, evaluateOperationToken},
+    {LSL_EQUAL,                         "==",   LSL_RIGHT2LEFT,                         NULL, NULL, evaluateOperationToken},
+    {LSL_GREATER_EQUAL,                 ">=",   LSL_RIGHT2LEFT,                         NULL, NULL, evaluateOperationToken},
+    {LSL_LESS_EQUAL,                    "<=",   LSL_RIGHT2LEFT,                         NULL, NULL, evaluateOperationToken},
+    {LSL_GREATER_THAN,                  ">",    LSL_RIGHT2LEFT,                         NULL, NULL, evaluateOperationToken},
+    {LSL_LESS_THAN,                     "<",    LSL_RIGHT2LEFT,                         NULL, NULL, evaluateOperationToken},
     {LSL_RIGHT_SHIFT,                   ">>",   LSL_LEFT2RIGHT,                         NULL, NULL, evaluateOperationToken},
     {LSL_LEFT_SHIFT,                    "<<",   LSL_LEFT2RIGHT,                         NULL, NULL, evaluateOperationToken},
 //    {LSL_CONCATENATE,                 "+",    LSL_LEFT2RIGHT,                         NULL, NULL, evaluateOperationToken},
diff --git a/LuaSL/src/LuaSL_lemon_yaccer.y b/LuaSL/src/LuaSL_lemon_yaccer.y
index 731a52d..bd0aa52 100644
--- a/LuaSL/src/LuaSL_lemon_yaccer.y
+++ b/LuaSL/src/LuaSL_lemon_yaccer.y
@@ -13,10 +13,9 @@
 
 program ::= script LSL_SCRIPT(A).                                               { A->left = param->ast;  param->ast = A; }  // Lemon does not like the start symbol to be on the RHS, so give it a dummy one.
 
-
-%left  LSL_BOOL_AND.
+%right  LSL_BOOL_AND.
 expr(A) ::= expr(B) LSL_BOOL_AND(C)             expr(D).                        { A = addOperation(B, C, D); }
-%left  LSL_BOOL_OR.
+%right  LSL_BOOL_OR.
 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.
@@ -24,10 +23,10 @@ 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.
+%right  LSL_EQUAL LSL_NOT_EQUAL.
 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.
+%right  LSL_LESS_THAN LSL_GREATER_THAN LSL_LESS_EQUAL LSL_GREATER_EQUAL.
 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); }
@@ -75,10 +74,12 @@ expr(A) ::= LSL_INTEGER(B).							{ A = B; }
 %nonassoc LSL_STATEMENT.
 statement(A) ::= expr(B) LSL_STATEMENT(D).                                      { A = addStatement(D, LSL_EXPRESSION, B); }
 
-%nonassoc LSL_SPACE LSL_COMMENT LSL_COMMENT_LINE LSL_IDENTIFIER LSL_SCRIPT LSL_UNKNOWN.
+%nonassoc LSL_IDENTIFIER LSL_SCRIPT.
 script ::= script statement(A).                                                 { A->left = param->ast;  param->ast = A; }
 script ::= statement(A).                                                        { A->left = param->ast;  param->ast = A; }
 
+%nonassoc LSL_SPACE LSL_COMMENT LSL_COMMENT_LINE LSL_UNKNOWN.
+
 
 %parse_accept {printf("Parsing complete.\n");}