strictdoc 0.9.1__tar.gz → 0.9.2__tar.gz

{strictdoc-0.9.1 → strictdoc-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: strictdoc
-Version: 0.9.1
+Version: 0.9.2
 Summary: StrictDoc is open-source software for technical documentation and requirements management.
 Project-URL: Changelog, https://github.com/strictdoc-project/strictdoc/blob/main/CHANGELOG.md
 Project-URL: Homepage, https://strictdoc.readthedocs.io/en/stable/

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/__init__.py

@@ -1,6 +1,6 @@
 from strictdoc.core.environment import SDocRuntimeEnvironment
 
-__version__ = "0.9.1"
+__version__ = "0.9.2"
 
 
 environment = SDocRuntimeEnvironment(__file__)

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/excel/export/excel_generator.py

@@ -88,9 +88,7 @@ class ExcelGenerator:
             all_nodes = list(
                 map(
                     lambda node_with_context_: node_with_context_[0],
-                    document_iterator.all_content(
-                        print_fragments=False, print_fragments_from_files=False
-                    ),
+                    document_iterator.all_content(print_fragments=False),
                 )
             )
             req_uid_rows = ExcelGenerator._lookup_refs(all_nodes)
@@ -98,9 +96,7 @@ class ExcelGenerator:
             if len(req_uid_rows):
                 for node, _ in traceability_index.get_document_iterator(
                     document
-                ).all_content(
-                    print_fragments=False, print_fragments_from_files=False
-                ):
+                ).all_content(print_fragments=False):
                     if not node.is_requirement() or not node.reserved_uid:
                         # Only export the requirements with UID.
                         continue

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/excel/import_/excel_sheet_proxy.py

@@ -5,6 +5,7 @@ import openpyxl
 import xlrd
 
 from strictdoc.helpers.auto_described import auto_described
+from strictdoc.helpers.cast import assert_cast
 
 
 class ExcelLibType(Enum):
@@ -15,7 +16,7 @@ class ExcelLibType(Enum):
 @auto_described
 class ExcelSheetProxy:
     """
-    This proxy class allows to open either xls(xlrd) or xlsx(openpyxl) with the same interface.
+    An adapter class to open xls(xlrd) or xlsx(openpyxl) with the same interface.
     """
 
     def __init__(self, file: str):
@@ -23,7 +24,7 @@ class ExcelSheetProxy:
         if file.endswith(".xlsx"):
             self.workbook = openpyxl.load_workbook(file)
             self.sheet = self.workbook.active
-            if self.sheet is None:
+            if self.sheet is None:  # pragma: no cover
                 raise RuntimeError(
                     "Couldn't open the first sheet of the workbook"
                 )
@@ -32,8 +33,8 @@ class ExcelSheetProxy:
             self.workbook = xlrd.open_workbook(file, on_demand=True)
             self.sheet = self.workbook.sheet_by_index(0)
             self.lib = ExcelLibType.XLRD
-        else:
-            raise ValueError("Unsupported file format")
+        else:  # pragma: no cover
+            raise AssertionError("Unsupported file format")
 
     @property
     def name(self) -> str:
@@ -44,52 +45,46 @@ class ExcelSheetProxy:
             return str(self.sheet.title)
         elif self.lib == ExcelLibType.XLRD:
             return str(self.sheet.name)
-        return ""
+        raise AssertionError
 
     @property
     def ncols(self) -> int:
         """
         The number of columns.
         """
-        ncols: int = 0
         if self.lib == ExcelLibType.OPENPYXL:
-            ncols = self.sheet.max_column
+            return assert_cast(self.sheet.max_column, int)
         elif self.lib == ExcelLibType.XLRD:
-            ncols = self.sheet.ncols
-        return ncols
+            return assert_cast(self.sheet.ncols, int)
+        raise AssertionError
 
     @property
     def nrows(self) -> int:
         """
         The number of rows.
         """
-        nrows: int = 0
         if self.lib == ExcelLibType.OPENPYXL:
-            nrows = self.sheet.max_row
+            return assert_cast(self.sheet.max_row, int)
         elif self.lib == ExcelLibType.XLRD:
