ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-08-15 03:40:34 +02:00
Code Issues Projects Releases Wiki Activity

Give comment-generating functions more precise naming

Browse Source
This commit is contained in:
Jeff Smith 2014-02-17 00:08:50 -06:00 committed by Connor Tumbleson
parent a4d5d2299b
commit f5765d37c8
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java
View File

@ -66,10 +66,11 @@ public class ArrayDataMethodItem extends InstructionMethodItem<ArrayPayload> {
LongRenderer.writeSignedIntOrLongTo(writer, number.longValue()); LongRenderer.writeSignedIntOrLongTo(writer, number.longValue());
writer.write(suffix); writer.write(suffix);
if (elementWidth == 8) { if (elementWidth == 8) {
writeDouble(writer, number.longValue()); writeCommentIfLikelyDouble(writer, number.longValue());
} else if (elementWidth == 4) { } else if (elementWidth == 4) {
writeResourceId(writer, number.intValue()); int value = number.intValue();
writeFloat(writer, number.intValue()); boolean isResourceId = writeCommentIfResourceId(writer, value);
if (!isResourceId) writeCommentIfLikelyFloat(writer, value);
} }
writer.write("\n"); writer.write("\n");
} }

25
brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java
View File

@ -232,10 +232,10 @@ public class InstructionMethodItem<T extends Instruction> extends MethodItem {
writer.write(", "); writer.write(", ");
writeLiteral(writer); writeLiteral(writer);
if (instruction.getOpcode().setsWideRegister()) { if (instruction.getOpcode().setsWideRegister()) {
writeDouble(writer); writeCommentIfLikelyDouble(writer);
} else { } else {
writeResourceId(writer); boolean isResourceId = writeCommentIfResourceId(writer);
writeFloat(writer); if (!isResourceId) writeCommentIfLikelyFloat(writer);
} }
return true; return true;
case Format21t: case Format21t:
@ -441,11 +441,11 @@ public class InstructionMethodItem<T extends Instruction> extends MethodItem {
LongRenderer.writeSignedIntOrLongTo(writer, ((WideLiteralInstruction)instruction).getWideLiteral()); LongRenderer.writeSignedIntOrLongTo(writer, ((WideLiteralInstruction)instruction).getWideLiteral());
} }
protected void writeFloat(IndentingWriter writer) throws IOException { protected void writeCommentIfLikelyFloat(IndentingWriter writer) throws IOException {
writeFloat(writer, ((NarrowLiteralInstruction)instruction).getNarrowLiteral()); writeCommentIfLikelyFloat(writer, ((NarrowLiteralInstruction)instruction).getNarrowLiteral());
} }
protected void writeFloat(IndentingWriter writer, int val) throws IOException { protected void writeCommentIfLikelyFloat(IndentingWriter writer, int val) throws IOException {
if (NumberUtils.isLikelyFloat(val)) { if (NumberUtils.isLikelyFloat(val)) {
writer.write(" # "); writer.write(" # ");
float fval = Float.intBitsToFloat(val); float fval = Float.intBitsToFloat(val);
@ -468,11 +468,11 @@ public class InstructionMethodItem<T extends Instruction> extends MethodItem {
} }
} }
protected void writeDouble(IndentingWriter writer) throws IOException { protected void writeCommentIfLikelyDouble(IndentingWriter writer) throws IOException {
writeDouble(writer, ((WideLiteralInstruction)instruction).getWideLiteral()); writeCommentIfLikelyDouble(writer, ((WideLiteralInstruction)instruction).getWideLiteral());
} }
protected void writeDouble(IndentingWriter writer, long val) throws IOException { protected void writeCommentIfLikelyDouble(IndentingWriter writer, long val) throws IOException {
if (NumberUtils.isLikelyDouble(val)) { if (NumberUtils.isLikelyDouble(val)) {
writer.write(" # "); writer.write(" # ");
double dval = Double.longBitsToDouble(val); double dval = Double.longBitsToDouble(val);
@ -493,17 +493,18 @@ public class InstructionMethodItem<T extends Instruction> extends MethodItem {
} }
} }
protected void writeResourceId(IndentingWriter writer) throws IOException { protected boolean writeCommentIfResourceId(IndentingWriter writer) throws IOException {
writeResourceId(writer, ((NarrowLiteralInstruction)instruction).getNarrowLiteral()); return writeCommentIfResourceId(writer, ((NarrowLiteralInstruction)instruction).getNarrowLiteral());
} }
protected void writeResourceId(IndentingWriter writer, int val) throws IOException { protected boolean writeCommentIfResourceId(IndentingWriter writer, int val) throws IOException {
Map<Integer,String> resourceIds = methodDef.classDef.options.resourceIds; Map<Integer,String> resourceIds = methodDef.classDef.options.resourceIds;
String resource = resourceIds.get(Integer.valueOf(val)); String resource = resourceIds.get(Integer.valueOf(val));
if (resource != null) { if (resource != null) {
writer.write(" # "); writer.write(" # ");
writer.write(resource); writer.write(resource);
} }
return (resource != null);
} }
protected void writeFieldOffset(IndentingWriter writer) throws IOException { protected void writeFieldOffset(IndentingWriter writer) throws IOException {

2
brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/PackedSwitchMethodItem.java
View File

@ -85,7 +85,7 @@ public class PackedSwitchMethodItem extends InstructionMethodItem<PackedSwitchPa
int key = firstKey; int key = firstKey;
for (PackedSwitchTarget target: targets) { for (PackedSwitchTarget target: targets) {
target.writeTargetTo(writer); target.writeTargetTo(writer);
writeResourceId(writer, key); writeCommentIfResourceId(writer, key);
writer.write('\n'); writer.write('\n');
key++; key++;
} }

2
brut.apktool.smali/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/SparseSwitchMethodItem.java
View File

@ -71,7 +71,7 @@ public class SparseSwitchMethodItem extends InstructionMethodItem<SparseSwitchPa
IntegerRenderer.writeTo(writer, target.getKey()); IntegerRenderer.writeTo(writer, target.getKey());
writer.write(" -> "); writer.write(" -> ");
target.writeTargetTo(writer); target.writeTargetTo(writer);
writeResourceId(writer, target.getKey()); writeCommentIfResourceId(writer, target.getKey());
writer.write('\n'); writer.write('\n');
} }
writer.deindent(4); writer.deindent(4);