specware 1.3.7__tar.gz → 1.3.9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: specware
-Version: 1.3.7
+Version: 1.3.9
 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.7.0
+Requires-Dist: specitems>=1.7.3
 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.3.7 → specware-1.3.9}/pyproject.toml

@@ -4,7 +4,7 @@
 
 [project]
 name = "specware"
-version = "1.3.7"
+version = "1.3.9"
 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.7.0",
+    "specitems >=1.7.3",
 ]
 keywords = [
   "certification",

{specware-1.3.7 → specware-1.3.9}/src/specware/applconfig.py

@@ -30,13 +30,16 @@ import itertools
 from typing import Any, Callable, Optional
 
 from specitems import (ClangFormatter, ContentContext, EnabledSet,
-                       GenericContent, get_value_plural, Item, ItemCache,
-                       ItemGetValueContext, ItemMapper, TextContent)
+                       GenericContent, get_reference_target, get_value_plural,
+                       Item, ItemCache, ItemGetValueContext, ItemMapper,
+                       TextContent)
 
 from .contentc import (CContent, DEFAULT_ITEM_MARKER, add_item_marker,
                        get_value_double_colon, get_value_doxygen_function,
                        get_value_doxygen_group, get_value_doxygen_ref,
                        get_value_hash, get_value_header_file)
+from .interfacemapper import (add_reference_transformers,
+                              get_interface_reference, get_reference_url)
 from .rtems import is_export_affected
 
 _GROUP_MEMBER_ROLES = ("appl-config-group-member", "interface-ingroup")
@@ -315,12 +318,21 @@ def _get_value_doxygen_url(
     ctx: ItemGetValueContext,
     get_value: Callable[[ItemGetValueContext],
                         str] = _get_value) -> Optional[str]:
-    for ref in ctx.item.get("references", []):
-        if ref["type"] == "url":
-            return f"<a href=\"{ref['identifier']}\">{get_value(ctx)}</a>"
+    target = get_interface_reference(ctx.item)
+    if target is not None:
+        url = get_reference_url(ctx.mapper, target)
+        if url is not None:
+            return f"<a href=\"{url}\">{get_value(ctx)}</a>"
     return None
 
 
+def _get_value_doxygen_reference_location(ctx: ItemGetValueContext) -> str:
+    url = get_reference_url(ctx.mapper, get_reference_target(ctx.item))
+    if url is None:
+        return ctx.value[ctx.key]
+    return f"<a href=\"{url}\">{ctx.value[ctx.key]}</a>"
+
+
 def _get_value_doxygen_unspecified_define(ctx: ItemGetValueContext) -> Any:
     return _get_value_doxygen_url(ctx) or get_value_hash(ctx)
 
@@ -339,6 +351,7 @@ def _get_value_doxygen_unspecfied_type(ctx: ItemGetValueContext) -> Any:
 
 
 def _add_doxygen_get_values(mapper: ItemMapper) -> None:
+    add_reference_transformers(mapper)
     for opt in ["feature-enable", "feature", "initializer", "integer"]:
         name = f"interface/appl-config-option/{opt}:/name"
         mapper.add_get_value(name, get_value_doxygen_ref)
@@ -354,6 +367,8 @@ def _add_doxygen_get_values(mapper: ItemMapper) -> None:
     mapper.add_get_value("interface/union:/name", get_value_double_colon)
     mapper.add_get_value("interface/unspecified-define:/name",
                          _get_value_doxygen_unspecified_define)
+    mapper.add_get_value("interface/unspecified-enumerator:/name",
+                         _get_value_doxygen_unspecified_define)
     mapper.add_get_value("interface/unspecified-function:/name",
                          _get_value_doxygen_unspecified_function)
     mapper.add_get_value("interface/unspecified-group:/name",
@@ -366,6 +381,8 @@ def _add_doxygen_get_values(mapper: ItemMapper) -> None:
                          _get_value_doxygen_unspecfied_type)
     mapper.add_get_value("interface/unspecified-union:/name",
                          _get_value_doxygen_unspecfied_type)
