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

Fixed handling of user-defined conversions between primitive types. 

Closes icsharpcode/NRefactory#68.
newNRvisualizers
Daniel Grunwald 13 years ago
parent
8a80ae0375
commit
a7816c2f51
1 changed files with 3 additions and 3 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. 6
      ICSharpCode.NRefactory.CSharp/Resolver/CSharpResolver.cs

6
ICSharpCode.NRefactory.CSharp/Resolver/CSharpResolver.cs
Unescape View File

@ -1260,7 +1260,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
{ {
if (c == Conversion.IdentityConversion) if (c == Conversion.IdentityConversion)
return rr; return rr;
else if (rr.IsCompileTimeConstant && c != Conversion.None) else if (rr.IsCompileTimeConstant && c != Conversion.None && !c.IsUserDefined)
return ResolveCast(targetType, rr); return ResolveCast(targetType, rr);
else else
return new ConversionResolveResult(targetType, rr, c, checkForOverflow); return new ConversionResolveResult(targetType, rr, c, checkForOverflow);
@ -1269,7 +1269,8 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
public ResolveResult ResolveCast(IType targetType, ResolveResult expression) public ResolveResult ResolveCast(IType targetType, ResolveResult expression)
{ {
// C# 4.0 spec: §7.7.6 Cast expressions // C# 4.0 spec: §7.7.6 Cast expressions
if (expression.IsCompileTimeConstant) { Conversion c = conversions.ExplicitConversion(expression, targetType);
if (expression.IsCompileTimeConstant && !c.IsUserDefined) {
TypeCode code = ReflectionHelper.GetTypeCode(targetType); TypeCode code = ReflectionHelper.GetTypeCode(targetType);
if (code >= TypeCode.Boolean && code <= TypeCode.Decimal && expression.ConstantValue != null) { if (code >= TypeCode.Boolean && code <= TypeCode.Decimal && expression.ConstantValue != null) {
try { try {
@ -1293,7 +1294,6 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
} }
} }
} }
Conversion c = conversions.ExplicitConversion(expression, targetType);
return new ConversionResolveResult(targetType, expression, c, checkForOverflow); return new ConversionResolveResult(targetType, expression, c, checkForOverflow);
} }

Write Preview
Loading…
Cancel
Save