Replaced mul with times in initializers

.gitignore

@@ -3,3 +3,4 @@ out/
 *.zip
 prg/**/*.ast
 prg/**/*.out
+prg/**/*.pins25

grammar.txt

@@ -39,9 +39,8 @@ restcmp -> EQU addexpr
 		 | .
 
 addexpr -> multexpr restadd .
-restadd -> ADD addexpr
+restadd -> ADD multexpr restadd
-		 | SUB addexpr
+		 | SUB multexpr restadd | .
-		 | .
 
 multexpr -> prefixexpr restmult .
 restmult -> MUL prefixexpr restmult

prg/test.pins25

@@ -1,3 +0,0 @@
-
-fun main() =
-	3 - 2 - 1

src/pins25/common/Token.java

@@ -69,6 +69,10 @@ public record Token(Report.Location location, Symbol symbol, String lexeme) impl
          * Kljucna beseda {@code in}.
          */
         IN,
+        /**
+         * Kljucna beseda {@code times}.
+         */
+        TIMES,
         /**
          * Kljucna beseda {@code end}.
          */

src/pins25/phase/LexAn.java

@@ -319,6 +319,7 @@ public class LexAn implements AutoCloseable {
             case "let" -> Token.Symbol.LET;
             case "in" -> Token.Symbol.IN;
             case "end" -> Token.Symbol.END;
+            case "times" -> Token.Symbol.TIMES;
             default -> null;
         };
     }

src/pins25/phase/SynAn.java

@@ -360,9 +360,9 @@ public class SynAn implements AutoCloseable {
 
     private AST.AtomExpr parseIntegerConstantMultiplier() {
         Token token = lexAn.peekToken();
-        if (token.symbol() == Token.Symbol.MUL) {
+        if (token.symbol() == Token.Symbol.TIMES) {
-            // intconstmult -> MUL const
+            // intconstmult -> TIMES const
-            check(Token.Symbol.MUL);
+            check(Token.Symbol.TIMES);
             return parseConstant();
         }
         // intconstmult -> ε
@@ -540,20 +540,20 @@ public class SynAn implements AutoCloseable {
         Token token = lexAn.peekToken();
         switch (token.symbol()) {
             case ADD: {
-                // restadd -> ADD addexpr
+                // restadd -> ADD multexpr restadd
                 check(Token.Symbol.ADD);
-                AST.Expr right = parseAdditionExpression();
+                AST.Expr right = parseMultiplicationExpression();
                 AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.ADD, left, right);
                 attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
-                return binExpr;
+                return parseRestAdditionExpressions(binExpr);
             }
             case SUB: {
-                // restadd -> ADD addexpr
+                // restadd -> SUB multexpr restadd
                 check(Token.Symbol.SUB);
-                AST.Expr right = parseAdditionExpression();
+                AST.Expr right = parseMultiplicationExpression();
                 AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.SUB, left, right);
                 attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
-                return binExpr;
+                return parseRestAdditionExpressions(binExpr);
             }
 
             default: