parent
63487afa67
commit
a351e94910
|
@ -34,15 +34,12 @@
|
||||||
|
|
||||||
|
|
||||||
<function name="f:apply">
|
<function name="f:apply">
|
||||||
<param name="fnref" as="element(f:ref)" />
|
<param name="fnref" as="item()+" />
|
||||||
|
|
||||||
<apply-templates select="$fnref" mode="f:apply" />
|
<sequence select="f:partial( $fnref, () )" />
|
||||||
</function>
|
</function>
|
||||||
|
|
||||||
|
|
||||||
<!-- WARNING: inconsistent state: only `f:apply#{1,2}' support partial
|
|
||||||
application at the moment -->
|
|
||||||
|
|
||||||
<function name="f:apply">
|
<function name="f:apply">
|
||||||
<param name="fnref" as="item()+" />
|
<param name="fnref" as="item()+" />
|
||||||
<param name="arg1" />
|
<param name="arg1" />
|
||||||
|
@ -56,63 +53,50 @@
|
||||||
<param name="arg1" />
|
<param name="arg1" />
|
||||||
<param name="arg2" />
|
<param name="arg2" />
|
||||||
|
|
||||||
<apply-templates select="$fnref" mode="f:apply">
|
<sequence select="f:partial( $fnref,
|
||||||
<with-param name="arg1" select="$arg1" />
|
($arg1, $arg2) )" />
|
||||||
<with-param name="arg2" select="$arg2" />
|
|
||||||
</apply-templates>
|
|
||||||
</function>
|
</function>
|
||||||
|
|
||||||
|
|
||||||
<function name="f:apply">
|
<function name="f:apply">
|
||||||
<param name="fnref" as="element(f:ref)" />
|
<param name="fnref" as="item()+" />
|
||||||
<param name="arg1" />
|
<param name="arg1" />
|
||||||
<param name="arg2" />
|
<param name="arg2" />
|
||||||
<param name="arg3" />
|
<param name="arg3" />
|
||||||
|
|
||||||
<apply-templates select="$fnref" mode="f:apply">
|
<sequence select="f:partial( $fnref,
|
||||||
<with-param name="arg1" select="$arg1" />
|
($arg1, $arg2, $arg3) )" />
|
||||||
<with-param name="arg2" select="$arg2" />
|
|
||||||
<with-param name="arg3" select="$arg3" />
|
|
||||||
</apply-templates>
|
|
||||||
</function>
|
</function>
|
||||||
|
|
||||||
|
|
||||||
<function name="f:apply">
|
<function name="f:apply">
|
||||||
<param name="fnref" as="element(f:ref)" />
|
<param name="fnref" as="item()+" />
|
||||||
<param name="arg1" />
|
<param name="arg1" />
|
||||||
<param name="arg2" />
|
<param name="arg2" />
|
||||||
<param name="arg3" />
|
<param name="arg3" />
|
||||||
<param name="arg4" />
|
<param name="arg4" />
|
||||||
|
|
||||||
<apply-templates select="$fnref" mode="f:apply">
|
<sequence select="f:partial( $fnref,
|
||||||
<with-param name="arg1" select="$arg1" />
|
($arg1, $arg2, $arg3, $arg4) )" />
|
||||||
<with-param name="arg2" select="$arg2" />
|
|
||||||
<with-param name="arg3" select="$arg3" />
|
|
||||||
<with-param name="arg4" select="$arg4" />
|
|
||||||
</apply-templates>
|
|
||||||
</function>
|
</function>
|
||||||
|
|
||||||
|
|
||||||
<function name="f:apply">
|
<function name="f:apply">
|
||||||
<param name="fnref" as="element(f:ref)" />
|
<param name="fnref" as="item()+" />
|
||||||
<param name="arg1" />
|
<param name="arg1" />
|
||||||
<param name="arg2" />
|
<param name="arg2" />
|
||||||
<param name="arg3" />
|
<param name="arg3" />
|
||||||
<param name="arg4" />
|
<param name="arg4" />
|
||||||
<param name="arg5" />
|
<param name="arg5" />
|
||||||
|
|
||||||
<apply-templates select="$fnref" mode="f:apply">
|
<sequence select="f:partial( $fnref,
|
||||||
<with-param name="arg1" select="$arg1" />
|
($arg1, $arg2, $arg3, $arg4,
|
||||||
<with-param name="arg2" select="$arg2" />
|
$arg5) )" />
|
||||||
<with-param name="arg3" select="$arg3" />
|
|
||||||
<with-param name="arg4" select="$arg4" />
|
|
||||||
<with-param name="arg5" select="$arg5" />
|
|
||||||
</apply-templates>
|
|
||||||
</function>
|
</function>
|
||||||
|
|
||||||
|
|
||||||
<function name="f:apply">
|
<function name="f:apply">
|
||||||
<param name="fnref" as="element(f:ref)" />
|
<param name="fnref" as="item()+" />
|
||||||
<param name="arg1" />
|
<param name="arg1" />
|
||||||
<param name="arg2" />
|
<param name="arg2" />
|
||||||
<param name="arg3" />
|
<param name="arg3" />
|
||||||
|
@ -120,19 +104,14 @@
|
||||||
<param name="arg5" />
|
<param name="arg5" />
|
||||||
<param name="arg6" />
|
<param name="arg6" />
|
||||||
|
|
||||||
<apply-templates select="$fnref" mode="f:apply">
|
<sequence select="f:partial( $fnref,
|
||||||
<with-param name="arg1" select="$arg1" />
|
($arg1, $arg2, $arg3, $arg4,
|
||||||
<with-param name="arg2" select="$arg2" />
|
$arg5, $arg6) )" />
|
||||||
<with-param name="arg3" select="$arg3" />
|
|
||||||
<with-param name="arg4" select="$arg4" />
|
|
||||||
<with-param name="arg5" select="$arg5" />
|
|
||||||
<with-param name="arg6" select="$arg6" />
|
|
||||||
</apply-templates>
|
|
||||||
</function>
|
</function>
|
||||||
|
|
||||||
|
|
||||||
<function name="f:apply">
|
<function name="f:apply">
|
||||||
<param name="fnref" as="element(f:ref)" />
|
<param name="fnref" as="item()+" />
|
||||||
<param name="arg1" />
|
<param name="arg1" />
|
||||||
<param name="arg2" />
|
<param name="arg2" />
|
||||||
<param name="arg3" />
|
<param name="arg3" />
|
||||||
|
@ -141,20 +120,14 @@
|
||||||
<param name="arg6" />
|
<param name="arg6" />
|
||||||
<param name="arg7" />
|
<param name="arg7" />
|
||||||
|
|
||||||
<apply-templates select="$fnref" mode="f:apply">
|
<sequence select="f:partial( $fnref,
|
||||||
<with-param name="arg1" select="$arg1" />
|
($arg1, $arg2, $arg3, $arg4,
|
||||||
<with-param name="arg2" select="$arg2" />
|
$arg5, $arg6, $arg7) )" />
|
||||||
<with-param name="arg3" select="$arg3" />
|
|
||||||
<with-param name="arg4" select="$arg4" />
|
|
||||||
<with-param name="arg5" select="$arg5" />
|
|
||||||
<with-param name="arg6" select="$arg6" />
|
|
||||||
<with-param name="arg7" select="$arg7" />
|
|
||||||
</apply-templates>
|
|
||||||
</function>
|
</function>
|
||||||
|
|
||||||
|
|
||||||
<function name="f:apply">
|
<function name="f:apply">
|
||||||
<param name="fnref" as="element(f:ref)" />
|
<param name="fnref" as="item()+" />
|
||||||
<param name="arg1" />
|
<param name="arg1" />
|
||||||
<param name="arg2" />
|
<param name="arg2" />
|
||||||
<param name="arg3" />
|
<param name="arg3" />
|
||||||
|
@ -164,16 +137,9 @@
|
||||||
<param name="arg7" />
|
<param name="arg7" />
|
||||||
<param name="arg8" />
|
<param name="arg8" />
|
||||||
|
|
||||||
<apply-templates select="$fnref" mode="f:apply">
|
<sequence select="f:partial( $fnref,
|
||||||
<with-param name="arg1" select="$arg1" />
|
($arg1, $arg2, $arg3, $arg4,
|
||||||
<with-param name="arg2" select="$arg2" />
|
$arg5, $arg6, $arg7, $arg8) )" />
|
||||||
<with-param name="arg3" select="$arg3" />
|
|
||||||
<with-param name="arg4" select="$arg4" />
|
|
||||||
<with-param name="arg5" select="$arg5" />
|
|
||||||
<with-param name="arg6" select="$arg6" />
|
|
||||||
<with-param name="arg7" select="$arg7" />
|
|
||||||
<with-param name="arg8" select="$arg8" />
|
|
||||||
</apply-templates>
|
|
||||||
</function>
|
</function>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -154,4 +154,20 @@
|
||||||
<sequence select="$arg1, $arg2, $arg3, $arg4,
|
<sequence select="$arg1, $arg2, $arg3, $arg4,
|
||||||
$arg5, $arg6, $arg7, $arg8" />
|
$arg5, $arg6, $arg7, $arg8" />
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
||||||
|
<function name="foo:arg8-check">
|
||||||
|
<param name="args" as="item()+" />
|
||||||
|
<param name="result" as="item()+" />
|
||||||
|
|
||||||
|
<sequence select="$result[ 1 ] instance of element( foo:applied )
|
||||||
|
and $result[ 2 ] is $args[1]
|
||||||
|
and $result[ 3 ] is $args[2]
|
||||||
|
and $result[ 4 ] is $args[3]
|
||||||
|
and $result[ 5 ] is $args[4]
|
||||||
|
and $result[ 6 ] is $args[5]
|
||||||
|
and $result[ 7 ] is $args[6]
|
||||||
|
and $result[ 8 ] is $args[7]
|
||||||
|
and $result[ 9 ] is $args[8]" />
|
||||||
|
</function>
|
||||||
</stylesheet>
|
</stylesheet>
|
||||||
|
|
178
test/apply.xspec
178
test/apply.xspec
|
@ -218,13 +218,14 @@
|
||||||
|
|
||||||
|
|
||||||
<scenario label="applied to partial argument list">
|
<scenario label="applied to partial argument list">
|
||||||
<!-- while this looks comprehensive, this really only tests
|
|
||||||
f:apply#2 -->
|
|
||||||
<scenario label="supports currying">
|
|
||||||
<variable name="fn8"
|
<variable name="fn8"
|
||||||
select="f:make-ref( QName( $foo-uri, 'fn8' ),
|
select="f:make-ref( QName( $foo-uri, 'fn8' ),
|
||||||
8 )" />
|
8 )" />
|
||||||
|
|
||||||
|
<!-- while this looks comprehensive, this really only tests
|
||||||
|
f:apply#2 -->
|
||||||
|
<scenario label="supports currying">
|
||||||
|
|
||||||
<call function="f:apply">
|
<call function="f:apply">
|
||||||
<!-- @, @ makin' you dizzy? -->
|
<!-- @, @ makin' you dizzy? -->
|
||||||
<param name="fnref"
|
<param name="fnref"
|
||||||
|
@ -252,15 +253,168 @@
|
||||||
|
|
||||||
<expect label="applies target function and binds each
|
<expect label="applies target function and binds each
|
||||||
argument in proper order"
|
argument in proper order"
|
||||||
test="$x:result[ 1 ] = foo:applied[ @n = 8 ]
|
test="foo:arg8-check( $args/*, $x:result )" />
|
||||||
and $x:result[ 2 ] is $args/foo:arg1
|
</scenario>
|
||||||
and $x:result[ 3 ] is $args/foo:arg2
|
|
||||||
and $x:result[ 4 ] is $args/foo:arg3
|
|
||||||
and $x:result[ 5 ] is $args/foo:arg4
|
<scenario label="with 1 argument">
|
||||||
and $x:result[ 6 ] is $args/foo:arg5
|
<call function="f:apply">
|
||||||
and $x:result[ 7 ] is $args/foo:arg6
|
<param name="fnref" select="$fn8" />
|
||||||
and $x:result[ 8 ] is $args/foo:arg7
|
<param name="arg1" select="$args/foo:arg1" />
|
||||||
and $x:result[ 9 ] is $args/foo:arg8" />
|
</call>
|
||||||
|
|
||||||
|
<expect label="produces a partial application"
|
||||||
|
test="f:is-partial( $x:result )" />
|
||||||
|
|
||||||
|
<expect label="can complete application with arguments in
|
||||||
|
proper order"
|
||||||
|
test="foo:arg8-check(
|
||||||
|
$args/*,
|
||||||
|
f:apply( $x:result, $args/foo:arg2,
|
||||||
|
$args/foo:arg3,
|
||||||
|
$args/foo:arg4,
|
||||||
|
$args/foo:arg5,
|
||||||
|
$args/foo:arg6,
|
||||||
|
$args/foo:arg7,
|
||||||
|
$args/foo:arg8 ) )" />
|
||||||
|
</scenario>
|
||||||
|
|
||||||
|
|
||||||
|
<scenario label="with 2 arguments">
|
||||||
|
<call function="f:apply">
|
||||||
|
<param name="fnref" select="$fn8" />
|
||||||
|
<param name="arg1" select="$args/foo:arg1" />
|
||||||
|
<param name="arg2" select="$args/foo:arg2" />
|
||||||
|
</call>
|
||||||
|
|
||||||
|
<expect label="produces a partial application"
|
||||||
|
test="f:is-partial( $x:result )" />
|
||||||
|
|
||||||
|
<expect label="can complete application with arguments in
|
||||||
|
proper order"
|
||||||
|
test="foo:arg8-check(
|
||||||
|
$args/*,
|
||||||
|
f:apply( $x:result, $args/foo:arg3,
|
||||||
|
$args/foo:arg4,
|
||||||
|
$args/foo:arg5,
|
||||||
|
$args/foo:arg6,
|
||||||
|
$args/foo:arg7,
|
||||||
|
$args/foo:arg8 ) )" />
|
||||||
|
</scenario>
|
||||||
|
|
||||||
|
|
||||||
|
<scenario label="with 3 arguments">
|
||||||
|
<call function="f:apply">
|
||||||
|
<param name="fnref" select="$fn8" />
|
||||||
|
<param name="arg1" select="$args/foo:arg1" />
|
||||||
|
<param name="arg2" select="$args/foo:arg2" />
|
||||||
|
<param name="arg3" select="$args/foo:arg3" />
|
||||||
|
</call>
|
||||||
|
|
||||||
|
<expect label="produces a partial application"
|
||||||
|
test="f:is-partial( $x:result )" />
|
||||||
|
|
||||||
|
<expect label="can complete application with arguments in
|
||||||
|
proper order"
|
||||||
|
test="foo:arg8-check(
|
||||||
|
$args/*,
|
||||||
|
f:apply( $x:result, $args/foo:arg4,
|
||||||
|
$args/foo:arg5,
|
||||||
|
$args/foo:arg6,
|
||||||
|
$args/foo:arg7,
|
||||||
|
$args/foo:arg8 ) )" />
|
||||||
|
</scenario>
|
||||||
|
|
||||||
|
|
||||||
|
<scenario label="with 4 arguments">
|
||||||
|
<call function="f:apply">
|
||||||
|
<param name="fnref" select="$fn8" />
|
||||||
|
<param name="arg1" select="$args/foo:arg1" />
|
||||||
|
<param name="arg2" select="$args/foo:arg2" />
|
||||||
|
<param name="arg3" select="$args/foo:arg3" />
|
||||||
|
<param name="arg4" select="$args/foo:arg4" />
|
||||||
|
</call>
|
||||||
|
|
||||||
|
<expect label="produces a partial application"
|
||||||
|
test="f:is-partial( $x:result )" />
|
||||||
|
|
||||||
|
<expect label="can complete application with arguments in
|
||||||
|
proper order"
|
||||||
|
test="foo:arg8-check(
|
||||||
|
$args/*,
|
||||||
|
f:apply( $x:result, $args/foo:arg5,
|
||||||
|
$args/foo:arg6,
|
||||||
|
$args/foo:arg7,
|
||||||
|
$args/foo:arg8 ) )" />
|
||||||
|
</scenario>
|
||||||
|
|
||||||
|
|
||||||
|
<scenario label="with 5 arguments">
|
||||||
|
<call function="f:apply">
|
||||||
|
<param name="fnref" select="$fn8" />
|
||||||
|
<param name="arg1" select="$args/foo:arg1" />
|
||||||
|
<param name="arg2" select="$args/foo:arg2" />
|
||||||
|
<param name="arg3" select="$args/foo:arg3" />
|
||||||
|
<param name="arg4" select="$args/foo:arg4" />
|
||||||
|
<param name="arg5" select="$args/foo:arg5" />
|
||||||
|
</call>
|
||||||
|
|
||||||
|
<expect label="produces a partial application"
|
||||||
|
test="f:is-partial( $x:result )" />
|
||||||
|
|
||||||
|
<expect label="can complete application with arguments in
|
||||||
|
proper order"
|
||||||
|
test="foo:arg8-check(
|
||||||
|
$args/*,
|
||||||
|
f:apply( $x:result, $args/foo:arg6,
|
||||||
|
$args/foo:arg7,
|
||||||
|
$args/foo:arg8 ) )" />
|
||||||
|
</scenario>
|
||||||
|
|
||||||
|
|
||||||
|
<scenario label="with 6 arguments">
|
||||||
|
<call function="f:apply">
|
||||||
|
<param name="fnref" select="$fn8" />
|
||||||
|
<param name="arg1" select="$args/foo:arg1" />
|
||||||
|
<param name="arg2" select="$args/foo:arg2" />
|
||||||
|
<param name="arg3" select="$args/foo:arg3" />
|
||||||
|
<param name="arg4" select="$args/foo:arg4" />
|
||||||
|
<param name="arg5" select="$args/foo:arg5" />
|
||||||
|
<param name="arg6" select="$args/foo:arg6" />
|
||||||
|
</call>
|
||||||
|
|
||||||
|
<expect label="produces a partial application"
|
||||||
|
test="f:is-partial( $x:result )" />
|
||||||
|
|
||||||
|
<expect label="can complete application with arguments in
|
||||||
|
proper order"
|
||||||
|
test="foo:arg8-check(
|
||||||
|
$args/*,
|
||||||
|
f:apply( $x:result, $args/foo:arg7,
|
||||||
|
$args/foo:arg8 ) )" />
|
||||||
|
</scenario>
|
||||||
|
|
||||||
|
|
||||||
|
<scenario label="with 7 arguments">
|
||||||
|
<call function="f:apply">
|
||||||
|
<param name="fnref" select="$fn8" />
|
||||||
|
<param name="arg1" select="$args/foo:arg1" />
|
||||||
|
<param name="arg2" select="$args/foo:arg2" />
|
||||||
|
<param name="arg3" select="$args/foo:arg3" />
|
||||||
|
<param name="arg4" select="$args/foo:arg4" />
|
||||||
|
<param name="arg5" select="$args/foo:arg5" />
|
||||||
|
<param name="arg6" select="$args/foo:arg6" />
|
||||||
|
<param name="arg7" select="$args/foo:arg7" />
|
||||||
|
</call>
|
||||||
|
|
||||||
|
<expect label="produces a partial application"
|
||||||
|
test="f:is-partial( $x:result )" />
|
||||||
|
|
||||||
|
<expect label="can complete application with arguments in
|
||||||
|
proper order"
|
||||||
|
test="foo:arg8-check(
|
||||||
|
$args/*,
|
||||||
|
f:apply( $x:result, $args/foo:arg8 ) )" />
|
||||||
</scenario>
|
</scenario>
|
||||||
</scenario>
|
</scenario>
|
||||||
</scenario>
|
</scenario>
|
||||||
|
|
Loading…
Reference in New Issue