girwriter: Don't include symbols outside of a namespace

Additionally report a warning for symbols which doesn't fulfill this rule.

Fixes https://gitlab.gnome.org/GNOME/vala/issues/241

diff --git a/codegen/valagirwriter.vala b/codegen/valagirwriter.vala
index 2ae748bf0fff0098036f8b82d6dd2d745319ad45..03b0643145a2355716415b070b5f97a95d505f79 100644 (file)
--- a/codegen/valagirwriter.vala
+++ b/codegen/valagirwriter.vala
@@ -392,6 +392,10 @@ public class Vala.GIRWriter : CodeVisitor {
                        return;
                }
 
+               if (!has_namespace (cl)) {
+                       return;
+               }
+
                if (!(hierarchy[0] is Namespace)) {
                        deferred.add (cl);
                        return;
@@ -604,6 +608,10 @@ public class Vala.GIRWriter : CodeVisitor {
                        return;
                }
 
+               if (!has_namespace (st)) {
+                       return;
+               }
+
                if (!(hierarchy[0] is Namespace)) {
                        deferred.add (st);
                        return;
@@ -642,6 +650,10 @@ public class Vala.GIRWriter : CodeVisitor {
                        return;
                }
 
+               if (!has_namespace (iface)) {
+                       return;
+               }
+
                if (!(hierarchy[0] is Namespace)) {
                        deferred.add (iface);
                        return;
@@ -807,6 +819,10 @@ public class Vala.GIRWriter : CodeVisitor {
                        return;
                }
 
+               if (!has_namespace (en)) {
+                       return;
+               }
+
                if (!(hierarchy[0] is Namespace)) {
                        deferred.add (en);
                        return;
@@ -881,6 +897,10 @@ public class Vala.GIRWriter : CodeVisitor {
                        return;
                }
 
+               if (!has_namespace (edomain)) {
+                       return;
+               }
+
                write_indent ();
                buffer.append_printf ("<enumeration name=\"%s\"", edomain.name);
                write_ctype_attributes (edomain);
@@ -938,6 +958,10 @@ public class Vala.GIRWriter : CodeVisitor {
                        return;
                }
 
+               if (!has_namespace (c)) {
+                       return;
+               }
+
                //TODO Add better constant evaluation
                var initializer = c.value;
                string value = literal_expression_to_value_string (initializer);
@@ -967,6 +991,10 @@ public class Vala.GIRWriter : CodeVisitor {
                        return;
                }
 
+               if (!has_namespace (f)) {
+                       return;
+               }
+
                write_indent ();
                buffer.append_printf ("<field name=\"%s\"", get_ccode_name (f));
                if (f.variable_type.nullable) {
@@ -1188,6 +1216,10 @@ public class Vala.GIRWriter : CodeVisitor {
                        return;
                }
 
+               if (!has_namespace (cb)) {
+                       return;
+               }
+
                write_indent ();
                buffer.append_printf ("<callback name=\"%s\"", cb.name);
                buffer.append_printf (" c:type=\"%s\"", get_ccode_name (cb));
@@ -1217,6 +1249,10 @@ public class Vala.GIRWriter : CodeVisitor {
                        return;
                }
 
+               if (!has_namespace (m)) {
+                       return;
+               }
+
                string tag_name = "method";
                var parent = this.hierarchy.get (0);
                if (parent is Enum) {
@@ -1724,4 +1760,13 @@ public class Vala.GIRWriter : CodeVisitor {
        private bool is_visibility (Symbol sym) {
                return sym.get_attribute_bool ("GIR", "visible", true);
        }
+
+       bool has_namespace (Symbol sym) {
+               if (!(sym.parent_symbol is Namespace) || sym.parent_symbol.name != null) {
+                       return true;
+               }
+
+               Report.warning (sym.source_reference, "`%s' must be part of namespace to be included in GIR".printf (sym.name));
+               return false;
+       }
 }

diff --git a/tests/girwriter/girtest.vala b/tests/girwriter/girtest.vala
index a63b6d4c38e7b1a434953a9290f83615b9d87c5e..9aeeacc4ad5b29fc2a15d569f3e74473fd317fc7 100644 (file)
--- a/tests/girwriter/girtest.vala
+++ b/tests/girwriter/girtest.vala
@@ -320,3 +320,30 @@ namespace GirTest {
                }
        }
 }
+
+public enum InvalidEnum {
+       VALUE
+}
+
+public errordomain InvalidError {
+       FAILED
+}
+
+public class InvalidClass {
+}
+
+public interface InvalidIface {
+}
+
+public struct InvalidStruct {
+       public int i;
+}
+
+public delegate void InvalidFunc ();
+
+public const int INVALID_CONST = 0;
+
+public int invalid_field;
+
+public void invalid_method () {
+}

diff --git a/tests/girwriter/girtest.vapi-expected b/tests/girwriter/girtest.vapi-expected
index b09de120d601383f08ef63ce1a5517369ce49eda..23ca2a8bd67b57d7a62197d011eafa38cce9d785 100644 (file)
--- a/tests/girwriter/girtest.vapi-expected
+++ b/tests/girwriter/girtest.vapi-expected
@@ -192,3 +192,30 @@ namespace GirTest {
        [CCode (cheader_filename = "girtest.h")]
        public const string CONSTANT_STRING;
 }
+[CCode (cheader_filename = "girtest.h")]
+public enum InvalidEnum {
+       VALUE
+}
+[CCode (cheader_filename = "girtest.h")]
+public errordomain InvalidError {
+       FAILED
+}
+[CCode (cheader_filename = "girtest.h")]
+public class InvalidClass {
+       public InvalidClass ();
+}
+[CCode (cheader_filename = "girtest.h")]
+public interface InvalidIface {
+}
+[CCode (cheader_filename = "girtest.h")]
+public struct InvalidStruct {
+       public int i;
+}
+[CCode (cheader_filename = "girtest.h")]
+public delegate void InvalidFunc ();
+[CCode (cheader_filename = "girtest.h")]
+public const int INVALID_CONST;
+[CCode (cheader_filename = "girtest.h")]
+public static int invalid_field;
+[CCode (cheader_filename = "girtest.h")]
+public static void invalid_method ();