Merge pull request #1009 from veryl-lang/fix_generic_member

Fix member access failure of generic instance
veryl-lang · Oct 10, 2024 · f4e293c · f4e293c
2 parents 4cdbd7a + 547c427
commit f4e293c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/crates/analyzer/src/symbol_table.rs b/crates/analyzer/src/symbol_table.rs
@@ -241,11 +241,19 @@ impl SymbolTable {
                             context.inner = true;
                         }
                         SymbolKind::Instance(ref x) => {
-                            context.namespace = Namespace::default();
-                            for x in &x.type_name {
-                                context.namespace.push(*x);
+                            let path = SymbolPath::new(&x.type_name);
+                            let symbol = self.resolve(&path, &context.namespace)?;
+                            if let SymbolKind::GenericInstance(x) = &symbol.found.kind {
+                                let symbol = self.symbol_table.get(&x.base).unwrap();
+                                context.namespace = symbol.inner_namespace();
+                                context.inner = true;
+                            } else {
+                                context.namespace = Namespace::default();
+                                for x in &x.type_name {
+                                    context.namespace.push(*x);
+                                }
+                                context.inner = true;
                             }
-                            context.inner = true;
                         }
                         SymbolKind::GenericInstance(ref x) => {
                             let symbol = self.symbol_table.get(&x.base).unwrap();

diff --git a/testcases/map/testcases/sv/56_generic_interface.sv.map b/testcases/map/testcases/sv/56_generic_interface.sv.map
diff --git a/testcases/sv/56_generic_interface.sv b/testcases/sv/56_generic_interface.sv
@@ -4,6 +4,11 @@ module veryl_testcase_Module56;
     veryl_testcase___Interface56B__Package56A u2 ();
     veryl_testcase___Interface56B__Package56A u4 ();
     veryl_testcase___Interface56B__Package56B u3 ();
+
+    logic _a;
+    always_comb _a = u0._a;
+    logic _b;
+    always_comb _b = u2._b;
 endmodule
 
 /// Generic interface test for doc comment

diff --git a/testcases/veryl/56_generic_interface.veryl b/testcases/veryl/56_generic_interface.veryl
@@ -4,6 +4,9 @@ module Module56 {
     inst u2: Interface56B::<Package56A>;
     inst u4: Interface56B::<Package56A>;
     inst u3: Interface56B::<>;
+
+    let _a: logic = u0._a;
+    let _b: logic = u2._b;
 }
 
 /// Generic interface test for doc comment