pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix build break; only escape _ if it is a type name. Add basic Discards tests.

pull/1440/head
Siegfried Pammer 6 years ago
parent
c1f2ccf24f
commit
f05c1bb466
7 changed files with 445 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
  2. 6
      ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs
  3. 42
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/Discards.cs
  4. 178
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/Discards.opt.roslyn.il
  5. 190
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/Discards.roslyn.il
  6. 6
      ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs
  7. 38
      ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs

1
ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj
Unescape View File

@ -68,6 +68,7 @@
<ItemGroup> <ItemGroup>
<Compile Include="DisassemblerPrettyTestRunner.cs" /> <Compile Include="DisassemblerPrettyTestRunner.cs" />
<Compile Include="TestCases\ILPretty\Issue1389.cs" /> <Compile Include="TestCases\ILPretty\Issue1389.cs" />
<Compile Include="TestCases\Pretty\Discards.cs" />
<Compile Include="TestCases\Pretty\MultidimensionalArray.cs" /> <Compile Include="TestCases\Pretty\MultidimensionalArray.cs" />
<Compile Include="Output\CSharpAmbienceTests.cs" /> <Compile Include="Output\CSharpAmbienceTests.cs" />
<Compile Include="Semantics\ConversionTests.cs" /> <Compile Include="Semantics\ConversionTests.cs" />

6
ICSharpCode.Decompiler.Tests/PrettyTestRunner.cs
Unescape View File

