new module is now an extension function

Author: wakaztahir

compiler/cbi/bindings/BuildContextCBI.cpp

@@ -22,10 +22,6 @@ AnnotationController* BuildContextgetAnnotationController(LabBuildContext* self)
     return &self->compiler.controller;
 }
 
-LabModule* BuildContextnew_module(LabBuildContext* self, chem::string_view* scope_name, chem::string_view* name, ModuleSpan* dependencies) {
-    return self->new_module(*scope_name, *name, dependencies->ptr, dependencies->size);
-}
-
 LabModule* BuildContextget_cached(LabBuildContext* self, LabJob* job, chem::string_view* scope_name, chem::string_view* name) {
     return self->get_cached(job, *scope_name, *name);
 }
@@ -324,7 +320,7 @@ static DependencySymbolInfo* allocate_dep_info(ASTAllocator& allocator, Dependen
     return info;
 }
 
-LabModule* BuildContextnew_module_and_deps(LabBuildContext* self, chem::string_view* scope_name, chem::string_view* name, ModuleDependencyCBISpan* dependencies) {
+LabModule* BuildContextnew_module(LabBuildContext* self, chem::string_view* scope_name, chem::string_view* name, ModuleDependencyCBISpan* dependencies) {
     auto& allocator = self->compiler.global_allocator;
     auto mod = new LabModule(LabModuleType::Directory, chem::string(*scope_name), chem::string(*name));
     self->storage.insert_module_ptr_dangerous(mod);

compiler/cbi/bindings/BuildContextCBI.h

@@ -81,9 +81,7 @@ extern "C" {
 
     AnnotationController* BuildContextgetAnnotationController(LabBuildContext* self);
 
-    LabModule* BuildContextnew_module(LabBuildContext* self, chem::string_view* scope_name, chem::string_view* name, ModuleSpan* dependencies);
-
-    LabModule* BuildContextnew_module_and_deps(LabBuildContext* self, chem::string_view* scope_name, chem::string_view* name, ModuleDependencyCBISpan* dependencies);
+    LabModule* BuildContextnew_module(LabBuildContext* self, chem::string_view* scope_name, chem::string_view* name, ModuleDependencyCBISpan* dependencies);
 
     void BuildContextset_module_symbol_info(LabBuildContext* self, LabModule* module, unsigned int index, DependencySymbolInfoCBI* info);
 

compiler/cbi/bindings/CBI.cpp

@@ -22,7 +22,6 @@
 const std::pair<chem::string_view, void*> BuildContextSymMap[] = {
         { "lab_BuildContextgetAnnotationController", (void*) BuildContextgetAnnotationController },
         { "lab_BuildContextnew_module", (void*) BuildContextnew_module },
-        { "lab_BuildContextnew_module_and_deps", (void*) BuildContextnew_module_and_deps },
         { "lab_BuildContextset_module_symbol_info", (void*) BuildContextset_module_symbol_info },
         { "lab_BuildContextget_cached", (void*) BuildContextget_cached },
         { "lab_BuildContextset_cached", (void*) BuildContextset_cached },

compiler/lab/mod_conv/ModToLabConverter.cpp

@@ -163,7 +163,7 @@ void convertToBuildLab(const ModuleFileData& data, std::ostream& output) {
     }
 
     output << " ];\n";
-    output << "\tconst mod = ctx.new_module_and_deps(\"" << data.scope_name << "\", \"" << data.module_name << "\", std::span<ModuleDependency>(deps, " << deps_size << "));\n";
+    output << "\tconst mod = ctx.new_module(\"" << data.scope_name << "\", \"" << data.module_name << "\", std::span<ModuleDependency>(deps, " << deps_size << "));\n";
     output << "\tctx.set_cached(__chx_job, mod)\n";
 
     // Now handle remote imports

lang/libs/lab/src/lab.ch

@@ -102,9 +102,7 @@ public interface BuildContext {
 
     func getAnnotationController(&self) : *mut AnnotationController
 
-    func new_module(&self, scope_name : &std::string_view, name : &std::string_view, dependencies : std::span<*Module>) : *mut Module
-
-    func new_module_and_deps(&self, scope_name : &std::string_view, name : &std::string_view, dependencies : std::span<ModuleDependency>) : *mut Module
+    func new_module(&self, scope_name : &std::string_view, name : &std::string_view, dependencies : std::span<ModuleDependency>) : *mut Module
 
     func set_module_symbol_info(&self, module : *mut Module, index : uint, info : &DependencySymbolInfo);
 
@@ -220,9 +218,21 @@ public interface BuildContext {
 
 }
 
+public func (ctx : &BuildContext) new_module_with_deps(scope_name : &std::string_view, name : &std::string_view, dependencies : std::span<*mut Module>) : *mut Module {
+    var vec = std::vector<ModuleDependency>()
+    vec.reserve(dependencies.size())
+    var start = dependencies.data()
+    const end = start + dependencies.size()
+    while(start != end) {
+        vec.push(ModuleDependency { module : *start as *mut Module, info : null })
+        start++;
+    }
+    return ctx.new_module(scope_name, name, std::span<ModuleDependency>(vec.data(), vec.size()))
+}
+
 // directory module
 public func (ctx : &BuildContext) chemical_dir_module (scope_name : &std::string_view, name : &std::string_view, path : &std::string_view, dependencies : std::span<*Module>) : *mut Module {
-    const mod = ctx.new_module(scope_name, name, dependencies);
+    const mod = ctx.new_module_with_deps(scope_name, name, dependencies);
     ctx.add_path(mod, path);
     return mod;
 }

lang/tests/build.lab

@@ -70,8 +70,7 @@ func get_main_module(ctx : *mut AppBuildContext, job : *mut LabJob) : *mut Modul
     const ext_cpp_module = ctx.cpp_file_module(std::string_view(""), std::string_view("ext_cpp"), std::string_view(ext_cpp_path), zero_deps)
 
     const submod_path = lab::rel_path_to("submod")
-    const submod = ctx.new_module(std::string_view(""), std::string_view("submod"), zero_deps)
-    ctx.add_path(submod, std::string_view(submod_path))
+    const submod = ctx.chemical_dir_module(std::string_view(""), std::string_view("submod"), std::string_view(submod_path), zero_deps)
 
     // the std module
     var cstd_module = cstdMod.build(ctx, job)