[vala/staging: 2/9] gsignal: get_detail_cexpression/get_signal_name_cexpression must not be null
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/staging: 2/9] gsignal: get_detail_cexpression/get_signal_name_cexpression must not be null
- Date: Sun, 10 Mar 2019 17:26:15 +0000 (UTC)
commit 5c190092d7385e315bbbefa4d638039e7dd3403c
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Sun Mar 10 18:14:09 2019 +0100
gsignal: get_detail_cexpression/get_signal_name_cexpression must not be null
codegen/valagsignalmodule.vala | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
---
diff --git a/codegen/valagsignalmodule.vala b/codegen/valagsignalmodule.vala
index 80f02f849..bcda9d96f 100644
--- a/codegen/valagsignalmodule.vala
+++ b/codegen/valagsignalmodule.vala
@@ -109,7 +109,7 @@ public class Vala.GSignalModule : GObjectModule {
return signature;
}
- private CCodeExpression? get_signal_name_cexpression (Signal sig, Expression? detail_expr, CodeNode
node) {
+ private CCodeExpression get_signal_name_cexpression (Signal sig, Expression? detail_expr, CodeNode
node) {
if (detail_expr == null) {
return get_signal_canonical_constant (sig);
}
@@ -138,7 +138,7 @@ public class Vala.GSignalModule : GObjectModule {
return new CCodeElementAccess (signal_array, signal_enum_value);
}
- private CCodeExpression? get_detail_cexpression (Expression detail_expr, CodeNode node) {
+ private CCodeExpression get_detail_cexpression (Expression detail_expr, CodeNode node) {
var detail_cexpr = get_cvalue (detail_expr);
CCodeFunctionCall detail_ccall;
if (is_constant_ccode_expression (detail_cexpr)) {
@@ -486,17 +486,13 @@ public class Vala.GSignalModule : GObjectModule {
ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_signal_emit"));
ccall.add_argument (get_cvalue (ma.inner));
ccall.add_argument (get_signal_id_cexpression (sig));
- if (detail_cexpr != null) {
- ccall.add_argument (detail_cexpr);
- }
+ ccall.add_argument (detail_cexpr);
} else {
var signal_name_cexpr = get_signal_name_cexpression (sig,
detail_expr, expr);
ccall = new CCodeFunctionCall (new CCodeIdentifier
("g_signal_emit_by_name"));
ccall.add_argument (get_cvalue (ma.inner));
- if (signal_name_cexpr != null) {
- ccall.add_argument (signal_name_cexpr);
- }
+ ccall.add_argument (signal_name_cexpr);
}
set_cvalue (expr, ccall);
@@ -647,9 +643,6 @@ public class Vala.GSignalModule : GObjectModule {
ma = (MemberAccess) ea.container;
var detail_expr = ea.get_indices ().get (0);
signal_name_cexpr = get_signal_name_cexpression (sig, detail_expr, expr);
- if (signal_name_cexpr == null) {
- return null;
- }
} else {
ma = (MemberAccess) signal_access;
signal_name_cexpr = get_signal_name_cexpression (sig, null, expr);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]