@ -420,6 +420,12 @@ namespace ICSharpCode.Decompiler.Tests
RunForLibrary(cscOptions: cscOptions); RunForLibrary(cscOptions: cscOptions);
} }
[Test]
public void Discards([ValueSource(nameof(roslynOnlyOptions))] CompilerOptions cscOptions)
{
RunForLibrary(cscOptions: cscOptions);
}
void RunForLibrary([CallerMemberName] string testName = null, AssemblerOptions asmOptions = AssemblerOptions.None, CompilerOptions cscOptions = CompilerOptions.None, DecompilerSettings decompilerSettings = null) void RunForLibrary([CallerMemberName] string testName = null, AssemblerOptions asmOptions = AssemblerOptions.None, CompilerOptions cscOptions = CompilerOptions.None, DecompilerSettings decompilerSettings = null)
{ {
Run(testName, asmOptions | AssemblerOptions.Library, cscOptions | CompilerOptions.Library, decompilerSettings); Run(testName, asmOptions | AssemblerOptions.Library, cscOptions | CompilerOptions.Library, decompilerSettings);

42
ICSharpCode.Decompiler.Tests/TestCases/Pretty/Discards.cs
Unescape View File

@ -0,0 +1,42 @@
using System;
namespace ICSharpCode.Decompiler.Tests.TestCases.Pretty
{
internal class Discards
{
public class @_
{
}
public void GetOut(out int value)
{
value = 0;
}
public void MakeValue(Func<object, string, int> func)
{
}
public void MakeValue(Func<@_, int> func)
{
}
public void SimpleParameter(@_ _)
{
}
public void ParameterHiddenByLocal(@_ _)
{
GetOut(out int _);
}
public void DiscardedOutVsLambdaParameter()
{
GetOut(out int _);
MakeValue((@_ _) => 5);
}
}
}

178
ICSharpCode.Decompiler.Tests/TestCases/Pretty/Discards.opt.roslyn.il
Unescape View File

@ -0,0 +1,178 @@
// Metadata version: v4.0.30319
.assembly extern mscorlib
{
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 4:0:0:0
}
.assembly Discards
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx
63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 ) // ceptionThrows.
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 02 00 00 00 00 00 )
.permissionset reqmin
= {[mscorlib]System.Security.Permissions.SecurityPermissionAttribute = {property bool 'SkipVerification' = bool(true)}}
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.module Discards.dll
.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 )
.imagebase 0x10000000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// =============== CLASS MEMBERS DECLARATION ===================
.class private auto ansi beforefieldinit ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards
extends [mscorlib]System.Object
{
.class auto ansi nested public beforefieldinit _
extends [mscorlib]System.Object
{
.method public hidebysig specialname rtspecialname
instance void .ctor() cil managed
{
// Code size 7 (0x7)
.maxstack 8
IL_0000: ldarg.0
IL_0001: call instance void [mscorlib]System.Object::.ctor()
IL_0006: ret
} // end of method _::.ctor
} // end of class _
.class auto ansi serializable sealed nested private beforefieldinit '<>c'
extends [mscorlib]System.Object
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
.field public static initonly class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c' '<>9'
.field public static class [mscorlib]System.Func`2<class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_,int32> '<>9__6_0'
.method private hidebysig specialname rtspecialname static
void .cctor() cil managed
{
// Code size 11 (0xb)
.maxstack 8
IL_0000: newobj instance void ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c'::.ctor()
IL_0005: stsfld class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c' ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c'::'<>9'
IL_000a: ret
} // end of method '<>c'::.cctor
.method public hidebysig specialname rtspecialname
instance void .ctor() cil managed
{
// Code size 7 (0x7)
.maxstack 8
IL_0000: ldarg.0
IL_0001: call instance void [mscorlib]System.Object::.ctor()
IL_0006: ret
} // end of method '<>c'::.ctor
.method assembly hidebysig instance int32
'<DiscardedOutVsLambdaParameter>b__6_0'(class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_ _) cil managed
{
// Code size 2 (0x2)
.maxstack 8
IL_0000: ldc.i4.5
IL_0001: ret
} // end of method '<>c'::'<DiscardedOutVsLambdaParameter>b__6_0'
} // end of class '<>c'
.method public hidebysig instance void
GetOut([out] int32& 'value') cil managed
{
// Code size 4 (0x4)
.maxstack 8
IL_0000: ldarg.1
IL_0001: ldc.i4.0
IL_0002: stind.i4
IL_0003: ret
} // end of method Discards::GetOut
.method public hidebysig instance void
MakeValue(class [mscorlib]System.Func`3<object,string,int32> func) cil managed
{
// Code size 1 (0x1)
.maxstack 8
IL_0000: ret
} // end of method Discards::MakeValue
.method public hidebysig instance void
MakeValue(class [mscorlib]System.Func`2<class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_,int32> func) cil managed
{
// Code size 1 (0x1)
.maxstack 8
IL_0000: ret
} // end of method Discards::MakeValue
.method public hidebysig instance void
SimpleParameter(class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_ _) cil managed
{
// Code size 1 (0x1)
.maxstack 8
IL_0000: ret
} // end of method Discards::SimpleParameter
.method public hidebysig instance void
ParameterHiddenByLocal(class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_ _) cil managed
{
// Code size 9 (0x9)
.maxstack 2
.locals init (int32 V_0)
IL_0000: ldarg.0
IL_0001: ldloca.s V_0
IL_0003: call instance void ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards::GetOut(int32&)
IL_0008: ret
} // end of method Discards::ParameterHiddenByLocal
.method public hidebysig instance void
DiscardedOutVsLambdaParameter() cil managed
{
// Code size 46 (0x2e)
.maxstack 3
.locals init (int32 V_0)
IL_0000: ldarg.0
IL_0001: ldloca.s V_0
IL_0003: call instance void ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards::GetOut(int32&)
IL_0008: ldarg.0
IL_0009: ldsfld class [mscorlib]System.Func`2<class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_,int32> ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c'::'<>9__6_0'
IL_000e: dup
IL_000f: brtrue.s IL_0028
IL_0011: pop
IL_0012: ldsfld class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c' ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c'::'<>9'
IL_0017: ldftn instance int32 ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c'::'<DiscardedOutVsLambdaParameter>b__6_0'(class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_)
IL_001d: newobj instance void class [mscorlib]System.Func`2<class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_,int32>::.ctor(object,
native int)
IL_0022: dup
IL_0023: stsfld class [mscorlib]System.Func`2<class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_,int32> ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c'::'<>9__6_0'
IL_0028: call instance void ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards::MakeValue(class [mscorlib]System.Func`2<class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_,int32>)
IL_002d: ret
} // end of method Discards::DiscardedOutVsLambdaParameter
.method public hidebysig specialname rtspecialname
instance void .ctor() cil managed
{
// Code size 7 (0x7)
.maxstack 8
IL_0000: ldarg.0
IL_0001: call instance void [mscorlib]System.Object::.ctor()
IL_0006: ret
} // end of method Discards::.ctor
} // end of class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards
// =============================================================
// *********** DISASSEMBLY COMPLETE ***********************

190
ICSharpCode.Decompiler.Tests/TestCases/Pretty/Discards.roslyn.il
Unescape View File

@ -0,0 +1,190 @@
// Metadata version: v4.0.30319
.assembly extern mscorlib
{
.publickeytoken = (B7 7A 5C 56 19 34 E0 89 ) // .z\V.4..
.ver 4:0:0:0
}
.assembly Discards
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilationRelaxationsAttribute::.ctor(int32) = ( 01 00 08 00 00 00 00 00 )
.custom instance void [mscorlib]System.Runtime.CompilerServices.RuntimeCompatibilityAttribute::.ctor() = ( 01 00 01 00 54 02 16 57 72 61 70 4E 6F 6E 45 78 // ....T..WrapNonEx
63 65 70 74 69 6F 6E 54 68 72 6F 77 73 01 ) // ceptionThrows.
// --- The following custom attribute is added automatically, do not uncomment -------
// .custom instance void [mscorlib]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 07 01 00 00 00 00 )
.permissionset reqmin
= {[mscorlib]System.Security.Permissions.SecurityPermissionAttribute = {property bool 'SkipVerification' = bool(true)}}
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.module Discards.dll
.custom instance void [mscorlib]System.Security.UnverifiableCodeAttribute::.ctor() = ( 01 00 00 00 )
.imagebase 0x10000000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// =============== CLASS MEMBERS DECLARATION ===================
.class private auto ansi beforefieldinit ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards
extends [mscorlib]System.Object
{
.class auto ansi nested public beforefieldinit _
extends [mscorlib]System.Object
{
.method public hidebysig specialname rtspecialname
instance void .ctor() cil managed
{
// Code size 8 (0x8)
.maxstack 8
IL_0000: ldarg.0
IL_0001: call instance void [mscorlib]System.Object::.ctor()
IL_0006: nop
IL_0007: ret
} // end of method _::.ctor
} // end of class _
.class auto ansi serializable sealed nested private beforefieldinit '<>c'
extends [mscorlib]System.Object
{
.custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 )
.field public static initonly class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c' '<>9'
.field public static class [mscorlib]System.Func`2<class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_,int32> '<>9__6_0'
.method private hidebysig specialname rtspecialname static
void .cctor() cil managed
{
// Code size 11 (0xb)
.maxstack 8
IL_0000: newobj instance void ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c'::.ctor()
IL_0005: stsfld class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c' ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c'::'<>9'
IL_000a: ret
} // end of method '<>c'::.cctor
.method public hidebysig specialname rtspecialname
instance void .ctor() cil managed
{
// Code size 8 (0x8)
.maxstack 8
IL_0000: ldarg.0
IL_0001: call instance void [mscorlib]System.Object::.ctor()
IL_0006: nop
IL_0007: ret
} // end of method '<>c'::.ctor
.method assembly hidebysig instance int32
'<DiscardedOutVsLambdaParameter>b__6_0'(class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_ _) cil managed
{
// Code size 2 (0x2)
.maxstack 8
IL_0000: ldc.i4.5
IL_0001: ret
} // end of method '<>c'::'<DiscardedOutVsLambdaParameter>b__6_0'
} // end of class '<>c'
.method public hidebysig instance void
GetOut([out] int32& 'value') cil managed
{
// Code size 5 (0x5)
.maxstack 8
IL_0000: nop
IL_0001: ldarg.1
IL_0002: ldc.i4.0
IL_0003: stind.i4
IL_0004: ret
} // end of method Discards::GetOut
.method public hidebysig instance void
MakeValue(class [mscorlib]System.Func`3<object,string,int32> func) cil managed
{
// Code size 2 (0x2)
.maxstack 8
IL_0000: nop
IL_0001: ret
} // end of method Discards::MakeValue
.method public hidebysig instance void
MakeValue(class [mscorlib]System.Func`2<class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_,int32> func) cil managed
{
// Code size 2 (0x2)
.maxstack 8
IL_0000: nop
IL_0001: ret
} // end of method Discards::MakeValue
.method public hidebysig instance void
SimpleParameter(class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_ _) cil managed
{
// Code size 2 (0x2)
.maxstack 8
IL_0000: nop
IL_0001: ret
} // end of method Discards::SimpleParameter
.method public hidebysig instance void
ParameterHiddenByLocal(class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_ _) cil managed
{
// Code size 11 (0xb)
.maxstack 2
.locals init (int32 V_0)
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldloca.s V_0
IL_0004: call instance void ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards::GetOut(int32&)
IL_0009: nop
IL_000a: ret
} // end of method Discards::ParameterHiddenByLocal
.method public hidebysig instance void
DiscardedOutVsLambdaParameter() cil managed
{
// Code size 49 (0x31)
.maxstack 3
.locals init (int32 V_0)
IL_0000: nop
IL_0001: ldarg.0
IL_0002: ldloca.s V_0
IL_0004: call instance void ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards::GetOut(int32&)
IL_0009: nop
IL_000a: ldarg.0
IL_000b: ldsfld class [mscorlib]System.Func`2<class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_,int32> ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c'::'<>9__6_0'
IL_0010: dup
IL_0011: brtrue.s IL_002a
IL_0013: pop
IL_0014: ldsfld class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c' ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c'::'<>9'
IL_0019: ldftn instance int32 ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c'::'<DiscardedOutVsLambdaParameter>b__6_0'(class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_)
IL_001f: newobj instance void class [mscorlib]System.Func`2<class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_,int32>::.ctor(object,
native int)
IL_0024: dup
IL_0025: stsfld class [mscorlib]System.Func`2<class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_,int32> ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/'<>c'::'<>9__6_0'
IL_002a: call instance void ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards::MakeValue(class [mscorlib]System.Func`2<class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards/_,int32>)
IL_002f: nop
IL_0030: ret
} // end of method Discards::DiscardedOutVsLambdaParameter
.method public hidebysig specialname rtspecialname
instance void .ctor() cil managed
{
// Code size 8 (0x8)
.maxstack 8
IL_0000: ldarg.0
IL_0001: call instance void [mscorlib]System.Object::.ctor()
IL_0006: nop
IL_0007: ret
} // end of method Discards::.ctor
} // end of class ICSharpCode.Decompiler.Tests.TestCases.Pretty.Discards
// =============================================================
// *********** DISASSEMBLY COMPLETE ***********************

