Merge pull request #1 from cirulls/develop

PR-76 issue #66 allow context in named templates
xspec · Feb 21, 2016 · 26a4292 · 26a4292
2 parents 8aca31c + 07c0c60
commit 26a4292
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/compiler/generate-xspec-tests.xsl b/src/compiler/generate-xspec-tests.xsl
@@ -208,7 +208,7 @@
                   <!-- Set up the $context variable -->
                   <xsl:apply-templates select="$context" mode="x:setup-context"/>
                   <!-- Switch to the context and call the template -->
-                  <for-each select="$context">
+                  <for-each select="$impl:context">
                     <xsl:copy-of select="$template-call" />
                   </for-each>
                 </xsl:when>

diff --git a/src/schemas/xspec.rnc b/src/schemas/xspec.rnc
@@ -113,7 +113,8 @@ function-scenario = function-call?,
 ## element defines the template call and the parameters passed to it and the
 ## <assertion> elements test the result of the template call. Child scenarios
 ## can override the parameters in the template call.
-named-scenario = template-call?, 
+named-scenario = context?,
+                 template-call?, 
                  like*,
                  (pending | assertion)*,
                  (pending | 
@@ -190,4 +191,4 @@ test = attribute test { xpath }
 common-attributes = attribute xml:* { text }*
 
 any-content = mixed { any-element* }
-any-element = element * { attribute * { text }*, any-content }
+any-element = element * { attribute * { text }*, any-content }