syntax: 'meth' -> 'fun', 'attr' -> 'var'

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

diff --git a/src/compiling/compiling.nit b/src/compiling/compiling.nit
index 7bfe046..a063ca5 100644 (file)
--- a/src/compiling/compiling.nit
+++ b/src/compiling/compiling.nit
@@ -26,7 +26,7 @@ redef class MMSrcModule
        # Compile the program
        # Generate all sep files (_sep.[ch]), the main file (_table.c) and the build file (_build.sh)
        # Then execute the build.sh
-       meth compile_prog_to_c(tc: ToolContext)
+       fun compile_prog_to_c(tc: ToolContext)
        do
                for m in mhe.greaters_and_self do
                        assert m isa MMSrcModule
@@ -78,10 +78,9 @@ redef class MMSrcModule
        end
 
        # Compile the main file
-       private meth compile_main(tc: ToolContext, ga: GlobalAnalysis)
+       private fun compile_main(tc: ToolContext, ga: GlobalAnalysis)
        do
-               var v = new CompilerVisitor(self, tc)
-               v.global_analysis = ga
+               var v = new GlobalCompilerVisitor(self, tc, ga)
                v.add_decl("#include <nit_common.h>")
                compile_tables_to_c(v)
                compile_main_part(v)
@@ -95,10 +94,9 @@ redef class MMSrcModule
        end
 
        # Compile the sep files (of the current module only)
-       private meth compile_separate_module(tc: ToolContext, ga: GlobalAnalysis)
+       private fun compile_separate_module(tc: ToolContext, ga: GlobalAnalysis)
        do
-               var v = new CompilerVisitor(self, tc)
-               v.global_analysis = ga
+               var v = new GlobalCompilerVisitor(self, tc, ga)
                v.add_decl("#include <nit_common.h>")
                var native_name = filename.strip_extension(".nit")
                native_name += ("_nit.h")