From c57ca9e4d30e07d2ff0ba2f113e905a3c3794c75 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Fri, 20 Oct 2023 17:51:33 +0100
Subject: Parse imports in namespace

---
 .../java/org/shedlang/compiler/parser/Parser.java  | 28 +++++++++++++++++++++-
 .../org/shedlang/compiler/parser/TokenType.java    |  1 +
 .../org/shedlang/compiler/parser/Tokeniser.java    |  1 +
 3 files changed, 29 insertions(+), 1 deletion(-)

(limited to 'src/main/java/org/shedlang/compiler/parser')

diff --git a/src/main/java/org/shedlang/compiler/parser/Parser.java b/src/main/java/org/shedlang/compiler/parser/Parser.java
index 71490933..2122c97c 100644
--- a/src/main/java/org/shedlang/compiler/parser/Parser.java
+++ b/src/main/java/org/shedlang/compiler/parser/Parser.java
@@ -417,6 +417,26 @@ public class Parser {
         return new UntypedConditionalBranchNode(condition, body, source);
     }
 
+    private static UntypedImportNode parseImport(TokenIterator<TokenType> tokens) {
+        var start = tokens.position();
+
+        tokens.skip(TokenType.KEYWORD_IMPORT);
+
+        var namespaceNameParts = parseOneOrMoreNoTrailingSeparator(
+            () -> tokens.nextValue(TokenType.IDENTIFIER),
+            () -> tokens.trySkip(TokenType.SYMBOL_FORWARD_SLASH)
+        );
+        var namespaceName = new NamespaceName(namespaceNameParts);
+
+        tokens.skip(TokenType.SYMBOL_SEMICOLON);
+
+        var end = tokens.position();
+        var source = start.to(end);
+
+        return new UntypedImportNode(namespaceName, source);
+
+    }
+
     private static UntypedExpressionNode parseInt(TokenIterator<TokenType> tokens) {
         var start = tokens.position();
 
@@ -680,6 +700,12 @@ public class Parser {
         NamespaceName namespaceName
     ) {
         var start = tokens.position();
+        
+        var imports = parseMany(
+            () -> !tokens.isNext(TokenType.KEYWORD_IMPORT),
+            () -> parseImport(tokens),
+            () -> true
+        );
 
         var body = parseMany(
             () -> tokens.isNext(TokenType.END),
@@ -690,7 +716,7 @@ public class Parser {
         var end = tokens.position();
         var source = start.to(end);
 
-        return new UntypedNamespaceNode(namespaceName, body, source);
+        return new UntypedNamespaceNode(namespaceName, imports, body, source);
     }
 
     private static UntypedExpressionNode parseReference(TokenIterator<TokenType> tokens) {
diff --git a/src/main/java/org/shedlang/compiler/parser/TokenType.java b/src/main/java/org/shedlang/compiler/parser/TokenType.java
index d49f2b7d..0f83083e 100644
--- a/src/main/java/org/shedlang/compiler/parser/TokenType.java
+++ b/src/main/java/org/shedlang/compiler/parser/TokenType.java
@@ -36,6 +36,7 @@ public enum TokenType {
     SYMBOL_DOT,
     SYMBOL_EQUALS,
     SYMBOL_EQUALS_EQUALS,
+    SYMBOL_FORWARD_SLASH,
     SYMBOL_HASH_PAREN_OPEN,
     SYMBOL_MINUS,
     SYMBOL_PAREN_OPEN,
diff --git a/src/main/java/org/shedlang/compiler/parser/Tokeniser.java b/src/main/java/org/shedlang/compiler/parser/Tokeniser.java
index f59775e1..c857418d 100644
--- a/src/main/java/org/shedlang/compiler/parser/Tokeniser.java
+++ b/src/main/java/org/shedlang/compiler/parser/Tokeniser.java
@@ -53,6 +53,7 @@ public class Tokeniser {
             RegexTokeniser.rule(TokenType.SYMBOL_COMMA, ","),
             RegexTokeniser.rule(TokenType.SYMBOL_DOT, "\\."),
             RegexTokeniser.rule(TokenType.SYMBOL_EQUALS, "="),
+            RegexTokeniser.rule(TokenType.SYMBOL_FORWARD_SLASH, "/"),
             RegexTokeniser.rule(TokenType.SYMBOL_MINUS, "-"),
             RegexTokeniser.rule(TokenType.SYMBOL_PAREN_OPEN, "\\("),
             RegexTokeniser.rule(TokenType.SYMBOL_PAREN_CLOSE, "\\)"),
-- 
cgit v1.2.3