nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model: add `full_name` to entities that miss one
[nit.git]
/
src
/
model
/
model_viz.nit
diff --git
a/src/model/model_viz.nit
b/src/model/model_viz.nit
index
f8c0016
..
bdb8373
100644
(file)
--- a/
src/model/model_viz.nit
+++ b/
src/model/model_viz.nit
@@
-26,8
+26,6
@@
class MProjectTree
# The model where to look for information
var model: Model
# The model where to look for information
var model: Model
- init(model: Model) do self.model = model
-
redef fun display(a) do
if a isa MGroup then
if a.parent == null then return "{a.mproject.name} ({a.filepath.to_s})"
redef fun display(a) do
if a isa MGroup then
if a.parent == null then return "{a.mproject.name} ({a.filepath.to_s})"
@@
-68,13
+66,13
@@
private class LinexComparator
var mins = new HashMap [MGroup, nullable MModule]
var maxs = new HashMap [MGroup, nullable MModule]
var mins = new HashMap [MGroup, nullable MModule]
var maxs = new HashMap [MGroup, nullable MModule]
- fun min(o: Object): nullable MModule do
+ fun mini(o: Object): nullable MModule do
if o isa MModule then return o
assert o isa MGroup
if not mins.has_key(o) then computeminmax(o)
return mins[o]
end
if o isa MModule then return o
assert o isa MGroup
if not mins.has_key(o) then computeminmax(o)
return mins[o]
end
- fun max(o: Object): nullable MModule do
+ fun maxi(o: Object): nullable MModule do
if o isa MModule then return o
assert o isa MGroup
if not maxs.has_key(o) then computeminmax(o)
if o isa MModule then return o
assert o isa MGroup
if not maxs.has_key(o) then computeminmax(o)
@@
-87,14
+85,14
@@
private class LinexComparator
return
end
var subs = tree.sub[o]
return
end
var subs = tree.sub[o]
- var minres = min(subs.first)
- var maxres = max(subs.first)
+ var minres = mini(subs.first)
+ var maxres = maxi(subs.first)
var order = minres.model.mmodule_importation_hierarchy
for o2 in subs do
var order = minres.model.mmodule_importation_hierarchy
for o2 in subs do
- var c = min(o2)
+ var c = mini(o2)
if c == null then continue
if minres == null or order.compare(minres, c) > 0 then minres = c
if c == null then continue
if minres == null or order.compare(minres, c) > 0 then minres = c
- c = max(o2)
+ c = maxi(o2)
if c == null then continue
if maxres == null or order.compare(maxres, c) < 0 then maxres = c
end
if c == null then continue
if maxres == null or order.compare(maxres, c) < 0 then maxres = c
end
@@
-103,8
+101,8
@@
private class LinexComparator
#if minres != maxres then print "* {o} {minres}..{maxres}"
end
redef fun compare(a,b) do
#if minres != maxres then print "* {o} {minres}..{maxres}"
end
redef fun compare(a,b) do
- var ma = min(a)
- var mb = min(b)
+ var ma = mini(a)
+ var mb = mini(b)
if ma == null then
if mb == null then return 0 else return -1
else if mb == null then
if ma == null then
if mb == null then return 0 else return -1
else if mb == null then