From c36501900766eb0b9c8490835c226bfee35d62f3 Mon Sep 17 00:00:00 2001 From: Graham Date: Sun, 12 Apr 2020 09:03:21 +0100 Subject: [PATCH] Output descriptor last in Member{Desc,Ref}.toString() The next commit will make MemberRef comparable, with the owner/name being used for sorting before the descriptor. This makes the output of the fields consistent with the sort order. Signed-off-by: Graham --- asm/src/main/java/dev/openrs2/asm/MemberDesc.kt | 2 +- asm/src/main/java/dev/openrs2/asm/MemberRef.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/asm/src/main/java/dev/openrs2/asm/MemberDesc.kt b/asm/src/main/java/dev/openrs2/asm/MemberDesc.kt index 6a6279eb..4ee9f8dc 100644 --- a/asm/src/main/java/dev/openrs2/asm/MemberDesc.kt +++ b/asm/src/main/java/dev/openrs2/asm/MemberDesc.kt @@ -13,6 +13,6 @@ data class MemberDesc(val name: String, val desc: String) { constructor(memberRef: MemberRef) : this(memberRef.name, memberRef.desc) override fun toString(): String { - return "$desc $name" + return "$name $desc" } } diff --git a/asm/src/main/java/dev/openrs2/asm/MemberRef.kt b/asm/src/main/java/dev/openrs2/asm/MemberRef.kt index b0a6e8ab..f6f34ecd 100644 --- a/asm/src/main/java/dev/openrs2/asm/MemberRef.kt +++ b/asm/src/main/java/dev/openrs2/asm/MemberRef.kt @@ -14,6 +14,6 @@ data class MemberRef(val owner: String, val name: String, val desc: String) { constructor(owner: String, desc: MemberDesc) : this(owner, desc.name, desc.desc) override fun toString(): String { - return "$desc $owner.$name" + return "$owner.$name $desc" } }