specware 1.2.25__tar.gz → 1.2.26__tar.gz

{specware-1.2.25 → specware-1.2.26}/PKG-INFO

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

{specware-1.2.25 → specware-1.2.26}/pyproject.toml

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

{specware-1.2.25 → specware-1.2.26}/src/specware/applconfig.py

@@ -308,7 +308,7 @@ def _get_value_doxygen_url(
     ctx: ItemGetValueContext,
     get_value: Callable[[ItemGetValueContext],
                         str] = _get_value) -> Optional[str]:
-    for ref in ctx.item["references"]:
+    for ref in ctx.item.get("references", []):
         if ref["type"] == "url":
             return f"<a href=\"{ref['identifier']}\">{get_value(ctx)}</a>"
     return None

{specware-1.2.25 → specware-1.2.26}/src/specware/cliview.py

@@ -97,14 +97,23 @@ def _substitute(item: Item, mapper: ItemMapper, prefix: str,
             _substitute(item, mapper, f"{prefix}[{index}]", element)
 
 
+def _link_info(link: Optional[Link]) -> str:
+    if link is None:
+        return ""
+    info = f", role={link.role}"
+    for key in sorted(key for key in link.data if key not in ("role", "uid")):
+        info += f", {key}={link[key]}"
+    return info
+
+
 def _visit_item(item: Item, mapper: ItemMapper, level: int,
-                role: Optional[str], validated_filter: str) -> bool:
+                link: Optional[Link], validated_filter: str) -> bool:
     validated = item.view.get("validated", True)
     if validated_filter == "yes" and not validated:
         return False
     if validated_filter == "no" and validated:
         return False
-    role_info = "" if role is None else f", role={role}"
+    role_info = _link_info(link)
     print(
         f"{'  ' * level}{item.uid} (type={item.type}{role_info}{_info(item)})")
     _substitute(item, mapper, "", item.data)
