Merge branch 'famandasm' of https://github.com/pentp/ILSpy into pentp-famandasm

ICSharpCode.Decompiler/CSharp/Syntax/CSharpModifierToken.cs

@@ -62,7 +62,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
 		// Not worth using a dictionary for such few elements.
 		// This table is sorted in the order that modifiers should be output when generating code.
 		static readonly Modifiers[] allModifiers = {
-			Modifiers.Public, Modifiers.Protected, Modifiers.Private, Modifiers.Internal,
+			Modifiers.Public, Modifiers.Private, Modifiers.Protected, Modifiers.Internal,
 			Modifiers.New,
 			Modifiers.Unsafe,
 			Modifiers.Abstract, Modifiers.Virtual, Modifiers.Sealed, Modifiers.Static, Modifiers.Override,

ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs

@@ -1057,8 +1057,9 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
 				case Accessibility.Internal:
 					return Modifiers.Internal;
 				case Accessibility.ProtectedOrInternal:
-				case Accessibility.ProtectedAndInternal:
 					return Modifiers.Protected | Modifiers.Internal;
+				case Accessibility.ProtectedAndInternal:
+					return Modifiers.Private | Modifiers.Protected;
 				default:
 					return Modifiers.None;
 			}

ICSharpCode.Decompiler/TypeSystem/Accessibility.cs

@@ -53,7 +53,7 @@ namespace ICSharpCode.Decompiler.TypeSystem
 		/// <summary>
 		/// The entity is accessible in derived classes within the same project content.
 		/// </summary>
-		/// <remarks>C# does not support this accessibility.</remarks>
+		/// <remarks>This corresponds to C# 'private protected'.</remarks>
 		ProtectedAndInternal,
 	}