You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by jb...@apache.org on 2010/06/12 21:42:26 UTC
svn commit: r954118 - in /commons/sandbox/gsoc/2010/scxml-js/trunk:
src/scxml/cgf/SCXMLCompiler.js test/testScript.sh
test/xslt/flattenTransitions.xsl
Author: jbeard
Date: Sat Jun 12 19:42:26 2010
New Revision: 954118
URL: http://svn.apache.org/viewvc?rev=954118&view=rev
Log:
Fixed last bug for table pattern. Had to do with transformation order. Works now.
Modified:
commons/sandbox/gsoc/2010/scxml-js/trunk/src/scxml/cgf/SCXMLCompiler.js
commons/sandbox/gsoc/2010/scxml-js/trunk/test/testScript.sh
commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/flattenTransitions.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=954118&r1=954117&r2=954118&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:42:26 2010
@@ -68,11 +68,10 @@ require.def("src/scxml/cgf/SCXMLCompiler
"test/xslt/computeLCA",
"test/xslt/transformIf",
"test/xslt/appendStateInformation",
- "test/xslt/appendBasicStateInformation",
- "test/xslt/appendTransitionInformation"];
+ "test/xslt/appendBasicStateInformation"];
- var enumeratedIRFilters = baseIRFilters.concat([ "test/xslt/nameTransitions",
- "test/xslt/flattenTransitions",
+ var enumeratedIRFilters = baseIRFilters.concat([ "test/xslt/flattenTransitions",
+ "test/xslt/nameTransitions",
"test/xslt/numberStatesAndTransitions" ]);
@@ -93,7 +92,9 @@ require.def("src/scxml/cgf/SCXMLCompiler
break;
}
- var allFilters = irFiltersXsl.concat(codeGeneratorXsl);
+ var allFilters = irFiltersXsl
+ .concat("test/xslt/appendTransitionInformation")
+ .concat(codeGeneratorXsl);
//do transforms
var tFactory = TransformerFactory.newInstance();
Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/test/testScript.sh
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/test/testScript.sh?rev=954118&r1=954117&r2=954118&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/test/testScript.sh (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/test/testScript.sh Sat Jun 12 19:42:26 2010
@@ -8,9 +8,9 @@ xsltproc xslt/computeLCA.xsl - | \
xsltproc xslt/transformIf.xsl - | \
xsltproc xslt/appendStateInformation.xsl - | \
xsltproc xslt/appendBasicStateInformation.xsl - | \
+xsltproc xslt/flattenTransitions.xsl - | \
xsltproc xslt/appendTransitionInformation.xsl - | \
xsltproc xslt/nameTransitions.xsl - | \
-xsltproc xslt/flattenTransitions.xsl - | \
xsltproc xslt/numberStatesAndTransitions.xsl - | \
xmlindent > tmp_IR.xml;
#xsltproc xslt/StatePatternStatechartGenerator.xsl tmp_IR.xml
Modified: commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/flattenTransitions.xsl
URL: http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/flattenTransitions.xsl?rev=954118&r1=954117&r2=954118&view=diff
==============================================================================
--- commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/flattenTransitions.xsl (original)
+++ commons/sandbox/gsoc/2010/scxml-js/trunk/test/xslt/flattenTransitions.xsl Sat Jun 12 19:42:26 2010
@@ -44,8 +44,7 @@
<!-- basic states -->
<xsl:template match="*[(self::s:state or self::s:parallel) and
- not(.//*[(self::s:state or self::s:parallel or self::s:final or self::s:initial or self::s:history)])]
- | s:final | s:initial | s:history">
+ not(.//*[(self::s:state or self::s:parallel or self::s:final or self::s:initial or self::s:history)])]">
<!-- if no param passed in, then initialized to empty node-list -->
<xsl:param name="parentTransitions" select="/.."/>
@@ -110,11 +109,11 @@
<xsl:copy>
<xsl:apply-templates select="@*"/>
- <xsl:apply-templates select="s:state | s:parallel | s:final | s:initial | s:history">
+ <xsl:apply-templates select="s:state | s:parallel">
<xsl:with-param name="parentTransitions" select="$activeTransitions"/>
</xsl:apply-templates>
- <xsl:apply-templates select="node()[not(self::s:state or self::s:parallel or self::s:final or self::s:initial or self::s:history or self::s:transition)]"/>
+ <xsl:apply-templates select="node()[not(self::s:state or self::s:parallel or self::s:transition)]"/>
</xsl:copy>
</xsl:template>