Author: jbeard
Date: Sun Jun 27 01:28:46 2010
New Revision: 958308
URL: http://svn.apache.org/viewvc?rev=958308&view=rev
Log:
Refactoring: changed xsl params that should be variables to be variables.
Modified:
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/AbstractEnumeratedStatechartGenerator.xsl
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/AbstractStatechartGenerator.xsl
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/StatePatternStatechartGenerator.xsl
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/StateTableStatechartGenerator.xsl
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/SwitchyardStatechartGenerator.xsl
Modified:
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/AbstractEnumeratedStatechartGenerator.xsl
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/AbstractEnumeratedStatechartGenerator.xsl?rev=958308&r1=958307&r2=958308&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/AbstractEnumeratedStatechartGenerator.xsl
(original)
+++
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/AbstractEnumeratedStatechartGenerator.xsl
Sun Jun 27 01:28:46 2010
@@ -22,15 +22,18 @@
<import href="AbstractStatechartGenerator.xsl"/>
- <param name="defaultEventLiteral" select="'$default'"/>
- <param name="currentConfigurationExpression"
+ <variable name="defaultEventLiteral" select="'$default'"/>
+ <variable name="currentConfigurationExpression"
select="'currentConfiguration.map(function(s){return
STATE_INT_ID_TO_OBJECT_MAP[s]})'"/>
+ <variable name="inPredicateFunctionStateReference" select="'state.id'"/>
+ <variable name="inPredicateFunctionStateIdReference"
select="'STATE_INT_ID_TO_OBJECT_MAP[s]'"/>
+
- <param
name="genHistoryTriggerDispatcherCurrentConfigurationAssignmentRHS"
+ <variable
name="genHistoryTriggerDispatcherCurrentConfigurationAssignmentRHS"
select="'newConfiguration.map(function(sObj){return
sObj.id})'"/>
- <param name="genHistoryTriggerDispatcherInnerForEachStateReference"
+ <variable name="genHistoryTriggerDispatcherInnerForEachStateReference"
select="'STATE_INT_ID_TO_OBJECT_MAP[state]'"/>
- <param name="genNonBasicTriggerDispatcherExitBlockIteratorExpression"
+ <variable name="genNonBasicTriggerDispatcherExitBlockIteratorExpression"
select="'currentConfiguration.map(function(state){return
STATE_INT_ID_TO_OBJECT_MAP[state]})'"/>
@@ -212,9 +215,6 @@
<value-of select="$s/@id"/>
</template>
- <variable name="inPredicateFunctionStateReference" select="'state.id'"/>
- <variable name="inPredicateFunctionStateIdReference"
select="'STATE_INT_ID_TO_OBJECT_MAP[s]'"/>
-
<template name="genStateHooks"/>
<template name="genEnumeratedHooks"/>
<template name="genTriggerIntEnum"/>
Modified:
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/AbstractStatechartGenerator.xsl
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/AbstractStatechartGenerator.xsl?rev=958308&r1=958307&r2=958308&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/AbstractStatechartGenerator.xsl
(original)
+++
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/AbstractStatechartGenerator.xsl
Sun Jun 27 01:28:46 2010
@@ -28,14 +28,16 @@
<param name="noSome" select="false()"/>
<param name="name"/>
- <!-- these params get overridden by subclasses -->
- <param name="dispatchInvocation"/>
- <param name="currentConfigurationExpression"/>
- <param name="defaultEventLiteral"/>
+ <!-- these variables get overridden by subclasses -->
+ <variable name="dispatchInvocation"/>
+ <variable name="currentConfigurationExpression"/>
+ <variable name="defaultEventLiteral"/>
+ <variable name="inPredicateFunctionStateReference"/>
+ <variable name="inPredicateFunctionStateIdReference"/>
<!-- TODO: refactor these names-->
- <param
name="genHistoryTriggerDispatcherCurrentConfigurationAssignmentRHS"/>
- <param name="genHistoryTriggerDispatcherInnerForEachStateReference"/>
- <param name="genNonBasicTriggerDispatcherExitBlockIteratorExpression"/>
+ <variable
name="genHistoryTriggerDispatcherCurrentConfigurationAssignmentRHS"/>
+ <variable name="genHistoryTriggerDispatcherInnerForEachStateReference"/>
+ <variable
name="genNonBasicTriggerDispatcherExitBlockIteratorExpression"/>
<!-- main variables -->
<variable name="allStates"
@@ -775,9 +777,6 @@
}
</variable>
- <variable name="inPredicateFunctionStateReference"/>
- <variable name="inPredicateFunctionStateIdReference"/>
-
<template name="genContextHooks"/>
<template name="genStateHooks"/>
<template name="genExternalTriggerDispatcher"/>
Modified:
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/StatePatternStatechartGenerator.xsl
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/StatePatternStatechartGenerator.xsl?rev=958308&r1=958307&r2=958308&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/StatePatternStatechartGenerator.xsl
(original)
+++
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/StatePatternStatechartGenerator.xsl
Sun Jun 27 01:28:46 2010
@@ -22,14 +22,15 @@
<import href="AbstractStatechartGenerator.xsl"/>
- <!-- these params get overridden by subclasses -->
- <param name="dispatchInvocation" select="'state[e]();'"/>
- <param name="defaultEventLiteral" select="'"$default"'"/>
- <param name="currentConfigurationExpression"
select="'currentConfiguration.slice()'"/>
-
- <param
name="genHistoryTriggerDispatcherCurrentConfigurationAssignmentRHS"
select="'newConfiguration'"/>
- <param name="genHistoryTriggerDispatcherInnerForEachStateReference"
select="'state'"/>
- <param name="genNonBasicTriggerDispatcherExitBlockIteratorExpression"
select="'currentConfiguration'"/>
+ <variable name="dispatchInvocation" select="'state[e]();'"/>
+ <variable name="defaultEventLiteral" select="'"$default"'"/>
+ <variable name="currentConfigurationExpression"
select="'currentConfiguration.slice()'"/>
+ <variable name="inPredicateFunctionStateReference" select="'state'"/>
+ <variable name="inPredicateFunctionStateIdReference" select="'s'"/>
+
+ <variable
name="genHistoryTriggerDispatcherCurrentConfigurationAssignmentRHS"
select="'newConfiguration'"/>
+ <variable name="genHistoryTriggerDispatcherInnerForEachStateReference"
select="'state'"/>
+ <variable
name="genNonBasicTriggerDispatcherExitBlockIteratorExpression"
select="'currentConfiguration'"/>
<template name="genStateHooks">
<param name="state"/>
@@ -162,7 +163,4 @@
</choose>
</template>
- <variable name="inPredicateFunctionStateReference" select="'state'"/>
- <variable name="inPredicateFunctionStateIdReference" select="'s'"/>
-
</stylesheet>
Modified:
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/StateTableStatechartGenerator.xsl
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/StateTableStatechartGenerator.xsl?rev=958308&r1=958307&r2=958308&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/StateTableStatechartGenerator.xsl
(original)
+++
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/StateTableStatechartGenerator.xsl
Sun Jun 27 01:28:46 2010
@@ -22,7 +22,7 @@
<import href="AbstractEnumeratedStatechartGenerator.xsl"/>
- <param name="dispatchInvocation"
select="'STATE_TRANSITION_TABLE[state][e]();'"/>
+ <variable name="dispatchInvocation"
select="'STATE_TRANSITION_TABLE[state][e]();'"/>
<variable name="nullTransitionFunctionName" select="'$nt'"/>
Modified:
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/SwitchyardStatechartGenerator.xsl
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/SwitchyardStatechartGenerator.xsl?rev=958308&r1=958307&r2=958308&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/SwitchyardStatechartGenerator.xsl
(original)
+++
commons/sandbox/gsoc/2010/scxml-js/branches/SCXML-140/src/xslt/backends/js/SwitchyardStatechartGenerator.xsl
Sun Jun 27 01:28:46 2010
@@ -22,7 +22,7 @@
<import href="AbstractEnumeratedStatechartGenerator.xsl"/>
- <param name="dispatchInvocation" select="'dispatch(state,e)'"/>
+ <variable name="dispatchInvocation" select="'dispatch(state,e)'"/>
<template name="genEnumeratedHooks">
//state transition table
