Merge branch 'better-locate' into wip

[nit.git] / src / syntax / syntax.nit

diff --git a/src/syntax/syntax.nit b/src/syntax/syntax.nit
index 0cbb402..aa17066 100644 (file)
--- a/src/syntax/syntax.nit
+++ b/src/syntax/syntax.nit
@@ -25,7 +25,7 @@ import icode_generation
 
 # Loader of nit source files
 class SrcModuleLoader
-special ModuleLoader
+       super ModuleLoader
        redef type MODULE: MMSrcModule
 
        redef fun file_type do return "nit"
@@ -39,10 +39,11 @@ special ModuleLoader
                        break
                end
                if not name_is_valid then
-                       context.error( null, "{filename}: Error package name \"{name}\", must start with a lower case letter and contain only letters, digits and '_'." )
+                       context.error( null, "{filename}: Error module name \"{name}\", must start with a lower case letter and contain only letters, digits and '_'." )
                end
 
-               var lexer = new Lexer(file, filename)
+               var source = new SourceFile(filename, file)
+               var lexer = new Lexer(source)
                var parser = new Parser(lexer)
                var node_tree = parser.parse
                if node_tree.n_base == null then
@@ -52,7 +53,7 @@ special ModuleLoader
                end
                var node_module = node_tree.n_base
                assert node_module != null
-               var module_loc = new Location.with_file(filename)
+               var module_loc = new Location.with_file(source)
                var mod = new MMSrcModule(context, node_module, dir, name, module_loc)
                return mod
        end