|
|
@ -84,7 +84,9 @@ namespace ICSharpCode.Decompiler.Ast |
|
|
|
{ |
|
|
|
{ |
|
|
|
AstNode node = nodeStack.Peek(); |
|
|
|
AstNode node = nodeStack.Peek(); |
|
|
|
MemberReference memberRef = node.Annotation<MemberReference>(); |
|
|
|
MemberReference memberRef = node.Annotation<MemberReference>(); |
|
|
|
if (memberRef == null && node.Role == Roles.TargetExpression && (node.Parent is InvocationExpression || node.Parent is ObjectCreateExpression)) { |
|
|
|
if ((node.Parent is ObjectCreateExpression) || |
|
|
|
|
|
|
|
(memberRef == null && node.Role == Roles.TargetExpression && node.Parent is InvocationExpression)) |
|
|
|
|
|
|
|
{ |
|
|
|
memberRef = node.Parent.Annotation<MemberReference>(); |
|
|
|
memberRef = node.Parent.Annotation<MemberReference>(); |
|
|
|
} |
|
|
|
} |
|
|
|
return memberRef; |
|
|
|
return memberRef; |
|
|
@ -160,7 +162,12 @@ namespace ICSharpCode.Decompiler.Ast |
|
|
|
|
|
|
|
|
|
|
|
public void WriteKeyword(string keyword) |
|
|
|
public void WriteKeyword(string keyword) |
|
|
|
{ |
|
|
|
{ |
|
|
|
output.Write(keyword); |
|
|
|
MemberReference memberRef = GetCurrentMemberReference(); |
|
|
|
|
|
|
|
var node = nodeStack.Peek(); |
|
|
|
|
|
|
|
if (memberRef != null && node is ConstructorInitializer) |
|
|
|
|
|
|
|
output.WriteReference(keyword, memberRef); |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
output.Write(keyword); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public void WriteToken(string token) |
|
|
|
public void WriteToken(string token) |
|
|
|