diff options
author | Matthias Clasen <mclasen@redhat.com> | 2005-05-09 19:32:10 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-05-09 19:32:10 +0000 |
commit | bc11a26dc88ace282584279684fc338240be030b (patch) | |
tree | 45634d643db61eb8062bcab7c1ddb16601e2122d /tests | |
parent | 5575c3ca5544ba5f99cfd820079ec8745c5beba3 (diff) | |
download | gobject-introspection-bc11a26dc88ace282584279684fc338240be030b.tar.gz |
Clean up handling of names. All elements have a "name", only the elements
2005-05-09 Matthias Clasen <mclasen@redhat.com>
* gidl.dtd: Clean up handling of names. All elements
have a "name", only the elements corresponding to
actual callable functions (function, method, constructor),
have an additional "symbol" attribute holding the
dlsym()-able function name.
* src/generate.c: Adapt to generate xml matching the
new dtd.
* src/gidlparser.c:
* src/gidlnode.c: Adapt to parse the new dtd.
* tests/*.test: Adjust to the new dtd.
* metadata-format.txt:
* src/gmetadata.h: Remove the short_name field
from the ValueBlob.
* src/gmetadata.c: Shrink size of ValueBlob to 12.
* src/girepository.h:
* src/ginfo.c (g_value_info_get_short_name): Removed
Diffstat (limited to 'tests')
-rw-r--r-- | tests/array.test | 6 | ||||
-rw-r--r-- | tests/boxed.test | 12 | ||||
-rw-r--r-- | tests/enum.test | 24 | ||||
-rw-r--r-- | tests/errors.test | 14 | ||||
-rw-r--r-- | tests/function.test | 4 | ||||
-rw-r--r-- | tests/gobject.test | 2 | ||||
-rw-r--r-- | tests/interface.test | 6 | ||||
-rw-r--r-- | tests/object.test | 6 | ||||
-rw-r--r-- | tests/xref1.test | 4 | ||||
-rw-r--r-- | tests/xref2.test | 4 |
10 files changed, 41 insertions, 41 deletions
diff --git a/tests/array.test b/tests/array.test index 05ea7625..9d554733 100644 --- a/tests/array.test +++ b/tests/array.test @@ -1,21 +1,21 @@ <?xml version="1.0"?> <api version="1.0"> <namespace name="Foo"> - <function name="Foo.test1" cname="test1"> + <function name="Foo.test1" symbol="test1"> <return-type type="gboolean"/> <parameters> <parameter name="p1" type="gchar*[length=1,zero-terminated=1]" direction="in"/> <parameter name="p2" type="gint" direction="in"/> </parameters> </function> - <function name="Foo.test2" cname="test2"> + <function name="Foo.test2" symbol="test2"> <return-type type="gboolean"/> <parameters> <parameter name="p2" type="gint" direction="out"/> <parameter name="p1" type="gchar*[length=0]" direction="out"/> </parameters> </function> - <function name="Foo.test3" cname="test3"> + <function name="Foo.test3" symbol="test3"> <return-type type="gboolean"/> <parameters> <parameter name="p1" type="gchar*[zero-terminated=1]" direction="in"/> diff --git a/tests/boxed.test b/tests/boxed.test index 70ae1966..b64ec072 100644 --- a/tests/boxed.test +++ b/tests/boxed.test @@ -1,9 +1,9 @@ <?xml version="1.0"?> <api version="1.0"> <namespace name="Foo"> - <boxed name="Foo.boxed1" cname="BoxedType1" get-type="boxed1_get_type" deprecated="1"> - <field cname="field1" readable="1" writable="1" offset="0" type="guint32" /> - <method name="Foo.boxed1.frob_boxed1" cname="frob_boxed1"> + <boxed name="Foo.boxed1" type-name="BoxedType1" get-type="boxed1_get_type" deprecated="1"> + <field name="field1" readable="1" writable="1" offset="0" type="guint32" /> + <method name="Foo.boxed1.frob_boxed1" symbol="frob_boxed1"> <return-type type="void"/> <parameters> <parameter name="box" type="Foo.boxed1*" direction="in"/> @@ -12,7 +12,7 @@ <parameter name="e" type="GError<>" direction="out"/> </parameters> </method> - <method name="Foo.boxed1.lart" cname="lart"> + <method name="Foo.boxed1.lart" symbol="lart"> <return-type type="gboolean"/> <parameters> <parameter name="box" type="Foo.boxed2*" direction="in"/> @@ -20,14 +20,14 @@ </parameters> </method> </boxed> - <function name="Foo.freefunc" cname="freefunc" deprecated="1"> + <function name="Foo.freefunc" symbol="freefunc" deprecated="1"> <return-type type="gint"/> <parameters> <parameter name="v1" type="gint" direction="in"/> <parameter name="val2" type="gint" direction="in"/> </parameters> </function> - <boxed name="Foo.boxed2" cname="BoxedType2" get-type="boxed2_get_type" deprecated="1"> + <boxed name="Foo.boxed2" type-name="BoxedType2" get-type="boxed2_get_type" deprecated="1"> </boxed> </namespace> </api> diff --git a/tests/enum.test b/tests/enum.test index 87e9d638..f488d20c 100644 --- a/tests/enum.test +++ b/tests/enum.test @@ -1,20 +1,20 @@ <?xml version="1.0"?> <api version="1.0"> <namespace name="Foo"> - <enum name="Foo.Enum1" cname="FooEnum" get-type="foo_enum_get_type"> - <member name="value1" cname="v1" value="0" /> - <member name="value2" cname="v1" value="1" /> - <member name="value3" cname="v1" value="2" /> + <enum name="Foo.Enum1" type-name="FooEnum" get-type="foo_enum_get_type"> + <member name="value1" value="0" /> + <member name="value2" value="1" /> + <member name="value3" value="2" /> </enum> - <flags name="Foo.Flags1" cname="FooFlags" get-type="foo_flags_get_type"> - <member name="value1" cname="v1" value="1" /> - <member name="value2" cname="v1" value="2" /> - <member name="value3" cname="v1" value="4" /> + <flags name="Foo.Flags1" type-name="FooFlags" get-type="foo_flags_get_type"> + <member name="value1" value="1" /> + <member name="value2" value="2" /> + <member name="value3" value="4" /> </flags> - <enum name="Foo.Enum2" cname="FooEnum2"> - <member name="value1" cname="v1" value="0" /> - <member name="value2" cname="v1" value="1" /> - <member name="value3" cname="v1" value="2" /> + <enum name="Foo.Enum2"> + <member name="value1" value="0" /> + <member name="value2" value="1" /> + <member name="value3" value="2" /> </enum> </namespace> </api> diff --git a/tests/errors.test b/tests/errors.test index 1e85669a..94e4db79 100644 --- a/tests/errors.test +++ b/tests/errors.test @@ -1,17 +1,17 @@ <?xml version="1.0"?> <api version="1.0"> <namespace name="Foo"> - <enum name="Foo.ErrorCodes1" cname="ErrorCodes1" get-type="foo_error_codes1_get_type"> - <member name="Foo.ErrorCodes1.e1" cname="e1" value="0" /> - <member name="Foo.ErrorCodes1.e2" cname="e2" value="1" deprecated="1" /> - <member name="Foo.ErrorCodes1.e3" cname="e3" value="2" /> + <enum name="Foo.ErrorCodes1" type-name="ErrorCodes1" get-type="foo_error_codes1_get_type"> + <member name="Foo.ErrorCodes1.e1" value="0" /> + <member name="Foo.ErrorCodes1.e2" value="1" deprecated="1" /> + <member name="Foo.ErrorCodes1.e3" value="2" /> </enum> - <enum name="Foo.ErrorCodes2" cname="ErrorCodes2" get-type="foo_error_codes2_get_type"> - <member name="Foo.ErrorCodes2.e1" cname="e1" value="0" /> + <enum name="Foo.ErrorCodes2" type-name="ErrorCodes2" get-type="foo_error_codes2_get_type"> + <member name="Foo.ErrorCodes2.e1" value="0" /> </enum> <errordomain name="Foo.Errors1" get-quark="foo_errors1_get_quark" codes="Foo.ErrorCodes1" /> <errordomain name="Foo.Errors2" get-quark="foo_errors2_get_quark" codes="Foo.ErrorCodes2" /> - <function name="Foo.test1" cname="test1"> + <function name="Foo.test1" symbol="test1"> <return-type type="gboolean"/> <parameters> <parameter name="p1" type="gint" direction="in" null-ok="1"/> diff --git a/tests/function.test b/tests/function.test index 7e632da2..d1328e32 100644 --- a/tests/function.test +++ b/tests/function.test @@ -1,9 +1,9 @@ <?xml version="1.0"?> <api version="1.0"> <namespace name="Foo"> - <boxed name="Foo.Boxed1" cname="Boxed1" get-type="boxed1_get_type"> + <boxed name="Foo.Boxed1" type-name="Boxed1" get-type="boxed1_get_type"> </boxed> - <function name="Foo.test1" cname="test1" deprecated="1"> + <function name="Foo.test1" symbol="test1" deprecated="1"> <return-type type="gboolean"/> <parameters> <parameter name="p1" type="Foo.Boxed1*" direction="in" null-ok="1"/> diff --git a/tests/gobject.test b/tests/gobject.test index 47152914..9728eba7 100644 --- a/tests/gobject.test +++ b/tests/gobject.test @@ -1,7 +1,7 @@ <?xml version="1.0"?> <api version="1.0"> <namespace name="GObject"> - <object name="GObject.GObject" cname="GObject" get-type="g_object_get_type"> + <object name="GObject.GObject" type-name="GObject" get-type="g_object_get_type"> </object> </namespace> </api> diff --git a/tests/interface.test b/tests/interface.test index 6c9313a6..9be2b5c7 100644 --- a/tests/interface.test +++ b/tests/interface.test @@ -1,11 +1,11 @@ <?xml version="1.0"?> <api version="1.0"> <namespace name="Foo"> - <interface name="Foo.Iface1" cname="Iface1" get-type="iface1_get_type"> + <interface name="Foo.Iface1" type-name="Iface1" get-type="iface1_get_type"> <requires> <interface name="Foo.Iface2" /> </requires> - <method name="Foo.Iface1.method1" cname="method1"> + <method name="Foo.Iface1.method1" symbol="method1"> <return-type type="Foo.Iface2*"/> <parameters> <parameter name="param1" type="Foo.Iface2*" direction="in"/> @@ -32,7 +32,7 @@ </vfunc> <constant name="constant1" type="gint" value="42" /> </interface> - <interface name="Foo.Iface2" cname="Iface2" get-type="iface2_get_type"> + <interface name="Foo.Iface2" type-name="Iface2" get-type="iface2_get_type"> </interface> </namespace> </api> diff --git a/tests/object.test b/tests/object.test index c4e0cfeb..33600103 100644 --- a/tests/object.test +++ b/tests/object.test @@ -1,7 +1,7 @@ <?xml version="1.0"?> <api version="1.0"> <namespace name="Foo"> - <object name="Foo.Object1" parent="Foo.Object2" cname="Object1" get-type="object1_get_type"> + <object name="Foo.Object1" parent="Foo.Object2" type-name="Object1" get-type="object1_get_type"> <implements> <interface name="Foo.Iface1" /> </implements> @@ -26,9 +26,9 @@ </vfunc> <constant name="constant1" type="gint" value="42" /> </object> - <interface name="Foo.Iface1" cname="Iface1" get-type="iface1_get_type"> + <interface name="Foo.Iface1" type-name="Iface1" get-type="iface1_get_type"> </interface> - <object name="Foo.Object2" parent="GObject.GObject" cname="Object2" get-type="object2_get_type"> + <object name="Foo.Object2" parent="GObject.GObject" type-name="Object2" get-type="object2_get_type"> </object> </namespace> </api> diff --git a/tests/xref1.test b/tests/xref1.test index 35658028..b065d8c0 100644 --- a/tests/xref1.test +++ b/tests/xref1.test @@ -1,9 +1,9 @@ <?xml version="1.0"?> <api version="1.0"> <namespace name="Foo"> - <boxed name="Foo.Boxed" cname="FooBoxed" get-type="foo_boxed_get_type"> + <boxed name="Foo.Boxed" type-name="FooBoxed" get-type="foo_boxed_get_type"> </boxed> - <function name="Foo.test" cname="foo_test"> + <function name="Foo.test" symbol="foo_test"> <return-type type="void"/> <parameters> <parameter name="p1" type="Bar.Boxed*" direction="in"/> diff --git a/tests/xref2.test b/tests/xref2.test index 78f95c72..c6380242 100644 --- a/tests/xref2.test +++ b/tests/xref2.test @@ -1,9 +1,9 @@ <?xml version="1.0"?> <api version="1.0"> <namespace name="Bar"> - <boxed name="Bar.Boxed" cname="BarBoxed" get-type="bar_boxed_get_type"> + <boxed name="Bar.Boxed" type-name="BarBoxed" get-type="bar_boxed_get_type"> </boxed> - <function name="Bar.test" cname="bar_test"> + <function name="Bar.test" symbol="bar_test"> <return-type type="void"/> <parameters> <parameter name="p1" type="Foo.Boxed*" direction="in"/> |