Bug 554521: scanner generates wrong names for enum members with

	full type name prefix

	* giscanner/utils.py (strip_common_prefix): Fix this to strip the
	right amount when the entire "first" string is a prefix of
	"second"

	* tests/scanner/foo.h (FooEnumFullname):
	* tests/scanner/foo-expected.gir: test that

svn path=/trunk/; revision=640

diff --git a/ChangeLog b/ChangeLog
index 1905c72be392111c16899c0637eddbd6cf9ad974..c75133a7443b2b98e43226164ccd1ed2c3622e88 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-09-30  Dan Winship  <danw@gnome.org>
+
+       Bug 554521: scanner generates wrong names for enum members with
+       full type name prefix
+
+       * giscanner/utils.py (strip_common_prefix): Fix this to strip the
+       right amount when the entire "first" string is a prefix of
+       "second"
+
+       * tests/scanner/foo.h (FooEnumFullname):
+       * tests/scanner/foo-expected.gir: test that
+
 2008-09-29  Colin Walters  <walters@verbum.org>
 
        Bug 552380: Array parameters should be marked in the gir

diff --git a/giscanner/utils.py b/giscanner/utils.py
index c2f6e5d804473076ec0e3883e5499202f24b3196..959ed8308c171edbeeb692ec8441d6b68a52d5a9 100644 (file)
--- a/giscanner/utils.py
+++ b/giscanner/utils.py
@@ -59,5 +59,5 @@ def strip_common_prefix(first, second):
     second = second.replace('_', '')
     for i, c in enumerate(first.upper()):
         if i >= len(second) or c != second[i]:
-            break
-    return second[i:]
+            return second[i:]
+    return second[i + 1:]

diff --git a/tests/scanner/foo-expected.gir b/tests/scanner/foo-expected.gir
index 057c3a70f56e26bdfe9684bcc5254131a0c7cabe..81158550c0957684947e557fefe55c8f3e38a0f7 100644 (file)
--- a/tests/scanner/foo-expected.gir
+++ b/tests/scanner/foo-expected.gir
@@ -245,6 +245,11 @@
       <member name="deux" value="2" c:identifier="FOO_ENUM_DEUX"/>
       <member name="trois" value="3" c:identifier="FOO_ENUM_TROIS"/>
     </enumeration>
+    <enumeration name="EnumFullname" c:type="FooEnumFullname">
+      <member name="one" value="1" c:identifier="FOO_ENUM_FULLNAME_ONE"/>
+      <member name="two" value="2" c:identifier="FOO_ENUM_FULLNAME_TWO"/>
+      <member name="three" value="3" c:identifier="FOO_ENUM_FULLNAME_THREE"/>
+    </enumeration>
     <record name="Boxed"
             c:type="FooBoxed"
             glib:type-name="FooBoxed"

diff --git a/tests/scanner/foo.h b/tests/scanner/foo.h
index d00eff3779568acb5cc0f36e64566f7199e692b2..3183c88327387ee7aa135c16ce66e30ee255a140 100644 (file)
--- a/tests/scanner/foo.h
+++ b/tests/scanner/foo.h
@@ -106,6 +106,13 @@ typedef enum
 
 GType foo_flags_type_get_type (void);
 
+typedef enum
+{
+  FOO_ENUM_FULLNAME_ONE = 1,
+  FOO_ENUM_FULLNAME_TWO,
+  FOO_ENUM_FULLNAME_THREE
+} FooEnumFullname;
+
 typedef struct _FooBoxed FooBoxed;
 
 GType                 foo_boxed_get_type       (void) G_GNUC_CONST;