Second fix re issue #20 in xml_reader

fvutils · Sep 28, 2024 · 0723c21 · 0723c21
1 parent da86ebb
commit 0723c21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/ucis/merge/db_merger.py b/src/ucis/merge/db_merger.py
@@ -109,9 +109,7 @@ def _merge_covergroup(self, dst_cg, src_cg_l):
         self._merge_crosses(dst_cg, dst_cp_m, src_cg_l)
 
         self._merge_coverinsts(dst_cg, src_cg_l)
-
-        pass
-
+
     def _merge_coverinsts(self, dst_cg, src_cg_l):
 
         cg_i_m = {}

diff --git a/src/ucis/xml/xml_reader.py b/src/ucis/xml/xml_reader.py
@@ -343,16 +343,16 @@ def populateCoverpointType(self, cp_t, cp_bin_m):
                 kind)
 
     def readCrossInst(self, cg_i, cr_e, cr_type_i, cp_m):
-        crossExpr = next(cr_e.iter("crossExpr"))
         name = self.getAttr(cr_e, "name", "<unknown>")
 
         cp_l = []
-        for cp_n in crossExpr.text.split(','):
+        for crossExpr in cr_e.iter("crossExpr"):
+            cp_n = crossExpr.text.strip()
             logging.debug("cp_n=\"" + cp_n + "\"")
             if cp_n in cp_m.keys():
                 cp_l.append(cp_m[cp_n])
             else:
-                raise Exception("Cross " + name + " references missing coverpoint " + cp_n)
+                raise Exception("Cross " + cp_n + " references missing coverpoint " + cp_n)
 
         srcinfo = None