Fixed graphviz bug for transitions that happen in loops not generatin…

…g properly.
frame-lang · Apr 25, 2024 · 9746eae · 9746eae
1 parent 72815f5
commit 9746eae
Show file tree

Hide file tree

Showing 25 changed files with 67 additions and 62 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/frame_build/Cargo.toml b/frame_build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "frame_build"
-version = "0.11.4"
+version = "0.11.5"
 authors = ["Eric Walkingshaw <eric.walkingshaw@savant.com>"]
 edition = "2018"
 

diff --git a/framec/Cargo.toml b/framec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "framec"
-version = "0.11.4"
+version = "0.11.5"
 authors = ["Mark Truluck <mark@frame-lang.org>"]
 edition = "2018"
 

diff --git a/framec/src/frame_c/compiler.rs b/framec/src/frame_c/compiler.rs
@@ -35,7 +35,7 @@ use std::convert::TryFrom;
 /* --------------------------------------------------------------------- */
 
 static IS_DEBUG: bool = false;
-static FRAMEC_VERSION: &str = "Emitted from framec_v0.11.2";
+static FRAMEC_VERSION: &str = "Emitted from framec_v0.11.5";
 
 /* --------------------------------------------------------------------- */
 

diff --git a/framec/src/frame_c/visitors/graphviz_visitor.rs b/framec/src/frame_c/visitors/graphviz_visitor.rs
@@ -1424,6 +1424,50 @@ impl AstVisitor for GraphVizVisitor {
 
     //* --------------------------------------------------------------------- *//
 
+    fn visit_loop_stmt_node(&mut self, loop_stmt_node: &LoopStmtNode) {
+        match &loop_stmt_node.loop_types {
+            LoopStmtTypes::LoopForStmt {
+                loop_for_stmt_node: loop_for_expr_node,
+            } => {
+                loop_for_expr_node.accept(self);
+            }
+            LoopStmtTypes::LoopInStmt { loop_in_stmt_node } => {
+                loop_in_stmt_node.accept(self);
+            }
+            LoopStmtTypes::LoopInfiniteStmt {
+                loop_infinite_stmt_node,
+            } => {
+                loop_infinite_stmt_node.accept(self);
+            }
+        }
+    }
+
+    //* --------------------------------------------------------------------- *//
+
+    fn visit_loop_for_stmt_node(&mut self, loop_for_expr_node: &LoopForStmtNode) {
+        // only call if there are statements
+        if loop_for_expr_node.statements.len() != 0 {
+            self.visit_decl_stmts(&loop_for_expr_node.statements);
+        }
+    }
+
+    //* --------------------------------------------------------------------- *//
+
+    fn visit_loop_in_stmt_node(&mut self, loop_in_stmt_node: &LoopInStmtNode) {
+        // only call if there are statements
+        if loop_in_stmt_node.statements.len() != 0 {
+            self.visit_decl_stmts(&loop_in_stmt_node.statements);
+        }
+    }
+
+    //* --------------------------------------------------------------------- *//
+
+    fn visit_loop_infinite_stmt_node(&mut self, loop_in_expr_node: &LoopInfiniteStmtNode) {
+        self.visit_decl_stmts(&loop_in_expr_node.statements);
+    }
+
+    //* --------------------------------------------------------------------- *//
+
     fn visit_bool_test_conditional_branch_node(
         &mut self,
         bool_test_true_branch_node: &BoolTestConditionalBranchNode,

diff --git a/framec_tests/Cargo.toml b/framec_tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "framec_tests"
-version = "0.11.4"
+version = "0.11.5"
 authors = ["Eric Walkingshaw <eric.wakingshaw@savant.com>", "Fernando De la Garza <fernando.delagarza@savant.com>"]
 edition = "2018"
 

diff --git a/framec_tests/python/src/basic/basic.frm b/framec_tests/python/src/basic/basic.frm
@@ -1,7 +1,4 @@
 
-```
-from framelang.framelang import FrameEvent
-```
 #[codegen.python.code.public_state_info:bool="true"]
 
 #Basic

diff --git a/framec_tests/python/src/branch/branch.frm b/framec_tests/python/src/branch/branch.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 
 #Branch

diff --git a/framec_tests/python/src/enum_case/enum_case.frm b/framec_tests/python/src/enum_case/enum_case.frm
@@ -1,5 +1,4 @@
 ```
-from framelang.framelang import FrameEvent
 from enum import Enum
 ```
 #[codegen.python.code.public_state_info:bool="true"]

diff --git a/framec_tests/python/src/event_handler/event_handler.frm b/framec_tests/python/src/event_handler/event_handler.frm
@@ -1,7 +1,4 @@
 
-```
-from framelang.framelang import FrameEvent
-```
 #[codegen.python.code.public_state_info:bool="true"]
 
 

diff --git a/framec_tests/python/src/forward_events/forward_events.frm b/framec_tests/python/src/forward_events/forward_events.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 
 #ForwardEvents

diff --git a/framec_tests/python/src/handler_calls/handler_calls.frm b/framec_tests/python/src/handler_calls/handler_calls.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 
 #HandlerCalls

diff --git a/framec_tests/python/src/hierarchical/hierarchical.frm b/framec_tests/python/src/hierarchical/hierarchical.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 
 #Hierarchical

diff --git a/framec_tests/python/src/hierarchical_guard/hierarchical_guard.frm b/framec_tests/python/src/hierarchical_guard/hierarchical_guard.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 
 #HierarchicalGuard

diff --git a/framec_tests/python/src/match/match.frm b/framec_tests/python/src/match/match.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 
 #Match

diff --git a/framec_tests/python/src/naming/naming.frm b/framec_tests/python/src/naming/naming.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 
 #Naming

diff --git a/framec_tests/python/src/simple_handler_calls/simple_handler_calls.frm b/framec_tests/python/src/simple_handler_calls/simple_handler_calls.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 
 #SimpleHandlerCalls

diff --git a/framec_tests/python/src/state_context/state_context.frm b/framec_tests/python/src/state_context/state_context.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 
 

diff --git a/framec_tests/python/src/state_context_stack/state_context_stack.frm b/framec_tests/python/src/state_context_stack/state_context_stack.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 
 #StateContextStack

diff --git a/framec_tests/python/src/state_params/state_params.frm b/framec_tests/python/src/state_params/state_params.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 
 #StateParams

diff --git a/framec_tests/python/src/state_stack/state_stack.frm b/framec_tests/python/src/state_stack/state_stack.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 
 #StateStack

diff --git a/framec_tests/python/src/state_vars/state_vars.frm b/framec_tests/python/src/state_vars/state_vars.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 #[codegen.python.code.public_compartment:bool="true"]
 

diff --git a/framec_tests/python/src/transition/transition.frm b/framec_tests/python/src/transition/transition.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 
 #TransitionSm

diff --git a/framec_tests/python/src/transition_params/transition_params.frm b/framec_tests/python/src/transition_params/transition_params.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 
 #TransitParams

diff --git a/framec_tests/python/src/var_scope/var_scope.frm b/framec_tests/python/src/var_scope/var_scope.frm
@@ -1,6 +1,4 @@
-```
-from framelang.framelang import FrameEvent
-```
+
 #[codegen.python.code.public_state_info:bool="true"]
 
 #VarScope