From 0ae1ffb51d1ce2990c9649055fd45e71f0aee652 Mon Sep 17 00:00:00 2001 From: Graham Date: Thu, 6 Aug 2020 22:37:38 +0100 Subject: [PATCH] Don't convert integer literals in char arithmetic to char literals On balance, I think in most cases this is harder to read. Signed-off-by: Graham --- .../dev/openrs2/deob/ast/transform/CharLiteralTransformer.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/CharLiteralTransformer.kt b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/CharLiteralTransformer.kt index 92d72f44..686e29b3 100644 --- a/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/CharLiteralTransformer.kt +++ b/deob-ast/src/main/java/dev/openrs2/deob/ast/transform/CharLiteralTransformer.kt @@ -8,9 +8,7 @@ import com.github.javaparser.ast.expr.BinaryExpr.Operator.GREATER import com.github.javaparser.ast.expr.BinaryExpr.Operator.GREATER_EQUALS import com.github.javaparser.ast.expr.BinaryExpr.Operator.LESS import com.github.javaparser.ast.expr.BinaryExpr.Operator.LESS_EQUALS -import com.github.javaparser.ast.expr.BinaryExpr.Operator.MINUS import com.github.javaparser.ast.expr.BinaryExpr.Operator.NOT_EQUALS -import com.github.javaparser.ast.expr.BinaryExpr.Operator.PLUS import com.github.javaparser.ast.expr.CharLiteralExpr import com.github.javaparser.ast.expr.Expression import com.github.javaparser.ast.expr.IntegerLiteralExpr @@ -33,7 +31,7 @@ import javax.inject.Singleton class CharLiteralTransformer : Transformer() { override fun transformUnit(group: LibraryGroup, library: Library, unit: CompilationUnit) { unit.walk { expr: BinaryExpr -> - if (expr.operator in COMPARISON_OPERATORS || expr.operator == PLUS || expr.operator == MINUS) { + if (expr.operator in COMPARISON_OPERATORS) { convertToCharLiteral(expr.left, expr.right) convertToCharLiteral(expr.right, expr.left) }