Predrok 2025 - Naloga 1

.gitignore

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

grammar.txt

@@ -70,3 +70,27 @@ initializer -> INTCONST intconstmult | CHARCONST | STRINGCONST .
 intconstmult -> MUL const | .
 
 const -> INTCONST | CHARCONST | STRINGCONST .
+
+
+--------------------------------------------------------------------
+
+//LEFT ASOC.
+exp0 = exp0 op other | other
+
+    |
+    v
+
+exp0  = other exp0'
+exp0' = op other exp0' | .
+
+
+
+
+//RIGHT ASOC.
+exp0 = other op exp0 | other
+
+    |
+    v
+
+exp0  = other exp0'
+exp0' =  op exp0 | .

prg/test.pins25

@@ -0,0 +1,5 @@
+// line1 --
+line2 -----x
+line3
+
+fun main() = 0

src/pins25/common/Token.java

@@ -69,10 +69,6 @@ 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

@@ -247,7 +247,13 @@ public class LexAn implements AutoCloseable {
                     return;
                 }
 
-                while (buffChar != '\n' && buffChar != -1) {
+                StringBuilder builder = new StringBuilder();
+                
+                while (buffChar != -1) {
+                    if (buffChar == '\n' && !builder.toString().endsWith("--")) {
+                        break;
+                    }
+                    builder.append((char) buffChar);
                     nextChar();
                 }
 
@@ -319,7 +325,6 @@ 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.TIMES) {
-            // intconstmult -> TIMES const
-            check(Token.Symbol.TIMES);
+        if (token.symbol() == Token.Symbol.MUL) {
+            // intconstmult -> MUL const
+            check(Token.Symbol.MUL);
             return parseConstant();
         }
         // intconstmult -> ε