diff options
| author | Colin Walters <walters@verbum.org> | 2009-03-16 22:25:19 (GMT) |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-03-17 15:10:04 (GMT) |
| commit | e9dcc3cfb985292b5ff96772b73029a32b18ff11 (patch) | |
| tree | 7c235feb39b547a3829c12f64972b071d93dd7fa /tests/scanner/foo-1.0-expected.gir | |
| parent | 1d1cc8c35364f9da12620c1925483b61dc688718 (diff) | |
Bug 575613 - Enum stripping with common prefix, also use "_" consistently
Some enums have members which have a common prefix which doesn't
match that of the enum name, but it also longer than the global
namespace prefix. Instead, try stripping the common prefix first,
and only if that fails fall back to the global strip.
Also, for glib-registered enums we were using the nick, which
typically has "-" as a separator. Replace that with "_" for
consistency between unregistered enums and registered.
utils.py:strip_common_prefix is now unused, delete.
Diffstat (limited to 'tests/scanner/foo-1.0-expected.gir')
| -rw-r--r-- | tests/scanner/foo-1.0-expected.gir | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/scanner/foo-1.0-expected.gir b/tests/scanner/foo-1.0-expected.gir index 59efffd..b28d861 100644 --- a/tests/scanner/foo-1.0-expected.gir +++ b/tests/scanner/foo-1.0-expected.gir @@ -15,6 +15,11 @@ and/or use gtk-doc annotations. --> <alias name="List" target="GLib.SList" c:type="FooList"/> <alias name="ObjectCookie" target="any" c:type="FooObjectCookie"/> <alias name="XEvent" target="none" c:type="FooXEvent"/> + <enumeration name="ASingle" c:type="FooASingle"> + <member name="some_single_enum" + value="0" + c:identifier="FOO_SOME_SINGLE_ENUM"/> + </enumeration> <record name="BRect" c:type="FooBRect" glib:type-name="FooBRect" @@ -536,6 +541,21 @@ uses a C sugar return type."> <constant name="SUCCESS_INT" value="4408"> <type name="int"/> </constant> + <enumeration name="StackLayer" c:type="FooStackLayer"> + <member name="desktop" value="0" c:identifier="FOO_LAYER_DESKTOP"/> + <member name="bottom" value="1" c:identifier="FOO_LAYER_BOTTOM"/> + <member name="normal" value="2" c:identifier="FOO_LAYER_NORMAL"/> + <member name="top" value="4" c:identifier="FOO_LAYER_TOP"/> + <member name="dock" value="4" c:identifier="FOO_LAYER_DOCK"/> + <member name="fullscreen" value="5" c:identifier="FOO_LAYER_FULLSCREEN"/> + <member name="focused_window" + value="6" + c:identifier="FOO_LAYER_FOCUSED_WINDOW"/> + <member name="override_redirect" + value="7" + c:identifier="FOO_LAYER_OVERRIDE_REDIRECT"/> + <member name="last" value="8" c:identifier="FOO_LAYER_LAST"/> + </enumeration> <record name="Struct" c:type="FooStruct"> <field name="priv" writable="1"> <type name="StructPrivate" c:type="FooStructPrivate*"/> |