From 87992d3e56fa48ac3f9ebaf61cfa3f946bda3b41 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Mon, 15 Aug 2011 17:29:23 +0200 Subject: [PATCH] Fix build for NRefactory.VB. --- .../Visitors/CSharpToVBConverterVisitor.cs | 28 +++++++++---------- .../Utils/FastSerializer.cs | 4 +-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs b/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs index eee8d06377..60ebaa9fd7 100644 --- a/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs +++ b/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs @@ -418,24 +418,24 @@ namespace ICSharpCode.NRefactory.VB.Visitors public AstNode VisitNamedArgumentExpression(CSharp.NamedArgumentExpression namedArgumentExpression, object data) { - Expression expr; - - if (namedArgumentExpression.Parent is CSharp.ArrayInitializerExpression) { - expr = new FieldInitializerExpression { - IsKey = true, - Identifier = namedArgumentExpression.Identifier, - Expression = (Expression)namedArgumentExpression.Expression.AcceptVisitor(this, data) - }; - } else { - expr = new NamedArgumentExpression { - Identifier = namedArgumentExpression.Identifier, - Expression = (Expression)namedArgumentExpression.Expression.AcceptVisitor(this, data) - }; - } + Expression expr = new NamedArgumentExpression { + Identifier = namedArgumentExpression.Identifier, + Expression = (Expression)namedArgumentExpression.Expression.AcceptVisitor(this, data) + }; return EndNode(namedArgumentExpression, expr); } + public AstNode VisitNamedExpression(CSharp.NamedExpression namedExpression, object data) + { + Expression expr = new FieldInitializerExpression { + IsKey = true, + Identifier = namedExpression.Identifier, + Expression = (Expression)namedExpression.Expression.AcceptVisitor(this, data) + }; + return EndNode(namedExpression, expr); + } + public AstNode VisitNullReferenceExpression(CSharp.NullReferenceExpression nullReferenceExpression, object data) { return EndNode(nullReferenceExpression, new PrimitiveExpression(null)); diff --git a/ICSharpCode.NRefactory/Utils/FastSerializer.cs b/ICSharpCode.NRefactory/Utils/FastSerializer.cs index a823c2db1a..0bd3887c6d 100644 --- a/ICSharpCode.NRefactory/Utils/FastSerializer.cs +++ b/ICSharpCode.NRefactory/Utils/FastSerializer.cs @@ -633,7 +633,7 @@ namespace ICSharpCode.NRefactory.Utils public void Serialize(Stream stream, object instance) { - Serialize(new BinaryWriter(stream), instance); + Serialize(new BinaryWriterWith7BitEncodedInts(stream), instance); } public void Serialize(BinaryWriter writer, object instance) @@ -717,7 +717,7 @@ namespace ICSharpCode.NRefactory.Utils public object Deserialize(Stream stream) { - return Deserialize(new BinaryReader(stream)); + return Deserialize(new BinaryReaderWith7BitEncodedInts(stream)); } public object Deserialize(BinaryReader reader)