From 04c6a6f1e9bf7bbcdff30300a690f6ae469b5e15 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Mon, 5 Jul 2010 20:32:29 +0000 Subject: [PATCH] - refactored AST; removed XmlLiteralExpression - added VB Options to Tests git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/vbnet@6040 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/ConvertVisitor.cs | 6 +- .../Src/Project/VBNetToCSharpConverter.cs | 7 + .../NRefactoryASTGenerator/AST/Expressions.cs | 2 +- .../NRefactory/Project/Src/Ast/Generated.cs | 52 +- .../NRefactory/Project/Src/IAstVisitor.cs | 4 +- .../Project/Src/Parser/VBNet/Parser.cs | 1630 +++++++++-------- .../Project/Src/Parser/VBNet/VBNET.ATG | 11 +- .../CSharp/CSharpOutputVisitor.cs | 4 +- .../Src/Visitors/AbstractASTVisitor.cs | 20 +- .../Src/Visitors/AbstractAstTransformer.cs | 34 +- .../Src/Visitors/NodeTrackingAstVisitor.cs | 22 +- .../Src/Visitors/NotImplementedAstVisitor.cs | 8 +- .../Visitors/VBNetConstructsConvertVisitor.cs | 35 +- .../NRefactory/Test/NRefactoryTests.csproj | 2 +- .../CSharp/VBNetToCSharpConverterTest.cs | 18 +- ...pressionTests.cs => XmlExpressionTests.cs} | 55 +- 16 files changed, 969 insertions(+), 941 deletions(-) rename src/Libraries/NRefactory/Test/Parser/Expressions/{XmlLiteralExpressionTests.cs => XmlExpressionTests.cs} (77%) diff --git a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitor.cs b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitor.cs index 468b576063..edf8dfc1f6 100644 --- a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitor.cs +++ b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitor.cs @@ -275,17 +275,17 @@ namespace NRefactoryToBooConverter throw new NotImplementedException(); } - public object VisitXmlElementExpression(XmlElementExpression xmlElementExpression, object data) + public object VisitXmlDocumentExpression(XmlDocumentExpression xmlDocumentExpression, object data) { throw new NotImplementedException(); } - public object VisitXmlEmbeddedExpression(XmlEmbeddedExpression xmlEmbeddedExpression, object data) + public object VisitXmlElementExpression(XmlElementExpression xmlElementExpression, object data) { throw new NotImplementedException(); } - public object VisitXmlLiteralExpression(XmlLiteralExpression xmlLiteralExpression, object data) + public object VisitXmlEmbeddedExpression(XmlEmbeddedExpression xmlEmbeddedExpression, object data) { throw new NotImplementedException(); } diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/VBNetToCSharpConverter.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/VBNetToCSharpConverter.cs index e2f7873e60..d8e073fca2 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/VBNetToCSharpConverter.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/VBNetToCSharpConverter.cs @@ -76,6 +76,13 @@ namespace CSharpBinding IProjectContent pc = ParserService.GetProjectContent(sourceItem.Project) ?? ParserService.CurrentProjectContent; VBNetToCSharpConvertVisitor visitor = new VBNetToCSharpConvertVisitorWithMyFormsSupport(pc, ParserService.GetParseInformation(sourceItem.FileName), sourceItem.Project.RootNamespace); + + // set project options + visitor.OptionInfer = (project.GetEvaluatedProperty("OptionInfer") ?? "Off") + .Equals("On", StringComparison.OrdinalIgnoreCase); + visitor.OptionStrict = (project.GetEvaluatedProperty("OptionStrict") ?? "Off") + .Equals("On", StringComparison.OrdinalIgnoreCase); + compilationUnit.AcceptVisitor(visitor, null); } diff --git a/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/Expressions.cs b/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/Expressions.cs index 26289080bd..1ed5d8f2c5 100644 --- a/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/Expressions.cs +++ b/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/Expressions.cs @@ -403,7 +403,7 @@ namespace NRefactoryASTGenerator.Ast abstract class XmlExpression : Expression { } - class XmlLiteralExpression : Expression { + class XmlDocumentExpression : XmlExpression { List expressions; } diff --git a/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs b/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs index 78a167c8be..be221f67a1 100644 --- a/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs +++ b/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs @@ -5564,6 +5564,32 @@ public UsingDeclaration(string @namespace, TypeReference alias) { usings = new L } } + public class XmlDocumentExpression : XmlExpression { + + List expressions; + + public List Expressions { + get { + return expressions; + } + set { + expressions = value ?? new List(); + } + } + + public XmlDocumentExpression() { + expressions = new List(); + } + + public override object AcceptVisitor(IAstVisitor visitor, object data) { + return visitor.VisitXmlDocumentExpression(this, data); + } + + public override string ToString() { + return string.Format("[XmlDocumentExpression Expressions={0}]", GetCollectionString(Expressions)); + } + } + public class XmlElementExpression : XmlExpression { Expression content; @@ -5673,32 +5699,6 @@ public UsingDeclaration(string @namespace, TypeReference alias) { usings = new L } } - public class XmlLiteralExpression : Expression { - - List expressions; - - public List Expressions { - get { - return expressions; - } - set { - expressions = value ?? new List(); - } - } - - public XmlLiteralExpression() { - expressions = new List(); - } - - public override object AcceptVisitor(IAstVisitor visitor, object data) { - return visitor.VisitXmlLiteralExpression(this, data); - } - - public override string ToString() { - return string.Format("[XmlLiteralExpression Expressions={0}]", GetCollectionString(Expressions)); - } - } - public class XmlMemberAccessExpression : Expression { Expression targetObject; diff --git a/src/Libraries/NRefactory/Project/Src/IAstVisitor.cs b/src/Libraries/NRefactory/Project/Src/IAstVisitor.cs index 4fdbadfd33..eac50291f0 100644 --- a/src/Libraries/NRefactory/Project/Src/IAstVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/IAstVisitor.cs @@ -265,12 +265,12 @@ namespace ICSharpCode.NRefactory { object VisitXmlContentExpression(XmlContentExpression xmlContentExpression, object data); + object VisitXmlDocumentExpression(XmlDocumentExpression xmlDocumentExpression, object data); + object VisitXmlElementExpression(XmlElementExpression xmlElementExpression, object data); object VisitXmlEmbeddedExpression(XmlEmbeddedExpression xmlEmbeddedExpression, object data); - object VisitXmlLiteralExpression(XmlLiteralExpression xmlLiteralExpression, object data); - object VisitXmlMemberAccessExpression(XmlMemberAccessExpression xmlMemberAccessExpression, object data); object VisitYieldStatement(YieldStatement yieldStatement, object data); diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index 0d5003448a..d1cec23aa7 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -181,7 +181,7 @@ out u); void GlobalAttributeSection() { Expect(40); -#line 2749 "VBNET.ATG" +#line 2754 "VBNET.ATG" Location startPos = t.Location; if (la.kind == 65) { lexer.NextToken(); @@ -189,20 +189,20 @@ out u); lexer.NextToken(); } else SynErr(242); -#line 2751 "VBNET.ATG" +#line 2756 "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 2755 "VBNET.ATG" +#line 2760 "VBNET.ATG" out attribute); -#line 2755 "VBNET.ATG" +#line 2760 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2756 "VBNET.ATG" +#line 2761 "VBNET.ATG" NotFinalComma()) { if (la.kind == 22) { lexer.NextToken(); @@ -214,10 +214,10 @@ NotFinalComma()) { Expect(21); } Attribute( -#line 2756 "VBNET.ATG" +#line 2761 "VBNET.ATG" out attribute); -#line 2756 "VBNET.ATG" +#line 2761 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 22) { @@ -226,7 +226,7 @@ out attribute); Expect(39); EndOfStmt(); -#line 2761 "VBNET.ATG" +#line 2766 "VBNET.ATG" AttributeSection section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -352,47 +352,47 @@ out aliasedType); } void Qualident( -#line 3505 "VBNET.ATG" +#line 3510 "VBNET.ATG" out string qualident) { -#line 3507 "VBNET.ATG" +#line 3512 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 3511 "VBNET.ATG" +#line 3516 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 3512 "VBNET.ATG" +#line 3517 "VBNET.ATG" DotAndIdentOrKw()) { Expect(26); IdentifierOrKeyword( -#line 3512 "VBNET.ATG" +#line 3517 "VBNET.ATG" out name); -#line 3512 "VBNET.ATG" +#line 3517 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 3514 "VBNET.ATG" +#line 3519 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 2622 "VBNET.ATG" +#line 2627 "VBNET.ATG" out TypeReference typeref) { -#line 2623 "VBNET.ATG" +#line 2628 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2625 "VBNET.ATG" +#line 2630 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 2629 "VBNET.ATG" +#line 2634 "VBNET.ATG" out rank); -#line 2630 "VBNET.ATG" +#line 2635 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -423,35 +423,35 @@ out rank); } void AttributeSection( -#line 2824 "VBNET.ATG" +#line 2829 "VBNET.ATG" out AttributeSection section) { -#line 2826 "VBNET.ATG" +#line 2831 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(40); -#line 2830 "VBNET.ATG" +#line 2835 "VBNET.ATG" Location startPos = t.Location; if ( -#line 2831 "VBNET.ATG" +#line 2836 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 119) { lexer.NextToken(); -#line 2832 "VBNET.ATG" +#line 2837 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 195) { lexer.NextToken(); -#line 2833 "VBNET.ATG" +#line 2838 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2836 "VBNET.ATG" +#line 2841 "VBNET.ATG" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -464,20 +464,20 @@ IsLocalAttrTarget()) { Expect(21); } Attribute( -#line 2846 "VBNET.ATG" +#line 2851 "VBNET.ATG" out attribute); -#line 2846 "VBNET.ATG" +#line 2851 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2847 "VBNET.ATG" +#line 2852 "VBNET.ATG" NotFinalComma()) { Expect(22); Attribute( -#line 2847 "VBNET.ATG" +#line 2852 "VBNET.ATG" out attribute); -#line 2847 "VBNET.ATG" +#line 2852 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 22) { @@ -485,7 +485,7 @@ out attribute); } Expect(39); -#line 2851 "VBNET.ATG" +#line 2856 "VBNET.ATG" section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -496,69 +496,69 @@ out attribute); } void TypeModifier( -#line 3590 "VBNET.ATG" +#line 3595 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 188: { lexer.NextToken(); -#line 3591 "VBNET.ATG" +#line 3596 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 187: { lexer.NextToken(); -#line 3592 "VBNET.ATG" +#line 3597 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 125: { lexer.NextToken(); -#line 3593 "VBNET.ATG" +#line 3598 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 185: { lexer.NextToken(); -#line 3594 "VBNET.ATG" +#line 3599 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 200: { lexer.NextToken(); -#line 3595 "VBNET.ATG" +#line 3600 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 199: { lexer.NextToken(); -#line 3596 "VBNET.ATG" +#line 3601 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 156: { lexer.NextToken(); -#line 3597 "VBNET.ATG" +#line 3602 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 166: { lexer.NextToken(); -#line 3598 "VBNET.ATG" +#line 3603 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 183: { lexer.NextToken(); -#line 3599 "VBNET.ATG" +#line 3604 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -1147,10 +1147,10 @@ m, attributes); } void NonArrayTypeName( -#line 2648 "VBNET.ATG" +#line 2653 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2650 "VBNET.ATG" +#line 2655 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; @@ -1160,36 +1160,36 @@ out TypeReference typeref, bool canBeUnbound) { lexer.NextToken(); Expect(26); -#line 2655 "VBNET.ATG" +#line 2660 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 2656 "VBNET.ATG" +#line 2661 "VBNET.ATG" out typeref, canBeUnbound); -#line 2657 "VBNET.ATG" +#line 2662 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 26) { lexer.NextToken(); -#line 2658 "VBNET.ATG" +#line 2663 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 2659 "VBNET.ATG" +#line 2664 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 2660 "VBNET.ATG" +#line 2665 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 168) { lexer.NextToken(); -#line 2663 "VBNET.ATG" +#line 2668 "VBNET.ATG" typeref = new TypeReference("System.Object", true); if (la.kind == 33) { lexer.NextToken(); -#line 2667 "VBNET.ATG" +#line 2672 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1197,15 +1197,15 @@ out nestedTypeRef, canBeUnbound); } } else if (StartOf(12)) { PrimitiveTypeName( -#line 2673 "VBNET.ATG" +#line 2678 "VBNET.ATG" out name); -#line 2673 "VBNET.ATG" +#line 2678 "VBNET.ATG" typeref = new TypeReference(name, true); if (la.kind == 33) { lexer.NextToken(); -#line 2677 "VBNET.ATG" +#line 2682 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1291,162 +1291,162 @@ TypeDeclaration newType) { } void FormalParameterList( -#line 2861 "VBNET.ATG" +#line 2866 "VBNET.ATG" List parameter) { -#line 2862 "VBNET.ATG" +#line 2867 "VBNET.ATG" ParameterDeclarationExpression p; FormalParameter( -#line 2864 "VBNET.ATG" +#line 2869 "VBNET.ATG" out p); -#line 2864 "VBNET.ATG" +#line 2869 "VBNET.ATG" if (p != null) parameter.Add(p); while (la.kind == 22) { lexer.NextToken(); FormalParameter( -#line 2866 "VBNET.ATG" +#line 2871 "VBNET.ATG" out p); -#line 2866 "VBNET.ATG" +#line 2871 "VBNET.ATG" if (p != null) parameter.Add(p); } } void MemberModifier( -#line 3602 "VBNET.ATG" +#line 3607 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 156: { lexer.NextToken(); -#line 3603 "VBNET.ATG" +#line 3608 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 102: { lexer.NextToken(); -#line 3604 "VBNET.ATG" +#line 3609 "VBNET.ATG" m.Add(Modifiers.Default, t.Location); break; } case 125: { lexer.NextToken(); -#line 3605 "VBNET.ATG" +#line 3610 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 199: { lexer.NextToken(); -#line 3606 "VBNET.ATG" +#line 3611 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 181: { lexer.NextToken(); -#line 3607 "VBNET.ATG" +#line 3612 "VBNET.ATG" m.Add(Modifiers.Override, t.Location); break; } case 157: { lexer.NextToken(); -#line 3608 "VBNET.ATG" +#line 3613 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 185: { lexer.NextToken(); -#line 3609 "VBNET.ATG" +#line 3614 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 187: { lexer.NextToken(); -#line 3610 "VBNET.ATG" +#line 3615 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 188: { lexer.NextToken(); -#line 3611 "VBNET.ATG" +#line 3616 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 166: { lexer.NextToken(); -#line 3612 "VBNET.ATG" +#line 3617 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 167: { lexer.NextToken(); -#line 3613 "VBNET.ATG" +#line 3618 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 200: { lexer.NextToken(); -#line 3614 "VBNET.ATG" +#line 3619 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 180: { lexer.NextToken(); -#line 3615 "VBNET.ATG" +#line 3620 "VBNET.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 179: { lexer.NextToken(); -#line 3616 "VBNET.ATG" +#line 3621 "VBNET.ATG" m.Add(Modifiers.Overloads, t.Location); break; } case 190: { lexer.NextToken(); -#line 3617 "VBNET.ATG" +#line 3622 "VBNET.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 235: { lexer.NextToken(); -#line 3618 "VBNET.ATG" +#line 3623 "VBNET.ATG" m.Add(Modifiers.WriteOnly, t.Location); break; } case 234: { lexer.NextToken(); -#line 3619 "VBNET.ATG" +#line 3624 "VBNET.ATG" m.Add(Modifiers.WithEvents, t.Location); break; } case 105: { lexer.NextToken(); -#line 3620 "VBNET.ATG" +#line 3625 "VBNET.ATG" m.Add(Modifiers.Dim, t.Location); break; } case 183: { lexer.NextToken(); -#line 3621 "VBNET.ATG" +#line 3626 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -2598,25 +2598,25 @@ out name); } void Block( -#line 2906 "VBNET.ATG" +#line 2911 "VBNET.ATG" out Statement stmt) { -#line 2909 "VBNET.ATG" +#line 2914 "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(23) || -#line 2915 "VBNET.ATG" +#line 2920 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2915 "VBNET.ATG" +#line 2920 "VBNET.ATG" IsEndStmtAhead()) { Expect(113); EndOfStmt(); -#line 2915 "VBNET.ATG" +#line 2920 "VBNET.ATG" AddChild(new EndStatement()); } else { Statement(); @@ -2624,7 +2624,7 @@ IsEndStmtAhead()) { } } -#line 2920 "VBNET.ATG" +#line 2925 "VBNET.ATG" stmt = blockStmt; if (t != null) blockStmt.EndLocation = t.EndLocation; BlockEnd(); @@ -2924,10 +2924,10 @@ out expr); } void ObjectCreateExpression( -#line 2074 "VBNET.ATG" +#line 2079 "VBNET.ATG" out Expression oce) { -#line 2076 "VBNET.ATG" +#line 2081 "VBNET.ATG" TypeReference type = null; CollectionInitializerExpression initializer = null; List arguments = null; @@ -2938,39 +2938,39 @@ out Expression oce) { Expect(162); if (StartOf(8)) { NonArrayTypeName( -#line 2084 "VBNET.ATG" +#line 2089 "VBNET.ATG" out type, false); if (la.kind == 37) { lexer.NextToken(); NormalOrReDimArgumentList( -#line 2085 "VBNET.ATG" +#line 2090 "VBNET.ATG" out arguments, out canBeNormal, out canBeReDim); Expect(38); if (la.kind == 35 || -#line 2086 "VBNET.ATG" +#line 2091 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { if ( -#line 2086 "VBNET.ATG" +#line 2091 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { ArrayTypeModifiers( -#line 2087 "VBNET.ATG" +#line 2092 "VBNET.ATG" out dimensions); CollectionInitializer( -#line 2088 "VBNET.ATG" +#line 2093 "VBNET.ATG" out initializer); } else { CollectionInitializer( -#line 2089 "VBNET.ATG" +#line 2094 "VBNET.ATG" out initializer); } } -#line 2091 "VBNET.ATG" +#line 2096 "VBNET.ATG" if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); } } -#line 2095 "VBNET.ATG" +#line 2100 "VBNET.ATG" if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); } else { @@ -2985,34 +2985,34 @@ out initializer); if (la.kind == 126 || la.kind == 233) { if (la.kind == 233) { -#line 2110 "VBNET.ATG" +#line 2115 "VBNET.ATG" MemberInitializerExpression memberInitializer = null; lexer.NextToken(); -#line 2114 "VBNET.ATG" +#line 2119 "VBNET.ATG" CollectionInitializerExpression memberInitializers = new CollectionInitializerExpression(); memberInitializers.StartLocation = la.Location; Expect(35); MemberInitializer( -#line 2118 "VBNET.ATG" +#line 2123 "VBNET.ATG" out memberInitializer); -#line 2119 "VBNET.ATG" +#line 2124 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); while (la.kind == 22) { lexer.NextToken(); MemberInitializer( -#line 2121 "VBNET.ATG" +#line 2126 "VBNET.ATG" out memberInitializer); -#line 2122 "VBNET.ATG" +#line 2127 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); } Expect(36); -#line 2126 "VBNET.ATG" +#line 2131 "VBNET.ATG" memberInitializers.EndLocation = t.Location; if(oce is ObjectCreateExpression) { @@ -3022,10 +3022,10 @@ out memberInitializer); } else { lexer.NextToken(); CollectionInitializer( -#line 2136 "VBNET.ATG" +#line 2141 "VBNET.ATG" out initializer); -#line 2138 "VBNET.ATG" +#line 2143 "VBNET.ATG" if(oce is ObjectCreateExpression) ((ObjectCreateExpression)oce).ObjectInitializer = initializer; @@ -3436,31 +3436,31 @@ out stmt); } void PropertyAccessorAccessModifier( -#line 3624 "VBNET.ATG" +#line 3629 "VBNET.ATG" out Modifiers m) { -#line 3625 "VBNET.ATG" +#line 3630 "VBNET.ATG" m = Modifiers.None; while (StartOf(29)) { if (la.kind == 188) { lexer.NextToken(); -#line 3627 "VBNET.ATG" +#line 3632 "VBNET.ATG" m |= Modifiers.Public; } else if (la.kind == 187) { lexer.NextToken(); -#line 3628 "VBNET.ATG" +#line 3633 "VBNET.ATG" m |= Modifiers.Protected; } else if (la.kind == 125) { lexer.NextToken(); -#line 3629 "VBNET.ATG" +#line 3634 "VBNET.ATG" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 3630 "VBNET.ATG" +#line 3635 "VBNET.ATG" m |= Modifiers.Private; } } @@ -3481,14 +3481,14 @@ out arrayModifiers); } void ArrayNameModifier( -#line 2701 "VBNET.ATG" +#line 2706 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2703 "VBNET.ATG" +#line 2708 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 2705 "VBNET.ATG" +#line 2710 "VBNET.ATG" out arrayModifiers); } @@ -3596,91 +3596,91 @@ out eventName); } void IdentifierOrKeyword( -#line 3557 "VBNET.ATG" +#line 3562 "VBNET.ATG" out string name) { lexer.NextToken(); -#line 3559 "VBNET.ATG" +#line 3564 "VBNET.ATG" name = t.val; } void QueryExpr( -#line 2225 "VBNET.ATG" +#line 2230 "VBNET.ATG" out Expression expr) { -#line 2227 "VBNET.ATG" +#line 2232 "VBNET.ATG" QueryExpressionVB qexpr = new QueryExpressionVB(); qexpr.StartLocation = la.Location; expr = qexpr; FromOrAggregateQueryOperator( -#line 2231 "VBNET.ATG" +#line 2236 "VBNET.ATG" qexpr.Clauses); while (StartOf(31)) { QueryOperator( -#line 2232 "VBNET.ATG" +#line 2237 "VBNET.ATG" qexpr.Clauses); } -#line 2234 "VBNET.ATG" +#line 2239 "VBNET.ATG" qexpr.EndLocation = t.EndLocation; } void LambdaExpr( -#line 2145 "VBNET.ATG" +#line 2150 "VBNET.ATG" out Expression expr) { -#line 2147 "VBNET.ATG" +#line 2152 "VBNET.ATG" LambdaExpression lambda = null; if (la.kind == 210) { SubLambdaExpression( -#line 2149 "VBNET.ATG" +#line 2154 "VBNET.ATG" out lambda); } else if (la.kind == 127) { FunctionLambdaExpression( -#line 2150 "VBNET.ATG" +#line 2155 "VBNET.ATG" out lambda); } else SynErr(273); -#line 2151 "VBNET.ATG" +#line 2156 "VBNET.ATG" expr = lambda; } void DisjunctionExpr( -#line 1918 "VBNET.ATG" +#line 1923 "VBNET.ATG" out Expression outExpr) { -#line 1920 "VBNET.ATG" +#line 1925 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConjunctionExpr( -#line 1923 "VBNET.ATG" +#line 1928 "VBNET.ATG" out outExpr); while (la.kind == 175 || la.kind == 177 || la.kind == 236) { if (la.kind == 175) { lexer.NextToken(); -#line 1926 "VBNET.ATG" +#line 1931 "VBNET.ATG" op = BinaryOperatorType.BitwiseOr; } else if (la.kind == 177) { lexer.NextToken(); -#line 1927 "VBNET.ATG" +#line 1932 "VBNET.ATG" op = BinaryOperatorType.LogicalOr; } else { lexer.NextToken(); -#line 1928 "VBNET.ATG" +#line 1933 "VBNET.ATG" op = BinaryOperatorType.ExclusiveOr; } ConjunctionExpr( -#line 1930 "VBNET.ATG" +#line 1935 "VBNET.ATG" out expr); -#line 1930 "VBNET.ATG" +#line 1935 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } @@ -3690,46 +3690,52 @@ out expr); out Expression pexpr) { #line 1775 "VBNET.ATG" - XmlLiteralExpression expr = new XmlLiteralExpression(); - List exprs = expr.Expressions; + List exprs = new List(); XmlExpression currentExpression = null; - pexpr = expr; if (StartOf(32)) { XmlContentExpression( -#line 1782 "VBNET.ATG" +#line 1780 "VBNET.ATG" exprs); while (StartOf(32)) { XmlContentExpression( -#line 1782 "VBNET.ATG" +#line 1780 "VBNET.ATG" exprs); } if (la.kind == 10) { XmlElement( -#line 1782 "VBNET.ATG" +#line 1780 "VBNET.ATG" out currentExpression); -#line 1782 "VBNET.ATG" +#line 1780 "VBNET.ATG" exprs.Add(currentExpression); while (StartOf(32)) { XmlContentExpression( -#line 1782 "VBNET.ATG" +#line 1780 "VBNET.ATG" exprs); } } } else if (la.kind == 10) { XmlElement( -#line 1784 "VBNET.ATG" +#line 1782 "VBNET.ATG" out currentExpression); -#line 1784 "VBNET.ATG" +#line 1782 "VBNET.ATG" exprs.Add(currentExpression); while (StartOf(32)) { XmlContentExpression( -#line 1784 "VBNET.ATG" +#line 1782 "VBNET.ATG" exprs); } } else SynErr(274); + +#line 1785 "VBNET.ATG" + if (exprs.Count > 1) { + pexpr = new XmlDocumentExpression() { Expressions = exprs }; + } else { + pexpr = exprs[0]; + } + } void AssignmentOperator( @@ -4234,161 +4240,161 @@ out name); } void TypeArgumentList( -#line 2737 "VBNET.ATG" +#line 2742 "VBNET.ATG" List typeArguments) { -#line 2739 "VBNET.ATG" +#line 2744 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2741 "VBNET.ATG" +#line 2746 "VBNET.ATG" out typeref); -#line 2741 "VBNET.ATG" +#line 2746 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 2744 "VBNET.ATG" +#line 2749 "VBNET.ATG" out typeref); -#line 2744 "VBNET.ATG" +#line 2749 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void InvocationExpression( -#line 1882 "VBNET.ATG" +#line 1887 "VBNET.ATG" ref Expression pexpr) { -#line 1883 "VBNET.ATG" +#line 1888 "VBNET.ATG" List parameters = null; Expect(37); -#line 1885 "VBNET.ATG" +#line 1890 "VBNET.ATG" Location start = t.Location; ArgumentList( -#line 1886 "VBNET.ATG" +#line 1891 "VBNET.ATG" out parameters); Expect(38); -#line 1889 "VBNET.ATG" +#line 1894 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); -#line 1891 "VBNET.ATG" +#line 1896 "VBNET.ATG" pexpr.StartLocation = start; pexpr.EndLocation = t.Location; } void PrimitiveTypeName( -#line 3564 "VBNET.ATG" +#line 3569 "VBNET.ATG" out string type) { -#line 3565 "VBNET.ATG" +#line 3570 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 68: { lexer.NextToken(); -#line 3566 "VBNET.ATG" +#line 3571 "VBNET.ATG" type = "System.Boolean"; break; } case 99: { lexer.NextToken(); -#line 3567 "VBNET.ATG" +#line 3572 "VBNET.ATG" type = "System.DateTime"; break; } case 82: { lexer.NextToken(); -#line 3568 "VBNET.ATG" +#line 3573 "VBNET.ATG" type = "System.Char"; break; } case 208: { lexer.NextToken(); -#line 3569 "VBNET.ATG" +#line 3574 "VBNET.ATG" type = "System.String"; break; } case 100: { lexer.NextToken(); -#line 3570 "VBNET.ATG" +#line 3575 "VBNET.ATG" type = "System.Decimal"; break; } case 71: { lexer.NextToken(); -#line 3571 "VBNET.ATG" +#line 3576 "VBNET.ATG" type = "System.Byte"; break; } case 201: { lexer.NextToken(); -#line 3572 "VBNET.ATG" +#line 3577 "VBNET.ATG" type = "System.Int16"; break; } case 141: { lexer.NextToken(); -#line 3573 "VBNET.ATG" +#line 3578 "VBNET.ATG" type = "System.Int32"; break; } case 151: { lexer.NextToken(); -#line 3574 "VBNET.ATG" +#line 3579 "VBNET.ATG" type = "System.Int64"; break; } case 202: { lexer.NextToken(); -#line 3575 "VBNET.ATG" +#line 3580 "VBNET.ATG" type = "System.Single"; break; } case 109: { lexer.NextToken(); -#line 3576 "VBNET.ATG" +#line 3581 "VBNET.ATG" type = "System.Double"; break; } case 221: { lexer.NextToken(); -#line 3577 "VBNET.ATG" +#line 3582 "VBNET.ATG" type = "System.UInt32"; break; } case 222: { lexer.NextToken(); -#line 3578 "VBNET.ATG" +#line 3583 "VBNET.ATG" type = "System.UInt64"; break; } case 225: { lexer.NextToken(); -#line 3579 "VBNET.ATG" +#line 3584 "VBNET.ATG" type = "System.UInt16"; break; } case 196: { lexer.NextToken(); -#line 3580 "VBNET.ATG" +#line 3585 "VBNET.ATG" type = "System.SByte"; break; } @@ -4397,122 +4403,122 @@ out string type) { } void CastTarget( -#line 1896 "VBNET.ATG" +#line 1901 "VBNET.ATG" out TypeReference type) { -#line 1898 "VBNET.ATG" +#line 1903 "VBNET.ATG" type = null; switch (la.kind) { case 76: { lexer.NextToken(); -#line 1900 "VBNET.ATG" +#line 1905 "VBNET.ATG" type = new TypeReference("System.Boolean", true); break; } case 77: { lexer.NextToken(); -#line 1901 "VBNET.ATG" +#line 1906 "VBNET.ATG" type = new TypeReference("System.Byte", true); break; } case 90: { lexer.NextToken(); -#line 1902 "VBNET.ATG" +#line 1907 "VBNET.ATG" type = new TypeReference("System.SByte", true); break; } case 78: { lexer.NextToken(); -#line 1903 "VBNET.ATG" +#line 1908 "VBNET.ATG" type = new TypeReference("System.Char", true); break; } case 79: { lexer.NextToken(); -#line 1904 "VBNET.ATG" +#line 1909 "VBNET.ATG" type = new TypeReference("System.DateTime", true); break; } case 81: { lexer.NextToken(); -#line 1905 "VBNET.ATG" +#line 1910 "VBNET.ATG" type = new TypeReference("System.Decimal", true); break; } case 80: { lexer.NextToken(); -#line 1906 "VBNET.ATG" +#line 1911 "VBNET.ATG" type = new TypeReference("System.Double", true); break; } case 91: { lexer.NextToken(); -#line 1907 "VBNET.ATG" +#line 1912 "VBNET.ATG" type = new TypeReference("System.Int16", true); break; } case 83: { lexer.NextToken(); -#line 1908 "VBNET.ATG" +#line 1913 "VBNET.ATG" type = new TypeReference("System.Int32", true); break; } case 85: { lexer.NextToken(); -#line 1909 "VBNET.ATG" +#line 1914 "VBNET.ATG" type = new TypeReference("System.Int64", true); break; } case 97: { lexer.NextToken(); -#line 1910 "VBNET.ATG" +#line 1915 "VBNET.ATG" type = new TypeReference("System.UInt16", true); break; } case 95: { lexer.NextToken(); -#line 1911 "VBNET.ATG" +#line 1916 "VBNET.ATG" type = new TypeReference("System.UInt32", true); break; } case 96: { lexer.NextToken(); -#line 1912 "VBNET.ATG" +#line 1917 "VBNET.ATG" type = new TypeReference("System.UInt64", true); break; } case 86: { lexer.NextToken(); -#line 1913 "VBNET.ATG" +#line 1918 "VBNET.ATG" type = new TypeReference("System.Object", true); break; } case 92: { lexer.NextToken(); -#line 1914 "VBNET.ATG" +#line 1919 "VBNET.ATG" type = new TypeReference("System.Single", true); break; } case 93: { lexer.NextToken(); -#line 1915 "VBNET.ATG" +#line 1920 "VBNET.ATG" type = new TypeReference("System.String", true); break; } @@ -4521,19 +4527,19 @@ out TypeReference type) { } void GetTypeTypeName( -#line 2636 "VBNET.ATG" +#line 2641 "VBNET.ATG" out TypeReference typeref) { -#line 2637 "VBNET.ATG" +#line 2642 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2639 "VBNET.ATG" +#line 2644 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 2640 "VBNET.ATG" +#line 2645 "VBNET.ATG" out rank); -#line 2641 "VBNET.ATG" +#line 2646 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4541,10 +4547,10 @@ out rank); } void ConditionalExpression( -#line 1848 "VBNET.ATG" +#line 1853 "VBNET.ATG" out Expression expr) { -#line 1850 "VBNET.ATG" +#line 1855 "VBNET.ATG" ConditionalExpression conditionalExpression = new ConditionalExpression(); BinaryOperatorExpression binaryOperatorExpression = new BinaryOperatorExpression(); conditionalExpression.StartLocation = binaryOperatorExpression.StartLocation = la.Location; @@ -4556,21 +4562,21 @@ out Expression expr) { Expect(135); Expect(37); Expr( -#line 1859 "VBNET.ATG" +#line 1864 "VBNET.ATG" out condition); Expect(22); Expr( -#line 1859 "VBNET.ATG" +#line 1864 "VBNET.ATG" out trueExpr); if (la.kind == 22) { lexer.NextToken(); Expr( -#line 1859 "VBNET.ATG" +#line 1864 "VBNET.ATG" out falseExpr); } Expect(38); -#line 1861 "VBNET.ATG" +#line 1866 "VBNET.ATG" if(falseExpr != null) { conditionalExpression.Condition = condition; @@ -4593,34 +4599,34 @@ out falseExpr); } void XmlContentExpression( -#line 1788 "VBNET.ATG" +#line 1793 "VBNET.ATG" List exprs) { -#line 1789 "VBNET.ATG" +#line 1794 "VBNET.ATG" XmlContentExpression expr = null; if (la.kind == 16) { lexer.NextToken(); -#line 1791 "VBNET.ATG" +#line 1796 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.Text); } else if (la.kind == 18) { lexer.NextToken(); -#line 1792 "VBNET.ATG" +#line 1797 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.CData); } else if (la.kind == 17) { lexer.NextToken(); -#line 1793 "VBNET.ATG" +#line 1798 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.Comment); } else if (la.kind == 19) { lexer.NextToken(); -#line 1794 "VBNET.ATG" +#line 1799 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); } else SynErr(286); -#line 1797 "VBNET.ATG" +#line 1802 "VBNET.ATG" expr.StartLocation = t.Location; expr.EndLocation = t.EndLocation; exprs.Add(expr); @@ -4628,54 +4634,54 @@ List exprs) { } void XmlElement( -#line 1823 "VBNET.ATG" +#line 1828 "VBNET.ATG" out XmlExpression expr) { -#line 1824 "VBNET.ATG" +#line 1829 "VBNET.ATG" XmlElementExpression el = new XmlElementExpression(); Expect(10); -#line 1827 "VBNET.ATG" +#line 1832 "VBNET.ATG" el.StartLocation = t.Location; if (la.kind == 12) { lexer.NextToken(); -#line 1828 "VBNET.ATG" +#line 1833 "VBNET.ATG" Expression innerExpression; Expr( -#line 1828 "VBNET.ATG" +#line 1833 "VBNET.ATG" out innerExpression); Expect(13); -#line 1829 "VBNET.ATG" +#line 1834 "VBNET.ATG" el.NameExpression = new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }; } else if (StartOf(4)) { Identifier(); -#line 1830 "VBNET.ATG" +#line 1835 "VBNET.ATG" el.XmlName = t.val; } else SynErr(287); while (StartOf(36)) { XmlAttribute( -#line 1830 "VBNET.ATG" +#line 1835 "VBNET.ATG" el.Attributes); } if (la.kind == 14) { lexer.NextToken(); -#line 1831 "VBNET.ATG" +#line 1836 "VBNET.ATG" el.EndLocation = t.EndLocation; } else if (la.kind == 11) { lexer.NextToken(); while (StartOf(37)) { -#line 1831 "VBNET.ATG" +#line 1836 "VBNET.ATG" XmlExpression child; XmlNestedContent( -#line 1831 "VBNET.ATG" +#line 1836 "VBNET.ATG" out child); -#line 1831 "VBNET.ATG" +#line 1836 "VBNET.ATG" el.Children.Add(child); } Expect(15); @@ -4684,73 +4690,73 @@ out child); } Expect(11); -#line 1831 "VBNET.ATG" +#line 1836 "VBNET.ATG" el.EndLocation = t.EndLocation; } else SynErr(288); -#line 1833 "VBNET.ATG" +#line 1838 "VBNET.ATG" expr = el; } void XmlNestedContent( -#line 1803 "VBNET.ATG" +#line 1808 "VBNET.ATG" out XmlExpression expr) { -#line 1804 "VBNET.ATG" +#line 1809 "VBNET.ATG" XmlExpression tmpExpr = null; Location start = la.Location; switch (la.kind) { case 16: { lexer.NextToken(); -#line 1807 "VBNET.ATG" +#line 1812 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.Text); break; } case 18: { lexer.NextToken(); -#line 1808 "VBNET.ATG" +#line 1813 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.CData); break; } case 17: { lexer.NextToken(); -#line 1809 "VBNET.ATG" +#line 1814 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.Comment); break; } case 19: { lexer.NextToken(); -#line 1810 "VBNET.ATG" +#line 1815 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); break; } case 12: { lexer.NextToken(); -#line 1811 "VBNET.ATG" +#line 1816 "VBNET.ATG" Expression innerExpression; Expr( -#line 1811 "VBNET.ATG" +#line 1816 "VBNET.ATG" out innerExpression); Expect(13); -#line 1811 "VBNET.ATG" +#line 1816 "VBNET.ATG" tmpExpr = new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }; break; } case 10: { XmlElement( -#line 1812 "VBNET.ATG" +#line 1817 "VBNET.ATG" out tmpExpr); break; } default: SynErr(289); break; } -#line 1815 "VBNET.ATG" +#line 1820 "VBNET.ATG" if (tmpExpr.StartLocation.IsEmpty) tmpExpr.StartLocation = start; if (tmpExpr.EndLocation.IsEmpty) @@ -4760,393 +4766,393 @@ out tmpExpr); } void XmlAttribute( -#line 1836 "VBNET.ATG" +#line 1841 "VBNET.ATG" List attrs) { -#line 1837 "VBNET.ATG" +#line 1842 "VBNET.ATG" Location start = la.Location; if (StartOf(4)) { Identifier(); -#line 1839 "VBNET.ATG" +#line 1844 "VBNET.ATG" string name = t.val; Expect(20); -#line 1840 "VBNET.ATG" +#line 1845 "VBNET.ATG" string literalValue = null; Expression expressionValue = null; bool useDoubleQuotes = false; if (la.kind == 3) { lexer.NextToken(); -#line 1841 "VBNET.ATG" +#line 1846 "VBNET.ATG" literalValue = t.literalValue.ToString(); useDoubleQuotes = t.val[0] == '"'; } else if (la.kind == 12) { lexer.NextToken(); Expr( -#line 1841 "VBNET.ATG" +#line 1846 "VBNET.ATG" out expressionValue); Expect(13); } else SynErr(290); -#line 1842 "VBNET.ATG" +#line 1847 "VBNET.ATG" attrs.Add(new XmlAttribute() { Name = name, ExpressionValue = expressionValue, LiteralValue = literalValue, UseDoubleQuotes = useDoubleQuotes, StartLocation = start, EndLocation = t.EndLocation }); } else if (la.kind == 12) { lexer.NextToken(); -#line 1844 "VBNET.ATG" +#line 1849 "VBNET.ATG" Expression innerExpression; Expr( -#line 1844 "VBNET.ATG" +#line 1849 "VBNET.ATG" out innerExpression); Expect(13); -#line 1845 "VBNET.ATG" +#line 1850 "VBNET.ATG" attrs.Add(new XmlEmbeddedExpression() { InlineVBExpression = innerExpression, StartLocation = start, EndLocation = t.EndLocation }); } else SynErr(291); } void ArgumentList( -#line 2568 "VBNET.ATG" +#line 2573 "VBNET.ATG" out List arguments) { -#line 2570 "VBNET.ATG" +#line 2575 "VBNET.ATG" arguments = new List(); Expression expr = null; if (StartOf(30)) { Argument( -#line 2573 "VBNET.ATG" +#line 2578 "VBNET.ATG" out expr); } while (la.kind == 22) { lexer.NextToken(); -#line 2574 "VBNET.ATG" +#line 2579 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; if (StartOf(30)) { Argument( -#line 2575 "VBNET.ATG" +#line 2580 "VBNET.ATG" out expr); } -#line 2576 "VBNET.ATG" +#line 2581 "VBNET.ATG" if (expr == null) expr = Expression.Null; } -#line 2578 "VBNET.ATG" +#line 2583 "VBNET.ATG" if (expr != null) arguments.Add(expr); } void ConjunctionExpr( -#line 1934 "VBNET.ATG" +#line 1939 "VBNET.ATG" out Expression outExpr) { -#line 1936 "VBNET.ATG" +#line 1941 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; NotExpr( -#line 1939 "VBNET.ATG" +#line 1944 "VBNET.ATG" out outExpr); while (la.kind == 60 || la.kind == 61) { if (la.kind == 60) { lexer.NextToken(); -#line 1942 "VBNET.ATG" +#line 1947 "VBNET.ATG" op = BinaryOperatorType.BitwiseAnd; } else { lexer.NextToken(); -#line 1943 "VBNET.ATG" +#line 1948 "VBNET.ATG" op = BinaryOperatorType.LogicalAnd; } NotExpr( -#line 1945 "VBNET.ATG" +#line 1950 "VBNET.ATG" out expr); -#line 1945 "VBNET.ATG" +#line 1950 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void NotExpr( -#line 1949 "VBNET.ATG" +#line 1954 "VBNET.ATG" out Expression outExpr) { -#line 1950 "VBNET.ATG" +#line 1955 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 164) { lexer.NextToken(); -#line 1951 "VBNET.ATG" +#line 1956 "VBNET.ATG" uop = UnaryOperatorType.Not; } ComparisonExpr( -#line 1952 "VBNET.ATG" +#line 1957 "VBNET.ATG" out outExpr); -#line 1953 "VBNET.ATG" +#line 1958 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void ComparisonExpr( -#line 1958 "VBNET.ATG" +#line 1963 "VBNET.ATG" out Expression outExpr) { -#line 1960 "VBNET.ATG" +#line 1965 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1963 "VBNET.ATG" +#line 1968 "VBNET.ATG" out outExpr); while (StartOf(39)) { switch (la.kind) { case 40: { lexer.NextToken(); -#line 1966 "VBNET.ATG" +#line 1971 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 39: { lexer.NextToken(); -#line 1967 "VBNET.ATG" +#line 1972 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 43: { lexer.NextToken(); -#line 1968 "VBNET.ATG" +#line 1973 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 42: { lexer.NextToken(); -#line 1969 "VBNET.ATG" +#line 1974 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 41: { lexer.NextToken(); -#line 1970 "VBNET.ATG" +#line 1975 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } case 20: { lexer.NextToken(); -#line 1971 "VBNET.ATG" +#line 1976 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 150: { lexer.NextToken(); -#line 1972 "VBNET.ATG" +#line 1977 "VBNET.ATG" op = BinaryOperatorType.Like; break; } case 144: { lexer.NextToken(); -#line 1973 "VBNET.ATG" +#line 1978 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; break; } case 145: { lexer.NextToken(); -#line 1974 "VBNET.ATG" +#line 1979 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; break; } } if (StartOf(40)) { ShiftExpr( -#line 1977 "VBNET.ATG" +#line 1982 "VBNET.ATG" out expr); -#line 1977 "VBNET.ATG" +#line 1982 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else if (la.kind == 164) { lexer.NextToken(); ShiftExpr( -#line 1980 "VBNET.ATG" +#line 1985 "VBNET.ATG" out expr); -#line 1980 "VBNET.ATG" +#line 1985 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new UnaryOperatorExpression(expr, UnaryOperatorType.Not)); } else SynErr(292); } } void ShiftExpr( -#line 1985 "VBNET.ATG" +#line 1990 "VBNET.ATG" out Expression outExpr) { -#line 1987 "VBNET.ATG" +#line 1992 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConcatenationExpr( -#line 1990 "VBNET.ATG" +#line 1995 "VBNET.ATG" out outExpr); while (la.kind == 44 || la.kind == 45) { if (la.kind == 44) { lexer.NextToken(); -#line 1993 "VBNET.ATG" +#line 1998 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1994 "VBNET.ATG" +#line 1999 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } ConcatenationExpr( -#line 1996 "VBNET.ATG" +#line 2001 "VBNET.ATG" out expr); -#line 1996 "VBNET.ATG" +#line 2001 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ConcatenationExpr( -#line 2000 "VBNET.ATG" +#line 2005 "VBNET.ATG" out Expression outExpr) { -#line 2001 "VBNET.ATG" +#line 2006 "VBNET.ATG" Expression expr; AdditiveExpr( -#line 2003 "VBNET.ATG" +#line 2008 "VBNET.ATG" out outExpr); while (la.kind == 23) { lexer.NextToken(); AdditiveExpr( -#line 2003 "VBNET.ATG" +#line 2008 "VBNET.ATG" out expr); -#line 2003 "VBNET.ATG" +#line 2008 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Concat, expr); } } void AdditiveExpr( -#line 2006 "VBNET.ATG" +#line 2011 "VBNET.ATG" out Expression outExpr) { -#line 2008 "VBNET.ATG" +#line 2013 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ModuloExpr( -#line 2011 "VBNET.ATG" +#line 2016 "VBNET.ATG" out outExpr); while (la.kind == 30 || la.kind == 31) { if (la.kind == 31) { lexer.NextToken(); -#line 2014 "VBNET.ATG" +#line 2019 "VBNET.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 2015 "VBNET.ATG" +#line 2020 "VBNET.ATG" op = BinaryOperatorType.Subtract; } ModuloExpr( -#line 2017 "VBNET.ATG" +#line 2022 "VBNET.ATG" out expr); -#line 2017 "VBNET.ATG" +#line 2022 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ModuloExpr( -#line 2021 "VBNET.ATG" +#line 2026 "VBNET.ATG" out Expression outExpr) { -#line 2022 "VBNET.ATG" +#line 2027 "VBNET.ATG" Expression expr; IntegerDivisionExpr( -#line 2024 "VBNET.ATG" +#line 2029 "VBNET.ATG" out outExpr); while (la.kind == 154) { lexer.NextToken(); IntegerDivisionExpr( -#line 2024 "VBNET.ATG" +#line 2029 "VBNET.ATG" out expr); -#line 2024 "VBNET.ATG" +#line 2029 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr); } } void IntegerDivisionExpr( -#line 2027 "VBNET.ATG" +#line 2032 "VBNET.ATG" out Expression outExpr) { -#line 2028 "VBNET.ATG" +#line 2033 "VBNET.ATG" Expression expr; MultiplicativeExpr( -#line 2030 "VBNET.ATG" +#line 2035 "VBNET.ATG" out outExpr); while (la.kind == 25) { lexer.NextToken(); MultiplicativeExpr( -#line 2030 "VBNET.ATG" +#line 2035 "VBNET.ATG" out expr); -#line 2030 "VBNET.ATG" +#line 2035 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.DivideInteger, expr); } } void MultiplicativeExpr( -#line 2033 "VBNET.ATG" +#line 2038 "VBNET.ATG" out Expression outExpr) { -#line 2035 "VBNET.ATG" +#line 2040 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 2038 "VBNET.ATG" +#line 2043 "VBNET.ATG" out outExpr); while (la.kind == 24 || la.kind == 34) { if (la.kind == 34) { lexer.NextToken(); -#line 2041 "VBNET.ATG" +#line 2046 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else { lexer.NextToken(); -#line 2042 "VBNET.ATG" +#line 2047 "VBNET.ATG" op = BinaryOperatorType.Divide; } UnaryExpr( -#line 2044 "VBNET.ATG" +#line 2049 "VBNET.ATG" out expr); -#line 2044 "VBNET.ATG" +#line 2049 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void UnaryExpr( -#line 2048 "VBNET.ATG" +#line 2053 "VBNET.ATG" out Expression uExpr) { -#line 2050 "VBNET.ATG" +#line 2055 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -5155,25 +5161,25 @@ out Expression uExpr) { if (la.kind == 31) { lexer.NextToken(); -#line 2054 "VBNET.ATG" +#line 2059 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 30) { lexer.NextToken(); -#line 2055 "VBNET.ATG" +#line 2060 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 2056 "VBNET.ATG" +#line 2061 "VBNET.ATG" uop = UnaryOperatorType.Dereference; isUOp = true; } } ExponentiationExpr( -#line 2058 "VBNET.ATG" +#line 2063 "VBNET.ATG" out expr); -#line 2060 "VBNET.ATG" +#line 2065 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -5183,107 +5189,107 @@ out expr); } void ExponentiationExpr( -#line 2068 "VBNET.ATG" +#line 2073 "VBNET.ATG" out Expression outExpr) { -#line 2069 "VBNET.ATG" +#line 2074 "VBNET.ATG" Expression expr; SimpleExpr( -#line 2071 "VBNET.ATG" +#line 2076 "VBNET.ATG" out outExpr); while (la.kind == 32) { lexer.NextToken(); SimpleExpr( -#line 2071 "VBNET.ATG" +#line 2076 "VBNET.ATG" out expr); -#line 2071 "VBNET.ATG" +#line 2076 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Power, expr); } } void NormalOrReDimArgumentList( -#line 2582 "VBNET.ATG" +#line 2587 "VBNET.ATG" out List arguments, out bool canBeNormal, out bool canBeRedim) { -#line 2584 "VBNET.ATG" +#line 2589 "VBNET.ATG" arguments = new List(); canBeNormal = true; canBeRedim = !IsNamedAssign(); Expression expr = null; if (StartOf(30)) { Argument( -#line 2589 "VBNET.ATG" +#line 2594 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2590 "VBNET.ATG" +#line 2595 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2591 "VBNET.ATG" +#line 2596 "VBNET.ATG" out expr); } } while (la.kind == 22) { lexer.NextToken(); -#line 2594 "VBNET.ATG" +#line 2599 "VBNET.ATG" if (expr == null) canBeRedim = false; -#line 2595 "VBNET.ATG" +#line 2600 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; -#line 2596 "VBNET.ATG" +#line 2601 "VBNET.ATG" canBeRedim &= !IsNamedAssign(); if (StartOf(30)) { Argument( -#line 2597 "VBNET.ATG" +#line 2602 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2598 "VBNET.ATG" +#line 2603 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2599 "VBNET.ATG" +#line 2604 "VBNET.ATG" out expr); } } -#line 2601 "VBNET.ATG" +#line 2606 "VBNET.ATG" if (expr == null) { canBeRedim = false; expr = Expression.Null; } } -#line 2603 "VBNET.ATG" +#line 2608 "VBNET.ATG" if (expr != null) arguments.Add(expr); else canBeRedim = false; } void ArrayTypeModifiers( -#line 2710 "VBNET.ATG" +#line 2715 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2712 "VBNET.ATG" +#line 2717 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2715 "VBNET.ATG" +#line 2720 "VBNET.ATG" IsDims()) { Expect(37); if (la.kind == 22 || la.kind == 38) { RankList( -#line 2717 "VBNET.ATG" +#line 2722 "VBNET.ATG" out i); } -#line 2719 "VBNET.ATG" +#line 2724 "VBNET.ATG" arrayModifiers.Add(i); Expect(38); } -#line 2724 "VBNET.ATG" +#line 2729 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -5291,10 +5297,10 @@ out i); } void MemberInitializer( -#line 2549 "VBNET.ATG" +#line 2554 "VBNET.ATG" out MemberInitializerExpression memberInitializer) { -#line 2551 "VBNET.ATG" +#line 2556 "VBNET.ATG" memberInitializer = new MemberInitializerExpression(); memberInitializer.StartLocation = la.Location; Expression initExpr = null; @@ -5304,19 +5310,19 @@ out MemberInitializerExpression memberInitializer) { if (la.kind == 147) { lexer.NextToken(); -#line 2557 "VBNET.ATG" +#line 2562 "VBNET.ATG" isKey = true; } Expect(26); IdentifierOrKeyword( -#line 2558 "VBNET.ATG" +#line 2563 "VBNET.ATG" out name); Expect(20); Expr( -#line 2558 "VBNET.ATG" +#line 2563 "VBNET.ATG" out initExpr); -#line 2560 "VBNET.ATG" +#line 2565 "VBNET.ATG" memberInitializer.Name = name; memberInitializer.Expression = initExpr; memberInitializer.IsKey = isKey; @@ -5325,10 +5331,10 @@ out initExpr); } void SubLambdaExpression( -#line 2154 "VBNET.ATG" +#line 2159 "VBNET.ATG" out LambdaExpression lambda) { -#line 2156 "VBNET.ATG" +#line 2161 "VBNET.ATG" lambda = new LambdaExpression(); lambda.ReturnType = new TypeReference("System.Void", true); Expression inner = null; @@ -5340,7 +5346,7 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2163 "VBNET.ATG" +#line 2168 "VBNET.ATG" lambda.Parameters); } Expect(38); @@ -5348,19 +5354,19 @@ lambda.Parameters); if (StartOf(41)) { if (StartOf(30)) { Expr( -#line 2166 "VBNET.ATG" +#line 2171 "VBNET.ATG" out inner); -#line 2168 "VBNET.ATG" +#line 2173 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2172 "VBNET.ATG" +#line 2177 "VBNET.ATG" out statement); -#line 2174 "VBNET.ATG" +#line 2179 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5368,12 +5374,12 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2180 "VBNET.ATG" +#line 2185 "VBNET.ATG" out statement); Expect(113); Expect(210); -#line 2183 "VBNET.ATG" +#line 2188 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5381,10 +5387,10 @@ out statement); } void FunctionLambdaExpression( -#line 2189 "VBNET.ATG" +#line 2194 "VBNET.ATG" out LambdaExpression lambda) { -#line 2191 "VBNET.ATG" +#line 2196 "VBNET.ATG" lambda = new LambdaExpression(); TypeReference typeRef = null; Expression inner = null; @@ -5396,7 +5402,7 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2198 "VBNET.ATG" +#line 2203 "VBNET.ATG" lambda.Parameters); } Expect(38); @@ -5404,28 +5410,28 @@ lambda.Parameters); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2199 "VBNET.ATG" +#line 2204 "VBNET.ATG" out typeRef); -#line 2199 "VBNET.ATG" +#line 2204 "VBNET.ATG" lambda.ReturnType = typeRef; } if (StartOf(41)) { if (StartOf(30)) { Expr( -#line 2202 "VBNET.ATG" +#line 2207 "VBNET.ATG" out inner); -#line 2204 "VBNET.ATG" +#line 2209 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2208 "VBNET.ATG" +#line 2213 "VBNET.ATG" out statement); -#line 2210 "VBNET.ATG" +#line 2215 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5433,12 +5439,12 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2216 "VBNET.ATG" +#line 2221 "VBNET.ATG" out statement); Expect(113); Expect(127); -#line 2219 "VBNET.ATG" +#line 2224 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5446,10 +5452,10 @@ out statement); } void EmbeddedStatement( -#line 2981 "VBNET.ATG" +#line 2986 "VBNET.ATG" out Statement statement) { -#line 2983 "VBNET.ATG" +#line 2988 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5459,224 +5465,224 @@ out Statement statement) { if (la.kind == 120) { lexer.NextToken(); -#line 2989 "VBNET.ATG" +#line 2994 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 210: { lexer.NextToken(); -#line 2991 "VBNET.ATG" +#line 2996 "VBNET.ATG" exitType = ExitType.Sub; break; } case 127: { lexer.NextToken(); -#line 2993 "VBNET.ATG" +#line 2998 "VBNET.ATG" exitType = ExitType.Function; break; } case 186: { lexer.NextToken(); -#line 2995 "VBNET.ATG" +#line 3000 "VBNET.ATG" exitType = ExitType.Property; break; } case 108: { lexer.NextToken(); -#line 2997 "VBNET.ATG" +#line 3002 "VBNET.ATG" exitType = ExitType.Do; break; } case 124: { lexer.NextToken(); -#line 2999 "VBNET.ATG" +#line 3004 "VBNET.ATG" exitType = ExitType.For; break; } case 218: { lexer.NextToken(); -#line 3001 "VBNET.ATG" +#line 3006 "VBNET.ATG" exitType = ExitType.Try; break; } case 231: { lexer.NextToken(); -#line 3003 "VBNET.ATG" +#line 3008 "VBNET.ATG" exitType = ExitType.While; break; } case 197: { lexer.NextToken(); -#line 3005 "VBNET.ATG" +#line 3010 "VBNET.ATG" exitType = ExitType.Select; break; } default: SynErr(295); break; } -#line 3007 "VBNET.ATG" +#line 3012 "VBNET.ATG" statement = new ExitStatement(exitType); } else if (la.kind == 218) { TryStatement( -#line 3008 "VBNET.ATG" +#line 3013 "VBNET.ATG" out statement); } else if (la.kind == 89) { lexer.NextToken(); -#line 3009 "VBNET.ATG" +#line 3014 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 108 || la.kind == 124 || la.kind == 231) { if (la.kind == 108) { lexer.NextToken(); -#line 3009 "VBNET.ATG" +#line 3014 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 124) { lexer.NextToken(); -#line 3009 "VBNET.ATG" +#line 3014 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 3009 "VBNET.ATG" +#line 3014 "VBNET.ATG" continueType = ContinueType.While; } } -#line 3009 "VBNET.ATG" +#line 3014 "VBNET.ATG" statement = new ContinueStatement(continueType); } else if (la.kind == 215) { lexer.NextToken(); if (StartOf(30)) { Expr( -#line 3011 "VBNET.ATG" +#line 3016 "VBNET.ATG" out expr); } -#line 3011 "VBNET.ATG" +#line 3016 "VBNET.ATG" statement = new ThrowStatement(expr); } else if (la.kind == 195) { lexer.NextToken(); if (StartOf(30)) { Expr( -#line 3013 "VBNET.ATG" +#line 3018 "VBNET.ATG" out expr); } -#line 3013 "VBNET.ATG" +#line 3018 "VBNET.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 211) { lexer.NextToken(); Expr( -#line 3015 "VBNET.ATG" +#line 3020 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 3015 "VBNET.ATG" +#line 3020 "VBNET.ATG" out embeddedStatement); Expect(113); Expect(211); -#line 3016 "VBNET.ATG" +#line 3021 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 189) { lexer.NextToken(); Identifier(); -#line 3018 "VBNET.ATG" +#line 3023 "VBNET.ATG" name = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(42)) { ArgumentList( -#line 3019 "VBNET.ATG" +#line 3024 "VBNET.ATG" out p); } Expect(38); } -#line 3021 "VBNET.ATG" +#line 3026 "VBNET.ATG" statement = new RaiseEventStatement(name, p); } else if (la.kind == 233) { WithStatement( -#line 3024 "VBNET.ATG" +#line 3029 "VBNET.ATG" out statement); } else if (la.kind == 56) { lexer.NextToken(); -#line 3026 "VBNET.ATG" +#line 3031 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 3027 "VBNET.ATG" +#line 3032 "VBNET.ATG" out expr); Expect(22); Expr( -#line 3027 "VBNET.ATG" +#line 3032 "VBNET.ATG" out handlerExpr); -#line 3029 "VBNET.ATG" +#line 3034 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); } else if (la.kind == 193) { lexer.NextToken(); -#line 3032 "VBNET.ATG" +#line 3037 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 3033 "VBNET.ATG" +#line 3038 "VBNET.ATG" out expr); Expect(22); Expr( -#line 3033 "VBNET.ATG" +#line 3038 "VBNET.ATG" out handlerExpr); -#line 3035 "VBNET.ATG" +#line 3040 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); } else if (la.kind == 231) { lexer.NextToken(); Expr( -#line 3038 "VBNET.ATG" +#line 3043 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 3039 "VBNET.ATG" +#line 3044 "VBNET.ATG" out embeddedStatement); Expect(113); Expect(231); -#line 3041 "VBNET.ATG" +#line 3046 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 108) { lexer.NextToken(); -#line 3046 "VBNET.ATG" +#line 3051 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 3049 "VBNET.ATG" +#line 3054 "VBNET.ATG" out conditionType); Expr( -#line 3049 "VBNET.ATG" +#line 3054 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 3050 "VBNET.ATG" +#line 3055 "VBNET.ATG" out embeddedStatement); Expect(152); -#line 3053 "VBNET.ATG" +#line 3058 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5685,26 +5691,26 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 3060 "VBNET.ATG" +#line 3065 "VBNET.ATG" out embeddedStatement); Expect(152); if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 3061 "VBNET.ATG" +#line 3066 "VBNET.ATG" out conditionType); Expr( -#line 3061 "VBNET.ATG" +#line 3066 "VBNET.ATG" out expr); } -#line 3063 "VBNET.ATG" +#line 3068 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); } else SynErr(296); } else if (la.kind == 124) { lexer.NextToken(); -#line 3068 "VBNET.ATG" +#line 3073 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5713,24 +5719,24 @@ out expr); if (la.kind == 110) { lexer.NextToken(); LoopControlVariable( -#line 3075 "VBNET.ATG" +#line 3080 "VBNET.ATG" out typeReference, out typeName); Expect(138); Expr( -#line 3076 "VBNET.ATG" +#line 3081 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 3077 "VBNET.ATG" +#line 3082 "VBNET.ATG" out embeddedStatement); Expect(163); if (StartOf(30)) { Expr( -#line 3078 "VBNET.ATG" +#line 3083 "VBNET.ATG" out expr); } -#line 3080 "VBNET.ATG" +#line 3085 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5742,7 +5748,7 @@ out expr); } else if (StartOf(43)) { -#line 3091 "VBNET.ATG" +#line 3096 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; @@ -5751,59 +5757,59 @@ out expr); List nextExpressions = null; if ( -#line 3098 "VBNET.ATG" +#line 3103 "VBNET.ATG" IsLoopVariableDeclaration()) { LoopControlVariable( -#line 3099 "VBNET.ATG" +#line 3104 "VBNET.ATG" out typeReference, out typeName); } else { -#line 3101 "VBNET.ATG" +#line 3106 "VBNET.ATG" typeReference = null; typeName = null; SimpleExpr( -#line 3102 "VBNET.ATG" +#line 3107 "VBNET.ATG" out variableExpr); } Expect(20); Expr( -#line 3104 "VBNET.ATG" +#line 3109 "VBNET.ATG" out start); Expect(216); Expr( -#line 3104 "VBNET.ATG" +#line 3109 "VBNET.ATG" out end); if (la.kind == 205) { lexer.NextToken(); Expr( -#line 3104 "VBNET.ATG" +#line 3109 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 3105 "VBNET.ATG" +#line 3110 "VBNET.ATG" out embeddedStatement); Expect(163); if (StartOf(30)) { Expr( -#line 3108 "VBNET.ATG" +#line 3113 "VBNET.ATG" out nextExpr); -#line 3110 "VBNET.ATG" +#line 3115 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3113 "VBNET.ATG" +#line 3118 "VBNET.ATG" out nextExpr); -#line 3113 "VBNET.ATG" +#line 3118 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 3116 "VBNET.ATG" +#line 3121 "VBNET.ATG" statement = new ForNextStatement { TypeReference = typeReference, VariableName = typeName, @@ -5819,27 +5825,27 @@ out nextExpr); } else if (la.kind == 118) { lexer.NextToken(); Expr( -#line 3129 "VBNET.ATG" +#line 3134 "VBNET.ATG" out expr); -#line 3129 "VBNET.ATG" +#line 3134 "VBNET.ATG" statement = new ErrorStatement(expr); } else if (la.kind == 191) { lexer.NextToken(); -#line 3131 "VBNET.ATG" +#line 3136 "VBNET.ATG" bool isPreserve = false; if (la.kind == 184) { lexer.NextToken(); -#line 3131 "VBNET.ATG" +#line 3136 "VBNET.ATG" isPreserve = true; } ReDimClause( -#line 3132 "VBNET.ATG" +#line 3137 "VBNET.ATG" out expr); -#line 3134 "VBNET.ATG" +#line 3139 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); @@ -5847,48 +5853,48 @@ out expr); while (la.kind == 22) { lexer.NextToken(); ReDimClause( -#line 3138 "VBNET.ATG" +#line 3143 "VBNET.ATG" out expr); -#line 3139 "VBNET.ATG" +#line 3144 "VBNET.ATG" SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); } } else if (la.kind == 117) { lexer.NextToken(); Expr( -#line 3143 "VBNET.ATG" +#line 3148 "VBNET.ATG" out expr); -#line 3145 "VBNET.ATG" +#line 3150 "VBNET.ATG" EraseStatement eraseStatement = new EraseStatement(); if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr);} while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3148 "VBNET.ATG" +#line 3153 "VBNET.ATG" out expr); -#line 3148 "VBNET.ATG" +#line 3153 "VBNET.ATG" if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr); } } -#line 3149 "VBNET.ATG" +#line 3154 "VBNET.ATG" statement = eraseStatement; } else if (la.kind == 206) { lexer.NextToken(); -#line 3151 "VBNET.ATG" +#line 3156 "VBNET.ATG" statement = new StopStatement(); } else if ( -#line 3153 "VBNET.ATG" +#line 3158 "VBNET.ATG" la.kind == Tokens.If) { Expect(135); -#line 3154 "VBNET.ATG" +#line 3159 "VBNET.ATG" Location ifStartLocation = t.Location; Expr( -#line 3154 "VBNET.ATG" +#line 3159 "VBNET.ATG" out expr); if (la.kind == 214) { lexer.NextToken(); @@ -5896,46 +5902,46 @@ out expr); if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 3157 "VBNET.ATG" +#line 3162 "VBNET.ATG" out embeddedStatement); -#line 3159 "VBNET.ATG" +#line 3164 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; Location elseIfStart; while (la.kind == 112 || -#line 3165 "VBNET.ATG" +#line 3170 "VBNET.ATG" IsElseIf()) { if ( -#line 3165 "VBNET.ATG" +#line 3170 "VBNET.ATG" IsElseIf()) { Expect(111); -#line 3165 "VBNET.ATG" +#line 3170 "VBNET.ATG" elseIfStart = t.Location; Expect(135); } else { lexer.NextToken(); -#line 3166 "VBNET.ATG" +#line 3171 "VBNET.ATG" elseIfStart = t.Location; } -#line 3168 "VBNET.ATG" +#line 3173 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 3169 "VBNET.ATG" +#line 3174 "VBNET.ATG" out condition); if (la.kind == 214) { lexer.NextToken(); } EndOfStmt(); Block( -#line 3170 "VBNET.ATG" +#line 3175 "VBNET.ATG" out block); -#line 3172 "VBNET.ATG" +#line 3177 "VBNET.ATG" ElseIfSection elseIfSection = new ElseIfSection(condition, block); elseIfSection.StartLocation = elseIfStart; elseIfSection.EndLocation = t.Location; @@ -5949,39 +5955,39 @@ out block); EndOfStmt(); } Block( -#line 3181 "VBNET.ATG" +#line 3186 "VBNET.ATG" out embeddedStatement); -#line 3183 "VBNET.ATG" +#line 3188 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(113); Expect(135); -#line 3187 "VBNET.ATG" +#line 3192 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else if (StartOf(44)) { -#line 3192 "VBNET.ATG" +#line 3197 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr); ifStatement.StartLocation = ifStartLocation; SingleLineStatementList( -#line 3195 "VBNET.ATG" +#line 3200 "VBNET.ATG" ifStatement.TrueStatement); if (la.kind == 111) { lexer.NextToken(); if (StartOf(44)) { SingleLineStatementList( -#line 3198 "VBNET.ATG" +#line 3203 "VBNET.ATG" ifStatement.FalseStatement); } } -#line 3200 "VBNET.ATG" +#line 3205 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else SynErr(298); } else if (la.kind == 197) { @@ -5990,82 +5996,82 @@ ifStatement.FalseStatement); lexer.NextToken(); } Expr( -#line 3203 "VBNET.ATG" +#line 3208 "VBNET.ATG" out expr); EndOfStmt(); -#line 3204 "VBNET.ATG" +#line 3209 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 74) { -#line 3208 "VBNET.ATG" +#line 3213 "VBNET.ATG" List caseClauses = null; Location caseLocation = la.Location; lexer.NextToken(); CaseClauses( -#line 3209 "VBNET.ATG" +#line 3214 "VBNET.ATG" out caseClauses); if ( -#line 3209 "VBNET.ATG" +#line 3214 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 3211 "VBNET.ATG" +#line 3216 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); selectSection.StartLocation = caseLocation; Block( -#line 3214 "VBNET.ATG" +#line 3219 "VBNET.ATG" out block); -#line 3216 "VBNET.ATG" +#line 3221 "VBNET.ATG" selectSection.Children = block.Children; selectSection.EndLocation = t.EndLocation; selectSections.Add(selectSection); } -#line 3222 "VBNET.ATG" +#line 3227 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(113); Expect(197); } else if (la.kind == 171) { -#line 3225 "VBNET.ATG" +#line 3230 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 3226 "VBNET.ATG" +#line 3231 "VBNET.ATG" out onErrorStatement); -#line 3226 "VBNET.ATG" +#line 3231 "VBNET.ATG" statement = onErrorStatement; } else if (la.kind == 132) { -#line 3227 "VBNET.ATG" +#line 3232 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 3228 "VBNET.ATG" +#line 3233 "VBNET.ATG" out goToStatement); -#line 3228 "VBNET.ATG" +#line 3233 "VBNET.ATG" statement = goToStatement; } else if (la.kind == 194) { -#line 3229 "VBNET.ATG" +#line 3234 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 3230 "VBNET.ATG" +#line 3235 "VBNET.ATG" out resumeStatement); -#line 3230 "VBNET.ATG" +#line 3235 "VBNET.ATG" statement = resumeStatement; } else if (StartOf(43)) { -#line 3233 "VBNET.ATG" +#line 3238 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -6073,25 +6079,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 3239 "VBNET.ATG" +#line 3244 "VBNET.ATG" out expr); if (StartOf(45)) { AssignmentOperator( -#line 3241 "VBNET.ATG" +#line 3246 "VBNET.ATG" out op); Expr( -#line 3241 "VBNET.ATG" +#line 3246 "VBNET.ATG" out val); -#line 3241 "VBNET.ATG" +#line 3246 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (StartOf(46)) { -#line 3242 "VBNET.ATG" +#line 3247 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(299); -#line 3245 "VBNET.ATG" +#line 3250 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is MemberReferenceExpression || expr is IdentifierExpression) { @@ -6102,88 +6108,88 @@ out val); } else if (la.kind == 73) { lexer.NextToken(); SimpleExpr( -#line 3252 "VBNET.ATG" +#line 3257 "VBNET.ATG" out expr); -#line 3252 "VBNET.ATG" +#line 3257 "VBNET.ATG" statement = new ExpressionStatement(expr); } else if (la.kind == 226) { lexer.NextToken(); -#line 3254 "VBNET.ATG" +#line 3259 "VBNET.ATG" Statement block; if ( -#line 3255 "VBNET.ATG" +#line 3260 "VBNET.ATG" Peek(1).kind == Tokens.As) { -#line 3256 "VBNET.ATG" +#line 3261 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 3257 "VBNET.ATG" +#line 3262 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 3259 "VBNET.ATG" +#line 3264 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 3261 "VBNET.ATG" +#line 3266 "VBNET.ATG" out block); -#line 3263 "VBNET.ATG" +#line 3268 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); } else if (StartOf(30)) { Expr( -#line 3265 "VBNET.ATG" +#line 3270 "VBNET.ATG" out expr); Block( -#line 3266 "VBNET.ATG" +#line 3271 "VBNET.ATG" out block); -#line 3267 "VBNET.ATG" +#line 3272 "VBNET.ATG" statement = new UsingStatement(new ExpressionStatement(expr), block); } else SynErr(300); Expect(113); Expect(226); } else if (StartOf(47)) { LocalDeclarationStatement( -#line 3270 "VBNET.ATG" +#line 3275 "VBNET.ATG" out statement); } else SynErr(301); } void FromOrAggregateQueryOperator( -#line 2238 "VBNET.ATG" +#line 2243 "VBNET.ATG" List middleClauses) { -#line 2240 "VBNET.ATG" +#line 2245 "VBNET.ATG" QueryExpressionFromClause fromClause = null; QueryExpressionAggregateClause aggregateClause = null; if (la.kind == 126) { FromQueryOperator( -#line 2243 "VBNET.ATG" +#line 2248 "VBNET.ATG" out fromClause); -#line 2244 "VBNET.ATG" +#line 2249 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2245 "VBNET.ATG" +#line 2250 "VBNET.ATG" out aggregateClause); -#line 2246 "VBNET.ATG" +#line 2251 "VBNET.ATG" middleClauses.Add(aggregateClause); } else SynErr(302); } void QueryOperator( -#line 2249 "VBNET.ATG" +#line 2254 "VBNET.ATG" List middleClauses) { -#line 2251 "VBNET.ATG" +#line 2256 "VBNET.ATG" QueryExpressionJoinVBClause joinClause = null; QueryExpressionGroupVBClause groupByClause = null; QueryExpressionPartitionVBClause partitionClause = null; @@ -6193,94 +6199,94 @@ List middleClauses) { if (la.kind == 126) { FromQueryOperator( -#line 2258 "VBNET.ATG" +#line 2263 "VBNET.ATG" out fromClause); -#line 2259 "VBNET.ATG" +#line 2264 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2260 "VBNET.ATG" +#line 2265 "VBNET.ATG" out aggregateClause); -#line 2261 "VBNET.ATG" +#line 2266 "VBNET.ATG" middleClauses.Add(aggregateClause); } else if (la.kind == 197) { SelectQueryOperator( -#line 2262 "VBNET.ATG" +#line 2267 "VBNET.ATG" middleClauses); } else if (la.kind == 107) { DistinctQueryOperator( -#line 2263 "VBNET.ATG" +#line 2268 "VBNET.ATG" middleClauses); } else if (la.kind == 230) { WhereQueryOperator( -#line 2264 "VBNET.ATG" +#line 2269 "VBNET.ATG" middleClauses); } else if (la.kind == 176) { OrderByQueryOperator( -#line 2265 "VBNET.ATG" +#line 2270 "VBNET.ATG" middleClauses); } else if (la.kind == 203 || la.kind == 212) { PartitionQueryOperator( -#line 2266 "VBNET.ATG" +#line 2271 "VBNET.ATG" out partitionClause); -#line 2267 "VBNET.ATG" +#line 2272 "VBNET.ATG" middleClauses.Add(partitionClause); } else if (la.kind == 148) { LetQueryOperator( -#line 2268 "VBNET.ATG" +#line 2273 "VBNET.ATG" middleClauses); } else if (la.kind == 146) { JoinQueryOperator( -#line 2269 "VBNET.ATG" +#line 2274 "VBNET.ATG" out joinClause); -#line 2270 "VBNET.ATG" +#line 2275 "VBNET.ATG" middleClauses.Add(joinClause); } else if ( -#line 2271 "VBNET.ATG" +#line 2276 "VBNET.ATG" la.kind == Tokens.Group && Peek(1).kind == Tokens.Join) { GroupJoinQueryOperator( -#line 2271 "VBNET.ATG" +#line 2276 "VBNET.ATG" out groupJoinClause); -#line 2272 "VBNET.ATG" +#line 2277 "VBNET.ATG" middleClauses.Add(groupJoinClause); } else if (la.kind == 133) { GroupByQueryOperator( -#line 2273 "VBNET.ATG" +#line 2278 "VBNET.ATG" out groupByClause); -#line 2274 "VBNET.ATG" +#line 2279 "VBNET.ATG" middleClauses.Add(groupByClause); } else SynErr(303); } void FromQueryOperator( -#line 2349 "VBNET.ATG" +#line 2354 "VBNET.ATG" out QueryExpressionFromClause fromClause) { -#line 2351 "VBNET.ATG" +#line 2356 "VBNET.ATG" fromClause = new QueryExpressionFromClause(); fromClause.StartLocation = la.Location; Expect(126); CollectionRangeVariableDeclarationList( -#line 2354 "VBNET.ATG" +#line 2359 "VBNET.ATG" fromClause.Sources); -#line 2356 "VBNET.ATG" +#line 2361 "VBNET.ATG" fromClause.EndLocation = t.EndLocation; } void AggregateQueryOperator( -#line 2418 "VBNET.ATG" +#line 2423 "VBNET.ATG" out QueryExpressionAggregateClause aggregateClause) { -#line 2420 "VBNET.ATG" +#line 2425 "VBNET.ATG" aggregateClause = new QueryExpressionAggregateClause(); aggregateClause.IntoVariables = new List(); aggregateClause.StartLocation = la.Location; @@ -6288,77 +6294,77 @@ out QueryExpressionAggregateClause aggregateClause) { Expect(58); CollectionRangeVariableDeclaration( -#line 2425 "VBNET.ATG" +#line 2430 "VBNET.ATG" out source); -#line 2427 "VBNET.ATG" +#line 2432 "VBNET.ATG" aggregateClause.Source = source; while (StartOf(31)) { QueryOperator( -#line 2430 "VBNET.ATG" +#line 2435 "VBNET.ATG" aggregateClause.MiddleClauses); } Expect(143); ExpressionRangeVariableDeclarationList( -#line 2432 "VBNET.ATG" +#line 2437 "VBNET.ATG" aggregateClause.IntoVariables); -#line 2434 "VBNET.ATG" +#line 2439 "VBNET.ATG" aggregateClause.EndLocation = t.EndLocation; } void SelectQueryOperator( -#line 2360 "VBNET.ATG" +#line 2365 "VBNET.ATG" List middleClauses) { -#line 2362 "VBNET.ATG" +#line 2367 "VBNET.ATG" QueryExpressionSelectVBClause selectClause = new QueryExpressionSelectVBClause(); selectClause.StartLocation = la.Location; Expect(197); ExpressionRangeVariableDeclarationList( -#line 2365 "VBNET.ATG" +#line 2370 "VBNET.ATG" selectClause.Variables); -#line 2367 "VBNET.ATG" +#line 2372 "VBNET.ATG" selectClause.EndLocation = t.Location; middleClauses.Add(selectClause); } void DistinctQueryOperator( -#line 2372 "VBNET.ATG" +#line 2377 "VBNET.ATG" List middleClauses) { -#line 2374 "VBNET.ATG" +#line 2379 "VBNET.ATG" QueryExpressionDistinctClause distinctClause = new QueryExpressionDistinctClause(); distinctClause.StartLocation = la.Location; Expect(107); -#line 2379 "VBNET.ATG" +#line 2384 "VBNET.ATG" distinctClause.EndLocation = t.EndLocation; middleClauses.Add(distinctClause); } void WhereQueryOperator( -#line 2384 "VBNET.ATG" +#line 2389 "VBNET.ATG" List middleClauses) { -#line 2386 "VBNET.ATG" +#line 2391 "VBNET.ATG" QueryExpressionWhereClause whereClause = new QueryExpressionWhereClause(); whereClause.StartLocation = la.Location; Expression operand = null; Expect(230); Expr( -#line 2390 "VBNET.ATG" +#line 2395 "VBNET.ATG" out operand); -#line 2392 "VBNET.ATG" +#line 2397 "VBNET.ATG" whereClause.Condition = operand; whereClause.EndLocation = t.EndLocation; @@ -6367,10 +6373,10 @@ out operand); } void OrderByQueryOperator( -#line 2277 "VBNET.ATG" +#line 2282 "VBNET.ATG" List middleClauses) { -#line 2279 "VBNET.ATG" +#line 2284 "VBNET.ATG" QueryExpressionOrderClause orderClause = new QueryExpressionOrderClause(); orderClause.StartLocation = la.Location; List orderings = null; @@ -6378,10 +6384,10 @@ List middleClauses) { Expect(176); Expect(70); OrderExpressionList( -#line 2283 "VBNET.ATG" +#line 2288 "VBNET.ATG" out orderings); -#line 2285 "VBNET.ATG" +#line 2290 "VBNET.ATG" orderClause.Orderings = orderings; orderClause.EndLocation = t.EndLocation; middleClauses.Add(orderClause); @@ -6389,10 +6395,10 @@ out orderings); } void PartitionQueryOperator( -#line 2399 "VBNET.ATG" +#line 2404 "VBNET.ATG" out QueryExpressionPartitionVBClause partitionClause) { -#line 2401 "VBNET.ATG" +#line 2406 "VBNET.ATG" partitionClause = new QueryExpressionPartitionVBClause(); partitionClause.StartLocation = la.Location; Expression expr = null; @@ -6400,60 +6406,60 @@ out QueryExpressionPartitionVBClause partitionClause) { if (la.kind == 212) { lexer.NextToken(); -#line 2406 "VBNET.ATG" +#line 2411 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Take; if (la.kind == 231) { lexer.NextToken(); -#line 2407 "VBNET.ATG" +#line 2412 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.TakeWhile; } } else if (la.kind == 203) { lexer.NextToken(); -#line 2408 "VBNET.ATG" +#line 2413 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Skip; if (la.kind == 231) { lexer.NextToken(); -#line 2409 "VBNET.ATG" +#line 2414 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.SkipWhile; } } else SynErr(304); Expr( -#line 2411 "VBNET.ATG" +#line 2416 "VBNET.ATG" out expr); -#line 2413 "VBNET.ATG" +#line 2418 "VBNET.ATG" partitionClause.Expression = expr; partitionClause.EndLocation = t.EndLocation; } void LetQueryOperator( -#line 2438 "VBNET.ATG" +#line 2443 "VBNET.ATG" List middleClauses) { -#line 2440 "VBNET.ATG" +#line 2445 "VBNET.ATG" QueryExpressionLetVBClause letClause = new QueryExpressionLetVBClause(); letClause.StartLocation = la.Location; Expect(148); ExpressionRangeVariableDeclarationList( -#line 2443 "VBNET.ATG" +#line 2448 "VBNET.ATG" letClause.Variables); -#line 2445 "VBNET.ATG" +#line 2450 "VBNET.ATG" letClause.EndLocation = t.EndLocation; middleClauses.Add(letClause); } void JoinQueryOperator( -#line 2482 "VBNET.ATG" +#line 2487 "VBNET.ATG" out QueryExpressionJoinVBClause joinClause) { -#line 2484 "VBNET.ATG" +#line 2489 "VBNET.ATG" joinClause = new QueryExpressionJoinVBClause(); joinClause.StartLocation = la.Location; CollectionRangeVariable joinVariable = null; @@ -6463,203 +6469,203 @@ out QueryExpressionJoinVBClause joinClause) { Expect(146); CollectionRangeVariableDeclaration( -#line 2491 "VBNET.ATG" +#line 2496 "VBNET.ATG" out joinVariable); -#line 2492 "VBNET.ATG" +#line 2497 "VBNET.ATG" joinClause.JoinVariable = joinVariable; if (la.kind == 146) { JoinQueryOperator( -#line 2494 "VBNET.ATG" +#line 2499 "VBNET.ATG" out subJoin); -#line 2495 "VBNET.ATG" +#line 2500 "VBNET.ATG" joinClause.SubJoin = subJoin; } Expect(171); JoinCondition( -#line 2498 "VBNET.ATG" +#line 2503 "VBNET.ATG" out condition); -#line 2499 "VBNET.ATG" +#line 2504 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); while (la.kind == 60) { lexer.NextToken(); JoinCondition( -#line 2501 "VBNET.ATG" +#line 2506 "VBNET.ATG" out condition); -#line 2502 "VBNET.ATG" +#line 2507 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); } -#line 2505 "VBNET.ATG" +#line 2510 "VBNET.ATG" joinClause.EndLocation = t.EndLocation; } void GroupJoinQueryOperator( -#line 2335 "VBNET.ATG" +#line 2340 "VBNET.ATG" out QueryExpressionGroupJoinVBClause groupJoinClause) { -#line 2337 "VBNET.ATG" +#line 2342 "VBNET.ATG" groupJoinClause = new QueryExpressionGroupJoinVBClause(); groupJoinClause.StartLocation = la.Location; QueryExpressionJoinVBClause joinClause = null; Expect(133); JoinQueryOperator( -#line 2341 "VBNET.ATG" +#line 2346 "VBNET.ATG" out joinClause); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2342 "VBNET.ATG" +#line 2347 "VBNET.ATG" groupJoinClause.IntoVariables); -#line 2344 "VBNET.ATG" +#line 2349 "VBNET.ATG" groupJoinClause.JoinClause = joinClause; groupJoinClause.EndLocation = t.EndLocation; } void GroupByQueryOperator( -#line 2322 "VBNET.ATG" +#line 2327 "VBNET.ATG" out QueryExpressionGroupVBClause groupByClause) { -#line 2324 "VBNET.ATG" +#line 2329 "VBNET.ATG" groupByClause = new QueryExpressionGroupVBClause(); groupByClause.StartLocation = la.Location; Expect(133); ExpressionRangeVariableDeclarationList( -#line 2327 "VBNET.ATG" +#line 2332 "VBNET.ATG" groupByClause.GroupVariables); Expect(70); ExpressionRangeVariableDeclarationList( -#line 2328 "VBNET.ATG" +#line 2333 "VBNET.ATG" groupByClause.ByVariables); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2329 "VBNET.ATG" +#line 2334 "VBNET.ATG" groupByClause.IntoVariables); -#line 2331 "VBNET.ATG" +#line 2336 "VBNET.ATG" groupByClause.EndLocation = t.EndLocation; } void OrderExpressionList( -#line 2291 "VBNET.ATG" +#line 2296 "VBNET.ATG" out List orderings) { -#line 2293 "VBNET.ATG" +#line 2298 "VBNET.ATG" orderings = new List(); QueryExpressionOrdering ordering = null; OrderExpression( -#line 2296 "VBNET.ATG" +#line 2301 "VBNET.ATG" out ordering); -#line 2297 "VBNET.ATG" +#line 2302 "VBNET.ATG" orderings.Add(ordering); while (la.kind == 22) { lexer.NextToken(); OrderExpression( -#line 2299 "VBNET.ATG" +#line 2304 "VBNET.ATG" out ordering); -#line 2300 "VBNET.ATG" +#line 2305 "VBNET.ATG" orderings.Add(ordering); } } void OrderExpression( -#line 2304 "VBNET.ATG" +#line 2309 "VBNET.ATG" out QueryExpressionOrdering ordering) { -#line 2306 "VBNET.ATG" +#line 2311 "VBNET.ATG" ordering = new QueryExpressionOrdering(); ordering.StartLocation = la.Location; ordering.Direction = QueryExpressionOrderingDirection.None; Expression orderExpr = null; Expr( -#line 2311 "VBNET.ATG" +#line 2316 "VBNET.ATG" out orderExpr); -#line 2313 "VBNET.ATG" +#line 2318 "VBNET.ATG" ordering.Criteria = orderExpr; if (la.kind == 64 || la.kind == 104) { if (la.kind == 64) { lexer.NextToken(); -#line 2316 "VBNET.ATG" +#line 2321 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Ascending; } else { lexer.NextToken(); -#line 2317 "VBNET.ATG" +#line 2322 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Descending; } } -#line 2319 "VBNET.ATG" +#line 2324 "VBNET.ATG" ordering.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclarationList( -#line 2450 "VBNET.ATG" +#line 2455 "VBNET.ATG" List variables) { -#line 2452 "VBNET.ATG" +#line 2457 "VBNET.ATG" ExpressionRangeVariable variable = null; ExpressionRangeVariableDeclaration( -#line 2454 "VBNET.ATG" +#line 2459 "VBNET.ATG" out variable); -#line 2455 "VBNET.ATG" +#line 2460 "VBNET.ATG" variables.Add(variable); while (la.kind == 22) { lexer.NextToken(); ExpressionRangeVariableDeclaration( -#line 2456 "VBNET.ATG" +#line 2461 "VBNET.ATG" out variable); -#line 2456 "VBNET.ATG" +#line 2461 "VBNET.ATG" variables.Add(variable); } } void CollectionRangeVariableDeclarationList( -#line 2509 "VBNET.ATG" +#line 2514 "VBNET.ATG" List rangeVariables) { -#line 2510 "VBNET.ATG" +#line 2515 "VBNET.ATG" CollectionRangeVariable variableDeclaration; CollectionRangeVariableDeclaration( -#line 2512 "VBNET.ATG" +#line 2517 "VBNET.ATG" out variableDeclaration); -#line 2513 "VBNET.ATG" +#line 2518 "VBNET.ATG" rangeVariables.Add(variableDeclaration); while (la.kind == 22) { lexer.NextToken(); CollectionRangeVariableDeclaration( -#line 2514 "VBNET.ATG" +#line 2519 "VBNET.ATG" out variableDeclaration); -#line 2514 "VBNET.ATG" +#line 2519 "VBNET.ATG" rangeVariables.Add(variableDeclaration); } } void CollectionRangeVariableDeclaration( -#line 2517 "VBNET.ATG" +#line 2522 "VBNET.ATG" out CollectionRangeVariable rangeVariable) { -#line 2519 "VBNET.ATG" +#line 2524 "VBNET.ATG" rangeVariable = new CollectionRangeVariable(); rangeVariable.StartLocation = la.Location; TypeReference typeName = null; @@ -6667,71 +6673,71 @@ out CollectionRangeVariable rangeVariable) { Identifier(); -#line 2524 "VBNET.ATG" +#line 2529 "VBNET.ATG" rangeVariable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2525 "VBNET.ATG" +#line 2530 "VBNET.ATG" out typeName); -#line 2525 "VBNET.ATG" +#line 2530 "VBNET.ATG" rangeVariable.Type = typeName; } Expect(138); Expr( -#line 2526 "VBNET.ATG" +#line 2531 "VBNET.ATG" out inExpr); -#line 2528 "VBNET.ATG" +#line 2533 "VBNET.ATG" rangeVariable.Expression = inExpr; rangeVariable.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclaration( -#line 2459 "VBNET.ATG" +#line 2464 "VBNET.ATG" out ExpressionRangeVariable variable) { -#line 2461 "VBNET.ATG" +#line 2466 "VBNET.ATG" variable = new ExpressionRangeVariable(); variable.StartLocation = la.Location; Expression rhs = null; TypeReference typeName = null; if ( -#line 2467 "VBNET.ATG" +#line 2472 "VBNET.ATG" IsIdentifiedExpressionRange()) { Identifier(); -#line 2468 "VBNET.ATG" +#line 2473 "VBNET.ATG" variable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2470 "VBNET.ATG" +#line 2475 "VBNET.ATG" out typeName); -#line 2471 "VBNET.ATG" +#line 2476 "VBNET.ATG" variable.Type = typeName; } Expect(20); } Expr( -#line 2475 "VBNET.ATG" +#line 2480 "VBNET.ATG" out rhs); -#line 2477 "VBNET.ATG" +#line 2482 "VBNET.ATG" variable.Expression = rhs; variable.EndLocation = t.EndLocation; } void JoinCondition( -#line 2533 "VBNET.ATG" +#line 2538 "VBNET.ATG" out QueryExpressionJoinConditionVB condition) { -#line 2535 "VBNET.ATG" +#line 2540 "VBNET.ATG" condition = new QueryExpressionJoinConditionVB(); condition.StartLocation = la.Location; @@ -6739,14 +6745,14 @@ out QueryExpressionJoinConditionVB condition) { Expression rhs = null; Expr( -#line 2541 "VBNET.ATG" +#line 2546 "VBNET.ATG" out lhs); Expect(116); Expr( -#line 2541 "VBNET.ATG" +#line 2546 "VBNET.ATG" out rhs); -#line 2543 "VBNET.ATG" +#line 2548 "VBNET.ATG" condition.LeftSide = lhs; condition.RightSide = rhs; condition.EndLocation = t.EndLocation; @@ -6754,68 +6760,68 @@ out rhs); } void Argument( -#line 2607 "VBNET.ATG" +#line 2612 "VBNET.ATG" out Expression argumentexpr) { -#line 2609 "VBNET.ATG" +#line 2614 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 2613 "VBNET.ATG" +#line 2618 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 2613 "VBNET.ATG" +#line 2618 "VBNET.ATG" name = t.val; Expect(55); Expr( -#line 2613 "VBNET.ATG" +#line 2618 "VBNET.ATG" out expr); -#line 2615 "VBNET.ATG" +#line 2620 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); } else if (StartOf(30)) { Expr( -#line 2618 "VBNET.ATG" +#line 2623 "VBNET.ATG" out argumentexpr); } else SynErr(305); } void QualIdentAndTypeArguments( -#line 2684 "VBNET.ATG" +#line 2689 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2685 "VBNET.ATG" +#line 2690 "VBNET.ATG" string name; typeref = null; Qualident( -#line 2687 "VBNET.ATG" +#line 2692 "VBNET.ATG" out name); -#line 2688 "VBNET.ATG" +#line 2693 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 2689 "VBNET.ATG" +#line 2694 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); if ( -#line 2691 "VBNET.ATG" +#line 2696 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2692 "VBNET.ATG" +#line 2697 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 22) { lexer.NextToken(); -#line 2693 "VBNET.ATG" +#line 2698 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } } else if (StartOf(8)) { TypeArgumentList( -#line 2694 "VBNET.ATG" +#line 2699 "VBNET.ATG" typeref.GenericTypes); } else SynErr(306); Expect(38); @@ -6823,24 +6829,24 @@ typeref.GenericTypes); } void RankList( -#line 2731 "VBNET.ATG" +#line 2736 "VBNET.ATG" out int i) { -#line 2732 "VBNET.ATG" +#line 2737 "VBNET.ATG" i = 0; while (la.kind == 22) { lexer.NextToken(); -#line 2733 "VBNET.ATG" +#line 2738 "VBNET.ATG" ++i; } } void Attribute( -#line 2772 "VBNET.ATG" +#line 2777 "VBNET.ATG" out ASTAttribute attribute) { -#line 2773 "VBNET.ATG" +#line 2778 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -6850,40 +6856,40 @@ out ASTAttribute attribute) { Expect(26); } Qualident( -#line 2778 "VBNET.ATG" +#line 2783 "VBNET.ATG" out name); if (la.kind == 37) { AttributeArguments( -#line 2779 "VBNET.ATG" +#line 2784 "VBNET.ATG" positional, named); } -#line 2781 "VBNET.ATG" +#line 2786 "VBNET.ATG" attribute = new ASTAttribute(name, positional, named); } void AttributeArguments( -#line 2786 "VBNET.ATG" +#line 2791 "VBNET.ATG" List positional, List named) { -#line 2788 "VBNET.ATG" +#line 2793 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(37); if ( -#line 2794 "VBNET.ATG" +#line 2799 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2796 "VBNET.ATG" +#line 2801 "VBNET.ATG" IsNamedAssign()) { -#line 2796 "VBNET.ATG" +#line 2801 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2797 "VBNET.ATG" +#line 2802 "VBNET.ATG" out name); if (la.kind == 55) { lexer.NextToken(); @@ -6892,10 +6898,10 @@ out name); } else SynErr(307); } Expr( -#line 2799 "VBNET.ATG" +#line 2804 "VBNET.ATG" out expr); -#line 2801 "VBNET.ATG" +#line 2806 "VBNET.ATG" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } @@ -6904,13 +6910,13 @@ out expr); while (la.kind == 22) { lexer.NextToken(); if ( -#line 2809 "VBNET.ATG" +#line 2814 "VBNET.ATG" IsNamedAssign()) { -#line 2809 "VBNET.ATG" +#line 2814 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2810 "VBNET.ATG" +#line 2815 "VBNET.ATG" out name); if (la.kind == 55) { lexer.NextToken(); @@ -6919,14 +6925,14 @@ out name); } else SynErr(308); } else if (StartOf(30)) { -#line 2812 "VBNET.ATG" +#line 2817 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); } else SynErr(309); Expr( -#line 2813 "VBNET.ATG" +#line 2818 "VBNET.ATG" out expr); -#line 2813 "VBNET.ATG" +#line 2818 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -6937,10 +6943,10 @@ out expr); } void FormalParameter( -#line 2870 "VBNET.ATG" +#line 2875 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2872 "VBNET.ATG" +#line 2877 "VBNET.ATG" AttributeSection section; List attributes = new List(); TypeReference type = null; @@ -6951,36 +6957,36 @@ out ParameterDeclarationExpression p) { while (la.kind == 40) { AttributeSection( -#line 2881 "VBNET.ATG" +#line 2886 "VBNET.ATG" out section); -#line 2881 "VBNET.ATG" +#line 2886 "VBNET.ATG" attributes.Add(section); } while (StartOf(48)) { ParameterModifier( -#line 2882 "VBNET.ATG" +#line 2887 "VBNET.ATG" mod); } Identifier(); -#line 2883 "VBNET.ATG" +#line 2888 "VBNET.ATG" string parameterName = t.val; if ( -#line 2884 "VBNET.ATG" +#line 2889 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2884 "VBNET.ATG" +#line 2889 "VBNET.ATG" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2885 "VBNET.ATG" +#line 2890 "VBNET.ATG" out type); } -#line 2887 "VBNET.ATG" +#line 2892 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -6994,11 +7000,11 @@ out type); if (la.kind == 20) { lexer.NextToken(); Expr( -#line 2897 "VBNET.ATG" +#line 2902 "VBNET.ATG" out expr); } -#line 2899 "VBNET.ATG" +#line 2904 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); p.Attributes = attributes; @@ -7006,34 +7012,34 @@ out expr); } void ParameterModifier( -#line 3583 "VBNET.ATG" +#line 3588 "VBNET.ATG" ParamModifierList m) { if (la.kind == 72) { lexer.NextToken(); -#line 3584 "VBNET.ATG" +#line 3589 "VBNET.ATG" m.Add(ParameterModifiers.In); } else if (la.kind == 69) { lexer.NextToken(); -#line 3585 "VBNET.ATG" +#line 3590 "VBNET.ATG" m.Add(ParameterModifiers.Ref); } else if (la.kind == 174) { lexer.NextToken(); -#line 3586 "VBNET.ATG" +#line 3591 "VBNET.ATG" m.Add(ParameterModifiers.Optional); } else if (la.kind == 182) { lexer.NextToken(); -#line 3587 "VBNET.ATG" +#line 3592 "VBNET.ATG" m.Add(ParameterModifiers.Params); } else SynErr(310); } void Statement() { -#line 2928 "VBNET.ATG" +#line 2933 "VBNET.ATG" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -7041,27 +7047,27 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 21) { } else if ( -#line 2934 "VBNET.ATG" +#line 2939 "VBNET.ATG" IsLabel()) { LabelName( -#line 2934 "VBNET.ATG" +#line 2939 "VBNET.ATG" out label); -#line 2936 "VBNET.ATG" +#line 2941 "VBNET.ATG" AddChild(new LabelStatement(t.val)); Expect(21); Statement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 2939 "VBNET.ATG" +#line 2944 "VBNET.ATG" out stmt); -#line 2939 "VBNET.ATG" +#line 2944 "VBNET.ATG" AddChild(stmt); } else SynErr(311); -#line 2942 "VBNET.ATG" +#line 2947 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -7070,30 +7076,30 @@ out stmt); } void LabelName( -#line 3357 "VBNET.ATG" +#line 3362 "VBNET.ATG" out string name) { -#line 3359 "VBNET.ATG" +#line 3364 "VBNET.ATG" name = String.Empty; if (StartOf(4)) { Identifier(); -#line 3361 "VBNET.ATG" +#line 3366 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 3362 "VBNET.ATG" +#line 3367 "VBNET.ATG" name = t.val; } else SynErr(312); } void LocalDeclarationStatement( -#line 2950 "VBNET.ATG" +#line 2955 "VBNET.ATG" out Statement statement) { -#line 2952 "VBNET.ATG" +#line 2957 "VBNET.ATG" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -7102,22 +7108,22 @@ out Statement statement) { if (la.kind == 88) { lexer.NextToken(); -#line 2958 "VBNET.ATG" +#line 2963 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); } else if (la.kind == 204) { lexer.NextToken(); -#line 2959 "VBNET.ATG" +#line 2964 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 2960 "VBNET.ATG" +#line 2965 "VBNET.ATG" dimfound = true; } } -#line 2963 "VBNET.ATG" +#line 2968 "VBNET.ATG" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -7130,135 +7136,135 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2974 "VBNET.ATG" +#line 2979 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 2975 "VBNET.ATG" +#line 2980 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2977 "VBNET.ATG" +#line 2982 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 3471 "VBNET.ATG" +#line 3476 "VBNET.ATG" out Statement tryStatement) { -#line 3473 "VBNET.ATG" +#line 3478 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(218); EndOfStmt(); Block( -#line 3476 "VBNET.ATG" +#line 3481 "VBNET.ATG" out blockStmt); if (la.kind == 75 || la.kind == 113 || la.kind == 123) { CatchClauses( -#line 3477 "VBNET.ATG" +#line 3482 "VBNET.ATG" out catchClauses); } if (la.kind == 123) { lexer.NextToken(); EndOfStmt(); Block( -#line 3478 "VBNET.ATG" +#line 3483 "VBNET.ATG" out finallyStmt); } Expect(113); Expect(218); -#line 3481 "VBNET.ATG" +#line 3486 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 3451 "VBNET.ATG" +#line 3456 "VBNET.ATG" out Statement withStatement) { -#line 3453 "VBNET.ATG" +#line 3458 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(233); -#line 3456 "VBNET.ATG" +#line 3461 "VBNET.ATG" Location start = t.Location; Expr( -#line 3457 "VBNET.ATG" +#line 3462 "VBNET.ATG" out expr); EndOfStmt(); -#line 3459 "VBNET.ATG" +#line 3464 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 3462 "VBNET.ATG" +#line 3467 "VBNET.ATG" out blockStmt); -#line 3464 "VBNET.ATG" +#line 3469 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; Expect(113); Expect(233); -#line 3467 "VBNET.ATG" +#line 3472 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 3444 "VBNET.ATG" +#line 3449 "VBNET.ATG" out ConditionType conditionType) { -#line 3445 "VBNET.ATG" +#line 3450 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 231) { lexer.NextToken(); -#line 3446 "VBNET.ATG" +#line 3451 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 224) { lexer.NextToken(); -#line 3447 "VBNET.ATG" +#line 3452 "VBNET.ATG" conditionType = ConditionType.Until; } else SynErr(313); } void LoopControlVariable( -#line 3287 "VBNET.ATG" +#line 3292 "VBNET.ATG" out TypeReference type, out string name) { -#line 3288 "VBNET.ATG" +#line 3293 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 3292 "VBNET.ATG" +#line 3297 "VBNET.ATG" out name); if ( -#line 3293 "VBNET.ATG" +#line 3298 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 3293 "VBNET.ATG" +#line 3298 "VBNET.ATG" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3294 "VBNET.ATG" +#line 3299 "VBNET.ATG" out type); -#line 3294 "VBNET.ATG" +#line 3299 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 3296 "VBNET.ATG" +#line 3301 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -7270,34 +7276,34 @@ out type); } void ReDimClause( -#line 3366 "VBNET.ATG" +#line 3371 "VBNET.ATG" out Expression expr) { SimpleNonInvocationExpression( -#line 3368 "VBNET.ATG" +#line 3373 "VBNET.ATG" out expr); ReDimClauseInternal( -#line 3369 "VBNET.ATG" +#line 3374 "VBNET.ATG" ref expr); } void SingleLineStatementList( -#line 3273 "VBNET.ATG" +#line 3278 "VBNET.ATG" List list) { -#line 3274 "VBNET.ATG" +#line 3279 "VBNET.ATG" Statement embeddedStatement = null; if (la.kind == 113) { lexer.NextToken(); -#line 3276 "VBNET.ATG" +#line 3281 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 3277 "VBNET.ATG" +#line 3282 "VBNET.ATG" out embeddedStatement); } else SynErr(314); -#line 3278 "VBNET.ATG" +#line 3283 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); while (la.kind == 21) { lexer.NextToken(); @@ -7307,62 +7313,62 @@ out embeddedStatement); if (la.kind == 113) { lexer.NextToken(); -#line 3280 "VBNET.ATG" +#line 3285 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 3281 "VBNET.ATG" +#line 3286 "VBNET.ATG" out embeddedStatement); } else SynErr(315); -#line 3282 "VBNET.ATG" +#line 3287 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); } } void CaseClauses( -#line 3404 "VBNET.ATG" +#line 3409 "VBNET.ATG" out List caseClauses) { -#line 3406 "VBNET.ATG" +#line 3411 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 3409 "VBNET.ATG" +#line 3414 "VBNET.ATG" out caseClause); -#line 3409 "VBNET.ATG" +#line 3414 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 22) { lexer.NextToken(); CaseClause( -#line 3410 "VBNET.ATG" +#line 3415 "VBNET.ATG" out caseClause); -#line 3410 "VBNET.ATG" +#line 3415 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 3307 "VBNET.ATG" +#line 3312 "VBNET.ATG" out OnErrorStatement stmt) { -#line 3309 "VBNET.ATG" +#line 3314 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(171); Expect(118); if ( -#line 3315 "VBNET.ATG" +#line 3320 "VBNET.ATG" IsNegativeLabelName()) { Expect(132); Expect(30); Expect(5); -#line 3317 "VBNET.ATG" +#line 3322 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -7371,10 +7377,10 @@ IsNegativeLabelName()) { } else if (la.kind == 132) { GotoStatement( -#line 3323 "VBNET.ATG" +#line 3328 "VBNET.ATG" out goToStatement); -#line 3325 "VBNET.ATG" +#line 3330 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -7391,88 +7397,88 @@ out goToStatement); lexer.NextToken(); Expect(163); -#line 3339 "VBNET.ATG" +#line 3344 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); } else SynErr(316); } void GotoStatement( -#line 3345 "VBNET.ATG" +#line 3350 "VBNET.ATG" out GotoStatement goToStatement) { -#line 3347 "VBNET.ATG" +#line 3352 "VBNET.ATG" string label = String.Empty; Expect(132); LabelName( -#line 3350 "VBNET.ATG" +#line 3355 "VBNET.ATG" out label); -#line 3352 "VBNET.ATG" +#line 3357 "VBNET.ATG" goToStatement = new GotoStatement(label); } void ResumeStatement( -#line 3393 "VBNET.ATG" +#line 3398 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 3395 "VBNET.ATG" +#line 3400 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 3398 "VBNET.ATG" +#line 3403 "VBNET.ATG" IsResumeNext()) { Expect(194); Expect(163); -#line 3399 "VBNET.ATG" +#line 3404 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 194) { lexer.NextToken(); if (StartOf(50)) { LabelName( -#line 3400 "VBNET.ATG" +#line 3405 "VBNET.ATG" out label); } -#line 3400 "VBNET.ATG" +#line 3405 "VBNET.ATG" resumeStatement = new ResumeStatement(label); } else SynErr(317); } void ReDimClauseInternal( -#line 3372 "VBNET.ATG" +#line 3377 "VBNET.ATG" ref Expression expr) { -#line 3373 "VBNET.ATG" +#line 3378 "VBNET.ATG" List arguments; bool canBeNormal; bool canBeRedim; string name; while (la.kind == 26 || -#line 3376 "VBNET.ATG" +#line 3381 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { if (la.kind == 26) { lexer.NextToken(); IdentifierOrKeyword( -#line 3375 "VBNET.ATG" +#line 3380 "VBNET.ATG" out name); -#line 3375 "VBNET.ATG" +#line 3380 "VBNET.ATG" expr = new MemberReferenceExpression(expr, name); } else { InvocationExpression( -#line 3377 "VBNET.ATG" +#line 3382 "VBNET.ATG" ref expr); } } Expect(37); NormalOrReDimArgumentList( -#line 3380 "VBNET.ATG" +#line 3385 "VBNET.ATG" out arguments, out canBeNormal, out canBeRedim); Expect(38); -#line 3382 "VBNET.ATG" +#line 3387 "VBNET.ATG" expr = new InvocationExpression(expr, arguments); if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { if (this.Errors.Count == 0) { @@ -7484,10 +7490,10 @@ out arguments, out canBeNormal, out canBeRedim); } void CaseClause( -#line 3414 "VBNET.ATG" +#line 3419 "VBNET.ATG" out CaseLabel caseClause) { -#line 3416 "VBNET.ATG" +#line 3421 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -7496,7 +7502,7 @@ out CaseLabel caseClause) { if (la.kind == 111) { lexer.NextToken(); -#line 3422 "VBNET.ATG" +#line 3427 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(51)) { if (la.kind == 144) { @@ -7506,76 +7512,76 @@ out CaseLabel caseClause) { case 40: { lexer.NextToken(); -#line 3426 "VBNET.ATG" +#line 3431 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 39: { lexer.NextToken(); -#line 3427 "VBNET.ATG" +#line 3432 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 43: { lexer.NextToken(); -#line 3428 "VBNET.ATG" +#line 3433 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 42: { lexer.NextToken(); -#line 3429 "VBNET.ATG" +#line 3434 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 20: { lexer.NextToken(); -#line 3430 "VBNET.ATG" +#line 3435 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 41: { lexer.NextToken(); -#line 3431 "VBNET.ATG" +#line 3436 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } default: SynErr(318); break; } Expr( -#line 3433 "VBNET.ATG" +#line 3438 "VBNET.ATG" out expr); -#line 3435 "VBNET.ATG" +#line 3440 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(30)) { Expr( -#line 3437 "VBNET.ATG" +#line 3442 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); Expr( -#line 3437 "VBNET.ATG" +#line 3442 "VBNET.ATG" out sexpr); } -#line 3439 "VBNET.ATG" +#line 3444 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); } else SynErr(319); } void CatchClauses( -#line 3486 "VBNET.ATG" +#line 3491 "VBNET.ATG" out List catchClauses) { -#line 3488 "VBNET.ATG" +#line 3493 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -7587,27 +7593,27 @@ out List catchClauses) { if (StartOf(4)) { Identifier(); -#line 3496 "VBNET.ATG" +#line 3501 "VBNET.ATG" name = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3496 "VBNET.ATG" +#line 3501 "VBNET.ATG" out type); } } if (la.kind == 229) { lexer.NextToken(); Expr( -#line 3497 "VBNET.ATG" +#line 3502 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 3499 "VBNET.ATG" +#line 3504 "VBNET.ATG" out blockStmt); -#line 3500 "VBNET.ATG" +#line 3505 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index deaf6ddc35..f892d0df4e 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -1772,10 +1772,8 @@ SimpleNonInvocationExpression XmlLiteralExpression (. - XmlLiteralExpression expr = new XmlLiteralExpression(); - List exprs = expr.Expressions; + List exprs = new List(); XmlExpression currentExpression = null; - pexpr = expr; .) = ( @@ -1783,6 +1781,13 @@ XmlLiteralExpression | XmlElement (. exprs.Add(currentExpression); .) { XmlContentExpression } ) + (. + if (exprs.Count > 1) { + pexpr = new XmlDocumentExpression() { Expressions = exprs }; + } else { + pexpr = exprs[0]; + } + .) . XmlContentExpression exprs> = diff --git a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs index 7025bfa62e..33e83bc74d 100644 --- a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs @@ -537,8 +537,8 @@ namespace ICSharpCode.NRefactory.PrettyPrinter public override object TrackedVisitOptionDeclaration(OptionDeclaration optionDeclaration, object data) { - if ((optionDeclaration.OptionType == OptionType.Explicit || optionDeclaration.OptionType == OptionType.Strict) - && optionDeclaration.OptionValue == true) + if (((optionDeclaration.OptionType == OptionType.Explicit || optionDeclaration.OptionType == OptionType.Strict) + && optionDeclaration.OptionValue == true) || optionDeclaration.OptionType == OptionType.Infer) { // Explicit On/Strict On is what C# does, do not report an error } else { diff --git a/src/Libraries/NRefactory/Project/Src/Visitors/AbstractASTVisitor.cs b/src/Libraries/NRefactory/Project/Src/Visitors/AbstractASTVisitor.cs index cdc93a674b..875e2b5928 100644 --- a/src/Libraries/NRefactory/Project/Src/Visitors/AbstractASTVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Visitors/AbstractASTVisitor.cs @@ -1262,6 +1262,16 @@ namespace ICSharpCode.NRefactory.Visitors { return null; } + public virtual object VisitXmlDocumentExpression(XmlDocumentExpression xmlDocumentExpression, object data) { + Debug.Assert((xmlDocumentExpression != null)); + Debug.Assert((xmlDocumentExpression.Expressions != null)); + foreach (XmlExpression o in xmlDocumentExpression.Expressions) { + Debug.Assert(o != null); + o.AcceptVisitor(this, data); + } + return null; + } + public virtual object VisitXmlElementExpression(XmlElementExpression xmlElementExpression, object data) { Debug.Assert((xmlElementExpression != null)); Debug.Assert((xmlElementExpression.Content != null)); @@ -1282,16 +1292,6 @@ namespace ICSharpCode.NRefactory.Visitors { return xmlEmbeddedExpression.InlineVBExpression.AcceptVisitor(this, data); } - public virtual object VisitXmlLiteralExpression(XmlLiteralExpression xmlLiteralExpression, object data) { - Debug.Assert((xmlLiteralExpression != null)); - Debug.Assert((xmlLiteralExpression.Expressions != null)); - foreach (XmlExpression o in xmlLiteralExpression.Expressions) { - Debug.Assert(o != null); - o.AcceptVisitor(this, data); - } - return null; - } - public virtual object VisitXmlMemberAccessExpression(XmlMemberAccessExpression xmlMemberAccessExpression, object data) { Debug.Assert((xmlMemberAccessExpression != null)); Debug.Assert((xmlMemberAccessExpression.TargetObject != null)); diff --git a/src/Libraries/NRefactory/Project/Src/Visitors/AbstractAstTransformer.cs b/src/Libraries/NRefactory/Project/Src/Visitors/AbstractAstTransformer.cs index 201beae949..7aab97572a 100644 --- a/src/Libraries/NRefactory/Project/Src/Visitors/AbstractAstTransformer.cs +++ b/src/Libraries/NRefactory/Project/Src/Visitors/AbstractAstTransformer.cs @@ -2258,6 +2258,23 @@ namespace ICSharpCode.NRefactory.Visitors { return null; } + public virtual object VisitXmlDocumentExpression(XmlDocumentExpression xmlDocumentExpression, object data) { + Debug.Assert((xmlDocumentExpression != null)); + Debug.Assert((xmlDocumentExpression.Expressions != null)); + for (int i = 0; i < xmlDocumentExpression.Expressions.Count; i++) { + XmlExpression o = xmlDocumentExpression.Expressions[i]; + Debug.Assert(o != null); + nodeStack.Push(o); + o.AcceptVisitor(this, data); + o = (XmlExpression)nodeStack.Pop(); + if (o == null) + xmlDocumentExpression.Expressions.RemoveAt(i--); + else + xmlDocumentExpression.Expressions[i] = o; + } + return null; + } + public virtual object VisitXmlElementExpression(XmlElementExpression xmlElementExpression, object data) { Debug.Assert((xmlElementExpression != null)); Debug.Assert((xmlElementExpression.Content != null)); @@ -2303,23 +2320,6 @@ namespace ICSharpCode.NRefactory.Visitors { return null; } - public virtual object VisitXmlLiteralExpression(XmlLiteralExpression xmlLiteralExpression, object data) { - Debug.Assert((xmlLiteralExpression != null)); - Debug.Assert((xmlLiteralExpression.Expressions != null)); - for (int i = 0; i < xmlLiteralExpression.Expressions.Count; i++) { - XmlExpression o = xmlLiteralExpression.Expressions[i]; - Debug.Assert(o != null); - nodeStack.Push(o); - o.AcceptVisitor(this, data); - o = (XmlExpression)nodeStack.Pop(); - if (o == null) - xmlLiteralExpression.Expressions.RemoveAt(i--); - else - xmlLiteralExpression.Expressions[i] = o; - } - return null; - } - public virtual object VisitXmlMemberAccessExpression(XmlMemberAccessExpression xmlMemberAccessExpression, object data) { Debug.Assert((xmlMemberAccessExpression != null)); Debug.Assert((xmlMemberAccessExpression.TargetObject != null)); diff --git a/src/Libraries/NRefactory/Project/Src/Visitors/NodeTrackingAstVisitor.cs b/src/Libraries/NRefactory/Project/Src/Visitors/NodeTrackingAstVisitor.cs index a65c33c038..26bde2b941 100644 --- a/src/Libraries/NRefactory/Project/Src/Visitors/NodeTrackingAstVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Visitors/NodeTrackingAstVisitor.cs @@ -906,6 +906,13 @@ namespace ICSharpCode.NRefactory.Visitors { return result; } + public sealed override object VisitXmlDocumentExpression(XmlDocumentExpression xmlDocumentExpression, object data) { + this.BeginVisit(xmlDocumentExpression); + object result = this.TrackedVisitXmlDocumentExpression(xmlDocumentExpression, data); + this.EndVisit(xmlDocumentExpression); + return result; + } + public sealed override object VisitXmlElementExpression(XmlElementExpression xmlElementExpression, object data) { this.BeginVisit(xmlElementExpression); object result = this.TrackedVisitXmlElementExpression(xmlElementExpression, data); @@ -920,13 +927,6 @@ namespace ICSharpCode.NRefactory.Visitors { return result; } - public sealed override object VisitXmlLiteralExpression(XmlLiteralExpression xmlLiteralExpression, object data) { - this.BeginVisit(xmlLiteralExpression); - object result = this.TrackedVisitXmlLiteralExpression(xmlLiteralExpression, data); - this.EndVisit(xmlLiteralExpression); - return result; - } - public sealed override object VisitXmlMemberAccessExpression(XmlMemberAccessExpression xmlMemberAccessExpression, object data) { this.BeginVisit(xmlMemberAccessExpression); object result = this.TrackedVisitXmlMemberAccessExpression(xmlMemberAccessExpression, data); @@ -1441,6 +1441,10 @@ namespace ICSharpCode.NRefactory.Visitors { return base.VisitXmlContentExpression(xmlContentExpression, data); } + public virtual object TrackedVisitXmlDocumentExpression(XmlDocumentExpression xmlDocumentExpression, object data) { + return base.VisitXmlDocumentExpression(xmlDocumentExpression, data); + } + public virtual object TrackedVisitXmlElementExpression(XmlElementExpression xmlElementExpression, object data) { return base.VisitXmlElementExpression(xmlElementExpression, data); } @@ -1449,10 +1453,6 @@ namespace ICSharpCode.NRefactory.Visitors { return base.VisitXmlEmbeddedExpression(xmlEmbeddedExpression, data); } - public virtual object TrackedVisitXmlLiteralExpression(XmlLiteralExpression xmlLiteralExpression, object data) { - return base.VisitXmlLiteralExpression(xmlLiteralExpression, data); - } - public virtual object TrackedVisitXmlMemberAccessExpression(XmlMemberAccessExpression xmlMemberAccessExpression, object data) { return base.VisitXmlMemberAccessExpression(xmlMemberAccessExpression, data); } diff --git a/src/Libraries/NRefactory/Project/Src/Visitors/NotImplementedAstVisitor.cs b/src/Libraries/NRefactory/Project/Src/Visitors/NotImplementedAstVisitor.cs index e0603d2dff..4adc9b2677 100644 --- a/src/Libraries/NRefactory/Project/Src/Visitors/NotImplementedAstVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Visitors/NotImplementedAstVisitor.cs @@ -518,6 +518,10 @@ namespace ICSharpCode.NRefactory.Visitors { throw new global::System.NotImplementedException("XmlContentExpression"); } + public virtual object VisitXmlDocumentExpression(XmlDocumentExpression xmlDocumentExpression, object data) { + throw new global::System.NotImplementedException("XmlDocumentExpression"); + } + public virtual object VisitXmlElementExpression(XmlElementExpression xmlElementExpression, object data) { throw new global::System.NotImplementedException("XmlElementExpression"); } @@ -526,10 +530,6 @@ namespace ICSharpCode.NRefactory.Visitors { throw new global::System.NotImplementedException("XmlEmbeddedExpression"); } - public virtual object VisitXmlLiteralExpression(XmlLiteralExpression xmlLiteralExpression, object data) { - throw new global::System.NotImplementedException("XmlLiteralExpression"); - } - public virtual object VisitXmlMemberAccessExpression(XmlMemberAccessExpression xmlMemberAccessExpression, object data) { throw new global::System.NotImplementedException("XmlMemberAccessExpression"); } diff --git a/src/Libraries/NRefactory/Project/Src/Visitors/VBNetConstructsConvertVisitor.cs b/src/Libraries/NRefactory/Project/Src/Visitors/VBNetConstructsConvertVisitor.cs index e188c3472c..89459f4c6b 100644 --- a/src/Libraries/NRefactory/Project/Src/Visitors/VBNetConstructsConvertVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Visitors/VBNetConstructsConvertVisitor.cs @@ -36,6 +36,10 @@ namespace ICSharpCode.NRefactory.Visitors /// public bool AddDefaultValueInitializerToLocalVariableDeclarations = true; + public bool OptionInfer { get; set; } + + public bool OptionStrict { get; set; } + Dictionary usings; List addedUsings; TypeDeclaration currentTypeDeclaration; @@ -492,16 +496,33 @@ namespace ICSharpCode.NRefactory.Visitors public override object VisitLocalVariableDeclaration(LocalVariableDeclaration localVariableDeclaration, object data) { - if (AddDefaultValueInitializerToLocalVariableDeclarations && (localVariableDeclaration.Modifier & Modifiers.Static) == 0) { - for (int i = 0; i < localVariableDeclaration.Variables.Count; i++) { - VariableDeclaration decl = localVariableDeclaration.Variables[i]; - if (decl.FixedArrayInitialization.IsNull && decl.Initializer.IsNull) { - TypeReference type = localVariableDeclaration.GetTypeForVariable(i); - decl.Initializer = ExpressionBuilder.CreateDefaultValueForType(type); - } + for (int i = 0; i < localVariableDeclaration.Variables.Count; i++) { + VariableDeclaration decl = localVariableDeclaration.Variables[i]; + if (AddDefaultValueInitializerToLocalVariableDeclarations && + (localVariableDeclaration.Modifier & Modifiers.Static) == 0 && + decl.FixedArrayInitialization.IsNull && decl.Initializer.IsNull) { + TypeReference type = localVariableDeclaration.GetTypeForVariable(i); + decl.Initializer = ExpressionBuilder.CreateDefaultValueForType(type); + } + if (decl.TypeReference.IsNull) { + if (OptionInfer && !(decl.Initializer is PrimitiveExpression && (decl.Initializer as PrimitiveExpression).Value == null)) + decl.TypeReference = new TypeReference("var", true); + else if (OptionStrict) + decl.TypeReference = new TypeReference("System.Object", true); + else + decl.TypeReference = new TypeReference("dynamic", true); } } return base.VisitLocalVariableDeclaration(localVariableDeclaration, data); } + + public override object VisitOptionDeclaration(OptionDeclaration optionDeclaration, object data) + { + if (optionDeclaration.OptionType == OptionType.Infer) + OptionInfer = optionDeclaration.OptionValue; + if (optionDeclaration.OptionType == OptionType.Strict) + OptionStrict = optionDeclaration.OptionValue; + return base.VisitOptionDeclaration(optionDeclaration, data); + } } } diff --git a/src/Libraries/NRefactory/Test/NRefactoryTests.csproj b/src/Libraries/NRefactory/Test/NRefactoryTests.csproj index c54a27d8ad..e9de93aed8 100644 --- a/src/Libraries/NRefactory/Test/NRefactoryTests.csproj +++ b/src/Libraries/NRefactory/Test/NRefactoryTests.csproj @@ -66,7 +66,7 @@ - + diff --git a/src/Libraries/NRefactory/Test/Output/CSharp/VBNetToCSharpConverterTest.cs b/src/Libraries/NRefactory/Test/Output/CSharp/VBNetToCSharpConverterTest.cs index 1687ea65d4..c2b4eac1ef 100644 --- a/src/Libraries/NRefactory/Test/Output/CSharp/VBNetToCSharpConverterTest.cs +++ b/src/Libraries/NRefactory/Test/Output/CSharp/VBNetToCSharpConverterTest.cs @@ -57,7 +57,7 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter } } b.AppendLine("}"); - TestProgram("Class tmp1 \n" + input + "\nEnd Class", b.ToString()); + TestProgram("Option Strict On \n Class tmp1 \n" + input + "\nEnd Class", b.ToString()); } public void TestStatement(string input, string expectedOutput) @@ -76,7 +76,7 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter } b.AppendLine(" }"); b.AppendLine("}"); - TestProgram("Class tmp1 \n Sub tmp2() \n" + input + "\n End Sub \n End Class", b.ToString()); + TestProgram("Option Strict On \n Option Infer On \n Class tmp1 \n Sub tmp2() \n" + input + "\n End Sub \n End Class", b.ToString()); } [Test] @@ -778,5 +778,19 @@ static bool InitStaticVariableHelper(Microsoft.VisualBasic.CompilerServices.Stat { TestStatement("Dim x As Integer = CInt(obj)", "int x = Convert.ToInt32(obj);"); } + + [Test, Ignore] + public void XmlElement() + { + TestStatement("Dim xml = ", + @"var xml = new XElement(""Test"");"); + } + + [Test, Ignore] + public void XmlComment() + { + TestStatement("Dim xml = ", + @"var xml = new XComment("" test "");"); + } } } diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/XmlLiteralExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/XmlExpressionTests.cs similarity index 77% rename from src/Libraries/NRefactory/Test/Parser/Expressions/XmlLiteralExpressionTests.cs rename to src/Libraries/NRefactory/Test/Parser/Expressions/XmlExpressionTests.cs index 1f8da3ae30..60cc4bd81e 100644 --- a/src/Libraries/NRefactory/Test/Parser/Expressions/XmlLiteralExpressionTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/Expressions/XmlExpressionTests.cs @@ -14,7 +14,7 @@ using ICSharpCode.NRefactory.Ast; namespace ICSharpCode.NRefactory.Tests.Ast { [TestFixture] - public class XmlLiteralExpressionTests + public class XmlExpressionTests { #region C# @@ -26,10 +26,7 @@ namespace ICSharpCode.NRefactory.Tests.Ast [Test] public void VBNetSimpleCommentTest() { - XmlLiteralExpression xle = ParseUtilVBNet.ParseExpression(""); - Assert.IsNotEmpty(xle.Expressions); - Assert.IsTrue(xle.Expressions[0] is XmlContentExpression); - XmlContentExpression content = xle.Expressions[0] as XmlContentExpression; + XmlContentExpression content = ParseUtilVBNet.ParseExpression(""); Assert.AreEqual(XmlContentType.Comment, content.Type); Assert.AreEqual(" test ", content.Content); Assert.AreEqual(new Location(1,1), content.StartLocation); @@ -39,10 +36,7 @@ namespace ICSharpCode.NRefactory.Tests.Ast [Test] public void VBNetSimplePreprocessingInstructionTest() { - XmlLiteralExpression xle = ParseUtilVBNet.ParseExpression(""); - Assert.IsNotEmpty(xle.Expressions); - Assert.IsTrue(xle.Expressions[0] is XmlContentExpression); - XmlContentExpression content = xle.Expressions[0] as XmlContentExpression; + XmlContentExpression content = ParseUtilVBNet.ParseExpression(""); Assert.AreEqual(XmlContentType.ProcessingInstruction, content.Type); Assert.AreEqual("xml version='1.0'", content.Content); Assert.AreEqual(new Location(1,1), content.StartLocation); @@ -52,10 +46,7 @@ namespace ICSharpCode.NRefactory.Tests.Ast [Test] public void VBNetSimpleCDataTest() { - XmlLiteralExpression xle = ParseUtilVBNet.ParseExpression(" ]]>"); - Assert.IsNotEmpty(xle.Expressions); - Assert.IsTrue(xle.Expressions[0] is XmlContentExpression); - XmlContentExpression content = xle.Expressions[0] as XmlContentExpression; + XmlContentExpression content = ParseUtilVBNet.ParseExpression(" ]]>"); Assert.AreEqual(XmlContentType.CData, content.Type); Assert.AreEqual(" ", content.Content); Assert.AreEqual(new Location(1,1), content.StartLocation); @@ -65,10 +56,7 @@ namespace ICSharpCode.NRefactory.Tests.Ast [Test] public void VBNetSimpleEmptyElementTest() { - XmlLiteralExpression xle = ParseUtilVBNet.ParseExpression(""); - Assert.IsNotEmpty(xle.Expressions); - Assert.IsTrue(xle.Expressions[0] is XmlElementExpression); - XmlElementExpression element = xle.Expressions[0] as XmlElementExpression; + XmlElementExpression element = ParseUtilVBNet.ParseExpression(""); Assert.IsFalse(element.NameIsExpression); Assert.AreEqual("Test", element.XmlName); Assert.IsEmpty(element.Attributes); @@ -80,10 +68,7 @@ namespace ICSharpCode.NRefactory.Tests.Ast [Test] public void VBNetSimpleEmptyElementWithAttributeTest() { - XmlLiteralExpression xle = ParseUtilVBNet.ParseExpression(""); - Assert.IsNotEmpty(xle.Expressions); - Assert.IsTrue(xle.Expressions[0] is XmlElementExpression); - XmlElementExpression element = xle.Expressions[0] as XmlElementExpression; + XmlElementExpression element = ParseUtilVBNet.ParseExpression(""); Assert.IsFalse(element.NameIsExpression); Assert.AreEqual("Test", element.XmlName); Assert.IsNotEmpty(element.Attributes); @@ -104,11 +89,7 @@ namespace ICSharpCode.NRefactory.Tests.Ast [Test] public void VBNetSimpleEmptyElementWithAttributesTest() { - XmlLiteralExpression xle = ParseUtilVBNet.ParseExpression(" <%= contentData %> />"); - Assert.IsNotEmpty(xle.Expressions); - Assert.IsTrue(xle.Expressions[0] is XmlElementExpression); - XmlElementExpression element = xle.Expressions[0] as XmlElementExpression; - Assert.IsFalse(element.NameIsExpression); + XmlElementExpression element = ParseUtilVBNet.ParseExpression(" <%= contentData %> />"); Assert.IsFalse(element.NameIsExpression); Assert.AreEqual("Test", element.XmlName); Assert.IsNotEmpty(element.Attributes); Assert.AreEqual(3, element.Attributes.Count); @@ -158,13 +139,10 @@ namespace ICSharpCode.NRefactory.Tests.Ast [Test] public void VBNetElementWithAttributeTest() { - XmlLiteralExpression xle = ParseUtilVBNet.ParseExpression("\n" + + XmlElementExpression element = ParseUtilVBNet.ParseExpression("\n" + " \n" + " \n" + ""); - Assert.IsNotEmpty(xle.Expressions); - Assert.IsTrue(xle.Expressions[0] is XmlElementExpression); - XmlElementExpression element = xle.Expressions[0] as XmlElementExpression; Assert.IsFalse(element.NameIsExpression); Assert.AreEqual("Test", element.XmlName); @@ -196,15 +174,12 @@ namespace ICSharpCode.NRefactory.Tests.Ast [Test] public void VBNetElementWithMixedContentTest() { - XmlLiteralExpression xle = ParseUtilVBNet.ParseExpression("\n" + + XmlElementExpression element = ParseUtilVBNet.ParseExpression("\n" + " \n" + " \n" + " \n" + " section]]>\n" + ""); - Assert.IsNotEmpty(xle.Expressions); - Assert.IsTrue(xle.Expressions[0] is XmlElementExpression); - XmlElementExpression element = xle.Expressions[0] as XmlElementExpression; Assert.IsFalse(element.NameIsExpression); Assert.AreEqual("Test", element.XmlName); @@ -240,15 +215,15 @@ namespace ICSharpCode.NRefactory.Tests.Ast [Test] public void VBNetProcessingInstructionAndCommentAtEndTest() { - XmlLiteralExpression xle = ParseUtilVBNet.ParseExpression("\n" + + XmlDocumentExpression document = ParseUtilVBNet.ParseExpression("\n" + "\n" + ""); - Assert.IsNotEmpty(xle.Expressions); - Assert.AreEqual(3, xle.Expressions.Count); + Assert.IsNotEmpty(document.Expressions); + Assert.AreEqual(3, document.Expressions.Count); - CheckElement(xle.Expressions[0], "Test", new Location(1,1), new Location(9,1)); - CheckContent(xle.Expressions[1], " test ", XmlContentType.Comment, new Location(1,2), new Location(14,2)); - CheckContent(xle.Expressions[2], "target some text", XmlContentType.ProcessingInstruction, new Location(1,3), new Location(21,3)); + CheckElement(document.Expressions[0], "Test", new Location(1,1), new Location(9,1)); + CheckContent(document.Expressions[1], " test ", XmlContentType.Comment, new Location(1,2), new Location(14,2)); + CheckContent(document.Expressions[2], "target some text", XmlContentType.ProcessingInstruction, new Location(1,3), new Location(21,3)); } #endregion