1 files changed, 80 insertions, 14 deletions

diff --git a/LuaSL/src/LuaSL_lemon_yaccer.y b/LuaSL/src/LuaSL_lemon_yaccer.y
index 32d6b46..046a2b5 100644
--- a/LuaSL/src/LuaSL_lemon_yaccer.y
+++ b/LuaSL/src/LuaSL_lemon_yaccer.y
@@ -51,24 +51,43 @@ expr(A) ::= LSL_SUBTRACT(B)			expr(C).	[LSL_NEGATION]	{ A = addOperation(NULL, B
 
 %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.
+type ::= LSL_TYPE_FLOAT.
+type ::= LSL_TYPE_INTEGER.
+type ::= LSL_TYPE_KEY.
+type ::= LSL_TYPE_LIST.
+type ::= LSL_TYPE_ROTATION.
+type ::= LSL_TYPE_STRING.
+type ::= 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); }
-
-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); }
+expr(A) ::= LSL_PARENTHESIS_OPEN(B)     type(C) LSL_PARENTHESIS_CLOSE(D).       { A = addTypecast(B, C, D); }
+//expr ::= LSL_IDENTIFIER LSL_PARENTHESIS_OPEN exprList LSL_PARENTHESIS_CLOSE.
 
 %right LSL_ASSIGNMENT_CONCATENATE LSL_ASSIGNMENT_ADD LSL_ASSIGNMENT_SUBTRACT LSL_ASSIGNMENT_MULTIPLY LSL_ASSIGNMENT_MODULO LSL_ASSIGNMENT_DIVIDE LSL_ASSIGNMENT_PLAIN.
+expr ::= LSL_IDENTIFIER LSL_ASSIGNMENT_CONCATENATE expr.
+expr ::= LSL_IDENTIFIER LSL_ASSIGNMENT_ADD expr.
+expr ::= LSL_IDENTIFIER LSL_ASSIGNMENT_SUBTRACT expr.
+expr ::= LSL_IDENTIFIER LSL_ASSIGNMENT_MULTIPLY expr.
+expr ::= LSL_IDENTIFIER LSL_ASSIGNMENT_MODULO expr.
+expr ::= LSL_IDENTIFIER LSL_ASSIGNMENT_DIVIDE expr.
+expr ::= LSL_IDENTIFIER LSL_ASSIGNMENT_PLAIN expr.
 %right LSL_DOT.
+expr ::= LSL_IDENTIFIER LSL_DOT LSL_IDENTIFIER.
 %right LSL_DECREMENT_PRE LSL_INCREMENT_PRE LSL_DECREMENT_POST LSL_INCREMENT_POST.
+expr ::= LSL_IDENTIFIER LSL_DECREMENT_PRE.
+expr ::= LSL_IDENTIFIER LSL_INCREMENT_PRE.
+expr ::= LSL_DECREMENT_PRE LSL_IDENTIFIER.
+expr ::= LSL_INCREMENT_PRE LSL_IDENTIFIER.
+
 %nonassoc LSL_COMMA.
 
+exprList ::= exprList LSL_COMMA expr.
+exprList ::= expr.
+exprList ::= .
+
 %nonassoc  LSL_FLOAT.
 expr(A) ::= LSL_FLOAT(B).                                                       { B->basicType = OT_float; A = B; }
 %nonassoc LSL_INTEGER.
@@ -76,24 +95,71 @@ expr(A) ::= LSL_INTEGER(B).							{ B->basicType = OT_integer; A = B; }
 %nonassoc  LSL_KEY.
 expr(A) ::= LSL_KEY(B).                                                         { B->basicType = OT_key; A = B; }
 %nonassoc  LSL_LIST.
+expr ::= LSL_BRACKET_OPEN exprList LSL_BRACKET_CLOSE.
 %nonassoc  LSL_ROTATION.
+expr ::= LSL_ANGLE_OPEN expr LSL_COMMA expr LSL_COMMA expr LSL_COMMA expr LSL_ANGLE_CLOSE.
 %nonassoc  LSL_STRING.
 expr(A) ::= LSL_STRING(B).                                                      { B->basicType = OT_string; A = B; }
 %nonassoc  LSL_VECTOR.
