Remove from as keyword

4 files changed, 1 insertions, 15 deletions

diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java
index a1ae552..104eabb 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Parser.java
@@ -74,7 +74,7 @@ public class Parser {
         );
 
         tokens.skip(TokenType.SYMBOL_BRACE_CLOSE);
-        tokens.skip(TokenType.KEYWORD_FROM);
+        tokens.skip(TokenType.IDENTIFIER, "from");
 
         var isSibling = tokens.trySkip(TokenType.SYMBOL_DOT);
 
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/parser/TokenType.java b/src/main/java/org/zwobble/hobgoblin/compiler/parser/TokenType.java
index 1181fca..e38f3c7 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/parser/TokenType.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/TokenType.java
@@ -8,7 +8,6 @@ enum TokenType {
 
     KEYWORD_ENUM,
     KEYWORD_FIELD,
-    KEYWORD_FROM,
     KEYWORD_IMPORT,
     KEYWORD_NATIVE,
     KEYWORD_STRUCT,
diff --git a/src/main/java/org/zwobble/hobgoblin/compiler/parser/Tokenizer.java b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Tokenizer.java
index 56c2123..0b88b5c 100644
--- a/src/main/java/org/zwobble/hobgoblin/compiler/parser/Tokenizer.java
+++ b/src/main/java/org/zwobble/hobgoblin/compiler/parser/Tokenizer.java
@@ -126,8 +126,6 @@ class Tokenizer {
             tokenType = TokenType.KEYWORD_ENUM;
         } else if (CharSequence.compare(sourceRange.charSequence(), "field") == 0) {
             tokenType = TokenType.KEYWORD_FIELD;
-        } else if (CharSequence.compare(sourceRange.charSequence(), "from") == 0) {
-            tokenType = TokenType.KEYWORD_FROM;
         } else if (CharSequence.compare(sourceRange.charSequence(), "import") == 0) {
             tokenType = TokenType.KEYWORD_IMPORT;
         } else if (CharSequence.compare(sourceRange.charSequence(), "native") == 0) {
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/parser/TokenizerTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/parser/TokenizerTests.java
index d5b7347..86fb1f9 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/parser/TokenizerTests.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/parser/TokenizerTests.java
@@ -41,17 +41,6 @@ public class TokenizerTests {
     }
 
     @Test
-    public void keywordFromIsTokenized() {
-        var sourceText = SourceText.fromString("<string>", "from");
-
-        var tokens = Tokenizer.tokenize(sourceText);
-
-        assertThat(tokens.tokens(), isSequence(
-            equalTo(new Token(TokenType.KEYWORD_FROM, sourceRange(sourceText, 0, 4)))
-        ));
-    }
-
-    @Test
     public void keywordImportIsTokenized() {
         var sourceText = SourceText.fromString("<string>", "import");