+    mapper.add_get_value("reference-location:/name",
+                         _get_value_doxygen_reference_location)
 
 
 def is_application_configuration_affected(config: dict, item_cache: ItemCache,

{specware-1.3.7 → specware-1.3.9}/src/specware/cliexport.py

@@ -57,13 +57,18 @@ _DOC_FORMAT = {
 }
 
 
-def _bind_context(fmt: str, context: ContentContext) -> tuple[Any, Any, Any]:
+def _bind_context(
+        fmt: str,
+        context: ContentContext,
+        target_document_uid: Optional[str] = None) -> tuple[Any, Any, Any]:
     """
     Bind the context to the content and mapper constructors of the format.
 
     Args:
         fmt: The documentation format.
         context: The content context of a task.
+        target_document_uid: The UID of the target document of the
+            documentation of the task.
 
     Returns:
         The content constructor, the mapper constructor and the interface
@@ -78,7 +83,9 @@ def _bind_context(fmt: str, context: ContentContext) -> tuple[Any, Any, Any]:
                               **kwargs)
 
     return (_create_content, functools.partial(create_mapper, context=context),
-            functools.partial(create_interface_mapper, context=context))
+            functools.partial(create_interface_mapper,
+                              context=context,
+                              target_document_uid=target_document_uid))
 
 
 #: The keys of a task which its configuration object takes not.
@@ -101,7 +108,8 @@ def _generate_appl_config(task: dict, group_uids: list[str],
     # The task produces a Doxygen source and documentation sources, and each
     # kind states its own license.
     create_content, _, create_interface_mapper = _bind_context(
-        args.format, create_content_context(task, provider, "documentation-"))
+        args.format, create_content_context(task, provider, "documentation-"),
+        task.get("target-document-uid"))
     generate_application_configuration(task,
                                        group_uids,
                                        item_cache,
@@ -322,7 +330,7 @@ def _generate_documentation(item_cache: ItemCache, config: Item,
     for task in yield_tasks(config, "interface-documentation"):
         context = create_content_context(task, provider)
         create_content, _, create_interface_mapper = _bind_context(
-            args.format, context)
+            args.format, context, task.get("target-document-uid"))
         generate_interface_documentation(task, item_cache,
                                          create_interface_mapper,
                                          create_content)

{specware-1.3.7 → specware-1.3.9}/src/specware/cliview.py

@@ -33,7 +33,8 @@ from typing import Any, Callable, Optional, Iterable
 
 from specitems import (COL_SPAN, CommonMarkContent, Item, ItemCache,
                        ItemGetValueContext, ItemMapper, Link, MarkdownContent,
-                       ROW_SPAN, SphinxContent, TextContent, yield_tasks)
+                       ROW_SPAN, SphinxContent, TextContent,
+                       get_reference_work, yield_tasks)
 
 from specware import (exit_on_config_file_error, open_tree,
                       augment_with_test_case_links, augment_with_test_links,
@@ -165,7 +166,11 @@ def _view(item: Item, mapper: ItemMapper, level: int, link: Optional[Link],
     # 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)
+        if _visit_item(link_2.item, mapper, level + 1, link_2,
+                       validated_filter):
+            for link_3 in link_2.item.links_to_parents("reference-location"):
+                _visit_item(link_3.item, mapper, level + 2, link_3,
+                            validated_filter)
     _view_interface_placment(item, mapper, level + 1, validated_filter)
     for link_2 in itertools.chain(
             item.links_to_children(_VIEW_CHILD_ROLES),
@@ -573,8 +578,9 @@ def _register_block(item: Item) -> tuple[int, int]:
     size = item["register-block-size"]
     if size is not None:
         parts.append(f"size {size}")
-    parts.extend(link.item["title"]
-                 for link in item.links_to_parents("reference", _any_link))
+    parts.extend(
+        get_reference_work(link.item)["title"]
+        for link in item.links_to_parents("reference", _any_link))
     print(" ".join(parts))
     layout = get_register_block_layout(item)
     includes = dict(
@@ -635,7 +641,8 @@ def _validate(_item: Item, validated: bool) -> bool:
 def _prepare_mapper(mapper: ItemMapper) -> None:
     for type_path_key in (
             "interface:/spec", "glossary/term:/plural", "reference:/cite",
-            "reference:/cite-long",
+            "reference:/cite-long", "reference-location:/cite",
+            "reference-location:/cite-long",
             "requirement/functional/action:/text-template",
             "requirement/non-functional/performance-runtime:/environment",
             "requirement/non-functional/performance-runtime:/limit-condition",

{specware-1.3.7 → specware-1.3.9}/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.9}/src/specware/interfacemapper.py

@@ -24,9 +24,12 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+from typing import Callable, Optional
+
 from specitems import (BibTeXCitationProvider, ContentContext, Item,
-                       ItemGetValue, ItemGetValueContext, MarkdownMapper,
-                       SphinxMapper, get_reference, make_label)
+                       ItemGetValue, ItemGetValueContext, ItemMapper,
+                       MarkdownMapper, ReferenceTarget, SphinxMapper,
+                       get_reference, get_reference_target, make_label)
 
 from .contentc import get_value_header_file
 
@@ -36,6 +39,119 @@ def sanitize_name(name: str) -> str:
     return name.lstrip("_")
 
 
+def get_interface_reference(item: Item) -> Optional[ReferenceTarget]:
+    """
+    Get the target of the reference link of the interface.
+
+    Return None, if the interface has no reference link.
+
+    Raises:
+        ValueError: The interface has more than one reference link.
+    """
+    links = list(item.links_to_parents("reference"))
+    if not links:
+        return None
+    if len(links) > 1:
+        raise ValueError(f"{item.uid}: an interface shall have at most one "
+                         "reference link")
+    return get_reference_target(links[0].item, links[0])
+
+
+def get_reference_url(mapper: ItemMapper,
+                      target: ReferenceTarget) -> Optional[str]:
+    """
+    Get the URL of the reference target substituted in the context of the
+    referenced work.
+    """
+    if target.url is None:
+        return None
+    return mapper.substitute(target.url, target.work)
+
+
+def _relpath(_ctx: ItemGetValueContext, value: str) -> str:
+    return value
+
+
+def add_reference_transformers(mapper: ItemMapper) -> None:
+    """
+    Add the value transformers which the URLs of references may use.
+
+    Outside a package build, the relpath transformer returns the path
+    unchanged.
+    """
+    mapper.add_value_transformer("relpath", _relpath)
+
+
+#: Formats a reference to a label with an optional name.
+FormatLabel = Callable[[Optional[str], str], str]
+
+#: Formats a hyperlink with a name to an URL.
+FormatLink = Callable[[str, str], str]
+
+
+def _format_reference(ctx: ItemGetValueContext,
+                      target: Optional[ReferenceTarget], name: Optional[str],
+                      fallback: str) -> str:
+    """
+    Format a reference to the target.
+
+    Inside the target document, a target with a label yields a reference to
+    the label.  Elsewhere, a target with an URL yields a hyperlink.  A name of
+    None makes the reference to the label take the title of the label target.
+    """
+    if target is None:
+        return fallback
+    mapper = ctx.mapper
+    assert isinstance(mapper, (SphinxInterfaceMapper, MarkdownInterfaceMapper))
+    if (target.label is not None
+            and mapper.target_document_uid == target.work.uid):
+        return mapper.format_reference_label(name, target.label)
+    url = get_reference_url(mapper, target)
+    if url is None:
+        return fallback
+    return mapper.format_reference_link(fallback if name is None else name,
+                                        url)
+
+
+def _get_value_ref(ctx: ItemGetValueContext,
+                   get_value: ItemGetValue,
+                   postfix: str = "",
+                   prefix: str = "") -> str:
+    return _format_reference(ctx, get_interface_reference(ctx.item),
+                             f"{prefix}{ctx.value[ctx.key]}{postfix}",
+                             get_value(ctx))
+
+
+def _get_value_unspecified_group(ctx: ItemGetValueContext) -> str:
+    return _format_reference(ctx, get_interface_reference(ctx.item), None,
+                             ctx.value[ctx.key])
+
+
+def _get_value_reference_location(ctx: ItemGetValueContext) -> str:
+    return _format_reference(ctx, get_reference_target(ctx.item), None,
+                             ctx.value[ctx.key])
+
+
+def _format_sphinx_label(name: Optional[str], label: str) -> str:
+    if name is None:
+        return f":ref:`{label}`"
+    return f":ref:`{name} <{label}>`"
+
+
+def _format_sphinx_link(name: str, url: str) -> str:
+    return f"`{name} <{url}>`_"
+
+
+def _format_markdown_label(name: Optional[str], label: str) -> str:
+    if name is None:
+        return f"{{ref}}`{label}`"
+    return f"{{ref}}`{name} <{label}>`"
+
+
+def _format_markdown_link(name: str, url: str) -> str:
+    return f"[{name}]({url})"
+
+
 def _compound_kind(ctx: ItemGetValueContext) -> str:
     type_name = ctx.item.type
     return f"{type_name[type_name.rfind('-') + 1:]} "
@@ -61,48 +177,22 @@ def _get_value_sphinx_compound(ctx: ItemGetValueContext) -> str:
     return f"``{_compound_kind(ctx)}{ctx.value[ctx.key]}``"
 
 
-def _get_value_sphinx_ref(ctx: ItemGetValueContext,
-                          get_value: ItemGetValue,
-                          postfix: str = "",
-                          prefix: str = "") -> str:
-    for ref in ctx.item.get("references", []):
-        ref_type = ref["type"]
-        identifier = ref["identifier"]
-        name_ref = f"`{prefix}{ctx.value[ctx.key]}{postfix} <{identifier}>`"
-        if ref_type == "document" and ref["name"] == "c-user":
-            return f":ref:{name_ref}"
-        if ref_type == "url":
-            return f"{name_ref}_"
-    return get_value(ctx)
-
-
 def _get_value_sphinx_unspecified_define(ctx: ItemGetValueContext) -> str:
-    return _get_value_sphinx_ref(ctx, _get_value_sphinx_macro)
+    return _get_value_ref(ctx, _get_value_sphinx_macro)
 
 
 def _get_value_sphinx_unspecified_function(ctx: ItemGetValueContext) -> str:
-    return _get_value_sphinx_ref(ctx, _get_value_sphinx_function, "()")
-
-
-def _get_value_sphinx_unspecified_group(ctx: ItemGetValueContext) -> str:
-    for ref in ctx.item.get("references", []):
-        ref_type = ref["type"]
-        identifier = ref["identifier"]
-        if ref_type == "document" and ref["name"] == "c-user":
-            return f":ref:`{identifier}`"
-        if ref_type == "url":
-            return f"`{ctx.value[ctx.key]} <{identifier}>`_"
-    return ctx.value[ctx.key]
+    return _get_value_ref(ctx, _get_value_sphinx_function, "()")
 
 
 def _get_value_sphinx_unspecified_type(ctx: ItemGetValueContext) -> str:
-    return _get_value_sphinx_ref(ctx, _get_value_sphinx_type)
+    return _get_value_ref(ctx, _get_value_sphinx_type)
 
 
 def _get_value_sphinx_unspecified_compound(ctx: ItemGetValueContext) -> str:
-    return _get_value_sphinx_ref(ctx,
-                                 _get_value_sphinx_compound,
-                                 prefix=_compound_kind(ctx))
+    return _get_value_ref(ctx,
+                          _get_value_sphinx_compound,
+                          prefix=_compound_kind(ctx))
 
 
 def get_value_sphinx_param(ctx: ItemGetValueContext) -> str:
@@ -118,11 +208,23 @@ def get_value_sphinx_header_file(ctx: ItemGetValueContext) -> str:
 class SphinxInterfaceMapper(SphinxMapper):
     """ Sphinx item mapper for the interface documentation. """
 
-    def __init__(self, item: Item, group_uids: list[str],
-                 context: str | ContentContext):
+    def __init__(self,
+                 item: Item,
+                 group_uids: list[str],
+                 context: str | ContentContext,
+                 target_document_uid: Optional[str] = None):
         super().__init__(item, context)
         self._group_uids = set(group_uids)
+
+        #: The UID of the target document of the mapper.
+        self.target_document_uid = target_document_uid
+
+        self.format_reference_label: FormatLabel = _format_sphinx_label
+        self.format_reference_link: FormatLink = _format_sphinx_link
         BibTeXCitationProvider(self)
+        add_reference_transformers(self)
+        self.add_get_value("reference-location:/name",
+                           _get_value_reference_location)
         self.add_get_value("interface/appl-config-option/feature-enable:/name",
                            _get_value_sphinx_appl_config_option)
         self.add_get_value("interface/appl-config-option/feature:/name",
@@ -156,7 +258,7 @@ class SphinxInterfaceMapper(SphinxMapper):
         self.add_get_value("interface/unspecified-function:/name",
                            _get_value_sphinx_unspecified_function)
         self.add_get_value("interface/unspecified-group:/name",
-                           _get_value_sphinx_unspecified_group)
+                           _get_value_unspecified_group)
         self.add_get_value("interface/unspecified-enum:/name",
                            _get_value_sphinx_unspecified_type)
         self.add_get_value("interface/unspecified-struct:/name",
@@ -215,48 +317,22 @@ def _get_value_markdown_compound(ctx: ItemGetValueContext) -> str:
     return f"{{c:type}}`{_compound_kind(ctx)}{ctx.value[ctx.key]}`"
 
 
-def _get_value_markdown_ref(ctx: ItemGetValueContext,
-                            get_value: ItemGetValue,
-                            postfix: str = "",
-                            prefix: str = "") -> str:
-    for ref in ctx.item.get("references", []):
-        ref_type = ref["type"]
-        identifier = ref["identifier"]
-        name = f"{prefix}{ctx.value[ctx.key]}{postfix}"
-        if ref_type == "document" and ref["name"] == "c-user":
-            return f"{{ref}}`{name} <{identifier}>`"
-        if ref_type == "url":
-            return f"[{name}]({identifier})"
-    return get_value(ctx)
-
-
 def _get_value_markdown_unspecified_define(ctx: ItemGetValueContext) -> str:
-    return _get_value_markdown_ref(ctx, _get_value_markdown_macro)
+    return _get_value_ref(ctx, _get_value_markdown_macro)
 
 
 def _get_value_markdown_unspecified_function(ctx: ItemGetValueContext) -> str:
-    return _get_value_markdown_ref(ctx, _get_value_markdown_function, "()")
-
-
-def _get_value_markdown_unspecified_group(ctx: ItemGetValueContext) -> str:
-    for ref in ctx.item.get("references", []):
-        ref_type = ref["type"]
-        identifier = ref["identifier"]
-        if ref_type == "document" and ref["name"] == "c-user":
-            return f"{{ref}}`{identifier}`"
-        if ref_type == "url":
-            return f"[{ctx.value[ctx.key]}]({identifier})"
-    return ctx.value[ctx.key]
+    return _get_value_ref(ctx, _get_value_markdown_function, "()")
 
 
 def _get_value_markdown_unspecified_type(ctx: ItemGetValueContext) -> str:
-    return _get_value_markdown_ref(ctx, _get_value_markdown_type)
+    return _get_value_ref(ctx, _get_value_markdown_type)
 
 
 def _get_value_markdown_unspecified_compound(ctx: ItemGetValueContext) -> str:
-    return _get_value_markdown_ref(ctx,
-                                   _get_value_markdown_compound,
-                                   prefix=_compound_kind(ctx))
+    return _get_value_ref(ctx,
+                          _get_value_markdown_compound,
+                          prefix=_compound_kind(ctx))
 
 
 def get_value_markdown_param(ctx: ItemGetValueContext) -> str:
@@ -267,11 +343,23 @@ def get_value_markdown_param(ctx: ItemGetValueContext) -> str:
 class MarkdownInterfaceMapper(MarkdownMapper):
     """ Markdown item mapper for the interface documentation. """
 
-    def __init__(self, item: Item, group_uids: list[str],
-                 context: str | ContentContext):
+    def __init__(self,
+                 item: Item,
+                 group_uids: list[str],
+                 context: str | ContentContext,
+                 target_document_uid: Optional[str] = None):
         super().__init__(item, context)
         self._group_uids = set(group_uids)
+
+        #: The UID of the target document of the mapper.
+        self.target_document_uid = target_document_uid
+
+        self.format_reference_label: FormatLabel = _format_markdown_label
+        self.format_reference_link: FormatLink = _format_markdown_link
         BibTeXCitationProvider(self)
+        add_reference_transformers(self)
+        self.add_get_value("reference-location:/name",
+                           _get_value_reference_location)
         self.add_get_value("interface/appl-config-option/feature-enable:/name",
                            _get_value_markdown_appl_config_option)
         self.add_get_value("interface/appl-config-option/feature:/name",
@@ -305,7 +393,7 @@ class MarkdownInterfaceMapper(MarkdownMapper):
         self.add_get_value("interface/unspecified-function:/name",
                            _get_value_markdown_unspecified_function)
         self.add_get_value("interface/unspecified-group:/name",
-                           _get_value_markdown_unspecified_group)
+                           _get_value_unspecified_group)
         self.add_get_value("interface/unspecified-enum:/name",
                            _get_value_markdown_unspecified_type)
         self.add_get_value("interface/unspecified-struct:/name",

{specware-1.3.7 → specware-1.3.9}/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

{specware-1.3.7 → specware-1.3.9}/src/specware/util.py

@@ -37,8 +37,8 @@ from typing import (Any, Callable, Iterator, NamedTuple, Optional, TypeVar,
 
 from specitems import (ClangFormatter, IsEnabled, Item, ItemCache,
                        ItemCacheConfig, ItemDataByUID, SpecTypeProvider,
-                       create_config, create_type_provider, find_config_file,
-                       load_config_item, monitor_logging,
+                       add_inline_items, create_config, create_type_provider,
+                       find_config_file, load_config_item, monitor_logging,
                        pickle_load_data_by_uid)
 
 
@@ -303,4 +303,5 @@ def open_tree(config_file: Optional[str],
             item_cache = ItemCache(item_cache_config,
                                    is_item_enabled=is_item_enabled,
                                    type_provider=type_provider)
+        add_inline_items(config, item_cache)
         yield Tree(config, item_cache, directory)