-            nrows = self.sheet.nrows
-        return nrows
+            return assert_cast(self.sheet.nrows, int)
+        raise AssertionError
 
     def get_cell_value(self, row: int, col: int) -> str:
         """
         Returns the value at row/col as string.
         """
-        cell_value: str = ""
         if self.lib == ExcelLibType.OPENPYXL:
-            cell_value = (
-                self.sheet.cell(row=row + 1, column=col + 1).value or ""
-            )
+            return self.sheet.cell(row=row + 1, column=col + 1).value or ""
         elif self.lib == ExcelLibType.XLRD:
-            cell_value = self.sheet.cell_value(row, col)
-        return cell_value
+            return assert_cast(self.sheet.cell_value(row, col), str)
+        raise AssertionError
 
     def row_values(self, row: int) -> List[str]:
         """
         Returns a full row as list.
         """
-        row_values: List[str] = []
         if self.lib == ExcelLibType.OPENPYXL:
-            row_values = [(cell.value or "") for cell in self.sheet[row + 1]]
+            return [(cell.value or "") for cell in self.sheet[row + 1]]
         elif self.lib == ExcelLibType.XLRD:
-            row_values = self.sheet.row_values(row)
-        return row_values
+            return assert_cast(self.sheet.row_values(row), list)
+        raise AssertionError

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/excel/import_/excel_to_sdoc_converter.py

@@ -62,7 +62,7 @@ class ExcelToSDocConverter:
                 header_row_idx = i
                 break
         else:
-            raise NotImplementedError  # pragma: no cover
+            raise NotImplementedError
 
         header_row = sheet.row_values(header_row_idx)
         safe_header_row = [safe_name(x) for x in header_row]

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/reqif/p01_sdoc/reqif_to_sdoc_converter.py

@@ -66,7 +66,7 @@ class P01_ReqIFToSDocConverter:
     def convert_reqif_bundle(
         reqif_bundle: ReqIFBundle,
         enable_mid: bool,
-        import_markup: str,
+        import_markup: Optional[str],
     ) -> List[SDocDocument]:
         context = P01_ReqIFToSDocBuildContext(
             enable_mid=enable_mid, import_markup=import_markup
@@ -361,7 +361,7 @@ class P01_ReqIFToSDocConverter:
                 attribute.definition_ref
             ].long_name
             if long_name_or_none is None:
-                raise NotImplementedError  # pragma: no cover
+                raise NotImplementedError
             field_name: str = long_name_or_none
             if attribute.attribute_type == SpecObjectAttributeType.ENUMERATION:
                 sdoc_field_name = P01_ReqIFToSDocConverter.convert_requirement_field_from_reqif(
@@ -393,7 +393,7 @@ class P01_ReqIFToSDocConverter:
 
                         break
                 else:
-                    raise NotImplementedError  # pragma: no cover
+                    raise NotImplementedError
 
                 enum_values = ", ".join(enum_values_resolved)
                 fields.append(

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/reqif/p01_sdoc/sdoc_to_reqif_converter.py

@@ -245,7 +245,7 @@ class P01_SDocToReqIFObjectConverter:
 
             # FIXME: ReqIF must export complete documents including fragments.
             for node_, _ in document_iterator.all_content(
-                print_fragments=False, print_fragments_from_files=False
+                print_fragments=False
             ):
                 if isinstance(node_, SDocSection):
                     raise AssertionError(

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/sdoc/models/document.py

@@ -12,7 +12,6 @@ from strictdoc.backend.sdoc.models.document_grammar import (
 )
 from strictdoc.backend.sdoc.models.document_view import DocumentView
 from strictdoc.backend.sdoc.models.model import (
-    SDocDocumentContentIF,
     SDocDocumentFromFileIF,
     SDocDocumentIF,
     SDocElementIF,
@@ -47,7 +46,7 @@ class SDocDocument(SDocDocumentIF):
         config: Optional[DocumentConfig],
         view: Optional[DocumentView],
         grammar: Optional[DocumentGrammar],
-        section_contents: List[SDocDocumentContentIF],
+        section_contents: List[SDocElementIF],
         is_bundle_document: bool = False,
     ) -> None:
         self.title: str = title
@@ -61,7 +60,7 @@ class SDocDocument(SDocDocumentIF):
             view if view is not None else DocumentView.create_default(self)
         )
         self.grammar: Optional[DocumentGrammar] = grammar
-        self.section_contents: List[SDocDocumentContentIF] = section_contents
+        self.section_contents: List[SDocElementIF] = section_contents
 
         self.is_bundle_document: bool = is_bundle_document
 
@@ -86,9 +85,10 @@ class SDocDocument(SDocDocumentIF):
         self, element_type: Optional[str] = None
     ) -> Generator[SDocNodeIF, None, None]:
         """
-        Iterates over all non-[TEXT] nodes in the document. If element_type
-        is given, then only nodes of type `element_type` are returned.
-        Otherwise, all element types are returned.
+        Iterate over all non-[TEXT] nodes in the document.
+
+        If element_type is given, then only nodes of type `element_type` are
+        returned. Otherwise, all element types are returned.
         """
         task_list: List[SDocElementIF] = list(self.section_contents)
         while task_list:

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/sdoc/models/document_from_file.py

@@ -38,9 +38,10 @@ class DocumentFromFile(SDocDocumentFromFileIF):
         self, element_type: Optional[str] = None
     ) -> Generator[SDocNodeIF, None, None]:
         """
-        Iterates over all non-[TEXT] nodes in the document. If element_type
-        is given, then only nodes of type `element_type` are returned.
-        Otherwise, all element types are returned.
+        Iterate over all non-[TEXT] nodes in the document.
+
+        If element_type is given, then only nodes of type `element_type` are
+        returned. Otherwise, all element types are returned.
         """
 
         task_list: List[SDocElementIF] = list(self.section_contents)

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/sdoc/models/document_grammar.py

