Merge pull request #119 from bzz/fix-104-method-args-modifers

Fix #104 method args modifers

Author: bzz

Diff for: driver/normalizer/normalizer.go

@@ -143,16 +143,16 @@ var Normalizers = []Mapping{
 			"modifiers":        Var("ann"), // TODO: it's an array, we should expand it somewhere
 			"name":             Var("name"),
 			"body":             Var("body"),
-			"parameters": Each("args", Obj{
-				uast.KeyType:         String("SingleVariableDeclaration"),
-				uast.KeyPos:          Var("apos"),
-				"extraDimensions2":   Is(nil),
-				"initializer":        Var("ainit"),
-				"modifiers":          Is(nil),
-				"name":               Var("aname"),
-				"type":               Var("atype"),
-				"varargs":            Cases("varg", String("false"), String("true")),
-				"varargsAnnotations": Is(nil),
+			"parameters": Each("args", Fields{
+				{Name: uast.KeyType, Op: String("SingleVariableDeclaration")},
+				{Name: uast.KeyPos, Op: Var("apos")},
+				{Name: "extraDimensions2", Op: Is(nil)},
+				{Name: "initializer", Op: Var("ainit")},
+				{Name: "modifiers", Op: Any(), Drop: true}, // FIXME: preserve this array
+				{Name: "name", Op: Var("aname")},
+				{Name: "type", Op: Var("atype")},
+				{Name: "varargs", Op: Cases("varg", String("false"), String("true"))},
+				{Name: "varargsAnnotations", Op: Is(nil)},
 			}),
 			"receiverQualifier": Var("recv_name"),
 			"receiverType": Cases("recv",

Diff for: fixtures/issue104_final_args.java

@@ -0,0 +1,6 @@
+package pkg;
+
+class C {
+  public void m1(final String str1) {}
+  public void m2(String str2) {}
+}