1 Commits

Author SHA1 Message Date
Gašper Dobrovoljc
30fbde8c31 Added multiline comments 2025-06-03 17:45:56 +02:00
3 changed files with 33 additions and 9 deletions

View File

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

View File

@@ -247,9 +247,38 @@ public class LexAn implements AutoCloseable {
return; return;
} }
nextChar();
if (buffChar == '{') {
int depth = 1;
nextChar();
while (depth > 0) {
switch (buffChar) {
case '}':
nextChar();
if (buffChar != '/') continue;
nextChar();
if (buffChar != '/') continue;
depth--;
break;
case '/':
nextChar();
if (buffChar != '/') continue;
nextChar();
if (buffChar != '{') continue;
depth++;
break;
case -1:
throw new Report.Error(currentLocation(), "Unterminated multiline comment");
default:
nextChar();
}
}
} else {
while (buffChar != '\n' && buffChar != -1) { while (buffChar != '\n' && buffChar != -1) {
nextChar(); nextChar();
} }
}
nextToken(); nextToken();
return; return;
@@ -319,7 +348,6 @@ public class LexAn implements AutoCloseable {
case "let" -> Token.Symbol.LET; case "let" -> Token.Symbol.LET;
case "in" -> Token.Symbol.IN; case "in" -> Token.Symbol.IN;
case "end" -> Token.Symbol.END; case "end" -> Token.Symbol.END;
case "times" -> Token.Symbol.TIMES;
default -> null; default -> null;
}; };
} }

View File

@@ -360,9 +360,9 @@ public class SynAn implements AutoCloseable {
private AST.AtomExpr parseIntegerConstantMultiplier() { private AST.AtomExpr parseIntegerConstantMultiplier() {
Token token = lexAn.peekToken(); Token token = lexAn.peekToken();
if (token.symbol() == Token.Symbol.TIMES) { if (token.symbol() == Token.Symbol.MUL) {
// intconstmult -> TIMES const // intconstmult -> MUL const
check(Token.Symbol.TIMES); check(Token.Symbol.MUL);
return parseConstant(); return parseConstant();
} }
// intconstmult -> ε // intconstmult -> ε