vala: Accept interface as inner type for object-type symbols

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4fe6f9b3a1eab38b124c563953222cbc1255b587..c22b4dc0b6fd88c2f45546e765cd0d833c65e3ef 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -299,6 +299,7 @@ TESTS = \
        delegates/bug792077.vala \
        objects/chainup.vala \
        objects/class_only.vala \
+       objects/class-inner-types.vala \
        objects/classes.vala \
        objects/classes-interfaces.vala \
        objects/classes-interfaces-virtuals.vala \
@@ -321,6 +322,7 @@ TESTS = \
        objects/gsource.vala \
        objects/instance-comparison.vala \
        objects/interface_only.vala \
+       objects/interface-inner-types.vala \
        objects/interfaces.vala \
        objects/interface-generics.vala \
        objects/interface-virtual-override.vala \

diff --git a/tests/objects/class-inner-types.vala b/tests/objects/class-inner-types.vala
new file mode 100644 (file)
index 0000000..ee6ab08
--- /dev/null
+++ b/tests/objects/class-inner-types.vala
@@ -0,0 +1,17 @@
+class Foo {
+       interface IBar {
+       }
+
+       class Bar : IBar {
+       }
+
+       public void bar () {
+               var bar = new Bar ();
+               assert (bar is IBar);
+       }
+}
+
+void main () {
+       var foo = new Foo ();
+       foo.bar ();
+}

diff --git a/tests/objects/interface-inner-types.vala b/tests/objects/interface-inner-types.vala
new file mode 100644 (file)
index 0000000..db0d80d
--- /dev/null
+++ b/tests/objects/interface-inner-types.vala
@@ -0,0 +1,20 @@
+class Foo : IFoo {
+}
+
+interface IFoo {
+       interface IBar {
+       }
+
+       class Bar : IBar {
+       }
+
+       public void bar () {
+               var bar = new Bar ();
+               assert (bar is IBar);
+       }
+}
+
+void main () {
+       var foo = new Foo ();
+       foo.bar ();
+}

diff --git a/vala/valaclass.vala b/vala/valaclass.vala
index 289cc74599690d8fbc881916a44b3956d2c76c34..507a10d2384766846524549575c6781b32669109 100644 (file)
--- a/vala/valaclass.vala
+++ b/vala/valaclass.vala
@@ -629,6 +629,10 @@ public class Vala.Class : ObjectTypeSymbol {
                        cl.check (context);
                }
 
+               foreach (Interface iface in get_interfaces ()) {
+                       iface.check (context);
+               }
+
                foreach (Struct st in get_structs ()) {
                        st.check (context);
                }

diff --git a/vala/valainterface.vala b/vala/valainterface.vala
index 5cbb2ed785cf3f81df73c836362594021d445254..44613f9ef308f5916149eae72ffd6e27095ae7f2 100644 (file)
--- a/vala/valainterface.vala
+++ b/vala/valainterface.vala
@@ -270,6 +270,10 @@ public class Vala.Interface : ObjectTypeSymbol {
                        cl.check (context);
                }
 
+               foreach (Interface iface in get_interfaces ()) {
+                       iface.check (context);
+               }
+
                foreach (Struct st in get_structs ()) {
                        st.check (context);
                }

diff --git a/vala/valaobjecttypesymbol.vala b/vala/valaobjecttypesymbol.vala
index 918d18814a2d02d34719e376b7aef138f29baa6c..c0ca11bb2451f8c8129364ca80f0ffef4635e386 100644 (file)
--- a/vala/valaobjecttypesymbol.vala
+++ b/vala/valaobjecttypesymbol.vala
@@ -41,6 +41,7 @@ public abstract class Vala.ObjectTypeSymbol : TypeSymbol {
 
        // inner types
        private List<Class> classes = new ArrayList<Class> ();
+       private List<Interface> interfaces = new ArrayList<Interface> ();
        private List<Struct> structs = new ArrayList<Struct> ();
        private List<Enum> enums = new ArrayList<Enum> ();
        private List<Delegate> delegates = new ArrayList<Delegate> ();
@@ -156,6 +157,15 @@ public abstract class Vala.ObjectTypeSymbol : TypeSymbol {
                return classes;
        }
 
+       /**
+        * Returns the list of interfaces.
+        *
+        * @return list of interfaces
+        */
+       public unowned List<Interface> get_interfaces () {
+               return interfaces;
+       }
+
        /**
         * Returns the list of structs.
         *
@@ -193,6 +203,16 @@ public abstract class Vala.ObjectTypeSymbol : TypeSymbol {
                scope.add (cl.name, cl);
        }
 
+       /**
+        * Adds the specified interface as an inner interface.
+        *
+        * @param iface an interface
+        */
+       public override void add_interface (Interface iface) {
+               interfaces.add (iface);
+               scope.add (iface.name, iface);
+       }
+
        /**
         * Adds the specified struct as an inner struct.
         *
@@ -353,6 +373,10 @@ public abstract class Vala.ObjectTypeSymbol : TypeSymbol {
                        cl.accept (visitor);
                }
 
+               foreach (Interface iface in get_interfaces ()) {
+                       iface.accept (visitor);
+               }
+
                foreach (Struct st in get_structs ()) {
                        st.accept (visitor);
                }