Commit 972509b1 authored by Jonathon Duerig's avatar Jonathon Duerig

Fixed PropertySpec as well.

parent a59372d2
......@@ -121,9 +121,6 @@ LocalSpec = element local {
element operator { "+" }
}
## ((element global { empty }, element operator { "OnceOnly" | "FirstFree" }) |
## (element local { empty }, element operator { "+" }))?
## "Legacy" assign node flags - will be replaced with properties, and in some
## cases, explicit links
NodeFlagSpec =
......@@ -169,6 +166,5 @@ PropertySpec = element property {
element violatable { empty }?,
## TODO: Add more operators - equality, range test, etc
## Flags for special types of operators
((element global { empty }, element operator { "OnceOnly" | "FirstFree" }) |
(element local { empty }, element operator { "=" | "+" }))?
(GlobalSpec | LocalSpec)?
}
......@@ -272,32 +272,8 @@
<xs:complexType/>
</xs:element>
<xs:choice minOccurs="0">
<xs:sequence>
<xs:element name="global">
<xs:complexType/>
</xs:element>
<xs:element name="operator">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="OnceOnly"/>
<xs:enumeration value="FirstFree"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
<xs:sequence>
<xs:element name="local">
<xs:complexType/>
</xs:element>
<xs:element name="operator">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="="/>
<xs:enumeration value="+"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
<xs:element ref="ptop:global"/>
<xs:element ref="ptop:local"/>
</xs:choice>
</xs:sequence>
</xs:complexType>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment