From 7669641f3ea508a010ac79d951033be22bbce51b Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 19 Aug 2023 10:39:33 +0100 Subject: Parse bool literals --- src/main/java/org/shedlang/compiler/parser/Parser.java | 16 ++++++++++++++++ .../java/org/shedlang/compiler/parser/TokenType.java | 2 ++ .../java/org/shedlang/compiler/parser/Tokeniser.java | 2 ++ 3 files changed, 20 insertions(+) (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 8ffed6c5..9bf95612 100644 --- a/src/main/java/org/shedlang/compiler/parser/Parser.java +++ b/src/main/java/org/shedlang/compiler/parser/Parser.java @@ -156,6 +156,20 @@ public class Parser { } } + private static UntypedExpressionNode parseBoolLiteral(TokenIterator tokens) { + var start = tokens.position(); + + var value = tokens.trySkip(TokenType.KEYWORD_TRUE); + if (!value) { + tokens.skip(TokenType.KEYWORD_FALSE); + } + + var end = tokens.position(); + var source = start.to(end); + + return new UntypedBoolLiteralNode(value, source); + } + private static class CallParser implements OperationParser { @Override public OperatorPrecedence precedence() { @@ -442,6 +456,8 @@ public class Parser { case KEYWORD_IF -> parseIf(tokens); + case KEYWORD_FALSE, KEYWORD_TRUE -> parseBoolLiteral(tokens); + case STRING -> parseStringLiteral(tokens); default -> diff --git a/src/main/java/org/shedlang/compiler/parser/TokenType.java b/src/main/java/org/shedlang/compiler/parser/TokenType.java index bd4f71bd..e9855d4b 100644 --- a/src/main/java/org/shedlang/compiler/parser/TokenType.java +++ b/src/main/java/org/shedlang/compiler/parser/TokenType.java @@ -10,9 +10,11 @@ public enum TokenType { KEYWORD_ASSIGN, KEYWORD_ELSE, + KEYWORD_FALSE, KEYWORD_FUN, KEYWORD_IF, KEYWORD_RETURN, + KEYWORD_TRUE, KEYWORD_VAL, KEYWORD_VAR, KEYWORD_WHILE, diff --git a/src/main/java/org/shedlang/compiler/parser/Tokeniser.java b/src/main/java/org/shedlang/compiler/parser/Tokeniser.java index 80b97c35..68df3876 100644 --- a/src/main/java/org/shedlang/compiler/parser/Tokeniser.java +++ b/src/main/java/org/shedlang/compiler/parser/Tokeniser.java @@ -15,9 +15,11 @@ public class Tokeniser { private static final Map KEYWORDS = Map.ofEntries( Map.entry("assign", TokenType.KEYWORD_ASSIGN), Map.entry("else", TokenType.KEYWORD_ELSE), + Map.entry("false", TokenType.KEYWORD_FALSE), Map.entry("fun", TokenType.KEYWORD_FUN), Map.entry("if", TokenType.KEYWORD_IF), Map.entry("return", TokenType.KEYWORD_RETURN), + Map.entry("true", TokenType.KEYWORD_TRUE), Map.entry("val", TokenType.KEYWORD_VAL), Map.entry("var", TokenType.KEYWORD_VAR), Map.entry("while", TokenType.KEYWORD_WHILE) -- cgit v1.2.3