Explorar o código

Update Rust roadmap + fix bug

Joeri Exelmans %!s(int64=4) %!d(string=hai) anos
pai
achega
92b0b887a3

+ 14 - 1
src/sccd/statechart/codegen/code_generation.txt

@@ -19,9 +19,11 @@ Roadmap
         - parent-first 
 
     - (DONE) goal: subset of SCCD tests passes:
-        semantics/big_step_maximality/test_flag_takeone.xml
+        semantics/big_step_maximality/test_flat_takeone.xml
         semantics/big_step_maximality/test_ortho_takeone.xml
         semantics/priority/test_source_parent.xml
+        semantics/priority/test_explicit_flat.xml
+        semantics/priority/test_explicit_ortho.xml
 
     - no history
     - no action language
@@ -29,6 +31,17 @@ Roadmap
       - guards always true, actions no effect
     - no event parameters
 
+
+  Milestone 2: Minimal support for semantic variability:
+
+    - Priority: Child-first
+    - Big-Step Maximality: Take Many
+
+    - goal: following tests should pass:
+        semantics/priority/test_source_child.xml
+        semantics/big_step_maximality/test_flat_takemany.xml
+        semantics/big_step_maximality/test_ortho_takemany.xml
+
 Implementation
 ==============
 

+ 1 - 1
src/sccd/statechart/codegen/rust.py

@@ -317,7 +317,7 @@ def compile_statechart(sc: Statechart, globals: Globals, w: IndentingWriter):
                     elif isinstance(s, State):
                         if len(s.children) > 0:
                             # Or-state
-                            w.writeln("%s::enter_actions(output);" & ident_type(s))
+                            w.writeln("%s::enter_actions(output);" % ident_type(s))
                             write_enter(enter_path[1:]) # continue recursively with the next child on the enter path
                         else:
                             # The following should never occur