From: Zachary Snow <zach@zachjs.com>
Date: Fri, 21 Aug 2020 00:15:08 +0000 (-0400)
Subject: Module name scope support
X-Git-Tag: working-ls180~284^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6127f227880af506d806179ac622aba44c35fd4b;p=yosys.git

Module name scope support
---

diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 7f9795d29..19dd5af10 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -1597,6 +1597,13 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
 	if (type == AST_IDENTIFIER) {
 		if (current_scope.count(str) == 0) {
 			AstNode *current_scope_ast = (current_ast_mod == nullptr) ? current_ast : current_ast_mod;
+			const std::string& mod_scope = current_scope_ast->str;
+			if (str[0] == '\\' && str.substr(0, mod_scope.size()) == mod_scope) {
+				std::string new_str = "\\" + str.substr(mod_scope.size() + 1);
+				if (current_scope.count(new_str)) {
+					str = new_str;
+				}
+			}
 			for (auto node : current_scope_ast->children) {
 				//log("looking at mod scope child %s\n", type2str(node->type).c_str());
 				switch (node->type) {
diff --git a/tests/simple/generate.v b/tests/simple/generate.v
index dcd450e47..12327b36e 100644
--- a/tests/simple/generate.v
+++ b/tests/simple/generate.v
@@ -223,6 +223,10 @@ module gen_test8;
 				`ASSERT(A.x == 2)
 				`ASSERT(A.C.x == 1)
 				`ASSERT(A.B.x == 0)
+				`ASSERT(gen_test8.x == 3)
+				`ASSERT(gen_test8.A.x == 2)
+				`ASSERT(gen_test8.A.C.x == 1)
+				`ASSERT(gen_test8.A.B.x == 0)
 			end
 			begin : C
 				wire [1:0] x = 2'b01;
@@ -230,12 +234,20 @@ module gen_test8;
 				`ASSERT(A.x == 2)
 				`ASSERT(A.C.x == 1)
 				`ASSERT(A.B.x == 0)
+				`ASSERT(gen_test8.x == 3)
+				`ASSERT(gen_test8.A.x == 2)
+				`ASSERT(gen_test8.A.C.x == 1)
+				`ASSERT(gen_test8.A.B.x == 0)
 			end
 			assign x = B.x ^ 2'b11 ^ C.x;
 			`ASSERT(x == 2)
 			`ASSERT(A.x == 2)
 			`ASSERT(A.C.x == 1)
 			`ASSERT(A.B.x == 0)
+			`ASSERT(gen_test8.x == 3)
+			`ASSERT(gen_test8.A.x == 2)
+			`ASSERT(gen_test8.A.C.x == 1)
+			`ASSERT(gen_test8.A.B.x == 0)
 		end
 	endgenerate
 
@@ -243,4 +255,8 @@ module gen_test8;
 	`ASSERT(A.x == 2)
 	`ASSERT(A.C.x == 1)
 	`ASSERT(A.B.x == 0)
+	`ASSERT(gen_test8.x == 3)
+	`ASSERT(gen_test8.A.x == 2)
+	`ASSERT(gen_test8.A.C.x == 1)
+	`ASSERT(gen_test8.A.B.x == 0)
 endmodule