Add some more test files

test/new_test_files/event_lifeline/ortho_nextbs.test.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<test>
+  <statechart src="../models/ortho_intevent.statechart.xml">
+    <override_semantics
+      big_step_maximality="*"
+      internal_event_lifeline="queue"/>
+  </statechart>
+  <output>
+    <big_step>
+      <event name="in_b" port="out"/>
+    </big_step>
+    <big_step>
+      <event name="in_c" port="out"/>
+      <event name="in_e" port="out"/>
+    </big_step>
+  </output>
+</test>

test/new_test_files/event_lifeline/ortho_nextcs_takemany.test.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<test>
+  <statechart src="../models/ortho_intevent.statechart.xml">
+    <override_semantics
+      big_step_maximality="take_many"
+      internal_event_lifeline="next_combo_step"/>
+  </statechart>
+  <output>
+    <big_step>
+      <event name="in_b" port="out"/>
+      <event name="in_c" port="out"/>
+      <event name="in_e" port="out"/>
+    </big_step>
+  </output>
+</test>

test/new_test_files/event_lifeline/ortho_nextcs_takeone.test.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<test>
+  <statechart src="../models/ortho_intevent.statechart.xml">
+    <override_semantics
+      big_step_maximality="take_one"
+      internal_event_lifeline="next_combo_step"/>
+  </statechart>
+  <output>
+    <big_step>
+      <event name="in_b" port="out"/>
+    </big_step>
+  </output>
+</test>

test/new_test_files/event_lifeline/ortho_nextss.test.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<test>
+  <statechart src="../models/ortho_intevent.statechart.xml">
+    <override_semantics
+      big_step_maximality="*"
+      internal_event_lifeline="next_small_step"/>
+  </statechart>
+  <output>
+    <big_step>
+      <event name="in_b" port="out"/>
+      <event name="in_e" port="out"/>
+    </big_step>
+  </output>
+</test>

test/new_test_files/models/flat_intevent.statechart.svg

@@ -42,7 +42,7 @@
 <title>_a&#45;&gt;_b</title>
 <path fill="none" stroke="#000000" d="M53,-147.8711C53,-142.4482 53,-136.3229 53,-130.2494"/>
 <polygon fill="#000000" stroke="#000000" points="56.5001,-130.21 53,-120.21 49.5001,-130.21 56.5001,-130.21"/>
-<text text-anchor="start" x="53" y="-131" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">^f &#160;&#160;</text>
+<text text-anchor="start" x="53" y="-131" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">^e &#160;&#160;</text>
 </g>
 <!-- _c -->
 <g id="node4" class="node">
@@ -58,7 +58,7 @@
 <title>_b&#45;&gt;_c</title>
 <path fill="none" stroke="#000000" d="M53,-73.9916C53,-68.476 53,-62.474 53,-56.5881"/>
 <polygon fill="#000000" stroke="#000000" points="56.5001,-56.249 53,-46.2491 49.5001,-56.2491 56.5001,-56.249"/>
-<text text-anchor="start" x="53" y="-57" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">f &#160;&#160;</text>
+<text text-anchor="start" x="53" y="-57" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">e &#160;&#160;</text>
 </g>
 </g>
 </svg>

test/new_test_files/models/flat_intevent.statechart.xml

@@ -6,14 +6,14 @@
     <state initial="a">
       <state id="a">
         <transition target="/b">
-          <raise event="f"/>
+          <raise event="e"/>
         </transition>
       </state>
       <state id="b">
         <onentry>
           <raise event="in_b" port="out"/>
         </onentry>
-        <transition event="f" target="/c"/>
+        <transition event="e" target="/c"/>
       </state>
       <state id="c">
         <onentry>

