commons-commits mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=954063&view=rev
Log:
Still broken, but making progress.

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

Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/src/scxml/cgf/SCXMLCompiler.js
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/src/scxml/cgf/SCXMLCompiler.js?rev=954063&r1=954062&r2=954063&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/src/scxml/cgf/SCXMLCompiler.js (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/src/scxml/cgf/SCXMLCompiler.js Sat Jun 12 19:35:34
2010
@@ -329,11 +329,11 @@ require.def("src/scxml/cgf/SCXMLCompiler
 
 					//we use these funky-looking variables to avoid namespace collisions in the below query
 					var $s = sourceState, $t = transitionTarget;
-					if(conf.parallelRegions.( 
+					if(!conf.parallelRegions.( 
 						descendants($s.localName()).contains($s) &&
 							descendants($t.localName()).contains($t)).length()){ 
 
-						transition.@msdl::doesNotExitParallelRegion = true;
+						transition.@msdl::exitsParallelRegion = true;
 					}
 					
 

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=954063&r1=954062&r2=954063&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:34 2010
@@ -562,7 +562,7 @@
 			<when test="local-name($s) = 'initial' or local-name($s) = 'history' or 
 						( $s/@c:isBasic and 
 							( not($s/@c:isParallelSubstate) or 
-								($s/@c:isParallelSubstate and $t/c:doesNotExitParallelRegion)))">
+								($s/@c:isParallelSubstate and not($t/c:exitsParallelRegion))))">
 				<for-each select="$t/c:exitpath/c:state">
 					<value-of select="."/>.exitAction();
 				</for-each>
@@ -587,7 +587,7 @@
 			<copy-of select="$s"/>
 		</message>
 		<choose>
-			<when test="$s/@c:isParallelSubstate and $t/@c:doesNotExitParallelRegion">
+			<when test="$s/@c:isParallelSubstate and not($t/@c:exitsParallelRegion)">
 				<call-template name="genParallelSubstateConfigurationSetString">
 					<with-param name="s" select="$s"/>
 					<with-param name="t" select="$t"/>



Mime
View raw message