specware 1.2.13__tar.gz → 1.2.14__tar.gz

{specware-1.2.13 → specware-1.2.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: specware
-Version: 1.2.13
+Version: 1.2.14
 Summary: Provides utilities to specify software.
 Keywords: certification,documentation,markdown,qualification,requirements-management,traceability
 Author: The specware Authors
@@ -20,7 +20,7 @@ Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Software Development :: Testing :: Acceptance
 Classifier: Topic :: Text Processing :: Markup
 Classifier: Typing :: Typed
-Requires-Dist: specitems>=1.6.5
+Requires-Dist: specitems>=1.6.9
 Requires-Python: >=3.11
 Project-URL: Source Code, https://github.com/specthings/specware
 Project-URL: Bug Tracker, https://github.com/specthings/specware/issues

{specware-1.2.13 → specware-1.2.14}/pyproject.toml

@@ -4,7 +4,7 @@
 
 [project]
 name = "specware"
-version = "1.2.13"
+version = "1.2.14"
 description = "Provides utilities to specify software."
 authors = [
     {name = "The specware Authors", email = "specthings@embedded-brains.de"}
@@ -13,7 +13,7 @@ license = "BSD-2-Clause"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
-    "specitems >=1.6.5",
+    "specitems >=1.6.9",
 ]
 keywords = [
   "certification",

{specware-1.2.13 → specware-1.2.14}/src/specware/contentc.py

@@ -590,7 +590,7 @@ def get_value_hash(ctx: ItemGetValueContext) -> Any:
 
 def get_value_params(ctx: ItemGetValueContext) -> Any:
     """ Get the value formatted as a parameter. """
-    return f"``{ctx.value[ctx.key]}``"
+    return f"`{ctx.value[ctx.key]}`"
 
 
 def forward_declaration(item: Item) -> str:

{specware-1.2.13 → specware-1.2.14}/src/specware/transitionmap.py

@@ -378,19 +378,6 @@ class TransitionMap:
             map_idx //= count
         return ", ".join(reversed(conditions))
 
-    def map_idx_to_unconditional_pre_co_states(
-            self, map_idx: int) -> tuple[int, ...]:
-        """
-        Map the transition map index and the associated pre-condition state
-        indices.
-        """
-        co_states = []
-        for condition in reversed(self._item["pre-conditions"]):
-            count = len(condition["states"])
-            co_states.append(int(map_idx % count))
-            map_idx //= count
-        return tuple(reversed(co_states))
-
     def map_idx_to_pre_co_states(
             self, map_idx: int, pre_cond_na: tuple[int,
                                                    ...]) -> tuple[int, ...]:
@@ -492,10 +479,20 @@ class TransitionMap:
             f"{{{self._map_index_to_pre_conditions(map_idx)}}}")
 
     def _make_pre_cond_na(self, map_idx: int, the_pre_cond_na: Any,
-                          skip: list[int]) -> int:
+                          skip: list[int],
+                          resolved_pre_cond_na: tuple[int, ...]) -> int:
         if isinstance(the_pre_cond_na, int):
             return the_pre_cond_na
-        pre_co_states = self.map_idx_to_unconditional_pre_co_states(map_idx)
+        # Use the pre-condition states already resolved for earlier
+        # pre-conditions (in declaration order) so that a pre-condition
+        # which is N/A because of one of its ancestors is seen as N/A here
+        # as well, even if this pre-condition's own applicable/
+        # not-applicable/skip clause only names its direct parent.  This
+        # way, the N/A status transitively propagates along the whole
+        # dependency chain instead of having to be repeated in every
+        # dependent clause.
+        pre_co_states = self.map_idx_to_pre_co_states(map_idx,
+                                                      resolved_pre_cond_na)
         ctx = _CondExpContext(self, map_idx, pre_co_states, tuple(), -1, None)
         if _cond_bool_exp(
                 ctx,
@@ -513,11 +510,12 @@ class TransitionMap:
         # pylint: disable=too-many-arguments
         # pylint: disable=too-many-positional-arguments
         skip = [skip_post_cond[0]]
-        pre_cond_na = tuple(
-            self._make_pre_cond_na(map_idx, the_pre_cond_na, skip)
-            for the_pre_cond_na in pre_cond_na)
-        variant = Transition(desc_idx, enabled_by, skip[0], pre_cond_na,
-                             skip_post_cond[1:])
+        resolved_pre_cond_na = [0] * len(pre_cond_na)
+        for co_idx, the_pre_cond_na in enumerate(pre_cond_na):
+            resolved_pre_cond_na[co_idx] = self._make_pre_cond_na(
+                map_idx, the_pre_cond_na, skip, tuple(resolved_pre_cond_na))
+        variant = Transition(desc_idx, enabled_by, skip[0],
+                             tuple(resolved_pre_cond_na), skip_post_cond[1:])
         for co_idx in range(len(variant.post_cond)):
             variant = self._map_post_cond(map_idx, co_idx, variant)
         return variant

{specware-1.2.13 → specware-1.2.14}/src/specware/validation.py

@@ -38,9 +38,9 @@ from specitems import (create_unique_link, Item, ItemCache,
 
 from .build import get_build_base_directory
 from .contentc import (CContent, CInclude, enabled_by_to_exp, ExpressionMapper,
-                       GenericContent, get_integer_type, get_value_params,
-                       get_value_doxygen_group, get_value_doxygen_function,
-                       get_value_unspecified_type)
+                       GenericContent, get_integer_type, get_value_compound,
+                       get_value_params, get_value_doxygen_group,
+                       get_value_doxygen_function, get_value_unspecified_type)
 from .transitionmap import TransitionMap
 
 _CaseToSuite = dict[str, list["_TestItem"]]
@@ -82,6 +82,8 @@ class _Mapper(ItemMapper):
         self.add_get_value("interface/group:/name", get_value_doxygen_group)
         self.add_get_value("interface/macro:/name", get_value_doxygen_function)
         self.add_get_value("interface/macro:/params/name", get_value_params)
+        self.add_get_value("interface/struct:/name", get_value_compound)
+        self.add_get_value("interface/union:/name", get_value_compound)
         self.add_get_value("interface/unspecified-function:/name",
                            get_value_doxygen_function)
         self.add_get_value("interface/unspecified-struct:/name",
@@ -422,7 +424,7 @@ class _TestItem:
                 content.add_description_block(
                     self.substitute_text(info["brief"]),
                     self.substitute_text(info["description"]))
-                content.add(f"{info['member'].strip()};")
+                content.add(self.substitute_code(f"{info['member'].strip()};"))
             gap = content.gap
         content.gap = gap
         content.add(default_members)