From 7b6c0cf1fdd0008df932e750867ed3c7bd9aa27a Mon Sep 17 00:00:00 2001 From: Graham Date: Sat, 6 Feb 2021 21:44:06 +0000 Subject: [PATCH] Use block comments for multi-line comments Signed-off-by: Graham --- .../org/openrs2/archive/cache/CacheImporter.kt | 14 +++++++++----- cache/src/main/kotlin/org/openrs2/cache/Group.kt | 6 ++++-- .../deob/ast/transform/RedundantCastTransformer.kt | 6 ++++-- .../transform/OpaquePredicateTransformer.kt | 6 ++++-- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/archive/src/main/kotlin/org/openrs2/archive/cache/CacheImporter.kt b/archive/src/main/kotlin/org/openrs2/archive/cache/CacheImporter.kt index 9b487c64..49f6913f 100644 --- a/archive/src/main/kotlin/org/openrs2/archive/cache/CacheImporter.kt +++ b/archive/src/main/kotlin/org/openrs2/archive/cache/CacheImporter.kt @@ -274,9 +274,11 @@ public class CacheImporter @Inject constructor( stmt.executeBatch() } - // we deliberately ignore groups with truncated versions here and - // re-download them, just in case there's a (crc32, truncated version) - // collision + /* + * We deliberately ignore groups with truncated versions here and + * re-download them, just in case there's a (crc32, truncated version) + * collision. + */ connection.prepareStatement( """ SELECT t.group_id @@ -475,8 +477,10 @@ public class CacheImporter @Inject constructor( var versionTruncated = true val encrypted = Js5Compression.isEncrypted(buf.slice()) - // grab the non-truncated version from the Js5Index if we can - // confirm the group on disk matches the group in the index + /* + * Grab the non-truncated version from the Js5Index if we can + * confirm the group on disk matches the group in the index. + */ if (index != null) { val entry = index[group] if (entry != null && entry.checksum == buf.crc32() && (entry.version and 0xFFFF) == version) { diff --git a/cache/src/main/kotlin/org/openrs2/cache/Group.kt b/cache/src/main/kotlin/org/openrs2/cache/Group.kt index 75169216..23cd3744 100644 --- a/cache/src/main/kotlin/org/openrs2/cache/Group.kt +++ b/cache/src/main/kotlin/org/openrs2/cache/Group.kt @@ -65,8 +65,10 @@ public object Group { } } - // TODO(gpe): support multiple stripes (tricky, as the best sizes are - // probably specific to the format we're packing...) + /* + * TODO(gpe): support multiple stripes (tricky, as the best sizes are + * probably specific to the format we're packing...) + */ public fun pack(files: Int2ObjectSortedMap): ByteBuf { require(files.isNotEmpty()) diff --git a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/RedundantCastTransformer.kt b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/RedundantCastTransformer.kt index 83a77775..315bd681 100644 --- a/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/RedundantCastTransformer.kt +++ b/deob-ast/src/main/kotlin/org/openrs2/deob/ast/transform/RedundantCastTransformer.kt @@ -89,8 +89,10 @@ public class RedundantCastTransformer : Transformer() { } } - // replace casts with widening/narrowing conversions - // see https://docs.oracle.com/javase/specs/jls/se11/html/jls-5.html + /* + * replace casts with widening/narrowing conversions + * see https://docs.oracle.com/javase/specs/jls/se11/html/jls-5.html + */ unit.walk { expr: CastExpr -> expr.parentNode.ifPresent { parent -> if (parent !is AssignExpr && parent !is CastExpr) { diff --git a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OpaquePredicateTransformer.kt b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OpaquePredicateTransformer.kt index db7a02f8..7267536c 100644 --- a/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OpaquePredicateTransformer.kt +++ b/deob-bytecode/src/main/kotlin/org/openrs2/deob/bytecode/transform/OpaquePredicateTransformer.kt @@ -46,8 +46,10 @@ public class OpaquePredicateTransformer : Transformer() { val putstatic = match.last() as FieldInsnNode flowObstructors.add(MemberRef(putstatic)) - // remove initializer (except the opaque predicate at the start, - // which we treat like any other) + /* + * remove initializer (except the opaque predicate at the start, + * which we treat like any other) + */ match.drop(2).forEach(method.instructions::remove) // remove field