[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 d5f9a65c070663ea0e1507ae63c00e2293dffa8e..4d85e33eb3cb0e744e5e951f77a4588e3fa0ea83 100644 (file)
--- 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 9f2bc153c977b50c1851810e882a9ae890645dfd..4ad4d870a6aaed5e64377a89e96fc38c94e848e5 100644 (file)
--- 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