Merge branch 'parser-devel' into 39-add-parser-rule-for-functions

src/yacc/parser.y

@@ -74,12 +74,12 @@ expr: ValFloat
     | operation;
 
 exprlist: expr ',' exprlist
-        | expr
-        | ;
+        | expr;
 
 argumentlist: argumentlist '(' exprlist ')'
     | ;
 
+
 fundef: KeyFun Ident paramlist '{' statementlist'}' { DEBUG("Function");};
 
 paramlist: paramlist '(' params ')'
@@ -107,22 +107,21 @@ paramdecl: type ':' Ident { DEBUG("Param-Declaration"); };
 
 funcall: Ident argumentlist { DEBUG("Function call"); };
 
-assign: Ident '=' expr { DEBUG("Assignment"); };
-
-statementlist: statementlist statement
-    | ;
+statementlist: statement statementlist
+    | statement;
 
 statement: assign
         | decl
         | definition
-        | branch;
+        | branch
+        | funcall;
 
 branchif: KeyIf expr '{' statementlist '}' { DEBUG("if"); };
 branchelse: KeyElse '{' statementlist '}' { DEBUG("if-else"); };
 branchelseif: KeyElse KeyIf expr '{' statementlist '}' { DEBUG("else-if"); };
 
 branchelseifs: branchelseifs branchelseif
-    | ;
+    | branchelseif;
 
 branch: branchif branchelseifs
     | branchif branchelseifs branchelse;
@@ -130,25 +129,32 @@ branch: branchif branchelseifs
 identlist: Ident ',' identlist
         | Ident;
 
-decl: type ':' identlist { DEBUG("Declaration"); };
+decl: type ':' identlist;
 
 definition: decl '=' expr { DEBUG("Definition"); };
 
 assign: Ident '=' expr { DEBUG("Assignment"); };
 
 sign: KeySigned
-    | KeyUnsigned
-    | ;
+    | KeyUnsigned;
 
 scale: scale KeyShort
     | scale KeyHalf
     | scale KeyLong
     | scale KeyDouble
-    | ;
+    | KeyShort
+    | KeyHalf
+    | KeyLong
+    | KeyDouble;
 
-type: sign scale Ident
-    | sign scale KeyInt
-    | sign scale KeyFloat;
+typekind: Ident
+    | KeyInt
+    | KeyFloat;
+
+type: typekind
+    | scale typekind
+    | sign typekind
+    | sign scale typekind;
 
 operation: oparith
     | oplogic