From f7aa88e0feb14e80e9382e3cd77d453df0358278 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Wed, 29 Jan 2014 15:33:23 -0500 Subject: [PATCH] nitx: use projects instead of owner Change-Id: I7ffbf47d81b4ed1939902ee54d514ed0e9d57095 Signed-off-by: Jean Privat --- src/nitx.nit | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/nitx.nit b/src/nitx.nit index 4b5183f..84c0815 100644 --- a/src/nitx.nit +++ b/src/nitx.nit @@ -370,16 +370,16 @@ end redef class MModule super IndexMatch # prototype of the module - # module ownername::name + # module name private fun prototype: String do return "module {name.bold}" # namespace of the module - # ownername::name + # project::name private fun namespace: String do - if public_owner == null then + if mgroup == null or mgroup.mproject.name == self.name then return self.name else - return "{public_owner.namespace}::{self.name}" + return "{mgroup.mproject}::{self.name}" end end @@ -408,7 +408,7 @@ redef class MModule # imported modules var imports = new Array[MModule] for mmodule in in_importation.direct_greaters.to_a do - if not in_nesting.direct_greaters.has(mmodule) then imports.add(mmodule) + imports.add(mmodule) end if not imports.is_empty then sorter.sort(imports) @@ -421,19 +421,6 @@ redef class MModule end pager.indent = pager.indent - 1 end - # nested modules - var nested = in_nesting.direct_greaters.to_a - if not nested.is_empty then - sorter.sort(nested) - pager.add("") - pager.add("== nested modules".bold) - pager.indent = pager.indent + 1 - for mmodule in nested do - pager.add("") - mmodule.preview(index, pager) - end - pager.indent = pager.indent - 1 - end # mclassdefs var csorter = new MClassDefNameSorter var intros = new Array[MClassDef] -- 1.7.9.5