From b341e70834a89193080bb1f15fe5bfa793d62ed5 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Wed, 9 Apr 2014 16:35:54 -0400 Subject: [PATCH] modelbuilder: use qualified name in imports to import things import foo::bar Signed-off-by: Jean Privat --- src/modelbuilder.nit | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/modelbuilder.nit b/src/modelbuilder.nit index 51d2886..1db6a04 100644 --- a/src/modelbuilder.nit +++ b/src/modelbuilder.nit @@ -602,8 +602,15 @@ class ModelBuilder if not aimport isa AStdImport then continue end + var mgroup = mmodule.mgroup + if aimport.n_name.n_quad != null then mgroup = null # Start from top level + for grp in aimport.n_name.n_path do + var path = search_mmodule_by_name(grp, mgroup, grp.text) + if path == null then return # Skip error + mgroup = path.mgroup + end var mod_name = aimport.n_name.n_id.text - var sup = self.get_mmodule_by_name(aimport.n_name, mmodule.mgroup, mod_name) + var sup = self.get_mmodule_by_name(aimport.n_name, mgroup, mod_name) if sup == null then continue # Skip error aimport.mmodule = sup imported_modules.add(sup) -- 1.7.9.5