diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-04 01:45:41 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-04 01:45:41 +0100 |
| commit | 835cca85ee45dd1b6722d761999c07c33fb97cc9 (patch) | |
| tree | e4b9435222d100b6161277231ef3766cd3a45e11 /testdata/xmlparser | |
| parent | ec6306ad1e746d47ed66af6274fb6710c70933a2 (diff) | |
Implemented parsing of enum types
Diffstat (limited to 'testdata/xmlparser')
| -rw-r--r-- | testdata/xmlparser/color.oxm | 4 | ||||
| -rw-r--r-- | testdata/xmlparser/generic.oxm | 33 |
2 files changed, 22 insertions, 15 deletions
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"/> |