2.2.2

Author: quantum-leaps

Spexyfile

@@ -22,8 +22,8 @@ ALIASES += \
 "code_fw_trace{1}=^^@par Forward Traceability^^" \
 "endcode_uid=" \
 "tr{1}=@ref \1 \"\1\"" \
-"precondition{2}=@par Precondition `\1:\2`^^" \
-"postcondition{2}=@par Postcondition `\1:\2`^^" \
+"precondition{2}=^^@par Precondition `\1:\2`^^" \
+"postcondition{2}=^^@par Postcondition `\1:\2`^^" \
 "invariant{2}=@par Invariant `\1:\2`^^" \
 "nav{2}=<span class=\"prev_button\">@ref \1</span><span class=\"next_button\">@ref \2</span>" \
 "nav_prev{1}=<span class=\"prev_button\">@ref \1</span>" \

doc/Doxyfile

@@ -6,7 +6,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME           = Spexygen
-PROJECT_NUMBER         = 2.2.1
+PROJECT_NUMBER         = 2.2.2
 PROJECT_BRIEF          = "Reference Manual"
 PROJECT_LOGO           = $(SPEXYGEN)/spexygen-awesome/img/logo_spexygen.webp
 PROJECT_ICON           =

doc/Doxyfile-PDF

@@ -6,7 +6,7 @@
 # Configuration options related to the LateX output
 #---------------------------------------------------------------------------
 PROJECT_NAME           = Reference Manual
-PROJECT_BRIEF          = For Spexygen 2.2.1
+PROJECT_BRIEF          = For Spexygen 2.2.2
 PROJECT_NUMBER         = Document: DOC_MAN_SPX
 
 #---------------------------------------------------------------------------

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name="spexygen",
-    version="2.2.1",
+    version="2.2.2",
     author="Quantum Leaps",
     author_email="[email protected]",
     description="Traceable specifications based on doxygen",

spexygen.py

@@ -2,7 +2,7 @@
 
 #=============================================================================
 # _Spexygen_ - Traceable Specifications Based on doxygen
-# Copyright (C) 2023 Quantum Leaps, LLC <www.state-machine.com>
+# Copyright (C) 2024 Quantum Leaps, LLC <www.state-machine.com>
 #
 # SPDX-License-Identifier: MIT
 #
@@ -47,7 +47,7 @@ class Spexygen:
     '''
 
     # public class constants
-    VERSION = 221
+    VERSION = 222
 
     UID_DOC  = 1
     UID_CODE = 2
@@ -83,12 +83,12 @@ def on_file_pattern(self, fname):
                fname.endswith('.hpp') or fname.endswith('.cpp') or \
                fname.endswith('.py') or fname.endswith('.lnt')
 
-    def on_gen_fw_trace(self, level):
+    def on_gen_fw_trace(self, uid, level):
         '''recursively generate the forward trace for a "uid"
         from self._uid_traced_list[level]
         '''
-        uid = self._uid_traced_list[level]
-        Spexygen.debug("  level", level,
+        self._uid_traced_list.append(uid)
+        Spexygen.debug("  level=", level, "uid=", uid,
                        "self._uid_traced_list:", self._uid_traced_list)
         for uid in self._uid_trace_dict.get(uid):
             if uid not in self._uid_traced_list:
@@ -97,8 +97,7 @@ def on_gen_fw_trace(self, level):
                     uid, self._uid_brief_dict[uid]))
                 if level < len(Spexygen.LEVELS) - 2:
                     if uid in self._uid_trace_dict:
-                        self._uid_traced_list.append(uid)
-                        self.on_gen_fw_trace(level+1) # recursive!
+                        self.on_gen_fw_trace(uid, level+1) # recursive!
                 else:
                     self._file.write("%s%s- ...\n"
                         %(self._prefix, Spexygen.LEVELS[level+1]))
@@ -298,8 +297,8 @@ def gen_fw_trace(self, line):
         self._prefix = line[:i]
         self._file.write(line)
         if self._uid in self._uid_trace_dict:
-            self._uid_traced_list = [self._uid]
-            self.on_gen_fw_trace(0)
+            self._uid_traced_list = []
+            self.on_gen_fw_trace(self._uid, 0)
         else:
             print(f'  {self._fname}:{self._lnum} empty forward trace'\
                   f' for UID: "{self._uid}"')