@@ -279,8 +279,8 @@ class DocumentGrammar(SDocGrammarIF):
 
         self.update_with_elements(elements)
 
-        # textX passes an empty string instead of None when import_from_file is
-        # not provided in input.
+        # The textX parser passes an empty string instead of None when
+        # import_from_file is not provided in input.
         if import_from_file is not None and len(import_from_file) == 0:
             import_from_file = None
         self.import_from_file: Optional[str] = import_from_file

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/sdoc/models/document_view.py

@@ -88,4 +88,4 @@ class DocumentView:
         for view_element_ in self.views:
             if view_element_.view_id == view_id:
                 return view_element_
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/sdoc/models/model.py

@@ -3,6 +3,7 @@ from typing import Generator, List, Optional, Union
 
 from strictdoc.backend.sdoc.models.document_config import DocumentConfig
 from strictdoc.core.document_meta import DocumentMeta
+from strictdoc.helpers.mid import MID
 
 
 class SDocNodeFieldIF(ABC):
@@ -10,61 +11,71 @@ class SDocNodeFieldIF(ABC):
 
 
 class SDocNodeIF(ABC):
+    reserved_mid: MID
     node_type: str
     ng_level: Optional[int]
     ng_resolved_custom_level: Optional[str]
-    section_contents: List["SDocSectionContentIF"]
+    section_contents: List["SDocElementIF"]
+
+    # FIXME: Get rid of @property everywhere.
+    @property
+    def reserved_uid(self) -> Optional[str]:
+        raise NotImplementedError
+
+    @property
+    def reserved_title(self) -> Optional[str]:
+        raise NotImplementedError
 
     @abstractmethod
     def is_normative_node(self) -> bool:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
     @abstractmethod
     def is_text_node(self) -> bool:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
     @abstractmethod
     def get_debug_info(self) -> str:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
     @abstractmethod
     def get_document(self) -> Optional["SDocDocumentIF"]:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
     @abstractmethod
     def get_including_document(self) -> Optional["SDocDocumentIF"]:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
     @abstractmethod
     def get_parent_or_including_document(self) -> "SDocDocumentIF":
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
     @abstractmethod
     def get_prefix(self) -> Optional[str]:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
 
 class SDocSectionIF(ABC):
     parent: Union["SDocDocumentIF", "SDocSectionIF"]
     ng_level: Optional[int]
     ng_resolved_custom_level: Optional[str]
