merge fixes on loop branch

frame-lang · Feb 8, 2024 · 31a7cde · 31a7cde
2 parents b21b837 + bbc7f4a
commit 31a7cde
Show file tree

Hide file tree

Showing 22 changed files with 4 additions and 57 deletions.
diff --git a/framec/src/frame_c/visitors/python_visitor.rs b/framec/src/frame_c/visitors/python_visitor.rs
@@ -1423,21 +1423,10 @@ impl PythonVisitor {
             self.add_code("self.__compartment = None");
         }
 
-        if self.managed {
-            self.newline();
-            self.add_code("self._manager = manager");
-        }
-
-        self.newline();
-        self.add_code(&format!(
-            "self.__compartment: {}Compartment = {}Compartment(self.__state)",
-            system_node.name, system_node.name
-        ));
-        self.newline();
-        self.add_code(&format!(
-            "self.__next_compartment: {}Compartment = None",
-            system_node.name
-        ));
+        // if self.managed {
+        //     self.newline();
+        //     self.add_code("self._manager = manager");
+        // }
 
         // Initialize state arguments.
         match &system_node.start_state_state_params_opt {

diff --git a/framec_tests/python/src/basic/basic.py b/framec_tests/python/src/basic/basic.py
@@ -24,8 +24,6 @@ def __init__(self):
 
         self.__compartment: 'BasicCompartment' = BasicCompartment('__basic_state_S0')
         self.__next_compartment: 'BasicCompartment' = None
-        self.__compartment: BasicCompartment = BasicCompartment(self.__state)
-        self.__next_compartment: BasicCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/branch/branch.py b/framec_tests/python/src/branch/branch.py
@@ -24,8 +24,6 @@ def __init__(self):
 
         self.__compartment: 'BranchCompartment' = BranchCompartment('__branch_state_I')
         self.__next_compartment: 'BranchCompartment' = None
-        self.__compartment: BranchCompartment = BranchCompartment(self.__state)
-        self.__next_compartment: BranchCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/change_state/change_state.py b/framec_tests/python/src/change_state/change_state.py
@@ -19,8 +19,6 @@ def __init__(self):
 
         self.__compartment: 'ChangeStateSmCompartment' = ChangeStateSmCompartment('__changestatesm_state_S0')
         self.__next_compartment: 'ChangeStateSmCompartment' = None
-        self.__compartment: ChangeStateSmCompartment = ChangeStateSmCompartment(self.__state)
-        self.__next_compartment: ChangeStateSmCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/enum_case/enum_case.py b/framec_tests/python/src/enum_case/enum_case.py
@@ -34,8 +34,6 @@ def __init__(self):
 
         self.__compartment: 'EnumTestCompartment' = EnumTestCompartment('__enumtest_state_SUN')
         self.__next_compartment: 'EnumTestCompartment' = None
-        self.__compartment: EnumTestCompartment = EnumTestCompartment(self.__state)
-        self.__next_compartment: EnumTestCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/event_handler/event_handler.py b/framec_tests/python/src/event_handler/event_handler.py
@@ -24,8 +24,6 @@ def __init__(self):
 
         self.__compartment: 'EventHandlerCompartment' = EventHandlerCompartment('__eventhandler_state_S1')
         self.__next_compartment: 'EventHandlerCompartment' = None
-        self.__compartment: EventHandlerCompartment = EventHandlerCompartment(self.__state)
-        self.__next_compartment: EventHandlerCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/forward_events/forward_events.py b/framec_tests/python/src/forward_events/forward_events.py
@@ -28,8 +28,6 @@ def __init__(self):
 
         self.__compartment: 'ForwardEventsCompartment' = ForwardEventsCompartment('__forwardevents_state_S0')
         self.__next_compartment: 'ForwardEventsCompartment' = None
-        self.__compartment: ForwardEventsCompartment = ForwardEventsCompartment(self.__state)
-        self.__next_compartment: ForwardEventsCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/handler_calls/handler_calls.py b/framec_tests/python/src/handler_calls/handler_calls.py
@@ -24,8 +24,6 @@ def __init__(self):
 
         self.__compartment: 'HandlerCallsCompartment' = HandlerCallsCompartment('__handlercalls_state_Init')
         self.__next_compartment: 'HandlerCallsCompartment' = None
-        self.__compartment: HandlerCallsCompartment = HandlerCallsCompartment(self.__state)
-        self.__next_compartment: HandlerCallsCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/hierarchical/hierarchical.py b/framec_tests/python/src/hierarchical/hierarchical.py
@@ -24,8 +24,6 @@ def __init__(self):
 
         self.__compartment: 'HierarchicalCompartment' = HierarchicalCompartment('__hierarchical_state_I')
         self.__next_compartment: 'HierarchicalCompartment' = None
-        self.__compartment: HierarchicalCompartment = HierarchicalCompartment(self.__state)
-        self.__next_compartment: HierarchicalCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/hierarchical_guard/hierarchical_guard.py b/framec_tests/python/src/hierarchical_guard/hierarchical_guard.py
@@ -24,8 +24,6 @@ def __init__(self):
 
         self.__compartment: 'HierarchicalGuardCompartment' = HierarchicalGuardCompartment('__hierarchicalguard_state_I')
         self.__next_compartment: 'HierarchicalGuardCompartment' = None
-        self.__compartment: HierarchicalGuardCompartment = HierarchicalGuardCompartment(self.__state)
-        self.__next_compartment: HierarchicalGuardCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/match/match.py b/framec_tests/python/src/match/match.py
@@ -24,8 +24,6 @@ def __init__(self):
 
         self.__compartment: 'MatchCompartment' = MatchCompartment('__match_state_Init')
         self.__next_compartment: 'MatchCompartment' = None
-        self.__compartment: MatchCompartment = MatchCompartment(self.__state)
-        self.__next_compartment: MatchCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/match2/match2.py b/framec_tests/python/src/match2/match2.py
@@ -29,8 +29,6 @@ def __init__(self):
 
         self.__compartment: 'MatchTestsCompartment' = MatchTestsCompartment('__matchtests_state_A')
         self.__next_compartment: 'MatchTestsCompartment' = None
-        self.__compartment: MatchTestsCompartment = MatchTestsCompartment(self.__state)
-        self.__next_compartment: MatchTestsCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/naming/naming.py b/framec_tests/python/src/naming/naming.py
@@ -24,8 +24,6 @@ def __init__(self):
 
         self.__compartment: 'NamingCompartment' = NamingCompartment('__naming_state_Init')
         self.__next_compartment: 'NamingCompartment' = None
-        self.__compartment: NamingCompartment = NamingCompartment(self.__state)
-        self.__next_compartment: NamingCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/simple_handler_calls/simple_handler_calls.py b/framec_tests/python/src/simple_handler_calls/simple_handler_calls.py
@@ -24,8 +24,6 @@ def __init__(self):
 
         self.__compartment: 'SimpleHandlerCallsCompartment' = SimpleHandlerCallsCompartment('__simplehandlercalls_state_Init')
         self.__next_compartment: 'SimpleHandlerCallsCompartment' = None
-        self.__compartment: SimpleHandlerCallsCompartment = SimpleHandlerCallsCompartment(self.__state)
-        self.__next_compartment: SimpleHandlerCallsCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/state_context/state_context.py b/framec_tests/python/src/state_context/state_context.py
@@ -24,8 +24,6 @@ def __init__(self):
 
         self.__compartment: 'StateContextSmCompartment' = StateContextSmCompartment('__statecontextsm_state_Init')
         self.__next_compartment: 'StateContextSmCompartment' = None
-        self.__compartment: StateContextSmCompartment = StateContextSmCompartment(self.__state)
-        self.__next_compartment: StateContextSmCompartment = None
         self.__compartment.state_vars["w"] = 0
 
         # Initialize domain

diff --git a/framec_tests/python/src/state_context_stack/state_context_stack.py b/framec_tests/python/src/state_context_stack/state_context_stack.py
@@ -28,8 +28,6 @@ def __init__(self):
 
         self.__compartment: 'StateContextStackCompartment' = StateContextStackCompartment('__statecontextstack_state_A')
         self.__next_compartment: 'StateContextStackCompartment' = None
-        self.__compartment: StateContextStackCompartment = StateContextStackCompartment(self.__state)
-        self.__next_compartment: StateContextStackCompartment = None
         self.__compartment.state_vars["x"] = 0
 
         # Initialize domain

diff --git a/framec_tests/python/src/state_params/state_params.py b/framec_tests/python/src/state_params/state_params.py
@@ -24,8 +24,6 @@ def __init__(self):
 
         self.__compartment: 'StateParamsCompartment' = StateParamsCompartment('__stateparams_state_Init')
         self.__next_compartment: 'StateParamsCompartment' = None
-        self.__compartment: StateParamsCompartment = StateParamsCompartment(self.__state)
-        self.__next_compartment: StateParamsCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/state_stack/state_stack.py b/framec_tests/python/src/state_stack/state_stack.py
@@ -28,8 +28,6 @@ def __init__(self):
 
         self.__compartment: 'StateStackCompartment' = StateStackCompartment('__statestack_state_A')
         self.__next_compartment: 'StateStackCompartment' = None
-        self.__compartment: StateStackCompartment = StateStackCompartment(self.__state)
-        self.__next_compartment: StateStackCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/state_vars/state_vars.py b/framec_tests/python/src/state_vars/state_vars.py
@@ -24,8 +24,6 @@ def __init__(self):
 
         self.__compartment: 'StateVarsCompartment' = StateVarsCompartment('__statevars_state_Init')
         self.__next_compartment: 'StateVarsCompartment' = None
-        self.__compartment: StateVarsCompartment = StateVarsCompartment(self.__state)
-        self.__next_compartment: StateVarsCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/transition/transition.py b/framec_tests/python/src/transition/transition.py
@@ -24,8 +24,6 @@ def __init__(self):
 
         self.__compartment: 'TransitionSmCompartment' = TransitionSmCompartment('__transitionsm_state_S0')
         self.__next_compartment: 'TransitionSmCompartment' = None
-        self.__compartment: TransitionSmCompartment = TransitionSmCompartment(self.__state)
-        self.__next_compartment: TransitionSmCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/transition_params/transition_params.py b/framec_tests/python/src/transition_params/transition_params.py
@@ -24,8 +24,6 @@ def __init__(self):
 
         self.__compartment: 'TransitParamsCompartment' = TransitParamsCompartment('__transitparams_state_Init')
         self.__next_compartment: 'TransitParamsCompartment' = None
-        self.__compartment: TransitParamsCompartment = TransitParamsCompartment(self.__state)
-        self.__next_compartment: TransitParamsCompartment = None
 
         # Initialize domain
 

diff --git a/framec_tests/python/src/var_scope/var_scope.py b/framec_tests/python/src/var_scope/var_scope.py
@@ -24,8 +24,6 @@ def __init__(self):
 
         self.__compartment: 'VarScopeCompartment' = VarScopeCompartment('__varscope_state_Init')
         self.__next_compartment: 'VarScopeCompartment' = None
-        self.__compartment: VarScopeCompartment = VarScopeCompartment(self.__state)
-        self.__next_compartment: VarScopeCompartment = None
 
         # Initialize domain