]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
vala: Improve CodeWriter.visit_catch_clause()
authorRico Tzschichholz <ricotz@ubuntu.com>
Sat, 23 Oct 2021 13:27:12 +0000 (15:27 +0200)
committerRico Tzschichholz <ricotz@ubuntu.com>
Sun, 24 Oct 2021 12:57:31 +0000 (14:57 +0200)
Properly output general catch clause

vala/valacodewriter.vala

index 82f7efb49b099c46ea11923bb04d2ae8222e1220..2431afb2069325ca486034b172a9aa1684dfb35c 100644 (file)
@@ -1206,9 +1206,12 @@ public class Vala.CodeWriter : CodeVisitor {
        }
 
        public override void visit_catch_clause (CatchClause clause) {
-               var type_name = clause.error_type == null ? "GLib.Error" : clause.error_type.to_string ();
-               var var_name = clause.variable_name == null ? "_" : clause.variable_name;
-               write_string (" catch (%s %s)".printf (type_name, var_name));
+               if (clause.variable_name != null) {
+                       var type_name = clause.error_type == null ? "GLib.Error" : clause.error_type.to_string ();
+                       write_string (" catch (%s %s)".printf (type_name, clause.variable_name));
+               } else {
+                       write_string (" catch");
+               }
                clause.body.accept (this);
        }