commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbe...@apache.org
Subject svn commit: r954059 - in /commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt: AbstractStatechartGenerator.xsl StatePatternStatechartGenerator.xsl
Date Sat, 12 Jun 2010 19:35:03 GMT
Author: jbeard
Date: Sat Jun 12 19:35:03 2010
New Revision: 954059

URL: http://svn.apache.org/viewvc?rev=954059&view=rev
Log:
Generating no errors. Now need to add transforms to SCXMLCompiler that we no longer do in
the template.

Modified:
    commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/AbstractStatechartGenerator.xsl
    commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/StatePatternStatechartGenerator.xsl

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/AbstractStatechartGenerator.xsl
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/AbstractStatechartGenerator.xsl?rev=954059&r1=954058&r2=954059&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/AbstractStatechartGenerator.xsl (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/AbstractStatechartGenerator.xsl Sat
Jun 12 19:35:03 2010
@@ -447,7 +447,7 @@
 				topState.enterAction();
 			}
 		</text>
-	</template>
+	</variable>
 
 	<variable name="shallowHistoryEnterAction">
 		<text>
@@ -457,7 +457,7 @@
 
 			newConfiguration.push(topState.initial ? topState.initial : topState );	
 		</text>
-	</template>
+	</variable>
 
 	<variable name="genNonBasicTriggerDispatcherExitBlockInnerForEach">
 		<text>
@@ -496,6 +496,7 @@
 						console.log("return to last shallow configuration");')
 					</otherwise>
 				</choose>
+			</if>
 					
 				
 			<!--gen executable content for t-->
@@ -528,7 +529,7 @@
 				<with-param name="t" select="$t"/>
 			</call-template>
 		}
-	}
+	</template>
 
 	<template name="genHistoryTriggerDispatcherInnerForEach">
 		<param name="isDeep"/>
@@ -556,7 +557,7 @@
 		<param name="t"/> 
 
 		var statesExited = [];
-		var lca = {t.msdl::lca.text()};
+		var lca = <value-of select="$t/c:lca"/>;
 
 		<value-of select="$genNonBasicTriggerDispatcherExitBlockIteratorExpression"/>.forEach(function(state){
 			<value-of select="$genNonBasicTriggerDispatcherExitBlockInnerForEach"/>
@@ -575,7 +576,7 @@
 		<param name="s"/>
 		<param name="t"/>
 	
-		<if test="not($t/@event)>
+		<if test="not($t/@event)">
 			hasTakenDefaultTransition = true;
 		</if>
 
@@ -593,7 +594,7 @@
 			</when>
 			<otherwise>
 				<call-template name="genNonBasicTriggerDispatcherExitBlock">
-					<param name="t" select="$t"/>
+					<with-param name="t" select="$t"/>
 				</call-template>
 			</otherwise>
 		</choose>

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/StatePatternStatechartGenerator.xsl
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/StatePatternStatechartGenerator.xsl?rev=954059&r1=954058&r2=954059&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/StatePatternStatechartGenerator.xsl
(original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/StatePatternStatechartGenerator.xsl
Sat Jun 12 19:35:03 2010
@@ -73,8 +73,8 @@
 	</template>
 
 	<template name="genTriggerDispatcherContext">
-		<params name="s"/>
-		<params name="t"/>
+		<param name="s"/>
+		<param name="t"/>
 
 		<variable name="eventName">
 			<choose>
@@ -89,7 +89,7 @@
 
 		this.<value-of select="$eventName"/> = function(){
 			<choose>
-				<when test="$s/@m:isHistory">
+				<when test="local-name($s) = 'history'">
 					<call-template name="genHistoryTriggerDispatcher">
 						<with-param name="s" select="$s"/>
 						<with-param name="t" select="$t"/>
@@ -125,5 +125,3 @@
 	</template>
 
 </stylesheet>
-
-



Mime
View raw message