@@ -114,29 +123,40 @@ def _visit_item(item: Item, mapper: ItemMapper, level: int,
 def _view_interface_placment(item: Item, mapper: ItemMapper, level: int,
                              validated_filter: str) -> None:
     for link in item.links_to_children("interface-placement"):
-        if _visit_item(link.item, mapper, level, link.role, validated_filter):
+        if _visit_item(link.item, mapper, level, link, validated_filter):
             _view_interface_placment(link.item, mapper, level + 1,
                                      validated_filter)
 
 
-def _view(item: Item, mapper: ItemMapper, level: int, role: Optional[str],
+def _view(item: Item, mapper: ItemMapper, level: int, link: Optional[Link],
           validated_filter: str) -> None:
-    if not _visit_item(item, mapper, level, role, validated_filter):
+    if not _visit_item(item, mapper, level, link, validated_filter):
         return
-    for child in item.children("validation"):
-        _visit_item(child, mapper, level + 1, "validation", validated_filter)
-        for child_2 in child.children("runtime-measurement-request"):
-            _visit_item(child_2, mapper, level + 2,
-                        "runtime-measurement-request", validated_filter)
+    for link_2 in item.links_to_children("validation"):
+        _visit_item(link_2.item, mapper, level + 1, link_2, validated_filter)
+        for link_3 in link_2.item.links_to_children(
+                "runtime-measurement-request"):
+            _visit_item(link_3.item, mapper, level + 2, link_3,
+                        validated_filter)
+    for link_2 in item.links_to_children("requirement-disposition"):
+        _visit_item(link_2.item, mapper, level + 1, link_2, validated_filter)
+    # The cited work appears under the requirement which references it.  A
+    # refinement of the requirement places it in the tree.
+    for link_2 in item.links_to_parents("reference"):
+        _visit_item(link_2.item, mapper, level + 1, link_2, validated_filter)
     _view_interface_placment(item, mapper, level + 1, validated_filter)
-    for link in item.links_to_children(_CHILD_ROLES):
-        _view(link.item, mapper, level + 1, link.role, validated_filter)
-    for link in item.links_to_parents(_PARENT_ROLES):
-        _view(link.item, mapper, level + 1, link.role, validated_filter)
+    for link_2 in item.links_to_children(_CHILD_ROLES):
+        _view(link_2.item, mapper, level + 1, link_2, validated_filter)
+    for link_2 in item.links_to_parents(_PARENT_ROLES):
+        _view(link_2.item, mapper, level + 1, link_2, validated_filter)
 
 
 def _validation_count(item: Item) -> int:
-    return len(list(child for child in item.children("validation")))
+    """ Count the evidence items of an item. """
+    return len(
+        list(
+            itertools.chain(item.children("validation"),
+                            item.children("requirement-disposition"))))
 
 
 def _no_enforcement(item_cache: ItemCache) -> None:

{specware-1.2.25 → specware-1.2.26}/src/specware/interfacemapper.py

@@ -65,7 +65,7 @@ def _get_value_sphinx_ref(ctx: ItemGetValueContext,
                           get_value: ItemGetValue,
                           postfix: str = "",
                           prefix: str = "") -> str:
-    for ref in ctx.item["references"]:
+    for ref in ctx.item.get("references", []):
         ref_type = ref["type"]
         identifier = ref["identifier"]
         name_ref = f"`{prefix}{ctx.value[ctx.key]}{postfix} <{identifier}>`"
@@ -85,7 +85,7 @@ def _get_value_sphinx_unspecified_function(ctx: ItemGetValueContext) -> str:
 
 
 def _get_value_sphinx_unspecified_group(ctx: ItemGetValueContext) -> str:
-    for ref in ctx.item["references"]:
+    for ref in ctx.item.get("references", []):
         ref_type = ref["type"]
         identifier = ref["identifier"]
         if ref_type == "document" and ref["name"] == "c-user":
@@ -213,7 +213,7 @@ def _get_value_markdown_ref(ctx: ItemGetValueContext,
                             get_value: ItemGetValue,
                             postfix: str = "",
                             prefix: str = "") -> str:
-    for ref in ctx.item["references"]:
+    for ref in ctx.item.get("references", []):
         ref_type = ref["type"]
         identifier = ref["identifier"]
         name = f"{prefix}{ctx.value[ctx.key]}{postfix}"
@@ -233,7 +233,7 @@ def _get_value_markdown_unspecified_function(ctx: ItemGetValueContext) -> str:
 
 
 def _get_value_markdown_unspecified_group(ctx: ItemGetValueContext) -> str:
-    for ref in ctx.item["references"]:
+    for ref in ctx.item.get("references", []):
         ref_type = ref["type"]
         identifier = ref["identifier"]
         if ref_type == "document" and ref["name"] == "c-user":

{specware-1.2.25 → specware-1.2.26}/src/specware/rtems.py

@@ -109,12 +109,16 @@ _CONTAINER_TYPE = ("interface/domain", "interface/header-file",
 # placements would lead to an infinite recursion in _validate_tree().  In the
 # second pass using _validate_containers() the interface domain and header file
 # validations are fixed.
+#
+# A disposition states the evidence of its requirement and needs none of its
+# own.
 _VALIDATION_LEAF = tuple(
-    itertools.chain(_VALIDATION_METHOD.keys(), _CONTAINER_TYPE))
+    itertools.chain(_VALIDATION_METHOD.keys(), _CONTAINER_TYPE,
+                    ("requirement-disposition", )))
 
 _CHILD_ROLES = ("requirement-refinement", "interface-ingroup",
                 "interface-ingroup-hidden", "interface-function", "test-case",
-                "validation")
+                "validation", "requirement-disposition")
 
 _PARENT_ROLES = ("function-implementation", "interface-enumerator",
                  "performance-runtime-limits")
@@ -151,7 +155,8 @@ def gather_related_items(root: Item) -> list[Item]:
 # file which contains a member of that group.  The application configuration
 # aggregates the members of its groups, it descends on its own.
 _EXPORT_CHILD_ROLES = ("interface-function", "interface-placement",
-                       "requirement-refinement", "test-case", "validation")
+                       "requirement-disposition", "requirement-refinement",
+                       "test-case", "validation")
 
 _EXPORT_PARENT_ROLES = _PARENT_ROLES + ("constraint", "errno",
                                         "register-block-include")