Mike Gerwitz

Activist for User Freedom

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Gerwitz <mike.gerwitz@rtspecialty.com>2017-12-04 13:38:48 -0500
committerMike Gerwitz <mike.gerwitz@rtspecialty.com>2017-12-04 13:40:12 -0500
commitc207fad0087947cd4bc303bffb0a185c90f50193 (patch)
tree5612f654896b0fe09efd7012599cf370c33fd758
parent0fb1bae4879c13e63af52d99977b3e453d20942a (diff)
downloadtame-c207fad0087947cd4bc303bffb0a185c90f50193.tar.gz
tame-c207fad0087947cd4bc303bffb0a185c90f50193.tar.bz2
tame-c207fad0087947cd4bc303bffb0a185c90f50193.zip
Allow ##other nodes in apply nodes
The primary motivation for this is to allow for template conditionals. * src/current/calc.xsd (applyArgs): New group. (apply,recurse): Use it in sequence.
-rw-r--r--src/current/calc.xsd10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/current/calc.xsd b/src/current/calc.xsd
index c5b9572..ac1b49f 100644
--- a/src/current/calc.xsd
+++ b/src/current/calc.xsd
@@ -461,7 +461,7 @@
<xs:complexContent>
<xs:extension base="operatorBaseType">
<xs:sequence>
- <xs:element name="arg" type="applyArgumentType" minOccurs="0" maxOccurs="unbounded" />
+ <xs:group ref="applyArgs" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
<xs:attribute name="name" type="nameType" use="required">
@@ -479,6 +479,12 @@
</xs:complexType>
</xs:element>
+ <xs:group name="applyArgs">
+ <xs:choice>
+ <xs:element name="arg" type="applyArgumentType" minOccurs="0" maxOccurs="unbounded" />
+ <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:group>
<xs:complexType name="applyArgumentType">
<xs:annotation>
@@ -514,7 +520,7 @@
<xs:complexContent>
<xs:extension base="operatorBaseType">
<xs:sequence>
- <xs:element name="arg" type="applyArgumentType" minOccurs="0" maxOccurs="unbounded" />
+ <xs:group ref="applyArgs" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
<!-- argument shorthand -->