Rename REAMDE to README.md

[nit.git] / src / nitls.nit

diff --git a/src/nitls.nit b/src/nitls.nit
index c28ecb1..8755bfe 100644 (file)
--- a/src/nitls.nit
+++ b/src/nitls.nit
@@ -18,7 +18,6 @@
 module nitls
 
 import modelbuilder
-intrude import loader
 import ordered_tree
 import console
 
@@ -130,11 +129,11 @@ end
 
 var sum = opt_tree.value.to_i + opt_source.value.to_i + opt_project.value.to_i
 if sum > 1 then
-       print "Error: options --tree, --source, and --project are exclusives."
+       print "Error: options --tree, --source, and --project are exclusive."
        print tc.tooldescription
        exit 1
 end
-
+if sum == 0 then opt_project.value = true
 tc.keep_going = opt_keep.value
 
 var model = new Model
@@ -145,11 +144,10 @@ var files
 if opt_recursive.value then
        files = new Array[String]
        for d in tc.option_context.rest do
-               var pipe = new IProcess("find", d, "-name", "*.nit")
+               var pipe = new ProcessReader("find", d, "-name", "*.nit")
                while not pipe.eof do
                        var l = pipe.read_line
                        if l == "" then break # last line
-                       l = l.substring(0,l.length-1) # strip last oef
                        files.add l
                end
                pipe.close
@@ -160,19 +158,50 @@ else
        files = tc.option_context.rest
 end
 
+if sum == 0 then
+       # If one of the file is a group, default is `opt_tree` instead of `opt_project`
+       for a in files do
+               var g = mb.get_mgroup(a)
+               if g != null then
+                       opt_tree.value = true
+                       opt_project.value = false
+                       break
+               end
+       end
+end
+
+# Identify all relevant files
 for a in files do
+       var g = mb.get_mgroup(a)
        var mp = mb.identify_file(a)
-       tc.check_errors
-       if mp != null and not opt_paths.value then
+       if g != null and not opt_project.value then
+               mb.visit_group(g)
+       end
+       if g == null and mp == null then
+               # not a group not a module, then look at files in the directory
+               var fs = a.files
+               for f in fs do
+                       g = mb.get_mgroup(a/f)
+                       if g != null and not opt_project.value then
+                               mb.visit_group(g)
+                       end
+                       mp = mb.identify_file(a/f)
+                       #print "{a/f}: {mp or else "?"}"
+               end
+       end
+end
+
+# Load modules to get more informations
+for mp in mb.identified_files do
+       if not opt_paths.value or opt_depends.value then
                var mm = mb.load_module(mp.filepath)
                if mm != null and opt_depends.value then
                        mb.build_module_importation(mm)
                end
-               tc.check_errors
        end
 end
+#tc.check_errors
 
-if sum == 0 then opt_project.value = true
 
 var ot = new ProjTree(tc)
 var sorter = new AlphaEntityComparator