Add structure for 'from import' statement

cometlang · Apr 16, 2024 · ac8ebaa · ac8ebaa
1 parent 808867c
commit ac8ebaa
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/vmlib/compiler/src/statements.c b/vmlib/compiler/src/statements.c
@@ -329,6 +329,14 @@ void importStatement(Parser *parser)
     defineVariable(parser, global);
 }
 
+void fromImportStatement(Parser* parser)
+{
+    expression(parser);
+    emitByte(parser, OP_IMPORT);
+    // Imports are a function that return NIL, so ditch the nil from the stack
+    emitByte(parser, OP_POP);
+}
+
 void nextStatement(Parser *parser)
 {
     if (parser->currentLoop == NULL) {
@@ -415,6 +423,10 @@ void statement(Parser *parser)
     {
         importStatement(parser);
     }
+    else if (match(parser, TOKEN_FROM))
+    {
+        fromImportStatement(parser);
+    }
     else if (match(parser, TOKEN_NEXT))
     {
         nextStatement(parser);

diff --git a/vmlib/lexer/inc/scanner.h b/vmlib/lexer/inc/scanner.h
@@ -29,7 +29,7 @@ typedef enum {
 
   // Keywords.
   TOKEN_AS, TOKEN_BREAK, TOKEN_CLASS, TOKEN_ELSE, TOKEN_ENUM, TOKEN_FALSE,
-  TOKEN_FOR, TOKEN_FOREACH, TOKEN_FUN, TOKEN_IF, TOKEN_IMPORT, TOKEN_IN,
+  TOKEN_FOR, TOKEN_FOREACH, TOKEN_FROM, TOKEN_FUN, TOKEN_IF, TOKEN_IMPORT, TOKEN_IN,
   TOKEN_IS, TOKEN_NEXT, TOKEN_NIL, TOKEN_OPERATOR, TOKEN_RETHROW,
   TOKEN_RETURN, TOKEN_SELF, TOKEN_SUPER, TOKEN_TRUE, TOKEN_VAR, TOKEN_WHILE,
   TOKEN_TRY, TOKEN_CATCH, TOKEN_THROW, TOKEN_FINAL, TOKEN_FINALLY,

diff --git a/vmlib/lexer/src/scanner.c b/vmlib/lexer/src/scanner.c
@@ -180,6 +180,10 @@ static TokenType_t identifierType(Scanner *scanner)
                     return checkKeyword(scanner, 2, 5, "reach", TOKEN_FOREACH);
                 return checkKeyword(scanner, 2, 1, "r", TOKEN_FOR);
             }
+            case 'r':
+            {
+                return checkKeyword(scanner, 2, 2, "om", TOKEN_FROM);
+            }
             case 'u':
                 return checkKeyword(scanner, 2, 6, "nction", TOKEN_FUN);
             }

diff --git a/vmlib/lexer/test/test_scanner.c b/vmlib/lexer/test/test_scanner.c
@@ -57,6 +57,7 @@ char *token_strings[NUM_TOKENS] =
     [TOKEN_FALSE] = "false",
     [TOKEN_FOR] = "for",
     [TOKEN_FOREACH] = "foreach",
+    [TOKEN_FROM] = "from",
     [TOKEN_FUN] = "function",
     [TOKEN_IF] = "if",
     [TOKEN_IMPORT] = "import",