Major Refactoring v2.0

1 files changed, 21 insertions, 11 deletions

diff --git a/test/w3c/lua/test156.scxml b/test/w3c/lua/test156.scxml
index 6eaff52..7581b42 100644
--- a/test/w3c/lua/test156.scxml
+++ b/test/w3c/lua/test156.scxml
@@ -1,23 +1,33 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- test that an error causes the foreach to stop execution.  The second piece of executable content
 should cause an error, so var1 should be incremented only once -->
-<scxml xmlns="http://www.w3.org/2005/07/scxml" initial="s0" version="1.0" datamodel="lua">
+<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" version="1.0" datamodel="lua">
   <datamodel>
-    <data expr="0" id="testvar1"/>
-    <data id="testvar2"/>
-    <data id="testvar3">{1,2,3}</data>
+    <data id="Var1" expr="0"/>
+    <data id="Var2"/>
+    <data id="Var3">
+  {1,2,3}
+  </data>
   </datamodel>
   <state id="s0">
     <onentry>
-      <foreach array="testvar3" item="testvar2">
-        <assign location="testvar1" expr="testvar1+1"/>
+      <foreach item="Var2" array="Var3">
+        <assign xmlns:scxml="http://www.w3.org/2005/07/scxml" location="Var1" expr="Var1 + 1"/>
         <!-- assign an illegal value to a non-existent var -->
-        <assign expr="!" location="testvar5"/>
+        <assign location="Var5" expr="return"/>
       </foreach>
     </onentry>
-    <transition cond="testvar1 == 1" target="pass"/>
+    <transition cond="Var1==1" target="pass"/>
     <transition target="fail"/>
   </state>
-  <final id="pass"/>
-  <final id="fail"/>
+  <final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="pass">
+    <onentry>
+      <log label="Outcome" expr="'pass'"/>
+    </onentry>
+  </final>
+  <final xmlns:scxml="http://www.w3.org/2005/07/scxml" id="fail">
+    <onentry>
+      <log label="Outcome" expr="'fail'"/>
+    </onentry>
+  </final>
 </scxml>