Merge branch 'package2module' into wip

[nit.git] / src / compiling / compiling_base.nit

diff --git a/src/compiling/compiling_base.nit b/src/compiling/compiling_base.nit
index c922f05..24d4fcb 100644 (file)
--- a/src/compiling/compiling_base.nit
+++ b/src/compiling/compiling_base.nit
@@ -43,7 +43,7 @@ class CProgram
        do
                _program = p
                _compdir = p.tc.compdir.as(not null)
-               _build_file = "{compdir}/{program.module.name}._build.sh"
+               _build_file = "{compdir}/{program.main_module.name}._build.sh"
        end
 
        # The Nit program compiled to C
@@ -94,15 +94,15 @@ class CProgram
                end
 
                f.write("#!/bin/sh\n")
-               f.write("# This shell script is generated by NIT to compile the program {program.module.name}.\n")
+               f.write("# This shell script is generated by NIT to compile the program {program.main_module.name}.\n")
                f.write("CLIBDIR=\"{tc.clibdir.as(not null)}\"\n")
                f.write("{tc.bindir.as(not null)}/gccx {verbose} -d {compdir} -I $CLIBDIR {include_dirs.join(" ")}")
                if tc.output_file != null then
                        f.write(" -o {tc.output_file.as(not null)}")
                else if tc.ext_prefix.is_empty then
-                       f.write(" -o {program.module.name}")
+                       f.write(" -o {program.main_module.name}")
                else
-                       f.write(" -o {program.module.name}_{tc.ext_prefix}")
+                       f.write(" -o {program.main_module.name}_{tc.ext_prefix}")
                end
                if tc.boost then f.write(" -O")
                if not tc.cc_link then f.write(" -x \"-c\"")
@@ -190,8 +190,8 @@ class CompilerVisitor
                if _indent_level < 0 then _indent_level = 0
        end
 
-       # The processed module
-       readable var _module: MMModule
+       # The processed mmmodule
+       readable var _mmmodule: MMModule
 
        # Where header decl are stored (public stuff)
        readable writable var _header_writer: Writer
@@ -218,9 +218,9 @@ class CompilerVisitor
        readable var _cprogram: CProgram
 
        # Create a new CompilerVisitor based on a module
-       init(module: MMModule, cp: CProgram)
+       init(mod: MMModule, cp: CProgram)
        do
-               _module = module
+               _mmmodule = mod
                _cprogram = cp
                _program = cp.program
 
@@ -277,7 +277,7 @@ redef class MMLocalProperty
        do
                var cname = _cname_cache
                if cname == null then
-                       cname = cmangle(module.name, local_class.name, name)
+                       cname = cmangle(mmmodule.name, local_class.name, name)
                        _cname_cache = cname
                end
                return cname