gsignal: Move disconnect error from signal-module to semantic-analyzer pass

Add corresponding invalid test to increase coverage

diff --git a/codegen/valagsignalmodule.vala b/codegen/valagsignalmodule.vala
index c4c046a175478a62b9cf9dd6c934b112ecebcdfd..822519030173c191aa8509dde8d8c0d8956383c6 100644 (file)
--- a/codegen/valagsignalmodule.vala
+++ b/codegen/valagsignalmodule.vala
@@ -627,9 +627,6 @@ public class Vala.GSignalModule : GObjectModule {
                        }
                } else {
                        // disconnect
-                       if (handler is LambdaExpression) {
-                               Report.error (handler.source_reference, "Cannot disconnect lambda expression from signal. Use Object.disconnect.");
-                       }
                        if (sig is DynamicSignal) {
                                connect_func = get_dynamic_signal_disconnect_wrapper_name ((DynamicSignal) sig);
                        } else {

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e54e872274068c8d47d0d9249ad3b1a22d2b0950..77f4da8661a93851647c9325d23e0a9dba299d9f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -699,6 +699,7 @@ TESTS = \
        semantic/signal-detail-invalid.test \
        semantic/signal-detail-non-string.test \
        semantic/struct-derived.test \
+       semantic/signal-disconnect-invalid.test \
        semantic/struct-field-initializer.test \
        semantic/struct-invalid-base.test \
        semantic/struct-recursive.test \

diff --git a/tests/semantic/signal-disconnect-invalid.test b/tests/semantic/signal-disconnect-invalid.test
new file mode 100644 (file)
index 0000000..2d38838
--- /dev/null
+++ b/tests/semantic/signal-disconnect-invalid.test
@@ -0,0 +1,10 @@
+Invalid Code
+
+class Foo : Object {
+       public signal void bar ();
+}
+
+void main () {
+       var foo = new Foo ();
+       foo.bar.disconnect (() => {});
+}

diff --git a/vala/valamethodcall.vala b/vala/valamethodcall.vala
index af44a2a5b81a1058bfb088af30222bdfc0a0b954..80d0d772f5a961d6a1beab77d853b0a389741e57 100644 (file)
--- a/vala/valamethodcall.vala
+++ b/vala/valamethodcall.vala
@@ -535,6 +535,16 @@ public class Vala.MethodCall : Expression {
                                value_type.nullable = true;
                        }
 
+                       unowned Signal? sig = m.parent_symbol as Signal;
+                       if (sig != null && m.name == "disconnect") {
+                               var param = get_argument_list ()[0];
+                               if (param is LambdaExpression) {
+                                       error = true;
+                                       Report.error (source_reference, "Cannot disconnect lambda expression from signal");
+                                       return false;
+                               }
+                       }
+
                        var dynamic_sig = m.parent_symbol as DynamicSignal;
                        if (dynamic_sig != null && dynamic_sig.handler != null) {
                                dynamic_sig.return_type = dynamic_sig.handler.value_type.get_return_type ().copy ();