feat(rivetc+rivet): support subimports in import declarations (#58)

This allows submodules to be imported within a single `import` declaration.

`import module_path/{ subimports }`

Author: StunxFS

cmd/src/rivet.ri

@@ -2,12 +2,8 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/console;
-import std/process;
-
-import rivet;
-import rivet/prefs;
-import rivet/utils;
+import std/{ console, process };
+import rivet/{ self, prefs, utils };
 
 import ./tools;
 

cmd/src/tools/cmd_fmt.ri

@@ -2,15 +2,8 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/flag;
-import std/console;
-import std/fs.Directory;
-
-import rivet/ast;
-import rivet/fmt;
-import rivet/prefs;
-import rivet/utils;
-import rivet/parser;
+import std/{ flag, console, fs.Directory };
+import rivet/{ ast, fmt, prefs, utils, parser };
 
 var fmt_desc := "Formats the given Rivet source files or recursively formats all files in the
 directory, then prints their formatted source to stdout.";

cmd/src/tools/cmd_new.ri

@@ -2,15 +2,10 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/flag;
-import std/semver;
-import std/strings;
-import std/console;
-import std/process;
-import std/fs.{ Path, Directory, self };
-
-import rivet/build;
-import rivet/utils;
+import std/{ 
+    flag, semver, strings, console, process, fs.{self, Path, Directory}
+};
+import rivet/{ build, utils };
 
 import ./templates;
 

cmd/src/tools/utils.ri

@@ -2,8 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/console;
-import std/console/styles;
+import std/{ console, console/styles };
 
 #[inline]
 pub func readln(prompt: string) -> ?string {

lib/rivet/src/ast/CHeader.ri

@@ -2,10 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/process;
-import std/strings;
-import std/fs.Path;
+import std/{ traits, process, strings, fs.Path };
 
 import ../token;
 

lib/rivet/src/ast/Decl.ri

@@ -9,18 +9,7 @@ pub enum Decl {
     Empty(token.Pos),
     Comment(Comment),
     ComptimeIf(ComptimeIf),
-    Import {
-        attributes: Attributes;
-        is_public: bool;
-        path: string;
-        path_pos: token.Pos;
-        mut alias_name: string;
-        mut has_custom_alias: bool;
-        glob: bool;
-        import_list: []ImportListInfo;
-        mut info: ImportedMod;
-        pos: token.Pos;
-    },
+    Import(ImportDecl),
     Extern {
         docs: []Comment;
         attributes: Attributes;
@@ -200,10 +189,17 @@ pub struct EnumVariantDecl {
     pub pos: token.Pos;
 }
 
-pub struct ImportListInfo {
-    pub name: string;
-    pub alias_name: string;
+pub struct ImportDecl {
+    pub attributes: Attributes;
+    pub is_public: bool;
+    pub path: string;
+    pub path_pos: token.Pos;
+    pub mut alias_name: string;
     pub mut has_custom_alias: bool;
+    pub glob: bool;
+    pub mut subimports: []mut ImportDecl;
+    pub import_list: []ImportListInfo;
+    pub mut info: ImportedMod;
     pub pos: token.Pos;
 }
 
@@ -216,6 +212,13 @@ pub struct ImportedMod {
     pub mut mod: Module;
 }
 
+pub struct ImportListInfo {
+    pub name: string;
+    pub alias_name: string;
+    pub mut has_custom_alias: bool;
+    pub pos: token.Pos;
+}
+
 pub func filter_field_decl(decls: []Decl) -> []Decl {
     mut fields := []Decl();
     for decl in decls {

lib/rivet/src/ast/Env.ri

@@ -2,12 +2,9 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/sys;
-import std/fs.Path;
+import std/{ sys, fs.Path };
 
-import ../prefs;
-import ../report;
-import ../utils;
+import ../{ prefs, report, utils };
 
 #[boxed]
 pub struct Env {

lib/rivet/src/ast/Expr.ri

@@ -2,8 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/strings;
+import std/{ traits, strings };
 
 import ../token;
 

lib/rivet/src/ast/Sym.ri

@@ -2,8 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/strings;
+import std/{ traits, strings };
 
 import ../token;
 

lib/rivet/src/ast/Type.ri

@@ -2,9 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/process;
-import std/strings.Builder;
+import std/{ traits, process, strings.Builder };
 
 import ../token;
 import ../utils;

lib/rivet/src/ast/comptime.ri

@@ -4,8 +4,7 @@
 
 import std/sys;
 
-import ../token;
-import ../report;
+import ../{ token, report };
 
 pub struct ComptimeIf {
     mut branches: []mut ComptimeIfBranch;

lib/rivet/src/builder/mod.ri

@@ -2,21 +2,13 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import std/traits;
-import std/console;
-import std/process;
-import std/fs.{ Path, Directory };
+import std/{ 
+    traits, console, process, fs.{ Path, Directory } 
+};
 
-import ../ast;
-import ../utils;
-import ../prefs;
-import ../token;
-import ../parser;
-import ../report;
-import ../checker;
-import ../codegen;
-import ../resolver;
-import ../depgraph;
+import ../{ 
+    ast, utils, prefs, token, parser, report, checker, codegen, resolver, depgraph 
+};
 
 pub struct Builder {
     mut env: ast.Env;
@@ -160,14 +152,7 @@ pub struct Builder {
     ) -> ! {
         for mut decl in decls {
             if decl is .Import(mut import_decl) {
-                if self.env.universe.scope.exists(import_decl.info.full_name) {
-                    continue;
-                }
-                import_decl.info = self.load_module(
-                    import_decl.path, import_decl.alias_name, sf.path,
-                    import_decl.path_pos
-                )!;
-                import_decl.alias_name = import_decl.info.alias_name;
+                self.import_module(sf, import_decl)!;
             } else if decl is .ComptimeIf(mut comptime_if) {
                 mut ct_decls := ast.nodes_to_decls(
                     self.env.evalue_comptime_if(comptime_if)
@@ -177,6 +162,23 @@ pub struct Builder {
         }
     }
 
+    func import_module(mut self, sf: ast.SourceFile, mut import_decl: ast.ImportDecl) -> ! {
+        if !import_decl.subimports.is_empty() {
+            for mut subimport in import_decl.subimports {
+                self.import_module(sf, subimport)!;
+            }
+            return;
+        }
+        if self.env.universe.scope.exists(import_decl.info.full_name) {
+            return;
+        }
+        import_decl.info = self.load_module(
+            import_decl.path, import_decl.alias_name, sf.path,
+            import_decl.path_pos
+        )!;
+        import_decl.alias_name = import_decl.info.alias_name;
+    }
+
     func load_module(
         mut self, path: string, alias_name: string, file_path: string, pos: token.Pos
     ) -> !ast.ImportedMod {
@@ -331,21 +333,33 @@ pub struct Builder {
             }
             for d in pf.decls {
                 if d is .Import(import_decl) {
-                    if !import_decl.info.found {
-                        continue; // module not found
+                    if import_decl.subimports.len > 0 {
+                        for subimport in import_decl.subimports {
+                            if dep := import_graph_mod(&subimport, pf) {
+                                deps.push(dep);
+                            }
+                        }
+                    } else if dep := import_graph_mod(&import_decl, pf) {
+                        deps.push(dep);
                     }
-                    if import_decl.info.full_name == pf.mod.name {
-                        report.error("import cycle detected", import_decl.pos);
-                        continue;
-                    }
-                    deps.push(import_decl.info.full_name);
                 }
             }
             g.add(pf.mod.name, deps);
         }
         return g;
     }
 
+    func import_graph_mod(import_decl: &ast.ImportDecl, pf: ast.SourceFile) -> ?string {
+        if !import_decl.info.found {
+            return none; // module not found
+        }
+        if import_decl.info.full_name == pf.mod.name {
+            report.error("import cycle detected", import_decl.pos);
+            return none;
+        }
+        return import_decl.info.full_name;
+    }
+
     func vlog(&self, msg: string, args: ...traits.Stringable) {
         if self.env.prefs.is_verbose {
             console.writeln(utils.bold(utils.green("[rivet-log] ")).concat(msg), args);

lib/rivet/src/checker/builtin_call.ri

@@ -2,8 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../ast;
-import ../report;
+import ../{ ast, report };
 
 extend Checker {
     func check_builtin_call(mut self, mut builtin_call: ast.Expr.BuiltinCall) -> ast.Type {

lib/rivet/src/checker/call_expr.ri

@@ -2,9 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../ast;
-import ../report;
-import ../utils/maps;
+import ../{ ast, report, utils/maps };
 
 extend Checker {
     func check_call(mut self, mut call_expr: ast.Expr.Call) -> ast.Type {

lib/rivet/src/checker/decls.ri

@@ -2,8 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../ast;
-import ../report;
+import ../{ ast, report };
 
 extend Checker {
     func check_global_vars(mut self, mut decls: []mut ast.Decl) {

lib/rivet/src/checker/exprs.ri

@@ -2,8 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../ast;
-import ../report;
+import ../{ ast, report };
 
 extend Checker {
     func check_expr(mut self, mut expr: ast.Expr) -> ast.Type {

lib/rivet/src/checker/match_expr.ri

@@ -2,10 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../ast;
-import ../utils;
-import ../report;
-import ../utils/maps;
+import ../{ ast, utils, report, utils/maps };
 
 extend Checker {
     const MATCH_EXHAUSTIVE_CUTOFF_LIMIT := 12;

lib/rivet/src/checker/mod.ri

@@ -2,10 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../ast;
-import ../token;
-import ../utils;
-import ../report;
+import ../{ ast, token, utils, report };
 
 enum LoopControlLegalityTracker {
     None,

lib/rivet/src/checker/name_cases.ri

@@ -4,9 +4,7 @@
 
 import std/traits;
 
-import ../token;
-import ../utils;
-import ../report;
+import ../{ token, utils, report };
 
 extend Checker {
     enum NameCase as uint8 < traits.Stringable {

lib/rivet/src/checker/stmts.ri

@@ -2,9 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../ast;
-import ../token;
-import ../report;
+import ../{ ast, token, report };
 
 extend Checker {
     func check_stmts(mut self, mut stmts: []mut ast.Stmt) {

lib/rivet/src/checker/check_trait_impl.ri renamed to lib/rivet/src/checker/trait_impl.ri

@@ -2,9 +2,7 @@
 // source code is governed by an MIT license that can be found in the LICENSE
 // file.
 
-import ../ast;
-import ../token;
-import ../report;
+import ../{ ast, token, report };
 
 extend Checker {
     func check_trait_impl(mut self, impltor: ast.TypeSym, trait_sym: ast.TypeSym, pos: token.Pos) {