Reactiveated umundo invoker

2 files changed, 51 insertions, 102 deletions

diff --git a/test/samples/uscxml/proto/JSON.proto b/test/samples/uscxml/proto/JSON.proto
new file mode 100644
index 0000000..255ab79
--- /dev/null
+++ b/test/samples/uscxml/proto/JSON.proto
@@ -0,0 +1,6 @@
+message JSONProto {
+	repeated JSONProto compound = 1;
+	optional string key = 2;
+	optional string atom = 3;
+	optional bool verbatim = 4;
+}
diff --git a/test/samples/uscxml/test-umundo-s11n.scxml b/test/samples/uscxml/test-umundo-s11n.scxml
index f4a9a02..561cca7 100644
--- a/test/samples/uscxml/test-umundo-s11n.scxml
+++ b/test/samples/uscxml/test-umundo-s11n.scxml
@@ -1,115 +1,58 @@
 <scxml datamodel="ecmascript">
-  <script>
-	<![CDATA[
-    function dump(object, level) {
-        if (!level) level = 0;
-
-        var padding = "";
-        for (var j=0;j < level+1;j++) padding += "    ";
-
-        if (typeof(obj) == 'object') {  
-            for (var item in obj) {
-                var value = obj[item];
-
-                if(typeof(value) == 'object') { 
-                    print (padding + "'" + item + "' ...\n");
-                    print (dump (value, level+1));
-                } else {
-                    print (padding + "'" + item + "' => \"" + value + "\"\n");
-                }
-            }
-        } else { 
-            print("===> " + object + " <===(" + typeof(object) + ")");
-        }
-    }
-	]]>
-  </script>
+	<script src="http://uscxml.tk.informatik.tu-darmstadt.de/scripts/dump.js" />
   <state id="start">
 		<invoke type="umundo" id="scxml.umundo">
 		  <param name="types" expr="'proto/Test.proto'" />
 		  <param name="channel" expr="'types'" />
+		  <param name="domain" expr="''" />
 			<finalize>
 	      <script>
 	        dump(_event);
 	      </script>
-	      <send target="#_scxml.umundo" delay="0s" event="dump.event">
-	        <param name="type" expr="_event.data.type" />
-					<content>_event.data</content>
-				</send>
 			</finalize>
 		</invoke>
-		<onentry-off>
-      <!-- The round brackets are needed to evaluate the JSON object as an expression! -->
-      <send target="#_scxml.umundo" delay="3s" event="dump.event">
-        <param name="type" expr="'AllTypes'" />
-        <content>
-          ({
-            "doubleType": 1.0,
-            "floatType": 2.0,
-            "int32Type": -3,
-            "int64Type": -4,
-            "uint32Type": 5,
-            "uint64Type": 6,
-            "sint32Type": -7,
-            "sint64Type": -8,
-            "fixed32Type": 9,
-            "fixed64Type": 10,
-            "sfixed32Type": -11,
-            "sfixed64Type": -12,
-            "boolType": false,
-            "stringType": 'string',
-            "bytesType": 'bytes',
-          })
-        </content>
-      </send>
-      <send target="#_scxml.umundo" delay="3s" event="dump.event">
-        <param name="type" expr="'RepeatedTypes'" />
-        <content>
-          ({
-            "doubleType": [ 1.0, 2.0 ],
-            "floatType": [ 2.0, 3.0 ],
-            "int32Type": [ -3, -4 ],
-            "int64Type": [ -4, -5 ],
-            "uint32Type": [ 5, 6 ],
-            "uint64Type": [ 6, 7 ],
-            "sint32Type": [ -7, -8 ],
-            "sint64Type": [ -8, -9 ],
-            "fixed32Type": [ 9, 10 ],
-            "fixed64Type": [ 10, 11 ],
-            "sfixed32Type": [ -11, -12 ],
-            "sfixed64Type": [ -12, -13 ],
-            "boolType": [ false, true ],
-            "stringType": [ '1st string', '2nd string' ],
-            "bytesType": [ '1st bytes', '2nd bytes' ],
-            "repeatedMessage": [{
-              "doubleType": [ 1.0, 2.0 ],
-              "floatType": [ 2.0, 3.0 ],
-              "int32Type": [ -3, -4 ],
-              "int64Type": [ -4, -5 ],
-              "uint32Type": [ 5, 6 ],
-              "uint64Type": [ 6, 7 ],
-              "sint32Type": [ -7, -8 ],
-              "sint64Type": [ -8, -9 ],
-              "fixed32Type": [ 9, 10 ],
-              "fixed64Type": [ 10, 11 ],
-              "sfixed32Type": [ -11, -12 ],
-              "sfixed64Type": [ -12, -13 ],
-              "boolType": [ false, true ],
-              "stringType": [ '1st string', '2nd string' ],
-              "bytesType": [ '1st bytes', '2nd bytes' ],
-            }],
-          })
-        </content>
-      </send>
-		</onentry-off>
-		<transition target="dump" event="dump.event" />
-  </state>
-  <state id="dump">
-    <onentry>
-      <script>
-        dump(_event);
-      </script>
-    </onentry>
-		<transition target="dump" event="dump.event" />
+		<state id="idle">
+			<transition event="umundo.sub.added">
+	      <send target="#_scxml.umundo" event="dump.event">
+	        <!-- param name="type" expr="'RepeatedTypes'" / -->
+	        <content>
+	          ({
+	            "doubleType": [ 1.0, 2.0 ],
+	            "floatType": [ 2.0, 3.0 ],
+	            "int32Type": [ -3, -4 ],
+	            "int64Type": [ -4, -5 ],
+	            "uint32Type": [ 5, 6 ],
+	            "uint64Type": [ 6, 7 ],
+	            "sint32Type": [ -7, -8 ],
+	            "sint64Type": [ -8, -9 ],
+	            "fixed32Type": [ 9, 10 ],
+	            "fixed64Type": [ 10, 11 ],
+	            "sfixed32Type": [ -11, -12 ],
+	            "sfixed64Type": [ -12, -13 ],
+	            "boolType": [ false, true ],
+	            "stringType": [ '1st string', '2nd string' ],
+	            "bytesType": [ '1st bytes', '2nd bytes' ],
+	            "repeatedMessage": [{
+	              "doubleType": [ 1.0, 2.0 ],
+	              "floatType": [ 2.0, 3.0 ],
+	              "int32Type": [ -3, -4 ],
+	              "int64Type": [ -4, -5 ],
+	              "uint32Type": [ 5, 6 ],
+	              "uint64Type": [ 6, 7 ],
+	              "sint32Type": [ -7, -8 ],
+	              "sint64Type": [ -8, -9 ],
+	              "fixed32Type": [ 9, 10 ],
+	              "fixed64Type": [ 10, 11 ],
+	              "sfixed32Type": [ -11, -12 ],
+	              "sfixed64Type": [ -12, -13 ],
+	              "boolType": [ false, true ],
+	              "stringType": [ '1st string', '2nd string' ],
+	              "bytesType": [ '1st bytes', '2nd bytes' ],
+	            }],
+	          })
+	        </content>
+	      </send>
+			</transition>
+		</state>
   </state>
 </scxml>
\ No newline at end of file