diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-03 21:43:48 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-03 21:43:48 +0100 |
| commit | 5fb3d3f7f785144425513a734e2a9fc0dfd8a045 (patch) | |
| tree | 61b39c69f1b036f248431e47c4466eec9dc2fa8d | |
| parent | 7d8684c9239df6b05f3c9b25b1470d671b90df14 (diff) | |
Current data version
| -rw-r--r-- | data/typesystem/color.oxm | 1 | ||||
| -rw-r--r-- | testdata/xmlparser/generic.oxm | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/data/typesystem/color.oxm b/data/typesystem/color.oxm index f9eb53a..782c856 100644 --- a/data/typesystem/color.oxm +++ b/data/typesystem/color.oxm @@ -21,6 +21,7 @@ <constant name="bisque3" type="color" value="[205,183,158]"/> <constant name="bisque4" type="color" value="[139,125,107]"/> <constant name="bisque" type="color" value="[255,228,196]"/> + <constant name="black" type="color" value="[0,0,0]"/> <constant name="brown" type="color" value="[165,42,42]"/> <constant name="burlywood1" type="color" value="[255,211,155]"/> <constant name="burlywood2" type="color" value="[238,197,145]"/> diff --git a/testdata/xmlparser/generic.oxm b/testdata/xmlparser/generic.oxm index 4c9375e..820deea 100644 --- a/testdata/xmlparser/generic.oxm +++ b/testdata/xmlparser/generic.oxm @@ -1,21 +1,21 @@ <?xml version="1.0" standalone="yes"?> <typesystem name="bla"> - <!--<import>color.oxm</import>--> + <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> + <!--<include>color.oxm</include>--> <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="black" value="[zero, zero, zero]" type="color" /> + <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"> <field name="color" type="color" default="black" /> </struct> - <constant name="blackStructWithColor" value="[color=aquamarine]" type="structWithColor" /> + <constant name="aquamarineStructWithColor" value="[color=aquamarine]" type="structWithColor" /> </typesystem> <!--<domain name="color"> <struct name="bla" cardinality="{1,2}" isa="blub"/> |