Major refactoring

- Moved tests
- Changes to promela datamodel
- Implemented Trie

1 files changed, 67 insertions, 0 deletions

diff --git a/test/w3c/xpath/test240.scxml b/test/w3c/xpath/test240.scxml
new file mode 100644
index 0000000..ddf92c6
--- /dev/null
+++ b/test/w3c/xpath/test240.scxml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- test that datamodel values can be specified both by 'namelist' and by <param>.
+invoked child will return success if its Var1 is set to 1, failure otherwise. This
+test will fail schema validation because of the multiple occurences of Var1, but
+should run correctly. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="xpath">
+<datamodel>
+  <data id="Var1" expr="1"/>
+  </datamodel>
+     
+<state id="s0" initial="s01">
+  <onentry>
+    <send event="timeout" delay="2s"/>
+    </onentry>
+    <transition event="timeout" target="fail"/>
+   
+   <state id="s01">
+     <invoke type="http://www.w3.org/TR/scxml/" namelist="$Var1">
+       <content>
+         <scxml initial="sub01" version="1.0" datamodel="xpath">
+           <datamodel>
+             <data id="Var1" expr="0"/>
+               </datamodel>
+                   <state id="sub01">
+                      <transition cond="$Var1/data/text() =1" target="subFinal1">
+                     <send target="#_parent" event="success"/>
+                     </transition>
+                  <transition target="subFinal1">
+                 <send target="#_parent" event="failure"/>
+                 </transition>
+               </state>
+         <final id="subFinal1"/>
+          </scxml>
+        </content>
+        </invoke>
+     <transition event="success" target="s02"/>
+     <transition event="failure" target="fail"/>
+   </state>
+
+<state id="s02">
+      <invoke type="http://www.w3.org/TR/scxml/">
+          <param name="Var1" expr="1"/>
+       <content>
+         <scxml initial="sub02" version="1.0" datamodel="xpath">
+           <datamodel>
+             <data id="Var1" expr="0"/>
+               </datamodel>
+   
+                  <state id="sub02">
+                      <transition cond="$Var1/text() =1" target="subFinal2">
+                     <send target="#_parent" event="success"/>
+                     </transition>
+                  <transition target="subFinal1">
+                 <send target="#_parent" event="failure"/>
+                 </transition>
+               </state>
+         <final id="subFinal2"/>
+          </scxml>
+        </content>
+        </invoke>
+     <transition event="success" target="pass"/>
+     <transition event="failure" target="fail"/>
+  </state>
+ 
+</state>
+ 
+<final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final>
+<final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final>
+</scxml>
\ No newline at end of file