Add support for "import ... as"

koto-lang · Jan 18, 2024 · 12733e7 · 12733e7
1 parent bf64ac5
commit 12733e7
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 17 deletions.
diff --git a/grammar.js b/grammar.js
@@ -593,11 +593,12 @@ module.exports = grammar({
 
     ellipsis: _ => '...',
 
-    import: $ => seq(
+    import: $ => prec.right(PREC.import, seq(
       optional(seq('from', $.import_module)),
       'import',
-      $.import_items,
-    ),
+      $.import_item,
+      repeat(seq(',', $.import_item)),
+    )),
 
     import_module: $ => choice(
       seq(
@@ -607,10 +608,10 @@ module.exports = grammar({
       $.string,
     ),
 
-    import_items: $ => prec.right(PREC.import, seq(
+    import_item: $ => seq(
       choice($.string, $.identifier),
-      repeat(seq(",", choice($.string, $.identifier))),
-    )),
+      optional(seq("as", $.identifier)),
+    ),
 
     try: $ => prec.right(PREC.try, seq(
       'try',

diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -60,12 +60,13 @@
  "export"
  "from"
  "import"
+ "as"
 ] @include
 
 (identifier) @variable
 
 (import_module (identifier) @namespace)
-(import_items (identifier) @namespace)
+(import_item (identifier) @namespace)
 (export (identifier) @namespace)
 
 (chain lookup: (identifier) @field)

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json
diff --git a/src/parser.c b/src/parser.c
diff --git a/test/corpus/expressions.txt b/test/corpus/expressions.txt
@@ -247,27 +247,38 @@ import
 ===========================================================================================
 
 import foo
+import foo as bar
 from foo import 'bar'
 from foo.bar import x, 'y'
 from 'hello' import foo
+from foo import bar as x, baz as y
 
 ---
 
 (module
   (import
-    (import_items (identifier))
+    (import_item (identifier))
+  )
+  (import
+    (import_item (identifier) (identifier))
   )
   (import
     (import_module (identifier))
-    (import_items (string))
+    (import_item (string))
   )
   (import
     (import_module (identifier) (identifier))
-    (import_items (identifier) (string))
+    (import_item (identifier))
+    (import_item (string))
   )
   (import
     (import_module (string))
-    (import_items (identifier))
+    (import_item (identifier))
+  )
+  (import
+    (import_module (identifier))
+    (import_item (identifier) (identifier))
+    (import_item (identifier) (identifier))
   )
 )