From 826c6108e2b88196813ff27903ab7645b9a9ebc0 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Fri, 20 Mar 2026 11:57:05 +0000 Subject: Replace assign keyword with set --- src/main/java/org/shedlang/compiler/parser/Parser.java | 8 ++++---- src/main/java/org/shedlang/compiler/parser/TokenType.java | 2 +- src/main/java/org/shedlang/compiler/parser/Tokeniser.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java index 8a55de2d..5716400a 100644 --- a/src/main/java/org/shedlang/compiler/parser/Parser.java +++ b/src/main/java/org/shedlang/compiler/parser/Parser.java @@ -526,7 +526,7 @@ public class Parser { static UntypedFunctionStatementNode parseFunctionStatement(TokenIterator tokens) { return switch (tokens.peek().tokenType()) { - case KEYWORD_ASSIGN, KEYWORD_VAL, KEYWORD_VAR, SYMBOL_UNDERSCORE -> + case KEYWORD_SET, KEYWORD_VAL, KEYWORD_VAR, SYMBOL_UNDERSCORE -> parseAssign(tokens); case KEYWORD_BREAK -> @@ -562,7 +562,7 @@ public class Parser { case SYMBOL_HASH_PAREN_OPEN -> offset += 1; - case KEYWORD_ASSIGN, KEYWORD_VAL, KEYWORD_VAR -> { + case KEYWORD_SET, KEYWORD_VAL, KEYWORD_VAR -> { return parseAssign(tokens); } @@ -1266,8 +1266,8 @@ public class Parser { var start = tokens.startPosition(); return switch (tokens.peek().tokenType()) { - case KEYWORD_ASSIGN -> { - tokens.skip(TokenType.KEYWORD_ASSIGN); + case KEYWORD_SET -> { + tokens.skip(TokenType.KEYWORD_SET); var name = tokens.nextValue(TokenType.IDENTIFIER); diff --git a/src/main/java/org/shedlang/compiler/parser/TokenType.java b/src/main/java/org/shedlang/compiler/parser/TokenType.java index 945fb0b5..b1171014 100644 --- a/src/main/java/org/shedlang/compiler/parser/TokenType.java +++ b/src/main/java/org/shedlang/compiler/parser/TokenType.java @@ -9,7 +9,6 @@ public enum TokenType { COMMENT_SINGLE_LINE, WHITESPACE, - KEYWORD_ASSIGN, KEYWORD_BREAK, KEYWORD_EFFECT, KEYWORD_ELSE, @@ -25,6 +24,7 @@ public enum TokenType { KEYWORD_PUB, KEYWORD_RESUME, KEYWORD_RETURN, + KEYWORD_SET, KEYWORD_STRUCT, KEYWORD_SUMTYPE, KEYWORD_TRUE, diff --git a/src/main/java/org/shedlang/compiler/parser/Tokeniser.java b/src/main/java/org/shedlang/compiler/parser/Tokeniser.java index 7912ae3b..8139e254 100644 --- a/src/main/java/org/shedlang/compiler/parser/Tokeniser.java +++ b/src/main/java/org/shedlang/compiler/parser/Tokeniser.java @@ -13,7 +13,6 @@ import static org.shedlang.compiler.tokeniser.Token.token; public class Tokeniser { private static final Map KEYWORDS = Map.ofEntries( - Map.entry("assign", TokenType.KEYWORD_ASSIGN), Map.entry("break", TokenType.KEYWORD_BREAK), Map.entry("effect", TokenType.KEYWORD_EFFECT), Map.entry("else", TokenType.KEYWORD_ELSE), @@ -29,6 +28,7 @@ public class Tokeniser { Map.entry("pub", TokenType.KEYWORD_PUB), Map.entry("resume", TokenType.KEYWORD_RESUME), Map.entry("return", TokenType.KEYWORD_RETURN), + Map.entry("set", TokenType.KEYWORD_SET), Map.entry("struct", TokenType.KEYWORD_STRUCT), Map.entry("sumtype", TokenType.KEYWORD_SUMTYPE), Map.entry("true", TokenType.KEYWORD_TRUE), -- cgit v1.2.3