modelize: add and use method mpropdef2node

[nit.git] / src / nitls.nit

diff --git a/src/nitls.nit b/src/nitls.nit
index 5c375ad..cde9656 100644 (file)
--- a/src/nitls.nit
+++ b/src/nitls.nit
@@ -31,7 +31,7 @@ class ProjTree
                        if opt_paths then
                                return o.filepath.as(not null)
                        else
-                               return "{o.name} ({o.filepath})"
+                               return "{o.name} ({o.filepath.to_s})"
                        end
                else if o isa ModulePath then
                        if opt_paths then
@@ -46,14 +46,12 @@ class ProjTree
 end
 
 var tc = new ToolContext
-var model = new Model
-var mb = new ModelBuilder(model, tc)
 
 var opt_keep = new OptionBool("Ignore errors and files that are not a Nit source file", "-k", "--keep")
 var opt_recursive = new OptionBool("Process directories recussively", "-r", "--recursive")
 var opt_tree = new OptionBool("List source files in their groups and projects", "-t", "--tree")
 var opt_source = new OptionBool("List source files", "-s", "--source")
-var opt_project = new OptionBool("List projects paths (default)", "-p", "--project")
+var opt_project = new OptionBool("List projects paths (default)", "-P", "--project")
 var opt_depends = new OptionBool("List dependencies of given modules", "-d", "--depends")
 var opt_make = new OptionBool("List dependencies suitable for a rule in a Makefile. Alias for -d, -p and -s", "-M")
 var opt_paths = new OptionBool("List only path (instead of name + path)", "-p", "--path")
@@ -75,6 +73,11 @@ if sum > 1 then
        exit 1
 end
 
+tc.keep_going = opt_keep.value
+
+var model = new Model
+var mb = new ModelBuilder(model, tc)
+
 if opt_depends.value then
        if opt_recursive.value then
                print "-M incompatible with -r"
@@ -105,7 +108,7 @@ else
        for a in files do
                var mp = mb.identify_file(a)
                if mp == null then
-                       if not opt_keep.value then tc.check_errors
+                       tc.check_errors
                end
        end
 end