|
|
@ -9,6 +9,7 @@ import com.github.javaparser.ast.expr.NullLiteralExpr |
|
|
|
import com.github.javaparser.ast.expr.ObjectCreationExpr |
|
|
|
import com.github.javaparser.ast.expr.ObjectCreationExpr |
|
|
|
import com.github.javaparser.ast.expr.VariableDeclarationExpr |
|
|
|
import com.github.javaparser.ast.expr.VariableDeclarationExpr |
|
|
|
import com.github.javaparser.resolution.MethodAmbiguityException |
|
|
|
import com.github.javaparser.resolution.MethodAmbiguityException |
|
|
|
|
|
|
|
import com.github.javaparser.resolution.declarations.ResolvedMethodLikeDeclaration |
|
|
|
import dev.openrs2.deob.ast.Library |
|
|
|
import dev.openrs2.deob.ast.Library |
|
|
|
import dev.openrs2.deob.ast.LibraryGroup |
|
|
|
import dev.openrs2.deob.ast.LibraryGroup |
|
|
|
import dev.openrs2.deob.ast.util.walk |
|
|
|
import dev.openrs2.deob.ast.util.walk |
|
|
@ -29,6 +30,8 @@ class RedundantCastTransformer : Transformer() { |
|
|
|
val arg = expr.arguments[i] |
|
|
|
val arg = expr.arguments[i] |
|
|
|
if (!isCastedNull(arg)) { |
|
|
|
if (!isCastedNull(arg)) { |
|
|
|
continue |
|
|
|
continue |
|
|
|
|
|
|
|
} else if (resolvesVariadicAmbiguity(i, expr.resolve(), arg as CastExpr)) { |
|
|
|
|
|
|
|
continue |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
expr.arguments[i] = NullLiteralExpr() |
|
|
|
expr.arguments[i] = NullLiteralExpr() |
|
|
@ -45,6 +48,8 @@ class RedundantCastTransformer : Transformer() { |
|
|
|
val arg = expr.arguments[i] |
|
|
|
val arg = expr.arguments[i] |
|
|
|
if (!isCastedNull(arg)) { |
|
|
|
if (!isCastedNull(arg)) { |
|
|
|
continue |
|
|
|
continue |
|
|
|
|
|
|
|
} else if (resolvesVariadicAmbiguity(i, expr.resolve(), arg as CastExpr)) { |
|
|
|
|
|
|
|
continue |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
expr.arguments[i] = NullLiteralExpr() |
|
|
|
expr.arguments[i] = NullLiteralExpr() |
|
|
@ -80,4 +85,15 @@ class RedundantCastTransformer : Transformer() { |
|
|
|
} |
|
|
|
} |
|
|
|
return expr.expression is NullLiteralExpr |
|
|
|
return expr.expression is NullLiteralExpr |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private fun resolvesVariadicAmbiguity(index: Int, method: ResolvedMethodLikeDeclaration, cast: CastExpr): Boolean { |
|
|
|
|
|
|
|
if (index < method.numberOfParams) { |
|
|
|
|
|
|
|
val param = method.getParam(index) |
|
|
|
|
|
|
|
if (param.isVariadic && param.type == cast.type.resolve()) { |
|
|
|
|
|
|
|
return true |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return false |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|