-
-%nonassoc LSL_DO LSL_FOR LSL_ELSE LSL_ELSE_IF LSL_IF LSL_JUMP LSL_RETURN LSL_STATE_CHANGE LSL_WHILE.
+expr ::= LSL_VECTOR.
+expr ::= LSL_ANGLE_OPEN expr LSL_COMMA expr LSL_COMMA expr LSL_ANGLE_CLOSE.
+
+%nonassoc LSL_DO LSL_FOR LSL_ELSE_IF LSL_IF LSL_JUMP LSL_RETURN LSL_STATE_CHANGE LSL_WHILE.
+%nonassoc LSL_ELSE.
+statement ::= LSL_DO block LSL_WHILE LSL_PARENTHESIS_OPEN expr LSL_PARENTHESIS_CLOSE LSL_STATEMENT.
+statement ::= LSL_DO statement LSL_WHILE LSL_PARENTHESIS_OPEN expr LSL_PARENTHESIS_CLOSE LSL_STATEMENT.
+statement ::= LSL_FOR LSL_PARENTHESIS_OPEN expr LSL_COMMA expr LSL_COMMA expr LSL_PARENTHESIS_CLOSE block.
+statement ::= LSL_FOR LSL_PARENTHESIS_OPEN expr LSL_COMMA expr LSL_COMMA expr LSL_PARENTHESIS_CLOSE statement.
+
+elseIfList ::= elseIfList elseIf. 
+elseIfList ::= .
+elseIf ::= LSL_ELSE LSL_IF block.       [LSL_ELSE]
+//elseIf ::= LSL_ELSE LSL_IF statement.
+
+statement ::= LSL_IF LSL_PARENTHESIS_OPEN expr LSL_PARENTHESIS_CLOSE block elseIfList.  [LSL_ELSE]
+//statement ::= LSL_IF LSL_PARENTHESIS_OPEN expr LSL_PARENTHESIS_CLOSE statement elseIfList.
+statement ::= LSL_IF LSL_PARENTHESIS_OPEN expr LSL_PARENTHESIS_CLOSE block elseIfList LSL_ELSE block.
+//statement ::= LSL_IF LSL_PARENTHESIS_OPEN expr LSL_PARENTHESIS_CLOSE statement elseIfList LSL_ELSE block.
+//statement ::= LSL_IF LSL_PARENTHESIS_OPEN expr LSL_PARENTHESIS_CLOSE block elseIfList LSL_ELSE statement.
+//statement ::= LSL_IF LSL_PARENTHESIS_OPEN expr LSL_PARENTHESIS_CLOSE statement elseIfList LSL_ELSE statement.
+
+statement ::= LSL_JUMP LSL_IDENTIFIER.
+statement ::= LSL_RETURN expr LSL_STATEMENT.
+statement ::= LSL_RETURN LSL_STATEMENT.
+statement ::= LSL_STATE_CHANGE LSL_IDENTIFIER.
+statement ::= LSL_WHILE LSL_WHILE LSL_PARENTHESIS_OPEN expr LSL_PARENTHESIS_CLOSE block LSL_STATEMENT.
+statement ::= LSL_WHILE LSL_WHILE LSL_PARENTHESIS_OPEN expr LSL_PARENTHESIS_CLOSE statement LSL_STATEMENT.
 
 %nonassoc LSL_LABEL.
+target ::= LSL_LABEL LSL_IDENTIFIER.
 
-%nonassoc LSL_STATEMENT.
+%nonassoc  LSL_IDENTIFIER LSL_STATEMENT.
+statement ::= target LSL_STATEMENT.
+statement ::= type LSL_IDENTIFIER LSL_ASSIGNMENT_PLAIN expr LSL_STATEMENT.
+statement ::= type LSL_IDENTIFIER LSL_STATEMENT.
 statement(A) ::= expr(B) LSL_STATEMENT(D).                                      { A = addStatement(D, LSL_EXPRESSION, B); }
 
-%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; }
+statementList ::= statementList statement.
+statementList ::= .
 
 %nonassoc LSL_BLOCK_OPEN LSL_BLOCK_CLOSE.
+block ::= LSL_BLOCK_OPEN statementList LSL_BLOCK_CLOSE.
+
 %nonassoc LSL_PARAMETER LSL_FUNCTION LSL_STATE.
+parameter ::= type LSL_IDENTIFIER.
+parameterList ::= parameterList LSL_COMMA parameter.
+parameterList ::= parameter.
+parameterList ::= .
+function ::= LSL_IDENTIFIER LSL_PARENTHESIS_OPEN parameterList LSL_PARENTHESIS_CLOSE block.
+function ::= type LSL_IDENTIFIER LSL_PARENTHESIS_OPEN parameterList LSL_PARENTHESIS_CLOSE block.
+
+state ::= LSL_IDENTIFIER block.
+
+%nonassoc LSL_SCRIPT.
+script ::= script state.
+script ::= script function.
+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.