From: Johan Dahlin <johan@gnome.org>
Date: Sun, 26 Sep 2010 15:47:01 +0000 (-0300)
Subject: [scanner] Mark enum members as private in transformer
X-Git-Tag: GOBJECT_INTROSPECTION_0_9_7~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60a8c752b300470f33994be75b72a91cf349b6f0;p=platform%2Fupstream%2Fgobject-introspection.git

[scanner] Mark enum members as private in transformer

Remove enum members which follows /* <private> */ comments
inside the transformer instead of the sourcescanner itself.

Fixes a crash when creating the gir for GstBase.
---

diff --git a/giscanner/scannerparser.y b/giscanner/scannerparser.y
index d5f9a65..4d85e33 100644
--- a/giscanner/scannerparser.y
+++ b/giscanner/scannerparser.y
@@ -878,17 +878,11 @@ enumerator_list
 	  }
 	  enumerator
 	  {
-              if (!scanner->private)
-                {
-                  $$ = g_list_append (NULL, $2);
-                }
+            $$ = g_list_append (NULL, $2);
 	  }
 	| enumerator_list ',' enumerator
 	  {
-              if (!scanner->private)
-                {
-                  $$ = g_list_append ($1, $3);
-                }
+            $$ = g_list_append ($1, $3);
 	  }
 	;
 
diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index 9f2bc15..4ad4d87 100644
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -354,7 +354,7 @@ raise ValueError."""
             if prefixlen > 0:
                 name = child.ident[prefixlen:]
             else:
-                if child.ident is None:
+                if child.private:
                     continue
                 # Ok, the enum members don't have a consistent prefix
                 # among them, so let's just remove the global namespace