-    section_contents: List["SDocSectionContentIF"]
+    section_contents: List["SDocElementIF"]
 
     @abstractmethod
     def get_document(self) -> Optional["SDocDocumentIF"]:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
     @abstractmethod
     def get_prefix(self) -> str:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
     @abstractmethod
     def get_debug_info(self) -> str:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
     @abstractmethod
     def get_display_title(self, include_toc_number: bool = True) -> str:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
 
 class SDocGrammarIF:
@@ -75,32 +86,32 @@ class SDocDocumentIF(ABC):
     config: DocumentConfig
     grammar: Optional[SDocGrammarIF]
     meta: Optional[DocumentMeta]
-    section_contents: List["SDocSectionContentIF"]
+    section_contents: List["SDocElementIF"]
     included_documents: List["SDocDocumentIF"]
     is_bundle_document: bool
     ng_level: Optional[int]
 
     @abstractmethod
     def get_prefix(self) -> str:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
     @abstractmethod
     def get_debug_info(self) -> str:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
     @abstractmethod
     def iterate_included_documents_depth_first(
         self,
     ) -> Generator["SDocDocumentIF", None, None]:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
     @abstractmethod
     def get_display_title(self, include_toc_number: bool = True) -> str:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
     @property
     def ng_resolved_custom_level(self) -> Optional[str]:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
 
 class SDocDocumentFromFileIF(ABC):
@@ -112,25 +123,11 @@ class SDocDocumentFromFileIF(ABC):
         self,
         element_type: Optional[str] = None,
     ) -> Generator[SDocNodeIF, None, None]:
-        raise NotImplementedError  # pragma: no cover
+        raise NotImplementedError
 
     @property
     def section_contents(self) -> List[SDocDocumentIF]:
