Fix "Missing variable name in created C# code". Closes #81.

icsharpcode · Mar 14, 2011 · 2601a49 · 2601a49
1 parent 80fa674
commit 2601a49
Show file tree

Hide file tree

Showing 4 changed files with 241 additions and 211 deletions.
diff --git a/ICSharpCode.Decompiler/Ast/AstBuilder.cs b/ICSharpCode.Decompiler/Ast/AstBuilder.cs
@@ -599,7 +599,7 @@ MethodDeclaration CreateMethod(MethodDefinition methodDef)
 					astMethod.Modifiers = ConvertModifiers(methodDef);
 				else
 					astMethod.PrivateImplementationType = ConvertType(methodDef.Overrides.First().DeclaringType);
-				astMethod.Body = AstMethodBodyBuilder.CreateMethodBody(methodDef, context);
+				astMethod.Body = AstMethodBodyBuilder.CreateMethodBody(methodDef, context, astMethod.Parameters);
 			}
 			ConvertAttributes(astMethod, methodDef);
 			if (methodDef.HasCustomAttributes && astMethod.Parameters.Count > 0) {
@@ -661,7 +661,7 @@ ConstructorDeclaration CreateConstructor(MethodDefinition methodDef)
 			}
 			astMethod.Name = CleanName(methodDef.DeclaringType.Name);
 			astMethod.Parameters.AddRange(MakeParameters(methodDef.Parameters));
-			astMethod.Body = AstMethodBodyBuilder.CreateMethodBody(methodDef, context);
+			astMethod.Body = AstMethodBodyBuilder.CreateMethodBody(methodDef, context, astMethod.Parameters);
 			ConvertAttributes(astMethod, methodDef);
 			return astMethod;
 		}
@@ -793,6 +793,7 @@ public static IEnumerable<ParameterDeclaration> MakeParameters(IEnumerable<Param
 		{
 			foreach(ParameterDefinition paramDef in paramCol) {
 				ParameterDeclaration astParam = new ParameterDeclaration();
+				astParam.AddAnnotation(paramDef);
 				astParam.Type = ConvertType(paramDef.ParameterType, paramDef);
 				astParam.Name = paramDef.Name;