X-Git-Url: http://nitlanguage.org diff --git a/src/nitls.nit b/src/nitls.nit index 9bfafd7..1b492c4 100644 --- a/src/nitls.nit +++ b/src/nitls.nit @@ -18,7 +18,6 @@ module nitls import modelbuilder -intrude import loader import ordered_tree import console @@ -64,7 +63,7 @@ class ProjTree if o.mmodule != null and not o.mmodule.in_importation.direct_greaters.is_empty then var ms = new Array[String] for m in o.mmodule.in_importation.direct_greaters do - if m.mgroup.mproject == o.mmodule.mgroup.mproject then + if m.mgroup.mpackage == o.mmodule.mgroup.mpackage then ms.add m.name else ms.add m.full_name @@ -110,15 +109,16 @@ var tc = new ToolContext 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_tree = new OptionBool("List source files in their groups and packages", "-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_package = new OptionBool("List packages paths (default)", "-P", "--package") 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") -tc.option_context.add_option(opt_keep, opt_recursive, opt_tree, opt_source, opt_project, opt_depends, opt_paths, opt_make) -tc.tooldescription = "Usage: nitls [OPTION]... ...\nLists the projects and/or paths of Nit sources files." +tc.option_context.add_option(opt_keep, opt_recursive, opt_tree, opt_source, opt_package, opt_depends, opt_paths, opt_make) +tc.tooldescription = "Usage: nitls [OPTION]... ...\nLists the packages and/or paths of Nit sources files." +tc.accept_no_arguments = true tc.process_options(args) if opt_make.value then @@ -127,27 +127,27 @@ if opt_make.value then opt_source.value = true end -var sum = opt_tree.value.to_i + opt_source.value.to_i + opt_project.value.to_i +var sum = opt_tree.value.to_i + opt_source.value.to_i + opt_package.value.to_i if sum > 1 then - print "Error: options --tree, --source, and --project are exclusives." + print "Error: options --tree, --source, and --package are exclusive." print tc.tooldescription exit 1 end - +if sum == 0 then opt_package.value = true tc.keep_going = opt_keep.value var model = new Model var mb = new ModelBuilder(model, tc) +if tc.option_context.rest.is_empty then tc.option_context.rest.add "." 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 @@ -158,24 +158,56 @@ 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_package` + for a in files do + var g = mb.get_mgroup(a) + if g != null then + opt_tree.value = true + opt_package.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_package.value then + mb.scan_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_package.value then + mb.scan_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 if opt_tree.value then ot.opt_paths = opt_paths.value - for p in model.mprojects do + for p in model.mpackages do for g in p.mgroups do var pa = g.parent if g.is_interesting then @@ -187,41 +219,54 @@ if opt_tree.value then end end end - ot.sort_with(new AlphaEntityComparator) + ot.sort_with(sorter) ot.write_to(stdout) end if opt_source.value then - var list = new Array[String] - for p in model.mprojects do + var list = new Array[ModulePath] + for p in model.mpackages do for g in p.mgroups do for mp in g.module_paths do - if opt_paths.value then - list.add(mp.filepath) - else - list.add("{g.full_name}/{ot.display(mp)}") - end + list.add mp end end end - alpha_comparator.sort(list) - for l in list do print l + sorter.sort(list) + for mp in list do + if opt_paths.value then + print mp.filepath + else + print "{mp.mgroup.full_name}/{ot.display(mp)}" + end + end end -if opt_project.value then - var list = new Array[String] - for p in model.mprojects do - var path = p.root.filepath.as(not null) +if opt_package.value then + var list = new Array[MGroup] + for p in model.mpackages do + list.add p.root.as(not null) + end + sorter.sort(list) + for g in list do + var path = g.filepath.as(not null) if opt_paths.value then - list.add(path) + print path else + var d = "" + var md = g.mdoc_or_fallback + if md != null then + if tc.opt_no_color.value then + d = ": {md.content.first}" + else + d = ": {md.content.first.green}" + end + end if tc.opt_no_color.value then - list.add("{p.name} ({path})") + print "{g.name}{d} ({path})" else - list.add("{p.name} ({path.yellow})") + print "{g.name}{d} ({path.yellow})" end end end - alpha_comparator.sort(list) - for l in list do print l end