]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
gsignal: Move disconnect error from signal-module to semantic-analyzer pass
authorRico Tzschichholz <ricotz@ubuntu.com>
Sun, 10 Mar 2019 17:14:09 +0000 (18:14 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Wed, 10 Apr 2019 14:10:00 +0000 (16:10 +0200)
Add corresponding invalid test to increase coverage

codegen/valagsignalmodule.vala
tests/Makefile.am
tests/semantic/signal-disconnect-invalid.test [new file with mode: 0644]
vala/valamethodcall.vala

index e3a12f58faa5383ce7bfe16ad86505f18de20a75..b3b7333b8b613f591b01c7a0706d757c13d7c30c 100644 (file)
@@ -642,9 +642,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 {
index 9de37647440744f3928cd9d3dc3cc6c779e6041f..c71e0cf40bd03335200c36b8fba7e20c37a444e0 100644 (file)
@@ -664,6 +664,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
@@ -0,0 +1,10 @@
+Invalid Code
+
+class Foo : Object {
+       public signal void bar ();
+}
+
+void main () {
+       var foo = new Foo ();
+       foo.bar.disconnect (() => {});
+}
index b3fe08465446ec773c011b1ec17df004ca8bc7c0..15d6086560f448a932f5b4e6cd20a72d261a7f69 100644 (file)
@@ -509,6 +509,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 ();