From 835cca85ee45dd1b6722d761999c07c33fb97cc9 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Wed, 4 Feb 2015 01:45:41 +0100
Subject: Implemented parsing of enum types

---
 testdata/xmlparser/color.oxm   |  4 ++--
 testdata/xmlparser/generic.oxm | 33 ++++++++++++++++++++-------------
 2 files changed, 22 insertions(+), 15 deletions(-)

(limited to 'testdata/xmlparser')

diff --git a/testdata/xmlparser/color.oxm b/testdata/xmlparser/color.oxm
index 8a12e7a..17adea4 100644
--- a/testdata/xmlparser/color.oxm
+++ b/testdata/xmlparser/color.oxm
@@ -1,5 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
-<ousia>
+<typesystem name="color">
 	<struct name="color">
 		<field name="r" type="int"/>
 		<field name="g" type="int"/>
@@ -15,4 +15,4 @@
 	<constant name="azure3" type="color" value="[193,205,205]"/>
 	<constant name="azure4" type="color" value="[131,139,139]"/>
 	<constant name="azure" type="color" value="[240,255,255]"/>
-</ousia>
+</typesystem>
diff --git a/testdata/xmlparser/generic.oxm b/testdata/xmlparser/generic.oxm
index 820deea..a23d5f8 100644
--- a/testdata/xmlparser/generic.oxm
+++ b/testdata/xmlparser/generic.oxm
@@ -1,21 +1,28 @@
 <?xml version="1.0" standalone="yes"?>
-<typesystem name="bla">
-	<import>color.oxm</import>
-	<!--<struct name="color">
-		<field name="r" type="int"/>
-		<field name="g" type="int"/>
-		<field name="b" type="int"/>
-	</struct>-->
-	<!--<include>color.oxm</include>-->
+<typesystem name="border">
+	<import>./color.oxm</import>
+
+	<enum name="border-style">
+		<entry>none</entry>
+		<entry>dotted</entry>
+		<entry>dashed</entry>
+		<entry>solid</entry>
+		<entry>double</entry>
+		<entry>groove</entry>
+		<entry>ridge</entry>
+		<entry>inset</entry>
+		<entry>outset</entry>
+	</enum>
 
 	<constant name="zero" value="0" type="int" />
-	<constant name="zeros" value="[0, 0, 0]" type="int[]" />
-	<constant name="manyZeros" value="[[eeeee, [2, 5], zeros], [42, 1000], [0, {3-5}]]" type="int[][][]" />
-	<!--<constant name="black" value="[zero, zero, zero]" type="color" />-->
-	<struct name="structWithColor">
+	<constant name="black" value="[zero, zero, zero]" type="color" />
+
+	<struct name="border">
 		<field name="color" type="color" default="black" />
+		<field name="style" type="border-style"/>
 	</struct>
-	<constant name="aquamarineStructWithColor" value="[color=aquamarine]" type="structWithColor" />
+
+	<constant name="beautifulBorder" type="border" value="[color=aquamarine,style=solid]" />
 </typesystem>
 <!--<domain name="color">
 	<struct name="bla" cardinality="{1,2}" isa="blub"/>
-- 
cgit v1.2.3