nitc: fix calling extern constructors from extern code in separate compiler

[nit.git] / src / nitserial.nit

diff --git a/src/nitserial.nit b/src/nitserial.nit
index 43907aa..4953156 100644 (file)
--- a/src/nitserial.nit
+++ b/src/nitserial.nit
@@ -53,7 +53,7 @@ class NitModule
                if header != null then add header
 
                var name = name
-               if name != null then add "module {name}\n\n"
+               add "module {name}\n\n"
 
                for i in imports do add "import {i}\n"
                add "\n"
@@ -127,7 +127,7 @@ end
 var model = new Model
 var modelbuilder = new ModelBuilder(model, toolcontext)
 
-var mmodules = modelbuilder.parse(arguments)
+var mmodules = modelbuilder.parse_full(arguments)
 modelbuilder.run_phases
 
 # Create a distinct support module per targetted modules
@@ -149,7 +149,7 @@ for mmodule in mmodules do
                module_name = "{mmodule.name}_serial"
                module_path = null
        else if module_path.has_suffix(".nit") then
-               module_name = mmodule.name.basename(".nit")
+               module_name = module_path.basename(".nit")
        else
                module_name = module_path.basename("")
                module_path += ".nit"