6
ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs
Unescape View File

@ -395,13 +395,9 @@ namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
public static bool IsKeyword(string identifier, AstNode context) public static bool IsKeyword(string identifier, AstNode context)
{ {
// only 2-10 char lower-case identifiers can be keywords // only 2-10 char lower-case identifiers can be keywords
if (identifier.Length > maxKeywordLength || identifier.Length == 0) { if (identifier.Length > maxKeywordLength || identifier.Length < 2 || identifier[0] < 'a') {
return false; return false;
} }
if (identifier[0] < 'a') {
// we escape _ as identifier to avoid ambiguities with discard patterns
return identifier == "_";
}
if (unconditionalKeywords.Contains(identifier)) { if (unconditionalKeywords.Contains(identifier)) {
return true; return true;
} }

38
ICSharpCode.Decompiler/CSharp/Syntax/TypeSystemAstBuilder.cs
Unescape View File

@ -226,12 +226,12 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
TopLevelTypeName top = fullTypeName.TopLevelTypeName; TopLevelTypeName top = fullTypeName.TopLevelTypeName;
AstType type; AstType type;
if (string.IsNullOrEmpty(top.Namespace)) { if (string.IsNullOrEmpty(top.Namespace)) {
type = new SimpleType(top.Name); type = MakeSimpleType(top.Name);
} else { } else {
type = new SimpleType(top.Namespace).MemberType(top.Name); type = MakeMemberType(MakeSimpleType(top.Namespace), top.Name);
} }
for (int i = 0; i < fullTypeName.NestingLevel; i++) { for (int i = 0; i < fullTypeName.NestingLevel; i++) {
type = type.MemberType(fullTypeName.GetNestedTypeName(i)); type = MakeMemberType(type, fullTypeName.GetNestedTypeName(i));
} }
return type; return type;
} }
@ -282,7 +282,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
} }
} }
return new SimpleType(type.Name); return MakeSimpleType(type.Name);
} }
AstType ConvertTypeHelper(IType genericType, IReadOnlyList<IType> typeArguments) AstType ConvertTypeHelper(IType genericType, IReadOnlyList<IType> typeArguments)
@ -307,7 +307,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
foreach (var pair in usingScope.UsingAliases) { foreach (var pair in usingScope.UsingAliases) {
if (pair.Value is TypeResolveResult) { if (pair.Value is TypeResolveResult) {
if (TypeMatches(pair.Value.Type, typeDef, typeArguments)) if (TypeMatches(pair.Value.Type, typeDef, typeArguments))
return new SimpleType(pair.Key); return MakeSimpleType(pair.Key);
} }
} }
} }
@ -327,7 +327,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
if (trr != null || (localTypeArguments.Length == 0 && resolver.IsVariableReferenceWithSameType(rr, typeDef.Name, out trr))) { if (trr != null || (localTypeArguments.Length == 0 && resolver.IsVariableReferenceWithSameType(rr, typeDef.Name, out trr))) {
if (!trr.IsError && TypeMatches(trr.Type, typeDef, typeArguments)) { if (!trr.IsError && TypeMatches(trr.Type, typeDef, typeArguments)) {
// We can use the short type name // We can use the short type name
SimpleType shortResult = new SimpleType(typeDef.Name); SimpleType shortResult = MakeSimpleType(typeDef.Name);
AddTypeArguments(shortResult, typeDef.TypeParameters, typeArguments, outerTypeParameterCount, typeDef.TypeParameterCount); AddTypeArguments(shortResult, typeDef.TypeParameters, typeArguments, outerTypeParameterCount, typeDef.TypeParameterCount);
return shortResult; return shortResult;
} }
@ -335,7 +335,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
} }
if (AlwaysUseShortTypeNames || (typeDef == null && genericType.DeclaringType == null)) { if (AlwaysUseShortTypeNames || (typeDef == null && genericType.DeclaringType == null)) {
var shortResult = new SimpleType(genericType.Name); var shortResult = MakeSimpleType(genericType.Name);
AddTypeArguments(shortResult, genericType.TypeParameters, typeArguments, outerTypeParameterCount, genericType.TypeParameterCount); AddTypeArguments(shortResult, genericType.TypeParameters, typeArguments, outerTypeParameterCount, genericType.TypeParameterCount);
return shortResult; return shortResult;
} }
@ -395,7 +395,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
Debug.Assert(endIndex <= typeParameters.Count); Debug.Assert(endIndex <= typeParameters.Count);
for (int i = startIndex; i < endIndex; i++) { for (int i = startIndex; i < endIndex; i++) {
if (ConvertUnboundTypeArguments && typeArguments[i].Kind == TypeKind.UnboundTypeArgument) { if (ConvertUnboundTypeArguments && typeArguments[i].Kind == TypeKind.UnboundTypeArgument) {
result.AddChild(new SimpleType(typeParameters[i].Name), Roles.TypeArgument); result.AddChild(MakeSimpleType(typeParameters[i].Name), Roles.TypeArgument);
} else { } else {
result.AddChild(ConvertType(typeArguments[i]), Roles.TypeArgument); result.AddChild(ConvertType(typeArguments[i]), Roles.TypeArgument);
} }
@ -411,7 +411,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
foreach (var pair in usingScope.UsingAliases) { foreach (var pair in usingScope.UsingAliases) {
nrr = pair.Value as NamespaceResolveResult; nrr = pair.Value as NamespaceResolveResult;
if (nrr != null && nrr.NamespaceName == namespaceName) { if (nrr != null && nrr.NamespaceName == namespaceName) {
var ns = new SimpleType(pair.Key); var ns = MakeSimpleType(pair.Key);
if (AddResolveResultAnnotations) if (AddResolveResultAnnotations)
ns.AddAnnotation(nrr); ns.AddAnnotation(nrr);
return ns; return ns;
@ -424,7 +424,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
int pos = namespaceName.LastIndexOf('.'); int pos = namespaceName.LastIndexOf('.');
if (pos < 0) { if (pos < 0) {
if (IsValidNamespace(namespaceName, out nrr)) { if (IsValidNamespace(namespaceName, out nrr)) {
var ns = new SimpleType(namespaceName); var ns = MakeSimpleType(namespaceName);
if (AddResolveResultAnnotations && nrr != null) if (AddResolveResultAnnotations && nrr != null)
ns.AddAnnotation(nrr); ns.AddAnnotation(nrr);
return ns; return ns;
@ -471,6 +471,20 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
nrr = resolver.ResolveSimpleName(firstNamespacePart, EmptyList<IType>.Instance) as NamespaceResolveResult; nrr = resolver.ResolveSimpleName(firstNamespacePart, EmptyList<IType>.Instance) as NamespaceResolveResult;
return nrr != null && !nrr.IsError && nrr.NamespaceName == firstNamespacePart; return nrr != null && !nrr.IsError && nrr.NamespaceName == firstNamespacePart;
} }
static SimpleType MakeSimpleType(string name)
{
if (name == "_")
return new SimpleType("@_");
return new SimpleType(name);
}
static MemberType MakeMemberType(AstType target, string name)
{
if (name == "_")
return new MemberType(target, "@_");
return new MemberType(target, name);
}
#endregion #endregion
#region Convert Attribute #region Convert Attribute
@ -1334,7 +1348,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
if (AddResolveResultAnnotations) { if (AddResolveResultAnnotations) {
decl.AddAnnotation(new TypeResolveResult(typeDefinition)); decl.AddAnnotation(new TypeResolveResult(typeDefinition));
} }
decl.Name = typeDefinition.Name; decl.Name = typeDefinition.Name == "_" ? "@_" : typeDefinition.Name;
int outerTypeParameterCount = (typeDefinition.DeclaringTypeDefinition == null) ? 0 : typeDefinition.DeclaringTypeDefinition.TypeParameterCount; int outerTypeParameterCount = (typeDefinition.DeclaringTypeDefinition == null) ? 0 : typeDefinition.DeclaringTypeDefinition.TypeParameterCount;
@ -1714,7 +1728,7 @@ namespace ICSharpCode.Decompiler.CSharp.Syntax
return null; return null;
} }
Constraint c = new Constraint(); Constraint c = new Constraint();
c.TypeParameter = new SimpleType (tp.Name); c.TypeParameter = MakeSimpleType(tp.Name);
if (tp.HasReferenceTypeConstraint) { if (tp.HasReferenceTypeConstraint) {
c.BaseTypes.Add(new PrimitiveType("class")); c.BaseTypes.Add(new PrimitiveType("class"));
} else if (tp.HasValueTypeConstraint) { } else if (tp.HasValueTypeConstraint) {

Write Preview
Loading…
Cancel
Save