[vala/0.54] codegen: Use ErrorType.error_domain if possible
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/0.54] codegen: Use ErrorType.error_domain if possible
- Date: Sun, 24 Oct 2021 13:13:13 +0000 (UTC)
commit 51acfb573d880f3b761a22e97678e204db67d3ce
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Sat Oct 23 15:27:12 2021 +0200
codegen: Use ErrorType.error_domain if possible
codegen/valagerrormodule.vala | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/codegen/valagerrormodule.vala b/codegen/valagerrormodule.vala
index 8deea612a..a559a4d00 100644
--- a/codegen/valagerrormodule.vala
+++ b/codegen/valagerrormodule.vala
@@ -228,13 +228,13 @@ public class Vala.GErrorModule : CCodeDelegateModule {
ccode.add_goto (clause.get_attribute_string ("CCode",
"cname"));
break;
} else {
- var catch_type = clause.error_type as ErrorType;
+ unowned ErrorType catch_type = (ErrorType) clause.error_type;
if (catch_type.error_code != null) {
/* catch clause specifies a specific error code */
var error_match = new CCodeFunctionCall (new
CCodeIdentifier ("g_error_matches"));
error_match.add_argument (get_inner_error_cexpression
());
- error_match.add_argument (new CCodeIdentifier
(get_ccode_upper_case_name (catch_type.type_symbol)));
+ error_match.add_argument (new CCodeIdentifier
(get_ccode_upper_case_name (catch_type.error_domain)));
error_match.add_argument (new CCodeIdentifier
(get_ccode_name (catch_type.error_code)));
ccode.open_if (error_match);
@@ -242,7 +242,7 @@ public class Vala.GErrorModule : CCodeDelegateModule {
/* catch clause specifies a full error domain */
var ccond = new CCodeBinaryExpression
(CCodeBinaryOperator.EQUALITY,
new CCodeMemberAccess.pointer
(get_inner_error_cexpression (), "domain"), new CCodeIdentifier
- (get_ccode_upper_case_name
(clause.error_type.type_symbol)));
+ (get_ccode_upper_case_name
(catch_type.error_domain)));
ccode.open_if (ccond);
}
@@ -284,7 +284,7 @@ public class Vala.GErrorModule : CCodeDelegateModule {
// Check the allowed error domains to propagate
var domain_check = new CCodeBinaryExpression (CCodeBinaryOperator.EQUALITY,
new CCodeMemberAccess.pointer
- (get_inner_error_cexpression (), "domain"), new CCodeIdentifier
(get_ccode_upper_case_name (error_type.type_symbol)));
+ (get_inner_error_cexpression (), "domain"), new CCodeIdentifier
(get_ccode_upper_case_name (((ErrorType) error_type).error_domain)));
if (ccond == null) {
ccond = domain_check;
} else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]