Fill out the rest of theparser symbols, and partiallyimplement typecasting.

1 files changed, 23 insertions, 9 deletions

diff --git a/LuaSL/src/LuaSL_lemon_yaccer.y b/LuaSL/src/LuaSL_lemon_yaccer.y
index 5cffb73..9d08fa9 100644
--- a/LuaSL/src/LuaSL_lemon_yaccer.y
+++ b/LuaSL/src/LuaSL_lemon_yaccer.y
@@ -36,10 +36,10 @@ expr(A) ::= expr(B) LSL_LESS_THAN(C)		expr(D).			{ A = addOperation(B, C, D); }
 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.
+%left  LSL_SUBTRACT LSL_ADD LSL_CONCATENATE.
 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.
+%left  LSL_DIVIDE LSL_MODULO LSL_MULTIPLY LSL_DOT_PRODUCT LSL_CROSS_PRODUCT.
 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); }
@@ -49,29 +49,40 @@ 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); }
 
+%right  LSL_TYPECAST_OPEN LSL_TYPECAST_CLOSE.
+%nonassoc LSL_TYPE_FLOAT LSL_TYPE_INTEGER LSL_TYPE_KEY LSL_TYPE_LIST LSL_TYPE_ROTATION LSL_TYPE_STRING LSL_TYPE_VECTOR.
 %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); }
 
-%right LSL_ASSIGNMENT_ADD LSL_ASSIGNMENT_SUBTRACT LSL_ASSIGNMENT_MULTIPLY LSL_ASSIGNMENT_MODULO LSL_ASSIGNMENT_DIVIDE LSL_ASSIGNMENT_PLAIN.
+expr(A) ::= LSL_PARENTHESIS_OPEN(B)     LSL_TYPE_FLOAT(C)       LSL_PARENTHESIS_CLOSE(D).       { A = addTypecast(B, C, D); }
+expr(A) ::= LSL_PARENTHESIS_OPEN(B)     LSL_TYPE_INTEGER(C)     LSL_PARENTHESIS_CLOSE(D).       { A = addTypecast(B, C, D); }
+expr(A) ::= LSL_PARENTHESIS_OPEN(B)     LSL_TYPE_KEY(C)         LSL_PARENTHESIS_CLOSE(D).       { A = addTypecast(B, C, D); }
+expr(A) ::= LSL_PARENTHESIS_OPEN(B)     LSL_TYPE_LIST(C)        LSL_PARENTHESIS_CLOSE(D).       { A = addTypecast(B, C, D); }
+expr(A) ::= LSL_PARENTHESIS_OPEN(B)     LSL_TYPE_ROTATION(C)    LSL_PARENTHESIS_CLOSE(D).       { A = addTypecast(B, C, D); }
+expr(A) ::= LSL_PARENTHESIS_OPEN(B)     LSL_TYPE_STRING(C)      LSL_PARENTHESIS_CLOSE(D).       { A = addTypecast(B, C, D); }
+expr(A) ::= LSL_PARENTHESIS_OPEN(B)     LSL_TYPE_VECTOR(C)      LSL_PARENTHESIS_CLOSE(D).       { A = addTypecast(B, C, D); }
+
+%right LSL_ASSIGNMENT_CONCATENATE 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.
+%right LSL_DECREMENT_PRE LSL_INCREMENT_PRE LSL_DECREMENT_POST LSL_INCREMENT_POST.
 %nonassoc LSL_COMMA.
 
 %nonassoc  LSL_FLOAT.
 expr(A) ::= LSL_FLOAT(B).                                                       { B->basicType = OT_float; A = B; }
 %nonassoc LSL_INTEGER.
 expr(A) ::= LSL_INTEGER(B).                                                     { B->basicType = OT_integer; A = B; }
+%nonassoc  LSL_KEY.
+%nonassoc  LSL_LIST.
+%nonassoc  LSL_ROTATION.
+%nonassoc  LSL_STRING.
+%nonassoc  LSL_VECTOR.
 
-%nonassoc LSL_TYPE_FLOAT LSL_TYPE_INTEGER LSL_TYPE_KEY LSL_TYPE_LIST LSL_TYPE_ROTATION LSL_TYPE_STRING LSL_TYPE_VECTOR.
-
-%nonassoc LSL_DO LSL_FOR LSL_ELSE LSL_IF LSL_JUMP LSL_RETURN LSL_STATE_CHANGE LSL_WHILE.
+%nonassoc LSL_DO LSL_FOR LSL_ELSE LSL_ELSE_IF LSL_IF LSL_JUMP LSL_RETURN LSL_STATE_CHANGE LSL_WHILE.
 
 %nonassoc LSL_LABEL.
 
-%nonassoc LSL_BLOCK_OPEN LSL_BLOCK_CLOSE.
-
 %nonassoc LSL_STATEMENT.
 statement(A) ::= expr(B) LSL_STATEMENT(D).                                      { A = addStatement(D, LSL_EXPRESSION, B); }
 
@@ -79,6 +90,9 @@ statement(A) ::= expr(B) LSL_STATEMENT(D).					{ A = addStatement(D, LSL_EXPRESS
 script ::= script statement(A).                                                 { A->left = param->ast;  param->ast = A; }
 script ::= statement(A).                                                        { A->left = param->ast;  param->ast = A; }
 
+%nonassoc LSL_BLOCK_OPEN LSL_BLOCK_CLOSE.
+%nonassoc LSL_PARAMETER LSL_FUNCTION LSL_STATE.
+
 %nonassoc LSL_SPACE LSL_COMMENT LSL_COMMENT_LINE LSL_UNKNOWN.