vala: Warn about usage of override to implement abstract interface methods

Fixes criticals in GAsyncModule.visit_method()

    vala_symbol_get_parent_symbol: assertion 'self != NULL' failed

which were introduced with 12db9b7eeb1f53975010d89839d554b5fcf99831

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 29e45d862eaa8dfbf8885ddb22d470b4fa3770ef..b060be0223f1ec56ba95b700bf6bb696b7866cd5 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -360,6 +360,7 @@ TESTS = \
        objects/interface-async-base-access.vala \
        objects/interface-base-access.vala \
        objects/interfaces.vala \
+       objects/interface-abstract-async-override.vala \
        objects/interface-generics.vala \
        objects/interface-property-base-access.vala \
        objects/interface-property-base-impl.vala \

diff --git a/tests/objects/interface-abstract-async-override.vala b/tests/objects/interface-abstract-async-override.vala
new file mode 100644 (file)
index 0000000..2af7f4b
--- /dev/null
+++ b/tests/objects/interface-abstract-async-override.vala
@@ -0,0 +1,23 @@
+interface IFoo : Object {
+       public abstract async int foo ();
+}
+
+class Bar : Object, IFoo {
+       public override async int foo () {
+               return 42;
+       }
+}
+
+MainLoop loop;
+
+void main () {
+       loop = new MainLoop ();
+
+       IFoo bar = new Bar ();
+       bar.foo.begin ((o,r) => {
+               assert (((IFoo) o).foo.end (r) == 42);
+               loop.quit ();
+       });
+       loop.run ();
+}
+

diff --git a/vala/valamethod.vala b/vala/valamethod.vala
index 880d460640f177dbce88755e6b0da19fdc06d4f2..40bb578a6416de5ba40b4cf1de5345d887af2970 100644 (file)
--- a/vala/valamethod.vala
+++ b/vala/valamethod.vala
@@ -895,6 +895,9 @@ public class Vala.Method : Subroutine, Callable {
                                Report.error (source_reference, "A struct member `%s' cannot be marked as override, virtual, or abstract".printf (get_full_name ()));
                                return false;
                        }
+               } else if (overrides && base_method == null && base_interface_method != null && base_interface_method.is_abstract) {
+                       Report.warning (source_reference, "`override' not required to implement `abstract' interface method `%s'".printf (base_interface_method.get_full_name ()));
+                       overrides = false;
                } else if (overrides && base_method == null && base_interface_method == null) {
                        Report.error (source_reference, "`%s': no suitable method found to override".printf (get_full_name ()));
                } else if ((is_abstract || is_virtual || overrides) && access == SymbolAccessibility.PRIVATE) {