From bb85d55cfbf74818525bfb2563b74dce818b7883 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Fri, 9 Oct 2015 15:46:06 -0400 Subject: [PATCH] nitls: use alpha_comparator Signed-off-by: Jean Privat --- src/nitls.nit | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/src/nitls.nit b/src/nitls.nit index cf7c609..7ed5e40 100644 --- a/src/nitls.nit +++ b/src/nitls.nit @@ -87,24 +87,6 @@ class ProjTree end end -class AlphaEntityComparator - super Comparator - fun nameof(a: COMPARED): String - do - if a isa MGroup then - return a.name - else if a isa ModulePath then - return a.name - else - abort - end - end - redef fun compare(a,b) - do - return nameof(a) <=> nameof(b) - end -end - var tc = new ToolContext var opt_keep = new OptionBool("Ignore errors and files that are not a Nit source file", "-k", "--keep") @@ -189,7 +171,6 @@ if opt_depends.value then end var ot = new ProjTree(tc) -var sorter = new AlphaEntityComparator if opt_tree.value then ot.opt_paths = opt_paths.value var mgroups = new HashSet[MGroup] @@ -205,12 +186,12 @@ if opt_tree.value then ot.add(pa, g) end end - ot.sort_with(sorter) + ot.sort_with(alpha_comparator) ot.write_to(stdout) end if opt_source.value then - sorter.sort(mmodules) + alpha_comparator.sort(mmodules) for mp in mmodules do if opt_paths.value then print mp.filepath.as(not null) @@ -228,7 +209,7 @@ if opt_package.value then mpackages.add p end - sorter.sort(mpackages) + alpha_comparator.sort(mpackages) for p in mpackages do var g = p.root.as(not null) var path = g.filepath.as(not null) -- 1.7.9.5