From 66e9838c47b58810cb0bb6c67c32fb119eb50797 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Mon, 2 Feb 2015 15:11:34 +0100
Subject: Importing files works now

---
 testdata/xmlparser/color.oxm   | 18 ++++++++++++++++++
 testdata/xmlparser/generic.oxm | 11 ++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 testdata/xmlparser/color.oxm

(limited to 'testdata')

diff --git a/testdata/xmlparser/color.oxm b/testdata/xmlparser/color.oxm
new file mode 100644
index 0000000..17adea4
--- /dev/null
+++ b/testdata/xmlparser/color.oxm
@@ -0,0 +1,18 @@
+<?xml version="1.0" standalone="yes"?>
+<typesystem name="color">
+	<struct name="color">
+		<field name="r" type="int"/>
+		<field name="g" type="int"/>
+		<field name="b" type="int"/>
+	</struct>
+
+	<constant name="aquamarine1" type="color" value="[127,255,212]"/>
+	<constant name="aquamarine2" type="color" value="[118,238,198]"/>
+	<constant name="aquamarine3" type="color" value="[102,205,170]"/>
+	<constant name="aquamarine" type="color" value="[127,255,212]"/>
+	<constant name="azure1" type="color" value="[240,255,255]"/>
+	<constant name="azure2" type="color" value="[224,238,238]"/>
+	<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]"/>
+</typesystem>
diff --git a/testdata/xmlparser/generic.oxm b/testdata/xmlparser/generic.oxm
index b148364..a5a4dd6 100644
--- a/testdata/xmlparser/generic.oxm
+++ b/testdata/xmlparser/generic.oxm
@@ -1,18 +1,19 @@
 <?xml version="1.0" standalone="yes"?>
-<typesystem name="color">
-	<struct name="color">
+<typesystem name="bla">
+	<import>color</import>
+	<!--<struct name="color">
 		<field name="r" type="int"/>
 		<field name="g" type="int"/>
 		<field name="b" type="int"/>
-	</struct>
+	</struct>-->
 	<constant name="zero" value="0" type="int" />
 	<constant name="zeros" value="[0, 0, 0]" type="int[]" />
-	<constant name="manyZeros" value="[[0, 0], [0, 0], [0, 0]]" type="int[][][]" />
+	<constant name="manyZeros" value="[[0, 0], [0, 0], [0, 0]]" type="int[][]" />
 	<constant name="black" value="[zero, zero, zero]" type="color" />
 	<struct name="structWithColor">
 		<field name="color" type="color" default="black" />
 	</struct>
-	<constant name="blackStructWithColor" value="[color=black]" type="structWithColor" />
+	<constant name="blackStructWithColor" value="[color=aquamarine]" type="structWithColor" />
 </typesystem>
 <!--<domain name="color">
 	<struct name="bla" cardinality="{1,2}" isa="blub"/>
-- 
cgit v1.2.3