-        raise NotImplementedError  # pragma: no cover
-
-
-SDocSectionContentIF = Union[
-    SDocNodeIF,
-    SDocSectionIF,
-    SDocDocumentFromFileIF,
-]
-
-
-SDocDocumentContentIF = Union[
-    SDocDocumentFromFileIF,
-    SDocNodeIF,
-    SDocSectionIF,
-]
+        raise NotImplementedError
 
 
 SDocElementIF = Union[

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/sdoc/models/node.py

@@ -14,8 +14,8 @@ from strictdoc.backend.sdoc.models.document_grammar import (
 from strictdoc.backend.sdoc.models.inline_link import InlineLink
 from strictdoc.backend.sdoc.models.model import (
     SDocDocumentIF,
+    SDocElementIF,
     SDocNodeIF,
-    SDocSectionContentIF,
     SDocSectionIF,
 )
 from strictdoc.backend.sdoc.models.reference import (
@@ -108,7 +108,7 @@ class SDocNode(SDocNodeIF):
         fields: List[SDocNodeField],
         relations: List[Reference],
         is_composite: bool = False,
-        section_contents: Optional[List[SDocSectionContentIF]] = None,
+        section_contents: Optional[List[SDocElementIF]] = None,
         node_type_close: Optional[str] = None,
     ) -> None:
         assert parent
@@ -142,7 +142,7 @@ class SDocNode(SDocNodeIF):
                 has_meta = True
             ordered_fields_lookup.setdefault(field.field_name, []).append(field)
 
-        self.section_contents: List[SDocSectionContentIF] = (
+        self.section_contents: List[SDocElementIF] = (
             section_contents if section_contents is not None else []
         )
 
@@ -624,6 +624,8 @@ class SDocNode(SDocNodeIF):
         value: Optional[Union[str, SDocNodeField]],
     ) -> None:
         """
+        Create or update a field by name with the given value.
+
         The purpose of this purpose is to provide a single-method API for
         updating any field of a requirement. A requirement might use only some
         fields of a document grammar, so an extra exercise done by the method is

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/sdoc/models/section.py

@@ -12,7 +12,7 @@ from strictdoc.backend.sdoc.models.document_grammar import (
 )
 from strictdoc.backend.sdoc.models.model import (
     SDocDocumentIF,
-    SDocSectionContentIF,
+    SDocElementIF,
     SDocSectionIF,
 )
 from strictdoc.helpers.auto_described import auto_described
@@ -36,7 +36,7 @@ class SDocSection(SDocSectionIF):
         custom_level: Optional[str],
         title: str,
         requirement_prefix: Optional[str],
-        section_contents: List[SDocSectionContentIF],
+        section_contents: List[SDocElementIF],
     ):
         self.parent: Union[SDocDocumentIF, SDocSectionIF] = parent
 

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/sdoc/models/type_system.py

@@ -70,8 +70,8 @@ class FileEntry:
         file_path_posix = g_file_path.replace("\\", "/")
         self.file_path_posix = file_path_posix
 
-        # textX passes an empty string even if there is no LINE_RANGE provided
-        # in the SDoc source.
+        # The textX parser passes an empty string even if there is no LINE_RANGE
+        # provided in the SDoc source.
         g_line_range = (
             g_line_range
             if g_line_range is not None and len(g_line_range) > 0
@@ -88,7 +88,8 @@ class FileEntry:
                 int(range_components_str[1]),
             )
 
-        # textX parses an optional element as an empty string. We make it to None ourselves.
+        # The textX parser parses an optional element as an empty string. We
+        # make it to None ourselves.
         self.function: Optional[str] = (
             function if function is not None and len(function) > 0 else None
         )
@@ -198,7 +199,7 @@ class GrammarElementFieldTag(GrammarElementField):
 
 
 @auto_described
-class GrammarElementRelationParent:
+class GrammarElementRelationParent:  # noqa: PLW1641
     def __init__(
         self, parent, relation_type: str, relation_role: Optional[str]
     ):

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/sdoc/reader.py

@@ -77,8 +77,7 @@ class SDReader:
         self, file_path: str, project_config: ProjectConfig
     ) -> SDocDocument:
         """
-        This function parses the provided .sdoc file and returns a Document
-        object.
+        Parse a provided .sdoc file and convert it into a Document object.
         """
 
         unpickled_content = PickleCache.read_from_cache(

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/sdoc/validations/sdoc_validator.py

@@ -29,6 +29,7 @@ MULTIPLE_CHOICE_FIELD_REGEX = re.compile(
 def multi_choice_regex_match(value: str) -> bool:
     """
     Validate MultipleChoice field value.
+
     Bug: Forward slashes in field values cause errors #2197,
     https://github.com/strictdoc-project/strictdoc/issues/2197
     """
@@ -39,8 +40,8 @@ def multi_choice_regex_match(value: str) -> bool:
 
 class SDocValidator:
     """
-    This helper class is used for validating SDoc documents right after the
-    textX parsing and processing steps have finished.
+    Class that validates SDoc after textX parsing and processing steps.
+
     FIXME: In the future, all processing validation steps could be moved to this
            class as well. This would remove the need in the ParseContext class
            and simplify several other implementation details.

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/sdoc_source_code/caching_reader.py

@@ -73,7 +73,8 @@ class SourceFileTraceabilityCachingReader:
                 or path_to_file.endswith(".hpp")
                 or path_to_file.endswith(".cpp")
             ):
-                return SourceFileTraceabilityReader_C()
+                parse_nodes = project_config.shall_parse_nodes(path_to_file)
+                return SourceFileTraceabilityReader_C(parse_nodes=parse_nodes)
             if path_to_file.endswith(".robot"):
                 return SourceFileTraceabilityReader_Robot()
         return SourceFileTraceabilityReader()

strictdoc-0.9.2/strictdoc/backend/sdoc_source_code/comment_parser/marker_lexer.py

@@ -0,0 +1,87 @@
+from string import Template
+
+from lark import Lark, ParseTree, UnexpectedToken
+
+from strictdoc.backend.sdoc_source_code.constants import (
+    REGEX_REQ,
+    RESERVED_KEYWORDS,
+)
+
+
+class GrammarTemplate(Template):
+    delimiter = "##"
+
+
+RELATION_MARKER_START = r"@relation[\(\{]"
+
+GRAMMAR = GrammarTemplate("""
+start: ##START
+
+relation_marker: _RELATION_MARKER_START _WS? (relation_node_uid _SEP _WS)+ "scope=" relation_scope ("," _WS "role=" relation_role)? _WS? _BRACE_RIGHT
+
+_RELATION_MARKER_START: /##RELATION_MARKER_START/
+relation_node_uid: /##REGEX_REQ/
+relation_scope: /file|class|function|line|range_start|range_end/
+relation_role: ALPHANUMERIC_WORD
+
+node_field: node_name ":" node_multiline_value
+node_name: /(?!(##RESERVED_KEYWORDS))[A-Z_]+/
+node_multiline_value: (_WS_INLINE | _NL) (NODE_FIRST_STRING_VALUE _NL) (NODE_STRING_VALUE _NL)*
+
+NODE_FIRST_STRING_VALUE.2: /\\s*[^\n\r]+/x
+NODE_STRING_VALUE.2: /(?![ ]*##RELATION_MARKER_START)(?!\\s*[A-Z_]+: )[^\n\r]+/x
+
+_NORMAL_STRING_NO_MARKER_NO_NODE: /(?!\\s*##RELATION_MARKER_START)((?!\\s*[A-Z_]+: )|(##RESERVED_KEYWORDS)).+/
+
+_NORMAL_STRING_NO_MARKER: /(?!\\s*##RELATION_MARKER_START).+/
+
+_BRACE_LEFT: /[\\(\\{{]/
+_BRACE_RIGHT: /[\\)\\}}]/
+
+_SEP: ","
+
+_NL : (CR? LF)
+
+_WS : WS
+_WS_INLINE : WS_INLINE
+
+ALPHANUMERIC_WORD: /[a-zA-Z0-9_]+/
+
+%import common.WS -> WS
+%import common.CR -> CR
+%import common.LF -> LF
+%import common.WS_INLINE -> WS_INLINE
+%import common.NEWLINE -> NEWLINE
+""")
+
+
+class MarkerLexer:
+    @staticmethod
+    def parse(source_input: str, parse_nodes: bool = False) -> ParseTree:
+        if parse_nodes:
+            start = "(relation_marker | node_field | _NORMAL_STRING_NO_MARKER_NO_NODE | _WS)*"
+        else:
+            start = "(relation_marker | _NORMAL_STRING_NO_MARKER | _WS)*"
+
+        grammar = GRAMMAR.substitute(
+            RELATION_MARKER_START=RELATION_MARKER_START,
+            RESERVED_KEYWORDS=RESERVED_KEYWORDS,
+            REGEX_REQ=REGEX_REQ,
+            START=start,
+        )
+        parser: Lark = Lark(
+            grammar, parser="lalr", cache=True, propagate_positions=True
+        )
+
+        try:
+            # FIXME: Without rstrip, there is an edge case where the parser
+            #        breaks when resolving conflicts between multiline node
+            #        fields and normal strings.
+            #        See also test: test_31_single_node_field.
+            tree: ParseTree = parser.parse(source_input.rstrip() + "\n")
+        except UnexpectedToken as exception_:  # pragma: no cover
+            print(  # noqa: T201
+                "error: could not parse source comment:\n" + source_input
+            )
+            raise exception_
+        return tree

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/sdoc_source_code/marker_parser.py

@@ -28,6 +28,7 @@ class MarkerParser:
         comment_line_start: int,
         entity_name: Optional[str] = None,
         col_offset: int = 0,
+        parse_nodes: bool = False,
     ) -> SourceNode:
         """
         Parse relation markers from source file comments.
@@ -48,7 +49,9 @@ class MarkerParser:
 
         input_string = preprocess_source_code_comment(input_string)
 
-        tree: ParseTree = MarkerLexer.parse(input_string)
+        tree: ParseTree = MarkerLexer.parse(
+            input_string, parse_nodes=parse_nodes
+        )
 
         for element_ in tree.children:
             if not isinstance(element_, Tree):

{strictdoc-0.9.1 → strictdoc-0.9.2}/strictdoc/backend/sdoc_source_code/models/function.py

@@ -40,6 +40,4 @@ class Function:
         return FunctionAttribute.DEFINITION in self.attributes
 
     def is_public(self) -> bool:
-        if FunctionAttribute.STATIC in self.attributes:
-            return False
-        return True
+        return FunctionAttribute.STATIC not in self.attributes