From 16f257ee8f12974c62e50643b2f87533513da455 Mon Sep 17 00:00:00 2001 From: Ben Gruver Date: Sun, 28 Oct 2012 14:31:33 -0700 Subject: [PATCH] Use .param instead of .parameter and normalize param/local syntax --- .../jf/baksmali/Adaptors/Debug/EndLocalMethodItem.java | 2 +- .../baksmali/Adaptors/Debug/RestartLocalMethodItem.java | 2 +- .../java/org/jf/baksmali/Adaptors/MethodDefinition.java | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Debug/EndLocalMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Debug/EndLocalMethodItem.java index 5f68259d..3f99f043 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Debug/EndLocalMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Debug/EndLocalMethodItem.java @@ -57,7 +57,7 @@ public class EndLocalMethodItem extends DebugMethodItem { //TODO: what if name is null, but there is a type? String name = endLocal.getName(); if (name != null) { - writer.write(" #"); + writer.write(" #"); writer.write(name); writer.write(':'); writer.write(endLocal.getType()); diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Debug/RestartLocalMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Debug/RestartLocalMethodItem.java index 7f3d397a..ffabe751 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Debug/RestartLocalMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Debug/RestartLocalMethodItem.java @@ -57,7 +57,7 @@ public class RestartLocalMethodItem extends DebugMethodItem { //TODO: what if name is null, but there is a type? String name = restartLocal.getName(); if (name != null) { - writer.write(" #"); + writer.write(" #"); writer.write(name); writer.write(':'); writer.write(restartLocal.getType()); diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java index a686f9df..7cb753c6 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java @@ -210,17 +210,19 @@ public class MethodDefinition { String parameterName = parameter.getName(); List annotations = parameter.getAnnotations(); if (parameterName != null || annotations.size() != 0) { - writer.write(".parameter p"); + writer.write(".param p"); writer.printSignedIntAsDec(registerNumber); if (parameterName != null) { - writer.write(" "); + writer.write(", "); writer.write(parameterName); } + writer.write(" #"); + writer.write(parameterType); if (annotations.size() > 0) { writer.indent(4); AnnotationFormatter.writeTo(writer, annotations); writer.deindent(4); - writer.write(".end parameter\n"); + writer.write(".end param\n"); } else { writer.write("\n"); }