Commit a2bc3946 authored by ankraft's avatar ankraft

Corrected spelling of <Enum> element. Changed tests accordingly.

parent 982d002d
......@@ -46,7 +46,7 @@ SimpleType =
element SimpleType {
attribute type { BasicType }
}
EnumType = element EnumType { EnumValueDef+ }
EnumType = element Enum { EnumValueDef+ }
BasicType =
"integer"
| "boolean"
......
......@@ -153,7 +153,7 @@
<define name="EnumType">
<element name="EnumType">
<element name="Enum">
<oneOrMore>
<ref name="EnumValueDef" />
</oneOrMore>
......
......@@ -80,7 +80,7 @@
<xs:element ref="Struct"/>
<xs:element ref="Array"/>
<xs:element ref="SimpleType"/>
<xs:element ref="EnumType"/>
<xs:element ref="Enum"/>
</xs:choice>
</xs:choice>
<xs:element minOccurs="0" ref="Constraints"/>
......@@ -111,7 +111,7 @@
<xs:attribute name="type" use="required" type="BasicType"/>
</xs:complexType>
</xs:element>
<xs:element name="EnumType">
<xs:element name="Enum">
<xs:complexType>
<xs:sequence>
<xs:element maxOccurs="unbounded" ref="EnumValue"/>
......
......@@ -7,11 +7,11 @@
<SimpleType type="float"/>
</DataType>
<DataType name="anEnumType">
<EnumType>
<Enum>
<EnumValue name="red" type="integer" value="1"/>
<EnumValue name="green" value="2"/>
<EnumValue name="blue" value="3"/>
</EnumType>
</Enum>
</DataType>
</DataTypes>
......
......@@ -7,11 +7,11 @@
<Data>
<DataPoint name="TestEnumTypeDataPoint" writable="true">
<DataType>
<EnumType>
<Enum>
<EnumValue name="red" value="1" type="integer" />
<EnumValue name="green" value="2" />
<EnumValue name="blue" value="3" />
</EnumType>
</Enum>
</DataType>
</DataPoint>
</Data>
......
......@@ -7,11 +7,11 @@
<SimpleType type="float"/>
</DataType>
<DataType name="anEnumType" semanticURI="http://example.com/anEnumType.rdf">
<EnumType>
<Enum>
<EnumValue name="red" type="integer" value="1" semanticURI="http://example.com/anEnumType-red.rdf"/>
<EnumValue name="green" value="2" semanticURI="http://example.com/anEnumType-green.rdf"/>
<EnumValue name="blue" value="3" semanticURI="http://example.com/anEnumType-blue.rdf"/>
</EnumType>
</Enum>
</DataType>
</DataTypes>
......
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