implements PR001

This commit is contained in:
2026-03-24 13:42:19 +00:00
parent 14eddbcbae
commit 04f65f46b3
4 changed files with 204 additions and 30 deletions
@@ -77,16 +77,23 @@ public final class PbsLexer {
case ':' -> addToken(PbsTokenKind.COLON);
case ';' -> addToken(PbsTokenKind.SEMICOLON);
case '@' -> addToken(PbsTokenKind.AT);
case '+' -> addToken(PbsTokenKind.PLUS);
case '-' -> addToken(PbsTokenKind.MINUS);
case '*' -> addToken(PbsTokenKind.STAR);
case '%' -> addToken(PbsTokenKind.PERCENT);
case '?' -> addToken(PbsTokenKind.QUESTION);
case '+' -> addToken(match('=') ? PbsTokenKind.PLUS_EQUAL : PbsTokenKind.PLUS);
case '-' -> {
if (match('>')) {
addToken(PbsTokenKind.ARROW);
return;
}
addToken(match('=') ? PbsTokenKind.MINUS_EQUAL : PbsTokenKind.MINUS);
}
case '*' -> addToken(match('=') ? PbsTokenKind.STAR_EQUAL : PbsTokenKind.STAR);
case '%' -> addToken(match('=') ? PbsTokenKind.PERCENT_EQUAL : PbsTokenKind.PERCENT);
case '.' -> {
if (match('.')) {
addToken(PbsTokenKind.DOT_DOT);
return;
}
report(LexErrors.E_LEX_INVALID_CHAR, "Unexpected '.'");
addToken(PbsTokenKind.DOT);
}
case '!' -> addToken(match('=') ? PbsTokenKind.BANG_EQUAL : PbsTokenKind.BANG);
case '=' -> addToken(match('=') ? PbsTokenKind.EQUAL_EQUAL : PbsTokenKind.EQUAL);
@@ -111,7 +118,7 @@ public final class PbsLexer {
state = LexerState.LINE_COMMENT;
return;
}
addToken(PbsTokenKind.SLASH);
addToken(match('=') ? PbsTokenKind.SLASH_EQUAL : PbsTokenKind.SLASH);
}
case '"' -> state = LexerState.STRING;
default -> {
@@ -192,6 +199,7 @@ public final class PbsLexer {
while (!isAtEnd() && peek() != '\n') {
advance();
}
addToken(PbsTokenKind.COMMENT);
state = LexerState.DEFAULT;
}
@@ -246,23 +254,62 @@ public final class PbsLexer {
map.put("import", PbsTokenKind.IMPORT);
map.put("from", PbsTokenKind.FROM);
map.put("as", PbsTokenKind.AS);
map.put("pub", PbsTokenKind.PUB);
map.put("mod", PbsTokenKind.MOD);
map.put("service", PbsTokenKind.SERVICE);
map.put("host", PbsTokenKind.HOST);
map.put("fn", PbsTokenKind.FN);
map.put("apply", PbsTokenKind.APPLY);
map.put("bind", PbsTokenKind.BIND);
map.put("new", PbsTokenKind.NEW);
map.put("implements", PbsTokenKind.IMPLEMENTS);
map.put("using", PbsTokenKind.USING);
map.put("ctor", PbsTokenKind.CTOR);
map.put("let", PbsTokenKind.LET);
map.put("const", PbsTokenKind.CONST);
map.put("declare", PbsTokenKind.DECLARE);
map.put("struct", PbsTokenKind.STRUCT);
map.put("contract", PbsTokenKind.CONTRACT);
map.put("error", PbsTokenKind.ERROR);
map.put("enum", PbsTokenKind.ENUM);
map.put("callback", PbsTokenKind.CALLBACK);
map.put("builtin", PbsTokenKind.BUILTIN);
map.put("Self", PbsTokenKind.SELF);
map.put("this", PbsTokenKind.THIS);
map.put("pub", PbsTokenKind.PUB);
map.put("mut", PbsTokenKind.MUT);
map.put("mod", PbsTokenKind.MOD);
map.put("type", PbsTokenKind.TYPE);
map.put("if", PbsTokenKind.IF);
map.put("else", PbsTokenKind.ELSE);
map.put("when", PbsTokenKind.WHEN);
map.put("switch", PbsTokenKind.SWITCH);
map.put("default", PbsTokenKind.DEFAULT);
map.put("for", PbsTokenKind.FOR);
map.put("in", PbsTokenKind.IN);
map.put("until", PbsTokenKind.UNTIL);
map.put("step", PbsTokenKind.STEP);
map.put("while", PbsTokenKind.WHILE);
map.put("break", PbsTokenKind.BREAK);
map.put("continue", PbsTokenKind.CONTINUE);
map.put("return", PbsTokenKind.RETURN);
map.put("void", PbsTokenKind.VOID);
map.put("optional", PbsTokenKind.OPTIONAL);
map.put("result", PbsTokenKind.RESULT);
map.put("some", PbsTokenKind.SOME);
map.put("none", PbsTokenKind.NONE);
map.put("ok", PbsTokenKind.OK);
map.put("err", PbsTokenKind.ERR);
map.put("handle", PbsTokenKind.HANDLE);
map.put("true", PbsTokenKind.TRUE);
map.put("false", PbsTokenKind.FALSE);
map.put("and", PbsTokenKind.AND);
map.put("or", PbsTokenKind.OR);
map.put("not", PbsTokenKind.NOT);
map.put("spawn", PbsTokenKind.SPAWN);
map.put("yield", PbsTokenKind.YIELD);
map.put("sleep", PbsTokenKind.SLEEP);
map.put("match", PbsTokenKind.MATCH);
return map;
}
}
@@ -17,50 +17,75 @@ public enum PbsTokenKind {
FLOAT_LITERAL,
BOUNDED_LITERAL,
STRING_LITERAL,
COMMENT,
// Declaration and import keywords.
// Import keywords.
// Example:
// `import { Vec2 as V2 } from @core:math;`
IMPORT,
FROM,
AS,
// Barrel visibility keywords (reserved in source parser for now).
// Example in barrel:
// `pub fn sum;`
PUB,
MOD,
// Top-level declaration keywords.
// Example:
// `service Audio { fn play(): int { return 1; } }`
// `declare struct Point(x: int, y: int);`
// Declaration and callable keywords.
SERVICE,
HOST,
FN,
APPLY,
BIND,
NEW,
IMPLEMENTS,
USING,
CTOR,
DECLARE,
// Statement and type declaration keywords.
// Example:
// `let x: int = 1;`
LET,
CONST,
STRUCT,
CONTRACT,
ERROR,
ENUM,
CALLBACK,
BUILTIN,
SELF,
THIS,
PUB,
MUT,
MOD,
TYPE,
// Control-flow keywords.
// Example:
// `if cond { return 1; } else { return 0; }`
IF,
ELSE,
WHEN,
SWITCH,
DEFAULT,
FOR,
IN,
UNTIL,
STEP,
WHILE,
BREAK,
CONTINUE,
RETURN,
VOID,
OPTIONAL,
RESULT,
SOME,
NONE,
OK,
ERR,
HANDLE,
// Boolean literals.
// Example: `true && false`
// Example: `true and false`
TRUE,
FALSE,
AND,
OR,
NOT,
// Reserved keywords (not active syntax in v1).
SPAWN,
YIELD,
SLEEP,
MATCH,
// Delimiters and separators.
// Example:
@@ -75,7 +100,10 @@ public enum PbsTokenKind {
COLON,
SEMICOLON,
AT,
DOT,
DOT_DOT,
ARROW,
QUESTION,
// Arithmetic and unary operators.
// Example: `-a + b * 2`
@@ -85,6 +113,11 @@ public enum PbsTokenKind {
SLASH,
PERCENT,
BANG,
PLUS_EQUAL,
MINUS_EQUAL,
STAR_EQUAL,
SLASH_EQUAL,
PERCENT_EQUAL,
// Comparison and assignment operators.
// Example:
@@ -18,6 +18,9 @@ final class PbsTokenCursor {
PbsTokenCursor(final ReadOnlyList<PbsToken> tokens) {
for (final var token : tokens) {
if (token.kind() == PbsTokenKind.COMMENT) {
continue;
}
this.tokens.add(token);
}
}