specware 1.3.7__tar.gz → 1.3.8__tar.gz

{specware-1.3.7 → specware-1.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: specware
-Version: 1.3.7
+Version: 1.3.8
 Summary: Provides utilities to specify software.
 Keywords: certification,documentation,markdown,qualification,requirements-management,traceability
 Author: The specware Authors

{specware-1.3.7 → specware-1.3.8}/pyproject.toml

@@ -4,7 +4,7 @@
 
 [project]
 name = "specware"
-version = "1.3.7"
+version = "1.3.8"
 description = "Provides utilities to specify software."
 authors = [
     {name = "The specware Authors", email = "specthings@embedded-brains.de"}

{specware-1.3.7 → specware-1.3.8}/src/specware/interface.py

@@ -78,9 +78,15 @@ def _get_domains(item: Item) -> set[str]:
     return domains
 
 
+def _is_hosted_in_second_domain(item: Item) -> bool:
+    return any(True for _ in item.links_to_children("interface-host")) or (
+        bool(get_register_block_hosts(item))
+        and any(True for _ in item.parents("interface-placement")))
+
+
 def _get_ingroups_of_node(item: Item, domain: Item) -> _ItemMap:
     ingroups = _get_ingroups(item)
-    if get_register_block_hosts(item):
+    if _is_hosted_in_second_domain(item):
         return {
             uid: group
             for uid, group in ingroups.items()
@@ -700,8 +706,10 @@ class _Node:
             ctx.regs[name] = {}
             ctx.regs[name]["size"] = link.item["register-block-size"]
             ctx.regs[name]["type"] = link.item["name"]
+            host = self.header_file.get_host(
+                link.item) if _is_hosted_in_second_domain(link.item) else None
             ctx.regs[name]["group"] = get_register_block_identifier(
-                link.item, self.header_file.get_host(link.item))
+                link.item, host)
 
     def _get_register_member_info(self, ctx: _RegisterMemberContext) -> None:
         offset = -1

{specware-1.3.7 → specware-1.3.8}/src/specware/rtems.py

@@ -56,12 +56,6 @@ _ENABLEMENT_CHILD_ROLES = ("interface-host", "interface-group-member",
                            "register-block-base", "register-block-host",
                            "register-block-include")
 
-# A host of an interface with a placement does not decide its enablement.  The
-# placement serves the domain of the placement whatever the hosts are.
-_ENABLEMENT_PLACED_CHILD_ROLES = tuple(role for role in _ENABLEMENT_CHILD_ROLES
-                                       if role not in ("interface-host",
-                                                       "register-block-host"))
-
 
 def recursive_is_enabled(enabled_set: EnabledSet, item: Item) -> bool:
     """
@@ -71,13 +65,10 @@ def recursive_is_enabled(enabled_set: EnabledSet, item: Item) -> bool:
     if not item.is_enabled(enabled_set):
         return False
     result = True
-    if any(True for _ in item.parents("interface-placement")):
-        child_roles = _ENABLEMENT_PLACED_CHILD_ROLES
-    else:
-        child_roles = _ENABLEMENT_CHILD_ROLES
     for parent in itertools.chain(
             item.parents(_ENABLEMENT_ROLES, is_link_enabled=link_is_enabled),
-            item.children(child_roles, is_link_enabled=link_is_enabled)):
+            item.children(_ENABLEMENT_CHILD_ROLES,
+                          is_link_enabled=link_is_enabled)):
         if recursive_is_enabled(enabled_set, parent):
             return True
         result = False