Major refactoring

- Moved tests
- Changes to promela datamodel
- Implemented Trie

1 files changed, 57 insertions, 0 deletions

diff --git a/test/w3c/txml/test506.txml b/test/w3c/txml/test506.txml
new file mode 100644
index 0000000..b820ad5
--- /dev/null
+++ b/test/w3c/txml/test506.txml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+
+<!-- test that an internal transition whose targets are not proper descendants of its source state
+behaves like an external transition -->
+
+<scxml  initial="s1" version="1.0" conf:datamodel=""  xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance">
+<datamodel>
+  <data conf:id="1" conf:expr="0"/>  <!-- how often we have exited s2 -->
+  <data conf:id="2" conf:expr="0"/>  <!-- how often we have exited s21 -->
+  <data conf:id="3" conf:expr="0"/>  <!-- how often the transition for foo has been taken -->
+  </datamodel>
+    
+ <state id="s1">
+   <onentry>
+    <raise event="foo"/>
+    <raise event="bar"/>
+    </onentry>
+   <transition target="s2"/>
+   </state>
+
+<state id="s2" initial="s21">
+  <onexit>
+    <conf:incrementID id="1"/>
+    </onexit>
+  <transition event="foo" type="internal" target="s2">
+     <conf:incrementID id="3"/>
+     </transition>
+     
+   <!-- make sure the transition on foo was actually taken --> 
+  <transition event="bar" conf:idVal="3=1" target="s3"/>
+  <transition event="bar" conf:targetfail=""/>
+  
+ <state id="s21">
+   <onexit>
+   <conf:incrementID id="2"/>
+   </onexit>
+  </state>
+
+</state>
+  
+<state id="s3">
+  <!-- make sure that s2 was exited twice -->
+    <transition conf:idVal="1=2" target="s4"/>
+    <transition conf:targetfail=""/>
+ </state> 
+ 
+<state id="s4">
+  <!-- make sure that s21 was exited twice -->
+    <transition conf:idVal="2=2" conf:targetpass=""/>
+    <transition conf:targetfail=""/>
+ </state> 
+  
+  
+<conf:pass/>
+<conf:fail/>
+     
+</scxml>
\ No newline at end of file