diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Test/BooBinding.Tests.csproj b/src/AddIns/BackendBindings/Boo/BooBinding/Test/BooBinding.Tests.csproj index 64ce8b5de6..b5a7360023 100644 --- a/src/AddIns/BackendBindings/Boo/BooBinding/Test/BooBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Boo/BooBinding/Test/BooBinding.Tests.csproj @@ -1,4 +1,5 @@ - + + Library Grunwald.BooBinding.Tests @@ -12,14 +13,13 @@ False Auto 4194304 - AnyCPU + x86 4096 4 false v4.0 - obj\ obj\Debug\ False DEBUG;TRACE diff --git a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitor.cs b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitor.cs index d599360f29..468b576063 100644 --- a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitor.cs +++ b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitor.cs @@ -264,5 +264,35 @@ namespace NRefactoryToBooConverter { throw new NotImplementedException(); } + + public object VisitXmlAttribute(XmlAttribute xmlAttribute, object data) + { + throw new NotImplementedException(); + } + + public object VisitXmlContentExpression(XmlContentExpression xmlContentExpression, object data) + { + throw new NotImplementedException(); + } + + public object VisitXmlElementExpression(XmlElementExpression xmlElementExpression, object data) + { + throw new NotImplementedException(); + } + + public object VisitXmlEmbeddedExpression(XmlEmbeddedExpression xmlEmbeddedExpression, object data) + { + throw new NotImplementedException(); + } + + public object VisitXmlLiteralExpression(XmlLiteralExpression xmlLiteralExpression, object data) + { + throw new NotImplementedException(); + } + + public object VisitXmlMemberAccessExpression(XmlMemberAccessExpression xmlMemberAccessExpression, object data) + { + throw new NotImplementedException(); + } } } diff --git a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Test/NRefactoryToBooConverter.Tests.csproj b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Test/NRefactoryToBooConverter.Tests.csproj index e1f9b7e0a8..847a16c5e5 100644 --- a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Test/NRefactoryToBooConverter.Tests.csproj +++ b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Test/NRefactoryToBooConverter.Tests.csproj @@ -1,4 +1,5 @@ - + + Library NRefactoryToBooConverter.Tests @@ -12,10 +13,11 @@ False Full False - AnyCPU + x86 false true v4.0 + 4 false @@ -25,6 +27,11 @@ true TRACE + + Auto + 4194304 + 4096 + diff --git a/src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpBinding.Tests.csproj b/src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpBinding.Tests.csproj index e8a6ce0300..21fb8de070 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/CSharpBinding/Tests/CSharpBinding.Tests.csproj @@ -34,7 +34,7 @@ False Auto 4194304 - AnyCPU + x86 4096 diff --git a/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Test/Python.Build.Tasks.Tests.csproj b/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Test/Python.Build.Tasks.Tests.csproj index 821f3c1e93..440e557ee0 100644 --- a/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Test/Python.Build.Tasks.Tests.csproj +++ b/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Test/Python.Build.Tasks.Tests.csproj @@ -33,7 +33,7 @@ False Auto 4194304 - AnyCPU + x86 4096 diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj index a872c44704..8719692d0a 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj @@ -33,7 +33,7 @@ False Auto 4194304 - AnyCPU + x86 4096 diff --git a/src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj b/src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj index cdaac744ff..fc72f313dd 100644 --- a/src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/WixBinding/Test/WixBinding.Tests.csproj @@ -12,7 +12,7 @@ False Auto 4194304 - AnyCPU + x86 4096 4 false diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj index 6c15125e72..90f6dd19d0 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Tests/WpfDesign.Tests.csproj @@ -32,7 +32,7 @@ False Auto 4194304 - AnyCPU + x86 4096 diff --git a/src/AddIns/Misc/ResourceToolkit/Test/ResourceToolkit.Tests.csproj b/src/AddIns/Misc/ResourceToolkit/Test/ResourceToolkit.Tests.csproj index 0932307431..794d4c7e89 100644 --- a/src/AddIns/Misc/ResourceToolkit/Test/ResourceToolkit.Tests.csproj +++ b/src/AddIns/Misc/ResourceToolkit/Test/ResourceToolkit.Tests.csproj @@ -1,4 +1,5 @@ - + + {DD9AE6A5-2B9D-443A-BC71-38BE578C36BD} Debug @@ -30,7 +31,7 @@ False Auto 4194304 - AnyCPU + x86 4096 diff --git a/src/AddIns/Misc/SearchAndReplace/Test/SearchAndReplace.Tests.csproj b/src/AddIns/Misc/SearchAndReplace/Test/SearchAndReplace.Tests.csproj index 2c93000d81..9067609df7 100644 --- a/src/AddIns/Misc/SearchAndReplace/Test/SearchAndReplace.Tests.csproj +++ b/src/AddIns/Misc/SearchAndReplace/Test/SearchAndReplace.Tests.csproj @@ -1,4 +1,5 @@ - + + {A569DCC1-C608-45FD-B770-4F79335EF154} Debug @@ -31,7 +32,7 @@ False Auto 4194304 - AnyCPU + x86 4096 diff --git a/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/Expressions.cs b/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/Expressions.cs index 3a7aefcd8e..7ab30c29d7 100644 --- a/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/Expressions.cs +++ b/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/Expressions.cs @@ -394,9 +394,11 @@ namespace NRefactoryASTGenerator.Ast class XmlMemberAccessExpression : Expression { Expression targetObject; - XmlAxisType type; + XmlAxisType axisType; bool isXmlIdentifier; string identifier; + + public XmlMemberAccessExpression(Expression targetObject, XmlAxisType axisType, string identifier, bool isXmlIdentifier) {} } abstract class XmlExpression : Expression { } @@ -404,16 +406,14 @@ namespace NRefactoryASTGenerator.Ast class XmlLiteralExpression : Expression { List expressions; } - - class XmlCommentExpression : XmlExpression { - string content; - } enum XmlContentType { } class XmlContentExpression : XmlExpression { string content; XmlContentType type; + + public XmlContentExpression(string content, XmlContentType type) {} } class XmlEmbeddedExpression : XmlExpression { diff --git a/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs b/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs index c64f12d422..7a8d358721 100644 --- a/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs +++ b/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs @@ -2421,12 +2421,6 @@ namespace ICSharpCode.NRefactory.Ast { elseIfSections = new List(); } - public bool HasElseIfSections { - get { - return elseIfSections.Count > 0; - } - } - public bool HasElseStatements { get { return falseStatement.Count > 0; @@ -2442,6 +2436,12 @@ namespace ICSharpCode.NRefactory.Ast { if (falseStatement != null) falseStatement.Parent = this; } + public bool HasElseIfSections { + get { + return elseIfSections.Count > 0; + } + } + public IfElseStatement(Expression condition, Statement trueStatement) : this(condition) { @@ -5515,32 +5515,6 @@ public UsingDeclaration(string @namespace, TypeReference alias) { usings = new L } } - public class XmlCommentExpression : XmlExpression { - - string content; - - public string Content { - get { - return content; - } - set { - content = value ?? ""; - } - } - - public XmlCommentExpression() { - content = ""; - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitXmlCommentExpression(this, data); - } - - public override string ToString() { - return string.Format("[XmlCommentExpression Content={0}]", Content); - } - } - public class XmlContentExpression : XmlExpression { string content; @@ -5565,8 +5539,9 @@ public UsingDeclaration(string @namespace, TypeReference alias) { usings = new L } } - public XmlContentExpression() { - content = ""; + public XmlContentExpression(string content, XmlContentType type) { + Content = content; + Type = type; } public override object AcceptVisitor(IAstVisitor visitor, object data) { @@ -5717,7 +5692,7 @@ public UsingDeclaration(string @namespace, TypeReference alias) { usings = new L Expression targetObject; - XmlAxisType type; + XmlAxisType axisType; bool isXmlIdentifier; @@ -5733,12 +5708,12 @@ public UsingDeclaration(string @namespace, TypeReference alias) { usings = new L } } - public XmlAxisType Type { + public XmlAxisType AxisType { get { - return type; + return axisType; } set { - type = value; + axisType = value; } } @@ -5760,9 +5735,11 @@ public UsingDeclaration(string @namespace, TypeReference alias) { usings = new L } } - public XmlMemberAccessExpression() { - targetObject = Expression.Null; - identifier = ""; + public XmlMemberAccessExpression(Expression targetObject, XmlAxisType axisType, string identifier, bool isXmlIdentifier) { + TargetObject = targetObject; + AxisType = axisType; + Identifier = identifier; + IsXmlIdentifier = isXmlIdentifier; } public override object AcceptVisitor(IAstVisitor visitor, object data) { @@ -5770,8 +5747,8 @@ public UsingDeclaration(string @namespace, TypeReference alias) { usings = new L } public override string ToString() { - return string.Format("[XmlMemberAccessExpression TargetObject={0} Type={1} IsXmlIdentifier={2} Identifi" + - "er={3}]", TargetObject, Type, IsXmlIdentifier, Identifier); + return string.Format("[XmlMemberAccessExpression TargetObject={0} AxisType={1} IsXmlIdentifier={2} Iden" + + "tifier={3}]", TargetObject, AxisType, IsXmlIdentifier, Identifier); } } diff --git a/src/Libraries/NRefactory/Project/Src/IAstVisitor.cs b/src/Libraries/NRefactory/Project/Src/IAstVisitor.cs index 186cd6643a..4fdbadfd33 100644 --- a/src/Libraries/NRefactory/Project/Src/IAstVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/IAstVisitor.cs @@ -263,8 +263,6 @@ namespace ICSharpCode.NRefactory { object VisitXmlAttribute(XmlAttribute xmlAttribute, object data); - object VisitXmlCommentExpression(XmlCommentExpression xmlCommentExpression, object data); - object VisitXmlContentExpression(XmlContentExpression xmlContentExpression, object data); object VisitXmlElementExpression(XmlElementExpression xmlElementExpression, object data); diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index 3b430a7348..370a67f704 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -1651,6 +1651,7 @@ Expr QueryExpr | LambdaExpr | DisjunctionExpr + | XmlLiteralExpression . AssignmentOperator @@ -1673,12 +1674,19 @@ SimpleExpr = SimpleNonInvocationExpression { - "." IdentifierOrKeyword - (. pexpr = new MemberReferenceExpression(pexpr, name); .) + "." ( + IdentifierOrKeyword + (. pexpr = new MemberReferenceExpression(pexpr, name); .) + | XmlOpenTag IdentifierOrKeyword XmlCloseTag + (. pexpr = new XmlMemberAccessExpression(pexpr, XmlAxisType.Element, name, true); .) + ) [ IF (la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) "(" "Of" TypeArgumentList<((MemberReferenceExpression)pexpr).TypeArguments> ")" ] | "!" IdentifierOrKeyword (. pexpr = new BinaryOperatorExpression(pexpr, BinaryOperatorType.DictionaryAccess, new PrimitiveExpression(name, name)); .) + | (. XmlAxisType type = XmlAxisType.Attribute; bool isXmlName = false; .) + ( ".@" | "..." (. type = XmlAxisType.Descendents; .) ) [ XmlOpenTag (. isXmlName = true; .) ] IdentifierOrKeyword [ XmlCloseTag ] + (. pexpr = new XmlMemberAccessExpression(pexpr, type, name, isXmlName); .) | InvocationExpression } . @@ -1749,6 +1757,26 @@ SimpleNonInvocationExpression ) . +XmlLiteralExpression +(. + XmlLiteralExpression expr = pexpr = new XmlLiteralExpression(); + List exprs = expr.Expressions; + XmlExpression currentExpression = null; +.) + = + ( + XmlContent (. currentExpression = new XmlContentExpression(t.val, XmlContentType.Text); .) + | XmlCData (. currentExpression = new XmlContentExpression(t.val, XmlContentType.CData); .) + | XmlComment (. currentExpression = new XmlContentExpression(t.val, XmlContentType.Comment); .) + | XmlProcessingInstruction (. currentExpression = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); .) + ) + (. + currentExpression.Location = t.Location; + currentExpression.EndLocation = t.EndLocation; + exprs.Add(currentExpression); + .) +. + ConditionalExpression (. ConditionalExpression conditionalExpression = new ConditionalExpression(); diff --git a/src/Libraries/NRefactory/Project/Src/Visitors/AbstractASTVisitor.cs b/src/Libraries/NRefactory/Project/Src/Visitors/AbstractASTVisitor.cs index 61a190f34d..e8c736833a 100644 --- a/src/Libraries/NRefactory/Project/Src/Visitors/AbstractASTVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Visitors/AbstractASTVisitor.cs @@ -1257,11 +1257,6 @@ namespace ICSharpCode.NRefactory.Visitors { return xmlAttribute.ExpressionValue.AcceptVisitor(this, data); } - public virtual object VisitXmlCommentExpression(XmlCommentExpression xmlCommentExpression, object data) { - Debug.Assert((xmlCommentExpression != null)); - return null; - } - public virtual object VisitXmlContentExpression(XmlContentExpression xmlContentExpression, object data) { Debug.Assert((xmlContentExpression != null)); return null; diff --git a/src/Libraries/NRefactory/Project/Src/Visitors/AbstractAstTransformer.cs b/src/Libraries/NRefactory/Project/Src/Visitors/AbstractAstTransformer.cs index babad6a45d..4373dc0584 100644 --- a/src/Libraries/NRefactory/Project/Src/Visitors/AbstractAstTransformer.cs +++ b/src/Libraries/NRefactory/Project/Src/Visitors/AbstractAstTransformer.cs @@ -2253,11 +2253,6 @@ namespace ICSharpCode.NRefactory.Visitors { return null; } - public virtual object VisitXmlCommentExpression(XmlCommentExpression xmlCommentExpression, object data) { - Debug.Assert((xmlCommentExpression != null)); - return null; - } - public virtual object VisitXmlContentExpression(XmlContentExpression xmlContentExpression, object data) { Debug.Assert((xmlContentExpression != null)); return null; diff --git a/src/Libraries/NRefactory/Project/Src/Visitors/NodeTrackingAstVisitor.cs b/src/Libraries/NRefactory/Project/Src/Visitors/NodeTrackingAstVisitor.cs index 364952b938..a65c33c038 100644 --- a/src/Libraries/NRefactory/Project/Src/Visitors/NodeTrackingAstVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Visitors/NodeTrackingAstVisitor.cs @@ -899,13 +899,6 @@ namespace ICSharpCode.NRefactory.Visitors { return result; } - public sealed override object VisitXmlCommentExpression(XmlCommentExpression xmlCommentExpression, object data) { - this.BeginVisit(xmlCommentExpression); - object result = this.TrackedVisitXmlCommentExpression(xmlCommentExpression, data); - this.EndVisit(xmlCommentExpression); - return result; - } - public sealed override object VisitXmlContentExpression(XmlContentExpression xmlContentExpression, object data) { this.BeginVisit(xmlContentExpression); object result = this.TrackedVisitXmlContentExpression(xmlContentExpression, data); @@ -1444,10 +1437,6 @@ namespace ICSharpCode.NRefactory.Visitors { return base.VisitXmlAttribute(xmlAttribute, data); } - public virtual object TrackedVisitXmlCommentExpression(XmlCommentExpression xmlCommentExpression, object data) { - return base.VisitXmlCommentExpression(xmlCommentExpression, data); - } - public virtual object TrackedVisitXmlContentExpression(XmlContentExpression xmlContentExpression, object data) { return base.VisitXmlContentExpression(xmlContentExpression, data); } diff --git a/src/Libraries/NRefactory/Project/Src/Visitors/NotImplementedAstVisitor.cs b/src/Libraries/NRefactory/Project/Src/Visitors/NotImplementedAstVisitor.cs index f445f6a4b4..e0603d2dff 100644 --- a/src/Libraries/NRefactory/Project/Src/Visitors/NotImplementedAstVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Visitors/NotImplementedAstVisitor.cs @@ -514,10 +514,6 @@ namespace ICSharpCode.NRefactory.Visitors { throw new global::System.NotImplementedException("XmlAttribute"); } - public virtual object VisitXmlCommentExpression(XmlCommentExpression xmlCommentExpression, object data) { - throw new global::System.NotImplementedException("XmlCommentExpression"); - } - public virtual object VisitXmlContentExpression(XmlContentExpression xmlContentExpression, object data) { throw new global::System.NotImplementedException("XmlContentExpression"); } diff --git a/src/Main/Base/Test/VBExpressionFinderTests.cs b/src/Main/Base/Test/VBExpressionFinderTests.cs index 63ed13e5a7..8872db9701 100644 --- a/src/Main/Base/Test/VBExpressionFinderTests.cs +++ b/src/Main/Base/Test/VBExpressionFinderTests.cs @@ -15,8 +15,7 @@ using ICSharpCode.SharpDevelop.Dom.VBNet; namespace ICSharpCode.SharpDevelop.Tests { - [TestFixture] - [Ignore("currently not working because VBExpressionFinder is not yet completed.")] + [TestFixture, Ignore] public class VBExpressionFinderTests { const string program1 = @" diff --git a/src/Main/Core/Test/ICSharpCode.Core.Tests.csproj b/src/Main/Core/Test/ICSharpCode.Core.Tests.csproj index b5565ceea1..ba7e718dd3 100644 --- a/src/Main/Core/Test/ICSharpCode.Core.Tests.csproj +++ b/src/Main/Core/Test/ICSharpCode.Core.Tests.csproj @@ -20,23 +20,23 @@ True Full False - AnyCPU + x86 false v4.0 True ..\..\ICSharpCode.SharpDevelop.snk False File - - - true - - true DEBUG + + Auto + 4194304 + 4096 +