From 1318cce216e0db3cdb6925fb53895968a1f3f796 Mon Sep 17 00:00:00 2001 From: Graham Date: Wed, 5 Aug 2020 11:29:18 +0100 Subject: [PATCH] Move this keyword to the right-hand side of comparisons Signed-off-by: Graham --- .../deob/ast/transform/BinaryExprOrderTransformer.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/BinaryExprOrderTransformer.kt b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/BinaryExprOrderTransformer.kt index f052347e..b1c5827c 100644 --- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/BinaryExprOrderTransformer.kt +++ b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/BinaryExprOrderTransformer.kt @@ -2,6 +2,7 @@ package dev.openrs2.deob.ast.transform import com.github.javaparser.ast.CompilationUnit import com.github.javaparser.ast.expr.BinaryExpr +import com.github.javaparser.ast.expr.Expression import dev.openrs2.deob.ast.Library import dev.openrs2.deob.ast.LibraryGroup import dev.openrs2.deob.ast.util.flip @@ -22,11 +23,14 @@ class BinaryExprOrderTransformer : Transformer() { val left = expr.left val right = expr.right - if (left.isLiteralExpr && !right.isLiteralExpr) { + if (left.isLiteralOrThisExpr && !right.isLiteralOrThisExpr) { expr.operator = op expr.left = right.clone() expr.right = left.clone() } } } + + private val Expression.isLiteralOrThisExpr: Boolean + get() = isLiteralExpr || isThisExpr }