test/new_test_files/models/ortho_intevent.statechart.svg

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 2.40.1 (20161225.0304)
+ -->
+<!-- Title: state transitions Pages: 1 -->
+<svg width="300pt" height="540pt"
+ viewBox="0.00 0.00 300.00 540.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 536)">
+<title>state transitions</title>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-536 296,-536 296,4 -4,4"/>
+<g id="clust1" class="cluster">
+<title>cluster__p</title>
+<path fill="none" stroke="#000000" stroke-width="2" d="M20,-8C20,-8 272,-8 272,-8 278,-8 284,-14 284,-20 284,-20 284,-481 284,-481 284,-487 278,-493 272,-493 272,-493 20,-493 20,-493 14,-493 8,-487 8,-481 8,-481 8,-20 8,-20 8,-14 14,-8 20,-8"/>
+<text text-anchor="start" x="142.6646" y="-474.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">p</text>
+</g>
+<g id="clust2" class="cluster">
+<title>cluster__p_o0</title>
+<polygon fill="none" stroke="#000000" stroke-dasharray="5,2" points="154,-16 154,-455 276,-455 276,-16 154,-16"/>
+<text text-anchor="start" x="208.8292" y="-436.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">o0</text>
+</g>
+<g id="clust3" class="cluster">
+<title>cluster__p_o1</title>
+<polygon fill="none" stroke="#000000" stroke-dasharray="5,2" points="24,-152 24,-455 146,-455 146,-152 24,-152"/>
+<text text-anchor="start" x="78.8292" y="-436.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">o1</text>
+</g>
+<!-- __initial -->
+<g id="node1" class="node">
+<title>__initial</title>
+<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="16" cy="-526.5" rx="5.5" ry="5.5"/>
+</g>
+<!-- _p -->
+<!-- __initial&#45;&gt;_p -->
+<g id="edge1" class="edge">
+<title>__initial&#45;&gt;_p</title>
+<path fill="none" stroke="#000000" d="M16,-520.9533C16,-516.7779 16,-510.5043 16,-503.0332"/>
+<polygon fill="#000000" stroke="#000000" points="19.5001,-502.9971 16,-492.9971 12.5001,-502.9972 19.5001,-502.9971"/>
+<text text-anchor="middle" x="17.3895" y="-504" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
+</g>
+<!-- _p_o0 -->
+<!-- _p_o0_initial -->
+<g id="node4" class="node">
+<title>_p_o0_initial</title>
+<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="215" cy="-411.5" rx="5.5" ry="5.5"/>
+</g>
+<!-- _p_o0_a -->
+<g id="node5" class="node">
+<title>_p_o0_a</title>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="243,-324 187,-324 187,-288 243,-288 243,-324"/>
+<text text-anchor="start" x="211.6646" y="-302.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">a</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M199.3333,-289C199.3333,-289 230.6667,-289 230.6667,-289 236.3333,-289 242,-294.6667 242,-300.3333 242,-300.3333 242,-311.6667 242,-311.6667 242,-317.3333 236.3333,-323 230.6667,-323 230.6667,-323 199.3333,-323 199.3333,-323 193.6667,-323 188,-317.3333 188,-311.6667 188,-311.6667 188,-300.3333 188,-300.3333 188,-294.6667 193.6667,-289 199.3333,-289"/>
+</g>
+<!-- _p_o0_initial&#45;&gt;_p_o0_a -->
+<g id="edge2" class="edge">
+<title>_p_o0_initial&#45;&gt;_p_o0_a</title>
+<path fill="none" stroke="#000000" d="M215,-405.8288C215,-401.1736 215,-394.4097 215,-388.5 215,-388.5 215,-388.5 215,-341.5 215,-339.1079 215,-336.6252 215,-334.1342"/>
+<polygon fill="#000000" stroke="#000000" points="218.5001,-334.0597 215,-324.0598 211.5001,-334.0598 218.5001,-334.0597"/>
+<text text-anchor="middle" x="216.3895" y="-362" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
+</g>
+<!-- _p_o0_b -->
+<g id="node6" class="node">
+<title>_p_o0_b</title>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="268,-206 162,-206 162,-160 268,-160 268,-206"/>
+<text text-anchor="start" x="211.6646" y="-189.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">b</text>
+<text text-anchor="start" x="167.5022" y="-169.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">onentry/ ^out.in_b</text>
+<polygon fill="#000000" stroke="#000000" points="162,-183 162,-183 268,-183 268,-183 162,-183"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M175,-161C175,-161 255,-161 255,-161 261,-161 267,-167 267,-173 267,-173 267,-193 267,-193 267,-199 261,-205 255,-205 255,-205 175,-205 175,-205 169,-205 163,-199 163,-193 163,-193 163,-173 163,-173 163,-167 169,-161 175,-161"/>
+</g>
+<!-- _p_o0_a&#45;&gt;_p_o0_b -->
+<g id="edge3" class="edge">
+<title>_p_o0_a&#45;&gt;_p_o0_b</title>
+<path fill="none" stroke="#000000" d="M215,-287.9402C215,-282.3497 215,-276.1701 215,-270.5 215,-270.5 215,-270.5 215,-223.5 215,-221.127 215,-218.6757 215,-216.2081"/>
+<polygon fill="#000000" stroke="#000000" points="218.5001,-216.1306 215,-206.1306 211.5001,-216.1306 218.5001,-216.1306"/>
+<text text-anchor="start" x="215" y="-244" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">^e &#160;&#160;</text>
+</g>
+<!-- _p_o0_c -->
+<g id="node7" class="node">
+<title>_p_o0_c</title>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="268,-70 162,-70 162,-24 268,-24 268,-70"/>
+<text text-anchor="start" x="212" y="-53.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">c</text>
+<text text-anchor="start" x="167.8376" y="-33.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">onentry/ ^out.in_c</text>
+<polygon fill="#000000" stroke="#000000" points="162,-47 162,-47 268,-47 268,-47 162,-47"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M175,-25C175,-25 255,-25 255,-25 261,-25 267,-31 267,-37 267,-37 267,-57 267,-57 267,-63 261,-69 255,-69 255,-69 175,-69 175,-69 169,-69 163,-63 163,-57 163,-57 163,-37 163,-37 163,-31 169,-25 175,-25"/>
+</g>
+<!-- _p_o0_b&#45;&gt;_p_o0_c -->
+<g id="edge4" class="edge">
+<title>_p_o0_b&#45;&gt;_p_o0_c</title>
+<path fill="none" stroke="#000000" d="M215,-159.8105C215,-151.7932 215,-142.7517 215,-134.5 215,-134.5 215,-134.5 215,-87.5 215,-85.127 215,-82.6757 215,-80.2081"/>
+<polygon fill="#000000" stroke="#000000" points="218.5001,-80.1306 215,-70.1306 211.5001,-80.1306 218.5001,-80.1306"/>
+<text text-anchor="start" x="215" y="-108" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">e &#160;&#160;</text>
+</g>
+<!-- _p_o1 -->
+<!-- _p_o1_initial -->
+<g id="node9" class="node">
+<title>_p_o1_initial</title>
+<ellipse fill="#000000" stroke="#000000" stroke-width="2" cx="85" cy="-411.5" rx="5.5" ry="5.5"/>
+</g>
+<!-- _p_o1_d -->
+<g id="node10" class="node">
+<title>_p_o1_d</title>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="113,-324 57,-324 57,-288 113,-288 113,-324"/>
+<text text-anchor="start" x="81.6646" y="-302.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">d</text>
+<path fill="none" stroke="#000000" stroke-width="2" d="M69.3333,-289C69.3333,-289 100.6667,-289 100.6667,-289 106.3333,-289 112,-294.6667 112,-300.3333 112,-300.3333 112,-311.6667 112,-311.6667 112,-317.3333 106.3333,-323 100.6667,-323 100.6667,-323 69.3333,-323 69.3333,-323 63.6667,-323 58,-317.3333 58,-311.6667 58,-311.6667 58,-300.3333 58,-300.3333 58,-294.6667 63.6667,-289 69.3333,-289"/>
+</g>
+<!-- _p_o1_initial&#45;&gt;_p_o1_d -->
+<g id="edge5" class="edge">
+<title>_p_o1_initial&#45;&gt;_p_o1_d</title>
+<path fill="none" stroke="#000000" d="M85,-405.8288C85,-401.1736 85,-394.4097 85,-388.5 85,-388.5 85,-388.5 85,-341.5 85,-339.1079 85,-336.6252 85,-334.1342"/>
+<polygon fill="#000000" stroke="#000000" points="88.5001,-334.0597 85,-324.0598 81.5001,-334.0598 88.5001,-334.0597"/>
+<text text-anchor="middle" x="86.3895" y="-362" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000"> </text>
+</g>
+<!-- _p_o1_e -->
+<g id="node11" class="node">
+<title>_p_o1_e</title>
+<polygon fill="transparent" stroke="transparent" stroke-width="2" points="138,-206 32,-206 32,-160 138,-160 138,-206"/>
+<text text-anchor="start" x="81.6646" y="-189.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">e</text>
+<text text-anchor="start" x="37.5022" y="-169.2" font-family="Helvetica,sans-Serif" font-size="12.00" fill="#000000">onentry/ ^out.in_e</text>
+<polygon fill="#000000" stroke="#000000" points="32,-183 32,-183 138,-183 138,-183 32,-183"/>
+<path fill="none" stroke="#000000" stroke-width="2" d="M45,-161C45,-161 125,-161 125,-161 131,-161 137,-167 137,-173 137,-173 137,-193 137,-193 137,-199 131,-205 125,-205 125,-205 45,-205 45,-205 39,-205 33,-199 33,-193 33,-193 33,-173 33,-173 33,-167 39,-161 45,-161"/>
+</g>
+<!-- _p_o1_d&#45;&gt;_p_o1_e -->
+<g id="edge6" class="edge">
+<title>_p_o1_d&#45;&gt;_p_o1_e</title>
+<path fill="none" stroke="#000000" d="M85,-287.9402C85,-282.3497 85,-276.1701 85,-270.5 85,-270.5 85,-270.5 85,-223.5 85,-221.127 85,-218.6757 85,-216.2081"/>
+<polygon fill="#000000" stroke="#000000" points="88.5001,-216.1306 85,-206.1306 81.5001,-216.1306 88.5001,-216.1306"/>
+<text text-anchor="start" x="85" y="-244" font-family="Helvetica,sans-Serif" font-size="10.00" fill="#000000">e &#160;&#160;</text>
+</g>
+</g>
+</svg>

test/new_test_files/models/ortho_intevent.statechart.xml

@@ -0,0 +1,36 @@
+<statechart>
+  <tree>
+    <state>
+      <parallel id="p">
+        <state id="o0" initial="a">
+          <state id="a">
+            <transition target="../b">
+              <raise event="e"/>
+            </transition>
+          </state>
+          <state id="b">
+            <onentry>
+              <raise event="in_b" port="out"/>
+            </onentry>
+            <transition event="e" target="../c"/>
+          </state>
+          <state id="c">
+            <onentry>
+              <raise event="in_c" port="out"/>
+            </onentry>
+          </state>
+        </state>
+        <state id="o1" initial="d">
+          <state id="d">
+            <transition event="e" target="../e"/>
+          </state>
+          <state id="e">
+            <onentry>
+              <raise event="in_e" port="out"/>
+            </onentry>
+          </state>
+        </state>
+      </parallel>
+    </state>
+  </tree>
+</statechart>