1 Commits

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

1
.gitignore vendored
View File

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

View File

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

View File

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

View File

@@ -247,8 +247,37 @@ public class LexAn implements AutoCloseable {
return; return;
} }
while (buffChar != '\n' && buffChar != -1) { nextChar();
if (buffChar == '{') {
int depth = 1;
nextChar(); 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) {
nextChar();
}
} }
nextToken(); nextToken();
@@ -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 "__LINE__" -> Token.Symbol.LINE;
default -> null; default -> null;
}; };
} }
@@ -452,15 +480,6 @@ public class LexAn implements AutoCloseable {
symbol = Token.Symbol.IDENTIFIER; 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( buffToken = new Token(
new Report.Location(startLocation, endLocation), new Report.Location(startLocation, endLocation),
symbol, symbol,