From: Rico Tzschichholz Date: Tue, 16 Feb 2021 21:42:00 +0000 (+0100) Subject: vala: Simplify Expression.parent_statement X-Git-Tag: 0.51.2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d39357dc883f08bfbf5155ce03b748f4e077893c;p=thirdparty%2Fvala.git vala: Simplify Expression.parent_statement --- diff --git a/vala/valaexpression.vala b/vala/valaexpression.vala index a02cc1c1f..53983682e 100644 --- a/vala/valaexpression.vala +++ b/vala/valaexpression.vala @@ -104,18 +104,14 @@ public abstract class Vala.Expression : CodeNode { public Statement? parent_statement { get { - unowned Expression? expr = parent_node as Expression; - unowned Statement? stmt = parent_node as Statement; - unowned LocalVariable? local = parent_node as LocalVariable; - unowned MemberInitializer? initializer = parent_node as MemberInitializer; - if (stmt != null) { + if (parent_node is MemberInitializer) { + return ((Expression) parent_node.parent_node).parent_statement; + } else if (parent_node is LocalVariable) { + return (Statement) parent_node.parent_node; + } else if (parent_node is Statement) { return (Statement) parent_node; - } else if (expr != null) { - return expr.parent_statement; - } else if (local != null) { - return (Statement) local.parent_node; - } else if (initializer != null) { - return ((Expression)initializer.parent_node).parent_statement; + } else if (parent_node is Expression) { + return ((Expression) parent_node).parent_statement; } else { return null; }