From 8a419bac43e39de62d7d0160aad95b8a071d1579 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sat, 6 Nov 2010 21:03:09 +0100 Subject: [PATCH] NRefactory.VB: removed C# specific Dom classes --- NRefactory.sln | 16 +- VB/NRefactoryASTGenerator/AST/Expressions.cs | 58 - VB/NRefactoryASTGenerator/AST/Statements.cs | 51 - VB/NRefactoryASTGenerator/AST/TypeLevel.cs | 8 - VB/NRefactoryASTGenerator/KeywordGenerator.cs | 1 + VB/Project/Dom/Generated.cs | 704 +---- VB/Project/IAstVisitor.cs | 34 - VB/Project/Lexer/Token.cs | 2 +- VB/Project/Parser/Parser.cs | 2768 ++++++++--------- VB/Project/Parser/gen.bat | 8 +- VB/Project/Parser/vbnet.atg | 2 +- .../PrettyPrinter/VBNet/VBNetOutputVisitor.cs | 210 +- VB/Project/Visitors/AbstractASTVisitor.cs | 146 +- VB/Project/Visitors/AbstractAstTransformer.cs | 243 +- VB/Project/Visitors/CodeDOMOutputVisitor.cs | 160 +- VB/Project/Visitors/LookupTableVisitor.cs | 39 +- VB/Project/Visitors/NodeTrackingAstVisitor.cs | 187 -- .../Visitors/NotImplementedAstVisitor.cs | 68 - .../ICSharpCode.NRefactory.VB.Tests.csproj | 17 - VB/Test/Lexer/LexerTests.cs | 1 + .../Expressions/AddressOfExpressionTests.cs | 4 - .../Expressions/ArrayCreateExpressionTests.cs | 7 +- .../Expressions/AssignmentExpressionTests.cs | 36 +- .../Expressions/CheckedExpressionTests.cs | 19 - .../Expressions/IndexerExpressionTests.cs | 19 - .../PointerReferenceExpressionTests.cs | 19 - .../Expressions/QueryExpressionTests.cs | 617 ++++ .../Expressions/QueryExpressionVBTests.cs | 633 ---- .../Expressions/SizeOfExpressionTests.cs | 19 - .../Expressions/StackAllocExpressionTests.cs | 19 - .../Expressions/UncheckedExpressionTests.cs | 19 - .../Parser/Statements/BlockStatementTests.cs | 4 +- .../Parser/Statements/BreakStatementTests.cs | 20 - .../Statements/CheckedStatementTests.cs | 19 - .../Statements/ContinueStatementTests.cs | 4 +- .../Parser/Statements/EmptyStatementTests.cs | 19 - .../Statements/ExpressionStatementTests.cs | 4 +- .../Parser/Statements/FixedStatementTests.cs | 19 - .../Parser/Statements/ForStatementTests.cs | 19 - .../Statements/GotoCaseStatementTests.cs | 19 - .../Statements/UncheckedStatementTests.cs | 19 - .../Parser/Statements/UnsafeStatementTests.cs | 19 - .../TypeLevel/DestructorDeclarationTests.cs | 17 - .../TypeLevel/IndexerDeclarationTests.cs | 17 - 44 files changed, 2110 insertions(+), 4223 deletions(-) delete mode 100644 VB/Test/Parser/Expressions/CheckedExpressionTests.cs delete mode 100644 VB/Test/Parser/Expressions/IndexerExpressionTests.cs delete mode 100644 VB/Test/Parser/Expressions/PointerReferenceExpressionTests.cs delete mode 100644 VB/Test/Parser/Expressions/QueryExpressionVBTests.cs delete mode 100644 VB/Test/Parser/Expressions/SizeOfExpressionTests.cs delete mode 100644 VB/Test/Parser/Expressions/StackAllocExpressionTests.cs delete mode 100644 VB/Test/Parser/Expressions/UncheckedExpressionTests.cs delete mode 100644 VB/Test/Parser/Statements/BreakStatementTests.cs delete mode 100644 VB/Test/Parser/Statements/CheckedStatementTests.cs delete mode 100644 VB/Test/Parser/Statements/EmptyStatementTests.cs delete mode 100644 VB/Test/Parser/Statements/FixedStatementTests.cs delete mode 100644 VB/Test/Parser/Statements/ForStatementTests.cs delete mode 100644 VB/Test/Parser/Statements/GotoCaseStatementTests.cs delete mode 100644 VB/Test/Parser/Statements/UncheckedStatementTests.cs delete mode 100644 VB/Test/Parser/Statements/UnsafeStatementTests.cs delete mode 100644 VB/Test/Parser/TypeLevel/DestructorDeclarationTests.cs delete mode 100644 VB/Test/Parser/TypeLevel/IndexerDeclarationTests.cs diff --git a/NRefactory.sln b/NRefactory.sln index 162369c1cd..d4487ce22c 100644 --- a/NRefactory.sln +++ b/NRefactory.sln @@ -8,19 +8,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution doc\TODO = doc\TODO EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Tests", "ICSharpCode.NRefactory.Tests\ICSharpCode.NRefactory.Tests.csproj", "{63D3B27A-D966-4902-90B3-30290E1692F1}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VB", "VB", "{61F5C042-086B-45DD-999E-01B1A78A4619}" ProjectSection(SolutionItems) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "VB\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.VB.Tests", "VB\Test\ICSharpCode.NRefactory.VB.Tests.csproj", "{870115DD-960A-4406-A6B9-600BCDC36A03}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.VB", "VB\Project\ICSharpCode.NRefactory.VB.csproj", "{7B82B671-419F-45F4-B778-D9286F996EFA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.VB.Tests", "VB\Test\ICSharpCode.NRefactory.VB.Tests.csproj", "{870115DD-960A-4406-A6B9-600BCDC36A03}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryASTGenerator", "VB\NRefactoryASTGenerator\NRefactoryASTGenerator.csproj", "{B22522AA-B5BF-4A58-AC6D-D4B45805521F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Tests", "ICSharpCode.NRefactory.Tests\ICSharpCode.NRefactory.Tests.csproj", "{63D3B27A-D966-4902-90B3-30290E1692F1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -64,8 +64,8 @@ Global {870115DD-960A-4406-A6B9-600BCDC36A03}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution - {870115DD-960A-4406-A6B9-600BCDC36A03} = {61F5C042-086B-45DD-999E-01B1A78A4619} - {7B82B671-419F-45F4-B778-D9286F996EFA} = {61F5C042-086B-45DD-999E-01B1A78A4619} {B22522AA-B5BF-4A58-AC6D-D4B45805521F} = {61F5C042-086B-45DD-999E-01B1A78A4619} + {7B82B671-419F-45F4-B778-D9286F996EFA} = {61F5C042-086B-45DD-999E-01B1A78A4619} + {870115DD-960A-4406-A6B9-600BCDC36A03} = {61F5C042-086B-45DD-999E-01B1A78A4619} EndGlobalSection EndGlobal diff --git a/VB/NRefactoryASTGenerator/AST/Expressions.cs b/VB/NRefactoryASTGenerator/AST/Expressions.cs index 80b603d95d..1508905d3b 100644 --- a/VB/NRefactoryASTGenerator/AST/Expressions.cs +++ b/VB/NRefactoryASTGenerator/AST/Expressions.cs @@ -118,14 +118,6 @@ namespace NRefactoryASTGenerator.Ast public MemberReferenceExpression(Expression targetObject, string memberName) {} } - class PointerReferenceExpression : Expression { - Expression targetObject; - string memberName; - List typeArguments; - - public PointerReferenceExpression(Expression targetObject, string memberName) {} - } - class IdentifierExpression : Expression { string identifier; List typeArguments; @@ -185,12 +177,6 @@ namespace NRefactoryASTGenerator.Ast TypeReference returnType; } - class CheckedExpression : Expression { - Expression expression; - - public CheckedExpression(Expression expression) {} - } - class ConditionalExpression : Expression { Expression condition; Expression trueExpression; @@ -215,32 +201,6 @@ namespace NRefactoryASTGenerator.Ast public DirectionExpression(FieldDirection fieldDirection, Expression expression) {} } - class IndexerExpression : Expression { - Expression targetObject; - List indexes; - - public IndexerExpression(Expression targetObject, List indexes) {} - } - - class SizeOfExpression : Expression { - TypeReference typeReference; - - public SizeOfExpression(TypeReference typeReference) {} - } - - class StackAllocExpression : Expression { - TypeReference typeReference; - Expression expression; - - public StackAllocExpression(TypeReference typeReference, Expression expression) {} - } - - class UncheckedExpression : Expression { - Expression expression; - - public UncheckedExpression(Expression expression) {} - } - class AddressOfExpression : Expression { Expression expression; @@ -256,25 +216,7 @@ namespace NRefactoryASTGenerator.Ast public TypeOfIsExpression(Expression expression, TypeReference typeReference) {} } - [ImplementNullable(NullableImplementation.Shadow)] class QueryExpression : Expression { - - /// - /// Either from or aggregate clause. - /// - QueryExpressionFromClause fromClause; - - bool isQueryContinuation; - - List middleClauses; - - /// - /// C# only. - /// - QueryExpressionClause selectOrGroupClause; - } - - class QueryExpressionVB : Expression { List clauses; } diff --git a/VB/NRefactoryASTGenerator/AST/Statements.cs b/VB/NRefactoryASTGenerator/AST/Statements.cs index 5657bafa78..a7f0a5a3a7 100644 --- a/VB/NRefactoryASTGenerator/AST/Statements.cs +++ b/VB/NRefactoryASTGenerator/AST/Statements.cs @@ -17,8 +17,6 @@ namespace NRefactoryASTGenerator.Ast [CustomImplementation, HasChildren] class BlockStatement : Statement {} - class BreakStatement : Statement {} - enum ContinueType {} class ContinueStatement : Statement { @@ -49,14 +47,6 @@ namespace NRefactoryASTGenerator.Ast public ForeachStatement(TypeReference typeReference, string variableName, Expression expression, Statement embeddedStatement, Expression nextExpression) {} } - class ForStatement : StatementWithEmbeddedStatement { - List initializers; - Expression condition; - List iterator; - - public ForStatement(List initializers, Expression condition, List iterator, Statement embeddedStatement) {} - } - class GotoStatement : Statement { string label; @@ -178,53 +168,12 @@ namespace NRefactoryASTGenerator.Ast public CatchClause(Statement statementBlock) {} } - class CheckedStatement : Statement { - Statement block; - - public CheckedStatement(Statement block) {} - } - - class EmptyStatement : Statement {} - - class FixedStatement : StatementWithEmbeddedStatement { - Statement pointerDeclaration; - - public FixedStatement(Statement pointerDeclaration, Statement embeddedStatement) {} - } - - [IncludeBoolProperty("IsDefaultCase", "return expression.IsNull;")] - class GotoCaseStatement : Statement { - Expression expression; - - public GotoCaseStatement(Expression expression) {} - } - - class UncheckedStatement : Statement { - Statement block; - - public UncheckedStatement(Statement block) {} - } - - class UnsafeStatement : Statement { - Statement block; - - public UnsafeStatement(Statement block) {} - } - class UsingStatement : StatementWithEmbeddedStatement { Statement resourceAcquisition; public UsingStatement(Statement resourceAcquisition, Statement embeddedStatement) {} } - [IncludeBoolProperty("IsYieldReturn", "return statement is ReturnStatement;")] - [IncludeBoolProperty("IsYieldBreak", "return statement is BreakStatement;")] - class YieldStatement : Statement { - Statement statement; - - public YieldStatement(Statement statement) {} - } - class AddHandlerStatement : Statement { Expression eventExpression; Expression handlerExpression; diff --git a/VB/NRefactoryASTGenerator/AST/TypeLevel.cs b/VB/NRefactoryASTGenerator/AST/TypeLevel.cs index ea901cabca..ee2a1abeb0 100644 --- a/VB/NRefactoryASTGenerator/AST/TypeLevel.cs +++ b/VB/NRefactoryASTGenerator/AST/TypeLevel.cs @@ -211,14 +211,6 @@ namespace NRefactoryASTGenerator.Ast public PropertySetRegion(BlockStatement block, List attributes) : base(block, attributes) {} } - class DestructorDeclaration : AttributedNode - { - string name; - BlockStatement body; - - public DestructorDeclaration(string name, Modifiers modifier, List attributes) : base(modifier, attributes) {} - } - enum CharsetModifier { None } class DeclareDeclaration : ParametrizedNode diff --git a/VB/NRefactoryASTGenerator/KeywordGenerator.cs b/VB/NRefactoryASTGenerator/KeywordGenerator.cs index b505d9cc6c..25300da420 100644 --- a/VB/NRefactoryASTGenerator/KeywordGenerator.cs +++ b/VB/NRefactoryASTGenerator/KeywordGenerator.cs @@ -97,6 +97,7 @@ namespace NRefactoryASTGenerator writer.WriteLine("using System;"); writer.WriteLine("using System.IO;"); writer.WriteLine("using NUnit.Framework;"); + writer.WriteLine("using ICSharpCode.NRefactory.VB;"); writer.WriteLine("using ICSharpCode.NRefactory.VB.Parser;"); writer.WriteLine("using ICSharpCode.NRefactory.VB.PrettyPrinter;"); writer.WriteLine(); diff --git a/VB/Project/Dom/Generated.cs b/VB/Project/Dom/Generated.cs index 6099b4d132..554637ef53 100644 --- a/VB/Project/Dom/Generated.cs +++ b/VB/Project/Dom/Generated.cs @@ -455,20 +455,6 @@ namespace ICSharpCode.NRefactory.VB.Dom { } } - public class BreakStatement : Statement { - - public BreakStatement() { - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitBreakStatement(this, data); - } - - public override string ToString() { - return "[BreakStatement]"; - } - } - public class CaseLabel : AbstractNode { Expression label; @@ -679,60 +665,6 @@ namespace ICSharpCode.NRefactory.VB.Dom { } } - public class CheckedExpression : Expression { - - Expression expression; - - public Expression Expression { - get { - return expression; - } - set { - expression = value ?? Expression.Null; - if (!expression.IsNull) expression.Parent = this; - } - } - - public CheckedExpression(Expression expression) { - Expression = expression; - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitCheckedExpression(this, data); - } - - public override string ToString() { - return string.Format("[CheckedExpression Expression={0}]", Expression); - } - } - - public class CheckedStatement : Statement { - - Statement block; - - public Statement Block { - get { - return block; - } - set { - block = value ?? Statement.Null; - if (!block.IsNull) block.Parent = this; - } - } - - public CheckedStatement(Statement block) { - Block = block; - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitCheckedStatement(this, data); - } - - public override string ToString() { - return string.Format("[CheckedStatement Block={0}]", Block); - } - } - public class ClassReferenceExpression : Expression { public ClassReferenceExpression() { @@ -1256,47 +1188,6 @@ namespace ICSharpCode.NRefactory.VB.Dom { } } - public class DestructorDeclaration : AttributedNode { - - string name; - - BlockStatement body; - - public string Name { - get { - return name; - } - set { - name = value ?? ""; - } - } - - public BlockStatement Body { - get { - return body; - } - set { - body = value ?? BlockStatement.Null; - if (!body.IsNull) body.Parent = this; - } - } - - public DestructorDeclaration(string name, Modifiers modifier, List attributes) { - Name = name; - Modifier = modifier; - Attributes = attributes; - body = BlockStatement.Null; - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitDestructorDeclaration(this, data); - } - - public override string ToString() { - return string.Format("[DestructorDeclaration Name={0} Body={1} Attributes={2} Modifier={3}]", Name, Body, GetCollectionString(Attributes), Modifier); - } - } - public class DirectionExpression : Expression { FieldDirection fieldDirection; @@ -1417,20 +1308,6 @@ namespace ICSharpCode.NRefactory.VB.Dom { } } - public class EmptyStatement : Statement { - - public EmptyStatement() { - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitEmptyStatement(this, data); - } - - public override string ToString() { - return "[EmptyStatement]"; - } - } - public class EndStatement : Statement { public EndStatement() { @@ -1665,21 +1542,21 @@ namespace ICSharpCode.NRefactory.VB.Dom { initializer = Expression.Null; } - public bool HasRemoveRegion { + public bool HasAddRegion { get { - return !removeRegion.IsNull; + return !addRegion.IsNull; } } - public bool HasRaiseRegion { + public bool HasRemoveRegion { get { - return !raiseRegion.IsNull; + return !removeRegion.IsNull; } } - public bool HasAddRegion { + public bool HasRaiseRegion { get { - return !addRegion.IsNull; + return !raiseRegion.IsNull; } } @@ -2011,34 +1888,6 @@ namespace ICSharpCode.NRefactory.VB.Dom { } } - public class FixedStatement : StatementWithEmbeddedStatement { - - Statement pointerDeclaration; - - public Statement PointerDeclaration { - get { - return pointerDeclaration; - } - set { - pointerDeclaration = value ?? Statement.Null; - if (!pointerDeclaration.IsNull) pointerDeclaration.Parent = this; - } - } - - public FixedStatement(Statement pointerDeclaration, Statement embeddedStatement) { - PointerDeclaration = pointerDeclaration; - EmbeddedStatement = embeddedStatement; - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitFixedStatement(this, data); - } - - public override string ToString() { - return string.Format("[FixedStatement PointerDeclaration={0} EmbeddedStatement={1}]", PointerDeclaration, EmbeddedStatement); - } - } - public class ForeachStatement : StatementWithEmbeddedStatement { TypeReference typeReference; @@ -2218,91 +2067,6 @@ namespace ICSharpCode.NRefactory.VB.Dom { } } - public class ForStatement : StatementWithEmbeddedStatement { - - List initializers; - - Expression condition; - - List iterator; - - public List Initializers { - get { - return initializers; - } - set { - initializers = value ?? new List(); - } - } - - public Expression Condition { - get { - return condition; - } - set { - condition = value ?? Expression.Null; - if (!condition.IsNull) condition.Parent = this; - } - } - - public List Iterator { - get { - return iterator; - } - set { - iterator = value ?? new List(); - } - } - - public ForStatement(List initializers, Expression condition, List iterator, Statement embeddedStatement) { - Initializers = initializers; - Condition = condition; - Iterator = iterator; - EmbeddedStatement = embeddedStatement; - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitForStatement(this, data); - } - - public override string ToString() { - return string.Format("[ForStatement Initializers={0} Condition={1} Iterator={2} EmbeddedStatement={3}]", GetCollectionString(Initializers), Condition, GetCollectionString(Iterator), EmbeddedStatement); - } - } - - public class GotoCaseStatement : Statement { - - Expression expression; - - public Expression Expression { - get { - return expression; - } - set { - expression = value ?? Expression.Null; - if (!expression.IsNull) expression.Parent = this; - } - } - - public GotoCaseStatement(Expression expression) { - Expression = expression; - } - - public bool IsDefaultCase { - get { - return expression.IsNull; - } - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitGotoCaseStatement(this, data); - } - - public override string ToString() { - return string.Format("[GotoCaseStatement Expression={0}]", Expression); - } - } - public class GotoStatement : Statement { string label; @@ -2428,6 +2192,12 @@ namespace ICSharpCode.NRefactory.VB.Dom { if (trueStatement != null) trueStatement.Parent = this; } + public bool HasElseIfSections { + get { + return elseIfSections.Count > 0; + } + } + public bool HasElseStatements { get { return falseStatement.Count > 0; @@ -2443,12 +2213,6 @@ namespace ICSharpCode.NRefactory.VB.Dom { if (falseStatement != null) falseStatement.Parent = this; } - public bool HasElseIfSections { - get { - return elseIfSections.Count > 0; - } - } - public override object AcceptVisitor(IAstVisitor visitor, object data) { return visitor.VisitIfElseStatement(this, data); } @@ -2459,45 +2223,6 @@ namespace ICSharpCode.NRefactory.VB.Dom { } } - public class IndexerExpression : Expression { - - Expression targetObject; - - List indexes; - - public Expression TargetObject { - get { - return targetObject; - } - set { - targetObject = value ?? Expression.Null; - if (!targetObject.IsNull) targetObject.Parent = this; - } - } - - public List Indexes { - get { - return indexes; - } - set { - indexes = value ?? new List(); - } - } - - public IndexerExpression(Expression targetObject, List indexes) { - TargetObject = targetObject; - Indexes = indexes; - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitIndexerExpression(this, data); - } - - public override string ToString() { - return string.Format("[IndexerExpression TargetObject={0} Indexes={1}]", TargetObject, GetCollectionString(Indexes)); - } - } - public class InterfaceImplementation : AbstractNode { TypeReference interfaceType; @@ -3294,75 +3019,24 @@ public Location ExtendedEndLocation { get; set; } } } - public class PointerReferenceExpression : Expression { + public class PropertyDeclaration : MemberNode { - Expression targetObject; + Location bodyStart; - string memberName; + Location bodyEnd; - List typeArguments; + PropertyGetRegion getRegion; - public Expression TargetObject { + PropertySetRegion setRegion; + + Expression initializer; + + public Location BodyStart { get { - return targetObject; + return bodyStart; } set { - targetObject = value ?? Expression.Null; - if (!targetObject.IsNull) targetObject.Parent = this; - } - } - - public string MemberName { - get { - return memberName; - } - set { - memberName = value ?? ""; - } - } - - public List TypeArguments { - get { - return typeArguments; - } - set { - typeArguments = value ?? new List(); - } - } - - public PointerReferenceExpression(Expression targetObject, string memberName) { - TargetObject = targetObject; - MemberName = memberName; - typeArguments = new List(); - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitPointerReferenceExpression(this, data); - } - - public override string ToString() { - return string.Format("[PointerReferenceExpression TargetObject={0} MemberName={1} TypeArguments={2}]", TargetObject, MemberName, GetCollectionString(TypeArguments)); - } - } - - public class PropertyDeclaration : MemberNode { - - Location bodyStart; - - Location bodyEnd; - - PropertyGetRegion getRegion; - - PropertySetRegion setRegion; - - Expression initializer; - - public Location BodyStart { - get { - return bodyStart; - } - set { - bodyStart = value; + bodyStart = value; } } @@ -3417,24 +3091,6 @@ public Location ExtendedEndLocation { get; set; } initializer = Expression.Null; } - - internal PropertyDeclaration(string name, TypeReference typeReference, Modifiers modifier, List attributes) : this(modifier, attributes, name, null) - { - this.TypeReference = typeReference; - if ((modifier & Modifiers.ReadOnly) != Modifiers.ReadOnly) { - this.SetRegion = new PropertySetRegion(null, null); - } - if ((modifier & Modifiers.WriteOnly) != Modifiers.WriteOnly) { - this.GetRegion = new PropertyGetRegion(null, null); - } - } - - public bool HasSetRegion { - get { - return !setRegion.IsNull; - } - } - public bool IsReadOnly { get { return HasGetRegion && !HasSetRegion; @@ -3447,15 +3103,33 @@ public Location ExtendedEndLocation { get; set; } } } + public bool IsWriteOnly { + get { + return !HasGetRegion && HasSetRegion; + } + } + public bool IsIndexer { get { return (Modifier & Modifiers.Default) != 0; } } - public bool IsWriteOnly { + + internal PropertyDeclaration(string name, TypeReference typeReference, Modifiers modifier, List attributes) : this(modifier, attributes, name, null) + { + this.TypeReference = typeReference; + if ((modifier & Modifiers.ReadOnly) != Modifiers.ReadOnly) { + this.SetRegion = new PropertySetRegion(null, null); + } + if ((modifier & Modifiers.WriteOnly) != Modifiers.WriteOnly) { + this.GetRegion = new PropertyGetRegion(null, null); + } + } + + public bool HasSetRegion { get { - return !HasGetRegion && HasSetRegion; + return !setRegion.IsNull; } } @@ -3598,62 +3272,19 @@ public Location ExtendedEndLocation { get; set; } public class QueryExpression : Expression { - QueryExpressionFromClause fromClause; - - bool isQueryContinuation; - - List middleClauses; - - QueryExpressionClause selectOrGroupClause; - - public QueryExpressionFromClause FromClause { - get { - return fromClause; - } - set { - fromClause = value ?? QueryExpressionFromClause.Null; - if (!fromClause.IsNull) fromClause.Parent = this; - } - } - - public bool IsQueryContinuation { - get { - return isQueryContinuation; - } - set { - isQueryContinuation = value; - } - } - - public List MiddleClauses { - get { - return middleClauses; - } - set { - middleClauses = value ?? new List(); - } - } + List clauses; - public QueryExpressionClause SelectOrGroupClause { + public List Clauses { get { - return selectOrGroupClause; + return clauses; } set { - selectOrGroupClause = value ?? QueryExpressionClause.Null; - if (!selectOrGroupClause.IsNull) selectOrGroupClause.Parent = this; + clauses = value ?? new List(); } } public QueryExpression() { - fromClause = QueryExpressionFromClause.Null; - middleClauses = new List(); - selectOrGroupClause = QueryExpressionClause.Null; - } - - public new static QueryExpression Null { - get { - return NullQueryExpression.Instance; - } + clauses = new List(); } public override object AcceptVisitor(IAstVisitor visitor, object data) { @@ -3661,27 +3292,7 @@ public Location ExtendedEndLocation { get; set; } } public override string ToString() { - return string.Format("[QueryExpression FromClause={0} IsQueryContinuation={1} MiddleClauses={2} SelectO" + - "rGroupClause={3}]", FromClause, IsQueryContinuation, GetCollectionString(MiddleClauses), SelectOrGroupClause); - } - } - - internal sealed class NullQueryExpression : QueryExpression { - - internal static NullQueryExpression Instance = new NullQueryExpression(); - - public override bool IsNull { - get { - return true; - } - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return null; - } - - public override string ToString() { - return "[NullQueryExpression]"; + return string.Format("[QueryExpression Clauses={0}]", GetCollectionString(Clauses)); } } @@ -4371,32 +3982,6 @@ public Location ExtendedEndLocation { get; set; } } } - public class QueryExpressionVB : Expression { - - List clauses; - - public List Clauses { - get { - return clauses; - } - set { - clauses = value ?? new List(); - } - } - - public QueryExpressionVB() { - clauses = new List(); - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitQueryExpressionVB(this, data); - } - - public override string ToString() { - return string.Format("[QueryExpressionVB Clauses={0}]", GetCollectionString(Clauses)); - } - } - public class QueryExpressionWhereClause : QueryExpressionClause { Expression condition; @@ -4609,73 +4194,6 @@ public Location ExtendedEndLocation { get; set; } } } - public class SizeOfExpression : Expression { - - TypeReference typeReference; - - public TypeReference TypeReference { - get { - return typeReference; - } - set { - typeReference = value ?? TypeReference.Null; - if (!typeReference.IsNull) typeReference.Parent = this; - } - } - - public SizeOfExpression(TypeReference typeReference) { - TypeReference = typeReference; - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitSizeOfExpression(this, data); - } - - public override string ToString() { - return string.Format("[SizeOfExpression TypeReference={0}]", TypeReference); - } - } - - public class StackAllocExpression : Expression { - - TypeReference typeReference; - - Expression expression; - - public TypeReference TypeReference { - get { - return typeReference; - } - set { - typeReference = value ?? TypeReference.Null; - if (!typeReference.IsNull) typeReference.Parent = this; - } - } - - public Expression Expression { - get { - return expression; - } - set { - expression = value ?? Expression.Null; - if (!expression.IsNull) expression.Parent = this; - } - } - - public StackAllocExpression(TypeReference typeReference, Expression expression) { - TypeReference = typeReference; - Expression = expression; - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitStackAllocExpression(this, data); - } - - public override string ToString() { - return string.Format("[StackAllocExpression TypeReference={0} Expression={1}]", TypeReference, Expression); - } - } - public class StopStatement : Statement { public StopStatement() { @@ -5122,87 +4640,6 @@ public Location ExtendedEndLocation { get; set; } } } - public class UncheckedExpression : Expression { - - Expression expression; - - public Expression Expression { - get { - return expression; - } - set { - expression = value ?? Expression.Null; - if (!expression.IsNull) expression.Parent = this; - } - } - - public UncheckedExpression(Expression expression) { - Expression = expression; - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitUncheckedExpression(this, data); - } - - public override string ToString() { - return string.Format("[UncheckedExpression Expression={0}]", Expression); - } - } - - public class UncheckedStatement : Statement { - - Statement block; - - public Statement Block { - get { - return block; - } - set { - block = value ?? Statement.Null; - if (!block.IsNull) block.Parent = this; - } - } - - public UncheckedStatement(Statement block) { - Block = block; - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitUncheckedStatement(this, data); - } - - public override string ToString() { - return string.Format("[UncheckedStatement Block={0}]", Block); - } - } - - public class UnsafeStatement : Statement { - - Statement block; - - public Statement Block { - get { - return block; - } - set { - block = value ?? Statement.Null; - if (!block.IsNull) block.Parent = this; - } - } - - public UnsafeStatement(Statement block) { - Block = block; - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitUnsafeStatement(this, data); - } - - public override string ToString() { - return string.Format("[UnsafeStatement Block={0}]", Block); - } - } - public class Using : AbstractNode { string name; @@ -5297,10 +4734,10 @@ public Location ExtendedEndLocation { get; set; } public UsingDeclaration(string xmlNamespace, string prefix) { usings = new List(1); usings.Add(new Using(xmlNamespace, prefix)); } -public UsingDeclaration(string @namespace, TypeReference alias) { usings = new List(1); usings.Add(new Using(@namespace, alias)); } - public UsingDeclaration(string @namespace) : this(@namespace, TypeReference.Null) {} +public UsingDeclaration(string @namespace, TypeReference alias) { usings = new List(1); usings.Add(new Using(@namespace, alias)); } + public override object AcceptVisitor(IAstVisitor visitor, object data) { return visitor.VisitUsingDeclaration(this, data); } @@ -5763,43 +5200,4 @@ public UsingDeclaration(string @namespace) : this(@namespace, TypeReference.Null "tifier={3}]", TargetObject, AxisType, IsXmlIdentifier, Identifier); } } - - public class YieldStatement : Statement { - - Statement statement; - - public Statement Statement { - get { - return statement; - } - set { - statement = value ?? Statement.Null; - if (!statement.IsNull) statement.Parent = this; - } - } - - public YieldStatement(Statement statement) { - Statement = statement; - } - - public bool IsYieldBreak { - get { - return statement is BreakStatement; - } - } - - public bool IsYieldReturn { - get { - return statement is ReturnStatement; - } - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitYieldStatement(this, data); - } - - public override string ToString() { - return string.Format("[YieldStatement Statement={0}]", Statement); - } - } } diff --git a/VB/Project/IAstVisitor.cs b/VB/Project/IAstVisitor.cs index d00e8d5815..7a9026836f 100644 --- a/VB/Project/IAstVisitor.cs +++ b/VB/Project/IAstVisitor.cs @@ -35,18 +35,12 @@ namespace ICSharpCode.NRefactory.VB { object VisitBlockStatement(BlockStatement blockStatement, object data); - object VisitBreakStatement(BreakStatement breakStatement, object data); - object VisitCaseLabel(CaseLabel caseLabel, object data); object VisitCastExpression(CastExpression castExpression, object data); object VisitCatchClause(CatchClause catchClause, object data); - object VisitCheckedExpression(CheckedExpression checkedExpression, object data); - - object VisitCheckedStatement(CheckedStatement checkedStatement, object data); - object VisitClassReferenceExpression(ClassReferenceExpression classReferenceExpression, object data); object VisitCollectionInitializerExpression(CollectionInitializerExpression collectionInitializerExpression, object data); @@ -69,16 +63,12 @@ namespace ICSharpCode.NRefactory.VB { object VisitDelegateDeclaration(DelegateDeclaration delegateDeclaration, object data); - object VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration, object data); - object VisitDirectionExpression(DirectionExpression directionExpression, object data); object VisitDoLoopStatement(DoLoopStatement doLoopStatement, object data); object VisitElseIfSection(ElseIfSection elseIfSection, object data); - object VisitEmptyStatement(EmptyStatement emptyStatement, object data); - object VisitEndStatement(EndStatement endStatement, object data); object VisitEraseStatement(EraseStatement eraseStatement, object data); @@ -103,24 +93,16 @@ namespace ICSharpCode.NRefactory.VB { object VisitFieldDeclaration(FieldDeclaration fieldDeclaration, object data); - object VisitFixedStatement(FixedStatement fixedStatement, object data); - object VisitForeachStatement(ForeachStatement foreachStatement, object data); object VisitForNextStatement(ForNextStatement forNextStatement, object data); - object VisitForStatement(ForStatement forStatement, object data); - - object VisitGotoCaseStatement(GotoCaseStatement gotoCaseStatement, object data); - object VisitGotoStatement(GotoStatement gotoStatement, object data); object VisitIdentifierExpression(IdentifierExpression identifierExpression, object data); object VisitIfElseStatement(IfElseStatement ifElseStatement, object data); - object VisitIndexerExpression(IndexerExpression indexerExpression, object data); - object VisitInnerClassTypeReference(InnerClassTypeReference innerClassTypeReference, object data); object VisitInterfaceImplementation(InterfaceImplementation interfaceImplementation, object data); @@ -157,8 +139,6 @@ namespace ICSharpCode.NRefactory.VB { object VisitParenthesizedExpression(ParenthesizedExpression parenthesizedExpression, object data); - object VisitPointerReferenceExpression(PointerReferenceExpression pointerReferenceExpression, object data); - object VisitPrimitiveExpression(PrimitiveExpression primitiveExpression, object data); object VisitPropertyDeclaration(PropertyDeclaration propertyDeclaration, object data); @@ -201,8 +181,6 @@ namespace ICSharpCode.NRefactory.VB { object VisitQueryExpressionSelectVBClause(QueryExpressionSelectVBClause queryExpressionSelectVBClause, object data); - object VisitQueryExpressionVB(QueryExpressionVB queryExpressionVB, object data); - object VisitQueryExpressionWhereClause(QueryExpressionWhereClause queryExpressionWhereClause, object data); object VisitRaiseEventStatement(RaiseEventStatement raiseEventStatement, object data); @@ -215,10 +193,6 @@ namespace ICSharpCode.NRefactory.VB { object VisitReturnStatement(ReturnStatement returnStatement, object data); - object VisitSizeOfExpression(SizeOfExpression sizeOfExpression, object data); - - object VisitStackAllocExpression(StackAllocExpression stackAllocExpression, object data); - object VisitStopStatement(StopStatement stopStatement, object data); object VisitSwitchSection(SwitchSection switchSection, object data); @@ -245,12 +219,6 @@ namespace ICSharpCode.NRefactory.VB { object VisitUnaryOperatorExpression(UnaryOperatorExpression unaryOperatorExpression, object data); - object VisitUncheckedExpression(UncheckedExpression uncheckedExpression, object data); - - object VisitUncheckedStatement(UncheckedStatement uncheckedStatement, object data); - - object VisitUnsafeStatement(UnsafeStatement unsafeStatement, object data); - object VisitUsing(Using @using, object data); object VisitUsingDeclaration(UsingDeclaration usingDeclaration, object data); @@ -272,7 +240,5 @@ namespace ICSharpCode.NRefactory.VB { object VisitXmlEmbeddedExpression(XmlEmbeddedExpression xmlEmbeddedExpression, object data); object VisitXmlMemberAccessExpression(XmlMemberAccessExpression xmlMemberAccessExpression, object data); - - object VisitYieldStatement(YieldStatement yieldStatement, object data); } } diff --git a/VB/Project/Lexer/Token.cs b/VB/Project/Lexer/Token.cs index dda3a5a660..0eeaac9600 100644 --- a/VB/Project/Lexer/Token.cs +++ b/VB/Project/Lexer/Token.cs @@ -99,7 +99,7 @@ namespace ICSharpCode.NRefactory.VB.Parser vbToken = ""; } - return string.Format("[Token {1} Location={2} EndLocation={3} val={4}]", + return string.Format("[Token {0} Location={1} EndLocation={2} val={3}]", vbToken, Location, EndLocation, val); } } diff --git a/VB/Project/Parser/Parser.cs b/VB/Project/Parser/Parser.cs index bfede52e50..a8e64357e7 100644 --- a/VB/Project/Parser/Parser.cs +++ b/VB/Project/Parser/Parser.cs @@ -1,5 +1,5 @@ -#line 1 "VBNET.ATG" +#line 1 "vbnet.atg" using System.Collections; using System.Collections.Generic; using System.Collections.Specialized; @@ -26,7 +26,7 @@ partial class Parser : AbstractParser const bool x = false; -#line 13 "VBNET.ATG" +#line 13 "vbnet.atg" /* @@ -35,7 +35,7 @@ partial class Parser : AbstractParser void VBNET() { -#line 263 "VBNET.ATG" +#line 263 "vbnet.atg" lexer.NextToken(); // get the first token compilationUnit = new CompilationUnit(); BlockStart(compilationUnit); @@ -56,7 +56,7 @@ partial class Parser : AbstractParser } } while ( -#line 271 "VBNET.ATG" +#line 271 "vbnet.atg" IsGlobalAttrTarget()) { GlobalAttributeSection(); while (la.kind == 1 || la.kind == 21) { @@ -83,59 +83,59 @@ IsGlobalAttrTarget()) { void OptionStmt() { -#line 276 "VBNET.ATG" +#line 276 "vbnet.atg" INode node = null; bool val = true; Expect(173); -#line 277 "VBNET.ATG" +#line 277 "vbnet.atg" Location startPos = t.Location; if (la.kind == 121) { lexer.NextToken(); if (la.kind == 170 || la.kind == 171) { OptionValue( -#line 279 "VBNET.ATG" +#line 279 "vbnet.atg" ref val); } -#line 280 "VBNET.ATG" +#line 280 "vbnet.atg" node = new OptionDeclaration(OptionType.Explicit, val); } else if (la.kind == 207) { lexer.NextToken(); if (la.kind == 170 || la.kind == 171) { OptionValue( -#line 282 "VBNET.ATG" +#line 282 "vbnet.atg" ref val); } -#line 283 "VBNET.ATG" +#line 283 "vbnet.atg" node = new OptionDeclaration(OptionType.Strict, val); } else if (la.kind == 87) { lexer.NextToken(); if (la.kind == 67) { lexer.NextToken(); -#line 285 "VBNET.ATG" +#line 285 "vbnet.atg" node = new OptionDeclaration(OptionType.CompareBinary, val); } else if (la.kind == 213) { lexer.NextToken(); -#line 286 "VBNET.ATG" +#line 286 "vbnet.atg" node = new OptionDeclaration(OptionType.CompareText, val); } else SynErr(241); } else if (la.kind == 139) { lexer.NextToken(); if (la.kind == 170 || la.kind == 171) { OptionValue( -#line 289 "VBNET.ATG" +#line 289 "vbnet.atg" ref val); } -#line 290 "VBNET.ATG" +#line 290 "vbnet.atg" node = new OptionDeclaration(OptionType.Infer, val); } else SynErr(242); EndOfStmt(); -#line 294 "VBNET.ATG" +#line 294 "vbnet.atg" if (node != null) { node.StartLocation = startPos; node.EndLocation = t.Location; @@ -146,33 +146,33 @@ ref val); void ImportsStmt() { -#line 315 "VBNET.ATG" +#line 315 "vbnet.atg" List usings = new List(); Expect(137); -#line 319 "VBNET.ATG" +#line 319 "vbnet.atg" Location startPos = t.Location; Using u; ImportClause( -#line 322 "VBNET.ATG" +#line 322 "vbnet.atg" out u); -#line 322 "VBNET.ATG" +#line 322 "vbnet.atg" if (u != null) { usings.Add(u); } while (la.kind == 22) { lexer.NextToken(); ImportClause( -#line 324 "VBNET.ATG" +#line 324 "vbnet.atg" out u); -#line 324 "VBNET.ATG" +#line 324 "vbnet.atg" if (u != null) { usings.Add(u); } } EndOfStmt(); -#line 328 "VBNET.ATG" +#line 328 "vbnet.atg" UsingDeclaration usingDeclaration = new UsingDeclaration(usings); usingDeclaration.StartLocation = startPos; usingDeclaration.EndLocation = t.Location; @@ -183,7 +183,7 @@ out u); void GlobalAttributeSection() { Expect(40); -#line 2817 "VBNET.ATG" +#line 2817 "vbnet.atg" Location startPos = t.Location; if (la.kind == 65) { lexer.NextToken(); @@ -191,20 +191,20 @@ out u); lexer.NextToken(); } else SynErr(243); -#line 2819 "VBNET.ATG" +#line 2819 "vbnet.atg" string attributeTarget = t.val != null ? t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture) : null; List attributes = new List(); ASTAttribute attribute; Expect(21); Attribute( -#line 2823 "VBNET.ATG" +#line 2823 "vbnet.atg" out attribute); -#line 2823 "VBNET.ATG" +#line 2823 "vbnet.atg" attributes.Add(attribute); while ( -#line 2824 "VBNET.ATG" +#line 2824 "vbnet.atg" NotFinalComma()) { if (la.kind == 22) { lexer.NextToken(); @@ -216,10 +216,10 @@ NotFinalComma()) { Expect(21); } Attribute( -#line 2824 "VBNET.ATG" +#line 2824 "vbnet.atg" out attribute); -#line 2824 "VBNET.ATG" +#line 2824 "vbnet.atg" attributes.Add(attribute); } if (la.kind == 22) { @@ -228,7 +228,7 @@ out attribute); Expect(39); EndOfStmt(); -#line 2829 "VBNET.ATG" +#line 2829 "vbnet.atg" AttributeSection section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -241,7 +241,7 @@ out attribute); void NamespaceMemberDecl() { -#line 361 "VBNET.ATG" +#line 361 "vbnet.atg" ModifierList m = new ModifierList(); AttributeSection section; List attributes = new List(); @@ -250,14 +250,14 @@ out attribute); if (la.kind == 160) { lexer.NextToken(); -#line 368 "VBNET.ATG" +#line 368 "vbnet.atg" Location startPos = t.Location; Qualident( -#line 370 "VBNET.ATG" +#line 370 "vbnet.atg" out qualident); -#line 372 "VBNET.ATG" +#line 372 "vbnet.atg" INode node = new NamespaceDeclaration(qualident); node.StartLocation = startPos; AddChild(node); @@ -266,67 +266,67 @@ out qualident); EndOfStmt(); NamespaceBody(); -#line 380 "VBNET.ATG" +#line 380 "vbnet.atg" node.EndLocation = t.Location; BlockEnd(); } else if (StartOf(2)) { while (la.kind == 40) { AttributeSection( -#line 384 "VBNET.ATG" +#line 384 "vbnet.atg" out section); -#line 384 "VBNET.ATG" +#line 384 "vbnet.atg" attributes.Add(section); } while (StartOf(3)) { TypeModifier( -#line 385 "VBNET.ATG" +#line 385 "vbnet.atg" m); } NonModuleDeclaration( -#line 385 "VBNET.ATG" +#line 385 "vbnet.atg" m, attributes); } else SynErr(245); } void OptionValue( -#line 302 "VBNET.ATG" +#line 302 "vbnet.atg" ref bool val) { if (la.kind == 171) { lexer.NextToken(); -#line 304 "VBNET.ATG" +#line 304 "vbnet.atg" val = true; } else if (la.kind == 170) { lexer.NextToken(); -#line 306 "VBNET.ATG" +#line 306 "vbnet.atg" val = false; } else SynErr(246); } void ImportClause( -#line 335 "VBNET.ATG" +#line 335 "vbnet.atg" out Using u) { -#line 337 "VBNET.ATG" +#line 337 "vbnet.atg" string qualident = null; TypeReference aliasedType = null; u = null; if (StartOf(4)) { Qualident( -#line 342 "VBNET.ATG" +#line 342 "vbnet.atg" out qualident); if (la.kind == 20) { lexer.NextToken(); TypeName( -#line 343 "VBNET.ATG" +#line 343 "vbnet.atg" out aliasedType); } -#line 345 "VBNET.ATG" +#line 345 "vbnet.atg" if (qualident != null && qualident.Length > 0) { if (aliasedType != null) { u = new Using(qualident, aliasedType); @@ -337,64 +337,64 @@ out aliasedType); } else if (la.kind == 10) { -#line 353 "VBNET.ATG" +#line 353 "vbnet.atg" string prefix = null; lexer.NextToken(); Identifier(); -#line 354 "VBNET.ATG" +#line 354 "vbnet.atg" prefix = t.val; Expect(20); Expect(3); -#line 354 "VBNET.ATG" +#line 354 "vbnet.atg" u = new Using(t.literalValue as string, prefix); Expect(11); } else SynErr(247); } void Qualident( -#line 3617 "VBNET.ATG" +#line 3617 "vbnet.atg" out string qualident) { -#line 3619 "VBNET.ATG" +#line 3619 "vbnet.atg" string name; qualidentBuilder.Length = 0; Identifier(); -#line 3623 "VBNET.ATG" +#line 3623 "vbnet.atg" qualidentBuilder.Append(t.val); while ( -#line 3624 "VBNET.ATG" +#line 3624 "vbnet.atg" DotAndIdentOrKw()) { Expect(26); IdentifierOrKeyword( -#line 3624 "VBNET.ATG" +#line 3624 "vbnet.atg" out name); -#line 3624 "VBNET.ATG" +#line 3624 "vbnet.atg" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 3626 "VBNET.ATG" +#line 3626 "vbnet.atg" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 2688 "VBNET.ATG" +#line 2688 "vbnet.atg" out TypeReference typeref) { -#line 2689 "VBNET.ATG" +#line 2689 "vbnet.atg" ArrayList rank = null; Location startLocation = la.Location; NonArrayTypeName( -#line 2691 "VBNET.ATG" +#line 2691 "vbnet.atg" out typeref, false); ArrayTypeModifiers( -#line 2692 "VBNET.ATG" +#line 2692 "vbnet.atg" out rank); -#line 2694 "VBNET.ATG" +#line 2694 "vbnet.atg" if (typeref != null) { if (rank != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); @@ -429,10 +429,10 @@ out rank); } void AttributeSection( -#line 2895 "VBNET.ATG" +#line 2895 "vbnet.atg" out AttributeSection section) { -#line 2897 "VBNET.ATG" +#line 2897 "vbnet.atg" string attributeTarget = ""; List attributes = new List(); ASTAttribute attribute; @@ -440,22 +440,22 @@ out AttributeSection section) { Expect(40); if ( -#line 2903 "VBNET.ATG" +#line 2903 "vbnet.atg" IsLocalAttrTarget()) { if (la.kind == 119) { lexer.NextToken(); -#line 2904 "VBNET.ATG" +#line 2904 "vbnet.atg" attributeTarget = "event"; } else if (la.kind == 195) { lexer.NextToken(); -#line 2905 "VBNET.ATG" +#line 2905 "vbnet.atg" attributeTarget = "return"; } else { Identifier(); -#line 2908 "VBNET.ATG" +#line 2908 "vbnet.atg" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -468,20 +468,20 @@ IsLocalAttrTarget()) { Expect(21); } Attribute( -#line 2918 "VBNET.ATG" +#line 2918 "vbnet.atg" out attribute); -#line 2918 "VBNET.ATG" +#line 2918 "vbnet.atg" attributes.Add(attribute); while ( -#line 2919 "VBNET.ATG" +#line 2919 "vbnet.atg" NotFinalComma()) { Expect(22); Attribute( -#line 2919 "VBNET.ATG" +#line 2919 "vbnet.atg" out attribute); -#line 2919 "VBNET.ATG" +#line 2919 "vbnet.atg" attributes.Add(attribute); } if (la.kind == 22) { @@ -489,7 +489,7 @@ out attribute); } Expect(39); -#line 2923 "VBNET.ATG" +#line 2923 "vbnet.atg" section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -500,69 +500,69 @@ out attribute); } void TypeModifier( -#line 3702 "VBNET.ATG" +#line 3702 "vbnet.atg" ModifierList m) { switch (la.kind) { case 188: { lexer.NextToken(); -#line 3703 "VBNET.ATG" +#line 3703 "vbnet.atg" m.Add(Modifiers.Public, t.Location); break; } case 187: { lexer.NextToken(); -#line 3704 "VBNET.ATG" +#line 3704 "vbnet.atg" m.Add(Modifiers.Protected, t.Location); break; } case 125: { lexer.NextToken(); -#line 3705 "VBNET.ATG" +#line 3705 "vbnet.atg" m.Add(Modifiers.Internal, t.Location); break; } case 185: { lexer.NextToken(); -#line 3706 "VBNET.ATG" +#line 3706 "vbnet.atg" m.Add(Modifiers.Private, t.Location); break; } case 200: { lexer.NextToken(); -#line 3707 "VBNET.ATG" +#line 3707 "vbnet.atg" m.Add(Modifiers.Static, t.Location); break; } case 199: { lexer.NextToken(); -#line 3708 "VBNET.ATG" +#line 3708 "vbnet.atg" m.Add(Modifiers.New, t.Location); break; } case 156: { lexer.NextToken(); -#line 3709 "VBNET.ATG" +#line 3709 "vbnet.atg" m.Add(Modifiers.Abstract, t.Location); break; } case 166: { lexer.NextToken(); -#line 3710 "VBNET.ATG" +#line 3710 "vbnet.atg" m.Add(Modifiers.Sealed, t.Location); break; } case 183: { lexer.NextToken(); -#line 3711 "VBNET.ATG" +#line 3711 "vbnet.atg" m.Add(Modifiers.Partial, t.Location); break; } @@ -571,21 +571,21 @@ ModifierList m) { } void NonModuleDeclaration( -#line 455 "VBNET.ATG" +#line 455 "vbnet.atg" ModifierList m, List attributes) { -#line 457 "VBNET.ATG" +#line 457 "vbnet.atg" TypeReference typeRef = null; List baseInterfaces = null; switch (la.kind) { case 84: { -#line 460 "VBNET.ATG" +#line 460 "vbnet.atg" m.Check(Modifiers.Classes); lexer.NextToken(); -#line 463 "VBNET.ATG" +#line 463 "vbnet.atg" TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = t.Location; AddChild(newType); @@ -595,42 +595,42 @@ ModifierList m, List attributes) { Identifier(); -#line 470 "VBNET.ATG" +#line 470 "vbnet.atg" newType.Name = t.val; TypeParameterList( -#line 471 "VBNET.ATG" +#line 471 "vbnet.atg" newType.Templates); EndOfStmt(); -#line 473 "VBNET.ATG" +#line 473 "vbnet.atg" newType.BodyStartLocation = t.Location; if (la.kind == 140) { ClassBaseType( -#line 474 "VBNET.ATG" +#line 474 "vbnet.atg" out typeRef); -#line 474 "VBNET.ATG" +#line 474 "vbnet.atg" SafeAdd(newType, newType.BaseTypes, typeRef); } while (la.kind == 136) { TypeImplementsClause( -#line 475 "VBNET.ATG" +#line 475 "vbnet.atg" out baseInterfaces); -#line 475 "VBNET.ATG" +#line 475 "vbnet.atg" newType.BaseTypes.AddRange(baseInterfaces); } ClassBody( -#line 476 "VBNET.ATG" +#line 476 "vbnet.atg" newType); Expect(113); Expect(84); -#line 477 "VBNET.ATG" +#line 477 "vbnet.atg" newType.EndLocation = t.EndLocation; EndOfStmt(); -#line 480 "VBNET.ATG" +#line 480 "vbnet.atg" BlockEnd(); break; @@ -638,7 +638,7 @@ newType); case 155: { lexer.NextToken(); -#line 484 "VBNET.ATG" +#line 484 "vbnet.atg" m.Check(Modifiers.VBModules); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); AddChild(newType); @@ -648,17 +648,17 @@ newType); Identifier(); -#line 491 "VBNET.ATG" +#line 491 "vbnet.atg" newType.Name = t.val; EndOfStmt(); -#line 493 "VBNET.ATG" +#line 493 "vbnet.atg" newType.BodyStartLocation = t.Location; ModuleBody( -#line 494 "VBNET.ATG" +#line 494 "vbnet.atg" newType); -#line 496 "VBNET.ATG" +#line 496 "vbnet.atg" BlockEnd(); break; @@ -666,7 +666,7 @@ newType); case 209: { lexer.NextToken(); -#line 500 "VBNET.ATG" +#line 500 "vbnet.atg" m.Check(Modifiers.VBStructures); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); AddChild(newType); @@ -676,28 +676,28 @@ newType); Identifier(); -#line 507 "VBNET.ATG" +#line 507 "vbnet.atg" newType.Name = t.val; TypeParameterList( -#line 508 "VBNET.ATG" +#line 508 "vbnet.atg" newType.Templates); EndOfStmt(); -#line 510 "VBNET.ATG" +#line 510 "vbnet.atg" newType.BodyStartLocation = t.Location; while (la.kind == 136) { TypeImplementsClause( -#line 511 "VBNET.ATG" +#line 511 "vbnet.atg" out baseInterfaces); -#line 511 "VBNET.ATG" +#line 511 "vbnet.atg" newType.BaseTypes.AddRange(baseInterfaces); } StructureBody( -#line 512 "VBNET.ATG" +#line 512 "vbnet.atg" newType); -#line 514 "VBNET.ATG" +#line 514 "vbnet.atg" BlockEnd(); break; @@ -705,7 +705,7 @@ newType); case 115: { lexer.NextToken(); -#line 519 "VBNET.ATG" +#line 519 "vbnet.atg" m.Check(Modifiers.VBEnums); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = m.GetDeclarationLocation(t.Location); @@ -716,26 +716,26 @@ newType); Identifier(); -#line 527 "VBNET.ATG" +#line 527 "vbnet.atg" newType.Name = t.val; if (la.kind == 63) { lexer.NextToken(); NonArrayTypeName( -#line 528 "VBNET.ATG" +#line 528 "vbnet.atg" out typeRef, false); -#line 528 "VBNET.ATG" +#line 528 "vbnet.atg" SafeAdd(newType, newType.BaseTypes, typeRef); } EndOfStmt(); -#line 530 "VBNET.ATG" +#line 530 "vbnet.atg" newType.BodyStartLocation = t.Location; EnumBody( -#line 531 "VBNET.ATG" +#line 531 "vbnet.atg" newType); -#line 533 "VBNET.ATG" +#line 533 "vbnet.atg" BlockEnd(); break; @@ -743,7 +743,7 @@ newType); case 142: { lexer.NextToken(); -#line 538 "VBNET.ATG" +#line 538 "vbnet.atg" m.Check(Modifiers.VBInterfacs); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = m.GetDeclarationLocation(t.Location); @@ -753,28 +753,28 @@ newType); Identifier(); -#line 545 "VBNET.ATG" +#line 545 "vbnet.atg" newType.Name = t.val; TypeParameterList( -#line 546 "VBNET.ATG" +#line 546 "vbnet.atg" newType.Templates); EndOfStmt(); -#line 548 "VBNET.ATG" +#line 548 "vbnet.atg" newType.BodyStartLocation = t.Location; while (la.kind == 140) { InterfaceBase( -#line 549 "VBNET.ATG" +#line 549 "vbnet.atg" out baseInterfaces); -#line 549 "VBNET.ATG" +#line 549 "vbnet.atg" newType.BaseTypes.AddRange(baseInterfaces); } InterfaceBody( -#line 550 "VBNET.ATG" +#line 550 "vbnet.atg" newType); -#line 552 "VBNET.ATG" +#line 552 "vbnet.atg" BlockEnd(); break; @@ -782,7 +782,7 @@ newType); case 103: { lexer.NextToken(); -#line 557 "VBNET.ATG" +#line 557 "vbnet.atg" m.Check(Modifiers.VBDelegates); DelegateDeclaration delegateDeclr = new DelegateDeclaration(m.Modifier, attributes); delegateDeclr.ReturnType = new TypeReference("System.Void", true); @@ -793,63 +793,63 @@ newType); lexer.NextToken(); Identifier(); -#line 564 "VBNET.ATG" +#line 564 "vbnet.atg" delegateDeclr.Name = t.val; TypeParameterList( -#line 565 "VBNET.ATG" +#line 565 "vbnet.atg" delegateDeclr.Templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 566 "VBNET.ATG" +#line 566 "vbnet.atg" p); } Expect(38); -#line 566 "VBNET.ATG" +#line 566 "vbnet.atg" delegateDeclr.Parameters = p; } } else if (la.kind == 127) { lexer.NextToken(); Identifier(); -#line 568 "VBNET.ATG" +#line 568 "vbnet.atg" delegateDeclr.Name = t.val; TypeParameterList( -#line 569 "VBNET.ATG" +#line 569 "vbnet.atg" delegateDeclr.Templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 570 "VBNET.ATG" +#line 570 "vbnet.atg" p); } Expect(38); -#line 570 "VBNET.ATG" +#line 570 "vbnet.atg" delegateDeclr.Parameters = p; } if (la.kind == 63) { lexer.NextToken(); -#line 571 "VBNET.ATG" +#line 571 "vbnet.atg" TypeReference type; TypeName( -#line 571 "VBNET.ATG" +#line 571 "vbnet.atg" out type); -#line 571 "VBNET.ATG" +#line 571 "vbnet.atg" delegateDeclr.ReturnType = type; } } else SynErr(250); -#line 573 "VBNET.ATG" +#line 573 "vbnet.atg" delegateDeclr.EndLocation = t.EndLocation; EndOfStmt(); -#line 576 "VBNET.ATG" +#line 576 "vbnet.atg" AddChild(delegateDeclr); break; @@ -859,31 +859,31 @@ out type); } void TypeParameterList( -#line 389 "VBNET.ATG" +#line 389 "vbnet.atg" List templates) { -#line 391 "VBNET.ATG" +#line 391 "vbnet.atg" TemplateDefinition template; if ( -#line 395 "VBNET.ATG" +#line 395 "vbnet.atg" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); TypeParameter( -#line 396 "VBNET.ATG" +#line 396 "vbnet.atg" out template); -#line 398 "VBNET.ATG" +#line 398 "vbnet.atg" if (template != null) templates.Add(template); while (la.kind == 22) { lexer.NextToken(); TypeParameter( -#line 401 "VBNET.ATG" +#line 401 "vbnet.atg" out template); -#line 403 "VBNET.ATG" +#line 403 "vbnet.atg" if (template != null) templates.Add(template); } @@ -892,35 +892,35 @@ out template); } void TypeParameter( -#line 411 "VBNET.ATG" +#line 411 "vbnet.atg" out TemplateDefinition template) { -#line 412 "VBNET.ATG" +#line 412 "vbnet.atg" VarianceModifier modifier = VarianceModifier.Invariant; Location startLocation = la.Location; if (la.kind == 138 || la.kind == 178) { if (la.kind == 138) { lexer.NextToken(); -#line 415 "VBNET.ATG" +#line 415 "vbnet.atg" modifier = VarianceModifier.Contravariant; } else { lexer.NextToken(); -#line 415 "VBNET.ATG" +#line 415 "vbnet.atg" modifier = VarianceModifier.Covariant; } } Identifier(); -#line 415 "VBNET.ATG" +#line 415 "vbnet.atg" template = new TemplateDefinition(t.val, null) { VarianceModifier = modifier }; if (la.kind == 63) { TypeParameterConstraints( -#line 416 "VBNET.ATG" +#line 416 "vbnet.atg" template); } -#line 419 "VBNET.ATG" +#line 419 "vbnet.atg" if (template != null) { template.StartLocation = startLocation; template.EndLocation = t.EndLocation; @@ -929,141 +929,141 @@ template); } void TypeParameterConstraints( -#line 427 "VBNET.ATG" +#line 427 "vbnet.atg" TemplateDefinition template) { -#line 429 "VBNET.ATG" +#line 429 "vbnet.atg" TypeReference constraint; Expect(63); if (la.kind == 35) { lexer.NextToken(); TypeParameterConstraint( -#line 435 "VBNET.ATG" +#line 435 "vbnet.atg" out constraint); -#line 435 "VBNET.ATG" +#line 435 "vbnet.atg" if (constraint != null) { template.Bases.Add(constraint); } while (la.kind == 22) { lexer.NextToken(); TypeParameterConstraint( -#line 438 "VBNET.ATG" +#line 438 "vbnet.atg" out constraint); -#line 438 "VBNET.ATG" +#line 438 "vbnet.atg" if (constraint != null) { template.Bases.Add(constraint); } } Expect(36); } else if (StartOf(7)) { TypeParameterConstraint( -#line 441 "VBNET.ATG" +#line 441 "vbnet.atg" out constraint); -#line 441 "VBNET.ATG" +#line 441 "vbnet.atg" if (constraint != null) { template.Bases.Add(constraint); } } else SynErr(252); } void TypeParameterConstraint( -#line 445 "VBNET.ATG" +#line 445 "vbnet.atg" out TypeReference constraint) { -#line 446 "VBNET.ATG" +#line 446 "vbnet.atg" constraint = null; Location startLocation = la.Location; if (la.kind == 84) { lexer.NextToken(); -#line 448 "VBNET.ATG" +#line 448 "vbnet.atg" constraint = TypeReference.ClassConstraint; } else if (la.kind == 209) { lexer.NextToken(); -#line 449 "VBNET.ATG" +#line 449 "vbnet.atg" constraint = TypeReference.StructConstraint; } else if (la.kind == 162) { lexer.NextToken(); -#line 450 "VBNET.ATG" +#line 450 "vbnet.atg" constraint = TypeReference.NewConstraint; } else if (StartOf(8)) { TypeName( -#line 451 "VBNET.ATG" +#line 451 "vbnet.atg" out constraint); } else SynErr(253); } void ClassBaseType( -#line 797 "VBNET.ATG" +#line 797 "vbnet.atg" out TypeReference typeRef) { -#line 799 "VBNET.ATG" +#line 799 "vbnet.atg" typeRef = null; Expect(140); TypeName( -#line 802 "VBNET.ATG" +#line 802 "vbnet.atg" out typeRef); EndOfStmt(); } void TypeImplementsClause( -#line 1617 "VBNET.ATG" +#line 1617 "vbnet.atg" out List baseInterfaces) { -#line 1619 "VBNET.ATG" +#line 1619 "vbnet.atg" baseInterfaces = new List(); TypeReference type = null; Expect(136); TypeName( -#line 1622 "VBNET.ATG" +#line 1622 "vbnet.atg" out type); -#line 1624 "VBNET.ATG" +#line 1624 "vbnet.atg" if (type != null) baseInterfaces.Add(type); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 1627 "VBNET.ATG" +#line 1627 "vbnet.atg" out type); -#line 1628 "VBNET.ATG" +#line 1628 "vbnet.atg" if (type != null) baseInterfaces.Add(type); } EndOfStmt(); } void ClassBody( -#line 590 "VBNET.ATG" +#line 590 "vbnet.atg" TypeDeclaration newType) { -#line 591 "VBNET.ATG" +#line 591 "vbnet.atg" AttributeSection section; while (la.kind == 1 || la.kind == 21) { EndOfStmt(); } while (StartOf(9)) { -#line 594 "VBNET.ATG" +#line 594 "vbnet.atg" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 40) { AttributeSection( -#line 597 "VBNET.ATG" +#line 597 "vbnet.atg" out section); -#line 597 "VBNET.ATG" +#line 597 "vbnet.atg" attributes.Add(section); } while (StartOf(10)) { MemberModifier( -#line 598 "VBNET.ATG" +#line 598 "vbnet.atg" m); } ClassMemberDecl( -#line 599 "VBNET.ATG" +#line 599 "vbnet.atg" m, attributes); while (la.kind == 1 || la.kind == 21) { EndOfStmt(); @@ -1072,35 +1072,35 @@ m, attributes); } void ModuleBody( -#line 621 "VBNET.ATG" +#line 621 "vbnet.atg" TypeDeclaration newType) { -#line 622 "VBNET.ATG" +#line 622 "vbnet.atg" AttributeSection section; while (la.kind == 1 || la.kind == 21) { EndOfStmt(); } while (StartOf(9)) { -#line 625 "VBNET.ATG" +#line 625 "vbnet.atg" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 40) { AttributeSection( -#line 628 "VBNET.ATG" +#line 628 "vbnet.atg" out section); -#line 628 "VBNET.ATG" +#line 628 "vbnet.atg" attributes.Add(section); } while (StartOf(10)) { MemberModifier( -#line 629 "VBNET.ATG" +#line 629 "vbnet.atg" m); } ClassMemberDecl( -#line 630 "VBNET.ATG" +#line 630 "vbnet.atg" m, attributes); while (la.kind == 1 || la.kind == 21) { EndOfStmt(); @@ -1109,41 +1109,41 @@ m, attributes); Expect(113); Expect(155); -#line 633 "VBNET.ATG" +#line 633 "vbnet.atg" newType.EndLocation = t.EndLocation; EndOfStmt(); } void StructureBody( -#line 604 "VBNET.ATG" +#line 604 "vbnet.atg" TypeDeclaration newType) { -#line 605 "VBNET.ATG" +#line 605 "vbnet.atg" AttributeSection section; while (la.kind == 1 || la.kind == 21) { EndOfStmt(); } while (StartOf(9)) { -#line 608 "VBNET.ATG" +#line 608 "vbnet.atg" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 40) { AttributeSection( -#line 611 "VBNET.ATG" +#line 611 "vbnet.atg" out section); -#line 611 "VBNET.ATG" +#line 611 "vbnet.atg" attributes.Add(section); } while (StartOf(10)) { MemberModifier( -#line 612 "VBNET.ATG" +#line 612 "vbnet.atg" m); } StructureMemberDecl( -#line 613 "VBNET.ATG" +#line 613 "vbnet.atg" m, attributes); while (la.kind == 1 || la.kind == 21) { EndOfStmt(); @@ -1152,16 +1152,16 @@ m, attributes); Expect(113); Expect(209); -#line 616 "VBNET.ATG" +#line 616 "vbnet.atg" newType.EndLocation = t.EndLocation; EndOfStmt(); } void NonArrayTypeName( -#line 2716 "VBNET.ATG" +#line 2716 "vbnet.atg" out TypeReference typeref, bool canBeUnbound) { -#line 2718 "VBNET.ATG" +#line 2718 "vbnet.atg" string name; typeref = null; bool isGlobal = false; @@ -1171,36 +1171,36 @@ out TypeReference typeref, bool canBeUnbound) { lexer.NextToken(); Expect(26); -#line 2723 "VBNET.ATG" +#line 2723 "vbnet.atg" isGlobal = true; } QualIdentAndTypeArguments( -#line 2724 "VBNET.ATG" +#line 2724 "vbnet.atg" out typeref, canBeUnbound); -#line 2725 "VBNET.ATG" +#line 2725 "vbnet.atg" typeref.IsGlobal = isGlobal; while (la.kind == 26) { lexer.NextToken(); -#line 2726 "VBNET.ATG" +#line 2726 "vbnet.atg" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 2727 "VBNET.ATG" +#line 2727 "vbnet.atg" out nestedTypeRef, canBeUnbound); -#line 2728 "VBNET.ATG" +#line 2728 "vbnet.atg" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 168) { lexer.NextToken(); -#line 2731 "VBNET.ATG" +#line 2731 "vbnet.atg" typeref = new TypeReference("System.Object", true); if (la.kind == 33) { lexer.NextToken(); -#line 2735 "VBNET.ATG" +#line 2735 "vbnet.atg" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1208,15 +1208,15 @@ out nestedTypeRef, canBeUnbound); } } else if (StartOf(12)) { PrimitiveTypeName( -#line 2741 "VBNET.ATG" +#line 2741 "vbnet.atg" out name); -#line 2741 "VBNET.ATG" +#line 2741 "vbnet.atg" typeref = new TypeReference(name, true); if (la.kind == 33) { lexer.NextToken(); -#line 2745 "VBNET.ATG" +#line 2745 "vbnet.atg" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1226,20 +1226,20 @@ out name); } void EnumBody( -#line 637 "VBNET.ATG" +#line 637 "vbnet.atg" TypeDeclaration newType) { -#line 638 "VBNET.ATG" +#line 638 "vbnet.atg" FieldDeclaration f; while (la.kind == 1 || la.kind == 21) { EndOfStmt(); } while (StartOf(13)) { EnumMemberDecl( -#line 641 "VBNET.ATG" +#line 641 "vbnet.atg" out f); -#line 643 "VBNET.ATG" +#line 643 "vbnet.atg" AddChild(f); while (la.kind == 1 || la.kind == 21) { @@ -1249,40 +1249,40 @@ out f); Expect(113); Expect(115); -#line 647 "VBNET.ATG" +#line 647 "vbnet.atg" newType.EndLocation = t.EndLocation; EndOfStmt(); } void InterfaceBase( -#line 1602 "VBNET.ATG" +#line 1602 "vbnet.atg" out List bases) { -#line 1604 "VBNET.ATG" +#line 1604 "vbnet.atg" TypeReference type; bases = new List(); Expect(140); TypeName( -#line 1608 "VBNET.ATG" +#line 1608 "vbnet.atg" out type); -#line 1608 "VBNET.ATG" +#line 1608 "vbnet.atg" if (type != null) bases.Add(type); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 1611 "VBNET.ATG" +#line 1611 "vbnet.atg" out type); -#line 1611 "VBNET.ATG" +#line 1611 "vbnet.atg" if (type != null) bases.Add(type); } EndOfStmt(); } void InterfaceBody( -#line 651 "VBNET.ATG" +#line 651 "vbnet.atg" TypeDeclaration newType) { while (la.kind == 1 || la.kind == 21) { EndOfStmt(); @@ -1296,168 +1296,168 @@ TypeDeclaration newType) { Expect(113); Expect(142); -#line 657 "VBNET.ATG" +#line 657 "vbnet.atg" newType.EndLocation = t.EndLocation; EndOfStmt(); } void FormalParameterList( -#line 2933 "VBNET.ATG" +#line 2933 "vbnet.atg" List parameter) { -#line 2934 "VBNET.ATG" +#line 2934 "vbnet.atg" ParameterDeclarationExpression p; FormalParameter( -#line 2936 "VBNET.ATG" +#line 2936 "vbnet.atg" out p); -#line 2936 "VBNET.ATG" +#line 2936 "vbnet.atg" if (p != null) parameter.Add(p); while (la.kind == 22) { lexer.NextToken(); FormalParameter( -#line 2938 "VBNET.ATG" +#line 2938 "vbnet.atg" out p); -#line 2938 "VBNET.ATG" +#line 2938 "vbnet.atg" if (p != null) parameter.Add(p); } } void MemberModifier( -#line 3714 "VBNET.ATG" +#line 3714 "vbnet.atg" ModifierList m) { switch (la.kind) { case 156: { lexer.NextToken(); -#line 3715 "VBNET.ATG" +#line 3715 "vbnet.atg" m.Add(Modifiers.Abstract, t.Location); break; } case 102: { lexer.NextToken(); -#line 3716 "VBNET.ATG" +#line 3716 "vbnet.atg" m.Add(Modifiers.Default, t.Location); break; } case 125: { lexer.NextToken(); -#line 3717 "VBNET.ATG" +#line 3717 "vbnet.atg" m.Add(Modifiers.Internal, t.Location); break; } case 199: { lexer.NextToken(); -#line 3718 "VBNET.ATG" +#line 3718 "vbnet.atg" m.Add(Modifiers.New, t.Location); break; } case 181: { lexer.NextToken(); -#line 3719 "VBNET.ATG" +#line 3719 "vbnet.atg" m.Add(Modifiers.Override, t.Location); break; } case 157: { lexer.NextToken(); -#line 3720 "VBNET.ATG" +#line 3720 "vbnet.atg" m.Add(Modifiers.Abstract, t.Location); break; } case 185: { lexer.NextToken(); -#line 3721 "VBNET.ATG" +#line 3721 "vbnet.atg" m.Add(Modifiers.Private, t.Location); break; } case 187: { lexer.NextToken(); -#line 3722 "VBNET.ATG" +#line 3722 "vbnet.atg" m.Add(Modifiers.Protected, t.Location); break; } case 188: { lexer.NextToken(); -#line 3723 "VBNET.ATG" +#line 3723 "vbnet.atg" m.Add(Modifiers.Public, t.Location); break; } case 166: { lexer.NextToken(); -#line 3724 "VBNET.ATG" +#line 3724 "vbnet.atg" m.Add(Modifiers.Sealed, t.Location); break; } case 167: { lexer.NextToken(); -#line 3725 "VBNET.ATG" +#line 3725 "vbnet.atg" m.Add(Modifiers.Sealed, t.Location); break; } case 200: { lexer.NextToken(); -#line 3726 "VBNET.ATG" +#line 3726 "vbnet.atg" m.Add(Modifiers.Static, t.Location); break; } case 180: { lexer.NextToken(); -#line 3727 "VBNET.ATG" +#line 3727 "vbnet.atg" m.Add(Modifiers.Virtual, t.Location); break; } case 179: { lexer.NextToken(); -#line 3728 "VBNET.ATG" +#line 3728 "vbnet.atg" m.Add(Modifiers.Overloads, t.Location); break; } case 190: { lexer.NextToken(); -#line 3729 "VBNET.ATG" +#line 3729 "vbnet.atg" m.Add(Modifiers.ReadOnly, t.Location); break; } case 235: { lexer.NextToken(); -#line 3730 "VBNET.ATG" +#line 3730 "vbnet.atg" m.Add(Modifiers.WriteOnly, t.Location); break; } case 234: { lexer.NextToken(); -#line 3731 "VBNET.ATG" +#line 3731 "vbnet.atg" m.Add(Modifiers.WithEvents, t.Location); break; } case 105: { lexer.NextToken(); -#line 3732 "VBNET.ATG" +#line 3732 "vbnet.atg" m.Add(Modifiers.Dim, t.Location); break; } case 183: { lexer.NextToken(); -#line 3733 "VBNET.ATG" +#line 3733 "vbnet.atg" m.Add(Modifiers.Partial, t.Location); break; } @@ -1466,18 +1466,18 @@ ModifierList m) { } void ClassMemberDecl( -#line 793 "VBNET.ATG" +#line 793 "vbnet.atg" ModifierList m, List attributes) { StructureMemberDecl( -#line 794 "VBNET.ATG" +#line 794 "vbnet.atg" m, attributes); } void StructureMemberDecl( -#line 807 "VBNET.ATG" +#line 807 "vbnet.atg" ModifierList m, List attributes) { -#line 809 "VBNET.ATG" +#line 809 "vbnet.atg" TypeReference type = null; List p = new List(); Statement stmt = null; @@ -1487,37 +1487,37 @@ ModifierList m, List attributes) { switch (la.kind) { case 84: case 103: case 115: case 142: case 155: case 209: { NonModuleDeclaration( -#line 816 "VBNET.ATG" +#line 816 "vbnet.atg" m, attributes); break; } case 210: { lexer.NextToken(); -#line 820 "VBNET.ATG" +#line 820 "vbnet.atg" Location startPos = t.Location; if (StartOf(4)) { -#line 824 "VBNET.ATG" +#line 824 "vbnet.atg" string name = String.Empty; MethodDeclaration methodDeclaration; List handlesClause = null; List implementsClause = null; Identifier(); -#line 830 "VBNET.ATG" +#line 830 "vbnet.atg" name = t.val; m.Check(Modifiers.VBMethods); TypeParameterList( -#line 833 "VBNET.ATG" +#line 833 "vbnet.atg" templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 834 "VBNET.ATG" +#line 834 "vbnet.atg" p); } Expect(38); @@ -1525,23 +1525,23 @@ p); if (la.kind == 134 || la.kind == 136) { if (la.kind == 136) { ImplementsClause( -#line 837 "VBNET.ATG" +#line 837 "vbnet.atg" out implementsClause); } else { HandlesClause( -#line 839 "VBNET.ATG" +#line 839 "vbnet.atg" out handlesClause); } } -#line 842 "VBNET.ATG" +#line 842 "vbnet.atg" Location endLocation = t.EndLocation; if ( -#line 845 "VBNET.ATG" +#line 845 "vbnet.atg" IsMustOverride(m)) { EndOfStmt(); -#line 848 "VBNET.ATG" +#line 848 "vbnet.atg" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, Parameters = p, Attributes = attributes, StartLocation = m.GetDeclarationLocation(startPos), EndLocation = endLocation, @@ -1555,7 +1555,7 @@ IsMustOverride(m)) { } else if (la.kind == 1) { lexer.NextToken(); -#line 861 "VBNET.ATG" +#line 861 "vbnet.atg" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, Parameters = p, Attributes = attributes, StartLocation = m.GetDeclarationLocation(startPos), EndLocation = endLocation, @@ -1567,25 +1567,25 @@ IsMustOverride(m)) { AddChild(methodDeclaration); -#line 872 "VBNET.ATG" +#line 872 "vbnet.atg" if (ParseMethodBodies) { Block( -#line 873 "VBNET.ATG" +#line 873 "vbnet.atg" out stmt); Expect(113); Expect(210); -#line 875 "VBNET.ATG" +#line 875 "vbnet.atg" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 881 "VBNET.ATG" +#line 881 "vbnet.atg" methodDeclaration.Body = (BlockStatement)stmt; -#line 882 "VBNET.ATG" +#line 882 "vbnet.atg" methodDeclaration.Body.EndLocation = t.EndLocation; EndOfStmt(); } else SynErr(256); @@ -1595,39 +1595,39 @@ out stmt); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 886 "VBNET.ATG" +#line 886 "vbnet.atg" p); } Expect(38); } -#line 887 "VBNET.ATG" +#line 887 "vbnet.atg" m.Check(Modifiers.Constructors); -#line 888 "VBNET.ATG" +#line 888 "vbnet.atg" Location constructorEndLocation = t.EndLocation; Expect(1); -#line 891 "VBNET.ATG" +#line 891 "vbnet.atg" if (ParseMethodBodies) { Block( -#line 892 "VBNET.ATG" +#line 892 "vbnet.atg" out stmt); Expect(113); Expect(210); -#line 894 "VBNET.ATG" +#line 894 "vbnet.atg" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 900 "VBNET.ATG" +#line 900 "vbnet.atg" Location endLocation = t.EndLocation; EndOfStmt(); -#line 903 "VBNET.ATG" +#line 903 "vbnet.atg" ConstructorDeclaration cd = new ConstructorDeclaration("New", m.Modifier, p, attributes); cd.StartLocation = m.GetDeclarationLocation(startPos); cd.EndLocation = constructorEndLocation; @@ -1641,7 +1641,7 @@ out stmt); case 127: { lexer.NextToken(); -#line 915 "VBNET.ATG" +#line 915 "vbnet.atg" m.Check(Modifiers.VBMethods); string name = String.Empty; Location startPos = t.Location; @@ -1651,16 +1651,16 @@ out stmt); Identifier(); -#line 922 "VBNET.ATG" +#line 922 "vbnet.atg" name = t.val; TypeParameterList( -#line 923 "VBNET.ATG" +#line 923 "vbnet.atg" templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 924 "VBNET.ATG" +#line 924 "vbnet.atg" p); } Expect(38); @@ -1669,10 +1669,10 @@ p); lexer.NextToken(); while (la.kind == 40) { AttributeSection( -#line 926 "VBNET.ATG" +#line 926 "vbnet.atg" out returnTypeAttributeSection); -#line 928 "VBNET.ATG" +#line 928 "vbnet.atg" if (returnTypeAttributeSection != null) { returnTypeAttributeSection.AttributeTarget = "return"; attributes.Add(returnTypeAttributeSection); @@ -1680,11 +1680,11 @@ out returnTypeAttributeSection); } TypeName( -#line 934 "VBNET.ATG" +#line 934 "vbnet.atg" out type); } -#line 936 "VBNET.ATG" +#line 936 "vbnet.atg" if(type == null) { type = new TypeReference("System.Object", true); } @@ -1692,23 +1692,23 @@ out type); if (la.kind == 134 || la.kind == 136) { if (la.kind == 136) { ImplementsClause( -#line 942 "VBNET.ATG" +#line 942 "vbnet.atg" out implementsClause); } else { HandlesClause( -#line 944 "VBNET.ATG" +#line 944 "vbnet.atg" out handlesClause); } } -#line 947 "VBNET.ATG" +#line 947 "vbnet.atg" Location endLocation = t.EndLocation; if ( -#line 950 "VBNET.ATG" +#line 950 "vbnet.atg" IsMustOverride(m)) { EndOfStmt(); -#line 953 "VBNET.ATG" +#line 953 "vbnet.atg" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1724,7 +1724,7 @@ IsMustOverride(m)) { } else if (la.kind == 1) { lexer.NextToken(); -#line 968 "VBNET.ATG" +#line 968 "vbnet.atg" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1739,12 +1739,12 @@ IsMustOverride(m)) { if (ParseMethodBodies) { Block( -#line 981 "VBNET.ATG" +#line 981 "vbnet.atg" out stmt); Expect(113); Expect(127); -#line 983 "VBNET.ATG" +#line 983 "vbnet.atg" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Function); stmt = new BlockStatement(); @@ -1760,7 +1760,7 @@ out stmt); case 101: { lexer.NextToken(); -#line 997 "VBNET.ATG" +#line 997 "vbnet.atg" m.Check(Modifiers.VBExternalMethods); Location startPos = t.Location; CharsetModifier charsetModifer = CharsetModifier.None; @@ -1770,39 +1770,39 @@ out stmt); if (StartOf(15)) { Charset( -#line 1004 "VBNET.ATG" +#line 1004 "vbnet.atg" out charsetModifer); } if (la.kind == 210) { lexer.NextToken(); Identifier(); -#line 1007 "VBNET.ATG" +#line 1007 "vbnet.atg" name = t.val; Expect(149); Expect(3); -#line 1008 "VBNET.ATG" +#line 1008 "vbnet.atg" library = t.literalValue as string; if (la.kind == 59) { lexer.NextToken(); Expect(3); -#line 1009 "VBNET.ATG" +#line 1009 "vbnet.atg" alias = t.literalValue as string; } if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1010 "VBNET.ATG" +#line 1010 "vbnet.atg" p); } Expect(38); } EndOfStmt(); -#line 1013 "VBNET.ATG" +#line 1013 "vbnet.atg" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, null, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -1812,25 +1812,25 @@ p); lexer.NextToken(); Identifier(); -#line 1020 "VBNET.ATG" +#line 1020 "vbnet.atg" name = t.val; Expect(149); Expect(3); -#line 1021 "VBNET.ATG" +#line 1021 "vbnet.atg" library = t.literalValue as string; if (la.kind == 59) { lexer.NextToken(); Expect(3); -#line 1022 "VBNET.ATG" +#line 1022 "vbnet.atg" alias = t.literalValue as string; } if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1023 "VBNET.ATG" +#line 1023 "vbnet.atg" p); } Expect(38); @@ -1838,12 +1838,12 @@ p); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1024 "VBNET.ATG" +#line 1024 "vbnet.atg" out type); } EndOfStmt(); -#line 1027 "VBNET.ATG" +#line 1027 "vbnet.atg" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, type, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -1855,7 +1855,7 @@ out type); case 119: { lexer.NextToken(); -#line 1037 "VBNET.ATG" +#line 1037 "vbnet.atg" m.Check(Modifiers.VBEvents); Location startPos = t.Location; EventDeclaration eventDeclaration; @@ -1864,19 +1864,19 @@ out type); Identifier(); -#line 1043 "VBNET.ATG" +#line 1043 "vbnet.atg" name= t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1045 "VBNET.ATG" +#line 1045 "vbnet.atg" out type); } else if (StartOf(16)) { if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1047 "VBNET.ATG" +#line 1047 "vbnet.atg" p); } Expect(38); @@ -1884,11 +1884,11 @@ p); } else SynErr(260); if (la.kind == 136) { ImplementsClause( -#line 1049 "VBNET.ATG" +#line 1049 "vbnet.atg" out implementsClause); } -#line 1051 "VBNET.ATG" +#line 1051 "vbnet.atg" eventDeclaration = new EventDeclaration { Name = name, TypeReference = type, Modifier = m.Modifier, Parameters = p, Attributes = attributes, InterfaceImplementations = implementsClause, @@ -1902,29 +1902,29 @@ out implementsClause); } case 2: case 58: case 62: case 64: case 65: case 66: case 67: case 70: case 87: case 104: case 107: case 116: case 121: case 126: case 133: case 139: case 143: case 146: case 147: case 170: case 176: case 178: case 184: case 203: case 212: case 213: case 223: case 224: case 230: { -#line 1062 "VBNET.ATG" +#line 1062 "vbnet.atg" m.Check(Modifiers.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, null, m.Modifier); IdentifierForFieldDeclaration(); -#line 1065 "VBNET.ATG" +#line 1065 "vbnet.atg" string name = t.val; -#line 1066 "VBNET.ATG" +#line 1066 "vbnet.atg" fd.StartLocation = m.GetDeclarationLocation(t.Location); VariableDeclaratorPartAfterIdentifier( -#line 1068 "VBNET.ATG" +#line 1068 "vbnet.atg" variableDeclarators, name); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 1069 "VBNET.ATG" +#line 1069 "vbnet.atg" variableDeclarators); } EndOfStmt(); -#line 1072 "VBNET.ATG" +#line 1072 "vbnet.atg" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; AddChild(fd); @@ -1933,35 +1933,35 @@ variableDeclarators); } case 88: { -#line 1077 "VBNET.ATG" +#line 1077 "vbnet.atg" m.Check(Modifiers.Fields); lexer.NextToken(); -#line 1078 "VBNET.ATG" +#line 1078 "vbnet.atg" m.Add(Modifiers.Const, t.Location); -#line 1080 "VBNET.ATG" +#line 1080 "vbnet.atg" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(t.Location); List constantDeclarators = new List(); ConstantDeclarator( -#line 1084 "VBNET.ATG" +#line 1084 "vbnet.atg" constantDeclarators); while (la.kind == 22) { lexer.NextToken(); ConstantDeclarator( -#line 1085 "VBNET.ATG" +#line 1085 "vbnet.atg" constantDeclarators); } -#line 1087 "VBNET.ATG" +#line 1087 "vbnet.atg" fd.Fields = constantDeclarators; fd.EndLocation = t.Location; EndOfStmt(); -#line 1092 "VBNET.ATG" +#line 1092 "vbnet.atg" fd.EndLocation = t.EndLocation; AddChild(fd); @@ -1970,7 +1970,7 @@ constantDeclarators); case 186: { lexer.NextToken(); -#line 1098 "VBNET.ATG" +#line 1098 "vbnet.atg" m.Check(Modifiers.VBProperties); Location startPos = t.Location; List implementsClause = null; @@ -1979,13 +1979,13 @@ constantDeclarators); Identifier(); -#line 1104 "VBNET.ATG" +#line 1104 "vbnet.atg" string propertyName = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1105 "VBNET.ATG" +#line 1105 "vbnet.atg" p); } Expect(38); @@ -1994,10 +1994,10 @@ p); lexer.NextToken(); while (la.kind == 40) { AttributeSection( -#line 1108 "VBNET.ATG" +#line 1108 "vbnet.atg" out returnTypeAttributeSection); -#line 1110 "VBNET.ATG" +#line 1110 "vbnet.atg" if (returnTypeAttributeSection != null) { returnTypeAttributeSection.AttributeTarget = "return"; attributes.Add(returnTypeAttributeSection); @@ -2005,13 +2005,13 @@ out returnTypeAttributeSection); } if ( -#line 1117 "VBNET.ATG" +#line 1117 "vbnet.atg" IsNewExpression()) { ObjectCreateExpression( -#line 1117 "VBNET.ATG" +#line 1117 "vbnet.atg" out initializer); -#line 1119 "VBNET.ATG" +#line 1119 "vbnet.atg" if (initializer is ObjectCreateExpression) { type = ((ObjectCreateExpression)initializer).CreateType.Clone(); } else { @@ -2020,27 +2020,27 @@ out initializer); } else if (StartOf(8)) { TypeName( -#line 1126 "VBNET.ATG" +#line 1126 "vbnet.atg" out type); } else SynErr(261); } if (la.kind == 20) { lexer.NextToken(); Expr( -#line 1129 "VBNET.ATG" +#line 1129 "vbnet.atg" out initializer); } if (la.kind == 136) { ImplementsClause( -#line 1130 "VBNET.ATG" +#line 1130 "vbnet.atg" out implementsClause); } EndOfStmt(); if ( -#line 1134 "VBNET.ATG" +#line 1134 "vbnet.atg" IsMustOverride(m) || IsAutomaticProperty()) { -#line 1136 "VBNET.ATG" +#line 1136 "vbnet.atg" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2053,7 +2053,7 @@ IsMustOverride(m) || IsAutomaticProperty()) { } else if (StartOf(17)) { -#line 1148 "VBNET.ATG" +#line 1148 "vbnet.atg" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2065,13 +2065,13 @@ IsMustOverride(m) || IsAutomaticProperty()) { PropertySetRegion setRegion; AccessorDecls( -#line 1158 "VBNET.ATG" +#line 1158 "vbnet.atg" out getRegion, out setRegion); Expect(113); Expect(186); EndOfStmt(); -#line 1162 "VBNET.ATG" +#line 1162 "vbnet.atg" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.Location; // t = EndOfStmt; not "Property" @@ -2083,11 +2083,11 @@ out getRegion, out setRegion); case 98: { lexer.NextToken(); -#line 1169 "VBNET.ATG" +#line 1169 "vbnet.atg" Location startPos = t.Location; Expect(119); -#line 1171 "VBNET.ATG" +#line 1171 "vbnet.atg" m.Check(Modifiers.VBCustomEvents); EventAddRemoveRegion eventAccessorDeclaration; EventAddRegion addHandlerAccessorDeclaration = null; @@ -2097,24 +2097,24 @@ out getRegion, out setRegion); Identifier(); -#line 1178 "VBNET.ATG" +#line 1178 "vbnet.atg" string customEventName = t.val; Expect(63); TypeName( -#line 1179 "VBNET.ATG" +#line 1179 "vbnet.atg" out type); if (la.kind == 136) { ImplementsClause( -#line 1180 "VBNET.ATG" +#line 1180 "vbnet.atg" out implementsClause); } EndOfStmt(); while (StartOf(18)) { EventAccessorDeclaration( -#line 1183 "VBNET.ATG" +#line 1183 "vbnet.atg" out eventAccessorDeclaration); -#line 1185 "VBNET.ATG" +#line 1185 "vbnet.atg" if(eventAccessorDeclaration is EventAddRegion) { addHandlerAccessorDeclaration = (EventAddRegion)eventAccessorDeclaration; @@ -2133,7 +2133,7 @@ out eventAccessorDeclaration); Expect(119); EndOfStmt(); -#line 1201 "VBNET.ATG" +#line 1201 "vbnet.atg" if(addHandlerAccessorDeclaration == null) { Error("Need to provide AddHandler accessor."); @@ -2164,24 +2164,24 @@ out eventAccessorDeclaration); } case 161: case 172: case 232: { -#line 1227 "VBNET.ATG" +#line 1227 "vbnet.atg" ConversionType opConversionType = ConversionType.None; if (la.kind == 161 || la.kind == 232) { if (la.kind == 232) { lexer.NextToken(); -#line 1228 "VBNET.ATG" +#line 1228 "vbnet.atg" opConversionType = ConversionType.Implicit; } else { lexer.NextToken(); -#line 1229 "VBNET.ATG" +#line 1229 "vbnet.atg" opConversionType = ConversionType.Explicit; } } Expect(172); -#line 1232 "VBNET.ATG" +#line 1232 "vbnet.atg" m.Check(Modifiers.VBOperators); Location startPos = t.Location; TypeReference returnType = NullTypeReference.Instance; @@ -2192,57 +2192,57 @@ out eventAccessorDeclaration); List parameters = new List(); OverloadableOperator( -#line 1241 "VBNET.ATG" +#line 1241 "vbnet.atg" out operatorType); Expect(37); FormalParameter( -#line 1243 "VBNET.ATG" +#line 1243 "vbnet.atg" out param); -#line 1244 "VBNET.ATG" +#line 1244 "vbnet.atg" if (param != null) parameters.Add(param); if (la.kind == 22) { lexer.NextToken(); FormalParameter( -#line 1246 "VBNET.ATG" +#line 1246 "vbnet.atg" out param); -#line 1247 "VBNET.ATG" +#line 1247 "vbnet.atg" if (param != null) parameters.Add(param); } Expect(38); -#line 1250 "VBNET.ATG" +#line 1250 "vbnet.atg" Location endPos = t.EndLocation; if (la.kind == 63) { lexer.NextToken(); while (la.kind == 40) { AttributeSection( -#line 1251 "VBNET.ATG" +#line 1251 "vbnet.atg" out section); -#line 1252 "VBNET.ATG" +#line 1252 "vbnet.atg" if (section != null) { section.AttributeTarget = "return"; attributes.Add(section); } } TypeName( -#line 1256 "VBNET.ATG" +#line 1256 "vbnet.atg" out returnType); -#line 1256 "VBNET.ATG" +#line 1256 "vbnet.atg" endPos = t.EndLocation; } Expect(1); Block( -#line 1258 "VBNET.ATG" +#line 1258 "vbnet.atg" out stmt); Expect(113); Expect(172); EndOfStmt(); -#line 1260 "VBNET.ATG" +#line 1260 "vbnet.atg" OperatorDeclaration operatorDeclaration = new OperatorDeclaration { Modifier = m.Modifier, Attributes = attributes, @@ -2265,25 +2265,25 @@ out stmt); } void EnumMemberDecl( -#line 774 "VBNET.ATG" +#line 774 "vbnet.atg" out FieldDeclaration f) { -#line 776 "VBNET.ATG" +#line 776 "vbnet.atg" Expression expr = null;List attributes = new List(); AttributeSection section = null; VariableDeclaration varDecl = null; while (la.kind == 40) { AttributeSection( -#line 780 "VBNET.ATG" +#line 780 "vbnet.atg" out section); -#line 780 "VBNET.ATG" +#line 780 "vbnet.atg" attributes.Add(section); } Identifier(); -#line 783 "VBNET.ATG" +#line 783 "vbnet.atg" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2292,21 +2292,21 @@ out section); if (la.kind == 20) { lexer.NextToken(); Expr( -#line 788 "VBNET.ATG" +#line 788 "vbnet.atg" out expr); -#line 788 "VBNET.ATG" +#line 788 "vbnet.atg" varDecl.Initializer = expr; } -#line 789 "VBNET.ATG" +#line 789 "vbnet.atg" f.EndLocation = varDecl.EndLocation = t.EndLocation; EndOfStmt(); } void InterfaceMemberDecl() { -#line 665 "VBNET.ATG" +#line 665 "vbnet.atg" TypeReference type =null; List p = new List(); List templates = new List(); @@ -2318,33 +2318,33 @@ out expr); if (StartOf(19)) { while (la.kind == 40) { AttributeSection( -#line 673 "VBNET.ATG" +#line 673 "vbnet.atg" out section); -#line 673 "VBNET.ATG" +#line 673 "vbnet.atg" attributes.Add(section); } while (StartOf(10)) { MemberModifier( -#line 676 "VBNET.ATG" +#line 676 "vbnet.atg" mod); } if (la.kind == 119) { lexer.NextToken(); -#line 680 "VBNET.ATG" +#line 680 "vbnet.atg" mod.Check(Modifiers.VBInterfaceEvents); Location startLocation = t.Location; Identifier(); -#line 683 "VBNET.ATG" +#line 683 "vbnet.atg" name = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 684 "VBNET.ATG" +#line 684 "vbnet.atg" p); } Expect(38); @@ -2352,12 +2352,12 @@ p); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 685 "VBNET.ATG" +#line 685 "vbnet.atg" out type); } EndOfStmt(); -#line 688 "VBNET.ATG" +#line 688 "vbnet.atg" EventDeclaration ed = new EventDeclaration { Name = name, TypeReference = type, Modifier = mod.Modifier, Parameters = p, Attributes = attributes, @@ -2368,29 +2368,29 @@ out type); } else if (la.kind == 210) { lexer.NextToken(); -#line 698 "VBNET.ATG" +#line 698 "vbnet.atg" Location startLocation = t.Location; mod.Check(Modifiers.VBInterfaceMethods); Identifier(); -#line 701 "VBNET.ATG" +#line 701 "vbnet.atg" name = t.val; TypeParameterList( -#line 702 "VBNET.ATG" +#line 702 "vbnet.atg" templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 703 "VBNET.ATG" +#line 703 "vbnet.atg" p); } Expect(38); } EndOfStmt(); -#line 706 "VBNET.ATG" +#line 706 "vbnet.atg" MethodDeclaration md = new MethodDeclaration { Name = name, Modifier = mod.Modifier, @@ -2406,22 +2406,22 @@ p); } else if (la.kind == 127) { lexer.NextToken(); -#line 721 "VBNET.ATG" +#line 721 "vbnet.atg" mod.Check(Modifiers.VBInterfaceMethods); Location startLocation = t.Location; Identifier(); -#line 724 "VBNET.ATG" +#line 724 "vbnet.atg" name = t.val; TypeParameterList( -#line 725 "VBNET.ATG" +#line 725 "vbnet.atg" templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 726 "VBNET.ATG" +#line 726 "vbnet.atg" p); } Expect(38); @@ -2430,15 +2430,15 @@ p); lexer.NextToken(); while (la.kind == 40) { AttributeSection( -#line 727 "VBNET.ATG" +#line 727 "vbnet.atg" out returnTypeAttributeSection); } TypeName( -#line 727 "VBNET.ATG" +#line 727 "vbnet.atg" out type); } -#line 729 "VBNET.ATG" +#line 729 "vbnet.atg" if(type == null) { type = new TypeReference("System.Object", true); } @@ -2459,19 +2459,19 @@ out type); } else if (la.kind == 186) { lexer.NextToken(); -#line 749 "VBNET.ATG" +#line 749 "vbnet.atg" Location startLocation = t.Location; mod.Check(Modifiers.VBInterfaceProperties); Identifier(); -#line 752 "VBNET.ATG" +#line 752 "vbnet.atg" name = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 753 "VBNET.ATG" +#line 753 "vbnet.atg" p); } Expect(38); @@ -2479,18 +2479,18 @@ p); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 754 "VBNET.ATG" +#line 754 "vbnet.atg" out type); } -#line 756 "VBNET.ATG" +#line 756 "vbnet.atg" if(type == null) { type = new TypeReference("System.Object", true); } EndOfStmt(); -#line 762 "VBNET.ATG" +#line 762 "vbnet.atg" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod.Modifier, attributes); pd.Parameters = p; pd.EndLocation = t.EndLocation; @@ -2500,34 +2500,34 @@ out type); } else SynErr(264); } else if (StartOf(20)) { NonModuleDeclaration( -#line 770 "VBNET.ATG" +#line 770 "vbnet.atg" mod, attributes); } else SynErr(265); } void Expr( -#line 1661 "VBNET.ATG" +#line 1661 "vbnet.atg" out Expression expr) { -#line 1662 "VBNET.ATG" +#line 1662 "vbnet.atg" expr = null; Location startLocation = la.Location; if ( -#line 1665 "VBNET.ATG" +#line 1665 "vbnet.atg" IsQueryExpression() ) { QueryExpr( -#line 1666 "VBNET.ATG" +#line 1666 "vbnet.atg" out expr); } else if (la.kind == 127 || la.kind == 210) { LambdaExpr( -#line 1667 "VBNET.ATG" +#line 1667 "vbnet.atg" out expr); } else if (StartOf(21)) { DisjunctionExpr( -#line 1668 "VBNET.ATG" +#line 1668 "vbnet.atg" out expr); } else SynErr(266); -#line 1671 "VBNET.ATG" +#line 1671 "vbnet.atg" if (expr != null) { expr.StartLocation = startLocation; expr.EndLocation = t.EndLocation; @@ -2536,87 +2536,87 @@ out expr); } void ImplementsClause( -#line 1634 "VBNET.ATG" +#line 1634 "vbnet.atg" out List baseInterfaces) { -#line 1636 "VBNET.ATG" +#line 1636 "vbnet.atg" baseInterfaces = new List(); TypeReference type = null; string memberName = null; Expect(136); NonArrayTypeName( -#line 1641 "VBNET.ATG" +#line 1641 "vbnet.atg" out type, false); -#line 1642 "VBNET.ATG" +#line 1642 "vbnet.atg" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1643 "VBNET.ATG" +#line 1643 "vbnet.atg" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); while (la.kind == 22) { lexer.NextToken(); NonArrayTypeName( -#line 1645 "VBNET.ATG" +#line 1645 "vbnet.atg" out type, false); -#line 1646 "VBNET.ATG" +#line 1646 "vbnet.atg" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1647 "VBNET.ATG" +#line 1647 "vbnet.atg" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); } } void HandlesClause( -#line 1592 "VBNET.ATG" +#line 1592 "vbnet.atg" out List handlesClause) { -#line 1594 "VBNET.ATG" +#line 1594 "vbnet.atg" handlesClause = new List(); string name; Expect(134); EventMemberSpecifier( -#line 1597 "VBNET.ATG" +#line 1597 "vbnet.atg" out name); -#line 1597 "VBNET.ATG" +#line 1597 "vbnet.atg" if (name != null) handlesClause.Add(name); while (la.kind == 22) { lexer.NextToken(); EventMemberSpecifier( -#line 1598 "VBNET.ATG" +#line 1598 "vbnet.atg" out name); -#line 1598 "VBNET.ATG" +#line 1598 "vbnet.atg" if (name != null) handlesClause.Add(name); } } void Block( -#line 2981 "VBNET.ATG" +#line 2981 "vbnet.atg" out Statement stmt) { -#line 2984 "VBNET.ATG" +#line 2984 "vbnet.atg" BlockStatement blockStmt = new BlockStatement(); /* in snippet parsing mode, t might be null */ if (t != null) blockStmt.StartLocation = t.EndLocation; BlockStart(blockStmt); while (StartOf(22) || -#line 2990 "VBNET.ATG" +#line 2990 "vbnet.atg" IsEndStmtAhead()) { if ( -#line 2990 "VBNET.ATG" +#line 2990 "vbnet.atg" IsEndStmtAhead()) { -#line 2991 "VBNET.ATG" +#line 2991 "vbnet.atg" Token first = la; Expect(113); EndOfStmt(); -#line 2994 "VBNET.ATG" +#line 2994 "vbnet.atg" AddChild(new EndStatement() { StartLocation = first.Location, EndLocation = first.EndLocation } @@ -2628,7 +2628,7 @@ IsEndStmtAhead()) { } } -#line 3003 "VBNET.ATG" +#line 3003 "vbnet.atg" stmt = blockStmt; if (t != null) blockStmt.EndLocation = t.EndLocation; BlockEnd(); @@ -2636,26 +2636,26 @@ IsEndStmtAhead()) { } void Charset( -#line 1584 "VBNET.ATG" +#line 1584 "vbnet.atg" out CharsetModifier charsetModifier) { -#line 1585 "VBNET.ATG" +#line 1585 "vbnet.atg" charsetModifier = CharsetModifier.None; if (la.kind == 127 || la.kind == 210) { } else if (la.kind == 62) { lexer.NextToken(); -#line 1586 "VBNET.ATG" +#line 1586 "vbnet.atg" charsetModifier = CharsetModifier.Ansi; } else if (la.kind == 66) { lexer.NextToken(); -#line 1587 "VBNET.ATG" +#line 1587 "vbnet.atg" charsetModifier = CharsetModifier.Auto; } else if (la.kind == 223) { lexer.NextToken(); -#line 1588 "VBNET.ATG" +#line 1588 "vbnet.atg" charsetModifier = CharsetModifier.Unicode; } else SynErr(267); } @@ -2783,10 +2783,10 @@ out CharsetModifier charsetModifier) { } void VariableDeclaratorPartAfterIdentifier( -#line 1463 "VBNET.ATG" +#line 1463 "vbnet.atg" List fieldDeclaration, string name) { -#line 1465 "VBNET.ATG" +#line 1465 "vbnet.atg" Expression expr = null; TypeReference type = null; ArrayList rank = null; @@ -2794,28 +2794,28 @@ List fieldDeclaration, string name) { Location startLocation = t.Location; if ( -#line 1471 "VBNET.ATG" +#line 1471 "vbnet.atg" IsSize() && !IsDims()) { ArrayInitializationModifier( -#line 1471 "VBNET.ATG" +#line 1471 "vbnet.atg" out dimension); } if ( -#line 1472 "VBNET.ATG" +#line 1472 "vbnet.atg" IsDims()) { ArrayNameModifier( -#line 1472 "VBNET.ATG" +#line 1472 "vbnet.atg" out rank); } if ( -#line 1474 "VBNET.ATG" +#line 1474 "vbnet.atg" IsObjectCreation()) { Expect(63); ObjectCreateExpression( -#line 1474 "VBNET.ATG" +#line 1474 "vbnet.atg" out expr); -#line 1476 "VBNET.ATG" +#line 1476 "vbnet.atg" if (expr is ObjectCreateExpression) { type = ((ObjectCreateExpression)expr).CreateType.Clone(); } else { @@ -2826,10 +2826,10 @@ out expr); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1483 "VBNET.ATG" +#line 1483 "vbnet.atg" out type); -#line 1485 "VBNET.ATG" +#line 1485 "vbnet.atg" if (type != null) { for (int i = fieldDeclaration.Count - 1; i >= 0; i--) { VariableDeclaration vd = fieldDeclaration[i]; @@ -2842,7 +2842,7 @@ out type); } -#line 1497 "VBNET.ATG" +#line 1497 "vbnet.atg" if (type == null && (dimension != null || rank != null)) { type = new TypeReference(""); } @@ -2869,12 +2869,12 @@ out type); if (la.kind == 20) { lexer.NextToken(); Expr( -#line 1520 "VBNET.ATG" +#line 1520 "vbnet.atg" out expr); } } else SynErr(269); -#line 1523 "VBNET.ATG" +#line 1523 "vbnet.atg" VariableDeclaration varDecl = new VariableDeclaration(name, expr, type); varDecl.StartLocation = startLocation; varDecl.EndLocation = t.Location; @@ -2883,22 +2883,22 @@ out expr); } void VariableDeclarator( -#line 1457 "VBNET.ATG" +#line 1457 "vbnet.atg" List fieldDeclaration) { Identifier(); -#line 1459 "VBNET.ATG" +#line 1459 "vbnet.atg" string name = t.val; VariableDeclaratorPartAfterIdentifier( -#line 1460 "VBNET.ATG" +#line 1460 "vbnet.atg" fieldDeclaration, name); } void ConstantDeclarator( -#line 1438 "VBNET.ATG" +#line 1438 "vbnet.atg" List constantDeclaration) { -#line 1440 "VBNET.ATG" +#line 1440 "vbnet.atg" Expression expr = null; TypeReference type = null; string name = String.Empty; @@ -2906,20 +2906,20 @@ List constantDeclaration) { Identifier(); -#line 1445 "VBNET.ATG" +#line 1445 "vbnet.atg" name = t.val; location = t.Location; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1446 "VBNET.ATG" +#line 1446 "vbnet.atg" out type); } Expect(20); Expr( -#line 1447 "VBNET.ATG" +#line 1447 "vbnet.atg" out expr); -#line 1449 "VBNET.ATG" +#line 1449 "vbnet.atg" VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; f.StartLocation = location; @@ -2928,10 +2928,10 @@ out expr); } void ObjectCreateExpression( -#line 2123 "VBNET.ATG" +#line 2123 "vbnet.atg" out Expression oce) { -#line 2125 "VBNET.ATG" +#line 2125 "vbnet.atg" TypeReference type = null; CollectionInitializerExpression initializer = null; List arguments = null; @@ -2943,39 +2943,39 @@ out Expression oce) { Expect(162); if (StartOf(8)) { NonArrayTypeName( -#line 2134 "VBNET.ATG" +#line 2134 "vbnet.atg" out type, false); if (la.kind == 37) { lexer.NextToken(); NormalOrReDimArgumentList( -#line 2135 "VBNET.ATG" +#line 2135 "vbnet.atg" out arguments, out canBeNormal, out canBeReDim); Expect(38); if (la.kind == 35 || -#line 2136 "VBNET.ATG" +#line 2136 "vbnet.atg" la.kind == Tokens.OpenParenthesis) { if ( -#line 2136 "VBNET.ATG" +#line 2136 "vbnet.atg" la.kind == Tokens.OpenParenthesis) { ArrayTypeModifiers( -#line 2137 "VBNET.ATG" +#line 2137 "vbnet.atg" out dimensions); CollectionInitializer( -#line 2138 "VBNET.ATG" +#line 2138 "vbnet.atg" out initializer); } else { CollectionInitializer( -#line 2139 "VBNET.ATG" +#line 2139 "vbnet.atg" out initializer); } } -#line 2141 "VBNET.ATG" +#line 2141 "vbnet.atg" if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); } } -#line 2145 "VBNET.ATG" +#line 2145 "vbnet.atg" if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); } else { @@ -2990,53 +2990,53 @@ out initializer); if (la.kind == 126 || la.kind == 233) { if (la.kind == 233) { -#line 2160 "VBNET.ATG" +#line 2160 "vbnet.atg" MemberInitializerExpression memberInitializer = null; Expression anonymousMember = null; lexer.NextToken(); -#line 2165 "VBNET.ATG" +#line 2165 "vbnet.atg" CollectionInitializerExpression memberInitializers = new CollectionInitializerExpression(); memberInitializers.StartLocation = la.Location; Expect(35); if (la.kind == 26 || la.kind == 147) { MemberInitializer( -#line 2170 "VBNET.ATG" +#line 2170 "vbnet.atg" out memberInitializer); -#line 2171 "VBNET.ATG" +#line 2171 "vbnet.atg" memberInitializers.CreateExpressions.Add(memberInitializer); } else if (StartOf(24)) { Expr( -#line 2172 "VBNET.ATG" +#line 2172 "vbnet.atg" out anonymousMember); -#line 2173 "VBNET.ATG" +#line 2173 "vbnet.atg" memberInitializers.CreateExpressions.Add(anonymousMember); } else SynErr(270); while (la.kind == 22) { lexer.NextToken(); if (la.kind == 26 || la.kind == 147) { MemberInitializer( -#line 2177 "VBNET.ATG" +#line 2177 "vbnet.atg" out memberInitializer); -#line 2178 "VBNET.ATG" +#line 2178 "vbnet.atg" memberInitializers.CreateExpressions.Add(memberInitializer); } else if (StartOf(24)) { Expr( -#line 2179 "VBNET.ATG" +#line 2179 "vbnet.atg" out anonymousMember); -#line 2180 "VBNET.ATG" +#line 2180 "vbnet.atg" memberInitializers.CreateExpressions.Add(anonymousMember); } else SynErr(271); } Expect(36); -#line 2185 "VBNET.ATG" +#line 2185 "vbnet.atg" memberInitializers.EndLocation = t.Location; if(oce is ObjectCreateExpression) { @@ -3046,17 +3046,17 @@ out anonymousMember); } else { lexer.NextToken(); CollectionInitializer( -#line 2195 "VBNET.ATG" +#line 2195 "vbnet.atg" out initializer); -#line 2197 "VBNET.ATG" +#line 2197 "vbnet.atg" if(oce is ObjectCreateExpression) ((ObjectCreateExpression)oce).ObjectInitializer = initializer; } } -#line 2203 "VBNET.ATG" +#line 2203 "vbnet.atg" if (oce != null) { oce.StartLocation = startLocation; oce.EndLocation = t.EndLocation; @@ -3065,10 +3065,10 @@ out initializer); } void AccessorDecls( -#line 1372 "VBNET.ATG" +#line 1372 "vbnet.atg" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1374 "VBNET.ATG" +#line 1374 "vbnet.atg" List attributes = new List(); AttributeSection section; getBlock = null; @@ -3076,60 +3076,60 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 40) { AttributeSection( -#line 1379 "VBNET.ATG" +#line 1379 "vbnet.atg" out section); -#line 1379 "VBNET.ATG" +#line 1379 "vbnet.atg" attributes.Add(section); } if (StartOf(25)) { GetAccessorDecl( -#line 1381 "VBNET.ATG" +#line 1381 "vbnet.atg" out getBlock, attributes); if (StartOf(26)) { -#line 1383 "VBNET.ATG" +#line 1383 "vbnet.atg" attributes = new List(); while (la.kind == 40) { AttributeSection( -#line 1384 "VBNET.ATG" +#line 1384 "vbnet.atg" out section); -#line 1384 "VBNET.ATG" +#line 1384 "vbnet.atg" attributes.Add(section); } SetAccessorDecl( -#line 1385 "VBNET.ATG" +#line 1385 "vbnet.atg" out setBlock, attributes); } } else if (StartOf(27)) { SetAccessorDecl( -#line 1388 "VBNET.ATG" +#line 1388 "vbnet.atg" out setBlock, attributes); if (StartOf(28)) { -#line 1390 "VBNET.ATG" +#line 1390 "vbnet.atg" attributes = new List(); while (la.kind == 40) { AttributeSection( -#line 1391 "VBNET.ATG" +#line 1391 "vbnet.atg" out section); -#line 1391 "VBNET.ATG" +#line 1391 "vbnet.atg" attributes.Add(section); } GetAccessorDecl( -#line 1392 "VBNET.ATG" +#line 1392 "vbnet.atg" out getBlock, attributes); } } else SynErr(272); } void EventAccessorDeclaration( -#line 1335 "VBNET.ATG" +#line 1335 "vbnet.atg" out EventAddRemoveRegion eventAccessorDeclaration) { -#line 1337 "VBNET.ATG" +#line 1337 "vbnet.atg" Statement stmt = null; List p = new List(); AttributeSection section; @@ -3138,10 +3138,10 @@ out EventAddRemoveRegion eventAccessorDeclaration) { while (la.kind == 40) { AttributeSection( -#line 1343 "VBNET.ATG" +#line 1343 "vbnet.atg" out section); -#line 1343 "VBNET.ATG" +#line 1343 "vbnet.atg" attributes.Add(section); } if (la.kind == 56) { @@ -3150,20 +3150,20 @@ out section); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1345 "VBNET.ATG" +#line 1345 "vbnet.atg" p); } Expect(38); } Expect(1); Block( -#line 1346 "VBNET.ATG" +#line 1346 "vbnet.atg" out stmt); Expect(113); Expect(56); EndOfStmt(); -#line 1348 "VBNET.ATG" +#line 1348 "vbnet.atg" eventAccessorDeclaration = new EventAddRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3174,20 +3174,20 @@ out stmt); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1353 "VBNET.ATG" +#line 1353 "vbnet.atg" p); } Expect(38); } Expect(1); Block( -#line 1354 "VBNET.ATG" +#line 1354 "vbnet.atg" out stmt); Expect(113); Expect(193); EndOfStmt(); -#line 1356 "VBNET.ATG" +#line 1356 "vbnet.atg" eventAccessorDeclaration = new EventRemoveRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3198,20 +3198,20 @@ out stmt); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1361 "VBNET.ATG" +#line 1361 "vbnet.atg" p); } Expect(38); } Expect(1); Block( -#line 1362 "VBNET.ATG" +#line 1362 "vbnet.atg" out stmt); Expect(113); Expect(189); EndOfStmt(); -#line 1364 "VBNET.ATG" +#line 1364 "vbnet.atg" eventAccessorDeclaration = new EventRaiseRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3220,163 +3220,163 @@ out stmt); } void OverloadableOperator( -#line 1277 "VBNET.ATG" +#line 1277 "vbnet.atg" out OverloadableOperatorType operatorType) { -#line 1278 "VBNET.ATG" +#line 1278 "vbnet.atg" operatorType = OverloadableOperatorType.None; switch (la.kind) { case 31: { lexer.NextToken(); -#line 1280 "VBNET.ATG" +#line 1280 "vbnet.atg" operatorType = OverloadableOperatorType.Add; break; } case 30: { lexer.NextToken(); -#line 1282 "VBNET.ATG" +#line 1282 "vbnet.atg" operatorType = OverloadableOperatorType.Subtract; break; } case 34: { lexer.NextToken(); -#line 1284 "VBNET.ATG" +#line 1284 "vbnet.atg" operatorType = OverloadableOperatorType.Multiply; break; } case 24: { lexer.NextToken(); -#line 1286 "VBNET.ATG" +#line 1286 "vbnet.atg" operatorType = OverloadableOperatorType.Divide; break; } case 25: { lexer.NextToken(); -#line 1288 "VBNET.ATG" +#line 1288 "vbnet.atg" operatorType = OverloadableOperatorType.DivideInteger; break; } case 23: { lexer.NextToken(); -#line 1290 "VBNET.ATG" +#line 1290 "vbnet.atg" operatorType = OverloadableOperatorType.Concat; break; } case 150: { lexer.NextToken(); -#line 1292 "VBNET.ATG" +#line 1292 "vbnet.atg" operatorType = OverloadableOperatorType.Like; break; } case 154: { lexer.NextToken(); -#line 1294 "VBNET.ATG" +#line 1294 "vbnet.atg" operatorType = OverloadableOperatorType.Modulus; break; } case 60: { lexer.NextToken(); -#line 1296 "VBNET.ATG" +#line 1296 "vbnet.atg" operatorType = OverloadableOperatorType.BitwiseAnd; break; } case 175: { lexer.NextToken(); -#line 1298 "VBNET.ATG" +#line 1298 "vbnet.atg" operatorType = OverloadableOperatorType.BitwiseOr; break; } case 236: { lexer.NextToken(); -#line 1300 "VBNET.ATG" +#line 1300 "vbnet.atg" operatorType = OverloadableOperatorType.ExclusiveOr; break; } case 32: { lexer.NextToken(); -#line 1302 "VBNET.ATG" +#line 1302 "vbnet.atg" operatorType = OverloadableOperatorType.Power; break; } case 44: { lexer.NextToken(); -#line 1304 "VBNET.ATG" +#line 1304 "vbnet.atg" operatorType = OverloadableOperatorType.ShiftLeft; break; } case 45: { lexer.NextToken(); -#line 1306 "VBNET.ATG" +#line 1306 "vbnet.atg" operatorType = OverloadableOperatorType.ShiftRight; break; } case 20: { lexer.NextToken(); -#line 1308 "VBNET.ATG" +#line 1308 "vbnet.atg" operatorType = OverloadableOperatorType.Equality; break; } case 41: { lexer.NextToken(); -#line 1310 "VBNET.ATG" +#line 1310 "vbnet.atg" operatorType = OverloadableOperatorType.InEquality; break; } case 40: { lexer.NextToken(); -#line 1312 "VBNET.ATG" +#line 1312 "vbnet.atg" operatorType = OverloadableOperatorType.LessThan; break; } case 43: { lexer.NextToken(); -#line 1314 "VBNET.ATG" +#line 1314 "vbnet.atg" operatorType = OverloadableOperatorType.LessThanOrEqual; break; } case 39: { lexer.NextToken(); -#line 1316 "VBNET.ATG" +#line 1316 "vbnet.atg" operatorType = OverloadableOperatorType.GreaterThan; break; } case 42: { lexer.NextToken(); -#line 1318 "VBNET.ATG" +#line 1318 "vbnet.atg" operatorType = OverloadableOperatorType.GreaterThanOrEqual; break; } case 94: { lexer.NextToken(); -#line 1320 "VBNET.ATG" +#line 1320 "vbnet.atg" operatorType = OverloadableOperatorType.CType; break; } case 2: case 58: case 62: case 64: case 65: case 66: case 67: case 70: case 87: case 98: case 104: case 107: case 116: case 121: case 126: case 133: case 139: case 143: case 146: case 147: case 170: case 176: case 178: case 184: case 203: case 212: case 213: case 223: case 224: case 230: { Identifier(); -#line 1324 "VBNET.ATG" +#line 1324 "vbnet.atg" string opName = t.val; if (string.Equals(opName, "istrue", StringComparison.InvariantCultureIgnoreCase)) { operatorType = OverloadableOperatorType.IsTrue; @@ -3393,10 +3393,10 @@ out OverloadableOperatorType operatorType) { } void FormalParameter( -#line 2942 "VBNET.ATG" +#line 2942 "vbnet.atg" out ParameterDeclarationExpression p) { -#line 2944 "VBNET.ATG" +#line 2944 "vbnet.atg" AttributeSection section; List attributes = new List(); TypeReference type = null; @@ -3408,36 +3408,36 @@ out ParameterDeclarationExpression p) { while (la.kind == 40) { AttributeSection( -#line 2954 "VBNET.ATG" +#line 2954 "vbnet.atg" out section); -#line 2954 "VBNET.ATG" +#line 2954 "vbnet.atg" attributes.Add(section); } while (StartOf(29)) { ParameterModifier( -#line 2955 "VBNET.ATG" +#line 2955 "vbnet.atg" mod); } Identifier(); -#line 2956 "VBNET.ATG" +#line 2956 "vbnet.atg" string parameterName = t.val; if ( -#line 2957 "VBNET.ATG" +#line 2957 "vbnet.atg" IsDims()) { ArrayTypeModifiers( -#line 2957 "VBNET.ATG" +#line 2957 "vbnet.atg" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2958 "VBNET.ATG" +#line 2958 "vbnet.atg" out type); } -#line 2960 "VBNET.ATG" +#line 2960 "vbnet.atg" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -3451,11 +3451,11 @@ out type); if (la.kind == 20) { lexer.NextToken(); Expr( -#line 2970 "VBNET.ATG" +#line 2970 "vbnet.atg" out expr); } -#line 2972 "VBNET.ATG" +#line 2972 "vbnet.atg" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); p.Attributes = attributes; @@ -3465,67 +3465,67 @@ out expr); } void GetAccessorDecl( -#line 1398 "VBNET.ATG" +#line 1398 "vbnet.atg" out PropertyGetRegion getBlock, List attributes) { -#line 1399 "VBNET.ATG" +#line 1399 "vbnet.atg" Statement stmt = null; Modifiers m; PropertyAccessorAccessModifier( -#line 1401 "VBNET.ATG" +#line 1401 "vbnet.atg" out m); Expect(128); -#line 1403 "VBNET.ATG" +#line 1403 "vbnet.atg" Location startLocation = t.Location; Expect(1); Block( -#line 1405 "VBNET.ATG" +#line 1405 "vbnet.atg" out stmt); -#line 1406 "VBNET.ATG" +#line 1406 "vbnet.atg" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); Expect(113); Expect(128); -#line 1408 "VBNET.ATG" +#line 1408 "vbnet.atg" getBlock.Modifier = m; -#line 1409 "VBNET.ATG" +#line 1409 "vbnet.atg" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; EndOfStmt(); } void SetAccessorDecl( -#line 1414 "VBNET.ATG" +#line 1414 "vbnet.atg" out PropertySetRegion setBlock, List attributes) { -#line 1416 "VBNET.ATG" +#line 1416 "vbnet.atg" Statement stmt = null; List p = new List(); Modifiers m; PropertyAccessorAccessModifier( -#line 1421 "VBNET.ATG" +#line 1421 "vbnet.atg" out m); Expect(198); -#line 1423 "VBNET.ATG" +#line 1423 "vbnet.atg" Location startLocation = t.Location; if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1424 "VBNET.ATG" +#line 1424 "vbnet.atg" p); } Expect(38); } Expect(1); Block( -#line 1426 "VBNET.ATG" +#line 1426 "vbnet.atg" out stmt); -#line 1428 "VBNET.ATG" +#line 1428 "vbnet.atg" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); setBlock.Modifier = m; setBlock.Parameters = p; @@ -3533,116 +3533,116 @@ out stmt); Expect(113); Expect(198); -#line 1433 "VBNET.ATG" +#line 1433 "vbnet.atg" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; EndOfStmt(); } void PropertyAccessorAccessModifier( -#line 3736 "VBNET.ATG" +#line 3736 "vbnet.atg" out Modifiers m) { -#line 3737 "VBNET.ATG" +#line 3737 "vbnet.atg" m = Modifiers.None; while (StartOf(30)) { if (la.kind == 188) { lexer.NextToken(); -#line 3739 "VBNET.ATG" +#line 3739 "vbnet.atg" m |= Modifiers.Public; } else if (la.kind == 187) { lexer.NextToken(); -#line 3740 "VBNET.ATG" +#line 3740 "vbnet.atg" m |= Modifiers.Protected; } else if (la.kind == 125) { lexer.NextToken(); -#line 3741 "VBNET.ATG" +#line 3741 "vbnet.atg" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 3742 "VBNET.ATG" +#line 3742 "vbnet.atg" m |= Modifiers.Private; } } } void ArrayInitializationModifier( -#line 1531 "VBNET.ATG" +#line 1531 "vbnet.atg" out List arrayModifiers) { -#line 1533 "VBNET.ATG" +#line 1533 "vbnet.atg" arrayModifiers = null; Expect(37); InitializationRankList( -#line 1535 "VBNET.ATG" +#line 1535 "vbnet.atg" out arrayModifiers); Expect(38); } void ArrayNameModifier( -#line 2769 "VBNET.ATG" +#line 2769 "vbnet.atg" out ArrayList arrayModifiers) { -#line 2771 "VBNET.ATG" +#line 2771 "vbnet.atg" arrayModifiers = null; ArrayTypeModifiers( -#line 2773 "VBNET.ATG" +#line 2773 "vbnet.atg" out arrayModifiers); } void InitializationRankList( -#line 1539 "VBNET.ATG" +#line 1539 "vbnet.atg" out List rank) { -#line 1541 "VBNET.ATG" +#line 1541 "vbnet.atg" rank = new List(); Expression expr = null; Expr( -#line 1544 "VBNET.ATG" +#line 1544 "vbnet.atg" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 1545 "VBNET.ATG" +#line 1545 "vbnet.atg" EnsureIsZero(expr); Expr( -#line 1546 "VBNET.ATG" +#line 1546 "vbnet.atg" out expr); } -#line 1548 "VBNET.ATG" +#line 1548 "vbnet.atg" if (expr != null) { rank.Add(expr); } while (la.kind == 22) { lexer.NextToken(); Expr( -#line 1550 "VBNET.ATG" +#line 1550 "vbnet.atg" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 1551 "VBNET.ATG" +#line 1551 "vbnet.atg" EnsureIsZero(expr); Expr( -#line 1552 "VBNET.ATG" +#line 1552 "vbnet.atg" out expr); } -#line 1554 "VBNET.ATG" +#line 1554 "vbnet.atg" if (expr != null) { rank.Add(expr); } } } void CollectionInitializer( -#line 1559 "VBNET.ATG" +#line 1559 "vbnet.atg" out CollectionInitializerExpression outExpr) { -#line 1561 "VBNET.ATG" +#line 1561 "vbnet.atg" Expression expr = null; CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Location startLocation = la.Location; @@ -3650,27 +3650,27 @@ out CollectionInitializerExpression outExpr) { Expect(35); if (StartOf(24)) { Expr( -#line 1567 "VBNET.ATG" +#line 1567 "vbnet.atg" out expr); -#line 1569 "VBNET.ATG" +#line 1569 "vbnet.atg" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1572 "VBNET.ATG" +#line 1572 "vbnet.atg" NotFinalComma()) { Expect(22); Expr( -#line 1572 "VBNET.ATG" +#line 1572 "vbnet.atg" out expr); -#line 1573 "VBNET.ATG" +#line 1573 "vbnet.atg" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(36); -#line 1578 "VBNET.ATG" +#line 1578 "vbnet.atg" outExpr = initializer; outExpr.StartLocation = startLocation; outExpr.EndLocation = t.EndLocation; @@ -3678,10 +3678,10 @@ out expr); } void EventMemberSpecifier( -#line 1651 "VBNET.ATG" +#line 1651 "vbnet.atg" out string name) { -#line 1652 "VBNET.ATG" +#line 1652 "vbnet.atg" string eventName; if (StartOf(4)) { Identifier(); @@ -3691,182 +3691,182 @@ out string name) { lexer.NextToken(); } else SynErr(275); -#line 1655 "VBNET.ATG" +#line 1655 "vbnet.atg" name = t.val; Expect(26); IdentifierOrKeyword( -#line 1657 "VBNET.ATG" +#line 1657 "vbnet.atg" out eventName); -#line 1658 "VBNET.ATG" +#line 1658 "vbnet.atg" name = name + "." + eventName; } void IdentifierOrKeyword( -#line 3669 "VBNET.ATG" +#line 3669 "vbnet.atg" out string name) { lexer.NextToken(); -#line 3671 "VBNET.ATG" +#line 3671 "vbnet.atg" name = t.val; } void QueryExpr( -#line 2290 "VBNET.ATG" +#line 2290 "vbnet.atg" out Expression expr) { -#line 2292 "VBNET.ATG" - QueryExpressionVB qexpr = new QueryExpressionVB(); +#line 2292 "vbnet.atg" + QueryExpression qexpr = new QueryExpression(); qexpr.StartLocation = la.Location; expr = qexpr; FromOrAggregateQueryOperator( -#line 2296 "VBNET.ATG" +#line 2296 "vbnet.atg" qexpr.Clauses); while (StartOf(31)) { QueryOperator( -#line 2297 "VBNET.ATG" +#line 2297 "vbnet.atg" qexpr.Clauses); } -#line 2299 "VBNET.ATG" +#line 2299 "vbnet.atg" qexpr.EndLocation = t.EndLocation; } void LambdaExpr( -#line 2210 "VBNET.ATG" +#line 2210 "vbnet.atg" out Expression expr) { -#line 2212 "VBNET.ATG" +#line 2212 "vbnet.atg" LambdaExpression lambda = null; if (la.kind == 210) { SubLambdaExpression( -#line 2214 "VBNET.ATG" +#line 2214 "vbnet.atg" out lambda); } else if (la.kind == 127) { FunctionLambdaExpression( -#line 2215 "VBNET.ATG" +#line 2215 "vbnet.atg" out lambda); } else SynErr(276); -#line 2216 "VBNET.ATG" +#line 2216 "vbnet.atg" expr = lambda; } void DisjunctionExpr( -#line 1960 "VBNET.ATG" +#line 1960 "vbnet.atg" out Expression outExpr) { -#line 1962 "VBNET.ATG" +#line 1962 "vbnet.atg" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; ConjunctionExpr( -#line 1966 "VBNET.ATG" +#line 1966 "vbnet.atg" out outExpr); while (la.kind == 175 || la.kind == 177 || la.kind == 236) { if (la.kind == 175) { lexer.NextToken(); -#line 1969 "VBNET.ATG" +#line 1969 "vbnet.atg" op = BinaryOperatorType.BitwiseOr; } else if (la.kind == 177) { lexer.NextToken(); -#line 1970 "VBNET.ATG" +#line 1970 "vbnet.atg" op = BinaryOperatorType.LogicalOr; } else { lexer.NextToken(); -#line 1971 "VBNET.ATG" +#line 1971 "vbnet.atg" op = BinaryOperatorType.ExclusiveOr; } ConjunctionExpr( -#line 1973 "VBNET.ATG" +#line 1973 "vbnet.atg" out expr); -#line 1973 "VBNET.ATG" +#line 1973 "vbnet.atg" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void AssignmentOperator( -#line 1678 "VBNET.ATG" +#line 1678 "vbnet.atg" out AssignmentOperatorType op) { -#line 1679 "VBNET.ATG" +#line 1679 "vbnet.atg" op = AssignmentOperatorType.None; switch (la.kind) { case 20: { lexer.NextToken(); -#line 1680 "VBNET.ATG" +#line 1680 "vbnet.atg" op = AssignmentOperatorType.Assign; break; } case 54: { lexer.NextToken(); -#line 1681 "VBNET.ATG" +#line 1681 "vbnet.atg" op = AssignmentOperatorType.ConcatString; break; } case 46: { lexer.NextToken(); -#line 1682 "VBNET.ATG" +#line 1682 "vbnet.atg" op = AssignmentOperatorType.Add; break; } case 48: { lexer.NextToken(); -#line 1683 "VBNET.ATG" +#line 1683 "vbnet.atg" op = AssignmentOperatorType.Subtract; break; } case 49: { lexer.NextToken(); -#line 1684 "VBNET.ATG" +#line 1684 "vbnet.atg" op = AssignmentOperatorType.Multiply; break; } case 50: { lexer.NextToken(); -#line 1685 "VBNET.ATG" +#line 1685 "vbnet.atg" op = AssignmentOperatorType.Divide; break; } case 51: { lexer.NextToken(); -#line 1686 "VBNET.ATG" +#line 1686 "vbnet.atg" op = AssignmentOperatorType.DivideInteger; break; } case 47: { lexer.NextToken(); -#line 1687 "VBNET.ATG" +#line 1687 "vbnet.atg" op = AssignmentOperatorType.Power; break; } case 52: { lexer.NextToken(); -#line 1688 "VBNET.ATG" +#line 1688 "vbnet.atg" op = AssignmentOperatorType.ShiftLeft; break; } case 53: { lexer.NextToken(); -#line 1689 "VBNET.ATG" +#line 1689 "vbnet.atg" op = AssignmentOperatorType.ShiftRight; break; } @@ -3875,13 +3875,13 @@ out AssignmentOperatorType op) { } void SimpleExpr( -#line 1693 "VBNET.ATG" +#line 1693 "vbnet.atg" out Expression pexpr) { -#line 1694 "VBNET.ATG" +#line 1694 "vbnet.atg" string name; Location startLocation = la.Location; SimpleNonInvocationExpression( -#line 1697 "VBNET.ATG" +#line 1697 "vbnet.atg" out pexpr); while (StartOf(32)) { if (la.kind == 26) { @@ -3889,73 +3889,73 @@ out pexpr); if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1700 "VBNET.ATG" +#line 1700 "vbnet.atg" out name); Expect(11); -#line 1701 "VBNET.ATG" +#line 1701 "vbnet.atg" pexpr = new XmlMemberAccessExpression(pexpr, XmlAxisType.Element, name, true); } else if (StartOf(33)) { IdentifierOrKeyword( -#line 1702 "VBNET.ATG" +#line 1702 "vbnet.atg" out name); -#line 1703 "VBNET.ATG" +#line 1703 "vbnet.atg" pexpr = new MemberReferenceExpression(pexpr, name) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else SynErr(278); if ( -#line 1705 "VBNET.ATG" +#line 1705 "vbnet.atg" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); TypeArgumentList( -#line 1706 "VBNET.ATG" +#line 1706 "vbnet.atg" ((MemberReferenceExpression)pexpr).TypeArguments); Expect(38); } } else if (la.kind == 29) { lexer.NextToken(); IdentifierOrKeyword( -#line 1708 "VBNET.ATG" +#line 1708 "vbnet.atg" out name); -#line 1708 "VBNET.ATG" +#line 1708 "vbnet.atg" pexpr = new BinaryOperatorExpression(pexpr, BinaryOperatorType.DictionaryAccess, new PrimitiveExpression(name, name) { StartLocation = t.Location, EndLocation = t.EndLocation }); } else if (la.kind == 27 || la.kind == 28) { -#line 1709 "VBNET.ATG" +#line 1709 "vbnet.atg" XmlAxisType type = XmlAxisType.Attribute; bool isXmlName = false; if (la.kind == 28) { lexer.NextToken(); } else if (la.kind == 27) { lexer.NextToken(); -#line 1710 "VBNET.ATG" +#line 1710 "vbnet.atg" type = XmlAxisType.Descendents; } else SynErr(279); if (la.kind == 10) { lexer.NextToken(); -#line 1710 "VBNET.ATG" +#line 1710 "vbnet.atg" isXmlName = true; } IdentifierOrKeyword( -#line 1710 "VBNET.ATG" +#line 1710 "vbnet.atg" out name); if (la.kind == 11) { lexer.NextToken(); } -#line 1711 "VBNET.ATG" +#line 1711 "vbnet.atg" pexpr = new XmlMemberAccessExpression(pexpr, type, name, isXmlName); } else { InvocationExpression( -#line 1712 "VBNET.ATG" +#line 1712 "vbnet.atg" ref pexpr); } } -#line 1716 "VBNET.ATG" +#line 1716 "vbnet.atg" if (pexpr != null) { pexpr.StartLocation = startLocation; pexpr.EndLocation = t.EndLocation; @@ -3964,10 +3964,10 @@ ref pexpr); } void SimpleNonInvocationExpression( -#line 1723 "VBNET.ATG" +#line 1723 "vbnet.atg" out Expression pexpr) { -#line 1725 "VBNET.ATG" +#line 1725 "vbnet.atg" Expression expr; CollectionInitializerExpression cie; TypeReference type = null; @@ -3980,98 +3980,98 @@ out Expression pexpr) { case 3: { lexer.NextToken(); -#line 1735 "VBNET.ATG" +#line 1735 "vbnet.atg" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 4: { lexer.NextToken(); -#line 1736 "VBNET.ATG" +#line 1736 "vbnet.atg" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 7: { lexer.NextToken(); -#line 1737 "VBNET.ATG" +#line 1737 "vbnet.atg" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 6: { lexer.NextToken(); -#line 1738 "VBNET.ATG" +#line 1738 "vbnet.atg" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 5: { lexer.NextToken(); -#line 1739 "VBNET.ATG" +#line 1739 "vbnet.atg" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 9: { lexer.NextToken(); -#line 1740 "VBNET.ATG" +#line 1740 "vbnet.atg" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 8: { lexer.NextToken(); -#line 1741 "VBNET.ATG" +#line 1741 "vbnet.atg" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 217: { lexer.NextToken(); -#line 1743 "VBNET.ATG" +#line 1743 "vbnet.atg" pexpr = new PrimitiveExpression(true, "true"); break; } case 122: { lexer.NextToken(); -#line 1744 "VBNET.ATG" +#line 1744 "vbnet.atg" pexpr = new PrimitiveExpression(false, "false"); break; } case 165: { lexer.NextToken(); -#line 1745 "VBNET.ATG" +#line 1745 "vbnet.atg" pexpr = new PrimitiveExpression(null, "null"); break; } case 37: { lexer.NextToken(); Expr( -#line 1746 "VBNET.ATG" +#line 1746 "vbnet.atg" out expr); Expect(38); -#line 1746 "VBNET.ATG" +#line 1746 "vbnet.atg" pexpr = new ParenthesizedExpression(expr); break; } case 2: case 58: case 62: case 64: case 65: case 66: case 67: case 70: case 87: case 98: case 104: case 107: case 116: case 121: case 126: case 133: case 139: case 143: case 146: case 147: case 170: case 176: case 178: case 184: case 203: case 212: case 213: case 223: case 224: case 230: { Identifier(); -#line 1748 "VBNET.ATG" +#line 1748 "vbnet.atg" pexpr = new IdentifierExpression(t.val); pexpr.StartLocation = t.Location; pexpr.EndLocation = t.EndLocation; if ( -#line 1751 "VBNET.ATG" +#line 1751 "vbnet.atg" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); TypeArgumentList( -#line 1752 "VBNET.ATG" +#line 1752 "vbnet.atg" ((IdentifierExpression)pexpr).TypeArguments); Expect(38); } @@ -4079,51 +4079,51 @@ la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { } case 68: case 71: case 82: case 99: case 100: case 109: case 141: case 151: case 168: case 196: case 201: case 202: case 208: case 221: case 222: case 225: { -#line 1754 "VBNET.ATG" +#line 1754 "vbnet.atg" string val = String.Empty; if (StartOf(12)) { PrimitiveTypeName( -#line 1755 "VBNET.ATG" +#line 1755 "vbnet.atg" out val); } else if (la.kind == 168) { lexer.NextToken(); -#line 1755 "VBNET.ATG" +#line 1755 "vbnet.atg" val = "System.Object"; } else SynErr(280); -#line 1756 "VBNET.ATG" +#line 1756 "vbnet.atg" pexpr = new TypeReferenceExpression(new TypeReference(val, true)); break; } case 153: { lexer.NextToken(); -#line 1757 "VBNET.ATG" +#line 1757 "vbnet.atg" pexpr = new ThisReferenceExpression(); break; } case 158: case 159: { -#line 1758 "VBNET.ATG" +#line 1758 "vbnet.atg" Expression retExpr = null; if (la.kind == 158) { lexer.NextToken(); -#line 1759 "VBNET.ATG" +#line 1759 "vbnet.atg" retExpr = new BaseReferenceExpression() { StartLocation = t.Location, EndLocation = t.EndLocation }; } else if (la.kind == 159) { lexer.NextToken(); -#line 1760 "VBNET.ATG" +#line 1760 "vbnet.atg" retExpr = new ClassReferenceExpression() { StartLocation = t.Location, EndLocation = t.EndLocation }; } else SynErr(281); Expect(26); IdentifierOrKeyword( -#line 1762 "VBNET.ATG" +#line 1762 "vbnet.atg" out name); -#line 1762 "VBNET.ATG" +#line 1762 "vbnet.atg" pexpr = new MemberReferenceExpression(retExpr, name) { StartLocation = startLocation, EndLocation = t.EndLocation }; break; } @@ -4132,86 +4132,86 @@ out name); Expect(26); Identifier(); -#line 1764 "VBNET.ATG" +#line 1764 "vbnet.atg" type = new TypeReference(t.val ?? ""); -#line 1766 "VBNET.ATG" +#line 1766 "vbnet.atg" type.IsGlobal = true; -#line 1767 "VBNET.ATG" +#line 1767 "vbnet.atg" pexpr = new TypeReferenceExpression(type); break; } case 162: { ObjectCreateExpression( -#line 1768 "VBNET.ATG" +#line 1768 "vbnet.atg" out expr); -#line 1768 "VBNET.ATG" +#line 1768 "vbnet.atg" pexpr = expr; break; } case 35: { CollectionInitializer( -#line 1769 "VBNET.ATG" +#line 1769 "vbnet.atg" out cie); -#line 1769 "VBNET.ATG" +#line 1769 "vbnet.atg" pexpr = cie; break; } case 94: case 106: case 219: { -#line 1771 "VBNET.ATG" +#line 1771 "vbnet.atg" CastType castType = CastType.Cast; if (la.kind == 106) { lexer.NextToken(); } else if (la.kind == 94) { lexer.NextToken(); -#line 1773 "VBNET.ATG" +#line 1773 "vbnet.atg" castType = CastType.Conversion; } else if (la.kind == 219) { lexer.NextToken(); -#line 1774 "VBNET.ATG" +#line 1774 "vbnet.atg" castType = CastType.TryCast; } else SynErr(282); Expect(37); Expr( -#line 1776 "VBNET.ATG" +#line 1776 "vbnet.atg" out expr); Expect(22); TypeName( -#line 1776 "VBNET.ATG" +#line 1776 "vbnet.atg" out type); Expect(38); -#line 1777 "VBNET.ATG" +#line 1777 "vbnet.atg" pexpr = new CastExpression(type, expr, castType); break; } case 76: case 77: case 78: case 79: case 80: case 81: case 83: case 85: case 86: case 90: case 91: case 92: case 93: case 95: case 96: case 97: { CastTarget( -#line 1778 "VBNET.ATG" +#line 1778 "vbnet.atg" out type); Expect(37); Expr( -#line 1778 "VBNET.ATG" +#line 1778 "vbnet.atg" out expr); Expect(38); -#line 1778 "VBNET.ATG" +#line 1778 "vbnet.atg" pexpr = new CastExpression(type, expr, CastType.PrimitiveConversion); break; } case 57: { lexer.NextToken(); Expr( -#line 1779 "VBNET.ATG" +#line 1779 "vbnet.atg" out expr); -#line 1779 "VBNET.ATG" +#line 1779 "vbnet.atg" pexpr = new AddressOfExpression(expr); break; } @@ -4219,37 +4219,37 @@ out expr); lexer.NextToken(); Expect(37); GetTypeTypeName( -#line 1780 "VBNET.ATG" +#line 1780 "vbnet.atg" out type); Expect(38); -#line 1780 "VBNET.ATG" +#line 1780 "vbnet.atg" pexpr = new TypeOfExpression(type); break; } case 220: { lexer.NextToken(); SimpleExpr( -#line 1781 "VBNET.ATG" +#line 1781 "vbnet.atg" out expr); Expect(144); TypeName( -#line 1781 "VBNET.ATG" +#line 1781 "vbnet.atg" out type); -#line 1781 "VBNET.ATG" +#line 1781 "vbnet.atg" pexpr = new TypeOfIsExpression(expr, type); break; } case 135: { ConditionalExpression( -#line 1782 "VBNET.ATG" +#line 1782 "vbnet.atg" out pexpr); break; } case 10: case 16: case 17: case 18: case 19: { XmlLiteralExpression( -#line 1783 "VBNET.ATG" +#line 1783 "vbnet.atg" out pexpr); break; } @@ -4260,62 +4260,62 @@ out pexpr); if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1789 "VBNET.ATG" +#line 1789 "vbnet.atg" out name); Expect(11); -#line 1790 "VBNET.ATG" +#line 1790 "vbnet.atg" pexpr = new XmlMemberAccessExpression(null, XmlAxisType.Element, name, true) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else if (StartOf(33)) { IdentifierOrKeyword( -#line 1791 "VBNET.ATG" +#line 1791 "vbnet.atg" out name); -#line 1792 "VBNET.ATG" +#line 1792 "vbnet.atg" pexpr = new MemberReferenceExpression(null, name) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else SynErr(283); } else if (la.kind == 29) { lexer.NextToken(); IdentifierOrKeyword( -#line 1794 "VBNET.ATG" +#line 1794 "vbnet.atg" out name); -#line 1794 "VBNET.ATG" +#line 1794 "vbnet.atg" pexpr = new BinaryOperatorExpression(null, BinaryOperatorType.DictionaryAccess, new PrimitiveExpression(name, name) { StartLocation = t.Location, EndLocation = t.EndLocation }); } else { -#line 1795 "VBNET.ATG" +#line 1795 "vbnet.atg" XmlAxisType axisType = XmlAxisType.Element; bool isXmlIdentifier = false; if (la.kind == 27) { lexer.NextToken(); -#line 1796 "VBNET.ATG" +#line 1796 "vbnet.atg" axisType = XmlAxisType.Descendents; } else if (la.kind == 28) { lexer.NextToken(); -#line 1796 "VBNET.ATG" +#line 1796 "vbnet.atg" axisType = XmlAxisType.Attribute; } else SynErr(284); if (la.kind == 10) { lexer.NextToken(); -#line 1797 "VBNET.ATG" +#line 1797 "vbnet.atg" isXmlIdentifier = true; } IdentifierOrKeyword( -#line 1797 "VBNET.ATG" +#line 1797 "vbnet.atg" out name); if (la.kind == 11) { lexer.NextToken(); } -#line 1798 "VBNET.ATG" +#line 1798 "vbnet.atg" pexpr = new XmlMemberAccessExpression(null, axisType, name, isXmlIdentifier); } } else SynErr(285); -#line 1803 "VBNET.ATG" +#line 1803 "vbnet.atg" if (pexpr != null) { pexpr.StartLocation = startLocation; pexpr.EndLocation = t.EndLocation; @@ -4324,161 +4324,161 @@ out name); } void TypeArgumentList( -#line 2805 "VBNET.ATG" +#line 2805 "vbnet.atg" List typeArguments) { -#line 2807 "VBNET.ATG" +#line 2807 "vbnet.atg" TypeReference typeref; TypeName( -#line 2809 "VBNET.ATG" +#line 2809 "vbnet.atg" out typeref); -#line 2809 "VBNET.ATG" +#line 2809 "vbnet.atg" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 2812 "VBNET.ATG" +#line 2812 "vbnet.atg" out typeref); -#line 2812 "VBNET.ATG" +#line 2812 "vbnet.atg" if (typeref != null) typeArguments.Add(typeref); } } void InvocationExpression( -#line 1924 "VBNET.ATG" +#line 1924 "vbnet.atg" ref Expression pexpr) { -#line 1925 "VBNET.ATG" +#line 1925 "vbnet.atg" List parameters = null; Expect(37); -#line 1927 "VBNET.ATG" +#line 1927 "vbnet.atg" Location start = t.Location; ArgumentList( -#line 1928 "VBNET.ATG" +#line 1928 "vbnet.atg" out parameters); Expect(38); -#line 1931 "VBNET.ATG" +#line 1931 "vbnet.atg" pexpr = new InvocationExpression(pexpr, parameters); -#line 1933 "VBNET.ATG" +#line 1933 "vbnet.atg" pexpr.StartLocation = start; pexpr.EndLocation = t.Location; } void PrimitiveTypeName( -#line 3676 "VBNET.ATG" +#line 3676 "vbnet.atg" out string type) { -#line 3677 "VBNET.ATG" +#line 3677 "vbnet.atg" type = String.Empty; switch (la.kind) { case 68: { lexer.NextToken(); -#line 3678 "VBNET.ATG" +#line 3678 "vbnet.atg" type = "System.Boolean"; break; } case 99: { lexer.NextToken(); -#line 3679 "VBNET.ATG" +#line 3679 "vbnet.atg" type = "System.DateTime"; break; } case 82: { lexer.NextToken(); -#line 3680 "VBNET.ATG" +#line 3680 "vbnet.atg" type = "System.Char"; break; } case 208: { lexer.NextToken(); -#line 3681 "VBNET.ATG" +#line 3681 "vbnet.atg" type = "System.String"; break; } case 100: { lexer.NextToken(); -#line 3682 "VBNET.ATG" +#line 3682 "vbnet.atg" type = "System.Decimal"; break; } case 71: { lexer.NextToken(); -#line 3683 "VBNET.ATG" +#line 3683 "vbnet.atg" type = "System.Byte"; break; } case 201: { lexer.NextToken(); -#line 3684 "VBNET.ATG" +#line 3684 "vbnet.atg" type = "System.Int16"; break; } case 141: { lexer.NextToken(); -#line 3685 "VBNET.ATG" +#line 3685 "vbnet.atg" type = "System.Int32"; break; } case 151: { lexer.NextToken(); -#line 3686 "VBNET.ATG" +#line 3686 "vbnet.atg" type = "System.Int64"; break; } case 202: { lexer.NextToken(); -#line 3687 "VBNET.ATG" +#line 3687 "vbnet.atg" type = "System.Single"; break; } case 109: { lexer.NextToken(); -#line 3688 "VBNET.ATG" +#line 3688 "vbnet.atg" type = "System.Double"; break; } case 221: { lexer.NextToken(); -#line 3689 "VBNET.ATG" +#line 3689 "vbnet.atg" type = "System.UInt32"; break; } case 222: { lexer.NextToken(); -#line 3690 "VBNET.ATG" +#line 3690 "vbnet.atg" type = "System.UInt64"; break; } case 225: { lexer.NextToken(); -#line 3691 "VBNET.ATG" +#line 3691 "vbnet.atg" type = "System.UInt16"; break; } case 196: { lexer.NextToken(); -#line 3692 "VBNET.ATG" +#line 3692 "vbnet.atg" type = "System.SByte"; break; } @@ -4487,122 +4487,122 @@ out string type) { } void CastTarget( -#line 1938 "VBNET.ATG" +#line 1938 "vbnet.atg" out TypeReference type) { -#line 1940 "VBNET.ATG" +#line 1940 "vbnet.atg" type = null; switch (la.kind) { case 76: { lexer.NextToken(); -#line 1942 "VBNET.ATG" +#line 1942 "vbnet.atg" type = new TypeReference("System.Boolean", true); break; } case 77: { lexer.NextToken(); -#line 1943 "VBNET.ATG" +#line 1943 "vbnet.atg" type = new TypeReference("System.Byte", true); break; } case 90: { lexer.NextToken(); -#line 1944 "VBNET.ATG" +#line 1944 "vbnet.atg" type = new TypeReference("System.SByte", true); break; } case 78: { lexer.NextToken(); -#line 1945 "VBNET.ATG" +#line 1945 "vbnet.atg" type = new TypeReference("System.Char", true); break; } case 79: { lexer.NextToken(); -#line 1946 "VBNET.ATG" +#line 1946 "vbnet.atg" type = new TypeReference("System.DateTime", true); break; } case 81: { lexer.NextToken(); -#line 1947 "VBNET.ATG" +#line 1947 "vbnet.atg" type = new TypeReference("System.Decimal", true); break; } case 80: { lexer.NextToken(); -#line 1948 "VBNET.ATG" +#line 1948 "vbnet.atg" type = new TypeReference("System.Double", true); break; } case 91: { lexer.NextToken(); -#line 1949 "VBNET.ATG" +#line 1949 "vbnet.atg" type = new TypeReference("System.Int16", true); break; } case 83: { lexer.NextToken(); -#line 1950 "VBNET.ATG" +#line 1950 "vbnet.atg" type = new TypeReference("System.Int32", true); break; } case 85: { lexer.NextToken(); -#line 1951 "VBNET.ATG" +#line 1951 "vbnet.atg" type = new TypeReference("System.Int64", true); break; } case 97: { lexer.NextToken(); -#line 1952 "VBNET.ATG" +#line 1952 "vbnet.atg" type = new TypeReference("System.UInt16", true); break; } case 95: { lexer.NextToken(); -#line 1953 "VBNET.ATG" +#line 1953 "vbnet.atg" type = new TypeReference("System.UInt32", true); break; } case 96: { lexer.NextToken(); -#line 1954 "VBNET.ATG" +#line 1954 "vbnet.atg" type = new TypeReference("System.UInt64", true); break; } case 86: { lexer.NextToken(); -#line 1955 "VBNET.ATG" +#line 1955 "vbnet.atg" type = new TypeReference("System.Object", true); break; } case 92: { lexer.NextToken(); -#line 1956 "VBNET.ATG" +#line 1956 "vbnet.atg" type = new TypeReference("System.Single", true); break; } case 93: { lexer.NextToken(); -#line 1957 "VBNET.ATG" +#line 1957 "vbnet.atg" type = new TypeReference("System.String", true); break; } @@ -4611,19 +4611,19 @@ out TypeReference type) { } void GetTypeTypeName( -#line 2704 "VBNET.ATG" +#line 2704 "vbnet.atg" out TypeReference typeref) { -#line 2705 "VBNET.ATG" +#line 2705 "vbnet.atg" ArrayList rank = null; NonArrayTypeName( -#line 2707 "VBNET.ATG" +#line 2707 "vbnet.atg" out typeref, true); ArrayTypeModifiers( -#line 2708 "VBNET.ATG" +#line 2708 "vbnet.atg" out rank); -#line 2709 "VBNET.ATG" +#line 2709 "vbnet.atg" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4631,10 +4631,10 @@ out rank); } void ConditionalExpression( -#line 1890 "VBNET.ATG" +#line 1890 "vbnet.atg" out Expression expr) { -#line 1892 "VBNET.ATG" +#line 1892 "vbnet.atg" ConditionalExpression conditionalExpression = new ConditionalExpression(); BinaryOperatorExpression binaryOperatorExpression = new BinaryOperatorExpression(); conditionalExpression.StartLocation = binaryOperatorExpression.StartLocation = la.Location; @@ -4646,21 +4646,21 @@ out Expression expr) { Expect(135); Expect(37); Expr( -#line 1901 "VBNET.ATG" +#line 1901 "vbnet.atg" out condition); Expect(22); Expr( -#line 1901 "VBNET.ATG" +#line 1901 "vbnet.atg" out trueExpr); if (la.kind == 22) { lexer.NextToken(); Expr( -#line 1901 "VBNET.ATG" +#line 1901 "vbnet.atg" out falseExpr); } Expect(38); -#line 1903 "VBNET.ATG" +#line 1903 "vbnet.atg" if(falseExpr != null) { conditionalExpression.Condition = condition; @@ -4683,50 +4683,50 @@ out falseExpr); } void XmlLiteralExpression( -#line 1810 "VBNET.ATG" +#line 1810 "vbnet.atg" out Expression pexpr) { -#line 1812 "VBNET.ATG" +#line 1812 "vbnet.atg" List exprs = new List(); XmlExpression currentExpression = null; if (StartOf(36)) { XmlContentExpression( -#line 1817 "VBNET.ATG" +#line 1817 "vbnet.atg" exprs); while (StartOf(36)) { XmlContentExpression( -#line 1817 "VBNET.ATG" +#line 1817 "vbnet.atg" exprs); } if (la.kind == 10) { XmlElement( -#line 1817 "VBNET.ATG" +#line 1817 "vbnet.atg" out currentExpression); -#line 1817 "VBNET.ATG" +#line 1817 "vbnet.atg" exprs.Add(currentExpression); while (StartOf(36)) { XmlContentExpression( -#line 1817 "VBNET.ATG" +#line 1817 "vbnet.atg" exprs); } } } else if (la.kind == 10) { XmlElement( -#line 1819 "VBNET.ATG" +#line 1819 "vbnet.atg" out currentExpression); -#line 1819 "VBNET.ATG" +#line 1819 "vbnet.atg" exprs.Add(currentExpression); while (StartOf(36)) { XmlContentExpression( -#line 1819 "VBNET.ATG" +#line 1819 "vbnet.atg" exprs); } } else SynErr(288); -#line 1822 "VBNET.ATG" +#line 1822 "vbnet.atg" if (exprs.Count > 1) { pexpr = new XmlDocumentExpression() { Expressions = exprs }; } else { @@ -4736,34 +4736,34 @@ exprs); } void XmlContentExpression( -#line 1830 "VBNET.ATG" +#line 1830 "vbnet.atg" List exprs) { -#line 1831 "VBNET.ATG" +#line 1831 "vbnet.atg" XmlContentExpression expr = null; if (la.kind == 16) { lexer.NextToken(); -#line 1833 "VBNET.ATG" +#line 1833 "vbnet.atg" expr = new XmlContentExpression(t.val, XmlContentType.Text); } else if (la.kind == 18) { lexer.NextToken(); -#line 1834 "VBNET.ATG" +#line 1834 "vbnet.atg" expr = new XmlContentExpression(t.val, XmlContentType.CData); } else if (la.kind == 17) { lexer.NextToken(); -#line 1835 "VBNET.ATG" +#line 1835 "vbnet.atg" expr = new XmlContentExpression(t.val, XmlContentType.Comment); } else if (la.kind == 19) { lexer.NextToken(); -#line 1836 "VBNET.ATG" +#line 1836 "vbnet.atg" expr = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); } else SynErr(289); -#line 1839 "VBNET.ATG" +#line 1839 "vbnet.atg" expr.StartLocation = t.Location; expr.EndLocation = t.EndLocation; exprs.Add(expr); @@ -4771,54 +4771,54 @@ List exprs) { } void XmlElement( -#line 1865 "VBNET.ATG" +#line 1865 "vbnet.atg" out XmlExpression expr) { -#line 1866 "VBNET.ATG" +#line 1866 "vbnet.atg" XmlElementExpression el = new XmlElementExpression(); Expect(10); -#line 1869 "VBNET.ATG" +#line 1869 "vbnet.atg" el.StartLocation = t.Location; if (la.kind == 12) { lexer.NextToken(); -#line 1870 "VBNET.ATG" +#line 1870 "vbnet.atg" Expression innerExpression; Expr( -#line 1870 "VBNET.ATG" +#line 1870 "vbnet.atg" out innerExpression); Expect(13); -#line 1871 "VBNET.ATG" +#line 1871 "vbnet.atg" el.NameExpression = new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }; } else if (StartOf(4)) { Identifier(); -#line 1872 "VBNET.ATG" +#line 1872 "vbnet.atg" el.XmlName = t.val; } else SynErr(290); while (StartOf(37)) { XmlAttribute( -#line 1872 "VBNET.ATG" +#line 1872 "vbnet.atg" el.Attributes); } if (la.kind == 14) { lexer.NextToken(); -#line 1873 "VBNET.ATG" +#line 1873 "vbnet.atg" el.EndLocation = t.EndLocation; } else if (la.kind == 11) { lexer.NextToken(); while (StartOf(38)) { -#line 1873 "VBNET.ATG" +#line 1873 "vbnet.atg" XmlExpression child; XmlNestedContent( -#line 1873 "VBNET.ATG" +#line 1873 "vbnet.atg" out child); -#line 1873 "VBNET.ATG" +#line 1873 "vbnet.atg" el.Children.Add(child); } Expect(15); @@ -4827,73 +4827,73 @@ out child); } Expect(11); -#line 1873 "VBNET.ATG" +#line 1873 "vbnet.atg" el.EndLocation = t.EndLocation; } else SynErr(291); -#line 1875 "VBNET.ATG" +#line 1875 "vbnet.atg" expr = el; } void XmlNestedContent( -#line 1845 "VBNET.ATG" +#line 1845 "vbnet.atg" out XmlExpression expr) { -#line 1846 "VBNET.ATG" +#line 1846 "vbnet.atg" XmlExpression tmpExpr = null; Location start = la.Location; switch (la.kind) { case 16: { lexer.NextToken(); -#line 1849 "VBNET.ATG" +#line 1849 "vbnet.atg" tmpExpr = new XmlContentExpression(t.val, XmlContentType.Text); break; } case 18: { lexer.NextToken(); -#line 1850 "VBNET.ATG" +#line 1850 "vbnet.atg" tmpExpr = new XmlContentExpression(t.val, XmlContentType.CData); break; } case 17: { lexer.NextToken(); -#line 1851 "VBNET.ATG" +#line 1851 "vbnet.atg" tmpExpr = new XmlContentExpression(t.val, XmlContentType.Comment); break; } case 19: { lexer.NextToken(); -#line 1852 "VBNET.ATG" +#line 1852 "vbnet.atg" tmpExpr = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); break; } case 12: { lexer.NextToken(); -#line 1853 "VBNET.ATG" +#line 1853 "vbnet.atg" Expression innerExpression; Expr( -#line 1853 "VBNET.ATG" +#line 1853 "vbnet.atg" out innerExpression); Expect(13); -#line 1853 "VBNET.ATG" +#line 1853 "vbnet.atg" tmpExpr = new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }; break; } case 10: { XmlElement( -#line 1854 "VBNET.ATG" +#line 1854 "vbnet.atg" out tmpExpr); break; } default: SynErr(292); break; } -#line 1857 "VBNET.ATG" +#line 1857 "vbnet.atg" if (tmpExpr.StartLocation.IsEmpty) tmpExpr.StartLocation = start; if (tmpExpr.EndLocation.IsEmpty) @@ -4903,401 +4903,401 @@ out tmpExpr); } void XmlAttribute( -#line 1878 "VBNET.ATG" +#line 1878 "vbnet.atg" List attrs) { -#line 1879 "VBNET.ATG" +#line 1879 "vbnet.atg" Location start = la.Location; if (StartOf(4)) { Identifier(); -#line 1881 "VBNET.ATG" +#line 1881 "vbnet.atg" string name = t.val; Expect(20); -#line 1882 "VBNET.ATG" +#line 1882 "vbnet.atg" string literalValue = null; Expression expressionValue = null; bool useDoubleQuotes = false; if (la.kind == 3) { lexer.NextToken(); -#line 1883 "VBNET.ATG" +#line 1883 "vbnet.atg" literalValue = t.literalValue.ToString(); useDoubleQuotes = t.val[0] == '"'; } else if (la.kind == 12) { lexer.NextToken(); Expr( -#line 1883 "VBNET.ATG" +#line 1883 "vbnet.atg" out expressionValue); Expect(13); } else SynErr(293); -#line 1884 "VBNET.ATG" +#line 1884 "vbnet.atg" attrs.Add(new XmlAttributeExpression() { Name = name, ExpressionValue = expressionValue, LiteralValue = literalValue, UseDoubleQuotes = useDoubleQuotes, StartLocation = start, EndLocation = t.EndLocation }); } else if (la.kind == 12) { lexer.NextToken(); -#line 1886 "VBNET.ATG" +#line 1886 "vbnet.atg" Expression innerExpression; Expr( -#line 1886 "VBNET.ATG" +#line 1886 "vbnet.atg" out innerExpression); Expect(13); -#line 1887 "VBNET.ATG" +#line 1887 "vbnet.atg" attrs.Add(new XmlEmbeddedExpression() { InlineVBExpression = innerExpression, StartLocation = start, EndLocation = t.EndLocation }); } else SynErr(294); } void ArgumentList( -#line 2633 "VBNET.ATG" +#line 2633 "vbnet.atg" out List arguments) { -#line 2635 "VBNET.ATG" +#line 2635 "vbnet.atg" arguments = new List(); Expression expr = null; if (StartOf(24)) { Argument( -#line 2638 "VBNET.ATG" +#line 2638 "vbnet.atg" out expr); } while (la.kind == 22) { lexer.NextToken(); -#line 2639 "VBNET.ATG" +#line 2639 "vbnet.atg" arguments.Add(expr ?? Expression.Null); expr = null; if (StartOf(24)) { Argument( -#line 2640 "VBNET.ATG" +#line 2640 "vbnet.atg" out expr); } -#line 2641 "VBNET.ATG" +#line 2641 "vbnet.atg" if (expr == null) expr = Expression.Null; } -#line 2643 "VBNET.ATG" +#line 2643 "vbnet.atg" if (expr != null) arguments.Add(expr); } void ConjunctionExpr( -#line 1977 "VBNET.ATG" +#line 1977 "vbnet.atg" out Expression outExpr) { -#line 1979 "VBNET.ATG" +#line 1979 "vbnet.atg" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; NotExpr( -#line 1983 "VBNET.ATG" +#line 1983 "vbnet.atg" out outExpr); while (la.kind == 60 || la.kind == 61) { if (la.kind == 60) { lexer.NextToken(); -#line 1986 "VBNET.ATG" +#line 1986 "vbnet.atg" op = BinaryOperatorType.BitwiseAnd; } else { lexer.NextToken(); -#line 1987 "VBNET.ATG" +#line 1987 "vbnet.atg" op = BinaryOperatorType.LogicalAnd; } NotExpr( -#line 1989 "VBNET.ATG" +#line 1989 "vbnet.atg" out expr); -#line 1989 "VBNET.ATG" +#line 1989 "vbnet.atg" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void NotExpr( -#line 1993 "VBNET.ATG" +#line 1993 "vbnet.atg" out Expression outExpr) { -#line 1994 "VBNET.ATG" +#line 1994 "vbnet.atg" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 164) { lexer.NextToken(); -#line 1995 "VBNET.ATG" +#line 1995 "vbnet.atg" uop = UnaryOperatorType.Not; } ComparisonExpr( -#line 1996 "VBNET.ATG" +#line 1996 "vbnet.atg" out outExpr); -#line 1997 "VBNET.ATG" +#line 1997 "vbnet.atg" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void ComparisonExpr( -#line 2002 "VBNET.ATG" +#line 2002 "vbnet.atg" out Expression outExpr) { -#line 2004 "VBNET.ATG" +#line 2004 "vbnet.atg" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; ShiftExpr( -#line 2008 "VBNET.ATG" +#line 2008 "vbnet.atg" out outExpr); while (StartOf(40)) { switch (la.kind) { case 40: { lexer.NextToken(); -#line 2011 "VBNET.ATG" +#line 2011 "vbnet.atg" op = BinaryOperatorType.LessThan; break; } case 39: { lexer.NextToken(); -#line 2012 "VBNET.ATG" +#line 2012 "vbnet.atg" op = BinaryOperatorType.GreaterThan; break; } case 43: { lexer.NextToken(); -#line 2013 "VBNET.ATG" +#line 2013 "vbnet.atg" op = BinaryOperatorType.LessThanOrEqual; break; } case 42: { lexer.NextToken(); -#line 2014 "VBNET.ATG" +#line 2014 "vbnet.atg" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 41: { lexer.NextToken(); -#line 2015 "VBNET.ATG" +#line 2015 "vbnet.atg" op = BinaryOperatorType.InEquality; break; } case 20: { lexer.NextToken(); -#line 2016 "VBNET.ATG" +#line 2016 "vbnet.atg" op = BinaryOperatorType.Equality; break; } case 150: { lexer.NextToken(); -#line 2017 "VBNET.ATG" +#line 2017 "vbnet.atg" op = BinaryOperatorType.Like; break; } case 144: { lexer.NextToken(); -#line 2018 "VBNET.ATG" +#line 2018 "vbnet.atg" op = BinaryOperatorType.ReferenceEquality; break; } case 145: { lexer.NextToken(); -#line 2019 "VBNET.ATG" +#line 2019 "vbnet.atg" op = BinaryOperatorType.ReferenceInequality; break; } } if (StartOf(41)) { ShiftExpr( -#line 2022 "VBNET.ATG" +#line 2022 "vbnet.atg" out expr); -#line 2022 "VBNET.ATG" +#line 2022 "vbnet.atg" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else if (la.kind == 164) { -#line 2023 "VBNET.ATG" +#line 2023 "vbnet.atg" Location startLocation2 = la.Location; lexer.NextToken(); ShiftExpr( -#line 2025 "VBNET.ATG" +#line 2025 "vbnet.atg" out expr); -#line 2025 "VBNET.ATG" +#line 2025 "vbnet.atg" outExpr = new BinaryOperatorExpression(outExpr, op, new UnaryOperatorExpression(expr, UnaryOperatorType.Not) { StartLocation = startLocation2, EndLocation = t.EndLocation }) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else SynErr(295); } } void ShiftExpr( -#line 2030 "VBNET.ATG" +#line 2030 "vbnet.atg" out Expression outExpr) { -#line 2032 "VBNET.ATG" +#line 2032 "vbnet.atg" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; ConcatenationExpr( -#line 2036 "VBNET.ATG" +#line 2036 "vbnet.atg" out outExpr); while (la.kind == 44 || la.kind == 45) { if (la.kind == 44) { lexer.NextToken(); -#line 2039 "VBNET.ATG" +#line 2039 "vbnet.atg" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 2040 "VBNET.ATG" +#line 2040 "vbnet.atg" op = BinaryOperatorType.ShiftRight; } ConcatenationExpr( -#line 2042 "VBNET.ATG" +#line 2042 "vbnet.atg" out expr); -#line 2042 "VBNET.ATG" +#line 2042 "vbnet.atg" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void ConcatenationExpr( -#line 2046 "VBNET.ATG" +#line 2046 "vbnet.atg" out Expression outExpr) { -#line 2047 "VBNET.ATG" +#line 2047 "vbnet.atg" Expression expr; Location startLocation = la.Location; AdditiveExpr( -#line 2049 "VBNET.ATG" +#line 2049 "vbnet.atg" out outExpr); while (la.kind == 23) { lexer.NextToken(); AdditiveExpr( -#line 2049 "VBNET.ATG" +#line 2049 "vbnet.atg" out expr); -#line 2049 "VBNET.ATG" +#line 2049 "vbnet.atg" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Concat, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void AdditiveExpr( -#line 2052 "VBNET.ATG" +#line 2052 "vbnet.atg" out Expression outExpr) { -#line 2054 "VBNET.ATG" +#line 2054 "vbnet.atg" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; ModuloExpr( -#line 2058 "VBNET.ATG" +#line 2058 "vbnet.atg" out outExpr); while (la.kind == 30 || la.kind == 31) { if (la.kind == 31) { lexer.NextToken(); -#line 2061 "VBNET.ATG" +#line 2061 "vbnet.atg" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 2062 "VBNET.ATG" +#line 2062 "vbnet.atg" op = BinaryOperatorType.Subtract; } ModuloExpr( -#line 2064 "VBNET.ATG" +#line 2064 "vbnet.atg" out expr); -#line 2064 "VBNET.ATG" +#line 2064 "vbnet.atg" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void ModuloExpr( -#line 2068 "VBNET.ATG" +#line 2068 "vbnet.atg" out Expression outExpr) { -#line 2069 "VBNET.ATG" +#line 2069 "vbnet.atg" Expression expr; Location startLocation = la.Location; IntegerDivisionExpr( -#line 2071 "VBNET.ATG" +#line 2071 "vbnet.atg" out outExpr); while (la.kind == 154) { lexer.NextToken(); IntegerDivisionExpr( -#line 2071 "VBNET.ATG" +#line 2071 "vbnet.atg" out expr); -#line 2071 "VBNET.ATG" +#line 2071 "vbnet.atg" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void IntegerDivisionExpr( -#line 2074 "VBNET.ATG" +#line 2074 "vbnet.atg" out Expression outExpr) { -#line 2075 "VBNET.ATG" +#line 2075 "vbnet.atg" Expression expr; Location startLocation = la.Location; MultiplicativeExpr( -#line 2077 "VBNET.ATG" +#line 2077 "vbnet.atg" out outExpr); while (la.kind == 25) { lexer.NextToken(); MultiplicativeExpr( -#line 2077 "VBNET.ATG" +#line 2077 "vbnet.atg" out expr); -#line 2077 "VBNET.ATG" +#line 2077 "vbnet.atg" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.DivideInteger, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void MultiplicativeExpr( -#line 2080 "VBNET.ATG" +#line 2080 "vbnet.atg" out Expression outExpr) { -#line 2082 "VBNET.ATG" +#line 2082 "vbnet.atg" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; UnaryExpr( -#line 2086 "VBNET.ATG" +#line 2086 "vbnet.atg" out outExpr); while (la.kind == 24 || la.kind == 34) { if (la.kind == 34) { lexer.NextToken(); -#line 2089 "VBNET.ATG" +#line 2089 "vbnet.atg" op = BinaryOperatorType.Multiply; } else { lexer.NextToken(); -#line 2090 "VBNET.ATG" +#line 2090 "vbnet.atg" op = BinaryOperatorType.Divide; } UnaryExpr( -#line 2092 "VBNET.ATG" +#line 2092 "vbnet.atg" out expr); -#line 2092 "VBNET.ATG" +#line 2092 "vbnet.atg" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void UnaryExpr( -#line 2096 "VBNET.ATG" +#line 2096 "vbnet.atg" out Expression uExpr) { -#line 2098 "VBNET.ATG" +#line 2098 "vbnet.atg" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; Location startLocation = la.Location; @@ -5307,25 +5307,25 @@ out Expression uExpr) { if (la.kind == 31) { lexer.NextToken(); -#line 2103 "VBNET.ATG" +#line 2103 "vbnet.atg" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 30) { lexer.NextToken(); -#line 2104 "VBNET.ATG" +#line 2104 "vbnet.atg" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 2105 "VBNET.ATG" +#line 2105 "vbnet.atg" uop = UnaryOperatorType.Dereference; isUOp = true; } } ExponentiationExpr( -#line 2107 "VBNET.ATG" +#line 2107 "vbnet.atg" out expr); -#line 2109 "VBNET.ATG" +#line 2109 "vbnet.atg" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else { @@ -5335,107 +5335,107 @@ out expr); } void ExponentiationExpr( -#line 2117 "VBNET.ATG" +#line 2117 "vbnet.atg" out Expression outExpr) { -#line 2118 "VBNET.ATG" +#line 2118 "vbnet.atg" Expression expr; Location startLocation = la.Location; SimpleExpr( -#line 2120 "VBNET.ATG" +#line 2120 "vbnet.atg" out outExpr); while (la.kind == 32) { lexer.NextToken(); SimpleExpr( -#line 2120 "VBNET.ATG" +#line 2120 "vbnet.atg" out expr); -#line 2120 "VBNET.ATG" +#line 2120 "vbnet.atg" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Power, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void NormalOrReDimArgumentList( -#line 2647 "VBNET.ATG" +#line 2647 "vbnet.atg" out List arguments, out bool canBeNormal, out bool canBeRedim) { -#line 2649 "VBNET.ATG" +#line 2649 "vbnet.atg" arguments = new List(); canBeNormal = true; canBeRedim = !IsNamedAssign(); Expression expr = null; if (StartOf(24)) { Argument( -#line 2654 "VBNET.ATG" +#line 2654 "vbnet.atg" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2655 "VBNET.ATG" +#line 2655 "vbnet.atg" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2656 "VBNET.ATG" +#line 2656 "vbnet.atg" out expr); } } while (la.kind == 22) { lexer.NextToken(); -#line 2659 "VBNET.ATG" +#line 2659 "vbnet.atg" if (expr == null) canBeRedim = false; -#line 2660 "VBNET.ATG" +#line 2660 "vbnet.atg" arguments.Add(expr ?? Expression.Null); expr = null; -#line 2661 "VBNET.ATG" +#line 2661 "vbnet.atg" canBeRedim &= !IsNamedAssign(); if (StartOf(24)) { Argument( -#line 2662 "VBNET.ATG" +#line 2662 "vbnet.atg" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2663 "VBNET.ATG" +#line 2663 "vbnet.atg" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2664 "VBNET.ATG" +#line 2664 "vbnet.atg" out expr); } } -#line 2666 "VBNET.ATG" +#line 2666 "vbnet.atg" if (expr == null) { canBeRedim = false; expr = Expression.Null; } } -#line 2668 "VBNET.ATG" +#line 2668 "vbnet.atg" if (expr != null) arguments.Add(expr); else canBeRedim = false; } void ArrayTypeModifiers( -#line 2778 "VBNET.ATG" +#line 2778 "vbnet.atg" out ArrayList arrayModifiers) { -#line 2780 "VBNET.ATG" +#line 2780 "vbnet.atg" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2783 "VBNET.ATG" +#line 2783 "vbnet.atg" IsDims()) { Expect(37); if (la.kind == 22 || la.kind == 38) { RankList( -#line 2785 "VBNET.ATG" +#line 2785 "vbnet.atg" out i); } -#line 2787 "VBNET.ATG" +#line 2787 "vbnet.atg" arrayModifiers.Add(i); Expect(38); } -#line 2792 "VBNET.ATG" +#line 2792 "vbnet.atg" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -5443,10 +5443,10 @@ out i); } void MemberInitializer( -#line 2614 "VBNET.ATG" +#line 2614 "vbnet.atg" out MemberInitializerExpression memberInitializer) { -#line 2616 "VBNET.ATG" +#line 2616 "vbnet.atg" memberInitializer = new MemberInitializerExpression(); memberInitializer.StartLocation = la.Location; Expression initExpr = null; @@ -5456,19 +5456,19 @@ out MemberInitializerExpression memberInitializer) { if (la.kind == 147) { lexer.NextToken(); -#line 2622 "VBNET.ATG" +#line 2622 "vbnet.atg" isKey = true; } Expect(26); IdentifierOrKeyword( -#line 2623 "VBNET.ATG" +#line 2623 "vbnet.atg" out name); Expect(20); Expr( -#line 2623 "VBNET.ATG" +#line 2623 "vbnet.atg" out initExpr); -#line 2625 "VBNET.ATG" +#line 2625 "vbnet.atg" memberInitializer.Name = name; memberInitializer.Expression = initExpr; memberInitializer.IsKey = isKey; @@ -5477,10 +5477,10 @@ out initExpr); } void SubLambdaExpression( -#line 2219 "VBNET.ATG" +#line 2219 "vbnet.atg" out LambdaExpression lambda) { -#line 2221 "VBNET.ATG" +#line 2221 "vbnet.atg" lambda = new LambdaExpression(); lambda.ReturnType = new TypeReference("System.Void", true); Expression inner = null; @@ -5492,7 +5492,7 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2228 "VBNET.ATG" +#line 2228 "vbnet.atg" lambda.Parameters); } Expect(38); @@ -5500,19 +5500,19 @@ lambda.Parameters); if (StartOf(42)) { if (StartOf(24)) { Expr( -#line 2231 "VBNET.ATG" +#line 2231 "vbnet.atg" out inner); -#line 2233 "VBNET.ATG" +#line 2233 "vbnet.atg" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2237 "VBNET.ATG" +#line 2237 "vbnet.atg" out statement); -#line 2239 "VBNET.ATG" +#line 2239 "vbnet.atg" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5520,12 +5520,12 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2245 "VBNET.ATG" +#line 2245 "vbnet.atg" out statement); Expect(113); Expect(210); -#line 2248 "VBNET.ATG" +#line 2248 "vbnet.atg" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5533,10 +5533,10 @@ out statement); } void FunctionLambdaExpression( -#line 2254 "VBNET.ATG" +#line 2254 "vbnet.atg" out LambdaExpression lambda) { -#line 2256 "VBNET.ATG" +#line 2256 "vbnet.atg" lambda = new LambdaExpression(); TypeReference typeRef = null; Expression inner = null; @@ -5548,7 +5548,7 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2263 "VBNET.ATG" +#line 2263 "vbnet.atg" lambda.Parameters); } Expect(38); @@ -5556,28 +5556,28 @@ lambda.Parameters); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2264 "VBNET.ATG" +#line 2264 "vbnet.atg" out typeRef); -#line 2264 "VBNET.ATG" +#line 2264 "vbnet.atg" lambda.ReturnType = typeRef; } if (StartOf(42)) { if (StartOf(24)) { Expr( -#line 2267 "VBNET.ATG" +#line 2267 "vbnet.atg" out inner); -#line 2269 "VBNET.ATG" +#line 2269 "vbnet.atg" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2273 "VBNET.ATG" +#line 2273 "vbnet.atg" out statement); -#line 2275 "VBNET.ATG" +#line 2275 "vbnet.atg" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5585,12 +5585,12 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2281 "VBNET.ATG" +#line 2281 "vbnet.atg" out statement); Expect(113); Expect(127); -#line 2284 "VBNET.ATG" +#line 2284 "vbnet.atg" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5598,10 +5598,10 @@ out statement); } void EmbeddedStatement( -#line 3064 "VBNET.ATG" +#line 3064 "vbnet.atg" out Statement statement) { -#line 3066 "VBNET.ATG" +#line 3066 "vbnet.atg" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5612,224 +5612,224 @@ out Statement statement) { if (la.kind == 120) { lexer.NextToken(); -#line 3074 "VBNET.ATG" +#line 3074 "vbnet.atg" ExitType exitType = ExitType.None; switch (la.kind) { case 210: { lexer.NextToken(); -#line 3076 "VBNET.ATG" +#line 3076 "vbnet.atg" exitType = ExitType.Sub; break; } case 127: { lexer.NextToken(); -#line 3078 "VBNET.ATG" +#line 3078 "vbnet.atg" exitType = ExitType.Function; break; } case 186: { lexer.NextToken(); -#line 3080 "VBNET.ATG" +#line 3080 "vbnet.atg" exitType = ExitType.Property; break; } case 108: { lexer.NextToken(); -#line 3082 "VBNET.ATG" +#line 3082 "vbnet.atg" exitType = ExitType.Do; break; } case 124: { lexer.NextToken(); -#line 3084 "VBNET.ATG" +#line 3084 "vbnet.atg" exitType = ExitType.For; break; } case 218: { lexer.NextToken(); -#line 3086 "VBNET.ATG" +#line 3086 "vbnet.atg" exitType = ExitType.Try; break; } case 231: { lexer.NextToken(); -#line 3088 "VBNET.ATG" +#line 3088 "vbnet.atg" exitType = ExitType.While; break; } case 197: { lexer.NextToken(); -#line 3090 "VBNET.ATG" +#line 3090 "vbnet.atg" exitType = ExitType.Select; break; } default: SynErr(298); break; } -#line 3092 "VBNET.ATG" +#line 3092 "vbnet.atg" statement = new ExitStatement(exitType); } else if (la.kind == 218) { TryStatement( -#line 3093 "VBNET.ATG" +#line 3093 "vbnet.atg" out statement); } else if (la.kind == 89) { lexer.NextToken(); -#line 3094 "VBNET.ATG" +#line 3094 "vbnet.atg" ContinueType continueType = ContinueType.None; if (la.kind == 108 || la.kind == 124 || la.kind == 231) { if (la.kind == 108) { lexer.NextToken(); -#line 3094 "VBNET.ATG" +#line 3094 "vbnet.atg" continueType = ContinueType.Do; } else if (la.kind == 124) { lexer.NextToken(); -#line 3094 "VBNET.ATG" +#line 3094 "vbnet.atg" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 3094 "VBNET.ATG" +#line 3094 "vbnet.atg" continueType = ContinueType.While; } } -#line 3094 "VBNET.ATG" +#line 3094 "vbnet.atg" statement = new ContinueStatement(continueType); } else if (la.kind == 215) { lexer.NextToken(); if (StartOf(24)) { Expr( -#line 3096 "VBNET.ATG" +#line 3096 "vbnet.atg" out expr); } -#line 3096 "VBNET.ATG" +#line 3096 "vbnet.atg" statement = new ThrowStatement(expr); } else if (la.kind == 195) { lexer.NextToken(); if (StartOf(24)) { Expr( -#line 3098 "VBNET.ATG" +#line 3098 "vbnet.atg" out expr); } -#line 3098 "VBNET.ATG" +#line 3098 "vbnet.atg" statement = new ReturnStatement(expr); } else if (la.kind == 211) { lexer.NextToken(); Expr( -#line 3100 "VBNET.ATG" +#line 3100 "vbnet.atg" out expr); EndOfStmt(); Block( -#line 3100 "VBNET.ATG" +#line 3100 "vbnet.atg" out embeddedStatement); Expect(113); Expect(211); -#line 3101 "VBNET.ATG" +#line 3101 "vbnet.atg" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 189) { lexer.NextToken(); Identifier(); -#line 3103 "VBNET.ATG" +#line 3103 "vbnet.atg" name = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(43)) { ArgumentList( -#line 3104 "VBNET.ATG" +#line 3104 "vbnet.atg" out p); } Expect(38); } -#line 3106 "VBNET.ATG" +#line 3106 "vbnet.atg" statement = new RaiseEventStatement(name, p); } else if (la.kind == 233) { WithStatement( -#line 3109 "VBNET.ATG" +#line 3109 "vbnet.atg" out statement); } else if (la.kind == 56) { lexer.NextToken(); -#line 3111 "VBNET.ATG" +#line 3111 "vbnet.atg" Expression handlerExpr = null; Expr( -#line 3112 "VBNET.ATG" +#line 3112 "vbnet.atg" out expr); Expect(22); Expr( -#line 3112 "VBNET.ATG" +#line 3112 "vbnet.atg" out handlerExpr); -#line 3114 "VBNET.ATG" +#line 3114 "vbnet.atg" statement = new AddHandlerStatement(expr, handlerExpr); } else if (la.kind == 193) { lexer.NextToken(); -#line 3117 "VBNET.ATG" +#line 3117 "vbnet.atg" Expression handlerExpr = null; Expr( -#line 3118 "VBNET.ATG" +#line 3118 "vbnet.atg" out expr); Expect(22); Expr( -#line 3118 "VBNET.ATG" +#line 3118 "vbnet.atg" out handlerExpr); -#line 3120 "VBNET.ATG" +#line 3120 "vbnet.atg" statement = new RemoveHandlerStatement(expr, handlerExpr); } else if (la.kind == 231) { lexer.NextToken(); Expr( -#line 3123 "VBNET.ATG" +#line 3123 "vbnet.atg" out expr); EndOfStmt(); Block( -#line 3124 "VBNET.ATG" +#line 3124 "vbnet.atg" out embeddedStatement); Expect(113); Expect(231); -#line 3126 "VBNET.ATG" +#line 3126 "vbnet.atg" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 108) { lexer.NextToken(); -#line 3131 "VBNET.ATG" +#line 3131 "vbnet.atg" ConditionType conditionType = ConditionType.None; if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 3134 "VBNET.ATG" +#line 3134 "vbnet.atg" out conditionType); Expr( -#line 3134 "VBNET.ATG" +#line 3134 "vbnet.atg" out expr); EndOfStmt(); Block( -#line 3135 "VBNET.ATG" +#line 3135 "vbnet.atg" out embeddedStatement); Expect(152); -#line 3138 "VBNET.ATG" +#line 3138 "vbnet.atg" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5838,26 +5838,26 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 3145 "VBNET.ATG" +#line 3145 "vbnet.atg" out embeddedStatement); Expect(152); if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 3146 "VBNET.ATG" +#line 3146 "vbnet.atg" out conditionType); Expr( -#line 3146 "VBNET.ATG" +#line 3146 "vbnet.atg" out expr); } -#line 3148 "VBNET.ATG" +#line 3148 "vbnet.atg" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); } else SynErr(299); } else if (la.kind == 124) { lexer.NextToken(); -#line 3153 "VBNET.ATG" +#line 3153 "vbnet.atg" Expression group = null; TypeReference typeReference; string typeName; @@ -5865,24 +5865,24 @@ out expr); if (la.kind == 110) { lexer.NextToken(); LoopControlVariable( -#line 3159 "VBNET.ATG" +#line 3159 "vbnet.atg" out typeReference, out typeName); Expect(138); Expr( -#line 3160 "VBNET.ATG" +#line 3160 "vbnet.atg" out group); EndOfStmt(); Block( -#line 3161 "VBNET.ATG" +#line 3161 "vbnet.atg" out embeddedStatement); Expect(163); if (StartOf(24)) { Expr( -#line 3162 "VBNET.ATG" +#line 3162 "vbnet.atg" out expr); } -#line 3164 "VBNET.ATG" +#line 3164 "vbnet.atg" statement = new ForeachStatement(typeReference, typeName, group, @@ -5894,7 +5894,7 @@ out expr); } else if (StartOf(44)) { -#line 3175 "VBNET.ATG" +#line 3175 "vbnet.atg" Expression start = null; Expression end = null; Expression step = null; @@ -5903,59 +5903,59 @@ out expr); List nextExpressions = null; if ( -#line 3182 "VBNET.ATG" +#line 3182 "vbnet.atg" IsLoopVariableDeclaration()) { LoopControlVariable( -#line 3183 "VBNET.ATG" +#line 3183 "vbnet.atg" out typeReference, out typeName); } else { -#line 3185 "VBNET.ATG" +#line 3185 "vbnet.atg" typeReference = null; typeName = null; SimpleExpr( -#line 3186 "VBNET.ATG" +#line 3186 "vbnet.atg" out variableExpr); } Expect(20); Expr( -#line 3188 "VBNET.ATG" +#line 3188 "vbnet.atg" out start); Expect(216); Expr( -#line 3188 "VBNET.ATG" +#line 3188 "vbnet.atg" out end); if (la.kind == 205) { lexer.NextToken(); Expr( -#line 3188 "VBNET.ATG" +#line 3188 "vbnet.atg" out step); } EndOfStmt(); Block( -#line 3189 "VBNET.ATG" +#line 3189 "vbnet.atg" out embeddedStatement); Expect(163); if (StartOf(24)) { Expr( -#line 3192 "VBNET.ATG" +#line 3192 "vbnet.atg" out nextExpr); -#line 3194 "VBNET.ATG" +#line 3194 "vbnet.atg" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3197 "VBNET.ATG" +#line 3197 "vbnet.atg" out nextExpr); -#line 3197 "VBNET.ATG" +#line 3197 "vbnet.atg" nextExpressions.Add(nextExpr); } } -#line 3200 "VBNET.ATG" +#line 3200 "vbnet.atg" statement = new ForNextStatement { TypeReference = typeReference, VariableName = typeName, @@ -5971,27 +5971,27 @@ out nextExpr); } else if (la.kind == 118) { lexer.NextToken(); Expr( -#line 3213 "VBNET.ATG" +#line 3213 "vbnet.atg" out expr); -#line 3213 "VBNET.ATG" +#line 3213 "vbnet.atg" statement = new ErrorStatement(expr); } else if (la.kind == 191) { lexer.NextToken(); -#line 3215 "VBNET.ATG" +#line 3215 "vbnet.atg" bool isPreserve = false; if (la.kind == 184) { lexer.NextToken(); -#line 3215 "VBNET.ATG" +#line 3215 "vbnet.atg" isPreserve = true; } ReDimClause( -#line 3216 "VBNET.ATG" +#line 3216 "vbnet.atg" out expr); -#line 3218 "VBNET.ATG" +#line 3218 "vbnet.atg" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); @@ -5999,48 +5999,48 @@ out expr); while (la.kind == 22) { lexer.NextToken(); ReDimClause( -#line 3222 "VBNET.ATG" +#line 3222 "vbnet.atg" out expr); -#line 3223 "VBNET.ATG" +#line 3223 "vbnet.atg" SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); } } else if (la.kind == 117) { lexer.NextToken(); Expr( -#line 3227 "VBNET.ATG" +#line 3227 "vbnet.atg" out expr); -#line 3229 "VBNET.ATG" +#line 3229 "vbnet.atg" EraseStatement eraseStatement = new EraseStatement(); if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr);} while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3232 "VBNET.ATG" +#line 3232 "vbnet.atg" out expr); -#line 3232 "VBNET.ATG" +#line 3232 "vbnet.atg" if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr); } } -#line 3233 "VBNET.ATG" +#line 3233 "vbnet.atg" statement = eraseStatement; } else if (la.kind == 206) { lexer.NextToken(); -#line 3235 "VBNET.ATG" +#line 3235 "vbnet.atg" statement = new StopStatement(); } else if ( -#line 3237 "VBNET.ATG" +#line 3237 "vbnet.atg" la.kind == Tokens.If) { Expect(135); -#line 3238 "VBNET.ATG" +#line 3238 "vbnet.atg" Location ifStartLocation = t.Location; Expr( -#line 3238 "VBNET.ATG" +#line 3238 "vbnet.atg" out expr); if (la.kind == 214) { lexer.NextToken(); @@ -6048,46 +6048,46 @@ out expr); if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 3241 "VBNET.ATG" +#line 3241 "vbnet.atg" out embeddedStatement); -#line 3243 "VBNET.ATG" +#line 3243 "vbnet.atg" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; Location elseIfStart; while (la.kind == 112 || -#line 3249 "VBNET.ATG" +#line 3249 "vbnet.atg" IsElseIf()) { if ( -#line 3249 "VBNET.ATG" +#line 3249 "vbnet.atg" IsElseIf()) { Expect(111); -#line 3249 "VBNET.ATG" +#line 3249 "vbnet.atg" elseIfStart = t.Location; Expect(135); } else { lexer.NextToken(); -#line 3250 "VBNET.ATG" +#line 3250 "vbnet.atg" elseIfStart = t.Location; } -#line 3252 "VBNET.ATG" +#line 3252 "vbnet.atg" Expression condition = null; Statement block = null; Expr( -#line 3253 "VBNET.ATG" +#line 3253 "vbnet.atg" out condition); if (la.kind == 214) { lexer.NextToken(); } EndOfStmt(); Block( -#line 3254 "VBNET.ATG" +#line 3254 "vbnet.atg" out block); -#line 3256 "VBNET.ATG" +#line 3256 "vbnet.atg" ElseIfSection elseIfSection = new ElseIfSection(condition, block); elseIfSection.StartLocation = elseIfStart; elseIfSection.EndLocation = t.Location; @@ -6101,39 +6101,39 @@ out block); EndOfStmt(); } Block( -#line 3265 "VBNET.ATG" +#line 3265 "vbnet.atg" out embeddedStatement); -#line 3267 "VBNET.ATG" +#line 3267 "vbnet.atg" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(113); Expect(135); -#line 3271 "VBNET.ATG" +#line 3271 "vbnet.atg" ifStatement.EndLocation = t.Location; statement = ifStatement; } else if (StartOf(45)) { -#line 3276 "VBNET.ATG" +#line 3276 "vbnet.atg" IfElseStatement ifStatement = new IfElseStatement(expr); ifStatement.StartLocation = ifStartLocation; SingleLineStatementList( -#line 3279 "VBNET.ATG" +#line 3279 "vbnet.atg" ifStatement.TrueStatement); if (la.kind == 111) { lexer.NextToken(); if (StartOf(45)) { SingleLineStatementList( -#line 3282 "VBNET.ATG" +#line 3282 "vbnet.atg" ifStatement.FalseStatement); } } -#line 3284 "VBNET.ATG" +#line 3284 "vbnet.atg" ifStatement.EndLocation = t.Location; statement = ifStatement; } else SynErr(301); } else if (la.kind == 197) { @@ -6142,82 +6142,82 @@ ifStatement.FalseStatement); lexer.NextToken(); } Expr( -#line 3287 "VBNET.ATG" +#line 3287 "vbnet.atg" out expr); EndOfStmt(); -#line 3288 "VBNET.ATG" +#line 3288 "vbnet.atg" List selectSections = new List(); Statement block = null; while (la.kind == 74) { -#line 3292 "VBNET.ATG" +#line 3292 "vbnet.atg" List caseClauses = null; Location caseLocation = la.Location; lexer.NextToken(); CaseClauses( -#line 3293 "VBNET.ATG" +#line 3293 "vbnet.atg" out caseClauses); if ( -#line 3293 "VBNET.ATG" +#line 3293 "vbnet.atg" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 3295 "VBNET.ATG" +#line 3295 "vbnet.atg" SwitchSection selectSection = new SwitchSection(caseClauses); selectSection.StartLocation = caseLocation; Block( -#line 3298 "VBNET.ATG" +#line 3298 "vbnet.atg" out block); -#line 3300 "VBNET.ATG" +#line 3300 "vbnet.atg" selectSection.Children = block.Children; selectSection.EndLocation = t.EndLocation; selectSections.Add(selectSection); } -#line 3306 "VBNET.ATG" +#line 3306 "vbnet.atg" statement = new SwitchStatement(expr, selectSections); Expect(113); Expect(197); } else if (la.kind == 171) { -#line 3309 "VBNET.ATG" +#line 3309 "vbnet.atg" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 3310 "VBNET.ATG" +#line 3310 "vbnet.atg" out onErrorStatement); -#line 3310 "VBNET.ATG" +#line 3310 "vbnet.atg" statement = onErrorStatement; } else if (la.kind == 132) { -#line 3311 "VBNET.ATG" +#line 3311 "vbnet.atg" GotoStatement goToStatement = null; GotoStatement( -#line 3312 "VBNET.ATG" +#line 3312 "vbnet.atg" out goToStatement); -#line 3312 "VBNET.ATG" +#line 3312 "vbnet.atg" statement = goToStatement; } else if (la.kind == 194) { -#line 3313 "VBNET.ATG" +#line 3313 "vbnet.atg" ResumeStatement resumeStatement = null; ResumeStatement( -#line 3314 "VBNET.ATG" +#line 3314 "vbnet.atg" out resumeStatement); -#line 3314 "VBNET.ATG" +#line 3314 "vbnet.atg" statement = resumeStatement; } else if (StartOf(44)) { -#line 3317 "VBNET.ATG" +#line 3317 "vbnet.atg" Expression val = null; AssignmentOperatorType op; Location startLoc = la.Location; @@ -6226,28 +6226,28 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 3324 "VBNET.ATG" +#line 3324 "vbnet.atg" out expr); if (StartOf(46)) { AssignmentOperator( -#line 3326 "VBNET.ATG" +#line 3326 "vbnet.atg" out op); Expr( -#line 3326 "VBNET.ATG" +#line 3326 "vbnet.atg" out val); -#line 3328 "VBNET.ATG" +#line 3328 "vbnet.atg" expr = new AssignmentExpression(expr, op, val); expr.StartLocation = startLoc; expr.EndLocation = t.EndLocation; } else if (StartOf(47)) { -#line 3332 "VBNET.ATG" +#line 3332 "vbnet.atg" if (mustBeAssignment) Error("error in assignment."); } else SynErr(302); -#line 3335 "VBNET.ATG" +#line 3335 "vbnet.atg" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is MemberReferenceExpression || expr is IdentifierExpression) { @@ -6261,58 +6261,58 @@ out val); } else if (la.kind == 73) { lexer.NextToken(); SimpleExpr( -#line 3345 "VBNET.ATG" +#line 3345 "vbnet.atg" out expr); -#line 3345 "VBNET.ATG" +#line 3345 "vbnet.atg" statement = new ExpressionStatement(expr); } else if (la.kind == 226) { lexer.NextToken(); -#line 3347 "VBNET.ATG" +#line 3347 "vbnet.atg" Statement block; if ( -#line 3348 "VBNET.ATG" +#line 3348 "vbnet.atg" Peek(1).kind == Tokens.As) { -#line 3349 "VBNET.ATG" +#line 3349 "vbnet.atg" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 3350 "VBNET.ATG" +#line 3350 "vbnet.atg" resourceAquisition.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 3352 "VBNET.ATG" +#line 3352 "vbnet.atg" resourceAquisition.Variables); } Block( -#line 3354 "VBNET.ATG" +#line 3354 "vbnet.atg" out block); -#line 3356 "VBNET.ATG" +#line 3356 "vbnet.atg" statement = new UsingStatement(resourceAquisition, block); } else if (StartOf(24)) { Expr( -#line 3358 "VBNET.ATG" +#line 3358 "vbnet.atg" out expr); Block( -#line 3359 "VBNET.ATG" +#line 3359 "vbnet.atg" out block); -#line 3360 "VBNET.ATG" +#line 3360 "vbnet.atg" statement = new UsingStatement(new ExpressionStatement(expr), block); } else SynErr(303); Expect(113); Expect(226); } else if (StartOf(48)) { LocalDeclarationStatement( -#line 3363 "VBNET.ATG" +#line 3363 "vbnet.atg" out statement); } else SynErr(304); -#line 3366 "VBNET.ATG" +#line 3366 "vbnet.atg" if (statement != null) { statement.StartLocation = startLocation; statement.EndLocation = t.EndLocation; @@ -6321,35 +6321,35 @@ out statement); } void FromOrAggregateQueryOperator( -#line 2303 "VBNET.ATG" +#line 2303 "vbnet.atg" List middleClauses) { -#line 2305 "VBNET.ATG" +#line 2305 "vbnet.atg" QueryExpressionFromClause fromClause = null; QueryExpressionAggregateClause aggregateClause = null; if (la.kind == 126) { FromQueryOperator( -#line 2308 "VBNET.ATG" +#line 2308 "vbnet.atg" out fromClause); -#line 2309 "VBNET.ATG" +#line 2309 "vbnet.atg" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2310 "VBNET.ATG" +#line 2310 "vbnet.atg" out aggregateClause); -#line 2311 "VBNET.ATG" +#line 2311 "vbnet.atg" middleClauses.Add(aggregateClause); } else SynErr(305); } void QueryOperator( -#line 2314 "VBNET.ATG" +#line 2314 "vbnet.atg" List middleClauses) { -#line 2316 "VBNET.ATG" +#line 2316 "vbnet.atg" QueryExpressionJoinVBClause joinClause = null; QueryExpressionGroupVBClause groupByClause = null; QueryExpressionPartitionVBClause partitionClause = null; @@ -6359,94 +6359,94 @@ List middleClauses) { if (la.kind == 126) { FromQueryOperator( -#line 2323 "VBNET.ATG" +#line 2323 "vbnet.atg" out fromClause); -#line 2324 "VBNET.ATG" +#line 2324 "vbnet.atg" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2325 "VBNET.ATG" +#line 2325 "vbnet.atg" out aggregateClause); -#line 2326 "VBNET.ATG" +#line 2326 "vbnet.atg" middleClauses.Add(aggregateClause); } else if (la.kind == 197) { SelectQueryOperator( -#line 2327 "VBNET.ATG" +#line 2327 "vbnet.atg" middleClauses); } else if (la.kind == 107) { DistinctQueryOperator( -#line 2328 "VBNET.ATG" +#line 2328 "vbnet.atg" middleClauses); } else if (la.kind == 230) { WhereQueryOperator( -#line 2329 "VBNET.ATG" +#line 2329 "vbnet.atg" middleClauses); } else if (la.kind == 176) { OrderByQueryOperator( -#line 2330 "VBNET.ATG" +#line 2330 "vbnet.atg" middleClauses); } else if (la.kind == 203 || la.kind == 212) { PartitionQueryOperator( -#line 2331 "VBNET.ATG" +#line 2331 "vbnet.atg" out partitionClause); -#line 2332 "VBNET.ATG" +#line 2332 "vbnet.atg" middleClauses.Add(partitionClause); } else if (la.kind == 148) { LetQueryOperator( -#line 2333 "VBNET.ATG" +#line 2333 "vbnet.atg" middleClauses); } else if (la.kind == 146) { JoinQueryOperator( -#line 2334 "VBNET.ATG" +#line 2334 "vbnet.atg" out joinClause); -#line 2335 "VBNET.ATG" +#line 2335 "vbnet.atg" middleClauses.Add(joinClause); } else if ( -#line 2336 "VBNET.ATG" +#line 2336 "vbnet.atg" la.kind == Tokens.Group && Peek(1).kind == Tokens.Join) { GroupJoinQueryOperator( -#line 2336 "VBNET.ATG" +#line 2336 "vbnet.atg" out groupJoinClause); -#line 2337 "VBNET.ATG" +#line 2337 "vbnet.atg" middleClauses.Add(groupJoinClause); } else if (la.kind == 133) { GroupByQueryOperator( -#line 2338 "VBNET.ATG" +#line 2338 "vbnet.atg" out groupByClause); -#line 2339 "VBNET.ATG" +#line 2339 "vbnet.atg" middleClauses.Add(groupByClause); } else SynErr(306); } void FromQueryOperator( -#line 2414 "VBNET.ATG" +#line 2414 "vbnet.atg" out QueryExpressionFromClause fromClause) { -#line 2416 "VBNET.ATG" +#line 2416 "vbnet.atg" fromClause = new QueryExpressionFromClause(); fromClause.StartLocation = la.Location; Expect(126); CollectionRangeVariableDeclarationList( -#line 2419 "VBNET.ATG" +#line 2419 "vbnet.atg" fromClause.Sources); -#line 2421 "VBNET.ATG" +#line 2421 "vbnet.atg" fromClause.EndLocation = t.EndLocation; } void AggregateQueryOperator( -#line 2483 "VBNET.ATG" +#line 2483 "vbnet.atg" out QueryExpressionAggregateClause aggregateClause) { -#line 2485 "VBNET.ATG" +#line 2485 "vbnet.atg" aggregateClause = new QueryExpressionAggregateClause(); aggregateClause.IntoVariables = new List(); aggregateClause.StartLocation = la.Location; @@ -6454,77 +6454,77 @@ out QueryExpressionAggregateClause aggregateClause) { Expect(58); CollectionRangeVariableDeclaration( -#line 2490 "VBNET.ATG" +#line 2490 "vbnet.atg" out source); -#line 2492 "VBNET.ATG" +#line 2492 "vbnet.atg" aggregateClause.Source = source; while (StartOf(31)) { QueryOperator( -#line 2495 "VBNET.ATG" +#line 2495 "vbnet.atg" aggregateClause.MiddleClauses); } Expect(143); ExpressionRangeVariableDeclarationList( -#line 2497 "VBNET.ATG" +#line 2497 "vbnet.atg" aggregateClause.IntoVariables); -#line 2499 "VBNET.ATG" +#line 2499 "vbnet.atg" aggregateClause.EndLocation = t.EndLocation; } void SelectQueryOperator( -#line 2425 "VBNET.ATG" +#line 2425 "vbnet.atg" List middleClauses) { -#line 2427 "VBNET.ATG" +#line 2427 "vbnet.atg" QueryExpressionSelectVBClause selectClause = new QueryExpressionSelectVBClause(); selectClause.StartLocation = la.Location; Expect(197); ExpressionRangeVariableDeclarationList( -#line 2430 "VBNET.ATG" +#line 2430 "vbnet.atg" selectClause.Variables); -#line 2432 "VBNET.ATG" +#line 2432 "vbnet.atg" selectClause.EndLocation = t.Location; middleClauses.Add(selectClause); } void DistinctQueryOperator( -#line 2437 "VBNET.ATG" +#line 2437 "vbnet.atg" List middleClauses) { -#line 2439 "VBNET.ATG" +#line 2439 "vbnet.atg" QueryExpressionDistinctClause distinctClause = new QueryExpressionDistinctClause(); distinctClause.StartLocation = la.Location; Expect(107); -#line 2444 "VBNET.ATG" +#line 2444 "vbnet.atg" distinctClause.EndLocation = t.EndLocation; middleClauses.Add(distinctClause); } void WhereQueryOperator( -#line 2449 "VBNET.ATG" +#line 2449 "vbnet.atg" List middleClauses) { -#line 2451 "VBNET.ATG" +#line 2451 "vbnet.atg" QueryExpressionWhereClause whereClause = new QueryExpressionWhereClause(); whereClause.StartLocation = la.Location; Expression operand = null; Expect(230); Expr( -#line 2455 "VBNET.ATG" +#line 2455 "vbnet.atg" out operand); -#line 2457 "VBNET.ATG" +#line 2457 "vbnet.atg" whereClause.Condition = operand; whereClause.EndLocation = t.EndLocation; @@ -6533,10 +6533,10 @@ out operand); } void OrderByQueryOperator( -#line 2342 "VBNET.ATG" +#line 2342 "vbnet.atg" List middleClauses) { -#line 2344 "VBNET.ATG" +#line 2344 "vbnet.atg" QueryExpressionOrderClause orderClause = new QueryExpressionOrderClause(); orderClause.StartLocation = la.Location; List orderings = null; @@ -6544,10 +6544,10 @@ List middleClauses) { Expect(176); Expect(70); OrderExpressionList( -#line 2348 "VBNET.ATG" +#line 2348 "vbnet.atg" out orderings); -#line 2350 "VBNET.ATG" +#line 2350 "vbnet.atg" orderClause.Orderings = orderings; orderClause.EndLocation = t.EndLocation; middleClauses.Add(orderClause); @@ -6555,10 +6555,10 @@ out orderings); } void PartitionQueryOperator( -#line 2464 "VBNET.ATG" +#line 2464 "vbnet.atg" out QueryExpressionPartitionVBClause partitionClause) { -#line 2466 "VBNET.ATG" +#line 2466 "vbnet.atg" partitionClause = new QueryExpressionPartitionVBClause(); partitionClause.StartLocation = la.Location; Expression expr = null; @@ -6566,60 +6566,60 @@ out QueryExpressionPartitionVBClause partitionClause) { if (la.kind == 212) { lexer.NextToken(); -#line 2471 "VBNET.ATG" +#line 2471 "vbnet.atg" partitionClause.PartitionType = QueryExpressionPartitionType.Take; if (la.kind == 231) { lexer.NextToken(); -#line 2472 "VBNET.ATG" +#line 2472 "vbnet.atg" partitionClause.PartitionType = QueryExpressionPartitionType.TakeWhile; } } else if (la.kind == 203) { lexer.NextToken(); -#line 2473 "VBNET.ATG" +#line 2473 "vbnet.atg" partitionClause.PartitionType = QueryExpressionPartitionType.Skip; if (la.kind == 231) { lexer.NextToken(); -#line 2474 "VBNET.ATG" +#line 2474 "vbnet.atg" partitionClause.PartitionType = QueryExpressionPartitionType.SkipWhile; } } else SynErr(307); Expr( -#line 2476 "VBNET.ATG" +#line 2476 "vbnet.atg" out expr); -#line 2478 "VBNET.ATG" +#line 2478 "vbnet.atg" partitionClause.Expression = expr; partitionClause.EndLocation = t.EndLocation; } void LetQueryOperator( -#line 2503 "VBNET.ATG" +#line 2503 "vbnet.atg" List middleClauses) { -#line 2505 "VBNET.ATG" +#line 2505 "vbnet.atg" QueryExpressionLetVBClause letClause = new QueryExpressionLetVBClause(); letClause.StartLocation = la.Location; Expect(148); ExpressionRangeVariableDeclarationList( -#line 2508 "VBNET.ATG" +#line 2508 "vbnet.atg" letClause.Variables); -#line 2510 "VBNET.ATG" +#line 2510 "vbnet.atg" letClause.EndLocation = t.EndLocation; middleClauses.Add(letClause); } void JoinQueryOperator( -#line 2547 "VBNET.ATG" +#line 2547 "vbnet.atg" out QueryExpressionJoinVBClause joinClause) { -#line 2549 "VBNET.ATG" +#line 2549 "vbnet.atg" joinClause = new QueryExpressionJoinVBClause(); joinClause.StartLocation = la.Location; CollectionRangeVariable joinVariable = null; @@ -6629,203 +6629,203 @@ out QueryExpressionJoinVBClause joinClause) { Expect(146); CollectionRangeVariableDeclaration( -#line 2556 "VBNET.ATG" +#line 2556 "vbnet.atg" out joinVariable); -#line 2557 "VBNET.ATG" +#line 2557 "vbnet.atg" joinClause.JoinVariable = joinVariable; if (la.kind == 146) { JoinQueryOperator( -#line 2559 "VBNET.ATG" +#line 2559 "vbnet.atg" out subJoin); -#line 2560 "VBNET.ATG" +#line 2560 "vbnet.atg" joinClause.SubJoin = subJoin; } Expect(171); JoinCondition( -#line 2563 "VBNET.ATG" +#line 2563 "vbnet.atg" out condition); -#line 2564 "VBNET.ATG" +#line 2564 "vbnet.atg" SafeAdd(joinClause, joinClause.Conditions, condition); while (la.kind == 60) { lexer.NextToken(); JoinCondition( -#line 2566 "VBNET.ATG" +#line 2566 "vbnet.atg" out condition); -#line 2567 "VBNET.ATG" +#line 2567 "vbnet.atg" SafeAdd(joinClause, joinClause.Conditions, condition); } -#line 2570 "VBNET.ATG" +#line 2570 "vbnet.atg" joinClause.EndLocation = t.EndLocation; } void GroupJoinQueryOperator( -#line 2400 "VBNET.ATG" +#line 2400 "vbnet.atg" out QueryExpressionGroupJoinVBClause groupJoinClause) { -#line 2402 "VBNET.ATG" +#line 2402 "vbnet.atg" groupJoinClause = new QueryExpressionGroupJoinVBClause(); groupJoinClause.StartLocation = la.Location; QueryExpressionJoinVBClause joinClause = null; Expect(133); JoinQueryOperator( -#line 2406 "VBNET.ATG" +#line 2406 "vbnet.atg" out joinClause); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2407 "VBNET.ATG" +#line 2407 "vbnet.atg" groupJoinClause.IntoVariables); -#line 2409 "VBNET.ATG" +#line 2409 "vbnet.atg" groupJoinClause.JoinClause = joinClause; groupJoinClause.EndLocation = t.EndLocation; } void GroupByQueryOperator( -#line 2387 "VBNET.ATG" +#line 2387 "vbnet.atg" out QueryExpressionGroupVBClause groupByClause) { -#line 2389 "VBNET.ATG" +#line 2389 "vbnet.atg" groupByClause = new QueryExpressionGroupVBClause(); groupByClause.StartLocation = la.Location; Expect(133); ExpressionRangeVariableDeclarationList( -#line 2392 "VBNET.ATG" +#line 2392 "vbnet.atg" groupByClause.GroupVariables); Expect(70); ExpressionRangeVariableDeclarationList( -#line 2393 "VBNET.ATG" +#line 2393 "vbnet.atg" groupByClause.ByVariables); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2394 "VBNET.ATG" +#line 2394 "vbnet.atg" groupByClause.IntoVariables); -#line 2396 "VBNET.ATG" +#line 2396 "vbnet.atg" groupByClause.EndLocation = t.EndLocation; } void OrderExpressionList( -#line 2356 "VBNET.ATG" +#line 2356 "vbnet.atg" out List orderings) { -#line 2358 "VBNET.ATG" +#line 2358 "vbnet.atg" orderings = new List(); QueryExpressionOrdering ordering = null; OrderExpression( -#line 2361 "VBNET.ATG" +#line 2361 "vbnet.atg" out ordering); -#line 2362 "VBNET.ATG" +#line 2362 "vbnet.atg" orderings.Add(ordering); while (la.kind == 22) { lexer.NextToken(); OrderExpression( -#line 2364 "VBNET.ATG" +#line 2364 "vbnet.atg" out ordering); -#line 2365 "VBNET.ATG" +#line 2365 "vbnet.atg" orderings.Add(ordering); } } void OrderExpression( -#line 2369 "VBNET.ATG" +#line 2369 "vbnet.atg" out QueryExpressionOrdering ordering) { -#line 2371 "VBNET.ATG" +#line 2371 "vbnet.atg" ordering = new QueryExpressionOrdering(); ordering.StartLocation = la.Location; ordering.Direction = QueryExpressionOrderingDirection.None; Expression orderExpr = null; Expr( -#line 2376 "VBNET.ATG" +#line 2376 "vbnet.atg" out orderExpr); -#line 2378 "VBNET.ATG" +#line 2378 "vbnet.atg" ordering.Criteria = orderExpr; if (la.kind == 64 || la.kind == 104) { if (la.kind == 64) { lexer.NextToken(); -#line 2381 "VBNET.ATG" +#line 2381 "vbnet.atg" ordering.Direction = QueryExpressionOrderingDirection.Ascending; } else { lexer.NextToken(); -#line 2382 "VBNET.ATG" +#line 2382 "vbnet.atg" ordering.Direction = QueryExpressionOrderingDirection.Descending; } } -#line 2384 "VBNET.ATG" +#line 2384 "vbnet.atg" ordering.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclarationList( -#line 2515 "VBNET.ATG" +#line 2515 "vbnet.atg" List variables) { -#line 2517 "VBNET.ATG" +#line 2517 "vbnet.atg" ExpressionRangeVariable variable = null; ExpressionRangeVariableDeclaration( -#line 2519 "VBNET.ATG" +#line 2519 "vbnet.atg" out variable); -#line 2520 "VBNET.ATG" +#line 2520 "vbnet.atg" variables.Add(variable); while (la.kind == 22) { lexer.NextToken(); ExpressionRangeVariableDeclaration( -#line 2521 "VBNET.ATG" +#line 2521 "vbnet.atg" out variable); -#line 2521 "VBNET.ATG" +#line 2521 "vbnet.atg" variables.Add(variable); } } void CollectionRangeVariableDeclarationList( -#line 2574 "VBNET.ATG" +#line 2574 "vbnet.atg" List rangeVariables) { -#line 2575 "VBNET.ATG" +#line 2575 "vbnet.atg" CollectionRangeVariable variableDeclaration; CollectionRangeVariableDeclaration( -#line 2577 "VBNET.ATG" +#line 2577 "vbnet.atg" out variableDeclaration); -#line 2578 "VBNET.ATG" +#line 2578 "vbnet.atg" rangeVariables.Add(variableDeclaration); while (la.kind == 22) { lexer.NextToken(); CollectionRangeVariableDeclaration( -#line 2579 "VBNET.ATG" +#line 2579 "vbnet.atg" out variableDeclaration); -#line 2579 "VBNET.ATG" +#line 2579 "vbnet.atg" rangeVariables.Add(variableDeclaration); } } void CollectionRangeVariableDeclaration( -#line 2582 "VBNET.ATG" +#line 2582 "vbnet.atg" out CollectionRangeVariable rangeVariable) { -#line 2584 "VBNET.ATG" +#line 2584 "vbnet.atg" rangeVariable = new CollectionRangeVariable(); rangeVariable.StartLocation = la.Location; TypeReference typeName = null; @@ -6833,71 +6833,71 @@ out CollectionRangeVariable rangeVariable) { Identifier(); -#line 2589 "VBNET.ATG" +#line 2589 "vbnet.atg" rangeVariable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2590 "VBNET.ATG" +#line 2590 "vbnet.atg" out typeName); -#line 2590 "VBNET.ATG" +#line 2590 "vbnet.atg" rangeVariable.Type = typeName; } Expect(138); Expr( -#line 2591 "VBNET.ATG" +#line 2591 "vbnet.atg" out inExpr); -#line 2593 "VBNET.ATG" +#line 2593 "vbnet.atg" rangeVariable.Expression = inExpr; rangeVariable.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclaration( -#line 2524 "VBNET.ATG" +#line 2524 "vbnet.atg" out ExpressionRangeVariable variable) { -#line 2526 "VBNET.ATG" +#line 2526 "vbnet.atg" variable = new ExpressionRangeVariable(); variable.StartLocation = la.Location; Expression rhs = null; TypeReference typeName = null; if ( -#line 2532 "VBNET.ATG" +#line 2532 "vbnet.atg" IsIdentifiedExpressionRange()) { Identifier(); -#line 2533 "VBNET.ATG" +#line 2533 "vbnet.atg" variable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2535 "VBNET.ATG" +#line 2535 "vbnet.atg" out typeName); -#line 2536 "VBNET.ATG" +#line 2536 "vbnet.atg" variable.Type = typeName; } Expect(20); } Expr( -#line 2540 "VBNET.ATG" +#line 2540 "vbnet.atg" out rhs); -#line 2542 "VBNET.ATG" +#line 2542 "vbnet.atg" variable.Expression = rhs; variable.EndLocation = t.EndLocation; } void JoinCondition( -#line 2598 "VBNET.ATG" +#line 2598 "vbnet.atg" out QueryExpressionJoinConditionVB condition) { -#line 2600 "VBNET.ATG" +#line 2600 "vbnet.atg" condition = new QueryExpressionJoinConditionVB(); condition.StartLocation = la.Location; @@ -6905,14 +6905,14 @@ out QueryExpressionJoinConditionVB condition) { Expression rhs = null; Expr( -#line 2606 "VBNET.ATG" +#line 2606 "vbnet.atg" out lhs); Expect(116); Expr( -#line 2606 "VBNET.ATG" +#line 2606 "vbnet.atg" out rhs); -#line 2608 "VBNET.ATG" +#line 2608 "vbnet.atg" condition.LeftSide = lhs; condition.RightSide = rhs; condition.EndLocation = t.EndLocation; @@ -6920,69 +6920,69 @@ out rhs); } void Argument( -#line 2672 "VBNET.ATG" +#line 2672 "vbnet.atg" out Expression argumentexpr) { -#line 2674 "VBNET.ATG" +#line 2674 "vbnet.atg" Expression expr; argumentexpr = null; string name; Location startLocation = la.Location; if ( -#line 2679 "VBNET.ATG" +#line 2679 "vbnet.atg" IsNamedAssign()) { Identifier(); -#line 2679 "VBNET.ATG" +#line 2679 "vbnet.atg" name = t.val; Expect(55); Expr( -#line 2679 "VBNET.ATG" +#line 2679 "vbnet.atg" out expr); -#line 2681 "VBNET.ATG" +#line 2681 "vbnet.atg" argumentexpr = new NamedArgumentExpression(name, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else if (StartOf(24)) { Expr( -#line 2684 "VBNET.ATG" +#line 2684 "vbnet.atg" out argumentexpr); } else SynErr(308); } void QualIdentAndTypeArguments( -#line 2752 "VBNET.ATG" +#line 2752 "vbnet.atg" out TypeReference typeref, bool canBeUnbound) { -#line 2753 "VBNET.ATG" +#line 2753 "vbnet.atg" string name; typeref = null; Qualident( -#line 2755 "VBNET.ATG" +#line 2755 "vbnet.atg" out name); -#line 2756 "VBNET.ATG" +#line 2756 "vbnet.atg" typeref = new TypeReference(name); if ( -#line 2757 "VBNET.ATG" +#line 2757 "vbnet.atg" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); if ( -#line 2759 "VBNET.ATG" +#line 2759 "vbnet.atg" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2760 "VBNET.ATG" +#line 2760 "vbnet.atg" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 22) { lexer.NextToken(); -#line 2761 "VBNET.ATG" +#line 2761 "vbnet.atg" typeref.GenericTypes.Add(NullTypeReference.Instance); } } else if (StartOf(8)) { TypeArgumentList( -#line 2762 "VBNET.ATG" +#line 2762 "vbnet.atg" typeref.GenericTypes); } else SynErr(309); Expect(38); @@ -6990,24 +6990,24 @@ typeref.GenericTypes); } void RankList( -#line 2799 "VBNET.ATG" +#line 2799 "vbnet.atg" out int i) { -#line 2800 "VBNET.ATG" +#line 2800 "vbnet.atg" i = 0; while (la.kind == 22) { lexer.NextToken(); -#line 2801 "VBNET.ATG" +#line 2801 "vbnet.atg" ++i; } } void Attribute( -#line 2840 "VBNET.ATG" +#line 2840 "vbnet.atg" out ASTAttribute attribute) { -#line 2842 "VBNET.ATG" +#line 2842 "vbnet.atg" string name; List positional = new List(); List named = new List(); @@ -7018,43 +7018,43 @@ out ASTAttribute attribute) { Expect(26); } Qualident( -#line 2848 "VBNET.ATG" +#line 2848 "vbnet.atg" out name); if (la.kind == 37) { AttributeArguments( -#line 2849 "VBNET.ATG" +#line 2849 "vbnet.atg" positional, named); } -#line 2851 "VBNET.ATG" +#line 2851 "vbnet.atg" attribute = new ASTAttribute(name, positional, named) { StartLocation = startLocation, EndLocation = t.EndLocation }; } void AttributeArguments( -#line 2856 "VBNET.ATG" +#line 2856 "vbnet.atg" List positional, List named) { -#line 2858 "VBNET.ATG" +#line 2858 "vbnet.atg" bool nameFound = false; string name = ""; Expression expr; Expect(37); if ( -#line 2864 "VBNET.ATG" +#line 2864 "vbnet.atg" IsNotClosingParenthesis()) { -#line 2865 "VBNET.ATG" +#line 2865 "vbnet.atg" Location startLocation = la.Location; if ( -#line 2867 "VBNET.ATG" +#line 2867 "vbnet.atg" IsNamedAssign()) { -#line 2867 "VBNET.ATG" +#line 2867 "vbnet.atg" nameFound = true; IdentifierOrKeyword( -#line 2868 "VBNET.ATG" +#line 2868 "vbnet.atg" out name); if (la.kind == 55) { lexer.NextToken(); @@ -7063,10 +7063,10 @@ out name); } else SynErr(310); } Expr( -#line 2870 "VBNET.ATG" +#line 2870 "vbnet.atg" out expr); -#line 2872 "VBNET.ATG" +#line 2872 "vbnet.atg" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }); name = ""; } @@ -7075,13 +7075,13 @@ out expr); while (la.kind == 22) { lexer.NextToken(); if ( -#line 2880 "VBNET.ATG" +#line 2880 "vbnet.atg" IsNamedAssign()) { -#line 2880 "VBNET.ATG" +#line 2880 "vbnet.atg" nameFound = true; IdentifierOrKeyword( -#line 2881 "VBNET.ATG" +#line 2881 "vbnet.atg" out name); if (la.kind == 55) { lexer.NextToken(); @@ -7090,14 +7090,14 @@ out name); } else SynErr(311); } else if (StartOf(24)) { -#line 2883 "VBNET.ATG" +#line 2883 "vbnet.atg" if (nameFound) Error("no positional argument after named argument"); } else SynErr(312); Expr( -#line 2884 "VBNET.ATG" +#line 2884 "vbnet.atg" out expr); -#line 2884 "VBNET.ATG" +#line 2884 "vbnet.atg" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }); name = ""; } } @@ -7108,34 +7108,34 @@ out expr); } void ParameterModifier( -#line 3695 "VBNET.ATG" +#line 3695 "vbnet.atg" ParamModifierList m) { if (la.kind == 72) { lexer.NextToken(); -#line 3696 "VBNET.ATG" +#line 3696 "vbnet.atg" m.Add(ParameterModifiers.In); } else if (la.kind == 69) { lexer.NextToken(); -#line 3697 "VBNET.ATG" +#line 3697 "vbnet.atg" m.Add(ParameterModifiers.Ref); } else if (la.kind == 174) { lexer.NextToken(); -#line 3698 "VBNET.ATG" +#line 3698 "vbnet.atg" m.Add(ParameterModifiers.Optional); } else if (la.kind == 182) { lexer.NextToken(); -#line 3699 "VBNET.ATG" +#line 3699 "vbnet.atg" m.Add(ParameterModifiers.Params); } else SynErr(313); } void Statement() { -#line 3011 "VBNET.ATG" +#line 3011 "vbnet.atg" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -7143,27 +7143,27 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 21) { } else if ( -#line 3017 "VBNET.ATG" +#line 3017 "vbnet.atg" IsLabel()) { LabelName( -#line 3017 "VBNET.ATG" +#line 3017 "vbnet.atg" out label); -#line 3019 "VBNET.ATG" +#line 3019 "vbnet.atg" AddChild(new LabelStatement(t.val)); Expect(21); Statement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 3022 "VBNET.ATG" +#line 3022 "vbnet.atg" out stmt); -#line 3022 "VBNET.ATG" +#line 3022 "vbnet.atg" AddChild(stmt); } else SynErr(314); -#line 3025 "VBNET.ATG" +#line 3025 "vbnet.atg" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -7172,30 +7172,30 @@ out stmt); } void LabelName( -#line 3465 "VBNET.ATG" +#line 3465 "vbnet.atg" out string name) { -#line 3467 "VBNET.ATG" +#line 3467 "vbnet.atg" name = String.Empty; if (StartOf(4)) { Identifier(); -#line 3469 "VBNET.ATG" +#line 3469 "vbnet.atg" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 3470 "VBNET.ATG" +#line 3470 "vbnet.atg" name = t.val; } else SynErr(315); } void LocalDeclarationStatement( -#line 3033 "VBNET.ATG" +#line 3033 "vbnet.atg" out Statement statement) { -#line 3035 "VBNET.ATG" +#line 3035 "vbnet.atg" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -7204,22 +7204,22 @@ out Statement statement) { if (la.kind == 88) { lexer.NextToken(); -#line 3041 "VBNET.ATG" +#line 3041 "vbnet.atg" m.Add(Modifiers.Const, t.Location); } else if (la.kind == 204) { lexer.NextToken(); -#line 3042 "VBNET.ATG" +#line 3042 "vbnet.atg" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 3043 "VBNET.ATG" +#line 3043 "vbnet.atg" dimfound = true; } } -#line 3046 "VBNET.ATG" +#line 3046 "vbnet.atg" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -7232,135 +7232,135 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 3057 "VBNET.ATG" +#line 3057 "vbnet.atg" localVariableDeclaration.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 3058 "VBNET.ATG" +#line 3058 "vbnet.atg" localVariableDeclaration.Variables); } -#line 3060 "VBNET.ATG" +#line 3060 "vbnet.atg" statement = localVariableDeclaration; } void TryStatement( -#line 3583 "VBNET.ATG" +#line 3583 "vbnet.atg" out Statement tryStatement) { -#line 3585 "VBNET.ATG" +#line 3585 "vbnet.atg" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(218); EndOfStmt(); Block( -#line 3588 "VBNET.ATG" +#line 3588 "vbnet.atg" out blockStmt); if (la.kind == 75 || la.kind == 113 || la.kind == 123) { CatchClauses( -#line 3589 "VBNET.ATG" +#line 3589 "vbnet.atg" out catchClauses); } if (la.kind == 123) { lexer.NextToken(); EndOfStmt(); Block( -#line 3590 "VBNET.ATG" +#line 3590 "vbnet.atg" out finallyStmt); } Expect(113); Expect(218); -#line 3593 "VBNET.ATG" +#line 3593 "vbnet.atg" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 3563 "VBNET.ATG" +#line 3563 "vbnet.atg" out Statement withStatement) { -#line 3565 "VBNET.ATG" +#line 3565 "vbnet.atg" Statement blockStmt = null; Expression expr = null; Expect(233); -#line 3568 "VBNET.ATG" +#line 3568 "vbnet.atg" Location start = t.Location; Expr( -#line 3569 "VBNET.ATG" +#line 3569 "vbnet.atg" out expr); EndOfStmt(); -#line 3571 "VBNET.ATG" +#line 3571 "vbnet.atg" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 3574 "VBNET.ATG" +#line 3574 "vbnet.atg" out blockStmt); -#line 3576 "VBNET.ATG" +#line 3576 "vbnet.atg" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; Expect(113); Expect(233); -#line 3579 "VBNET.ATG" +#line 3579 "vbnet.atg" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 3556 "VBNET.ATG" +#line 3556 "vbnet.atg" out ConditionType conditionType) { -#line 3557 "VBNET.ATG" +#line 3557 "vbnet.atg" conditionType = ConditionType.None; if (la.kind == 231) { lexer.NextToken(); -#line 3558 "VBNET.ATG" +#line 3558 "vbnet.atg" conditionType = ConditionType.While; } else if (la.kind == 224) { lexer.NextToken(); -#line 3559 "VBNET.ATG" +#line 3559 "vbnet.atg" conditionType = ConditionType.Until; } else SynErr(316); } void LoopControlVariable( -#line 3387 "VBNET.ATG" +#line 3387 "vbnet.atg" out TypeReference type, out string name) { -#line 3388 "VBNET.ATG" +#line 3388 "vbnet.atg" ArrayList arrayModifiers = null; type = null; Qualident( -#line 3392 "VBNET.ATG" +#line 3392 "vbnet.atg" out name); if ( -#line 3393 "VBNET.ATG" +#line 3393 "vbnet.atg" IsDims()) { ArrayTypeModifiers( -#line 3393 "VBNET.ATG" +#line 3393 "vbnet.atg" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3394 "VBNET.ATG" +#line 3394 "vbnet.atg" out type); -#line 3394 "VBNET.ATG" +#line 3394 "vbnet.atg" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 3396 "VBNET.ATG" +#line 3396 "vbnet.atg" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -7372,34 +7372,34 @@ out type); } void ReDimClause( -#line 3474 "VBNET.ATG" +#line 3474 "vbnet.atg" out Expression expr) { SimpleNonInvocationExpression( -#line 3476 "VBNET.ATG" +#line 3476 "vbnet.atg" out expr); ReDimClauseInternal( -#line 3477 "VBNET.ATG" +#line 3477 "vbnet.atg" ref expr); } void SingleLineStatementList( -#line 3373 "VBNET.ATG" +#line 3373 "vbnet.atg" List list) { -#line 3374 "VBNET.ATG" +#line 3374 "vbnet.atg" Statement embeddedStatement = null; if (la.kind == 113) { lexer.NextToken(); -#line 3376 "VBNET.ATG" +#line 3376 "vbnet.atg" embeddedStatement = new EndStatement() { StartLocation = t.Location, EndLocation = t.EndLocation }; } else if (StartOf(49)) { EmbeddedStatement( -#line 3377 "VBNET.ATG" +#line 3377 "vbnet.atg" out embeddedStatement); } else SynErr(317); -#line 3378 "VBNET.ATG" +#line 3378 "vbnet.atg" if (embeddedStatement != null) list.Add(embeddedStatement); while (la.kind == 21) { lexer.NextToken(); @@ -7409,49 +7409,49 @@ out embeddedStatement); if (la.kind == 113) { lexer.NextToken(); -#line 3380 "VBNET.ATG" +#line 3380 "vbnet.atg" embeddedStatement = new EndStatement() { StartLocation = t.Location, EndLocation = t.EndLocation }; } else if (StartOf(49)) { EmbeddedStatement( -#line 3381 "VBNET.ATG" +#line 3381 "vbnet.atg" out embeddedStatement); } else SynErr(318); -#line 3382 "VBNET.ATG" +#line 3382 "vbnet.atg" if (embeddedStatement != null) list.Add(embeddedStatement); } } void CaseClauses( -#line 3516 "VBNET.ATG" +#line 3516 "vbnet.atg" out List caseClauses) { -#line 3518 "VBNET.ATG" +#line 3518 "vbnet.atg" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 3521 "VBNET.ATG" +#line 3521 "vbnet.atg" out caseClause); -#line 3521 "VBNET.ATG" +#line 3521 "vbnet.atg" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 22) { lexer.NextToken(); CaseClause( -#line 3522 "VBNET.ATG" +#line 3522 "vbnet.atg" out caseClause); -#line 3522 "VBNET.ATG" +#line 3522 "vbnet.atg" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 3407 "VBNET.ATG" +#line 3407 "vbnet.atg" out OnErrorStatement stmt) { -#line 3409 "VBNET.ATG" +#line 3409 "vbnet.atg" stmt = null; Location startLocation = la.Location; GotoStatement goToStatement = null; @@ -7459,13 +7459,13 @@ out OnErrorStatement stmt) { Expect(171); Expect(118); if ( -#line 3416 "VBNET.ATG" +#line 3416 "vbnet.atg" IsNegativeLabelName()) { Expect(132); Expect(30); Expect(5); -#line 3418 "VBNET.ATG" +#line 3418 "vbnet.atg" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -7474,10 +7474,10 @@ IsNegativeLabelName()) { } else if (la.kind == 132) { GotoStatement( -#line 3424 "VBNET.ATG" +#line 3424 "vbnet.atg" out goToStatement); -#line 3426 "VBNET.ATG" +#line 3426 "vbnet.atg" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -7494,12 +7494,12 @@ out goToStatement); lexer.NextToken(); Expect(163); -#line 3440 "VBNET.ATG" +#line 3440 "vbnet.atg" stmt = new OnErrorStatement(new ResumeStatement(true)); } else SynErr(319); -#line 3444 "VBNET.ATG" +#line 3444 "vbnet.atg" if (stmt != null) { stmt.StartLocation = startLocation; stmt.EndLocation = t.EndLocation; @@ -7508,17 +7508,17 @@ out goToStatement); } void GotoStatement( -#line 3452 "VBNET.ATG" +#line 3452 "vbnet.atg" out GotoStatement goToStatement) { -#line 3453 "VBNET.ATG" +#line 3453 "vbnet.atg" string label = String.Empty; Location startLocation = la.Location; Expect(132); LabelName( -#line 3455 "VBNET.ATG" +#line 3455 "vbnet.atg" out label); -#line 3457 "VBNET.ATG" +#line 3457 "vbnet.atg" goToStatement = new GotoStatement(label) { StartLocation = startLocation, EndLocation = t.EndLocation @@ -7527,57 +7527,57 @@ out label); } void ResumeStatement( -#line 3505 "VBNET.ATG" +#line 3505 "vbnet.atg" out ResumeStatement resumeStatement) { -#line 3507 "VBNET.ATG" +#line 3507 "vbnet.atg" resumeStatement = null; string label = String.Empty; if ( -#line 3510 "VBNET.ATG" +#line 3510 "vbnet.atg" IsResumeNext()) { Expect(194); Expect(163); -#line 3511 "VBNET.ATG" +#line 3511 "vbnet.atg" resumeStatement = new ResumeStatement(true); } else if (la.kind == 194) { lexer.NextToken(); if (StartOf(50)) { LabelName( -#line 3512 "VBNET.ATG" +#line 3512 "vbnet.atg" out label); } -#line 3512 "VBNET.ATG" +#line 3512 "vbnet.atg" resumeStatement = new ResumeStatement(label); } else SynErr(320); } void ReDimClauseInternal( -#line 3480 "VBNET.ATG" +#line 3480 "vbnet.atg" ref Expression expr) { -#line 3481 "VBNET.ATG" +#line 3481 "vbnet.atg" List arguments; bool canBeNormal; bool canBeRedim; string name; Location startLocation = la.Location; while (la.kind == 26 || -#line 3484 "VBNET.ATG" +#line 3484 "vbnet.atg" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { if (la.kind == 26) { lexer.NextToken(); IdentifierOrKeyword( -#line 3483 "VBNET.ATG" +#line 3483 "vbnet.atg" out name); -#line 3483 "VBNET.ATG" +#line 3483 "vbnet.atg" expr = new MemberReferenceExpression(expr, name) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else { InvocationExpression( -#line 3485 "VBNET.ATG" +#line 3485 "vbnet.atg" ref expr); -#line 3487 "VBNET.ATG" +#line 3487 "vbnet.atg" expr.StartLocation = startLocation; expr.EndLocation = t.EndLocation; @@ -7585,11 +7585,11 @@ ref expr); } Expect(37); NormalOrReDimArgumentList( -#line 3492 "VBNET.ATG" +#line 3492 "vbnet.atg" out arguments, out canBeNormal, out canBeRedim); Expect(38); -#line 3494 "VBNET.ATG" +#line 3494 "vbnet.atg" expr = new InvocationExpression(expr, arguments); if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { if (this.Errors.Count == 0) { @@ -7601,10 +7601,10 @@ out arguments, out canBeNormal, out canBeRedim); } void CaseClause( -#line 3526 "VBNET.ATG" +#line 3526 "vbnet.atg" out CaseLabel caseClause) { -#line 3528 "VBNET.ATG" +#line 3528 "vbnet.atg" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -7613,7 +7613,7 @@ out CaseLabel caseClause) { if (la.kind == 111) { lexer.NextToken(); -#line 3534 "VBNET.ATG" +#line 3534 "vbnet.atg" caseClause = new CaseLabel(); } else if (StartOf(51)) { if (la.kind == 144) { @@ -7623,76 +7623,76 @@ out CaseLabel caseClause) { case 40: { lexer.NextToken(); -#line 3538 "VBNET.ATG" +#line 3538 "vbnet.atg" op = BinaryOperatorType.LessThan; break; } case 39: { lexer.NextToken(); -#line 3539 "VBNET.ATG" +#line 3539 "vbnet.atg" op = BinaryOperatorType.GreaterThan; break; } case 43: { lexer.NextToken(); -#line 3540 "VBNET.ATG" +#line 3540 "vbnet.atg" op = BinaryOperatorType.LessThanOrEqual; break; } case 42: { lexer.NextToken(); -#line 3541 "VBNET.ATG" +#line 3541 "vbnet.atg" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 20: { lexer.NextToken(); -#line 3542 "VBNET.ATG" +#line 3542 "vbnet.atg" op = BinaryOperatorType.Equality; break; } case 41: { lexer.NextToken(); -#line 3543 "VBNET.ATG" +#line 3543 "vbnet.atg" op = BinaryOperatorType.InEquality; break; } default: SynErr(321); break; } Expr( -#line 3545 "VBNET.ATG" +#line 3545 "vbnet.atg" out expr); -#line 3547 "VBNET.ATG" +#line 3547 "vbnet.atg" caseClause = new CaseLabel(op, expr); } else if (StartOf(24)) { Expr( -#line 3549 "VBNET.ATG" +#line 3549 "vbnet.atg" out expr); if (la.kind == 216) { lexer.NextToken(); Expr( -#line 3549 "VBNET.ATG" +#line 3549 "vbnet.atg" out sexpr); } -#line 3551 "VBNET.ATG" +#line 3551 "vbnet.atg" caseClause = new CaseLabel(expr, sexpr); } else SynErr(322); } void CatchClauses( -#line 3598 "VBNET.ATG" +#line 3598 "vbnet.atg" out List catchClauses) { -#line 3600 "VBNET.ATG" +#line 3600 "vbnet.atg" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -7704,27 +7704,27 @@ out List catchClauses) { if (StartOf(4)) { Identifier(); -#line 3608 "VBNET.ATG" +#line 3608 "vbnet.atg" name = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3608 "VBNET.ATG" +#line 3608 "vbnet.atg" out type); } } if (la.kind == 229) { lexer.NextToken(); Expr( -#line 3609 "VBNET.ATG" +#line 3609 "vbnet.atg" out expr); } EndOfStmt(); Block( -#line 3611 "VBNET.ATG" +#line 3611 "vbnet.atg" out blockStmt); -#line 3612 "VBNET.ATG" +#line 3612 "vbnet.atg" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } diff --git a/VB/Project/Parser/gen.bat b/VB/Project/Parser/gen.bat index 58fa44f3bb..15f007bae3 100644 --- a/VB/Project/Parser/gen.bat +++ b/VB/Project/Parser/gen.bat @@ -4,11 +4,11 @@ echo Generating with #Coco cd Frames -copy ..\VBNet\VBNET.ATG -SharpCoco -namespace ICSharpCode.NRefactory.VB.Parser VBNET.ATG -move Parser.cs ..\VBNet +copy ..\vbnet.atg +SharpCoco -namespace ICSharpCode.NRefactory.VB.Parser vbnet.atg +move Parser.cs .. -del VBNET.ATG +del vbnet.atg pause cd .. \ No newline at end of file diff --git a/VB/Project/Parser/vbnet.atg b/VB/Project/Parser/vbnet.atg index 5f5e5716e2..c67c785d7c 100644 --- a/VB/Project/Parser/vbnet.atg +++ b/VB/Project/Parser/vbnet.atg @@ -2289,7 +2289,7 @@ FunctionLambdaExpression QueryExpr (. - QueryExpressionVB qexpr = new QueryExpressionVB(); + QueryExpression qexpr = new QueryExpression(); qexpr.StartLocation = la.Location; expr = qexpr; .) = diff --git a/VB/Project/PrettyPrinter/VBNet/VBNetOutputVisitor.cs b/VB/Project/PrettyPrinter/VBNet/VBNetOutputVisitor.cs index a3e0fa24fe..02c810933b 100644 --- a/VB/Project/PrettyPrinter/VBNet/VBNetOutputVisitor.cs +++ b/VB/Project/PrettyPrinter/VBNet/VBNetOutputVisitor.cs @@ -997,51 +997,6 @@ namespace ICSharpCode.NRefactory.VB.PrettyPrinter return null; } - public override object TrackedVisitDestructorDeclaration(DestructorDeclaration destructorDeclaration, object data) - { - outputFormatter.Indent(); - outputFormatter.PrintText("Protected Overrides Sub Finalize()"); - outputFormatter.NewLine(); - - ++outputFormatter.IndentationLevel; - exitTokenStack.Push(Tokens.Sub); - - outputFormatter.Indent(); - outputFormatter.PrintToken(Tokens.Try); - outputFormatter.NewLine(); - - ++outputFormatter.IndentationLevel; - TrackedVisit(destructorDeclaration.Body, data); - --outputFormatter.IndentationLevel; - - outputFormatter.Indent(); - outputFormatter.PrintToken(Tokens.Finally); - outputFormatter.NewLine(); - - ++outputFormatter.IndentationLevel; - outputFormatter.Indent(); - outputFormatter.PrintText("MyBase.Finalize()"); - outputFormatter.NewLine(); - --outputFormatter.IndentationLevel; - - outputFormatter.Indent(); - outputFormatter.PrintToken(Tokens.End); - outputFormatter.Space(); - outputFormatter.PrintToken(Tokens.Try); - outputFormatter.NewLine(); - - exitTokenStack.Pop(); - --outputFormatter.IndentationLevel; - - outputFormatter.Indent(); - outputFormatter.PrintToken(Tokens.End); - outputFormatter.Space(); - outputFormatter.PrintToken(Tokens.Sub); - outputFormatter.NewLine(); - - return null; - } - public override object TrackedVisitOperatorDeclaration(OperatorDeclaration operatorDeclaration, object data) { VisitAttributes(operatorDeclaration.Attributes, data); @@ -1397,20 +1352,6 @@ namespace ICSharpCode.NRefactory.VB.PrettyPrinter return null; } - public override object TrackedVisitEmptyStatement(EmptyStatement emptyStatement, object data) - { - outputFormatter.NewLine(); - return null; - } - - public override object TrackedVisitYieldStatement(YieldStatement yieldStatement, object data) - { - UnsupportedNode(yieldStatement); - outputFormatter.PrintText("yield "); - TrackedVisit(yieldStatement.Statement, data); - return null; - } - public override object TrackedVisitReturnStatement(ReturnStatement returnStatement, object data) { outputFormatter.PrintToken(Tokens.Return); @@ -1463,40 +1404,6 @@ namespace ICSharpCode.NRefactory.VB.PrettyPrinter return null; } - public override object TrackedVisitForStatement(ForStatement forStatement, object data) - { - // Is converted to {initializer} while {Embedded} {Iterators} end while - exitTokenStack.Push(Tokens.While); - bool isFirstLine = true; - foreach (INode node in forStatement.Initializers) { - if (!isFirstLine) - outputFormatter.Indent(); - isFirstLine = false; - TrackedVisit(node, data); - outputFormatter.NewLine(); - } - if (!isFirstLine) - outputFormatter.Indent(); - outputFormatter.PrintToken(Tokens.While); - outputFormatter.Space(); - if (forStatement.Condition.IsNull) { - outputFormatter.PrintToken(Tokens.True); - } else { - TrackedVisit(forStatement.Condition, data); - } - outputFormatter.NewLine(); - - PrintIndentedBlock(forStatement.EmbeddedStatement); - PrintIndentedBlock(forStatement.Iterator); - - outputFormatter.Indent(); - outputFormatter.PrintToken(Tokens.End); - outputFormatter.Space(); - outputFormatter.PrintToken(Tokens.While); - exitTokenStack.Pop(); - return null; - } - public override object TrackedVisitLabelStatement(LabelStatement labelStatement, object data) { outputFormatter.PrintIdentifier(labelStatement.Label); @@ -1590,16 +1497,6 @@ namespace ICSharpCode.NRefactory.VB.PrettyPrinter return null; } - public override object TrackedVisitBreakStatement(BreakStatement breakStatement, object data) - { - outputFormatter.PrintToken(Tokens.Exit); - if (exitTokenStack.Count > 0) { - outputFormatter.Space(); - outputFormatter.PrintToken(exitTokenStack.Peek()); - } - return null; - } - public override object TrackedVisitStopStatement(StopStatement stopStatement, object data) { outputFormatter.PrintToken(Tokens.Stop); @@ -1645,17 +1542,6 @@ namespace ICSharpCode.NRefactory.VB.PrettyPrinter return null; } - public override object TrackedVisitGotoCaseStatement(GotoCaseStatement gotoCaseStatement, object data) - { - outputFormatter.PrintText("goto case "); - if (gotoCaseStatement.IsDefaultCase) { - outputFormatter.PrintText("default"); - } else { - TrackedVisit(gotoCaseStatement.Expression, null); - } - return null; - } - public override object TrackedVisitDoLoopStatement(DoLoopStatement doLoopStatement, object data) { if (doLoopStatement.ConditionPosition == ConditionPosition.None) { @@ -1877,30 +1763,6 @@ namespace ICSharpCode.NRefactory.VB.PrettyPrinter return null; } - public override object TrackedVisitFixedStatement(FixedStatement fixedStatement, object data) - { - UnsupportedNode(fixedStatement); - return TrackedVisit(fixedStatement.EmbeddedStatement, data); - } - - public override object TrackedVisitUnsafeStatement(UnsafeStatement unsafeStatement, object data) - { - UnsupportedNode(unsafeStatement); - return TrackedVisit(unsafeStatement.Block, data); - } - - public override object TrackedVisitCheckedStatement(CheckedStatement checkedStatement, object data) - { - UnsupportedNode(checkedStatement); - return TrackedVisit(checkedStatement.Block, data); - } - - public override object TrackedVisitUncheckedStatement(UncheckedStatement uncheckedStatement, object data) - { - UnsupportedNode(uncheckedStatement); - return TrackedVisit(uncheckedStatement.Block, data); - } - public override object TrackedVisitExitStatement(ExitStatement exitStatement, object data) { outputFormatter.PrintToken(Tokens.Exit); @@ -2441,38 +2303,6 @@ namespace ICSharpCode.NRefactory.VB.PrettyPrinter return null; } - public override object TrackedVisitSizeOfExpression(SizeOfExpression sizeOfExpression, object data) - { - if (!sizeOfExpression.TypeReference.IsArrayType && sizeOfExpression.TypeReference.PointerNestingLevel == 0) { - switch (sizeOfExpression.TypeReference.Type) { - case "System.Byte": - case "System.SByte": - outputFormatter.PrintText("1"); - return null; - case "System.Char": - case "System.Int16": - case "System.UInt16": - outputFormatter.PrintText("2"); - return null; - case "System.Single": - case "System.Int32": - case "System.UInt32": - outputFormatter.PrintText("4"); - return null; - case "System.Double": - case "System.Int64": - case "System.UInt64": - outputFormatter.PrintText("8"); - return null; - } - } - UnsupportedNode(sizeOfExpression); - outputFormatter.PrintText("sizeof("); - TrackedVisit(sizeOfExpression.TypeReference, data); - outputFormatter.PrintText(")"); - return null; - } - public override object TrackedVisitTypeOfExpression(TypeOfExpression typeOfExpression, object data) { outputFormatter.PrintToken(Tokens.GetType); @@ -2515,28 +2345,6 @@ namespace ICSharpCode.NRefactory.VB.PrettyPrinter return null; } - public override object TrackedVisitCheckedExpression(CheckedExpression checkedExpression, object data) - { - UnsupportedNode(checkedExpression); - return TrackedVisit(checkedExpression.Expression, data); - } - - public override object TrackedVisitUncheckedExpression(UncheckedExpression uncheckedExpression, object data) - { - UnsupportedNode(uncheckedExpression); - return TrackedVisit(uncheckedExpression.Expression, data); - } - - public override object TrackedVisitPointerReferenceExpression(PointerReferenceExpression pointerReferenceExpression, object data) - { - UnsupportedNode(pointerReferenceExpression); - TrackedVisit(pointerReferenceExpression.TargetObject, data); - outputFormatter.PrintText("."); - outputFormatter.PrintIdentifier(pointerReferenceExpression.MemberName); - PrintTypeArguments(pointerReferenceExpression.TypeArguments); - return null; - } - public override object TrackedVisitCastExpression(CastExpression castExpression, object data) { if (castExpression.CastType == CastType.TryCast) { @@ -2615,22 +2423,6 @@ namespace ICSharpCode.NRefactory.VB.PrettyPrinter return null; } - public override object TrackedVisitStackAllocExpression(StackAllocExpression stackAllocExpression, object data) - { - UnsupportedNode(stackAllocExpression); - outputFormatter.PrintText("stackalloc"); - return null; - } - - public override object TrackedVisitIndexerExpression(IndexerExpression indexerExpression, object data) - { - TrackedVisit(indexerExpression.TargetObject, data); - outputFormatter.PrintToken(Tokens.OpenParenthesis); - AppendCommaSeparatedList(indexerExpression.Indexes); - outputFormatter.PrintToken(Tokens.CloseParenthesis); - return null; - } - public override object TrackedVisitThisReferenceExpression(ThisReferenceExpression thisReferenceExpression, object data) { outputFormatter.PrintToken(Tokens.Me); @@ -3011,7 +2803,7 @@ namespace ICSharpCode.NRefactory.VB.PrettyPrinter outputFormatter.PrintToken(Tokens.Function); } - public override object TrackedVisitQueryExpressionVB(QueryExpressionVB queryExpression, object data) + public override object TrackedVisitQueryExpression(QueryExpression queryExpression, object data) { outputFormatter.IndentationLevel++; for (int i = 0; i < queryExpression.Clauses.Count; i++) { diff --git a/VB/Project/Visitors/AbstractASTVisitor.cs b/VB/Project/Visitors/AbstractASTVisitor.cs index 0559abd6c8..19396fc77f 100644 --- a/VB/Project/Visitors/AbstractASTVisitor.cs +++ b/VB/Project/Visitors/AbstractASTVisitor.cs @@ -106,11 +106,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return blockStatement.AcceptChildren(this, data); } - public virtual object VisitBreakStatement(BreakStatement breakStatement, object data) { - Debug.Assert((breakStatement != null)); - return null; - } - public virtual object VisitCaseLabel(CaseLabel caseLabel, object data) { Debug.Assert((caseLabel != null)); Debug.Assert((caseLabel.Label != null)); @@ -137,18 +132,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return catchClause.Condition.AcceptVisitor(this, data); } - public virtual object VisitCheckedExpression(CheckedExpression checkedExpression, object data) { - Debug.Assert((checkedExpression != null)); - Debug.Assert((checkedExpression.Expression != null)); - return checkedExpression.Expression.AcceptVisitor(this, data); - } - - public virtual object VisitCheckedStatement(CheckedStatement checkedStatement, object data) { - Debug.Assert((checkedStatement != null)); - Debug.Assert((checkedStatement.Block != null)); - return checkedStatement.Block.AcceptVisitor(this, data); - } - public virtual object VisitClassReferenceExpression(ClassReferenceExpression classReferenceExpression, object data) { Debug.Assert((classReferenceExpression != null)); return null; @@ -264,17 +247,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return null; } - public virtual object VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration, object data) { - Debug.Assert((destructorDeclaration != null)); - Debug.Assert((destructorDeclaration.Attributes != null)); - Debug.Assert((destructorDeclaration.Body != null)); - foreach (AttributeSection o in destructorDeclaration.Attributes) { - Debug.Assert(o != null); - o.AcceptVisitor(this, data); - } - return destructorDeclaration.Body.AcceptVisitor(this, data); - } - public virtual object VisitDirectionExpression(DirectionExpression directionExpression, object data) { Debug.Assert((directionExpression != null)); Debug.Assert((directionExpression.Expression != null)); @@ -297,11 +269,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return elseIfSection.EmbeddedStatement.AcceptVisitor(this, data); } - public virtual object VisitEmptyStatement(EmptyStatement emptyStatement, object data) { - Debug.Assert((emptyStatement != null)); - return null; - } - public virtual object VisitEndStatement(EndStatement endStatement, object data) { Debug.Assert((endStatement != null)); return null; @@ -444,14 +411,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return null; } - public virtual object VisitFixedStatement(FixedStatement fixedStatement, object data) { - Debug.Assert((fixedStatement != null)); - Debug.Assert((fixedStatement.PointerDeclaration != null)); - Debug.Assert((fixedStatement.EmbeddedStatement != null)); - fixedStatement.PointerDeclaration.AcceptVisitor(this, data); - return fixedStatement.EmbeddedStatement.AcceptVisitor(this, data); - } - public virtual object VisitForeachStatement(ForeachStatement foreachStatement, object data) { Debug.Assert((foreachStatement != null)); Debug.Assert((foreachStatement.TypeReference != null)); @@ -485,30 +444,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return forNextStatement.EmbeddedStatement.AcceptVisitor(this, data); } - public virtual object VisitForStatement(ForStatement forStatement, object data) { - Debug.Assert((forStatement != null)); - Debug.Assert((forStatement.Initializers != null)); - Debug.Assert((forStatement.Condition != null)); - Debug.Assert((forStatement.Iterator != null)); - Debug.Assert((forStatement.EmbeddedStatement != null)); - foreach (Statement o in forStatement.Initializers) { - Debug.Assert(o != null); - o.AcceptVisitor(this, data); - } - forStatement.Condition.AcceptVisitor(this, data); - foreach (Statement o in forStatement.Iterator) { - Debug.Assert(o != null); - o.AcceptVisitor(this, data); - } - return forStatement.EmbeddedStatement.AcceptVisitor(this, data); - } - - public virtual object VisitGotoCaseStatement(GotoCaseStatement gotoCaseStatement, object data) { - Debug.Assert((gotoCaseStatement != null)); - Debug.Assert((gotoCaseStatement.Expression != null)); - return gotoCaseStatement.Expression.AcceptVisitor(this, data); - } - public virtual object VisitGotoStatement(GotoStatement gotoStatement, object data) { Debug.Assert((gotoStatement != null)); return null; @@ -546,18 +481,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return null; } - public virtual object VisitIndexerExpression(IndexerExpression indexerExpression, object data) { - Debug.Assert((indexerExpression != null)); - Debug.Assert((indexerExpression.TargetObject != null)); - Debug.Assert((indexerExpression.Indexes != null)); - indexerExpression.TargetObject.AcceptVisitor(this, data); - foreach (Expression o in indexerExpression.Indexes) { - Debug.Assert(o != null); - o.AcceptVisitor(this, data); - } - return null; - } - public virtual object VisitInnerClassTypeReference(InnerClassTypeReference innerClassTypeReference, object data) { Debug.Assert((innerClassTypeReference != null)); Debug.Assert((innerClassTypeReference.GenericTypes != null)); @@ -757,18 +680,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return parenthesizedExpression.Expression.AcceptVisitor(this, data); } - public virtual object VisitPointerReferenceExpression(PointerReferenceExpression pointerReferenceExpression, object data) { - Debug.Assert((pointerReferenceExpression != null)); - Debug.Assert((pointerReferenceExpression.TargetObject != null)); - Debug.Assert((pointerReferenceExpression.TypeArguments != null)); - pointerReferenceExpression.TargetObject.AcceptVisitor(this, data); - foreach (TypeReference o in pointerReferenceExpression.TypeArguments) { - Debug.Assert(o != null); - o.AcceptVisitor(this, data); - } - return null; - } - public virtual object VisitPrimitiveExpression(PrimitiveExpression primitiveExpression, object data) { Debug.Assert((primitiveExpression != null)); return null; @@ -831,15 +742,12 @@ namespace ICSharpCode.NRefactory.VB.Visitors { public virtual object VisitQueryExpression(QueryExpression queryExpression, object data) { Debug.Assert((queryExpression != null)); - Debug.Assert((queryExpression.FromClause != null)); - Debug.Assert((queryExpression.MiddleClauses != null)); - Debug.Assert((queryExpression.SelectOrGroupClause != null)); - queryExpression.FromClause.AcceptVisitor(this, data); - foreach (QueryExpressionClause o in queryExpression.MiddleClauses) { + Debug.Assert((queryExpression.Clauses != null)); + foreach (QueryExpressionClause o in queryExpression.Clauses) { Debug.Assert(o != null); o.AcceptVisitor(this, data); } - return queryExpression.SelectOrGroupClause.AcceptVisitor(this, data); + return null; } public virtual object VisitQueryExpressionAggregateClause(QueryExpressionAggregateClause queryExpressionAggregateClause, object data) { @@ -1000,16 +908,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return null; } - public virtual object VisitQueryExpressionVB(QueryExpressionVB queryExpressionVB, object data) { - Debug.Assert((queryExpressionVB != null)); - Debug.Assert((queryExpressionVB.Clauses != null)); - foreach (QueryExpressionClause o in queryExpressionVB.Clauses) { - Debug.Assert(o != null); - o.AcceptVisitor(this, data); - } - return null; - } - public virtual object VisitQueryExpressionWhereClause(QueryExpressionWhereClause queryExpressionWhereClause, object data) { Debug.Assert((queryExpressionWhereClause != null)); Debug.Assert((queryExpressionWhereClause.Condition != null)); @@ -1055,20 +953,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return returnStatement.Expression.AcceptVisitor(this, data); } - public virtual object VisitSizeOfExpression(SizeOfExpression sizeOfExpression, object data) { - Debug.Assert((sizeOfExpression != null)); - Debug.Assert((sizeOfExpression.TypeReference != null)); - return sizeOfExpression.TypeReference.AcceptVisitor(this, data); - } - - public virtual object VisitStackAllocExpression(StackAllocExpression stackAllocExpression, object data) { - Debug.Assert((stackAllocExpression != null)); - Debug.Assert((stackAllocExpression.TypeReference != null)); - Debug.Assert((stackAllocExpression.Expression != null)); - stackAllocExpression.TypeReference.AcceptVisitor(this, data); - return stackAllocExpression.Expression.AcceptVisitor(this, data); - } - public virtual object VisitStopStatement(StopStatement stopStatement, object data) { Debug.Assert((stopStatement != null)); return null; @@ -1191,24 +1075,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return unaryOperatorExpression.Expression.AcceptVisitor(this, data); } - public virtual object VisitUncheckedExpression(UncheckedExpression uncheckedExpression, object data) { - Debug.Assert((uncheckedExpression != null)); - Debug.Assert((uncheckedExpression.Expression != null)); - return uncheckedExpression.Expression.AcceptVisitor(this, data); - } - - public virtual object VisitUncheckedStatement(UncheckedStatement uncheckedStatement, object data) { - Debug.Assert((uncheckedStatement != null)); - Debug.Assert((uncheckedStatement.Block != null)); - return uncheckedStatement.Block.AcceptVisitor(this, data); - } - - public virtual object VisitUnsafeStatement(UnsafeStatement unsafeStatement, object data) { - Debug.Assert((unsafeStatement != null)); - Debug.Assert((unsafeStatement.Block != null)); - return unsafeStatement.Block.AcceptVisitor(this, data); - } - public virtual object VisitUsing(Using @using, object data) { Debug.Assert((@using != null)); Debug.Assert((@using.Alias != null)); @@ -1297,11 +1163,5 @@ namespace ICSharpCode.NRefactory.VB.Visitors { Debug.Assert((xmlMemberAccessExpression.TargetObject != null)); return xmlMemberAccessExpression.TargetObject.AcceptVisitor(this, data); } - - public virtual object VisitYieldStatement(YieldStatement yieldStatement, object data) { - Debug.Assert((yieldStatement != null)); - Debug.Assert((yieldStatement.Statement != null)); - return yieldStatement.Statement.AcceptVisitor(this, data); - } } } diff --git a/VB/Project/Visitors/AbstractAstTransformer.cs b/VB/Project/Visitors/AbstractAstTransformer.cs index 05f1f33eeb..b5d91fab1d 100644 --- a/VB/Project/Visitors/AbstractAstTransformer.cs +++ b/VB/Project/Visitors/AbstractAstTransformer.cs @@ -199,11 +199,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return null; } - public virtual object VisitBreakStatement(BreakStatement breakStatement, object data) { - Debug.Assert((breakStatement != null)); - return null; - } - public virtual object VisitCaseLabel(CaseLabel caseLabel, object data) { Debug.Assert((caseLabel != null)); Debug.Assert((caseLabel.Label != null)); @@ -247,24 +242,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return null; } - public virtual object VisitCheckedExpression(CheckedExpression checkedExpression, object data) { - Debug.Assert((checkedExpression != null)); - Debug.Assert((checkedExpression.Expression != null)); - nodeStack.Push(checkedExpression.Expression); - checkedExpression.Expression.AcceptVisitor(this, data); - checkedExpression.Expression = ((Expression)(nodeStack.Pop())); - return null; - } - - public virtual object VisitCheckedStatement(CheckedStatement checkedStatement, object data) { - Debug.Assert((checkedStatement != null)); - Debug.Assert((checkedStatement.Block != null)); - nodeStack.Push(checkedStatement.Block); - checkedStatement.Block.AcceptVisitor(this, data); - checkedStatement.Block = ((Statement)(nodeStack.Pop())); - return null; - } - public virtual object VisitClassReferenceExpression(ClassReferenceExpression classReferenceExpression, object data) { Debug.Assert((classReferenceExpression != null)); return null; @@ -479,27 +456,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return null; } - public virtual object VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration, object data) { - Debug.Assert((destructorDeclaration != null)); - Debug.Assert((destructorDeclaration.Attributes != null)); - Debug.Assert((destructorDeclaration.Body != null)); - for (int i = 0; i < destructorDeclaration.Attributes.Count; i++) { - AttributeSection o = destructorDeclaration.Attributes[i]; - Debug.Assert(o != null); - nodeStack.Push(o); - o.AcceptVisitor(this, data); - o = (AttributeSection)nodeStack.Pop(); - if (o == null) - destructorDeclaration.Attributes.RemoveAt(i--); - else - destructorDeclaration.Attributes[i] = o; - } - nodeStack.Push(destructorDeclaration.Body); - destructorDeclaration.Body.AcceptVisitor(this, data); - destructorDeclaration.Body = ((BlockStatement)(nodeStack.Pop())); - return null; - } - public virtual object VisitDirectionExpression(DirectionExpression directionExpression, object data) { Debug.Assert((directionExpression != null)); Debug.Assert((directionExpression.Expression != null)); @@ -535,11 +491,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return null; } - public virtual object VisitEmptyStatement(EmptyStatement emptyStatement, object data) { - Debug.Assert((emptyStatement != null)); - return null; - } - public virtual object VisitEndStatement(EndStatement endStatement, object data) { Debug.Assert((endStatement != null)); return null; @@ -796,19 +747,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return null; } - public virtual object VisitFixedStatement(FixedStatement fixedStatement, object data) { - Debug.Assert((fixedStatement != null)); - Debug.Assert((fixedStatement.PointerDeclaration != null)); - Debug.Assert((fixedStatement.EmbeddedStatement != null)); - nodeStack.Push(fixedStatement.PointerDeclaration); - fixedStatement.PointerDeclaration.AcceptVisitor(this, data); - fixedStatement.PointerDeclaration = ((Statement)(nodeStack.Pop())); - nodeStack.Push(fixedStatement.EmbeddedStatement); - fixedStatement.EmbeddedStatement.AcceptVisitor(this, data); - fixedStatement.EmbeddedStatement = ((Statement)(nodeStack.Pop())); - return null; - } - public virtual object VisitForeachStatement(ForeachStatement foreachStatement, object data) { Debug.Assert((foreachStatement != null)); Debug.Assert((foreachStatement.TypeReference != null)); @@ -871,52 +809,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return null; } - public virtual object VisitForStatement(ForStatement forStatement, object data) { - Debug.Assert((forStatement != null)); - Debug.Assert((forStatement.Initializers != null)); - Debug.Assert((forStatement.Condition != null)); - Debug.Assert((forStatement.Iterator != null)); - Debug.Assert((forStatement.EmbeddedStatement != null)); - for (int i = 0; i < forStatement.Initializers.Count; i++) { - Statement o = forStatement.Initializers[i]; - Debug.Assert(o != null); - nodeStack.Push(o); - o.AcceptVisitor(this, data); - o = (Statement)nodeStack.Pop(); - if (o == null) - forStatement.Initializers.RemoveAt(i--); - else - forStatement.Initializers[i] = o; - } - nodeStack.Push(forStatement.Condition); - forStatement.Condition.AcceptVisitor(this, data); - forStatement.Condition = ((Expression)(nodeStack.Pop())); - for (int i = 0; i < forStatement.Iterator.Count; i++) { - Statement o = forStatement.Iterator[i]; - Debug.Assert(o != null); - nodeStack.Push(o); - o.AcceptVisitor(this, data); - o = (Statement)nodeStack.Pop(); - if (o == null) - forStatement.Iterator.RemoveAt(i--); - else - forStatement.Iterator[i] = o; - } - nodeStack.Push(forStatement.EmbeddedStatement); - forStatement.EmbeddedStatement.AcceptVisitor(this, data); - forStatement.EmbeddedStatement = ((Statement)(nodeStack.Pop())); - return null; - } - - public virtual object VisitGotoCaseStatement(GotoCaseStatement gotoCaseStatement, object data) { - Debug.Assert((gotoCaseStatement != null)); - Debug.Assert((gotoCaseStatement.Expression != null)); - nodeStack.Push(gotoCaseStatement.Expression); - gotoCaseStatement.Expression.AcceptVisitor(this, data); - gotoCaseStatement.Expression = ((Expression)(nodeStack.Pop())); - return null; - } - public virtual object VisitGotoStatement(GotoStatement gotoStatement, object data) { Debug.Assert((gotoStatement != null)); return null; @@ -984,27 +876,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return null; } - public virtual object VisitIndexerExpression(IndexerExpression indexerExpression, object data) { - Debug.Assert((indexerExpression != null)); - Debug.Assert((indexerExpression.TargetObject != null)); - Debug.Assert((indexerExpression.Indexes != null)); - nodeStack.Push(indexerExpression.TargetObject); - indexerExpression.TargetObject.AcceptVisitor(this, data); - indexerExpression.TargetObject = ((Expression)(nodeStack.Pop())); - for (int i = 0; i < indexerExpression.Indexes.Count; i++) { - Expression o = indexerExpression.Indexes[i]; - Debug.Assert(o != null); - nodeStack.Push(o); - o.AcceptVisitor(this, data); - o = (Expression)nodeStack.Pop(); - if (o == null) - indexerExpression.Indexes.RemoveAt(i--); - else - indexerExpression.Indexes[i] = o; - } - return null; - } - public virtual object VisitInnerClassTypeReference(InnerClassTypeReference innerClassTypeReference, object data) { Debug.Assert((innerClassTypeReference != null)); Debug.Assert((innerClassTypeReference.GenericTypes != null)); @@ -1374,27 +1245,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return null; } - public virtual object VisitPointerReferenceExpression(PointerReferenceExpression pointerReferenceExpression, object data) { - Debug.Assert((pointerReferenceExpression != null)); - Debug.Assert((pointerReferenceExpression.TargetObject != null)); - Debug.Assert((pointerReferenceExpression.TypeArguments != null)); - nodeStack.Push(pointerReferenceExpression.TargetObject); - pointerReferenceExpression.TargetObject.AcceptVisitor(this, data); - pointerReferenceExpression.TargetObject = ((Expression)(nodeStack.Pop())); - for (int i = 0; i < pointerReferenceExpression.TypeArguments.Count; i++) { - TypeReference o = pointerReferenceExpression.TypeArguments[i]; - Debug.Assert(o != null); - nodeStack.Push(o); - o.AcceptVisitor(this, data); - o = (TypeReference)nodeStack.Pop(); - if (o == null) - pointerReferenceExpression.TypeArguments.RemoveAt(i--); - else - pointerReferenceExpression.TypeArguments[i] = o; - } - return null; - } - public virtual object VisitPrimitiveExpression(PrimitiveExpression primitiveExpression, object data) { Debug.Assert((primitiveExpression != null)); return null; @@ -1513,26 +1363,18 @@ namespace ICSharpCode.NRefactory.VB.Visitors { public virtual object VisitQueryExpression(QueryExpression queryExpression, object data) { Debug.Assert((queryExpression != null)); - Debug.Assert((queryExpression.FromClause != null)); - Debug.Assert((queryExpression.MiddleClauses != null)); - Debug.Assert((queryExpression.SelectOrGroupClause != null)); - nodeStack.Push(queryExpression.FromClause); - queryExpression.FromClause.AcceptVisitor(this, data); - queryExpression.FromClause = ((QueryExpressionFromClause)(nodeStack.Pop())); - for (int i = 0; i < queryExpression.MiddleClauses.Count; i++) { - QueryExpressionClause o = queryExpression.MiddleClauses[i]; + Debug.Assert((queryExpression.Clauses != null)); + for (int i = 0; i < queryExpression.Clauses.Count; i++) { + QueryExpressionClause o = queryExpression.Clauses[i]; Debug.Assert(o != null); nodeStack.Push(o); o.AcceptVisitor(this, data); o = (QueryExpressionClause)nodeStack.Pop(); if (o == null) - queryExpression.MiddleClauses.RemoveAt(i--); + queryExpression.Clauses.RemoveAt(i--); else - queryExpression.MiddleClauses[i] = o; + queryExpression.Clauses[i] = o; } - nodeStack.Push(queryExpression.SelectOrGroupClause); - queryExpression.SelectOrGroupClause.AcceptVisitor(this, data); - queryExpression.SelectOrGroupClause = ((QueryExpressionClause)(nodeStack.Pop())); return null; } @@ -1808,23 +1650,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return null; } - public virtual object VisitQueryExpressionVB(QueryExpressionVB queryExpressionVB, object data) { - Debug.Assert((queryExpressionVB != null)); - Debug.Assert((queryExpressionVB.Clauses != null)); - for (int i = 0; i < queryExpressionVB.Clauses.Count; i++) { - QueryExpressionClause o = queryExpressionVB.Clauses[i]; - Debug.Assert(o != null); - nodeStack.Push(o); - o.AcceptVisitor(this, data); - o = (QueryExpressionClause)nodeStack.Pop(); - if (o == null) - queryExpressionVB.Clauses.RemoveAt(i--); - else - queryExpressionVB.Clauses[i] = o; - } - return null; - } - public virtual object VisitQueryExpressionWhereClause(QueryExpressionWhereClause queryExpressionWhereClause, object data) { Debug.Assert((queryExpressionWhereClause != null)); Debug.Assert((queryExpressionWhereClause.Condition != null)); @@ -1895,28 +1720,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return null; } - public virtual object VisitSizeOfExpression(SizeOfExpression sizeOfExpression, object data) { - Debug.Assert((sizeOfExpression != null)); - Debug.Assert((sizeOfExpression.TypeReference != null)); - nodeStack.Push(sizeOfExpression.TypeReference); - sizeOfExpression.TypeReference.AcceptVisitor(this, data); - sizeOfExpression.TypeReference = ((TypeReference)(nodeStack.Pop())); - return null; - } - - public virtual object VisitStackAllocExpression(StackAllocExpression stackAllocExpression, object data) { - Debug.Assert((stackAllocExpression != null)); - Debug.Assert((stackAllocExpression.TypeReference != null)); - Debug.Assert((stackAllocExpression.Expression != null)); - nodeStack.Push(stackAllocExpression.TypeReference); - stackAllocExpression.TypeReference.AcceptVisitor(this, data); - stackAllocExpression.TypeReference = ((TypeReference)(nodeStack.Pop())); - nodeStack.Push(stackAllocExpression.Expression); - stackAllocExpression.Expression.AcceptVisitor(this, data); - stackAllocExpression.Expression = ((Expression)(nodeStack.Pop())); - return null; - } - public virtual object VisitStopStatement(StopStatement stopStatement, object data) { Debug.Assert((stopStatement != null)); return null; @@ -2148,33 +1951,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return null; } - public virtual object VisitUncheckedExpression(UncheckedExpression uncheckedExpression, object data) { - Debug.Assert((uncheckedExpression != null)); - Debug.Assert((uncheckedExpression.Expression != null)); - nodeStack.Push(uncheckedExpression.Expression); - uncheckedExpression.Expression.AcceptVisitor(this, data); - uncheckedExpression.Expression = ((Expression)(nodeStack.Pop())); - return null; - } - - public virtual object VisitUncheckedStatement(UncheckedStatement uncheckedStatement, object data) { - Debug.Assert((uncheckedStatement != null)); - Debug.Assert((uncheckedStatement.Block != null)); - nodeStack.Push(uncheckedStatement.Block); - uncheckedStatement.Block.AcceptVisitor(this, data); - uncheckedStatement.Block = ((Statement)(nodeStack.Pop())); - return null; - } - - public virtual object VisitUnsafeStatement(UnsafeStatement unsafeStatement, object data) { - Debug.Assert((unsafeStatement != null)); - Debug.Assert((unsafeStatement.Block != null)); - nodeStack.Push(unsafeStatement.Block); - unsafeStatement.Block.AcceptVisitor(this, data); - unsafeStatement.Block = ((Statement)(nodeStack.Pop())); - return null; - } - public virtual object VisitUsing(Using @using, object data) { Debug.Assert((@using != null)); Debug.Assert((@using.Alias != null)); @@ -2328,14 +2104,5 @@ namespace ICSharpCode.NRefactory.VB.Visitors { xmlMemberAccessExpression.TargetObject = ((Expression)(nodeStack.Pop())); return null; } - - public virtual object VisitYieldStatement(YieldStatement yieldStatement, object data) { - Debug.Assert((yieldStatement != null)); - Debug.Assert((yieldStatement.Statement != null)); - nodeStack.Push(yieldStatement.Statement); - yieldStatement.Statement.AcceptVisitor(this, data); - yieldStatement.Statement = ((Statement)(nodeStack.Pop())); - return null; - } } } diff --git a/VB/Project/Visitors/CodeDOMOutputVisitor.cs b/VB/Project/Visitors/CodeDOMOutputVisitor.cs index da6885fbf7..6542fb5bf4 100644 --- a/VB/Project/Visitors/CodeDOMOutputVisitor.cs +++ b/VB/Project/Visitors/CodeDOMOutputVisitor.cs @@ -489,15 +489,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors return declStmt; } - public override object VisitEmptyStatement(EmptyStatement emptyStatement, object data) - { - CodeSnippetStatement emptyStmt = new CodeSnippetStatement(); - - AddStmt(emptyStmt); - - return emptyStmt; - } - public override object VisitReturnStatement(ReturnStatement returnStatement, object data) { CodeMethodReturnStatement returnStmt; @@ -722,86 +713,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors return forLoop; } - - public override object VisitForStatement(ForStatement forStatement, object data) - { - CodeIterationStatement forLoop = new CodeIterationStatement(); - breakableStack.Push(new Breakable()); - - codeStack.Push(NullStmtCollection); - - if (forStatement.Initializers.Count > 0) - { - if (forStatement.Initializers.Count > 1) - { - throw new NotSupportedException("CodeDom does not support Multiple For-Loop Initializer Statements"); - } - - foreach (object o in forStatement.Initializers) - { - if (o is Expression) - { - forLoop.InitStatement = new CodeExpressionStatement((CodeExpression)((Expression)o).AcceptVisitor(this, data)); - } - if (o is Statement) - { - forLoop.InitStatement = (CodeStatement)((Statement)o).AcceptVisitor(this, data); - } - } - } - else - { - // RG: need to handle empty InitStatement - forLoop.InitStatement = new CodeExpressionStatement(new CodeSnippetExpression()); - } - - if (forStatement.Condition == null) { - forLoop.TestExpression = new CodePrimitiveExpression(true); - } else { - forLoop.TestExpression = (CodeExpression)forStatement.Condition.AcceptVisitor(this, data); - } - - codeStack.Push(forLoop.Statements); - forStatement.EmbeddedStatement.AcceptVisitor(this, data); - codeStack.Pop(); - - if (forStatement.Iterator.Count > 0) - { - if (forStatement.Initializers.Count > 1) - { - throw new NotSupportedException("CodeDom does not support Multiple For-Loop Iterator Statements"); - } - - foreach (Statement stmt in forStatement.Iterator) - { - forLoop.IncrementStatement = (CodeStatement)stmt.AcceptVisitor(this, data); - } - } - else - { - // RG: need to handle empty IncrementStatement - forLoop.IncrementStatement = new CodeExpressionStatement(new CodeSnippetExpression()); - } - - codeStack.Pop(); - - Breakable breakable = breakableStack.Pop(); - - if (breakable.IsContinue) - { - forLoop.Statements.Add(new CodeSnippetStatement()); - forLoop.Statements.Add(new CodeLabeledStatement("continue" + breakable.Id, new CodeExpressionStatement(new CodeSnippetExpression()))); - } - - AddStmt(forLoop); - - if (breakable.IsBreak) - { - AddStmt(new CodeLabeledStatement("break" + breakable.Id, new CodeExpressionStatement(new CodeSnippetExpression()))); - } - - return forLoop; - } public override object VisitLabelStatement(LabelStatement labelStatement, object data) { @@ -939,8 +850,8 @@ namespace ICSharpCode.NRefactory.VB.Visitors { INode stmt = section.Children[i]; - if (i == section.Children.Count - 1 && stmt is BreakStatement) - break; +// if (i == section.Children.Count - 1 && stmt is BreakStatement) +// break; stmt.AcceptVisitor(this, data); } @@ -958,8 +869,8 @@ namespace ICSharpCode.NRefactory.VB.Visitors { INode stmt = defaultSection.Children[i]; - if (i == defaultSection.Children.Count - 1 && stmt is BreakStatement) - break; +// if (i == defaultSection.Children.Count - 1 && stmt is BreakStatement) +// break; stmt.AcceptVisitor(this, data); } @@ -1028,11 +939,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors return throwStmt; } - public override object VisitFixedStatement(FixedStatement fixedStatement, object data) - { - throw new NotSupportedException("CodeDom does not support Fixed Statement"); - } - #region Expressions public override object VisitPrimitiveExpression(PrimitiveExpression primitiveExpression, object data) { @@ -1437,11 +1343,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors return new CodeCastExpression(typeRef, (CodeExpression)castExpression.Expression.AcceptVisitor(this, data)); } - public override object VisitIndexerExpression(IndexerExpression indexerExpression, object data) - { - return new CodeIndexerExpression((CodeExpression)indexerExpression.TargetObject.AcceptVisitor(this, data), GetExpressionList(indexerExpression.Indexes)); - } - public override object VisitThisReferenceExpression(ThisReferenceExpression thisReferenceExpression, object data) { return new CodeThisReferenceExpression(); @@ -1477,59 +1378,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors return parameter; } - public override object VisitBreakStatement(BreakStatement breakStatement, object data) - { - // RG: - // break; - // - // emulate with: - // goto break1; - // - Breakable breakable = breakableStack.Peek(); - - breakable.IsBreak = true; - - CodeGotoStatement breakStmt = new CodeGotoStatement("break" + breakable.Id); - - AddStmt(breakStmt); - - return breakStmt; - } - - public override object VisitContinueStatement(ContinueStatement continueStatement, object data) - { - // RG: - // continue; - // - // emulate with: - // goto continue1; - // - Breakable breakable = breakableStack.Peek(); - - // Is continuable? - if (!breakable.AllowContinue) - { - // walk stack to find first continuable item - Breakable[] stack = breakableStack.ToArray(); - foreach (Breakable b in stack) - { - if (b.AllowContinue) - { - breakable = b; - break; - } - } - } - - breakable.IsContinue = true; - - CodeGotoStatement continueStmt = new CodeGotoStatement("continue" + breakable.Id); - - AddStmt(continueStmt); - - return continueStmt; - } - bool IsField(string reflectionTypeName, string fieldName) { return environmentInformationProvider.HasField(reflectionTypeName, 0, fieldName); diff --git a/VB/Project/Visitors/LookupTableVisitor.cs b/VB/Project/Visitors/LookupTableVisitor.cs index dde3582a29..8d9fbd84d0 100644 --- a/VB/Project/Visitors/LookupTableVisitor.cs +++ b/VB/Project/Visitors/LookupTableVisitor.cs @@ -155,12 +155,13 @@ namespace ICSharpCode.NRefactory.VB.Visitors public override object VisitQueryExpressionFromClause(QueryExpressionFromClause fromClause, object data) { - QueryExpression parent = fromClause.Parent as QueryExpression; - foreach (CollectionRangeVariable variable in fromClause.Sources) { - AddVariable(variable.Type, variable.Identifier, - variable.StartLocation, CurrentEndLocation, - false, true, variable.Expression, null, parent != null && parent.IsQueryContinuation); - } + // TODO : reimplement this! +// QueryExpression parent = fromClause.Parent as QueryExpression; +// foreach (CollectionRangeVariable variable in fromClause.Sources) { +// AddVariable(variable.Type, variable.Identifier, +// variable.StartLocation, CurrentEndLocation, +// false, true, variable.Expression, null, parent != null && parent.IsQueryContinuation); +// } return base.VisitQueryExpressionFromClause(fromClause, data); } @@ -213,32 +214,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors } } - public override object VisitFixedStatement(FixedStatement fixedStatement, object data) - { - // uses LocalVariableDeclaration, we just have to put the end location on the stack - if (fixedStatement.EmbeddedStatement.EndLocation.IsEmpty) { - return base.VisitFixedStatement(fixedStatement, data); - } else { - endLocationStack.Push(fixedStatement.EmbeddedStatement.EndLocation); - base.VisitFixedStatement(fixedStatement, data); - endLocationStack.Pop(); - return null; - } - } - - public override object VisitForStatement(ForStatement forStatement, object data) - { - // uses LocalVariableDeclaration, we just have to put the end location on the stack - if (forStatement.EmbeddedStatement.EndLocation.IsEmpty) { - return base.VisitForStatement(forStatement, data); - } else { - endLocationStack.Push(forStatement.EmbeddedStatement.EndLocation); - base.VisitForStatement(forStatement, data); - endLocationStack.Pop(); - return null; - } - } - public override object VisitUsingStatement(UsingStatement usingStatement, object data) { // uses LocalVariableDeclaration, we just have to put the end location on the stack diff --git a/VB/Project/Visitors/NodeTrackingAstVisitor.cs b/VB/Project/Visitors/NodeTrackingAstVisitor.cs index aa5b5ce2d4..926875299a 100644 --- a/VB/Project/Visitors/NodeTrackingAstVisitor.cs +++ b/VB/Project/Visitors/NodeTrackingAstVisitor.cs @@ -101,13 +101,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return result; } - public sealed override object VisitBreakStatement(BreakStatement breakStatement, object data) { - this.BeginVisit(breakStatement); - object result = this.TrackedVisitBreakStatement(breakStatement, data); - this.EndVisit(breakStatement); - return result; - } - public sealed override object VisitCaseLabel(CaseLabel caseLabel, object data) { this.BeginVisit(caseLabel); object result = this.TrackedVisitCaseLabel(caseLabel, data); @@ -129,20 +122,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return result; } - public sealed override object VisitCheckedExpression(CheckedExpression checkedExpression, object data) { - this.BeginVisit(checkedExpression); - object result = this.TrackedVisitCheckedExpression(checkedExpression, data); - this.EndVisit(checkedExpression); - return result; - } - - public sealed override object VisitCheckedStatement(CheckedStatement checkedStatement, object data) { - this.BeginVisit(checkedStatement); - object result = this.TrackedVisitCheckedStatement(checkedStatement, data); - this.EndVisit(checkedStatement); - return result; - } - public sealed override object VisitClassReferenceExpression(ClassReferenceExpression classReferenceExpression, object data) { this.BeginVisit(classReferenceExpression); object result = this.TrackedVisitClassReferenceExpression(classReferenceExpression, data); @@ -220,13 +199,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return result; } - public sealed override object VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration, object data) { - this.BeginVisit(destructorDeclaration); - object result = this.TrackedVisitDestructorDeclaration(destructorDeclaration, data); - this.EndVisit(destructorDeclaration); - return result; - } - public sealed override object VisitDirectionExpression(DirectionExpression directionExpression, object data) { this.BeginVisit(directionExpression); object result = this.TrackedVisitDirectionExpression(directionExpression, data); @@ -248,13 +220,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return result; } - public sealed override object VisitEmptyStatement(EmptyStatement emptyStatement, object data) { - this.BeginVisit(emptyStatement); - object result = this.TrackedVisitEmptyStatement(emptyStatement, data); - this.EndVisit(emptyStatement); - return result; - } - public sealed override object VisitEndStatement(EndStatement endStatement, object data) { this.BeginVisit(endStatement); object result = this.TrackedVisitEndStatement(endStatement, data); @@ -339,13 +304,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return result; } - public sealed override object VisitFixedStatement(FixedStatement fixedStatement, object data) { - this.BeginVisit(fixedStatement); - object result = this.TrackedVisitFixedStatement(fixedStatement, data); - this.EndVisit(fixedStatement); - return result; - } - public sealed override object VisitForeachStatement(ForeachStatement foreachStatement, object data) { this.BeginVisit(foreachStatement); object result = this.TrackedVisitForeachStatement(foreachStatement, data); @@ -360,20 +318,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return result; } - public sealed override object VisitForStatement(ForStatement forStatement, object data) { - this.BeginVisit(forStatement); - object result = this.TrackedVisitForStatement(forStatement, data); - this.EndVisit(forStatement); - return result; - } - - public sealed override object VisitGotoCaseStatement(GotoCaseStatement gotoCaseStatement, object data) { - this.BeginVisit(gotoCaseStatement); - object result = this.TrackedVisitGotoCaseStatement(gotoCaseStatement, data); - this.EndVisit(gotoCaseStatement); - return result; - } - public sealed override object VisitGotoStatement(GotoStatement gotoStatement, object data) { this.BeginVisit(gotoStatement); object result = this.TrackedVisitGotoStatement(gotoStatement, data); @@ -395,13 +339,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return result; } - public sealed override object VisitIndexerExpression(IndexerExpression indexerExpression, object data) { - this.BeginVisit(indexerExpression); - object result = this.TrackedVisitIndexerExpression(indexerExpression, data); - this.EndVisit(indexerExpression); - return result; - } - public sealed override object VisitInnerClassTypeReference(InnerClassTypeReference innerClassTypeReference, object data) { this.BeginVisit(innerClassTypeReference); object result = this.TrackedVisitInnerClassTypeReference(innerClassTypeReference, data); @@ -528,13 +465,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return result; } - public sealed override object VisitPointerReferenceExpression(PointerReferenceExpression pointerReferenceExpression, object data) { - this.BeginVisit(pointerReferenceExpression); - object result = this.TrackedVisitPointerReferenceExpression(pointerReferenceExpression, data); - this.EndVisit(pointerReferenceExpression); - return result; - } - public sealed override object VisitPrimitiveExpression(PrimitiveExpression primitiveExpression, object data) { this.BeginVisit(primitiveExpression); object result = this.TrackedVisitPrimitiveExpression(primitiveExpression, data); @@ -682,13 +612,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return result; } - public sealed override object VisitQueryExpressionVB(QueryExpressionVB queryExpressionVB, object data) { - this.BeginVisit(queryExpressionVB); - object result = this.TrackedVisitQueryExpressionVB(queryExpressionVB, data); - this.EndVisit(queryExpressionVB); - return result; - } - public sealed override object VisitQueryExpressionWhereClause(QueryExpressionWhereClause queryExpressionWhereClause, object data) { this.BeginVisit(queryExpressionWhereClause); object result = this.TrackedVisitQueryExpressionWhereClause(queryExpressionWhereClause, data); @@ -731,20 +654,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return result; } - public sealed override object VisitSizeOfExpression(SizeOfExpression sizeOfExpression, object data) { - this.BeginVisit(sizeOfExpression); - object result = this.TrackedVisitSizeOfExpression(sizeOfExpression, data); - this.EndVisit(sizeOfExpression); - return result; - } - - public sealed override object VisitStackAllocExpression(StackAllocExpression stackAllocExpression, object data) { - this.BeginVisit(stackAllocExpression); - object result = this.TrackedVisitStackAllocExpression(stackAllocExpression, data); - this.EndVisit(stackAllocExpression); - return result; - } - public sealed override object VisitStopStatement(StopStatement stopStatement, object data) { this.BeginVisit(stopStatement); object result = this.TrackedVisitStopStatement(stopStatement, data); @@ -836,27 +745,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return result; } - public sealed override object VisitUncheckedExpression(UncheckedExpression uncheckedExpression, object data) { - this.BeginVisit(uncheckedExpression); - object result = this.TrackedVisitUncheckedExpression(uncheckedExpression, data); - this.EndVisit(uncheckedExpression); - return result; - } - - public sealed override object VisitUncheckedStatement(UncheckedStatement uncheckedStatement, object data) { - this.BeginVisit(uncheckedStatement); - object result = this.TrackedVisitUncheckedStatement(uncheckedStatement, data); - this.EndVisit(uncheckedStatement); - return result; - } - - public sealed override object VisitUnsafeStatement(UnsafeStatement unsafeStatement, object data) { - this.BeginVisit(unsafeStatement); - object result = this.TrackedVisitUnsafeStatement(unsafeStatement, data); - this.EndVisit(unsafeStatement); - return result; - } - public sealed override object VisitUsing(Using @using, object data) { this.BeginVisit(@using); object result = this.TrackedVisitUsing(@using, data); @@ -934,13 +822,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return result; } - public sealed override object VisitYieldStatement(YieldStatement yieldStatement, object data) { - this.BeginVisit(yieldStatement); - object result = this.TrackedVisitYieldStatement(yieldStatement, data); - this.EndVisit(yieldStatement); - return result; - } - public virtual object TrackedVisitAddHandlerStatement(AddHandlerStatement addHandlerStatement, object data) { return base.VisitAddHandlerStatement(addHandlerStatement, data); } @@ -981,10 +862,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return base.VisitBlockStatement(blockStatement, data); } - public virtual object TrackedVisitBreakStatement(BreakStatement breakStatement, object data) { - return base.VisitBreakStatement(breakStatement, data); - } - public virtual object TrackedVisitCaseLabel(CaseLabel caseLabel, object data) { return base.VisitCaseLabel(caseLabel, data); } @@ -997,14 +874,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return base.VisitCatchClause(catchClause, data); } - public virtual object TrackedVisitCheckedExpression(CheckedExpression checkedExpression, object data) { - return base.VisitCheckedExpression(checkedExpression, data); - } - - public virtual object TrackedVisitCheckedStatement(CheckedStatement checkedStatement, object data) { - return base.VisitCheckedStatement(checkedStatement, data); - } - public virtual object TrackedVisitClassReferenceExpression(ClassReferenceExpression classReferenceExpression, object data) { return base.VisitClassReferenceExpression(classReferenceExpression, data); } @@ -1049,10 +918,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return base.VisitDelegateDeclaration(delegateDeclaration, data); } - public virtual object TrackedVisitDestructorDeclaration(DestructorDeclaration destructorDeclaration, object data) { - return base.VisitDestructorDeclaration(destructorDeclaration, data); - } - public virtual object TrackedVisitDirectionExpression(DirectionExpression directionExpression, object data) { return base.VisitDirectionExpression(directionExpression, data); } @@ -1065,10 +930,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return base.VisitElseIfSection(elseIfSection, data); } - public virtual object TrackedVisitEmptyStatement(EmptyStatement emptyStatement, object data) { - return base.VisitEmptyStatement(emptyStatement, data); - } - public virtual object TrackedVisitEndStatement(EndStatement endStatement, object data) { return base.VisitEndStatement(endStatement, data); } @@ -1117,10 +978,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return base.VisitFieldDeclaration(fieldDeclaration, data); } - public virtual object TrackedVisitFixedStatement(FixedStatement fixedStatement, object data) { - return base.VisitFixedStatement(fixedStatement, data); - } - public virtual object TrackedVisitForeachStatement(ForeachStatement foreachStatement, object data) { return base.VisitForeachStatement(foreachStatement, data); } @@ -1129,14 +986,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return base.VisitForNextStatement(forNextStatement, data); } - public virtual object TrackedVisitForStatement(ForStatement forStatement, object data) { - return base.VisitForStatement(forStatement, data); - } - - public virtual object TrackedVisitGotoCaseStatement(GotoCaseStatement gotoCaseStatement, object data) { - return base.VisitGotoCaseStatement(gotoCaseStatement, data); - } - public virtual object TrackedVisitGotoStatement(GotoStatement gotoStatement, object data) { return base.VisitGotoStatement(gotoStatement, data); } @@ -1149,10 +998,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return base.VisitIfElseStatement(ifElseStatement, data); } - public virtual object TrackedVisitIndexerExpression(IndexerExpression indexerExpression, object data) { - return base.VisitIndexerExpression(indexerExpression, data); - } - public virtual object TrackedVisitInnerClassTypeReference(InnerClassTypeReference innerClassTypeReference, object data) { return base.VisitInnerClassTypeReference(innerClassTypeReference, data); } @@ -1225,10 +1070,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return base.VisitParenthesizedExpression(parenthesizedExpression, data); } - public virtual object TrackedVisitPointerReferenceExpression(PointerReferenceExpression pointerReferenceExpression, object data) { - return base.VisitPointerReferenceExpression(pointerReferenceExpression, data); - } - public virtual object TrackedVisitPrimitiveExpression(PrimitiveExpression primitiveExpression, object data) { return base.VisitPrimitiveExpression(primitiveExpression, data); } @@ -1313,10 +1154,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return base.VisitQueryExpressionSelectVBClause(queryExpressionSelectVBClause, data); } - public virtual object TrackedVisitQueryExpressionVB(QueryExpressionVB queryExpressionVB, object data) { - return base.VisitQueryExpressionVB(queryExpressionVB, data); - } - public virtual object TrackedVisitQueryExpressionWhereClause(QueryExpressionWhereClause queryExpressionWhereClause, object data) { return base.VisitQueryExpressionWhereClause(queryExpressionWhereClause, data); } @@ -1341,14 +1178,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return base.VisitReturnStatement(returnStatement, data); } - public virtual object TrackedVisitSizeOfExpression(SizeOfExpression sizeOfExpression, object data) { - return base.VisitSizeOfExpression(sizeOfExpression, data); - } - - public virtual object TrackedVisitStackAllocExpression(StackAllocExpression stackAllocExpression, object data) { - return base.VisitStackAllocExpression(stackAllocExpression, data); - } - public virtual object TrackedVisitStopStatement(StopStatement stopStatement, object data) { return base.VisitStopStatement(stopStatement, data); } @@ -1401,18 +1230,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { return base.VisitUnaryOperatorExpression(unaryOperatorExpression, data); } - public virtual object TrackedVisitUncheckedExpression(UncheckedExpression uncheckedExpression, object data) { - return base.VisitUncheckedExpression(uncheckedExpression, data); - } - - public virtual object TrackedVisitUncheckedStatement(UncheckedStatement uncheckedStatement, object data) { - return base.VisitUncheckedStatement(uncheckedStatement, data); - } - - public virtual object TrackedVisitUnsafeStatement(UnsafeStatement unsafeStatement, object data) { - return base.VisitUnsafeStatement(unsafeStatement, data); - } - public virtual object TrackedVisitUsing(Using @using, object data) { return base.VisitUsing(@using, data); } @@ -1456,9 +1273,5 @@ namespace ICSharpCode.NRefactory.VB.Visitors { public virtual object TrackedVisitXmlMemberAccessExpression(XmlMemberAccessExpression xmlMemberAccessExpression, object data) { return base.VisitXmlMemberAccessExpression(xmlMemberAccessExpression, data); } - - public virtual object TrackedVisitYieldStatement(YieldStatement yieldStatement, object data) { - return base.VisitYieldStatement(yieldStatement, data); - } } } diff --git a/VB/Project/Visitors/NotImplementedAstVisitor.cs b/VB/Project/Visitors/NotImplementedAstVisitor.cs index cad1aa3a96..c840449f9c 100644 --- a/VB/Project/Visitors/NotImplementedAstVisitor.cs +++ b/VB/Project/Visitors/NotImplementedAstVisitor.cs @@ -58,10 +58,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { throw new global::System.NotImplementedException("BlockStatement"); } - public virtual object VisitBreakStatement(BreakStatement breakStatement, object data) { - throw new global::System.NotImplementedException("BreakStatement"); - } - public virtual object VisitCaseLabel(CaseLabel caseLabel, object data) { throw new global::System.NotImplementedException("CaseLabel"); } @@ -74,14 +70,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { throw new global::System.NotImplementedException("CatchClause"); } - public virtual object VisitCheckedExpression(CheckedExpression checkedExpression, object data) { - throw new global::System.NotImplementedException("CheckedExpression"); - } - - public virtual object VisitCheckedStatement(CheckedStatement checkedStatement, object data) { - throw new global::System.NotImplementedException("CheckedStatement"); - } - public virtual object VisitClassReferenceExpression(ClassReferenceExpression classReferenceExpression, object data) { throw new global::System.NotImplementedException("ClassReferenceExpression"); } @@ -126,10 +114,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { throw new global::System.NotImplementedException("DelegateDeclaration"); } - public virtual object VisitDestructorDeclaration(DestructorDeclaration destructorDeclaration, object data) { - throw new global::System.NotImplementedException("DestructorDeclaration"); - } - public virtual object VisitDirectionExpression(DirectionExpression directionExpression, object data) { throw new global::System.NotImplementedException("DirectionExpression"); } @@ -142,10 +126,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { throw new global::System.NotImplementedException("ElseIfSection"); } - public virtual object VisitEmptyStatement(EmptyStatement emptyStatement, object data) { - throw new global::System.NotImplementedException("EmptyStatement"); - } - public virtual object VisitEndStatement(EndStatement endStatement, object data) { throw new global::System.NotImplementedException("EndStatement"); } @@ -194,10 +174,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { throw new global::System.NotImplementedException("FieldDeclaration"); } - public virtual object VisitFixedStatement(FixedStatement fixedStatement, object data) { - throw new global::System.NotImplementedException("FixedStatement"); - } - public virtual object VisitForeachStatement(ForeachStatement foreachStatement, object data) { throw new global::System.NotImplementedException("ForeachStatement"); } @@ -206,14 +182,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { throw new global::System.NotImplementedException("ForNextStatement"); } - public virtual object VisitForStatement(ForStatement forStatement, object data) { - throw new global::System.NotImplementedException("ForStatement"); - } - - public virtual object VisitGotoCaseStatement(GotoCaseStatement gotoCaseStatement, object data) { - throw new global::System.NotImplementedException("GotoCaseStatement"); - } - public virtual object VisitGotoStatement(GotoStatement gotoStatement, object data) { throw new global::System.NotImplementedException("GotoStatement"); } @@ -226,10 +194,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { throw new global::System.NotImplementedException("IfElseStatement"); } - public virtual object VisitIndexerExpression(IndexerExpression indexerExpression, object data) { - throw new global::System.NotImplementedException("IndexerExpression"); - } - public virtual object VisitInnerClassTypeReference(InnerClassTypeReference innerClassTypeReference, object data) { throw new global::System.NotImplementedException("InnerClassTypeReference"); } @@ -302,10 +266,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { throw new global::System.NotImplementedException("ParenthesizedExpression"); } - public virtual object VisitPointerReferenceExpression(PointerReferenceExpression pointerReferenceExpression, object data) { - throw new global::System.NotImplementedException("PointerReferenceExpression"); - } - public virtual object VisitPrimitiveExpression(PrimitiveExpression primitiveExpression, object data) { throw new global::System.NotImplementedException("PrimitiveExpression"); } @@ -390,10 +350,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { throw new global::System.NotImplementedException("QueryExpressionSelectVBClause"); } - public virtual object VisitQueryExpressionVB(QueryExpressionVB queryExpressionVB, object data) { - throw new global::System.NotImplementedException("QueryExpressionVB"); - } - public virtual object VisitQueryExpressionWhereClause(QueryExpressionWhereClause queryExpressionWhereClause, object data) { throw new global::System.NotImplementedException("QueryExpressionWhereClause"); } @@ -418,14 +374,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { throw new global::System.NotImplementedException("ReturnStatement"); } - public virtual object VisitSizeOfExpression(SizeOfExpression sizeOfExpression, object data) { - throw new global::System.NotImplementedException("SizeOfExpression"); - } - - public virtual object VisitStackAllocExpression(StackAllocExpression stackAllocExpression, object data) { - throw new global::System.NotImplementedException("StackAllocExpression"); - } - public virtual object VisitStopStatement(StopStatement stopStatement, object data) { throw new global::System.NotImplementedException("StopStatement"); } @@ -478,18 +426,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors { throw new global::System.NotImplementedException("UnaryOperatorExpression"); } - public virtual object VisitUncheckedExpression(UncheckedExpression uncheckedExpression, object data) { - throw new global::System.NotImplementedException("UncheckedExpression"); - } - - public virtual object VisitUncheckedStatement(UncheckedStatement uncheckedStatement, object data) { - throw new global::System.NotImplementedException("UncheckedStatement"); - } - - public virtual object VisitUnsafeStatement(UnsafeStatement unsafeStatement, object data) { - throw new global::System.NotImplementedException("UnsafeStatement"); - } - public virtual object VisitUsing(Using @using, object data) { throw new global::System.NotImplementedException("Using"); } @@ -533,9 +469,5 @@ namespace ICSharpCode.NRefactory.VB.Visitors { public virtual object VisitXmlMemberAccessExpression(XmlMemberAccessExpression xmlMemberAccessExpression, object data) { throw new global::System.NotImplementedException("XmlMemberAccessExpression"); } - - public virtual object VisitYieldStatement(YieldStatement yieldStatement, object data) { - throw new global::System.NotImplementedException("YieldStatement"); - } } } diff --git a/VB/Test/ICSharpCode.NRefactory.VB.Tests.csproj b/VB/Test/ICSharpCode.NRefactory.VB.Tests.csproj index 3be2dbe3f4..11daba7644 100644 --- a/VB/Test/ICSharpCode.NRefactory.VB.Tests.csproj +++ b/VB/Test/ICSharpCode.NRefactory.VB.Tests.csproj @@ -70,7 +70,6 @@ - @@ -90,13 +89,7 @@ - - - - - - @@ -106,16 +99,11 @@ - - - - - @@ -126,11 +114,6 @@ - - - - - diff --git a/VB/Test/Lexer/LexerTests.cs b/VB/Test/Lexer/LexerTests.cs index b8662b6efd..6d8ea0854f 100644 --- a/VB/Test/Lexer/LexerTests.cs +++ b/VB/Test/Lexer/LexerTests.cs @@ -2,6 +2,7 @@ using System; using System.IO; using NUnit.Framework; +using ICSharpCode.NRefactory.VB; using ICSharpCode.NRefactory.VB.Parser; using ICSharpCode.NRefactory.VB.PrettyPrinter; diff --git a/VB/Test/Parser/Expressions/AddressOfExpressionTests.cs b/VB/Test/Parser/Expressions/AddressOfExpressionTests.cs index 59b2d771bd..6b91bc49ea 100644 --- a/VB/Test/Parser/Expressions/AddressOfExpressionTests.cs +++ b/VB/Test/Parser/Expressions/AddressOfExpressionTests.cs @@ -12,8 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class AddressOfExpressionTests { - #region VB.NET - [Test] public void SimpleAddressOfExpressionTest() { @@ -43,7 +41,5 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom Assert.AreEqual("t", ((MemberReferenceExpression)ae.Expression).MemberName, "t"); Assert.IsInstanceOf(typeof(ThisReferenceExpression), ((MemberReferenceExpression)ae.Expression).TargetObject); } - - #endregion } } diff --git a/VB/Test/Parser/Expressions/ArrayCreateExpressionTests.cs b/VB/Test/Parser/Expressions/ArrayCreateExpressionTests.cs index bd581a6355..cf849360b6 100644 --- a/VB/Test/Parser/Expressions/ArrayCreateExpressionTests.cs +++ b/VB/Test/Parser/Expressions/ArrayCreateExpressionTests.cs @@ -12,10 +12,8 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class ArrayCreateExpressionTests { - #region VB.NET - [Test] - public void VBNetArrayCreateExpressionTest1() + public void ArrayCreateExpressionTest1() { ArrayCreateExpression ace = ParseUtilVBNet.ParseExpression("new Integer() {1, 2, 3, 4}"); @@ -25,7 +23,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom } [Test] - public void VBNetArrayCreateExpressionTest2() + public void ArrayCreateExpressionTest2() { ArrayCreateExpression ace = ParseUtilVBNet.ParseExpression("New Integer(0 To 5){0, 1, 2, 3, 4, 5}"); @@ -34,6 +32,5 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom Assert.AreEqual(5, (ace.Arguments[0] as PrimitiveExpression).Value); Assert.AreEqual(new int[] {0}, ace.CreateType.RankSpecifier); } - #endregion } } diff --git a/VB/Test/Parser/Expressions/AssignmentExpressionTests.cs b/VB/Test/Parser/Expressions/AssignmentExpressionTests.cs index c4a15e51e8..b3081f6c10 100644 --- a/VB/Test/Parser/Expressions/AssignmentExpressionTests.cs +++ b/VB/Test/Parser/Expressions/AssignmentExpressionTests.cs @@ -12,8 +12,7 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class AssignmentExpressionTests { - #region VB.NET - void VBNetTestAssignmentExpression(string program, AssignmentOperatorType op) + void TestAssignmentExpression(string program, AssignmentOperatorType op) { ExpressionStatement se = ParseUtilVBNet.ParseStatement(program); AssignmentExpression ae = se.Expression as AssignmentExpression; @@ -24,52 +23,51 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom } [Test] - public void VBNetAssignTest() + public void AssignTest() { - VBNetTestAssignmentExpression("a = b", AssignmentOperatorType.Assign); + TestAssignmentExpression("a = b", AssignmentOperatorType.Assign); } [Test] - public void VBNetAddTest() + public void AddTest() { - VBNetTestAssignmentExpression("a += b", AssignmentOperatorType.Add); + TestAssignmentExpression("a += b", AssignmentOperatorType.Add); } [Test] - public void VBNetSubtractTest() + public void SubtractTest() { - VBNetTestAssignmentExpression("a -= b", AssignmentOperatorType.Subtract); + TestAssignmentExpression("a -= b", AssignmentOperatorType.Subtract); } [Test] - public void VBNetMultiplyTest() + public void MultiplyTest() { - VBNetTestAssignmentExpression("a *= b", AssignmentOperatorType.Multiply); + TestAssignmentExpression("a *= b", AssignmentOperatorType.Multiply); } [Test] - public void VBNetDivideTest() + public void DivideTest() { - VBNetTestAssignmentExpression("a /= b", AssignmentOperatorType.Divide); + TestAssignmentExpression("a /= b", AssignmentOperatorType.Divide); } [Test] - public void VBNetExclusiveOrTest() + public void ExclusiveOrTest() { - VBNetTestAssignmentExpression("a ^= b", AssignmentOperatorType.Power); + TestAssignmentExpression("a ^= b", AssignmentOperatorType.Power); } [Test] - public void VBNetStringConcatTest() + public void StringConcatTest() { - VBNetTestAssignmentExpression("a &= b", AssignmentOperatorType.ConcatString); + TestAssignmentExpression("a &= b", AssignmentOperatorType.ConcatString); } [Test] - public void VBNetModulusTest() + public void ModulusTest() { - VBNetTestAssignmentExpression("a \\= b", AssignmentOperatorType.DivideInteger); + TestAssignmentExpression("a \\= b", AssignmentOperatorType.DivideInteger); } - #endregion } } diff --git a/VB/Test/Parser/Expressions/CheckedExpressionTests.cs b/VB/Test/Parser/Expressions/CheckedExpressionTests.cs deleted file mode 100644 index 4cbc8fe677..0000000000 --- a/VB/Test/Parser/Expressions/CheckedExpressionTests.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.IO; -using NUnit.Framework; -using ICSharpCode.NRefactory.VB.Parser; -using ICSharpCode.NRefactory.VB.Dom; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class CheckedExpressionTests - { - #region VB.NET - // No VB.NET representation - #endregion - } -} diff --git a/VB/Test/Parser/Expressions/IndexerExpressionTests.cs b/VB/Test/Parser/Expressions/IndexerExpressionTests.cs deleted file mode 100644 index 85ca5f3f44..0000000000 --- a/VB/Test/Parser/Expressions/IndexerExpressionTests.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.IO; -using NUnit.Framework; -using ICSharpCode.NRefactory.VB.Parser; -using ICSharpCode.NRefactory.VB.Dom; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class IndexerExpressionTests - { - #region VB.NET - // No VB.NET representation - #endregion - } -} diff --git a/VB/Test/Parser/Expressions/PointerReferenceExpressionTests.cs b/VB/Test/Parser/Expressions/PointerReferenceExpressionTests.cs deleted file mode 100644 index 0f16ce1b2f..0000000000 --- a/VB/Test/Parser/Expressions/PointerReferenceExpressionTests.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.IO; -using NUnit.Framework; -using ICSharpCode.NRefactory.VB.Parser; -using ICSharpCode.NRefactory.VB.Dom; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class PointerReferenceExpressionTests - { - #region VB.NET - // No VB.NET representation - #endregion - } -} diff --git a/VB/Test/Parser/Expressions/QueryExpressionTests.cs b/VB/Test/Parser/Expressions/QueryExpressionTests.cs index c6d150f257..aca6b74b20 100644 --- a/VB/Test/Parser/Expressions/QueryExpressionTests.cs +++ b/VB/Test/Parser/Expressions/QueryExpressionTests.cs @@ -14,5 +14,622 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class QueryExpressionTests { + void RunTest(string expression, int expectedCount, Action constraint, params Type[] expectedTypes) + { + var expr = ParseUtilVBNet.ParseExpression(expression); + + Assert.AreEqual(expectedCount, expr.Clauses.Count); + + for (int i = 0; i < expectedTypes.Length; i++) { + Assert.IsTrue(expectedTypes[i] == expr.Clauses[i].GetType()); + } + + constraint(expr); + } + + [Test] + public void SimpleQueryTest() + { + RunTest("From o In db.Orders Select o.OrderID", 2, + expr => { + var fromClause = expr.Clauses[0] as QueryExpressionFromClause; + var selectClause = expr.Clauses[1] as QueryExpressionSelectVBClause; + + Assert.AreEqual(1, fromClause.Sources.Count); + + var var1 = fromClause.Sources.First(); + + Assert.AreEqual("o", var1.Identifier); + Assert.IsTrue(var1.Expression is MemberReferenceExpression); + var inExpr = var1.Expression as MemberReferenceExpression; + Assert.IsTrue(inExpr.MemberName == "Orders" && inExpr.TargetObject is IdentifierExpression && (inExpr.TargetObject as IdentifierExpression).Identifier == "db"); + + Assert.AreEqual(1, selectClause.Variables.Count); + Assert.IsTrue(selectClause.Variables[0].Expression is MemberReferenceExpression); + var member = selectClause.Variables[0].Expression as MemberReferenceExpression; + + Assert.IsTrue(member.MemberName == "OrderID" && member.TargetObject is IdentifierExpression && (member.TargetObject as IdentifierExpression).Identifier == "o"); + }, + typeof(QueryExpressionFromClause), typeof(QueryExpressionSelectVBClause) + ); + } + + [Test] + public void SkipTakeQueryTest() + { + RunTest("From o In db.Orders Select o.OrderID Skip 10 Take 5", 4, + expr => { + var fromClause = expr.Clauses[0] as QueryExpressionFromClause; + var selectClause = expr.Clauses[1] as QueryExpressionSelectVBClause; + var skipClause = expr.Clauses[2] as QueryExpressionPartitionVBClause; + var takeClause = expr.Clauses[3] as QueryExpressionPartitionVBClause; + + Assert.AreEqual(1, fromClause.Sources.Count); + + var var1 = fromClause.Sources.First(); + + Assert.AreEqual("o", var1.Identifier); + Assert.IsTrue(var1.Expression is MemberReferenceExpression); + var inExpr = var1.Expression as MemberReferenceExpression; + Assert.IsTrue(inExpr.MemberName == "Orders" && inExpr.TargetObject is IdentifierExpression && (inExpr.TargetObject as IdentifierExpression).Identifier == "db"); + + Assert.AreEqual(1, selectClause.Variables.Count); + Assert.IsTrue(selectClause.Variables[0].Expression is MemberReferenceExpression); + var member = selectClause.Variables[0].Expression as MemberReferenceExpression; + + Assert.IsTrue(member.MemberName == "OrderID" && member.TargetObject is IdentifierExpression && (member.TargetObject as IdentifierExpression).Identifier == "o"); + + Assert.AreEqual(QueryExpressionPartitionType.Skip, skipClause.PartitionType); + Assert.IsTrue(skipClause.Expression is PrimitiveExpression && + (skipClause.Expression as PrimitiveExpression).StringValue == "10"); + + Assert.AreEqual(QueryExpressionPartitionType.Take, takeClause.PartitionType); + Assert.IsTrue(takeClause.Expression is PrimitiveExpression && + (takeClause.Expression as PrimitiveExpression).StringValue == "5"); + }, + typeof(QueryExpressionFromClause), typeof(QueryExpressionSelectVBClause), + typeof(QueryExpressionPartitionVBClause), typeof(QueryExpressionPartitionVBClause) + ); + } + + [Test] + public void SkipWhileTakeWhileQueryTest() + { + RunTest("From o In db.Orders Select o.OrderID Skip While o.OrderId > 2 Take While o.OrderId < 5", 4, + expr => { + var fromClause = expr.Clauses[0] as QueryExpressionFromClause; + var selectClause = expr.Clauses[1] as QueryExpressionSelectVBClause; + var skipClause = expr.Clauses[2] as QueryExpressionPartitionVBClause; + var takeClause = expr.Clauses[3] as QueryExpressionPartitionVBClause; + + Assert.AreEqual(1, fromClause.Sources.Count); + + var var1 = fromClause.Sources.First(); + + Assert.AreEqual("o", var1.Identifier); + Assert.IsTrue(var1.Expression is MemberReferenceExpression); + var inExpr = var1.Expression as MemberReferenceExpression; + Assert.IsTrue(inExpr.MemberName == "Orders" && inExpr.TargetObject is IdentifierExpression && (inExpr.TargetObject as IdentifierExpression).Identifier == "db"); + + Assert.AreEqual(1, selectClause.Variables.Count); + Assert.IsTrue(selectClause.Variables[0].Expression is MemberReferenceExpression); + var member = selectClause.Variables[0].Expression as MemberReferenceExpression; + + Assert.IsTrue(member.MemberName == "OrderID" && member.TargetObject is IdentifierExpression && (member.TargetObject as IdentifierExpression).Identifier == "o"); + + Assert.AreEqual(QueryExpressionPartitionType.SkipWhile, skipClause.PartitionType); + Assert.IsTrue(skipClause.Expression is BinaryOperatorExpression); + + Assert.AreEqual(QueryExpressionPartitionType.TakeWhile, takeClause.PartitionType); + Assert.IsTrue(takeClause.Expression is BinaryOperatorExpression); + }, + typeof(QueryExpressionFromClause), typeof(QueryExpressionSelectVBClause), + typeof(QueryExpressionPartitionVBClause), typeof(QueryExpressionPartitionVBClause) + ); + } + + [Test] + public void MultipleValuesSelectTest() + { + RunTest(@"From i In list Select i, x2 = i^2", + 2, expr => { + var fromClause = expr.Clauses[0] as QueryExpressionFromClause; + var selectClause = expr.Clauses[1] as QueryExpressionSelectVBClause; + + Assert.AreEqual(1, fromClause.Sources.Count); + + var var1 = fromClause.Sources.First(); + + Assert.AreEqual("i", var1.Identifier); + Assert.IsTrue(var1.Expression is IdentifierExpression); + Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "list"); + + Assert.AreEqual(2, selectClause.Variables.Count); + + var selectExpr1 = selectClause.Variables[0]; + var selectExpr2 = selectClause.Variables[1]; + + Assert.IsEmpty(selectExpr1.Identifier); + Assert.IsTrue(selectExpr1.Expression is IdentifierExpression && + (selectExpr1.Expression as IdentifierExpression).Identifier == "i"); + + Assert.AreEqual("x2", selectExpr2.Identifier); + Assert.IsTrue(selectExpr2.Type.IsNull); + Assert.IsTrue(selectExpr2.Expression is BinaryOperatorExpression); + + var binOp = selectExpr2.Expression as BinaryOperatorExpression; + + Assert.AreEqual(BinaryOperatorType.Power, binOp.Op); + Assert.IsTrue(binOp.Left is IdentifierExpression && (binOp.Left as IdentifierExpression).Identifier == "i"); + Assert.IsTrue(binOp.Right is PrimitiveExpression && (binOp.Right as PrimitiveExpression).StringValue == "2"); + }, + typeof(QueryExpressionFromClause), typeof(QueryExpressionSelectVBClause) + ); + } + + [Test] + public void GroupTest() + { + Action constraint = expr => { + var fromClause = expr.Clauses[0] as QueryExpressionFromClause; + var groupClause = expr.Clauses[1] as QueryExpressionGroupVBClause; + var selectClause = expr.Clauses[2] as QueryExpressionSelectVBClause; + + Assert.AreEqual(1, fromClause.Sources.Count); + + var fromVar1 = fromClause.Sources.First(); + + Assert.AreEqual("p", fromVar1.Identifier); + Assert.IsTrue(fromVar1.Expression is IdentifierExpression); + Assert.IsTrue((fromVar1.Expression as IdentifierExpression).Identifier == "products"); + + Assert.AreEqual(1, groupClause.GroupVariables.Count); + Assert.AreEqual(1, groupClause.ByVariables.Count); + Assert.AreEqual(1, groupClause.IntoVariables.Count); + + var gv = groupClause.GroupVariables.First(); + var bv = groupClause.ByVariables.First(); + var iv = groupClause.IntoVariables.First(); + + Assert.IsTrue(gv.Expression is IdentifierExpression && (gv.Expression as IdentifierExpression).Identifier == "p"); + Assert.IsTrue(bv.Expression is MemberReferenceExpression && + (bv.Expression as MemberReferenceExpression).MemberName == "Category"); + Assert.IsTrue((bv.Expression as MemberReferenceExpression).TargetObject is IdentifierExpression && + ((bv.Expression as MemberReferenceExpression).TargetObject as IdentifierExpression).Identifier == "p"); + Assert.IsTrue(iv.Expression is IdentifierExpression && + (iv.Expression as IdentifierExpression).Identifier == "Group"); + + Assert.AreEqual(2, selectClause.Variables.Count); + + var var1 = selectClause.Variables.First(); + var var2 = selectClause.Variables.Skip(1).First(); + + Assert.IsTrue(var1.Expression is IdentifierExpression && + (var1.Expression as IdentifierExpression).Identifier == "Category"); + Assert.IsTrue(var2.Expression is InvocationExpression && + (var2.Expression as InvocationExpression).TargetObject is MemberReferenceExpression && + ((var2.Expression as InvocationExpression).TargetObject as MemberReferenceExpression).MemberName == "Average" && + ((var2.Expression as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject is IdentifierExpression && + (((var2.Expression as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject as IdentifierExpression).Identifier == "Group"); + }; + + RunTest(@"From p In products _ + Group p By p.Category Into Group _ + Select Category, AveragePrice = Group.Average(Function(p) p.UnitPrice)", 3, constraint, + typeof(QueryExpressionFromClause), typeof(QueryExpressionGroupVBClause), typeof(QueryExpressionSelectVBClause)); + } + + [Test] + public void LetTest() + { + Action constraint = expr => { + var fromClause = expr.Clauses[0] as QueryExpressionFromClause; + var groupClause = expr.Clauses[1] as QueryExpressionGroupVBClause; + var letClause = expr.Clauses[2] as QueryExpressionLetVBClause; + var selectClause = expr.Clauses[3] as QueryExpressionSelectVBClause; + + // From + Assert.AreEqual(1, fromClause.Sources.Count); + + var fromVar1 = fromClause.Sources.First(); + + Assert.AreEqual("p", fromVar1.Identifier); + Assert.IsTrue(fromVar1.Expression is IdentifierExpression); + Assert.IsTrue((fromVar1.Expression as IdentifierExpression).Identifier == "products"); + + // Group By Into + Assert.AreEqual(1, groupClause.GroupVariables.Count); + Assert.AreEqual(1, groupClause.ByVariables.Count); + Assert.AreEqual(1, groupClause.IntoVariables.Count); + + var gv = groupClause.GroupVariables.First(); + var bv = groupClause.ByVariables.First(); + var iv = groupClause.IntoVariables.First(); + + Assert.IsTrue(gv.Expression is IdentifierExpression && (gv.Expression as IdentifierExpression).Identifier == "p"); + CheckMemberReferenceExpression(bv.Expression, "Category", "p"); + Assert.IsTrue(iv.Expression is IdentifierExpression && + (iv.Expression as IdentifierExpression).Identifier == "Group"); + + // Let + Assert.AreEqual(1, letClause.Variables.Count); + + var letVariable = letClause.Variables.First(); + + Assert.AreEqual("minPrice", letVariable.Identifier); + Assert.IsTrue(letVariable.Expression is InvocationExpression); + CheckMemberReferenceExpression((letVariable.Expression as InvocationExpression).TargetObject, "Min", "Group"); + + // Select + Assert.AreEqual(2, selectClause.Variables.Count); + + var var1 = selectClause.Variables.First(); + var var2 = selectClause.Variables.Skip(1).First(); + + Assert.IsTrue(var1.Expression is IdentifierExpression && + (var1.Expression as IdentifierExpression).Identifier == "Category"); + Assert.IsTrue(var2.Expression is InvocationExpression); + CheckMemberReferenceExpression((var2.Expression as InvocationExpression).TargetObject, "Where", "Group"); + }; + + RunTest(@"From p In products _ + Group p By p.Category Into Group _ + Let minPrice = Group.Min(Function(p) p.UnitPrice) _ + Select Category, CheapestProducts = Group.Where(Function(p) p.UnitPrice = minPrice)", 4, constraint, + typeof(QueryExpressionFromClause), typeof(QueryExpressionGroupVBClause), typeof(QueryExpressionLetVBClause), typeof(QueryExpressionSelectVBClause)); + } + + [Test] + public void CrossJoinTest() + { + Action constraint = expr => { + var fromClause = expr.Clauses[0] as QueryExpressionFromClause; + var joinClause = expr.Clauses[1] as QueryExpressionJoinVBClause; + var selectClause = expr.Clauses[2] as QueryExpressionSelectVBClause; + + // From + Assert.AreEqual(1, fromClause.Sources.Count); + + var fromVar1 = fromClause.Sources.First(); + + Assert.AreEqual("c", fromVar1.Identifier); + Assert.IsTrue(fromVar1.Expression is IdentifierExpression); + Assert.IsTrue((fromVar1.Expression as IdentifierExpression).Identifier == "categories"); + + // Join In On Equals + var inClause = joinClause.JoinVariable as CollectionRangeVariable; + + Assert.AreEqual("p", inClause.Identifier); + Assert.IsTrue(inClause.Expression is IdentifierExpression && + (inClause.Expression as IdentifierExpression).Identifier == "products"); + + Assert.IsTrue(joinClause.SubJoin.IsNull); + + Assert.AreEqual(1, joinClause.Conditions.Count); + + var condition1 = joinClause.Conditions.First(); + + Assert.IsTrue(condition1.LeftSide is IdentifierExpression && (condition1.LeftSide as IdentifierExpression).Identifier == "c"); + + CheckMemberReferenceExpression(condition1.RightSide, "Category", "p"); + + // Select + Assert.AreEqual(2, selectClause.Variables.Count); + + var var1 = selectClause.Variables.First(); + var var2 = selectClause.Variables.Skip(1).First(); + + Assert.AreEqual("Category", var1.Identifier); + Assert.IsEmpty(var2.Identifier); + + Assert.IsTrue(var1.Expression is IdentifierExpression && + (var1.Expression as IdentifierExpression).Identifier == "c"); + CheckMemberReferenceExpression(var2.Expression, "ProductName", "p"); + }; + + RunTest(@"From c In categories _ + Join p In products On c Equals p.Category _ + Select Category = c, p.ProductName", 3, constraint, + typeof(QueryExpressionFromClause), typeof(QueryExpressionJoinVBClause), typeof(QueryExpressionSelectVBClause)); + } + + [Test] + public void OrderByTest() + { + Action constraint = expr => { + var fromClause = expr.Clauses[0] as QueryExpressionFromClause; + var orderClause = expr.Clauses[1] as QueryExpressionOrderClause; + + // From + Assert.AreEqual(1, fromClause.Sources.Count); + + var var1 = fromClause.Sources.First(); + + Assert.AreEqual("i", var1.Identifier); + Assert.IsTrue(var1.Expression is IdentifierExpression); + Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "list"); + + // Order By + Assert.AreEqual(1, orderClause.Orderings.Count); + + var ordering1 = orderClause.Orderings.First(); + + Assert.IsTrue(ordering1.Criteria is IdentifierExpression && + (ordering1.Criteria as IdentifierExpression).Identifier == "i"); + Assert.AreEqual(QueryExpressionOrderingDirection.None, ordering1.Direction); + }; + + RunTest(@"From i In list Order By i", 2, constraint, typeof(QueryExpressionFromClause), typeof(QueryExpressionOrderClause)); + } + + [Test] + public void OrderByTest2() + { + Action constraint = expr => { + var fromClause = expr.Clauses[0] as QueryExpressionFromClause; + var orderClause = expr.Clauses[1] as QueryExpressionOrderClause; + + // From + Assert.AreEqual(1, fromClause.Sources.Count); + + var var1 = fromClause.Sources.First(); + + Assert.AreEqual("i", var1.Identifier); + Assert.IsTrue(var1.Expression is IdentifierExpression); + Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "list"); + + // Order By + Assert.AreEqual(1, orderClause.Orderings.Count); + + var ordering1 = orderClause.Orderings.First(); + + Assert.IsTrue(ordering1.Criteria is IdentifierExpression && + (ordering1.Criteria as IdentifierExpression).Identifier == "i"); + Assert.AreEqual(QueryExpressionOrderingDirection.Ascending, ordering1.Direction); + }; + + RunTest(@"From i In list Order By i Ascending", 2, constraint, typeof(QueryExpressionFromClause), typeof(QueryExpressionOrderClause)); + } + + [Test] + public void OrderByTest3() + { + Action constraint = expr => { + var fromClause = expr.Clauses[0] as QueryExpressionFromClause; + var orderClause = expr.Clauses[1] as QueryExpressionOrderClause; + + // From + Assert.AreEqual(1, fromClause.Sources.Count); + + var var1 = fromClause.Sources.First(); + + Assert.AreEqual("i", var1.Identifier); + Assert.IsTrue(var1.Expression is IdentifierExpression); + Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "list"); + + // Order By + Assert.AreEqual(1, orderClause.Orderings.Count); + + var ordering1 = orderClause.Orderings.First(); + + Assert.IsTrue(ordering1.Criteria is IdentifierExpression && + (ordering1.Criteria as IdentifierExpression).Identifier == "i"); + Assert.AreEqual(QueryExpressionOrderingDirection.Descending, ordering1.Direction); + }; + + RunTest(@"From i In list Order By i Descending", 2, constraint, typeof(QueryExpressionFromClause), typeof(QueryExpressionOrderClause)); + } + + [Test] + public void OrderByThenByTest() + { + Action constraint = expr => { + var fromClause = expr.Clauses[0] as QueryExpressionFromClause; + var orderClause = expr.Clauses[1] as QueryExpressionOrderClause; + + // From + Assert.AreEqual(1, fromClause.Sources.Count); + + var var1 = fromClause.Sources.First(); + + Assert.AreEqual("d", var1.Identifier); + Assert.IsTrue(var1.Expression is IdentifierExpression); + Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "digits"); + + // Order By + Assert.AreEqual(2, orderClause.Orderings.Count); + + var ordering1 = orderClause.Orderings.First(); + var ordering2 = orderClause.Orderings.Skip(1).First(); + + CheckMemberReferenceExpression(ordering1.Criteria, "Length", "d"); + + Assert.IsTrue(ordering2.Criteria is IdentifierExpression && + (ordering2.Criteria as IdentifierExpression).Identifier == "d"); + + Assert.AreEqual(QueryExpressionOrderingDirection.None, ordering1.Direction); + Assert.AreEqual(QueryExpressionOrderingDirection.None, ordering2.Direction); + + }; + + RunTest(@"From d In digits _ + Order By d.Length, d", 2, constraint, + typeof(QueryExpressionFromClause), typeof(QueryExpressionOrderClause)); + } + + [Test] + public void DistinctTest() + { + Action constraint = expr => { + var fromClause = expr.Clauses[0] as QueryExpressionFromClause; + + // From + Assert.AreEqual(1, fromClause.Sources.Count); + + var var1 = fromClause.Sources.First(); + + Assert.AreEqual("d", var1.Identifier); + Assert.IsTrue(var1.Expression is IdentifierExpression); + Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "digits"); + }; + + RunTest(@"From d In digits Distinct", 2, constraint, + typeof(QueryExpressionFromClause), typeof(QueryExpressionDistinctClause)); + } + + [Test] + public void AggregateTest() + { + Action constraint = expr => { + var clause = expr.Clauses[0] as QueryExpressionAggregateClause; + + Assert.AreEqual("p", clause.Source.Identifier); + CheckMemberReferenceExpression(clause.Source.Expression, "GetProcesses", "Process"); + + Assert.AreEqual(1, clause.IntoVariables.Count); + + var into1 = clause.IntoVariables.First(); + + Assert.AreEqual("virtualMemory", into1.Identifier); + + Assert.IsTrue(into1.Expression is InvocationExpression && + (into1.Expression as InvocationExpression).TargetObject is IdentifierExpression && + ((into1.Expression as InvocationExpression).TargetObject as IdentifierExpression).Identifier == "Sum"); + Assert.AreEqual(1, (into1.Expression as InvocationExpression).Arguments.Count); + CheckMemberReferenceExpression((into1.Expression as InvocationExpression).Arguments.First(), "VirtualMemorySize64", "p"); + }; + + RunTest(@"Aggregate p In Process.GetProcesses _ + Into virtualMemory = Sum(p.VirtualMemorySize64)", 1, constraint, typeof(QueryExpressionAggregateClause)); + } + + [Test] + public void GroupJoinTest() + { + Action constraint = expr => { + var fromClause1 = expr.Clauses[0] as QueryExpressionFromClause; + var groupJoinClause = expr.Clauses[1] as QueryExpressionGroupJoinVBClause; + var fromClause2 = expr.Clauses[2] as QueryExpressionFromClause; + var selectClause = expr.Clauses[3] as QueryExpressionSelectVBClause; + + // From 1 + Assert.AreEqual(1, fromClause1.Sources.Count); + + var var1 = fromClause1.Sources.First(); + + Assert.AreEqual("s", var1.Identifier); + Assert.IsTrue(var1.Expression is IdentifierExpression && + (var1.Expression as IdentifierExpression).Identifier == "fileList"); + + // From 2 + Assert.AreEqual(1, fromClause2.Sources.Count); + + var var2 = fromClause2.Sources.First(); + + Assert.AreEqual("p", var2.Identifier); + Assert.IsTrue(var2.Expression is IdentifierExpression && + (var2.Expression as IdentifierExpression).Identifier == "Group"); + + // Select + Assert.AreEqual(1, selectClause.Variables.Count); + + var var3 = selectClause.Variables.First(); + + Assert.IsEmpty(var3.Identifier); + Assert.IsTrue(var3.Expression is IdentifierExpression && + (var3.Expression as IdentifierExpression).Identifier == "s"); + + // Group Join + var joinClause = groupJoinClause.JoinClause; + + // Join In On Equals + var inClause = joinClause.JoinVariable as CollectionRangeVariable; + + Assert.AreEqual("p", inClause.Identifier); + Assert.IsTrue(inClause.Expression is IdentifierExpression && + (inClause.Expression as IdentifierExpression).Identifier == "IMAGES"); + + Assert.IsTrue(joinClause.SubJoin.IsNull); + + Assert.AreEqual(1, joinClause.Conditions.Count); + + var condition1 = joinClause.Conditions.First(); + + Assert.IsTrue(condition1.LeftSide is InvocationExpression); + Assert.IsTrue((condition1.LeftSide as InvocationExpression).TargetObject is MemberReferenceExpression); + Assert.IsTrue(((condition1.LeftSide as InvocationExpression).TargetObject as MemberReferenceExpression).MemberName == "ToUpper"); + Assert.IsTrue(((condition1.LeftSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject is MemberReferenceExpression); + Assert.IsTrue((((condition1.LeftSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject as MemberReferenceExpression).MemberName == "Extension"); + Assert.IsTrue((((condition1.LeftSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject as MemberReferenceExpression).TargetObject is IdentifierExpression); + Assert.IsTrue(((((condition1.LeftSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject as MemberReferenceExpression).TargetObject as IdentifierExpression).Identifier == "s"); + + Assert.IsTrue(condition1.RightSide is InvocationExpression); + Assert.IsTrue((condition1.RightSide as InvocationExpression).TargetObject is MemberReferenceExpression); + Assert.IsTrue(((condition1.RightSide as InvocationExpression).TargetObject as MemberReferenceExpression).MemberName == "ToUpper"); + Assert.IsTrue(((condition1.RightSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject is IdentifierExpression); + Assert.IsTrue((((condition1.RightSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject as IdentifierExpression).Identifier == "p"); + }; + + RunTest(@"From s In fileList _ +Group Join p In IMAGES On s.Extension.ToUpper() Equals p.ToUpper() Into Group _ +From p In Group _ +Select s", 4, constraint, + typeof(QueryExpressionFromClause), typeof(QueryExpressionGroupJoinVBClause), typeof(QueryExpressionFromClause), typeof(QueryExpressionSelectVBClause)); + } + + [Test] + public void SelectManyTest() + { + Action constraint = expr => { + var fromClause = expr.Clauses[0] as QueryExpressionFromClause; + var whereClause = expr.Clauses[1] as QueryExpressionWhereClause; + var selectClause = expr.Clauses[2] as QueryExpressionSelectVBClause; + + // From + Assert.AreEqual(2, fromClause.Sources.Count); + + var fromVar1 = fromClause.Sources.First(); + var fromVar2 = fromClause.Sources.Skip(1).First(); + + Assert.AreEqual("c", fromVar1.Identifier); + Assert.IsTrue(fromVar1.Expression is IdentifierExpression); + Assert.IsTrue((fromVar1.Expression as IdentifierExpression).Identifier == "customers"); + + Assert.AreEqual("o", fromVar2.Identifier); + CheckMemberReferenceExpression(fromVar2.Expression, "Orders", "c"); + + // Where + Assert.IsTrue(whereClause.Condition is BinaryOperatorExpression); + Assert.IsTrue((whereClause.Condition as BinaryOperatorExpression).Op == BinaryOperatorType.LessThan); + CheckMemberReferenceExpression((whereClause.Condition as BinaryOperatorExpression).Left, "Total", "o"); + Assert.IsTrue((whereClause.Condition as BinaryOperatorExpression).Right is PrimitiveExpression); + Assert.IsTrue((double)((whereClause.Condition as BinaryOperatorExpression).Right as PrimitiveExpression).Value == 500.0); + + // Select + foreach (var v in selectClause.Variables) { + Assert.IsEmpty(v.Identifier); + } + + var var1 = selectClause.Variables.First(); + var var2 = selectClause.Variables.Skip(1).First(); + var var3 = selectClause.Variables.Skip(2).First(); + + CheckMemberReferenceExpression(var1.Expression, "CustomerID", "c"); + CheckMemberReferenceExpression(var2.Expression, "OrderID", "o"); + CheckMemberReferenceExpression(var3.Expression, "Total", "o"); + }; + + RunTest(@"From c In customers, o In c.Orders _ + Where o.Total < 500.0 _ + Select c.CustomerID, o.OrderID, o.Total", 3, constraint, typeof(QueryExpressionFromClause), typeof(QueryExpressionWhereClause), typeof(QueryExpressionSelectVBClause)); + } + + void CheckMemberReferenceExpression(Expression expr, string memberName, string targetObjectIdentifier) + { + Assert.IsTrue(expr is MemberReferenceExpression); + Assert.IsTrue((expr as MemberReferenceExpression).MemberName == memberName && + (expr as MemberReferenceExpression).TargetObject is IdentifierExpression && + ((expr as MemberReferenceExpression).TargetObject as IdentifierExpression).Identifier == targetObjectIdentifier); + } } } diff --git a/VB/Test/Parser/Expressions/QueryExpressionVBTests.cs b/VB/Test/Parser/Expressions/QueryExpressionVBTests.cs deleted file mode 100644 index b50322adbe..0000000000 --- a/VB/Test/Parser/Expressions/QueryExpressionVBTests.cs +++ /dev/null @@ -1,633 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.Linq; -using ICSharpCode.NRefactory.VB.Dom; -using ICSharpCode.NRefactory.VB.Tests.Dom; -using NUnit.Framework; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class QueryExpressionVBTests - { - void RunTest(string expression, int expectedCount, Action constraint, params Type[] expectedTypes) - { - var expr = ParseUtilVBNet.ParseExpression(expression); - - Assert.AreEqual(expectedCount, expr.Clauses.Count); - - for (int i = 0; i < expectedTypes.Length; i++) { - Assert.IsTrue(expectedTypes[i] == expr.Clauses[i].GetType()); - } - - constraint(expr); - } - - [Test] - public void SimpleQueryTest() - { - RunTest("From o In db.Orders Select o.OrderID", 2, - expr => { - var fromClause = expr.Clauses[0] as QueryExpressionFromClause; - var selectClause = expr.Clauses[1] as QueryExpressionSelectVBClause; - - Assert.AreEqual(1, fromClause.Sources.Count); - - var var1 = fromClause.Sources.First(); - - Assert.AreEqual("o", var1.Identifier); - Assert.IsTrue(var1.Expression is MemberReferenceExpression); - var inExpr = var1.Expression as MemberReferenceExpression; - Assert.IsTrue(inExpr.MemberName == "Orders" && inExpr.TargetObject is IdentifierExpression && (inExpr.TargetObject as IdentifierExpression).Identifier == "db"); - - Assert.AreEqual(1, selectClause.Variables.Count); - Assert.IsTrue(selectClause.Variables[0].Expression is MemberReferenceExpression); - var member = selectClause.Variables[0].Expression as MemberReferenceExpression; - - Assert.IsTrue(member.MemberName == "OrderID" && member.TargetObject is IdentifierExpression && (member.TargetObject as IdentifierExpression).Identifier == "o"); - }, - typeof(QueryExpressionFromClause), typeof(QueryExpressionSelectVBClause) - ); - } - - [Test] - public void SkipTakeQueryTest() - { - RunTest("From o In db.Orders Select o.OrderID Skip 10 Take 5", 4, - expr => { - var fromClause = expr.Clauses[0] as QueryExpressionFromClause; - var selectClause = expr.Clauses[1] as QueryExpressionSelectVBClause; - var skipClause = expr.Clauses[2] as QueryExpressionPartitionVBClause; - var takeClause = expr.Clauses[3] as QueryExpressionPartitionVBClause; - - Assert.AreEqual(1, fromClause.Sources.Count); - - var var1 = fromClause.Sources.First(); - - Assert.AreEqual("o", var1.Identifier); - Assert.IsTrue(var1.Expression is MemberReferenceExpression); - var inExpr = var1.Expression as MemberReferenceExpression; - Assert.IsTrue(inExpr.MemberName == "Orders" && inExpr.TargetObject is IdentifierExpression && (inExpr.TargetObject as IdentifierExpression).Identifier == "db"); - - Assert.AreEqual(1, selectClause.Variables.Count); - Assert.IsTrue(selectClause.Variables[0].Expression is MemberReferenceExpression); - var member = selectClause.Variables[0].Expression as MemberReferenceExpression; - - Assert.IsTrue(member.MemberName == "OrderID" && member.TargetObject is IdentifierExpression && (member.TargetObject as IdentifierExpression).Identifier == "o"); - - Assert.AreEqual(QueryExpressionPartitionType.Skip, skipClause.PartitionType); - Assert.IsTrue(skipClause.Expression is PrimitiveExpression && - (skipClause.Expression as PrimitiveExpression).StringValue == "10"); - - Assert.AreEqual(QueryExpressionPartitionType.Take, takeClause.PartitionType); - Assert.IsTrue(takeClause.Expression is PrimitiveExpression && - (takeClause.Expression as PrimitiveExpression).StringValue == "5"); - }, - typeof(QueryExpressionFromClause), typeof(QueryExpressionSelectVBClause), - typeof(QueryExpressionPartitionVBClause), typeof(QueryExpressionPartitionVBClause) - ); - } - - [Test] - public void SkipWhileTakeWhileQueryTest() - { - RunTest("From o In db.Orders Select o.OrderID Skip While o.OrderId > 2 Take While o.OrderId < 5", 4, - expr => { - var fromClause = expr.Clauses[0] as QueryExpressionFromClause; - var selectClause = expr.Clauses[1] as QueryExpressionSelectVBClause; - var skipClause = expr.Clauses[2] as QueryExpressionPartitionVBClause; - var takeClause = expr.Clauses[3] as QueryExpressionPartitionVBClause; - - Assert.AreEqual(1, fromClause.Sources.Count); - - var var1 = fromClause.Sources.First(); - - Assert.AreEqual("o", var1.Identifier); - Assert.IsTrue(var1.Expression is MemberReferenceExpression); - var inExpr = var1.Expression as MemberReferenceExpression; - Assert.IsTrue(inExpr.MemberName == "Orders" && inExpr.TargetObject is IdentifierExpression && (inExpr.TargetObject as IdentifierExpression).Identifier == "db"); - - Assert.AreEqual(1, selectClause.Variables.Count); - Assert.IsTrue(selectClause.Variables[0].Expression is MemberReferenceExpression); - var member = selectClause.Variables[0].Expression as MemberReferenceExpression; - - Assert.IsTrue(member.MemberName == "OrderID" && member.TargetObject is IdentifierExpression && (member.TargetObject as IdentifierExpression).Identifier == "o"); - - Assert.AreEqual(QueryExpressionPartitionType.SkipWhile, skipClause.PartitionType); - Assert.IsTrue(skipClause.Expression is BinaryOperatorExpression); - - Assert.AreEqual(QueryExpressionPartitionType.TakeWhile, takeClause.PartitionType); - Assert.IsTrue(takeClause.Expression is BinaryOperatorExpression); - }, - typeof(QueryExpressionFromClause), typeof(QueryExpressionSelectVBClause), - typeof(QueryExpressionPartitionVBClause), typeof(QueryExpressionPartitionVBClause) - ); - } - - [Test] - public void MultipleValuesSelectTest() - { - RunTest(@"From i In list Select i, x2 = i^2", - 2, expr => { - var fromClause = expr.Clauses[0] as QueryExpressionFromClause; - var selectClause = expr.Clauses[1] as QueryExpressionSelectVBClause; - - Assert.AreEqual(1, fromClause.Sources.Count); - - var var1 = fromClause.Sources.First(); - - Assert.AreEqual("i", var1.Identifier); - Assert.IsTrue(var1.Expression is IdentifierExpression); - Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "list"); - - Assert.AreEqual(2, selectClause.Variables.Count); - - var selectExpr1 = selectClause.Variables[0]; - var selectExpr2 = selectClause.Variables[1]; - - Assert.IsEmpty(selectExpr1.Identifier); - Assert.IsTrue(selectExpr1.Expression is IdentifierExpression && - (selectExpr1.Expression as IdentifierExpression).Identifier == "i"); - - Assert.AreEqual("x2", selectExpr2.Identifier); - Assert.IsTrue(selectExpr2.Type.IsNull); - Assert.IsTrue(selectExpr2.Expression is BinaryOperatorExpression); - - var binOp = selectExpr2.Expression as BinaryOperatorExpression; - - Assert.AreEqual(BinaryOperatorType.Power, binOp.Op); - Assert.IsTrue(binOp.Left is IdentifierExpression && (binOp.Left as IdentifierExpression).Identifier == "i"); - Assert.IsTrue(binOp.Right is PrimitiveExpression && (binOp.Right as PrimitiveExpression).StringValue == "2"); - }, - typeof(QueryExpressionFromClause), typeof(QueryExpressionSelectVBClause) - ); - } - - [Test] - public void GroupTest() - { - Action constraint = expr => { - var fromClause = expr.Clauses[0] as QueryExpressionFromClause; - var groupClause = expr.Clauses[1] as QueryExpressionGroupVBClause; - var selectClause = expr.Clauses[2] as QueryExpressionSelectVBClause; - - Assert.AreEqual(1, fromClause.Sources.Count); - - var fromVar1 = fromClause.Sources.First(); - - Assert.AreEqual("p", fromVar1.Identifier); - Assert.IsTrue(fromVar1.Expression is IdentifierExpression); - Assert.IsTrue((fromVar1.Expression as IdentifierExpression).Identifier == "products"); - - Assert.AreEqual(1, groupClause.GroupVariables.Count); - Assert.AreEqual(1, groupClause.ByVariables.Count); - Assert.AreEqual(1, groupClause.IntoVariables.Count); - - var gv = groupClause.GroupVariables.First(); - var bv = groupClause.ByVariables.First(); - var iv = groupClause.IntoVariables.First(); - - Assert.IsTrue(gv.Expression is IdentifierExpression && (gv.Expression as IdentifierExpression).Identifier == "p"); - Assert.IsTrue(bv.Expression is MemberReferenceExpression && - (bv.Expression as MemberReferenceExpression).MemberName == "Category"); - Assert.IsTrue((bv.Expression as MemberReferenceExpression).TargetObject is IdentifierExpression && - ((bv.Expression as MemberReferenceExpression).TargetObject as IdentifierExpression).Identifier == "p"); - Assert.IsTrue(iv.Expression is IdentifierExpression && - (iv.Expression as IdentifierExpression).Identifier == "Group"); - - Assert.AreEqual(2, selectClause.Variables.Count); - - var var1 = selectClause.Variables.First(); - var var2 = selectClause.Variables.Skip(1).First(); - - Assert.IsTrue(var1.Expression is IdentifierExpression && - (var1.Expression as IdentifierExpression).Identifier == "Category"); - Assert.IsTrue(var2.Expression is InvocationExpression && - (var2.Expression as InvocationExpression).TargetObject is MemberReferenceExpression && - ((var2.Expression as InvocationExpression).TargetObject as MemberReferenceExpression).MemberName == "Average" && - ((var2.Expression as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject is IdentifierExpression && - (((var2.Expression as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject as IdentifierExpression).Identifier == "Group"); - }; - - RunTest(@"From p In products _ - Group p By p.Category Into Group _ - Select Category, AveragePrice = Group.Average(Function(p) p.UnitPrice)", 3, constraint, - typeof(QueryExpressionFromClause), typeof(QueryExpressionGroupVBClause), typeof(QueryExpressionSelectVBClause)); - } - - [Test] - public void LetTest() - { - Action constraint = expr => { - var fromClause = expr.Clauses[0] as QueryExpressionFromClause; - var groupClause = expr.Clauses[1] as QueryExpressionGroupVBClause; - var letClause = expr.Clauses[2] as QueryExpressionLetVBClause; - var selectClause = expr.Clauses[3] as QueryExpressionSelectVBClause; - - // From - Assert.AreEqual(1, fromClause.Sources.Count); - - var fromVar1 = fromClause.Sources.First(); - - Assert.AreEqual("p", fromVar1.Identifier); - Assert.IsTrue(fromVar1.Expression is IdentifierExpression); - Assert.IsTrue((fromVar1.Expression as IdentifierExpression).Identifier == "products"); - - // Group By Into - Assert.AreEqual(1, groupClause.GroupVariables.Count); - Assert.AreEqual(1, groupClause.ByVariables.Count); - Assert.AreEqual(1, groupClause.IntoVariables.Count); - - var gv = groupClause.GroupVariables.First(); - var bv = groupClause.ByVariables.First(); - var iv = groupClause.IntoVariables.First(); - - Assert.IsTrue(gv.Expression is IdentifierExpression && (gv.Expression as IdentifierExpression).Identifier == "p"); - CheckMemberReferenceExpression(bv.Expression, "Category", "p"); - Assert.IsTrue(iv.Expression is IdentifierExpression && - (iv.Expression as IdentifierExpression).Identifier == "Group"); - - // Let - Assert.AreEqual(1, letClause.Variables.Count); - - var letVariable = letClause.Variables.First(); - - Assert.AreEqual("minPrice", letVariable.Identifier); - Assert.IsTrue(letVariable.Expression is InvocationExpression); - CheckMemberReferenceExpression((letVariable.Expression as InvocationExpression).TargetObject, "Min", "Group"); - - // Select - Assert.AreEqual(2, selectClause.Variables.Count); - - var var1 = selectClause.Variables.First(); - var var2 = selectClause.Variables.Skip(1).First(); - - Assert.IsTrue(var1.Expression is IdentifierExpression && - (var1.Expression as IdentifierExpression).Identifier == "Category"); - Assert.IsTrue(var2.Expression is InvocationExpression); - CheckMemberReferenceExpression((var2.Expression as InvocationExpression).TargetObject, "Where", "Group"); - }; - - RunTest(@"From p In products _ - Group p By p.Category Into Group _ - Let minPrice = Group.Min(Function(p) p.UnitPrice) _ - Select Category, CheapestProducts = Group.Where(Function(p) p.UnitPrice = minPrice)", 4, constraint, - typeof(QueryExpressionFromClause), typeof(QueryExpressionGroupVBClause), typeof(QueryExpressionLetVBClause), typeof(QueryExpressionSelectVBClause)); - } - - [Test] - public void CrossJoinTest() - { - Action constraint = expr => { - var fromClause = expr.Clauses[0] as QueryExpressionFromClause; - var joinClause = expr.Clauses[1] as QueryExpressionJoinVBClause; - var selectClause = expr.Clauses[2] as QueryExpressionSelectVBClause; - - // From - Assert.AreEqual(1, fromClause.Sources.Count); - - var fromVar1 = fromClause.Sources.First(); - - Assert.AreEqual("c", fromVar1.Identifier); - Assert.IsTrue(fromVar1.Expression is IdentifierExpression); - Assert.IsTrue((fromVar1.Expression as IdentifierExpression).Identifier == "categories"); - - // Join In On Equals - var inClause = joinClause.JoinVariable as CollectionRangeVariable; - - Assert.AreEqual("p", inClause.Identifier); - Assert.IsTrue(inClause.Expression is IdentifierExpression && - (inClause.Expression as IdentifierExpression).Identifier == "products"); - - Assert.IsTrue(joinClause.SubJoin.IsNull); - - Assert.AreEqual(1, joinClause.Conditions.Count); - - var condition1 = joinClause.Conditions.First(); - - Assert.IsTrue(condition1.LeftSide is IdentifierExpression && (condition1.LeftSide as IdentifierExpression).Identifier == "c"); - - CheckMemberReferenceExpression(condition1.RightSide, "Category", "p"); - - // Select - Assert.AreEqual(2, selectClause.Variables.Count); - - var var1 = selectClause.Variables.First(); - var var2 = selectClause.Variables.Skip(1).First(); - - Assert.AreEqual("Category", var1.Identifier); - Assert.IsEmpty(var2.Identifier); - - Assert.IsTrue(var1.Expression is IdentifierExpression && - (var1.Expression as IdentifierExpression).Identifier == "c"); - CheckMemberReferenceExpression(var2.Expression, "ProductName", "p"); - }; - - RunTest(@"From c In categories _ - Join p In products On c Equals p.Category _ - Select Category = c, p.ProductName", 3, constraint, - typeof(QueryExpressionFromClause), typeof(QueryExpressionJoinVBClause), typeof(QueryExpressionSelectVBClause)); - } - - [Test] - public void OrderByTest() - { - Action constraint = expr => { - var fromClause = expr.Clauses[0] as QueryExpressionFromClause; - var orderClause = expr.Clauses[1] as QueryExpressionOrderClause; - - // From - Assert.AreEqual(1, fromClause.Sources.Count); - - var var1 = fromClause.Sources.First(); - - Assert.AreEqual("i", var1.Identifier); - Assert.IsTrue(var1.Expression is IdentifierExpression); - Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "list"); - - // Order By - Assert.AreEqual(1, orderClause.Orderings.Count); - - var ordering1 = orderClause.Orderings.First(); - - Assert.IsTrue(ordering1.Criteria is IdentifierExpression && - (ordering1.Criteria as IdentifierExpression).Identifier == "i"); - Assert.AreEqual(QueryExpressionOrderingDirection.None, ordering1.Direction); - }; - - RunTest(@"From i In list Order By i", 2, constraint, typeof(QueryExpressionFromClause), typeof(QueryExpressionOrderClause)); - } - - [Test] - public void OrderByTest2() - { - Action constraint = expr => { - var fromClause = expr.Clauses[0] as QueryExpressionFromClause; - var orderClause = expr.Clauses[1] as QueryExpressionOrderClause; - - // From - Assert.AreEqual(1, fromClause.Sources.Count); - - var var1 = fromClause.Sources.First(); - - Assert.AreEqual("i", var1.Identifier); - Assert.IsTrue(var1.Expression is IdentifierExpression); - Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "list"); - - // Order By - Assert.AreEqual(1, orderClause.Orderings.Count); - - var ordering1 = orderClause.Orderings.First(); - - Assert.IsTrue(ordering1.Criteria is IdentifierExpression && - (ordering1.Criteria as IdentifierExpression).Identifier == "i"); - Assert.AreEqual(QueryExpressionOrderingDirection.Ascending, ordering1.Direction); - }; - - RunTest(@"From i In list Order By i Ascending", 2, constraint, typeof(QueryExpressionFromClause), typeof(QueryExpressionOrderClause)); - } - - [Test] - public void OrderByTest3() - { - Action constraint = expr => { - var fromClause = expr.Clauses[0] as QueryExpressionFromClause; - var orderClause = expr.Clauses[1] as QueryExpressionOrderClause; - - // From - Assert.AreEqual(1, fromClause.Sources.Count); - - var var1 = fromClause.Sources.First(); - - Assert.AreEqual("i", var1.Identifier); - Assert.IsTrue(var1.Expression is IdentifierExpression); - Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "list"); - - // Order By - Assert.AreEqual(1, orderClause.Orderings.Count); - - var ordering1 = orderClause.Orderings.First(); - - Assert.IsTrue(ordering1.Criteria is IdentifierExpression && - (ordering1.Criteria as IdentifierExpression).Identifier == "i"); - Assert.AreEqual(QueryExpressionOrderingDirection.Descending, ordering1.Direction); - }; - - RunTest(@"From i In list Order By i Descending", 2, constraint, typeof(QueryExpressionFromClause), typeof(QueryExpressionOrderClause)); - } - - [Test] - public void OrderByThenByTest() - { - Action constraint = expr => { - var fromClause = expr.Clauses[0] as QueryExpressionFromClause; - var orderClause = expr.Clauses[1] as QueryExpressionOrderClause; - - // From - Assert.AreEqual(1, fromClause.Sources.Count); - - var var1 = fromClause.Sources.First(); - - Assert.AreEqual("d", var1.Identifier); - Assert.IsTrue(var1.Expression is IdentifierExpression); - Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "digits"); - - // Order By - Assert.AreEqual(2, orderClause.Orderings.Count); - - var ordering1 = orderClause.Orderings.First(); - var ordering2 = orderClause.Orderings.Skip(1).First(); - - CheckMemberReferenceExpression(ordering1.Criteria, "Length", "d"); - - Assert.IsTrue(ordering2.Criteria is IdentifierExpression && - (ordering2.Criteria as IdentifierExpression).Identifier == "d"); - - Assert.AreEqual(QueryExpressionOrderingDirection.None, ordering1.Direction); - Assert.AreEqual(QueryExpressionOrderingDirection.None, ordering2.Direction); - - }; - - RunTest(@"From d In digits _ - Order By d.Length, d", 2, constraint, - typeof(QueryExpressionFromClause), typeof(QueryExpressionOrderClause)); - } - - [Test] - public void DistinctTest() - { - Action constraint = expr => { - var fromClause = expr.Clauses[0] as QueryExpressionFromClause; - - // From - Assert.AreEqual(1, fromClause.Sources.Count); - - var var1 = fromClause.Sources.First(); - - Assert.AreEqual("d", var1.Identifier); - Assert.IsTrue(var1.Expression is IdentifierExpression); - Assert.IsTrue((var1.Expression as IdentifierExpression).Identifier == "digits"); - }; - - RunTest(@"From d In digits Distinct", 2, constraint, - typeof(QueryExpressionFromClause), typeof(QueryExpressionDistinctClause)); - } - - [Test] - public void AggregateTest() - { - Action constraint = expr => { - var clause = expr.Clauses[0] as QueryExpressionAggregateClause; - - Assert.AreEqual("p", clause.Source.Identifier); - CheckMemberReferenceExpression(clause.Source.Expression, "GetProcesses", "Process"); - - Assert.AreEqual(1, clause.IntoVariables.Count); - - var into1 = clause.IntoVariables.First(); - - Assert.AreEqual("virtualMemory", into1.Identifier); - - Assert.IsTrue(into1.Expression is InvocationExpression && - (into1.Expression as InvocationExpression).TargetObject is IdentifierExpression && - ((into1.Expression as InvocationExpression).TargetObject as IdentifierExpression).Identifier == "Sum"); - Assert.AreEqual(1, (into1.Expression as InvocationExpression).Arguments.Count); - CheckMemberReferenceExpression((into1.Expression as InvocationExpression).Arguments.First(), "VirtualMemorySize64", "p"); - }; - - RunTest(@"Aggregate p In Process.GetProcesses _ - Into virtualMemory = Sum(p.VirtualMemorySize64)", 1, constraint, typeof(QueryExpressionAggregateClause)); - } - - [Test] - public void GroupJoinTest() - { - Action constraint = expr => { - var fromClause1 = expr.Clauses[0] as QueryExpressionFromClause; - var groupJoinClause = expr.Clauses[1] as QueryExpressionGroupJoinVBClause; - var fromClause2 = expr.Clauses[2] as QueryExpressionFromClause; - var selectClause = expr.Clauses[3] as QueryExpressionSelectVBClause; - - // From 1 - Assert.AreEqual(1, fromClause1.Sources.Count); - - var var1 = fromClause1.Sources.First(); - - Assert.AreEqual("s", var1.Identifier); - Assert.IsTrue(var1.Expression is IdentifierExpression && - (var1.Expression as IdentifierExpression).Identifier == "fileList"); - - // From 2 - Assert.AreEqual(1, fromClause2.Sources.Count); - - var var2 = fromClause2.Sources.First(); - - Assert.AreEqual("p", var2.Identifier); - Assert.IsTrue(var2.Expression is IdentifierExpression && - (var2.Expression as IdentifierExpression).Identifier == "Group"); - - // Select - Assert.AreEqual(1, selectClause.Variables.Count); - - var var3 = selectClause.Variables.First(); - - Assert.IsEmpty(var3.Identifier); - Assert.IsTrue(var3.Expression is IdentifierExpression && - (var3.Expression as IdentifierExpression).Identifier == "s"); - - // Group Join - var joinClause = groupJoinClause.JoinClause; - - // Join In On Equals - var inClause = joinClause.JoinVariable as CollectionRangeVariable; - - Assert.AreEqual("p", inClause.Identifier); - Assert.IsTrue(inClause.Expression is IdentifierExpression && - (inClause.Expression as IdentifierExpression).Identifier == "IMAGES"); - - Assert.IsTrue(joinClause.SubJoin.IsNull); - - Assert.AreEqual(1, joinClause.Conditions.Count); - - var condition1 = joinClause.Conditions.First(); - - Assert.IsTrue(condition1.LeftSide is InvocationExpression); - Assert.IsTrue((condition1.LeftSide as InvocationExpression).TargetObject is MemberReferenceExpression); - Assert.IsTrue(((condition1.LeftSide as InvocationExpression).TargetObject as MemberReferenceExpression).MemberName == "ToUpper"); - Assert.IsTrue(((condition1.LeftSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject is MemberReferenceExpression); - Assert.IsTrue((((condition1.LeftSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject as MemberReferenceExpression).MemberName == "Extension"); - Assert.IsTrue((((condition1.LeftSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject as MemberReferenceExpression).TargetObject is IdentifierExpression); - Assert.IsTrue(((((condition1.LeftSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject as MemberReferenceExpression).TargetObject as IdentifierExpression).Identifier == "s"); - - Assert.IsTrue(condition1.RightSide is InvocationExpression); - Assert.IsTrue((condition1.RightSide as InvocationExpression).TargetObject is MemberReferenceExpression); - Assert.IsTrue(((condition1.RightSide as InvocationExpression).TargetObject as MemberReferenceExpression).MemberName == "ToUpper"); - Assert.IsTrue(((condition1.RightSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject is IdentifierExpression); - Assert.IsTrue((((condition1.RightSide as InvocationExpression).TargetObject as MemberReferenceExpression).TargetObject as IdentifierExpression).Identifier == "p"); - }; - - RunTest(@"From s In fileList _ -Group Join p In IMAGES On s.Extension.ToUpper() Equals p.ToUpper() Into Group _ -From p In Group _ -Select s", 4, constraint, - typeof(QueryExpressionFromClause), typeof(QueryExpressionGroupJoinVBClause), typeof(QueryExpressionFromClause), typeof(QueryExpressionSelectVBClause)); - } - - [Test] - public void SelectManyTest() - { - Action constraint = expr => { - var fromClause = expr.Clauses[0] as QueryExpressionFromClause; - var whereClause = expr.Clauses[1] as QueryExpressionWhereClause; - var selectClause = expr.Clauses[2] as QueryExpressionSelectVBClause; - - // From - Assert.AreEqual(2, fromClause.Sources.Count); - - var fromVar1 = fromClause.Sources.First(); - var fromVar2 = fromClause.Sources.Skip(1).First(); - - Assert.AreEqual("c", fromVar1.Identifier); - Assert.IsTrue(fromVar1.Expression is IdentifierExpression); - Assert.IsTrue((fromVar1.Expression as IdentifierExpression).Identifier == "customers"); - - Assert.AreEqual("o", fromVar2.Identifier); - CheckMemberReferenceExpression(fromVar2.Expression, "Orders", "c"); - - // Where - Assert.IsTrue(whereClause.Condition is BinaryOperatorExpression); - Assert.IsTrue((whereClause.Condition as BinaryOperatorExpression).Op == BinaryOperatorType.LessThan); - CheckMemberReferenceExpression((whereClause.Condition as BinaryOperatorExpression).Left, "Total", "o"); - Assert.IsTrue((whereClause.Condition as BinaryOperatorExpression).Right is PrimitiveExpression); - Assert.IsTrue((double)((whereClause.Condition as BinaryOperatorExpression).Right as PrimitiveExpression).Value == 500.0); - - // Select - foreach (var v in selectClause.Variables) { - Assert.IsEmpty(v.Identifier); - } - - var var1 = selectClause.Variables.First(); - var var2 = selectClause.Variables.Skip(1).First(); - var var3 = selectClause.Variables.Skip(2).First(); - - CheckMemberReferenceExpression(var1.Expression, "CustomerID", "c"); - CheckMemberReferenceExpression(var2.Expression, "OrderID", "o"); - CheckMemberReferenceExpression(var3.Expression, "Total", "o"); - }; - - RunTest(@"From c In customers, o In c.Orders _ - Where o.Total < 500.0 _ - Select c.CustomerID, o.OrderID, o.Total", 3, constraint, typeof(QueryExpressionFromClause), typeof(QueryExpressionWhereClause), typeof(QueryExpressionSelectVBClause)); - } - - void CheckMemberReferenceExpression(Expression expr, string memberName, string targetObjectIdentifier) - { - Assert.IsTrue(expr is MemberReferenceExpression); - Assert.IsTrue((expr as MemberReferenceExpression).MemberName == memberName && - (expr as MemberReferenceExpression).TargetObject is IdentifierExpression && - ((expr as MemberReferenceExpression).TargetObject as IdentifierExpression).Identifier == targetObjectIdentifier); - } - } -} diff --git a/VB/Test/Parser/Expressions/SizeOfExpressionTests.cs b/VB/Test/Parser/Expressions/SizeOfExpressionTests.cs deleted file mode 100644 index c57e318ecf..0000000000 --- a/VB/Test/Parser/Expressions/SizeOfExpressionTests.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.IO; -using NUnit.Framework; -using ICSharpCode.NRefactory.VB.Parser; -using ICSharpCode.NRefactory.VB.Dom; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class SizeOfExpressionTests - { - #region VB.NET - // No VB.NET representation - #endregion - } -} diff --git a/VB/Test/Parser/Expressions/StackAllocExpressionTests.cs b/VB/Test/Parser/Expressions/StackAllocExpressionTests.cs deleted file mode 100644 index 59415f30f6..0000000000 --- a/VB/Test/Parser/Expressions/StackAllocExpressionTests.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.IO; -using NUnit.Framework; -using ICSharpCode.NRefactory.VB.Parser; -using ICSharpCode.NRefactory.VB.Dom; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class StackAllocExpressionTests - { - #region VB.NET - // No VB.NET representation - #endregion - } -} diff --git a/VB/Test/Parser/Expressions/UncheckedExpressionTests.cs b/VB/Test/Parser/Expressions/UncheckedExpressionTests.cs deleted file mode 100644 index 347d953e7f..0000000000 --- a/VB/Test/Parser/Expressions/UncheckedExpressionTests.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.IO; -using NUnit.Framework; -using ICSharpCode.NRefactory.VB.Parser; -using ICSharpCode.NRefactory.VB.Dom; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class UncheckedExpressionTests - { - #region VB.NET - // No VB.NET representation - #endregion - } -} diff --git a/VB/Test/Parser/Statements/BlockStatementTests.cs b/VB/Test/Parser/Statements/BlockStatementTests.cs index 962cbfd14c..0dcba63673 100644 --- a/VB/Test/Parser/Statements/BlockStatementTests.cs +++ b/VB/Test/Parser/Statements/BlockStatementTests.cs @@ -12,8 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class BlockStatementTests { - #region VB.NET - // TODO - #endregion + // TODO create BlockStatementTests } } diff --git a/VB/Test/Parser/Statements/BreakStatementTests.cs b/VB/Test/Parser/Statements/BreakStatementTests.cs deleted file mode 100644 index f067e3ddc1..0000000000 --- a/VB/Test/Parser/Statements/BreakStatementTests.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.IO; -using NUnit.Framework; -using ICSharpCode.NRefactory.VB.Parser; -using ICSharpCode.NRefactory.VB.Dom; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class BreakStatementTests - { - #region VB.NET - // No VB.NET representation - #endregion - - } -} diff --git a/VB/Test/Parser/Statements/CheckedStatementTests.cs b/VB/Test/Parser/Statements/CheckedStatementTests.cs deleted file mode 100644 index b965010928..0000000000 --- a/VB/Test/Parser/Statements/CheckedStatementTests.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.IO; -using NUnit.Framework; -using ICSharpCode.NRefactory.VB.Parser; -using ICSharpCode.NRefactory.VB.Dom; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class CheckedStatementTests - { - #region VB.NET - // No VB.NET representation - #endregion - } -} diff --git a/VB/Test/Parser/Statements/ContinueStatementTests.cs b/VB/Test/Parser/Statements/ContinueStatementTests.cs index ea7ce29bf3..0b50f9ed4e 100644 --- a/VB/Test/Parser/Statements/ContinueStatementTests.cs +++ b/VB/Test/Parser/Statements/ContinueStatementTests.cs @@ -12,8 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class ContinueStatementTests { - #region VB.NET - // No VB.NET representation - #endregion + // TODO : add ContinueStatementTests } } diff --git a/VB/Test/Parser/Statements/EmptyStatementTests.cs b/VB/Test/Parser/Statements/EmptyStatementTests.cs deleted file mode 100644 index 3698089327..0000000000 --- a/VB/Test/Parser/Statements/EmptyStatementTests.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.IO; -using NUnit.Framework; -using ICSharpCode.NRefactory.VB.Parser; -using ICSharpCode.NRefactory.VB.Dom; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class EmptyStatementTests - { - #region VB.NET - // No VB.NET representation - #endregion - } -} diff --git a/VB/Test/Parser/Statements/ExpressionStatementTests.cs b/VB/Test/Parser/Statements/ExpressionStatementTests.cs index 3645f348aa..57c08f3df9 100644 --- a/VB/Test/Parser/Statements/ExpressionStatementTests.cs +++ b/VB/Test/Parser/Statements/ExpressionStatementTests.cs @@ -12,8 +12,6 @@ namespace ICSharpCode.NRefactory.VB.Tests.Dom [TestFixture] public class ExpressionStatementTests { - #region VB.NET - // TODO - #endregion + // TODO : Create ExpressionStatementTests } } diff --git a/VB/Test/Parser/Statements/FixedStatementTests.cs b/VB/Test/Parser/Statements/FixedStatementTests.cs deleted file mode 100644 index 8a19eb5591..0000000000 --- a/VB/Test/Parser/Statements/FixedStatementTests.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.IO; -using NUnit.Framework; -using ICSharpCode.NRefactory.VB.Parser; -using ICSharpCode.NRefactory.VB.Dom; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class FixedStatementTests - { - #region VB.NET - // No VB.NET representation - #endregion - } -} diff --git a/VB/Test/Parser/Statements/ForStatementTests.cs b/VB/Test/Parser/Statements/ForStatementTests.cs deleted file mode 100644 index 99866101fd..0000000000 --- a/VB/Test/Parser/Statements/ForStatementTests.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.IO; -using NUnit.Framework; -using ICSharpCode.NRefactory.VB.Parser; -using ICSharpCode.NRefactory.VB.Dom; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class ForStatementTests - { - #region VB.NET - // No VB.NET representation (for ... next is different) - #endregion - } -} diff --git a/VB/Test/Parser/Statements/GotoCaseStatementTests.cs b/VB/Test/Parser/Statements/GotoCaseStatementTests.cs deleted file mode 100644 index 3a5d0713ca..0000000000 --- a/VB/Test/Parser/Statements/GotoCaseStatementTests.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.IO; -using NUnit.Framework; -using ICSharpCode.NRefactory.VB.Parser; -using ICSharpCode.NRefactory.VB.Dom; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class GotoCaseStatementTests - { - #region VB.NET - // No VB.NET representation - #endregion - } -} diff --git a/VB/Test/Parser/Statements/UncheckedStatementTests.cs b/VB/Test/Parser/Statements/UncheckedStatementTests.cs deleted file mode 100644 index bfff608bc9..0000000000 --- a/VB/Test/Parser/Statements/UncheckedStatementTests.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.IO; -using NUnit.Framework; -using ICSharpCode.NRefactory.VB.Parser; -using ICSharpCode.NRefactory.VB.Dom; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class UncheckedStatementTests - { - #region VB.NET - // No VB.NET representation - #endregion - } -} diff --git a/VB/Test/Parser/Statements/UnsafeStatementTests.cs b/VB/Test/Parser/Statements/UnsafeStatementTests.cs deleted file mode 100644 index 2267a49f8c..0000000000 --- a/VB/Test/Parser/Statements/UnsafeStatementTests.cs +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using System.IO; -using NUnit.Framework; -using ICSharpCode.NRefactory.VB.Parser; -using ICSharpCode.NRefactory.VB.Dom; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class UnsafeStatementTests - { - #region VB.NET - // No VB.NET representation - #endregion - } -} diff --git a/VB/Test/Parser/TypeLevel/DestructorDeclarationTests.cs b/VB/Test/Parser/TypeLevel/DestructorDeclarationTests.cs deleted file mode 100644 index dd9a38c807..0000000000 --- a/VB/Test/Parser/TypeLevel/DestructorDeclarationTests.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using ICSharpCode.NRefactory.VB.Dom; -using NUnit.Framework; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class DestructorDeclarationTests - { - #region VB.NET - // No VB.NET representation - #endregion - } -} diff --git a/VB/Test/Parser/TypeLevel/IndexerDeclarationTests.cs b/VB/Test/Parser/TypeLevel/IndexerDeclarationTests.cs deleted file mode 100644 index 0b5e8840eb..0000000000 --- a/VB/Test/Parser/TypeLevel/IndexerDeclarationTests.cs +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -using System; -using ICSharpCode.NRefactory.VB.Dom; -using NUnit.Framework; - -namespace ICSharpCode.NRefactory.VB.Tests.Dom -{ - [TestFixture] - public class IndexerDeclarationTests - { - #region VB.NET - // no vb.net representation (indexers are properties named "item" in vb.net) - #endregion - } -}