Added __LINE__ symbol

.gitignore

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

prg/test.pins25

@@ -0,0 +1,4 @@
+fun putint(n)
+
+fun main() =
+	putint(__LINE__)

src/pins25/common/Token.java

@@ -148,7 +148,11 @@ public record Token(Report.Location location, Symbol symbol, String lexeme) impl
         /**
          * Simbol {@code )}.
          */
-        RPAREN;
+        RPAREN,
+        /**
+         * Simbol {@code __LINE__}.
+         */
+        LINE
     }
 
     @Override

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 "__LINE__" -> Token.Symbol.LINE;
             default -> null;
         };
     }
@@ -451,6 +452,15 @@ public class LexAn implements AutoCloseable {
             symbol = Token.Symbol.IDENTIFIER;
         }
 
+        if (symbol == Token.Symbol.LINE) {
+            buffToken = new Token(
+                    new Report.Location(startLocation, endLocation),
+                    Token.Symbol.INTCONST,
+                    Integer.toString(startLocation.begLine())
+            );
+            return;
+        }
+
         buffToken = new Token(
                 new Report.Location(startLocation, endLocation),
                 symbol,

src/pins25/phase/SynAn.java

@@ -5,7 +5,6 @@ import pins25.common.*;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Sintaksni analizator.
@@ -467,7 +466,7 @@ public class SynAn implements AutoCloseable {
         checkExpression();
 
         // cmpexpr -> addexpr restcmp
-        AST.Expr left = parseSubstractionExpression();
+        AST.Expr left = parseAdditionExpression();
         return parseRestComparisons(left);
     }
 
@@ -477,7 +476,7 @@ public class SynAn implements AutoCloseable {
             case EQU: {
                 // restcmp -> EQU addexpr
                 check(Token.Symbol.EQU);
-                AST.Expr right = parseSubstractionExpression();
+                AST.Expr right = parseAdditionExpression();
                 AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.EQU, left, right);
                 attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
                 return binExpr;
@@ -485,7 +484,7 @@ public class SynAn implements AutoCloseable {
             case NEQ: {
                 // restcmp -> NEQ addexpr
                 check(Token.Symbol.NEQ);
-                AST.Expr right = parseSubstractionExpression();
+                AST.Expr right = parseAdditionExpression();
                 AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.NEQ, left, right);
                 attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
                 return binExpr;
@@ -493,7 +492,7 @@ public class SynAn implements AutoCloseable {
             case LTH: {
                 // restcmp -> LTH addexpr
                 check(Token.Symbol.LTH);
-                AST.Expr right = parseSubstractionExpression();
+                AST.Expr right = parseAdditionExpression();
                 AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.LTH, left, right);
                 attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
                 return binExpr;
@@ -501,7 +500,7 @@ public class SynAn implements AutoCloseable {
             case GTH: {
                 // restcmp -> GTH addexpr
                 check(Token.Symbol.GTH);
-                AST.Expr right = parseSubstractionExpression();
+                AST.Expr right = parseAdditionExpression();
                 AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.GTH, left, right);
                 attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
                 return binExpr;
@@ -509,7 +508,7 @@ public class SynAn implements AutoCloseable {
             case LEQ: {
                 // restcmp -> LEQ addexpr
                 check(Token.Symbol.LEQ);
-                AST.Expr right = parseSubstractionExpression();
+                AST.Expr right = parseAdditionExpression();
                 AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.LEQ, left, right);
                 attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
                 return binExpr;
@@ -517,7 +516,7 @@ public class SynAn implements AutoCloseable {
             case GEQ: {
                 // restcmp -> GEQ addexpr
                 check(Token.Symbol.GEQ);
-                AST.Expr right = parseSubstractionExpression();
+                AST.Expr right = parseAdditionExpression();
                 AST.BinExpr binExpr = new AST.BinExpr(AST.BinExpr.Oper.GEQ, left, right);
                 attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
                 return binExpr;
@@ -529,28 +528,39 @@ public class SynAn implements AutoCloseable {
         }
     }
 
-
+    private AST.Expr parseAdditionExpression() {
-    private AST.Expr parseSubstractionExpression() {
         checkExpression();
 
-        // subexpr -> multexpr restsub
+        // addexpr -> multexpr restadd
         AST.Expr left = parseMultiplicationExpression();
-        return parseRestSubtractionExpressions(left);
+        return parseRestAdditionExpressions(left);
     }
 
-    private AST.Expr parseRestSubtractionExpressions(AST.Expr left) {
+    private AST.Expr parseRestAdditionExpressions(AST.Expr left) {
         Token token = lexAn.peekToken();
-        if (Objects.requireNonNull(token.symbol()) == Token.Symbol.SUB) {
+        switch (token.symbol()) {
-            // restsub -> SUB multexpr restsub
+            case ADD: {
+                // restadd -> ADD multexpr restadd
+                check(Token.Symbol.ADD);
+                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 parseRestAdditionExpressions(binExpr);
+            }
+            case SUB: {
+                // restadd -> SUB multexpr restadd
                 check(Token.Symbol.SUB);
                 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 parseRestSubtractionExpressions(binExpr);
+                return parseRestAdditionExpressions(binExpr);
             }
-        // restsub -> ε
+
+            default:
+                // restadd -> ε
                 return left;
         }
+    }
 
     private AST.Expr parseMultiplicationExpression() {
         checkExpression();
@@ -564,25 +574,25 @@ public class SynAn implements AutoCloseable {
         Token token = lexAn.peekToken();
         switch (token.symbol()) {
             case MUL: {
-                // restmult -> MUL addexpr restmult
+                // restmult -> MUL prefixexpr restmult
                 check(Token.Symbol.MUL);
-                AST.Expr right = parseAdditionExpression();
+                AST.Expr right = parsePrefixExpression();
                 AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.MUL, left, right);
                 attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
                 return parseRestMultiplicationExpressions(binExpr);
             }
             case DIV: {
-                // restmult -> DIV addexpr restmult
+                // restmult -> DIV prefixexpr restmult
                 check(Token.Symbol.DIV);
-                AST.Expr right = parseAdditionExpression();
+                AST.Expr right = parsePrefixExpression();
                 AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.DIV, left, right);
                 attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
                 return parseRestMultiplicationExpressions(binExpr);
             }
             case MOD: {
-                // restmult -> MOD addexpr restmult
+                // restmult -> MOD prefixexpr restmult
                 check(Token.Symbol.MOD);
-                AST.Expr right = parseAdditionExpression();
+                AST.Expr right = parsePrefixExpression();
                 AST.Expr binExpr = new AST.BinExpr(AST.BinExpr.Oper.MOD, left, right);
                 attrLoc.put(binExpr, new Report.Location(attrLoc.get(left), attrLoc.get(right)));
                 return parseRestMultiplicationExpressions(binExpr);
@@ -594,28 +604,6 @@ public class SynAn implements AutoCloseable {
         }
     }
 
-    private AST.Expr parseAdditionExpression() {
-        checkExpression();
-
-        // addexpr -> prefexpr restadd
-        AST.Expr left = parsePrefixExpression();
-        return parseRestAdditionExpressions(left);
-    }
-
-    private AST.Expr parseRestAdditionExpressions(AST.Expr left) {
-        Token token = lexAn.peekToken();
-        if (Objects.requireNonNull(token.symbol()) == Token.Symbol.ADD) {
-            // restadd -> ADD multexpr restadd
-            check(Token.Symbol.ADD);
-            AST.Expr right = parsePrefixExpression();
-            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 parseRestAdditionExpressions(binExpr);
-        }
-        // restadd -> ε
-        return left;
-    }
-
     private AST.Expr parsePrefixExpression() {
         checkExpression();