Fix decompilation of arrays as attribute arguments. Closes #82.

ICSharpCode.Decompiler/Ast/AstBuilder.cs

@@ -1074,17 +1074,31 @@ namespace ICSharpCode.Decompiler.Ast
 			}
 		}
 		
-		private static Expression ConvertArgumentValue(CustomAttributeArgument parameter)
+		private static Expression ConvertArgumentValue(CustomAttributeArgument argument)
 		{
-			var type = parameter.Type.Resolve();
+			if (argument.Value is CustomAttributeArgument[]) {
+				ArrayInitializerExpression arrayInit = new ArrayInitializerExpression();
+				foreach (CustomAttributeArgument element in (CustomAttributeArgument[])argument.Value) {
+					arrayInit.Elements.Add(ConvertArgumentValue(element));
+				}
+				ArrayType arrayType = argument.Type as ArrayType;
+				return new ArrayCreateExpression {
+					Type = ConvertType(arrayType != null ? arrayType.ElementType : argument.Type),
+					Initializer = arrayInit
+				};
+			} else if (argument.Value is CustomAttributeArgument) {
+				// occurs with boxed arguments
+				return ConvertArgumentValue((CustomAttributeArgument)argument.Value);
+			}
+			var type = argument.Type.Resolve();
 			if (type != null && type.IsEnum) {
-				return MakePrimitive(Convert.ToInt64(parameter.Value), type);
-			} else if (parameter.Value is TypeReference) {
+				return MakePrimitive(Convert.ToInt64(argument.Value), type);
+			} else if (argument.Value is TypeReference) {
 				return new TypeOfExpression() {
-					Type = ConvertType((TypeReference)parameter.Value),
+					Type = ConvertType((TypeReference)argument.Value),
 				};
 			} else {
-				return new PrimitiveExpression(parameter.Value);
+				return new PrimitiveExpression(argument.Value);
 			}
 		}
 		#endregion

ICSharpCode.Decompiler/Tests/CustomAttributes/S_CustomAttributes.cs

@@ -5,7 +5,7 @@ using System;
 
 namespace aa
 {
-	public static class CustomAtributes
+	public static class CustomAttributes
 	{
 		[Flags]
 		public enum EnumWithFlag
@@ -20,13 +20,13 @@ namespace aa
 		[AttributeUsage(AttributeTargets.All)]
 		public class MyAttribute : Attribute
 		{
-			public MyAttribute(CustomAtributes.EnumWithFlag en)
+			public MyAttribute(object val)
 			{
 			}
 		}
-		[CustomAtributes.MyAttribute(CustomAtributes.EnumWithFlag.Item1 | CustomAtributes.EnumWithFlag.Item2)]
+		[CustomAttributes.MyAttribute(CustomAttributes.EnumWithFlag.Item1 | CustomAttributes.EnumWithFlag.Item2)]
 		private static int field;
-		[CustomAtributes.MyAttribute(CustomAtributes.EnumWithFlag.All)]
+		[CustomAttributes.MyAttribute(CustomAttributes.EnumWithFlag.All)]
 		public static string Property
 		{
 			get
@@ -42,5 +42,23 @@ namespace aa
 			AttributeTargets attributeTargets = AttributeTargets.Property | AttributeTargets.Field;
 			Console.WriteLine("{0} $$$ {1}", AttributeTargets.Interface, attributeTargets);
 		}
+		// No Boxing
+		[CustomAttributes.MyAttribute(new StringComparison[]
+		{
+			StringComparison.Ordinal, 
+			StringComparison.CurrentCulture
+		})]
+		public static void ArrayAsAttribute1()
+		{
+		}
+		// Boxing of each array element
+		[CustomAttributes.MyAttribute(new object[]
+		{
+			StringComparison.Ordinal, 
+			StringComparison.CurrentCulture
+		})]
+		public static void ArrayAsAttribute2()
+		{
+		}
 	}
 }