From b205555b9a11ca7d0bd5f8af3962e909425bbbcc Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Wed, 15 Sep 2010 07:28:32 +0200 Subject: [PATCH] fixed http://community.sharpdevelop.net/forums/p/11851/32435.aspx --- .../Project/Src/Parser/VBNet/Parser.cs | 1521 +++++++++-------- .../Project/Src/Parser/VBNet/VBNET.ATG | 17 +- .../ObjectCreateExpressionTests.cs | 13 + 3 files changed, 797 insertions(+), 754 deletions(-) diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index 547675c805..ae4fd6f2cf 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -182,7 +182,7 @@ out u); void GlobalAttributeSection() { Expect(40); -#line 2753 "VBNET.ATG" +#line 2762 "VBNET.ATG" Location startPos = t.Location; if (la.kind == 65) { lexer.NextToken(); @@ -190,20 +190,20 @@ out u); lexer.NextToken(); } else SynErr(243); -#line 2755 "VBNET.ATG" +#line 2764 "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 2759 "VBNET.ATG" +#line 2768 "VBNET.ATG" out attribute); -#line 2759 "VBNET.ATG" +#line 2768 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2760 "VBNET.ATG" +#line 2769 "VBNET.ATG" NotFinalComma()) { if (la.kind == 22) { lexer.NextToken(); @@ -215,10 +215,10 @@ NotFinalComma()) { Expect(21); } Attribute( -#line 2760 "VBNET.ATG" +#line 2769 "VBNET.ATG" out attribute); -#line 2760 "VBNET.ATG" +#line 2769 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 22) { @@ -227,7 +227,7 @@ out attribute); Expect(39); EndOfStmt(); -#line 2765 "VBNET.ATG" +#line 2774 "VBNET.ATG" AttributeSection section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -353,47 +353,47 @@ out aliasedType); } void Qualident( -#line 3509 "VBNET.ATG" +#line 3518 "VBNET.ATG" out string qualident) { -#line 3511 "VBNET.ATG" +#line 3520 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 3515 "VBNET.ATG" +#line 3524 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 3516 "VBNET.ATG" +#line 3525 "VBNET.ATG" DotAndIdentOrKw()) { Expect(26); IdentifierOrKeyword( -#line 3516 "VBNET.ATG" +#line 3525 "VBNET.ATG" out name); -#line 3516 "VBNET.ATG" +#line 3525 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 3518 "VBNET.ATG" +#line 3527 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 2626 "VBNET.ATG" +#line 2635 "VBNET.ATG" out TypeReference typeref) { -#line 2627 "VBNET.ATG" +#line 2636 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2629 "VBNET.ATG" +#line 2638 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 2633 "VBNET.ATG" +#line 2642 "VBNET.ATG" out rank); -#line 2634 "VBNET.ATG" +#line 2643 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -424,35 +424,35 @@ out rank); } void AttributeSection( -#line 2828 "VBNET.ATG" +#line 2837 "VBNET.ATG" out AttributeSection section) { -#line 2830 "VBNET.ATG" +#line 2839 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(40); -#line 2834 "VBNET.ATG" +#line 2843 "VBNET.ATG" Location startPos = t.Location; if ( -#line 2835 "VBNET.ATG" +#line 2844 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 119) { lexer.NextToken(); -#line 2836 "VBNET.ATG" +#line 2845 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 195) { lexer.NextToken(); -#line 2837 "VBNET.ATG" +#line 2846 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2840 "VBNET.ATG" +#line 2849 "VBNET.ATG" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -465,20 +465,20 @@ IsLocalAttrTarget()) { Expect(21); } Attribute( -#line 2850 "VBNET.ATG" +#line 2859 "VBNET.ATG" out attribute); -#line 2850 "VBNET.ATG" +#line 2859 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2851 "VBNET.ATG" +#line 2860 "VBNET.ATG" NotFinalComma()) { Expect(22); Attribute( -#line 2851 "VBNET.ATG" +#line 2860 "VBNET.ATG" out attribute); -#line 2851 "VBNET.ATG" +#line 2860 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 22) { @@ -486,7 +486,7 @@ out attribute); } Expect(39); -#line 2855 "VBNET.ATG" +#line 2864 "VBNET.ATG" section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -497,69 +497,69 @@ out attribute); } void TypeModifier( -#line 3594 "VBNET.ATG" +#line 3603 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 188: { lexer.NextToken(); -#line 3595 "VBNET.ATG" +#line 3604 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 187: { lexer.NextToken(); -#line 3596 "VBNET.ATG" +#line 3605 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 125: { lexer.NextToken(); -#line 3597 "VBNET.ATG" +#line 3606 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 185: { lexer.NextToken(); -#line 3598 "VBNET.ATG" +#line 3607 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 200: { lexer.NextToken(); -#line 3599 "VBNET.ATG" +#line 3608 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 199: { lexer.NextToken(); -#line 3600 "VBNET.ATG" +#line 3609 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 156: { lexer.NextToken(); -#line 3601 "VBNET.ATG" +#line 3610 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 166: { lexer.NextToken(); -#line 3602 "VBNET.ATG" +#line 3611 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 183: { lexer.NextToken(); -#line 3603 "VBNET.ATG" +#line 3612 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -1148,10 +1148,10 @@ m, attributes); } void NonArrayTypeName( -#line 2652 "VBNET.ATG" +#line 2661 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2654 "VBNET.ATG" +#line 2663 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; @@ -1161,36 +1161,36 @@ out TypeReference typeref, bool canBeUnbound) { lexer.NextToken(); Expect(26); -#line 2659 "VBNET.ATG" +#line 2668 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 2660 "VBNET.ATG" +#line 2669 "VBNET.ATG" out typeref, canBeUnbound); -#line 2661 "VBNET.ATG" +#line 2670 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 26) { lexer.NextToken(); -#line 2662 "VBNET.ATG" +#line 2671 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 2663 "VBNET.ATG" +#line 2672 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 2664 "VBNET.ATG" +#line 2673 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 168) { lexer.NextToken(); -#line 2667 "VBNET.ATG" +#line 2676 "VBNET.ATG" typeref = new TypeReference("System.Object", true); if (la.kind == 33) { lexer.NextToken(); -#line 2671 "VBNET.ATG" +#line 2680 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1198,15 +1198,15 @@ out nestedTypeRef, canBeUnbound); } } else if (StartOf(12)) { PrimitiveTypeName( -#line 2677 "VBNET.ATG" +#line 2686 "VBNET.ATG" out name); -#line 2677 "VBNET.ATG" +#line 2686 "VBNET.ATG" typeref = new TypeReference(name, true); if (la.kind == 33) { lexer.NextToken(); -#line 2681 "VBNET.ATG" +#line 2690 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1292,162 +1292,162 @@ TypeDeclaration newType) { } void FormalParameterList( -#line 2865 "VBNET.ATG" +#line 2874 "VBNET.ATG" List parameter) { -#line 2866 "VBNET.ATG" +#line 2875 "VBNET.ATG" ParameterDeclarationExpression p; FormalParameter( -#line 2868 "VBNET.ATG" +#line 2877 "VBNET.ATG" out p); -#line 2868 "VBNET.ATG" +#line 2877 "VBNET.ATG" if (p != null) parameter.Add(p); while (la.kind == 22) { lexer.NextToken(); FormalParameter( -#line 2870 "VBNET.ATG" +#line 2879 "VBNET.ATG" out p); -#line 2870 "VBNET.ATG" +#line 2879 "VBNET.ATG" if (p != null) parameter.Add(p); } } void MemberModifier( -#line 3606 "VBNET.ATG" +#line 3615 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 156: { lexer.NextToken(); -#line 3607 "VBNET.ATG" +#line 3616 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 102: { lexer.NextToken(); -#line 3608 "VBNET.ATG" +#line 3617 "VBNET.ATG" m.Add(Modifiers.Default, t.Location); break; } case 125: { lexer.NextToken(); -#line 3609 "VBNET.ATG" +#line 3618 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 199: { lexer.NextToken(); -#line 3610 "VBNET.ATG" +#line 3619 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 181: { lexer.NextToken(); -#line 3611 "VBNET.ATG" +#line 3620 "VBNET.ATG" m.Add(Modifiers.Override, t.Location); break; } case 157: { lexer.NextToken(); -#line 3612 "VBNET.ATG" +#line 3621 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 185: { lexer.NextToken(); -#line 3613 "VBNET.ATG" +#line 3622 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 187: { lexer.NextToken(); -#line 3614 "VBNET.ATG" +#line 3623 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 188: { lexer.NextToken(); -#line 3615 "VBNET.ATG" +#line 3624 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 166: { lexer.NextToken(); -#line 3616 "VBNET.ATG" +#line 3625 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 167: { lexer.NextToken(); -#line 3617 "VBNET.ATG" +#line 3626 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 200: { lexer.NextToken(); -#line 3618 "VBNET.ATG" +#line 3627 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 180: { lexer.NextToken(); -#line 3619 "VBNET.ATG" +#line 3628 "VBNET.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 179: { lexer.NextToken(); -#line 3620 "VBNET.ATG" +#line 3629 "VBNET.ATG" m.Add(Modifiers.Overloads, t.Location); break; } case 190: { lexer.NextToken(); -#line 3621 "VBNET.ATG" +#line 3630 "VBNET.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 235: { lexer.NextToken(); -#line 3622 "VBNET.ATG" +#line 3631 "VBNET.ATG" m.Add(Modifiers.WriteOnly, t.Location); break; } case 234: { lexer.NextToken(); -#line 3623 "VBNET.ATG" +#line 3632 "VBNET.ATG" m.Add(Modifiers.WithEvents, t.Location); break; } case 105: { lexer.NextToken(); -#line 3624 "VBNET.ATG" +#line 3633 "VBNET.ATG" m.Add(Modifiers.Dim, t.Location); break; } case 183: { lexer.NextToken(); -#line 3625 "VBNET.ATG" +#line 3634 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -2595,25 +2595,25 @@ out name); } void Block( -#line 2910 "VBNET.ATG" +#line 2919 "VBNET.ATG" out Statement stmt) { -#line 2913 "VBNET.ATG" +#line 2922 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); /* in snippet parsing mode, t might be null */ if (t != null) blockStmt.StartLocation = t.EndLocation; BlockStart(blockStmt); while (StartOf(22) || -#line 2919 "VBNET.ATG" +#line 2928 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2919 "VBNET.ATG" +#line 2928 "VBNET.ATG" IsEndStmtAhead()) { Expect(113); EndOfStmt(); -#line 2919 "VBNET.ATG" +#line 2928 "VBNET.ATG" AddChild(new EndStatement()); } else { Statement(); @@ -2621,7 +2621,7 @@ IsEndStmtAhead()) { } } -#line 2924 "VBNET.ATG" +#line 2933 "VBNET.ATG" stmt = blockStmt; if (t != null) blockStmt.EndLocation = t.EndLocation; BlockEnd(); @@ -2984,32 +2984,51 @@ out initializer); #line 2114 "VBNET.ATG" MemberInitializerExpression memberInitializer = null; + Expression anonymousMember = null; lexer.NextToken(); -#line 2118 "VBNET.ATG" +#line 2119 "VBNET.ATG" CollectionInitializerExpression memberInitializers = new CollectionInitializerExpression(); memberInitializers.StartLocation = la.Location; Expect(35); - MemberInitializer( -#line 2122 "VBNET.ATG" + if (la.kind == 26 || la.kind == 147) { + MemberInitializer( +#line 2124 "VBNET.ATG" out memberInitializer); -#line 2123 "VBNET.ATG" - memberInitializers.CreateExpressions.Add(memberInitializer); +#line 2125 "VBNET.ATG" + memberInitializers.CreateExpressions.Add(memberInitializer); + } else if (StartOf(24)) { + Expr( +#line 2126 "VBNET.ATG" +out anonymousMember); + +#line 2127 "VBNET.ATG" + memberInitializers.CreateExpressions.Add(anonymousMember); + } else SynErr(270); while (la.kind == 22) { lexer.NextToken(); - MemberInitializer( -#line 2125 "VBNET.ATG" + if (la.kind == 26 || la.kind == 147) { + MemberInitializer( +#line 2131 "VBNET.ATG" out memberInitializer); -#line 2126 "VBNET.ATG" - memberInitializers.CreateExpressions.Add(memberInitializer); +#line 2132 "VBNET.ATG" + memberInitializers.CreateExpressions.Add(memberInitializer); + } else if (StartOf(24)) { + Expr( +#line 2133 "VBNET.ATG" +out anonymousMember); + +#line 2134 "VBNET.ATG" + memberInitializers.CreateExpressions.Add(anonymousMember); + } else SynErr(271); } Expect(36); -#line 2130 "VBNET.ATG" +#line 2139 "VBNET.ATG" memberInitializers.EndLocation = t.Location; if(oce is ObjectCreateExpression) { @@ -3019,10 +3038,10 @@ out memberInitializer); } else { lexer.NextToken(); CollectionInitializer( -#line 2140 "VBNET.ATG" +#line 2149 "VBNET.ATG" out initializer); -#line 2142 "VBNET.ATG" +#line 2151 "VBNET.ATG" if(oce is ObjectCreateExpression) ((ObjectCreateExpression)oce).ObjectInitializer = initializer; @@ -3048,11 +3067,11 @@ out section); #line 1371 "VBNET.ATG" attributes.Add(section); } - if (StartOf(24)) { + if (StartOf(25)) { GetAccessorDecl( #line 1373 "VBNET.ATG" out getBlock, attributes); - if (StartOf(25)) { + if (StartOf(26)) { #line 1375 "VBNET.ATG" attributes = new List(); @@ -3068,11 +3087,11 @@ out section); #line 1377 "VBNET.ATG" out setBlock, attributes); } - } else if (StartOf(26)) { + } else if (StartOf(27)) { SetAccessorDecl( #line 1380 "VBNET.ATG" out setBlock, attributes); - if (StartOf(27)) { + if (StartOf(28)) { #line 1382 "VBNET.ATG" attributes = new List(); @@ -3088,7 +3107,7 @@ out section); #line 1384 "VBNET.ATG" out getBlock, attributes); } - } else SynErr(270); + } else SynErr(272); } void EventAccessorDeclaration( @@ -3182,7 +3201,7 @@ out stmt); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; - } else SynErr(271); + } else SynErr(273); } void OverloadableOperator( @@ -3354,7 +3373,7 @@ out OverloadableOperatorType operatorType) { break; } - default: SynErr(272); break; + default: SynErr(274); break; } } @@ -3433,31 +3452,31 @@ out stmt); } void PropertyAccessorAccessModifier( -#line 3628 "VBNET.ATG" +#line 3637 "VBNET.ATG" out Modifiers m) { -#line 3629 "VBNET.ATG" +#line 3638 "VBNET.ATG" m = Modifiers.None; - while (StartOf(28)) { + while (StartOf(29)) { if (la.kind == 188) { lexer.NextToken(); -#line 3631 "VBNET.ATG" +#line 3640 "VBNET.ATG" m |= Modifiers.Public; } else if (la.kind == 187) { lexer.NextToken(); -#line 3632 "VBNET.ATG" +#line 3641 "VBNET.ATG" m |= Modifiers.Protected; } else if (la.kind == 125) { lexer.NextToken(); -#line 3633 "VBNET.ATG" +#line 3642 "VBNET.ATG" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 3634 "VBNET.ATG" +#line 3643 "VBNET.ATG" m |= Modifiers.Private; } } @@ -3478,14 +3497,14 @@ out arrayModifiers); } void ArrayNameModifier( -#line 2705 "VBNET.ATG" +#line 2714 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2707 "VBNET.ATG" +#line 2716 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 2709 "VBNET.ATG" +#line 2718 "VBNET.ATG" out arrayModifiers); } @@ -3541,7 +3560,7 @@ out CollectionInitializerExpression outExpr) { CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Expect(35); - if (StartOf(29)) { + if (StartOf(24)) { Expr( #line 1558 "VBNET.ATG" out expr); @@ -3579,7 +3598,7 @@ out string name) { lexer.NextToken(); } else if (la.kind == 153) { lexer.NextToken(); - } else SynErr(273); + } else SynErr(275); #line 1641 "VBNET.ATG" name = t.val; @@ -3593,55 +3612,55 @@ out eventName); } void IdentifierOrKeyword( -#line 3561 "VBNET.ATG" +#line 3570 "VBNET.ATG" out string name) { lexer.NextToken(); -#line 3563 "VBNET.ATG" +#line 3572 "VBNET.ATG" name = t.val; } void QueryExpr( -#line 2229 "VBNET.ATG" +#line 2238 "VBNET.ATG" out Expression expr) { -#line 2231 "VBNET.ATG" +#line 2240 "VBNET.ATG" QueryExpressionVB qexpr = new QueryExpressionVB(); qexpr.StartLocation = la.Location; expr = qexpr; FromOrAggregateQueryOperator( -#line 2235 "VBNET.ATG" +#line 2244 "VBNET.ATG" qexpr.Clauses); while (StartOf(30)) { QueryOperator( -#line 2236 "VBNET.ATG" +#line 2245 "VBNET.ATG" qexpr.Clauses); } -#line 2238 "VBNET.ATG" +#line 2247 "VBNET.ATG" qexpr.EndLocation = t.EndLocation; } void LambdaExpr( -#line 2149 "VBNET.ATG" +#line 2158 "VBNET.ATG" out Expression expr) { -#line 2151 "VBNET.ATG" +#line 2160 "VBNET.ATG" LambdaExpression lambda = null; if (la.kind == 210) { SubLambdaExpression( -#line 2153 "VBNET.ATG" +#line 2162 "VBNET.ATG" out lambda); } else if (la.kind == 127) { FunctionLambdaExpression( -#line 2154 "VBNET.ATG" +#line 2163 "VBNET.ATG" out lambda); - } else SynErr(274); + } else SynErr(276); -#line 2155 "VBNET.ATG" +#line 2164 "VBNET.ATG" expr = lambda; } @@ -3759,7 +3778,7 @@ out AssignmentOperatorType op) { op = AssignmentOperatorType.ShiftRight; break; } - default: SynErr(275); break; + default: SynErr(277); break; } } @@ -3791,7 +3810,7 @@ out name); #line 1679 "VBNET.ATG" pexpr = new MemberReferenceExpression(pexpr, name); - } else SynErr(276); + } else SynErr(278); if ( #line 1681 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { @@ -3821,7 +3840,7 @@ out name); #line 1686 "VBNET.ATG" type = XmlAxisType.Descendents; - } else SynErr(277); + } else SynErr(279); if (la.kind == 10) { lexer.NextToken(); @@ -3971,7 +3990,7 @@ out val); #line 1723 "VBNET.ATG" val = "System.Object"; - } else SynErr(278); + } else SynErr(280); #line 1724 "VBNET.ATG" pexpr = new TypeReferenceExpression(new TypeReference(val, true)); @@ -3998,7 +4017,7 @@ out val); #line 1728 "VBNET.ATG" retExpr = new ClassReferenceExpression(); - } else SynErr(279); + } else SynErr(281); Expect(26); IdentifierOrKeyword( #line 1730 "VBNET.ATG" @@ -4057,7 +4076,7 @@ out cie); #line 1742 "VBNET.ATG" castType = CastType.TryCast; - } else SynErr(280); + } else SynErr(282); Expect(37); Expr( #line 1744 "VBNET.ATG" @@ -4154,7 +4173,7 @@ out name); #line 1760 "VBNET.ATG" pexpr = new MemberReferenceExpression(null, name); - } else SynErr(281); + } else SynErr(283); } else if (la.kind == 29) { lexer.NextToken(); IdentifierOrKeyword( @@ -4177,7 +4196,7 @@ out name); #line 1764 "VBNET.ATG" axisType = XmlAxisType.Attribute; - } else SynErr(282); + } else SynErr(284); if (la.kind == 10) { lexer.NextToken(); @@ -4194,29 +4213,29 @@ out name); #line 1766 "VBNET.ATG" pexpr = new XmlMemberAccessExpression(null, axisType, name, isXmlIdentifier); } - } else SynErr(283); + } else SynErr(285); } void TypeArgumentList( -#line 2741 "VBNET.ATG" +#line 2750 "VBNET.ATG" List typeArguments) { -#line 2743 "VBNET.ATG" +#line 2752 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2745 "VBNET.ATG" +#line 2754 "VBNET.ATG" out typeref); -#line 2745 "VBNET.ATG" +#line 2754 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 2748 "VBNET.ATG" +#line 2757 "VBNET.ATG" out typeref); -#line 2748 "VBNET.ATG" +#line 2757 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } @@ -4245,118 +4264,118 @@ out parameters); } void PrimitiveTypeName( -#line 3568 "VBNET.ATG" +#line 3577 "VBNET.ATG" out string type) { -#line 3569 "VBNET.ATG" +#line 3578 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 68: { lexer.NextToken(); -#line 3570 "VBNET.ATG" +#line 3579 "VBNET.ATG" type = "System.Boolean"; break; } case 99: { lexer.NextToken(); -#line 3571 "VBNET.ATG" +#line 3580 "VBNET.ATG" type = "System.DateTime"; break; } case 82: { lexer.NextToken(); -#line 3572 "VBNET.ATG" +#line 3581 "VBNET.ATG" type = "System.Char"; break; } case 208: { lexer.NextToken(); -#line 3573 "VBNET.ATG" +#line 3582 "VBNET.ATG" type = "System.String"; break; } case 100: { lexer.NextToken(); -#line 3574 "VBNET.ATG" +#line 3583 "VBNET.ATG" type = "System.Decimal"; break; } case 71: { lexer.NextToken(); -#line 3575 "VBNET.ATG" +#line 3584 "VBNET.ATG" type = "System.Byte"; break; } case 201: { lexer.NextToken(); -#line 3576 "VBNET.ATG" +#line 3585 "VBNET.ATG" type = "System.Int16"; break; } case 141: { lexer.NextToken(); -#line 3577 "VBNET.ATG" +#line 3586 "VBNET.ATG" type = "System.Int32"; break; } case 151: { lexer.NextToken(); -#line 3578 "VBNET.ATG" +#line 3587 "VBNET.ATG" type = "System.Int64"; break; } case 202: { lexer.NextToken(); -#line 3579 "VBNET.ATG" +#line 3588 "VBNET.ATG" type = "System.Single"; break; } case 109: { lexer.NextToken(); -#line 3580 "VBNET.ATG" +#line 3589 "VBNET.ATG" type = "System.Double"; break; } case 221: { lexer.NextToken(); -#line 3581 "VBNET.ATG" +#line 3590 "VBNET.ATG" type = "System.UInt32"; break; } case 222: { lexer.NextToken(); -#line 3582 "VBNET.ATG" +#line 3591 "VBNET.ATG" type = "System.UInt64"; break; } case 225: { lexer.NextToken(); -#line 3583 "VBNET.ATG" +#line 3592 "VBNET.ATG" type = "System.UInt16"; break; } case 196: { lexer.NextToken(); -#line 3584 "VBNET.ATG" +#line 3593 "VBNET.ATG" type = "System.SByte"; break; } - default: SynErr(284); break; + default: SynErr(286); break; } } @@ -4480,24 +4499,24 @@ out TypeReference type) { type = new TypeReference("System.String", true); break; } - default: SynErr(285); break; + default: SynErr(287); break; } } void GetTypeTypeName( -#line 2640 "VBNET.ATG" +#line 2649 "VBNET.ATG" out TypeReference typeref) { -#line 2641 "VBNET.ATG" +#line 2650 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2643 "VBNET.ATG" +#line 2652 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 2644 "VBNET.ATG" +#line 2653 "VBNET.ATG" out rank); -#line 2645 "VBNET.ATG" +#line 2654 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4598,7 +4617,7 @@ out currentExpression); #line 1781 "VBNET.ATG" exprs); } - } else SynErr(286); + } else SynErr(288); #line 1784 "VBNET.ATG" if (exprs.Count > 1) { @@ -4635,7 +4654,7 @@ List exprs) { #line 1798 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); - } else SynErr(287); + } else SynErr(289); #line 1801 "VBNET.ATG" expr.StartLocation = t.Location; @@ -4671,7 +4690,7 @@ out innerExpression); #line 1834 "VBNET.ATG" el.XmlName = t.val; - } else SynErr(288); + } else SynErr(290); while (StartOf(36)) { XmlAttribute( #line 1834 "VBNET.ATG" @@ -4703,7 +4722,7 @@ out child); #line 1835 "VBNET.ATG" el.EndLocation = t.EndLocation; - } else SynErr(289); + } else SynErr(291); #line 1837 "VBNET.ATG" expr = el; @@ -4764,7 +4783,7 @@ out innerExpression); out tmpExpr); break; } - default: SynErr(290); break; + default: SynErr(292); break; } #line 1819 "VBNET.ATG" @@ -4802,7 +4821,7 @@ List attrs) { #line 1845 "VBNET.ATG" out expressionValue); Expect(13); - } else SynErr(291); + } else SynErr(293); #line 1846 "VBNET.ATG" attrs.Add(new XmlAttributeExpression() { Name = name, ExpressionValue = expressionValue, LiteralValue = literalValue, UseDoubleQuotes = useDoubleQuotes, StartLocation = start, EndLocation = t.EndLocation }); @@ -4818,38 +4837,38 @@ out innerExpression); #line 1849 "VBNET.ATG" attrs.Add(new XmlEmbeddedExpression() { InlineVBExpression = innerExpression, StartLocation = start, EndLocation = t.EndLocation }); - } else SynErr(292); + } else SynErr(294); } void ArgumentList( -#line 2572 "VBNET.ATG" +#line 2581 "VBNET.ATG" out List arguments) { -#line 2574 "VBNET.ATG" +#line 2583 "VBNET.ATG" arguments = new List(); Expression expr = null; - if (StartOf(29)) { + if (StartOf(24)) { Argument( -#line 2577 "VBNET.ATG" +#line 2586 "VBNET.ATG" out expr); } while (la.kind == 22) { lexer.NextToken(); -#line 2578 "VBNET.ATG" +#line 2587 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; - if (StartOf(29)) { + if (StartOf(24)) { Argument( -#line 2579 "VBNET.ATG" +#line 2588 "VBNET.ATG" out expr); } -#line 2580 "VBNET.ATG" +#line 2589 "VBNET.ATG" if (expr == null) expr = Expression.Null; } -#line 2582 "VBNET.ATG" +#line 2591 "VBNET.ATG" if (expr != null) arguments.Add(expr); } @@ -4999,7 +5018,7 @@ out expr); #line 1984 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new UnaryOperatorExpression(expr, UnaryOperatorType.Not)); - } else SynErr(293); + } else SynErr(295); } } @@ -5220,87 +5239,87 @@ out expr); } void NormalOrReDimArgumentList( -#line 2586 "VBNET.ATG" +#line 2595 "VBNET.ATG" out List arguments, out bool canBeNormal, out bool canBeRedim) { -#line 2588 "VBNET.ATG" +#line 2597 "VBNET.ATG" arguments = new List(); canBeNormal = true; canBeRedim = !IsNamedAssign(); Expression expr = null; - if (StartOf(29)) { + if (StartOf(24)) { Argument( -#line 2593 "VBNET.ATG" +#line 2602 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2594 "VBNET.ATG" +#line 2603 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2595 "VBNET.ATG" +#line 2604 "VBNET.ATG" out expr); } } while (la.kind == 22) { lexer.NextToken(); -#line 2598 "VBNET.ATG" +#line 2607 "VBNET.ATG" if (expr == null) canBeRedim = false; -#line 2599 "VBNET.ATG" +#line 2608 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; -#line 2600 "VBNET.ATG" +#line 2609 "VBNET.ATG" canBeRedim &= !IsNamedAssign(); - if (StartOf(29)) { + if (StartOf(24)) { Argument( -#line 2601 "VBNET.ATG" +#line 2610 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2602 "VBNET.ATG" +#line 2611 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2603 "VBNET.ATG" +#line 2612 "VBNET.ATG" out expr); } } -#line 2605 "VBNET.ATG" +#line 2614 "VBNET.ATG" if (expr == null) { canBeRedim = false; expr = Expression.Null; } } -#line 2607 "VBNET.ATG" +#line 2616 "VBNET.ATG" if (expr != null) arguments.Add(expr); else canBeRedim = false; } void ArrayTypeModifiers( -#line 2714 "VBNET.ATG" +#line 2723 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2716 "VBNET.ATG" +#line 2725 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2719 "VBNET.ATG" +#line 2728 "VBNET.ATG" IsDims()) { Expect(37); if (la.kind == 22 || la.kind == 38) { RankList( -#line 2721 "VBNET.ATG" +#line 2730 "VBNET.ATG" out i); } -#line 2723 "VBNET.ATG" +#line 2732 "VBNET.ATG" arrayModifiers.Add(i); Expect(38); } -#line 2728 "VBNET.ATG" +#line 2737 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -5308,10 +5327,10 @@ out i); } void MemberInitializer( -#line 2553 "VBNET.ATG" +#line 2562 "VBNET.ATG" out MemberInitializerExpression memberInitializer) { -#line 2555 "VBNET.ATG" +#line 2564 "VBNET.ATG" memberInitializer = new MemberInitializerExpression(); memberInitializer.StartLocation = la.Location; Expression initExpr = null; @@ -5321,19 +5340,19 @@ out MemberInitializerExpression memberInitializer) { if (la.kind == 147) { lexer.NextToken(); -#line 2561 "VBNET.ATG" +#line 2570 "VBNET.ATG" isKey = true; } Expect(26); IdentifierOrKeyword( -#line 2562 "VBNET.ATG" +#line 2571 "VBNET.ATG" out name); Expect(20); Expr( -#line 2562 "VBNET.ATG" +#line 2571 "VBNET.ATG" out initExpr); -#line 2564 "VBNET.ATG" +#line 2573 "VBNET.ATG" memberInitializer.Name = name; memberInitializer.Expression = initExpr; memberInitializer.IsKey = isKey; @@ -5342,10 +5361,10 @@ out initExpr); } void SubLambdaExpression( -#line 2158 "VBNET.ATG" +#line 2167 "VBNET.ATG" out LambdaExpression lambda) { -#line 2160 "VBNET.ATG" +#line 2169 "VBNET.ATG" lambda = new LambdaExpression(); lambda.ReturnType = new TypeReference("System.Void", true); Expression inner = null; @@ -5357,27 +5376,27 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2167 "VBNET.ATG" +#line 2176 "VBNET.ATG" lambda.Parameters); } Expect(38); } if (StartOf(41)) { - if (StartOf(29)) { + if (StartOf(24)) { Expr( -#line 2170 "VBNET.ATG" +#line 2179 "VBNET.ATG" out inner); -#line 2172 "VBNET.ATG" +#line 2181 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2176 "VBNET.ATG" +#line 2185 "VBNET.ATG" out statement); -#line 2178 "VBNET.ATG" +#line 2187 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5385,23 +5404,23 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2184 "VBNET.ATG" +#line 2193 "VBNET.ATG" out statement); Expect(113); Expect(210); -#line 2187 "VBNET.ATG" +#line 2196 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; - } else SynErr(294); + } else SynErr(296); } void FunctionLambdaExpression( -#line 2193 "VBNET.ATG" +#line 2202 "VBNET.ATG" out LambdaExpression lambda) { -#line 2195 "VBNET.ATG" +#line 2204 "VBNET.ATG" lambda = new LambdaExpression(); TypeReference typeRef = null; Expression inner = null; @@ -5413,7 +5432,7 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2202 "VBNET.ATG" +#line 2211 "VBNET.ATG" lambda.Parameters); } Expect(38); @@ -5421,28 +5440,28 @@ lambda.Parameters); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2203 "VBNET.ATG" +#line 2212 "VBNET.ATG" out typeRef); -#line 2203 "VBNET.ATG" +#line 2212 "VBNET.ATG" lambda.ReturnType = typeRef; } if (StartOf(41)) { - if (StartOf(29)) { + if (StartOf(24)) { Expr( -#line 2206 "VBNET.ATG" +#line 2215 "VBNET.ATG" out inner); -#line 2208 "VBNET.ATG" +#line 2217 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2212 "VBNET.ATG" +#line 2221 "VBNET.ATG" out statement); -#line 2214 "VBNET.ATG" +#line 2223 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5450,23 +5469,23 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2220 "VBNET.ATG" +#line 2229 "VBNET.ATG" out statement); Expect(113); Expect(127); -#line 2223 "VBNET.ATG" +#line 2232 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; - } else SynErr(295); + } else SynErr(297); } void EmbeddedStatement( -#line 2985 "VBNET.ATG" +#line 2994 "VBNET.ATG" out Statement statement) { -#line 2987 "VBNET.ATG" +#line 2996 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5476,224 +5495,224 @@ out Statement statement) { if (la.kind == 120) { lexer.NextToken(); -#line 2993 "VBNET.ATG" +#line 3002 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 210: { lexer.NextToken(); -#line 2995 "VBNET.ATG" +#line 3004 "VBNET.ATG" exitType = ExitType.Sub; break; } case 127: { lexer.NextToken(); -#line 2997 "VBNET.ATG" +#line 3006 "VBNET.ATG" exitType = ExitType.Function; break; } case 186: { lexer.NextToken(); -#line 2999 "VBNET.ATG" +#line 3008 "VBNET.ATG" exitType = ExitType.Property; break; } case 108: { lexer.NextToken(); -#line 3001 "VBNET.ATG" +#line 3010 "VBNET.ATG" exitType = ExitType.Do; break; } case 124: { lexer.NextToken(); -#line 3003 "VBNET.ATG" +#line 3012 "VBNET.ATG" exitType = ExitType.For; break; } case 218: { lexer.NextToken(); -#line 3005 "VBNET.ATG" +#line 3014 "VBNET.ATG" exitType = ExitType.Try; break; } case 231: { lexer.NextToken(); -#line 3007 "VBNET.ATG" +#line 3016 "VBNET.ATG" exitType = ExitType.While; break; } case 197: { lexer.NextToken(); -#line 3009 "VBNET.ATG" +#line 3018 "VBNET.ATG" exitType = ExitType.Select; break; } - default: SynErr(296); break; + default: SynErr(298); break; } -#line 3011 "VBNET.ATG" +#line 3020 "VBNET.ATG" statement = new ExitStatement(exitType); } else if (la.kind == 218) { TryStatement( -#line 3012 "VBNET.ATG" +#line 3021 "VBNET.ATG" out statement); } else if (la.kind == 89) { lexer.NextToken(); -#line 3013 "VBNET.ATG" +#line 3022 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 108 || la.kind == 124 || la.kind == 231) { if (la.kind == 108) { lexer.NextToken(); -#line 3013 "VBNET.ATG" +#line 3022 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 124) { lexer.NextToken(); -#line 3013 "VBNET.ATG" +#line 3022 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 3013 "VBNET.ATG" +#line 3022 "VBNET.ATG" continueType = ContinueType.While; } } -#line 3013 "VBNET.ATG" +#line 3022 "VBNET.ATG" statement = new ContinueStatement(continueType); } else if (la.kind == 215) { lexer.NextToken(); - if (StartOf(29)) { + if (StartOf(24)) { Expr( -#line 3015 "VBNET.ATG" +#line 3024 "VBNET.ATG" out expr); } -#line 3015 "VBNET.ATG" +#line 3024 "VBNET.ATG" statement = new ThrowStatement(expr); } else if (la.kind == 195) { lexer.NextToken(); - if (StartOf(29)) { + if (StartOf(24)) { Expr( -#line 3017 "VBNET.ATG" +#line 3026 "VBNET.ATG" out expr); } -#line 3017 "VBNET.ATG" +#line 3026 "VBNET.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 211) { lexer.NextToken(); Expr( -#line 3019 "VBNET.ATG" +#line 3028 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 3019 "VBNET.ATG" +#line 3028 "VBNET.ATG" out embeddedStatement); Expect(113); Expect(211); -#line 3020 "VBNET.ATG" +#line 3029 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 189) { lexer.NextToken(); Identifier(); -#line 3022 "VBNET.ATG" +#line 3031 "VBNET.ATG" name = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(42)) { ArgumentList( -#line 3023 "VBNET.ATG" +#line 3032 "VBNET.ATG" out p); } Expect(38); } -#line 3025 "VBNET.ATG" +#line 3034 "VBNET.ATG" statement = new RaiseEventStatement(name, p); } else if (la.kind == 233) { WithStatement( -#line 3028 "VBNET.ATG" +#line 3037 "VBNET.ATG" out statement); } else if (la.kind == 56) { lexer.NextToken(); -#line 3030 "VBNET.ATG" +#line 3039 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 3031 "VBNET.ATG" +#line 3040 "VBNET.ATG" out expr); Expect(22); Expr( -#line 3031 "VBNET.ATG" +#line 3040 "VBNET.ATG" out handlerExpr); -#line 3033 "VBNET.ATG" +#line 3042 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); } else if (la.kind == 193) { lexer.NextToken(); -#line 3036 "VBNET.ATG" +#line 3045 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 3037 "VBNET.ATG" +#line 3046 "VBNET.ATG" out expr); Expect(22); Expr( -#line 3037 "VBNET.ATG" +#line 3046 "VBNET.ATG" out handlerExpr); -#line 3039 "VBNET.ATG" +#line 3048 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); } else if (la.kind == 231) { lexer.NextToken(); Expr( -#line 3042 "VBNET.ATG" +#line 3051 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 3043 "VBNET.ATG" +#line 3052 "VBNET.ATG" out embeddedStatement); Expect(113); Expect(231); -#line 3045 "VBNET.ATG" +#line 3054 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 108) { lexer.NextToken(); -#line 3050 "VBNET.ATG" +#line 3059 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 3053 "VBNET.ATG" +#line 3062 "VBNET.ATG" out conditionType); Expr( -#line 3053 "VBNET.ATG" +#line 3062 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 3054 "VBNET.ATG" +#line 3063 "VBNET.ATG" out embeddedStatement); Expect(152); -#line 3057 "VBNET.ATG" +#line 3066 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5702,26 +5721,26 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 3064 "VBNET.ATG" +#line 3073 "VBNET.ATG" out embeddedStatement); Expect(152); if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 3065 "VBNET.ATG" +#line 3074 "VBNET.ATG" out conditionType); Expr( -#line 3065 "VBNET.ATG" +#line 3074 "VBNET.ATG" out expr); } -#line 3067 "VBNET.ATG" +#line 3076 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); - } else SynErr(297); + } else SynErr(299); } else if (la.kind == 124) { lexer.NextToken(); -#line 3072 "VBNET.ATG" +#line 3081 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5730,24 +5749,24 @@ out expr); if (la.kind == 110) { lexer.NextToken(); LoopControlVariable( -#line 3079 "VBNET.ATG" +#line 3088 "VBNET.ATG" out typeReference, out typeName); Expect(138); Expr( -#line 3080 "VBNET.ATG" +#line 3089 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 3081 "VBNET.ATG" +#line 3090 "VBNET.ATG" out embeddedStatement); Expect(163); - if (StartOf(29)) { + if (StartOf(24)) { Expr( -#line 3082 "VBNET.ATG" +#line 3091 "VBNET.ATG" out expr); } -#line 3084 "VBNET.ATG" +#line 3093 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5759,7 +5778,7 @@ out expr); } else if (StartOf(43)) { -#line 3095 "VBNET.ATG" +#line 3104 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; @@ -5768,59 +5787,59 @@ out expr); List nextExpressions = null; if ( -#line 3102 "VBNET.ATG" +#line 3111 "VBNET.ATG" IsLoopVariableDeclaration()) { LoopControlVariable( -#line 3103 "VBNET.ATG" +#line 3112 "VBNET.ATG" out typeReference, out typeName); } else { -#line 3105 "VBNET.ATG" +#line 3114 "VBNET.ATG" typeReference = null; typeName = null; SimpleExpr( -#line 3106 "VBNET.ATG" +#line 3115 "VBNET.ATG" out variableExpr); } Expect(20); Expr( -#line 3108 "VBNET.ATG" +#line 3117 "VBNET.ATG" out start); Expect(216); Expr( -#line 3108 "VBNET.ATG" +#line 3117 "VBNET.ATG" out end); if (la.kind == 205) { lexer.NextToken(); Expr( -#line 3108 "VBNET.ATG" +#line 3117 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 3109 "VBNET.ATG" +#line 3118 "VBNET.ATG" out embeddedStatement); Expect(163); - if (StartOf(29)) { + if (StartOf(24)) { Expr( -#line 3112 "VBNET.ATG" +#line 3121 "VBNET.ATG" out nextExpr); -#line 3114 "VBNET.ATG" +#line 3123 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3117 "VBNET.ATG" +#line 3126 "VBNET.ATG" out nextExpr); -#line 3117 "VBNET.ATG" +#line 3126 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 3120 "VBNET.ATG" +#line 3129 "VBNET.ATG" statement = new ForNextStatement { TypeReference = typeReference, VariableName = typeName, @@ -5832,31 +5851,31 @@ out nextExpr); NextExpressions = nextExpressions }; - } else SynErr(298); + } else SynErr(300); } else if (la.kind == 118) { lexer.NextToken(); Expr( -#line 3133 "VBNET.ATG" +#line 3142 "VBNET.ATG" out expr); -#line 3133 "VBNET.ATG" +#line 3142 "VBNET.ATG" statement = new ErrorStatement(expr); } else if (la.kind == 191) { lexer.NextToken(); -#line 3135 "VBNET.ATG" +#line 3144 "VBNET.ATG" bool isPreserve = false; if (la.kind == 184) { lexer.NextToken(); -#line 3135 "VBNET.ATG" +#line 3144 "VBNET.ATG" isPreserve = true; } ReDimClause( -#line 3136 "VBNET.ATG" +#line 3145 "VBNET.ATG" out expr); -#line 3138 "VBNET.ATG" +#line 3147 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); @@ -5864,48 +5883,48 @@ out expr); while (la.kind == 22) { lexer.NextToken(); ReDimClause( -#line 3142 "VBNET.ATG" +#line 3151 "VBNET.ATG" out expr); -#line 3143 "VBNET.ATG" +#line 3152 "VBNET.ATG" SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); } } else if (la.kind == 117) { lexer.NextToken(); Expr( -#line 3147 "VBNET.ATG" +#line 3156 "VBNET.ATG" out expr); -#line 3149 "VBNET.ATG" +#line 3158 "VBNET.ATG" EraseStatement eraseStatement = new EraseStatement(); if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr);} while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3152 "VBNET.ATG" +#line 3161 "VBNET.ATG" out expr); -#line 3152 "VBNET.ATG" +#line 3161 "VBNET.ATG" if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr); } } -#line 3153 "VBNET.ATG" +#line 3162 "VBNET.ATG" statement = eraseStatement; } else if (la.kind == 206) { lexer.NextToken(); -#line 3155 "VBNET.ATG" +#line 3164 "VBNET.ATG" statement = new StopStatement(); } else if ( -#line 3157 "VBNET.ATG" +#line 3166 "VBNET.ATG" la.kind == Tokens.If) { Expect(135); -#line 3158 "VBNET.ATG" +#line 3167 "VBNET.ATG" Location ifStartLocation = t.Location; Expr( -#line 3158 "VBNET.ATG" +#line 3167 "VBNET.ATG" out expr); if (la.kind == 214) { lexer.NextToken(); @@ -5913,46 +5932,46 @@ out expr); if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 3161 "VBNET.ATG" +#line 3170 "VBNET.ATG" out embeddedStatement); -#line 3163 "VBNET.ATG" +#line 3172 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; Location elseIfStart; while (la.kind == 112 || -#line 3169 "VBNET.ATG" +#line 3178 "VBNET.ATG" IsElseIf()) { if ( -#line 3169 "VBNET.ATG" +#line 3178 "VBNET.ATG" IsElseIf()) { Expect(111); -#line 3169 "VBNET.ATG" +#line 3178 "VBNET.ATG" elseIfStart = t.Location; Expect(135); } else { lexer.NextToken(); -#line 3170 "VBNET.ATG" +#line 3179 "VBNET.ATG" elseIfStart = t.Location; } -#line 3172 "VBNET.ATG" +#line 3181 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 3173 "VBNET.ATG" +#line 3182 "VBNET.ATG" out condition); if (la.kind == 214) { lexer.NextToken(); } EndOfStmt(); Block( -#line 3174 "VBNET.ATG" +#line 3183 "VBNET.ATG" out block); -#line 3176 "VBNET.ATG" +#line 3185 "VBNET.ATG" ElseIfSection elseIfSection = new ElseIfSection(condition, block); elseIfSection.StartLocation = elseIfStart; elseIfSection.EndLocation = t.Location; @@ -5966,123 +5985,123 @@ out block); EndOfStmt(); } Block( -#line 3185 "VBNET.ATG" +#line 3194 "VBNET.ATG" out embeddedStatement); -#line 3187 "VBNET.ATG" +#line 3196 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(113); Expect(135); -#line 3191 "VBNET.ATG" +#line 3200 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else if (StartOf(44)) { -#line 3196 "VBNET.ATG" +#line 3205 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr); ifStatement.StartLocation = ifStartLocation; SingleLineStatementList( -#line 3199 "VBNET.ATG" +#line 3208 "VBNET.ATG" ifStatement.TrueStatement); if (la.kind == 111) { lexer.NextToken(); if (StartOf(44)) { SingleLineStatementList( -#line 3202 "VBNET.ATG" +#line 3211 "VBNET.ATG" ifStatement.FalseStatement); } } -#line 3204 "VBNET.ATG" +#line 3213 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; - } else SynErr(299); + } else SynErr(301); } else if (la.kind == 197) { lexer.NextToken(); if (la.kind == 74) { lexer.NextToken(); } Expr( -#line 3207 "VBNET.ATG" +#line 3216 "VBNET.ATG" out expr); EndOfStmt(); -#line 3208 "VBNET.ATG" +#line 3217 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 74) { -#line 3212 "VBNET.ATG" +#line 3221 "VBNET.ATG" List caseClauses = null; Location caseLocation = la.Location; lexer.NextToken(); CaseClauses( -#line 3213 "VBNET.ATG" +#line 3222 "VBNET.ATG" out caseClauses); if ( -#line 3213 "VBNET.ATG" +#line 3222 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 3215 "VBNET.ATG" +#line 3224 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); selectSection.StartLocation = caseLocation; Block( -#line 3218 "VBNET.ATG" +#line 3227 "VBNET.ATG" out block); -#line 3220 "VBNET.ATG" +#line 3229 "VBNET.ATG" selectSection.Children = block.Children; selectSection.EndLocation = t.EndLocation; selectSections.Add(selectSection); } -#line 3226 "VBNET.ATG" +#line 3235 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(113); Expect(197); } else if (la.kind == 171) { -#line 3229 "VBNET.ATG" +#line 3238 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 3230 "VBNET.ATG" +#line 3239 "VBNET.ATG" out onErrorStatement); -#line 3230 "VBNET.ATG" +#line 3239 "VBNET.ATG" statement = onErrorStatement; } else if (la.kind == 132) { -#line 3231 "VBNET.ATG" +#line 3240 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 3232 "VBNET.ATG" +#line 3241 "VBNET.ATG" out goToStatement); -#line 3232 "VBNET.ATG" +#line 3241 "VBNET.ATG" statement = goToStatement; } else if (la.kind == 194) { -#line 3233 "VBNET.ATG" +#line 3242 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 3234 "VBNET.ATG" +#line 3243 "VBNET.ATG" out resumeStatement); -#line 3234 "VBNET.ATG" +#line 3243 "VBNET.ATG" statement = resumeStatement; } else if (StartOf(43)) { -#line 3237 "VBNET.ATG" +#line 3246 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -6090,25 +6109,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 3243 "VBNET.ATG" +#line 3252 "VBNET.ATG" out expr); if (StartOf(45)) { AssignmentOperator( -#line 3245 "VBNET.ATG" +#line 3254 "VBNET.ATG" out op); Expr( -#line 3245 "VBNET.ATG" +#line 3254 "VBNET.ATG" out val); -#line 3245 "VBNET.ATG" +#line 3254 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (StartOf(46)) { -#line 3246 "VBNET.ATG" +#line 3255 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); - } else SynErr(300); + } else SynErr(302); -#line 3249 "VBNET.ATG" +#line 3258 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is MemberReferenceExpression || expr is IdentifierExpression) { @@ -6119,88 +6138,88 @@ out val); } else if (la.kind == 73) { lexer.NextToken(); SimpleExpr( -#line 3256 "VBNET.ATG" +#line 3265 "VBNET.ATG" out expr); -#line 3256 "VBNET.ATG" +#line 3265 "VBNET.ATG" statement = new ExpressionStatement(expr); } else if (la.kind == 226) { lexer.NextToken(); -#line 3258 "VBNET.ATG" +#line 3267 "VBNET.ATG" Statement block; if ( -#line 3259 "VBNET.ATG" +#line 3268 "VBNET.ATG" Peek(1).kind == Tokens.As) { -#line 3260 "VBNET.ATG" +#line 3269 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 3261 "VBNET.ATG" +#line 3270 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 3263 "VBNET.ATG" +#line 3272 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 3265 "VBNET.ATG" +#line 3274 "VBNET.ATG" out block); -#line 3267 "VBNET.ATG" +#line 3276 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); - } else if (StartOf(29)) { + } else if (StartOf(24)) { Expr( -#line 3269 "VBNET.ATG" +#line 3278 "VBNET.ATG" out expr); Block( -#line 3270 "VBNET.ATG" +#line 3279 "VBNET.ATG" out block); -#line 3271 "VBNET.ATG" +#line 3280 "VBNET.ATG" statement = new UsingStatement(new ExpressionStatement(expr), block); - } else SynErr(301); + } else SynErr(303); Expect(113); Expect(226); } else if (StartOf(47)) { LocalDeclarationStatement( -#line 3274 "VBNET.ATG" +#line 3283 "VBNET.ATG" out statement); - } else SynErr(302); + } else SynErr(304); } void FromOrAggregateQueryOperator( -#line 2242 "VBNET.ATG" +#line 2251 "VBNET.ATG" List middleClauses) { -#line 2244 "VBNET.ATG" +#line 2253 "VBNET.ATG" QueryExpressionFromClause fromClause = null; QueryExpressionAggregateClause aggregateClause = null; if (la.kind == 126) { FromQueryOperator( -#line 2247 "VBNET.ATG" +#line 2256 "VBNET.ATG" out fromClause); -#line 2248 "VBNET.ATG" +#line 2257 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2249 "VBNET.ATG" +#line 2258 "VBNET.ATG" out aggregateClause); -#line 2250 "VBNET.ATG" +#line 2259 "VBNET.ATG" middleClauses.Add(aggregateClause); - } else SynErr(303); + } else SynErr(305); } void QueryOperator( -#line 2253 "VBNET.ATG" +#line 2262 "VBNET.ATG" List middleClauses) { -#line 2255 "VBNET.ATG" +#line 2264 "VBNET.ATG" QueryExpressionJoinVBClause joinClause = null; QueryExpressionGroupVBClause groupByClause = null; QueryExpressionPartitionVBClause partitionClause = null; @@ -6210,94 +6229,94 @@ List middleClauses) { if (la.kind == 126) { FromQueryOperator( -#line 2262 "VBNET.ATG" +#line 2271 "VBNET.ATG" out fromClause); -#line 2263 "VBNET.ATG" +#line 2272 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2264 "VBNET.ATG" +#line 2273 "VBNET.ATG" out aggregateClause); -#line 2265 "VBNET.ATG" +#line 2274 "VBNET.ATG" middleClauses.Add(aggregateClause); } else if (la.kind == 197) { SelectQueryOperator( -#line 2266 "VBNET.ATG" +#line 2275 "VBNET.ATG" middleClauses); } else if (la.kind == 107) { DistinctQueryOperator( -#line 2267 "VBNET.ATG" +#line 2276 "VBNET.ATG" middleClauses); } else if (la.kind == 230) { WhereQueryOperator( -#line 2268 "VBNET.ATG" +#line 2277 "VBNET.ATG" middleClauses); } else if (la.kind == 176) { OrderByQueryOperator( -#line 2269 "VBNET.ATG" +#line 2278 "VBNET.ATG" middleClauses); } else if (la.kind == 203 || la.kind == 212) { PartitionQueryOperator( -#line 2270 "VBNET.ATG" +#line 2279 "VBNET.ATG" out partitionClause); -#line 2271 "VBNET.ATG" +#line 2280 "VBNET.ATG" middleClauses.Add(partitionClause); } else if (la.kind == 148) { LetQueryOperator( -#line 2272 "VBNET.ATG" +#line 2281 "VBNET.ATG" middleClauses); } else if (la.kind == 146) { JoinQueryOperator( -#line 2273 "VBNET.ATG" +#line 2282 "VBNET.ATG" out joinClause); -#line 2274 "VBNET.ATG" +#line 2283 "VBNET.ATG" middleClauses.Add(joinClause); } else if ( -#line 2275 "VBNET.ATG" +#line 2284 "VBNET.ATG" la.kind == Tokens.Group && Peek(1).kind == Tokens.Join) { GroupJoinQueryOperator( -#line 2275 "VBNET.ATG" +#line 2284 "VBNET.ATG" out groupJoinClause); -#line 2276 "VBNET.ATG" +#line 2285 "VBNET.ATG" middleClauses.Add(groupJoinClause); } else if (la.kind == 133) { GroupByQueryOperator( -#line 2277 "VBNET.ATG" +#line 2286 "VBNET.ATG" out groupByClause); -#line 2278 "VBNET.ATG" +#line 2287 "VBNET.ATG" middleClauses.Add(groupByClause); - } else SynErr(304); + } else SynErr(306); } void FromQueryOperator( -#line 2353 "VBNET.ATG" +#line 2362 "VBNET.ATG" out QueryExpressionFromClause fromClause) { -#line 2355 "VBNET.ATG" +#line 2364 "VBNET.ATG" fromClause = new QueryExpressionFromClause(); fromClause.StartLocation = la.Location; Expect(126); CollectionRangeVariableDeclarationList( -#line 2358 "VBNET.ATG" +#line 2367 "VBNET.ATG" fromClause.Sources); -#line 2360 "VBNET.ATG" +#line 2369 "VBNET.ATG" fromClause.EndLocation = t.EndLocation; } void AggregateQueryOperator( -#line 2422 "VBNET.ATG" +#line 2431 "VBNET.ATG" out QueryExpressionAggregateClause aggregateClause) { -#line 2424 "VBNET.ATG" +#line 2433 "VBNET.ATG" aggregateClause = new QueryExpressionAggregateClause(); aggregateClause.IntoVariables = new List(); aggregateClause.StartLocation = la.Location; @@ -6305,77 +6324,77 @@ out QueryExpressionAggregateClause aggregateClause) { Expect(58); CollectionRangeVariableDeclaration( -#line 2429 "VBNET.ATG" +#line 2438 "VBNET.ATG" out source); -#line 2431 "VBNET.ATG" +#line 2440 "VBNET.ATG" aggregateClause.Source = source; while (StartOf(30)) { QueryOperator( -#line 2434 "VBNET.ATG" +#line 2443 "VBNET.ATG" aggregateClause.MiddleClauses); } Expect(143); ExpressionRangeVariableDeclarationList( -#line 2436 "VBNET.ATG" +#line 2445 "VBNET.ATG" aggregateClause.IntoVariables); -#line 2438 "VBNET.ATG" +#line 2447 "VBNET.ATG" aggregateClause.EndLocation = t.EndLocation; } void SelectQueryOperator( -#line 2364 "VBNET.ATG" +#line 2373 "VBNET.ATG" List middleClauses) { -#line 2366 "VBNET.ATG" +#line 2375 "VBNET.ATG" QueryExpressionSelectVBClause selectClause = new QueryExpressionSelectVBClause(); selectClause.StartLocation = la.Location; Expect(197); ExpressionRangeVariableDeclarationList( -#line 2369 "VBNET.ATG" +#line 2378 "VBNET.ATG" selectClause.Variables); -#line 2371 "VBNET.ATG" +#line 2380 "VBNET.ATG" selectClause.EndLocation = t.Location; middleClauses.Add(selectClause); } void DistinctQueryOperator( -#line 2376 "VBNET.ATG" +#line 2385 "VBNET.ATG" List middleClauses) { -#line 2378 "VBNET.ATG" +#line 2387 "VBNET.ATG" QueryExpressionDistinctClause distinctClause = new QueryExpressionDistinctClause(); distinctClause.StartLocation = la.Location; Expect(107); -#line 2383 "VBNET.ATG" +#line 2392 "VBNET.ATG" distinctClause.EndLocation = t.EndLocation; middleClauses.Add(distinctClause); } void WhereQueryOperator( -#line 2388 "VBNET.ATG" +#line 2397 "VBNET.ATG" List middleClauses) { -#line 2390 "VBNET.ATG" +#line 2399 "VBNET.ATG" QueryExpressionWhereClause whereClause = new QueryExpressionWhereClause(); whereClause.StartLocation = la.Location; Expression operand = null; Expect(230); Expr( -#line 2394 "VBNET.ATG" +#line 2403 "VBNET.ATG" out operand); -#line 2396 "VBNET.ATG" +#line 2405 "VBNET.ATG" whereClause.Condition = operand; whereClause.EndLocation = t.EndLocation; @@ -6384,10 +6403,10 @@ out operand); } void OrderByQueryOperator( -#line 2281 "VBNET.ATG" +#line 2290 "VBNET.ATG" List middleClauses) { -#line 2283 "VBNET.ATG" +#line 2292 "VBNET.ATG" QueryExpressionOrderClause orderClause = new QueryExpressionOrderClause(); orderClause.StartLocation = la.Location; List orderings = null; @@ -6395,10 +6414,10 @@ List middleClauses) { Expect(176); Expect(70); OrderExpressionList( -#line 2287 "VBNET.ATG" +#line 2296 "VBNET.ATG" out orderings); -#line 2289 "VBNET.ATG" +#line 2298 "VBNET.ATG" orderClause.Orderings = orderings; orderClause.EndLocation = t.EndLocation; middleClauses.Add(orderClause); @@ -6406,10 +6425,10 @@ out orderings); } void PartitionQueryOperator( -#line 2403 "VBNET.ATG" +#line 2412 "VBNET.ATG" out QueryExpressionPartitionVBClause partitionClause) { -#line 2405 "VBNET.ATG" +#line 2414 "VBNET.ATG" partitionClause = new QueryExpressionPartitionVBClause(); partitionClause.StartLocation = la.Location; Expression expr = null; @@ -6417,60 +6436,60 @@ out QueryExpressionPartitionVBClause partitionClause) { if (la.kind == 212) { lexer.NextToken(); -#line 2410 "VBNET.ATG" +#line 2419 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Take; if (la.kind == 231) { lexer.NextToken(); -#line 2411 "VBNET.ATG" +#line 2420 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.TakeWhile; } } else if (la.kind == 203) { lexer.NextToken(); -#line 2412 "VBNET.ATG" +#line 2421 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Skip; if (la.kind == 231) { lexer.NextToken(); -#line 2413 "VBNET.ATG" +#line 2422 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.SkipWhile; } - } else SynErr(305); + } else SynErr(307); Expr( -#line 2415 "VBNET.ATG" +#line 2424 "VBNET.ATG" out expr); -#line 2417 "VBNET.ATG" +#line 2426 "VBNET.ATG" partitionClause.Expression = expr; partitionClause.EndLocation = t.EndLocation; } void LetQueryOperator( -#line 2442 "VBNET.ATG" +#line 2451 "VBNET.ATG" List middleClauses) { -#line 2444 "VBNET.ATG" +#line 2453 "VBNET.ATG" QueryExpressionLetVBClause letClause = new QueryExpressionLetVBClause(); letClause.StartLocation = la.Location; Expect(148); ExpressionRangeVariableDeclarationList( -#line 2447 "VBNET.ATG" +#line 2456 "VBNET.ATG" letClause.Variables); -#line 2449 "VBNET.ATG" +#line 2458 "VBNET.ATG" letClause.EndLocation = t.EndLocation; middleClauses.Add(letClause); } void JoinQueryOperator( -#line 2486 "VBNET.ATG" +#line 2495 "VBNET.ATG" out QueryExpressionJoinVBClause joinClause) { -#line 2488 "VBNET.ATG" +#line 2497 "VBNET.ATG" joinClause = new QueryExpressionJoinVBClause(); joinClause.StartLocation = la.Location; CollectionRangeVariable joinVariable = null; @@ -6480,203 +6499,203 @@ out QueryExpressionJoinVBClause joinClause) { Expect(146); CollectionRangeVariableDeclaration( -#line 2495 "VBNET.ATG" +#line 2504 "VBNET.ATG" out joinVariable); -#line 2496 "VBNET.ATG" +#line 2505 "VBNET.ATG" joinClause.JoinVariable = joinVariable; if (la.kind == 146) { JoinQueryOperator( -#line 2498 "VBNET.ATG" +#line 2507 "VBNET.ATG" out subJoin); -#line 2499 "VBNET.ATG" +#line 2508 "VBNET.ATG" joinClause.SubJoin = subJoin; } Expect(171); JoinCondition( -#line 2502 "VBNET.ATG" +#line 2511 "VBNET.ATG" out condition); -#line 2503 "VBNET.ATG" +#line 2512 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); while (la.kind == 60) { lexer.NextToken(); JoinCondition( -#line 2505 "VBNET.ATG" +#line 2514 "VBNET.ATG" out condition); -#line 2506 "VBNET.ATG" +#line 2515 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); } -#line 2509 "VBNET.ATG" +#line 2518 "VBNET.ATG" joinClause.EndLocation = t.EndLocation; } void GroupJoinQueryOperator( -#line 2339 "VBNET.ATG" +#line 2348 "VBNET.ATG" out QueryExpressionGroupJoinVBClause groupJoinClause) { -#line 2341 "VBNET.ATG" +#line 2350 "VBNET.ATG" groupJoinClause = new QueryExpressionGroupJoinVBClause(); groupJoinClause.StartLocation = la.Location; QueryExpressionJoinVBClause joinClause = null; Expect(133); JoinQueryOperator( -#line 2345 "VBNET.ATG" +#line 2354 "VBNET.ATG" out joinClause); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2346 "VBNET.ATG" +#line 2355 "VBNET.ATG" groupJoinClause.IntoVariables); -#line 2348 "VBNET.ATG" +#line 2357 "VBNET.ATG" groupJoinClause.JoinClause = joinClause; groupJoinClause.EndLocation = t.EndLocation; } void GroupByQueryOperator( -#line 2326 "VBNET.ATG" +#line 2335 "VBNET.ATG" out QueryExpressionGroupVBClause groupByClause) { -#line 2328 "VBNET.ATG" +#line 2337 "VBNET.ATG" groupByClause = new QueryExpressionGroupVBClause(); groupByClause.StartLocation = la.Location; Expect(133); ExpressionRangeVariableDeclarationList( -#line 2331 "VBNET.ATG" +#line 2340 "VBNET.ATG" groupByClause.GroupVariables); Expect(70); ExpressionRangeVariableDeclarationList( -#line 2332 "VBNET.ATG" +#line 2341 "VBNET.ATG" groupByClause.ByVariables); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2333 "VBNET.ATG" +#line 2342 "VBNET.ATG" groupByClause.IntoVariables); -#line 2335 "VBNET.ATG" +#line 2344 "VBNET.ATG" groupByClause.EndLocation = t.EndLocation; } void OrderExpressionList( -#line 2295 "VBNET.ATG" +#line 2304 "VBNET.ATG" out List orderings) { -#line 2297 "VBNET.ATG" +#line 2306 "VBNET.ATG" orderings = new List(); QueryExpressionOrdering ordering = null; OrderExpression( -#line 2300 "VBNET.ATG" +#line 2309 "VBNET.ATG" out ordering); -#line 2301 "VBNET.ATG" +#line 2310 "VBNET.ATG" orderings.Add(ordering); while (la.kind == 22) { lexer.NextToken(); OrderExpression( -#line 2303 "VBNET.ATG" +#line 2312 "VBNET.ATG" out ordering); -#line 2304 "VBNET.ATG" +#line 2313 "VBNET.ATG" orderings.Add(ordering); } } void OrderExpression( -#line 2308 "VBNET.ATG" +#line 2317 "VBNET.ATG" out QueryExpressionOrdering ordering) { -#line 2310 "VBNET.ATG" +#line 2319 "VBNET.ATG" ordering = new QueryExpressionOrdering(); ordering.StartLocation = la.Location; ordering.Direction = QueryExpressionOrderingDirection.None; Expression orderExpr = null; Expr( -#line 2315 "VBNET.ATG" +#line 2324 "VBNET.ATG" out orderExpr); -#line 2317 "VBNET.ATG" +#line 2326 "VBNET.ATG" ordering.Criteria = orderExpr; if (la.kind == 64 || la.kind == 104) { if (la.kind == 64) { lexer.NextToken(); -#line 2320 "VBNET.ATG" +#line 2329 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Ascending; } else { lexer.NextToken(); -#line 2321 "VBNET.ATG" +#line 2330 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Descending; } } -#line 2323 "VBNET.ATG" +#line 2332 "VBNET.ATG" ordering.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclarationList( -#line 2454 "VBNET.ATG" +#line 2463 "VBNET.ATG" List variables) { -#line 2456 "VBNET.ATG" +#line 2465 "VBNET.ATG" ExpressionRangeVariable variable = null; ExpressionRangeVariableDeclaration( -#line 2458 "VBNET.ATG" +#line 2467 "VBNET.ATG" out variable); -#line 2459 "VBNET.ATG" +#line 2468 "VBNET.ATG" variables.Add(variable); while (la.kind == 22) { lexer.NextToken(); ExpressionRangeVariableDeclaration( -#line 2460 "VBNET.ATG" +#line 2469 "VBNET.ATG" out variable); -#line 2460 "VBNET.ATG" +#line 2469 "VBNET.ATG" variables.Add(variable); } } void CollectionRangeVariableDeclarationList( -#line 2513 "VBNET.ATG" +#line 2522 "VBNET.ATG" List rangeVariables) { -#line 2514 "VBNET.ATG" +#line 2523 "VBNET.ATG" CollectionRangeVariable variableDeclaration; CollectionRangeVariableDeclaration( -#line 2516 "VBNET.ATG" +#line 2525 "VBNET.ATG" out variableDeclaration); -#line 2517 "VBNET.ATG" +#line 2526 "VBNET.ATG" rangeVariables.Add(variableDeclaration); while (la.kind == 22) { lexer.NextToken(); CollectionRangeVariableDeclaration( -#line 2518 "VBNET.ATG" +#line 2527 "VBNET.ATG" out variableDeclaration); -#line 2518 "VBNET.ATG" +#line 2527 "VBNET.ATG" rangeVariables.Add(variableDeclaration); } } void CollectionRangeVariableDeclaration( -#line 2521 "VBNET.ATG" +#line 2530 "VBNET.ATG" out CollectionRangeVariable rangeVariable) { -#line 2523 "VBNET.ATG" +#line 2532 "VBNET.ATG" rangeVariable = new CollectionRangeVariable(); rangeVariable.StartLocation = la.Location; TypeReference typeName = null; @@ -6684,71 +6703,71 @@ out CollectionRangeVariable rangeVariable) { Identifier(); -#line 2528 "VBNET.ATG" +#line 2537 "VBNET.ATG" rangeVariable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2529 "VBNET.ATG" +#line 2538 "VBNET.ATG" out typeName); -#line 2529 "VBNET.ATG" +#line 2538 "VBNET.ATG" rangeVariable.Type = typeName; } Expect(138); Expr( -#line 2530 "VBNET.ATG" +#line 2539 "VBNET.ATG" out inExpr); -#line 2532 "VBNET.ATG" +#line 2541 "VBNET.ATG" rangeVariable.Expression = inExpr; rangeVariable.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclaration( -#line 2463 "VBNET.ATG" +#line 2472 "VBNET.ATG" out ExpressionRangeVariable variable) { -#line 2465 "VBNET.ATG" +#line 2474 "VBNET.ATG" variable = new ExpressionRangeVariable(); variable.StartLocation = la.Location; Expression rhs = null; TypeReference typeName = null; if ( -#line 2471 "VBNET.ATG" +#line 2480 "VBNET.ATG" IsIdentifiedExpressionRange()) { Identifier(); -#line 2472 "VBNET.ATG" +#line 2481 "VBNET.ATG" variable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2474 "VBNET.ATG" +#line 2483 "VBNET.ATG" out typeName); -#line 2475 "VBNET.ATG" +#line 2484 "VBNET.ATG" variable.Type = typeName; } Expect(20); } Expr( -#line 2479 "VBNET.ATG" +#line 2488 "VBNET.ATG" out rhs); -#line 2481 "VBNET.ATG" +#line 2490 "VBNET.ATG" variable.Expression = rhs; variable.EndLocation = t.EndLocation; } void JoinCondition( -#line 2537 "VBNET.ATG" +#line 2546 "VBNET.ATG" out QueryExpressionJoinConditionVB condition) { -#line 2539 "VBNET.ATG" +#line 2548 "VBNET.ATG" condition = new QueryExpressionJoinConditionVB(); condition.StartLocation = la.Location; @@ -6756,14 +6775,14 @@ out QueryExpressionJoinConditionVB condition) { Expression rhs = null; Expr( -#line 2545 "VBNET.ATG" +#line 2554 "VBNET.ATG" out lhs); Expect(116); Expr( -#line 2545 "VBNET.ATG" +#line 2554 "VBNET.ATG" out rhs); -#line 2547 "VBNET.ATG" +#line 2556 "VBNET.ATG" condition.LeftSide = lhs; condition.RightSide = rhs; condition.EndLocation = t.EndLocation; @@ -6771,93 +6790,93 @@ out rhs); } void Argument( -#line 2611 "VBNET.ATG" +#line 2620 "VBNET.ATG" out Expression argumentexpr) { -#line 2613 "VBNET.ATG" +#line 2622 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 2617 "VBNET.ATG" +#line 2626 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 2617 "VBNET.ATG" +#line 2626 "VBNET.ATG" name = t.val; Expect(55); Expr( -#line 2617 "VBNET.ATG" +#line 2626 "VBNET.ATG" out expr); -#line 2619 "VBNET.ATG" +#line 2628 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); - } else if (StartOf(29)) { + } else if (StartOf(24)) { Expr( -#line 2622 "VBNET.ATG" +#line 2631 "VBNET.ATG" out argumentexpr); - } else SynErr(306); + } else SynErr(308); } void QualIdentAndTypeArguments( -#line 2688 "VBNET.ATG" +#line 2697 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2689 "VBNET.ATG" +#line 2698 "VBNET.ATG" string name; typeref = null; Qualident( -#line 2691 "VBNET.ATG" +#line 2700 "VBNET.ATG" out name); -#line 2692 "VBNET.ATG" +#line 2701 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 2693 "VBNET.ATG" +#line 2702 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); if ( -#line 2695 "VBNET.ATG" +#line 2704 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2696 "VBNET.ATG" +#line 2705 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 22) { lexer.NextToken(); -#line 2697 "VBNET.ATG" +#line 2706 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } } else if (StartOf(8)) { TypeArgumentList( -#line 2698 "VBNET.ATG" +#line 2707 "VBNET.ATG" typeref.GenericTypes); - } else SynErr(307); + } else SynErr(309); Expect(38); } } void RankList( -#line 2735 "VBNET.ATG" +#line 2744 "VBNET.ATG" out int i) { -#line 2736 "VBNET.ATG" +#line 2745 "VBNET.ATG" i = 0; while (la.kind == 22) { lexer.NextToken(); -#line 2737 "VBNET.ATG" +#line 2746 "VBNET.ATG" ++i; } } void Attribute( -#line 2776 "VBNET.ATG" +#line 2785 "VBNET.ATG" out ASTAttribute attribute) { -#line 2777 "VBNET.ATG" +#line 2786 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -6867,52 +6886,52 @@ out ASTAttribute attribute) { Expect(26); } Qualident( -#line 2782 "VBNET.ATG" +#line 2791 "VBNET.ATG" out name); if (la.kind == 37) { AttributeArguments( -#line 2783 "VBNET.ATG" +#line 2792 "VBNET.ATG" positional, named); } -#line 2785 "VBNET.ATG" +#line 2794 "VBNET.ATG" attribute = new ASTAttribute(name, positional, named); } void AttributeArguments( -#line 2790 "VBNET.ATG" +#line 2799 "VBNET.ATG" List positional, List named) { -#line 2792 "VBNET.ATG" +#line 2801 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(37); if ( -#line 2798 "VBNET.ATG" +#line 2807 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2800 "VBNET.ATG" +#line 2809 "VBNET.ATG" IsNamedAssign()) { -#line 2800 "VBNET.ATG" +#line 2809 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2801 "VBNET.ATG" +#line 2810 "VBNET.ATG" out name); if (la.kind == 55) { lexer.NextToken(); } else if (la.kind == 20) { lexer.NextToken(); - } else SynErr(308); + } else SynErr(310); } Expr( -#line 2803 "VBNET.ATG" +#line 2812 "VBNET.ATG" out expr); -#line 2805 "VBNET.ATG" +#line 2814 "VBNET.ATG" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } @@ -6921,29 +6940,29 @@ out expr); while (la.kind == 22) { lexer.NextToken(); if ( -#line 2813 "VBNET.ATG" +#line 2822 "VBNET.ATG" IsNamedAssign()) { -#line 2813 "VBNET.ATG" +#line 2822 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2814 "VBNET.ATG" +#line 2823 "VBNET.ATG" out name); if (la.kind == 55) { lexer.NextToken(); } else if (la.kind == 20) { lexer.NextToken(); - } else SynErr(309); - } else if (StartOf(29)) { + } else SynErr(311); + } else if (StartOf(24)) { -#line 2816 "VBNET.ATG" +#line 2825 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); - } else SynErr(310); + } else SynErr(312); Expr( -#line 2817 "VBNET.ATG" +#line 2826 "VBNET.ATG" out expr); -#line 2817 "VBNET.ATG" +#line 2826 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -6954,10 +6973,10 @@ out expr); } void FormalParameter( -#line 2874 "VBNET.ATG" +#line 2883 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2876 "VBNET.ATG" +#line 2885 "VBNET.ATG" AttributeSection section; List attributes = new List(); TypeReference type = null; @@ -6968,36 +6987,36 @@ out ParameterDeclarationExpression p) { while (la.kind == 40) { AttributeSection( -#line 2885 "VBNET.ATG" +#line 2894 "VBNET.ATG" out section); -#line 2885 "VBNET.ATG" +#line 2894 "VBNET.ATG" attributes.Add(section); } while (StartOf(48)) { ParameterModifier( -#line 2886 "VBNET.ATG" +#line 2895 "VBNET.ATG" mod); } Identifier(); -#line 2887 "VBNET.ATG" +#line 2896 "VBNET.ATG" string parameterName = t.val; if ( -#line 2888 "VBNET.ATG" +#line 2897 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2888 "VBNET.ATG" +#line 2897 "VBNET.ATG" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2889 "VBNET.ATG" +#line 2898 "VBNET.ATG" out type); } -#line 2891 "VBNET.ATG" +#line 2900 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -7011,11 +7030,11 @@ out type); if (la.kind == 20) { lexer.NextToken(); Expr( -#line 2901 "VBNET.ATG" +#line 2910 "VBNET.ATG" out expr); } -#line 2903 "VBNET.ATG" +#line 2912 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); p.Attributes = attributes; @@ -7023,34 +7042,34 @@ out expr); } void ParameterModifier( -#line 3587 "VBNET.ATG" +#line 3596 "VBNET.ATG" ParamModifierList m) { if (la.kind == 72) { lexer.NextToken(); -#line 3588 "VBNET.ATG" +#line 3597 "VBNET.ATG" m.Add(ParameterModifiers.In); } else if (la.kind == 69) { lexer.NextToken(); -#line 3589 "VBNET.ATG" +#line 3598 "VBNET.ATG" m.Add(ParameterModifiers.Ref); } else if (la.kind == 174) { lexer.NextToken(); -#line 3590 "VBNET.ATG" +#line 3599 "VBNET.ATG" m.Add(ParameterModifiers.Optional); } else if (la.kind == 182) { lexer.NextToken(); -#line 3591 "VBNET.ATG" +#line 3600 "VBNET.ATG" m.Add(ParameterModifiers.Params); - } else SynErr(311); + } else SynErr(313); } void Statement() { -#line 2932 "VBNET.ATG" +#line 2941 "VBNET.ATG" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -7058,27 +7077,27 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 21) { } else if ( -#line 2938 "VBNET.ATG" +#line 2947 "VBNET.ATG" IsLabel()) { LabelName( -#line 2938 "VBNET.ATG" +#line 2947 "VBNET.ATG" out label); -#line 2940 "VBNET.ATG" +#line 2949 "VBNET.ATG" AddChild(new LabelStatement(t.val)); Expect(21); Statement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 2943 "VBNET.ATG" +#line 2952 "VBNET.ATG" out stmt); -#line 2943 "VBNET.ATG" +#line 2952 "VBNET.ATG" AddChild(stmt); - } else SynErr(312); + } else SynErr(314); -#line 2946 "VBNET.ATG" +#line 2955 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -7087,30 +7106,30 @@ out stmt); } void LabelName( -#line 3361 "VBNET.ATG" +#line 3370 "VBNET.ATG" out string name) { -#line 3363 "VBNET.ATG" +#line 3372 "VBNET.ATG" name = String.Empty; if (StartOf(4)) { Identifier(); -#line 3365 "VBNET.ATG" +#line 3374 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 3366 "VBNET.ATG" +#line 3375 "VBNET.ATG" name = t.val; - } else SynErr(313); + } else SynErr(315); } void LocalDeclarationStatement( -#line 2954 "VBNET.ATG" +#line 2963 "VBNET.ATG" out Statement statement) { -#line 2956 "VBNET.ATG" +#line 2965 "VBNET.ATG" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -7119,22 +7138,22 @@ out Statement statement) { if (la.kind == 88) { lexer.NextToken(); -#line 2962 "VBNET.ATG" +#line 2971 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); } else if (la.kind == 204) { lexer.NextToken(); -#line 2963 "VBNET.ATG" +#line 2972 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 2964 "VBNET.ATG" +#line 2973 "VBNET.ATG" dimfound = true; } } -#line 2967 "VBNET.ATG" +#line 2976 "VBNET.ATG" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -7147,135 +7166,135 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2978 "VBNET.ATG" +#line 2987 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 2979 "VBNET.ATG" +#line 2988 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2981 "VBNET.ATG" +#line 2990 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 3475 "VBNET.ATG" +#line 3484 "VBNET.ATG" out Statement tryStatement) { -#line 3477 "VBNET.ATG" +#line 3486 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(218); EndOfStmt(); Block( -#line 3480 "VBNET.ATG" +#line 3489 "VBNET.ATG" out blockStmt); if (la.kind == 75 || la.kind == 113 || la.kind == 123) { CatchClauses( -#line 3481 "VBNET.ATG" +#line 3490 "VBNET.ATG" out catchClauses); } if (la.kind == 123) { lexer.NextToken(); EndOfStmt(); Block( -#line 3482 "VBNET.ATG" +#line 3491 "VBNET.ATG" out finallyStmt); } Expect(113); Expect(218); -#line 3485 "VBNET.ATG" +#line 3494 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 3455 "VBNET.ATG" +#line 3464 "VBNET.ATG" out Statement withStatement) { -#line 3457 "VBNET.ATG" +#line 3466 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(233); -#line 3460 "VBNET.ATG" +#line 3469 "VBNET.ATG" Location start = t.Location; Expr( -#line 3461 "VBNET.ATG" +#line 3470 "VBNET.ATG" out expr); EndOfStmt(); -#line 3463 "VBNET.ATG" +#line 3472 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 3466 "VBNET.ATG" +#line 3475 "VBNET.ATG" out blockStmt); -#line 3468 "VBNET.ATG" +#line 3477 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; Expect(113); Expect(233); -#line 3471 "VBNET.ATG" +#line 3480 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 3448 "VBNET.ATG" +#line 3457 "VBNET.ATG" out ConditionType conditionType) { -#line 3449 "VBNET.ATG" +#line 3458 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 231) { lexer.NextToken(); -#line 3450 "VBNET.ATG" +#line 3459 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 224) { lexer.NextToken(); -#line 3451 "VBNET.ATG" +#line 3460 "VBNET.ATG" conditionType = ConditionType.Until; - } else SynErr(314); + } else SynErr(316); } void LoopControlVariable( -#line 3291 "VBNET.ATG" +#line 3300 "VBNET.ATG" out TypeReference type, out string name) { -#line 3292 "VBNET.ATG" +#line 3301 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 3296 "VBNET.ATG" +#line 3305 "VBNET.ATG" out name); if ( -#line 3297 "VBNET.ATG" +#line 3306 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 3297 "VBNET.ATG" +#line 3306 "VBNET.ATG" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3298 "VBNET.ATG" +#line 3307 "VBNET.ATG" out type); -#line 3298 "VBNET.ATG" +#line 3307 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 3300 "VBNET.ATG" +#line 3309 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -7287,34 +7306,34 @@ out type); } void ReDimClause( -#line 3370 "VBNET.ATG" +#line 3379 "VBNET.ATG" out Expression expr) { SimpleNonInvocationExpression( -#line 3372 "VBNET.ATG" +#line 3381 "VBNET.ATG" out expr); ReDimClauseInternal( -#line 3373 "VBNET.ATG" +#line 3382 "VBNET.ATG" ref expr); } void SingleLineStatementList( -#line 3277 "VBNET.ATG" +#line 3286 "VBNET.ATG" List list) { -#line 3278 "VBNET.ATG" +#line 3287 "VBNET.ATG" Statement embeddedStatement = null; if (la.kind == 113) { lexer.NextToken(); -#line 3280 "VBNET.ATG" +#line 3289 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 3281 "VBNET.ATG" +#line 3290 "VBNET.ATG" out embeddedStatement); - } else SynErr(315); + } else SynErr(317); -#line 3282 "VBNET.ATG" +#line 3291 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); while (la.kind == 21) { lexer.NextToken(); @@ -7324,62 +7343,62 @@ out embeddedStatement); if (la.kind == 113) { lexer.NextToken(); -#line 3284 "VBNET.ATG" +#line 3293 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 3285 "VBNET.ATG" +#line 3294 "VBNET.ATG" out embeddedStatement); - } else SynErr(316); + } else SynErr(318); -#line 3286 "VBNET.ATG" +#line 3295 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); } } void CaseClauses( -#line 3408 "VBNET.ATG" +#line 3417 "VBNET.ATG" out List caseClauses) { -#line 3410 "VBNET.ATG" +#line 3419 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 3413 "VBNET.ATG" +#line 3422 "VBNET.ATG" out caseClause); -#line 3413 "VBNET.ATG" +#line 3422 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 22) { lexer.NextToken(); CaseClause( -#line 3414 "VBNET.ATG" +#line 3423 "VBNET.ATG" out caseClause); -#line 3414 "VBNET.ATG" +#line 3423 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 3311 "VBNET.ATG" +#line 3320 "VBNET.ATG" out OnErrorStatement stmt) { -#line 3313 "VBNET.ATG" +#line 3322 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(171); Expect(118); if ( -#line 3319 "VBNET.ATG" +#line 3328 "VBNET.ATG" IsNegativeLabelName()) { Expect(132); Expect(30); Expect(5); -#line 3321 "VBNET.ATG" +#line 3330 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -7388,10 +7407,10 @@ IsNegativeLabelName()) { } else if (la.kind == 132) { GotoStatement( -#line 3327 "VBNET.ATG" +#line 3336 "VBNET.ATG" out goToStatement); -#line 3329 "VBNET.ATG" +#line 3338 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -7408,88 +7427,88 @@ out goToStatement); lexer.NextToken(); Expect(163); -#line 3343 "VBNET.ATG" +#line 3352 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); - } else SynErr(317); + } else SynErr(319); } void GotoStatement( -#line 3349 "VBNET.ATG" +#line 3358 "VBNET.ATG" out GotoStatement goToStatement) { -#line 3351 "VBNET.ATG" +#line 3360 "VBNET.ATG" string label = String.Empty; Expect(132); LabelName( -#line 3354 "VBNET.ATG" +#line 3363 "VBNET.ATG" out label); -#line 3356 "VBNET.ATG" +#line 3365 "VBNET.ATG" goToStatement = new GotoStatement(label); } void ResumeStatement( -#line 3397 "VBNET.ATG" +#line 3406 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 3399 "VBNET.ATG" +#line 3408 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 3402 "VBNET.ATG" +#line 3411 "VBNET.ATG" IsResumeNext()) { Expect(194); Expect(163); -#line 3403 "VBNET.ATG" +#line 3412 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 194) { lexer.NextToken(); if (StartOf(50)) { LabelName( -#line 3404 "VBNET.ATG" +#line 3413 "VBNET.ATG" out label); } -#line 3404 "VBNET.ATG" +#line 3413 "VBNET.ATG" resumeStatement = new ResumeStatement(label); - } else SynErr(318); + } else SynErr(320); } void ReDimClauseInternal( -#line 3376 "VBNET.ATG" +#line 3385 "VBNET.ATG" ref Expression expr) { -#line 3377 "VBNET.ATG" +#line 3386 "VBNET.ATG" List arguments; bool canBeNormal; bool canBeRedim; string name; while (la.kind == 26 || -#line 3380 "VBNET.ATG" +#line 3389 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { if (la.kind == 26) { lexer.NextToken(); IdentifierOrKeyword( -#line 3379 "VBNET.ATG" +#line 3388 "VBNET.ATG" out name); -#line 3379 "VBNET.ATG" +#line 3388 "VBNET.ATG" expr = new MemberReferenceExpression(expr, name); } else { InvocationExpression( -#line 3381 "VBNET.ATG" +#line 3390 "VBNET.ATG" ref expr); } } Expect(37); NormalOrReDimArgumentList( -#line 3384 "VBNET.ATG" +#line 3393 "VBNET.ATG" out arguments, out canBeNormal, out canBeRedim); Expect(38); -#line 3386 "VBNET.ATG" +#line 3395 "VBNET.ATG" expr = new InvocationExpression(expr, arguments); if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { if (this.Errors.Count == 0) { @@ -7501,10 +7520,10 @@ out arguments, out canBeNormal, out canBeRedim); } void CaseClause( -#line 3418 "VBNET.ATG" +#line 3427 "VBNET.ATG" out CaseLabel caseClause) { -#line 3420 "VBNET.ATG" +#line 3429 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -7513,7 +7532,7 @@ out CaseLabel caseClause) { if (la.kind == 111) { lexer.NextToken(); -#line 3426 "VBNET.ATG" +#line 3435 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(51)) { if (la.kind == 144) { @@ -7523,76 +7542,76 @@ out CaseLabel caseClause) { case 40: { lexer.NextToken(); -#line 3430 "VBNET.ATG" +#line 3439 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 39: { lexer.NextToken(); -#line 3431 "VBNET.ATG" +#line 3440 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 43: { lexer.NextToken(); -#line 3432 "VBNET.ATG" +#line 3441 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 42: { lexer.NextToken(); -#line 3433 "VBNET.ATG" +#line 3442 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 20: { lexer.NextToken(); -#line 3434 "VBNET.ATG" +#line 3443 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 41: { lexer.NextToken(); -#line 3435 "VBNET.ATG" +#line 3444 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } - default: SynErr(319); break; + default: SynErr(321); break; } Expr( -#line 3437 "VBNET.ATG" +#line 3446 "VBNET.ATG" out expr); -#line 3439 "VBNET.ATG" +#line 3448 "VBNET.ATG" caseClause = new CaseLabel(op, expr); - } else if (StartOf(29)) { + } else if (StartOf(24)) { Expr( -#line 3441 "VBNET.ATG" +#line 3450 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); Expr( -#line 3441 "VBNET.ATG" +#line 3450 "VBNET.ATG" out sexpr); } -#line 3443 "VBNET.ATG" +#line 3452 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); - } else SynErr(320); + } else SynErr(322); } void CatchClauses( -#line 3490 "VBNET.ATG" +#line 3499 "VBNET.ATG" out List catchClauses) { -#line 3492 "VBNET.ATG" +#line 3501 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -7604,27 +7623,27 @@ out List catchClauses) { if (StartOf(4)) { Identifier(); -#line 3500 "VBNET.ATG" +#line 3509 "VBNET.ATG" name = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3500 "VBNET.ATG" +#line 3509 "VBNET.ATG" out type); } } if (la.kind == 229) { lexer.NextToken(); Expr( -#line 3501 "VBNET.ATG" +#line 3510 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 3503 "VBNET.ATG" +#line 3512 "VBNET.ATG" out blockStmt); -#line 3504 "VBNET.ATG" +#line 3513 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } @@ -7911,57 +7930,59 @@ out blockStmt); case 267: s = "invalid Charset"; break; case 268: s = "invalid IdentifierForFieldDeclaration"; break; case 269: s = "invalid VariableDeclaratorPartAfterIdentifier"; break; - case 270: s = "invalid AccessorDecls"; break; - case 271: s = "invalid EventAccessorDeclaration"; break; - case 272: s = "invalid OverloadableOperator"; break; - case 273: s = "invalid EventMemberSpecifier"; break; - case 274: s = "invalid LambdaExpr"; break; - case 275: s = "invalid AssignmentOperator"; break; - case 276: s = "invalid SimpleExpr"; break; - case 277: s = "invalid SimpleExpr"; break; - case 278: s = "invalid SimpleNonInvocationExpression"; break; - case 279: s = "invalid SimpleNonInvocationExpression"; break; + case 270: s = "invalid ObjectCreateExpression"; break; + case 271: s = "invalid ObjectCreateExpression"; break; + case 272: s = "invalid AccessorDecls"; break; + case 273: s = "invalid EventAccessorDeclaration"; break; + case 274: s = "invalid OverloadableOperator"; break; + case 275: s = "invalid EventMemberSpecifier"; break; + case 276: s = "invalid LambdaExpr"; break; + case 277: s = "invalid AssignmentOperator"; break; + case 278: s = "invalid SimpleExpr"; break; + case 279: s = "invalid SimpleExpr"; break; case 280: s = "invalid SimpleNonInvocationExpression"; break; case 281: s = "invalid SimpleNonInvocationExpression"; break; case 282: s = "invalid SimpleNonInvocationExpression"; break; case 283: s = "invalid SimpleNonInvocationExpression"; break; - case 284: s = "invalid PrimitiveTypeName"; break; - case 285: s = "invalid CastTarget"; break; - case 286: s = "invalid XmlLiteralExpression"; break; - case 287: s = "invalid XmlContentExpression"; break; - case 288: s = "invalid XmlElement"; break; - case 289: s = "invalid XmlElement"; break; - case 290: s = "invalid XmlNestedContent"; break; - case 291: s = "invalid XmlAttribute"; break; - case 292: s = "invalid XmlAttribute"; break; - case 293: s = "invalid ComparisonExpr"; break; - case 294: s = "invalid SubLambdaExpression"; break; - case 295: s = "invalid FunctionLambdaExpression"; break; - case 296: s = "invalid EmbeddedStatement"; break; - case 297: s = "invalid EmbeddedStatement"; break; + case 284: s = "invalid SimpleNonInvocationExpression"; break; + case 285: s = "invalid SimpleNonInvocationExpression"; break; + case 286: s = "invalid PrimitiveTypeName"; break; + case 287: s = "invalid CastTarget"; break; + case 288: s = "invalid XmlLiteralExpression"; break; + case 289: s = "invalid XmlContentExpression"; break; + case 290: s = "invalid XmlElement"; break; + case 291: s = "invalid XmlElement"; break; + case 292: s = "invalid XmlNestedContent"; break; + case 293: s = "invalid XmlAttribute"; break; + case 294: s = "invalid XmlAttribute"; break; + case 295: s = "invalid ComparisonExpr"; break; + case 296: s = "invalid SubLambdaExpression"; break; + case 297: s = "invalid FunctionLambdaExpression"; break; case 298: s = "invalid EmbeddedStatement"; break; case 299: s = "invalid EmbeddedStatement"; break; case 300: s = "invalid EmbeddedStatement"; break; case 301: s = "invalid EmbeddedStatement"; break; case 302: s = "invalid EmbeddedStatement"; break; - case 303: s = "invalid FromOrAggregateQueryOperator"; break; - case 304: s = "invalid QueryOperator"; break; - case 305: s = "invalid PartitionQueryOperator"; break; - case 306: s = "invalid Argument"; break; - case 307: s = "invalid QualIdentAndTypeArguments"; break; - case 308: s = "invalid AttributeArguments"; break; - case 309: s = "invalid AttributeArguments"; break; + case 303: s = "invalid EmbeddedStatement"; break; + case 304: s = "invalid EmbeddedStatement"; break; + case 305: s = "invalid FromOrAggregateQueryOperator"; break; + case 306: s = "invalid QueryOperator"; break; + case 307: s = "invalid PartitionQueryOperator"; break; + case 308: s = "invalid Argument"; break; + case 309: s = "invalid QualIdentAndTypeArguments"; break; case 310: s = "invalid AttributeArguments"; break; - case 311: s = "invalid ParameterModifier"; break; - case 312: s = "invalid Statement"; break; - case 313: s = "invalid LabelName"; break; - case 314: s = "invalid WhileOrUntil"; break; - case 315: s = "invalid SingleLineStatementList"; break; - case 316: s = "invalid SingleLineStatementList"; break; - case 317: s = "invalid OnErrorStatement"; break; - case 318: s = "invalid ResumeStatement"; break; - case 319: s = "invalid CaseClause"; break; - case 320: s = "invalid CaseClause"; break; + case 311: s = "invalid AttributeArguments"; break; + case 312: s = "invalid AttributeArguments"; break; + case 313: s = "invalid ParameterModifier"; break; + case 314: s = "invalid Statement"; break; + case 315: s = "invalid LabelName"; break; + case 316: s = "invalid WhileOrUntil"; break; + case 317: s = "invalid SingleLineStatementList"; break; + case 318: s = "invalid SingleLineStatementList"; break; + case 319: s = "invalid OnErrorStatement"; break; + case 320: s = "invalid ResumeStatement"; break; + case 321: s = "invalid CaseClause"; break; + case 322: s = "invalid CaseClause"; break; default: s = "error " + errorNumber; break; } @@ -7998,12 +8019,12 @@ out blockStmt); {x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, T,T,T,T, x,x,x,x, x,x,T,T, T,T,T,T, x,x,T,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,T,x, T,T,T,T, T,x,T,T, x,x,x,x, T,T,T,T, T,T,T,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,x,T,T, x,T,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,x, x,T,T,x, x,T,x,T, x,x,x,T, x,T,x,T, x,x,T,T, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, T,T,x,x, T,x,T,x, x,x,x,x, T,x,T,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,T, x,x,x,x, T,x,x,x, T,T,x,x, x,T,x,T, T,T,T,T, T,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x}, {x,T,T,T, T,T,T,T, T,T,T,x, x,x,x,x, T,T,T,T, x,T,x,x, x,x,T,T, T,T,x,x, x,x,x,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,x, x,x,T,x, T,T,T,T, T,x,T,T, x,T,x,x, T,T,T,T, T,T,T,T, x,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,T,T,T, T,T,x,x, x,x,x,x, T,T,T,x, T,T,T,x, T,x,T,x, x,T,T,x, T,T,x,T, x,x,x,T, x,T,x,T, x,x,T,T, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, x,T,x,x, T,x,T,T, x,x,x,x, T,x,T,x, x,x,x,x, T,x,x,x, x,T,x,T, x,T,T,T, T,T,x,x, x,T,T,T, T,x,T,x, T,x,x,T, T,T,x,T, x,T,T,T, T,T,T,T, T,T,T,x, x,x,T,T, x,T,x,x, x,x,x,x}, {x,T,T,T, T,T,T,T, T,T,T,x, x,T,x,x, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,x,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x, T,T,T,x, T,T,T,T, T,T,T,T, T,x,T,T, x,T,x,x, T,T,T,T, T,T,T,T, x,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,T,T,T, T,T,x,T, x,T,x,x, T,T,T,x, T,T,T,x, T,x,T,x, x,T,T,x, T,T,x,T, T,x,x,T, x,T,x,T, T,T,T,T, T,x,T,T, x,T,T,x, x,x,T,T, x,x,T,x, x,T,x,x, T,x,T,T, x,x,x,T, T,T,T,x, x,x,x,x, T,x,x,x, x,T,x,T, x,T,T,T, T,T,x,x, x,T,T,T, T,T,T,x, T,x,x,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x, x,x,T,T, x,T,x,x, T,x,x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, T,T,T,T, x,x,x,x, x,x,T,T, T,T,T,T, x,x,T,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,T,x, T,T,T,T, T,x,T,T, x,x,x,x, T,T,T,T, T,T,T,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,x,T,T, x,T,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,T,x, x,T,x,T, x,x,x,T, x,T,x,T, x,x,T,T, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, T,T,x,x, T,x,T,x, x,x,x,x, T,x,T,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,T, x,x,x,x, T,x,T,x, T,T,x,x, x,T,x,T, T,T,T,T, T,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, - {x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, T,T,T,T, x,x,x,x, x,x,T,T, T,T,T,T, x,x,T,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,T,x, T,T,T,T, T,x,T,T, x,x,x,x, T,T,T,T, T,T,T,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,x,T,T, x,T,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,T,x, x,T,x,T, x,x,x,T, x,T,x,T, x,x,T,T, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, T,T,x,x, T,x,T,x, x,x,x,x, T,x,T,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,T, x,x,x,x, T,x,T,x, T,T,x,x, x,T,x,T, T,T,T,T, T,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x}, diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index 811a5abf36..dfe343803b 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -2112,6 +2112,7 @@ ObjectCreateExpression ( (. MemberInitializerExpression memberInitializer = null; + Expression anonymousMember = null; .) "With" (. @@ -2119,11 +2120,19 @@ ObjectCreateExpression memberInitializers.StartLocation = la.Location; .) "{" - MemberInitializer - (. memberInitializers.CreateExpressions.Add(memberInitializer); .) - { "," + ( MemberInitializer - (. memberInitializers.CreateExpressions.Add(memberInitializer); .) + (. memberInitializers.CreateExpressions.Add(memberInitializer); .) + | Expr + (. memberInitializers.CreateExpressions.Add(anonymousMember); .) + ) + { "," + ( + MemberInitializer + (. memberInitializers.CreateExpressions.Add(memberInitializer); .) + | Expr + (. memberInitializers.CreateExpressions.Add(anonymousMember); .) + ) } "}" (. diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs index fa93e53982..4b081bf4c1 100644 --- a/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/Expressions/ObjectCreateExpressionTests.cs @@ -201,6 +201,19 @@ namespace ICSharpCode.NRefactory.Tests.Ast Assert.IsInstanceOf(typeof(MemberInitializerExpression), oce.ObjectInitializer.CreateExpressions[1]); } + [Test] + public void VBNetAnonymousTypeWithoutProperty() + { + ObjectCreateExpression oce = ParseUtilVBNet.ParseExpression("New With { c }"); + + Assert.IsTrue(oce.CreateType.IsNull); + Assert.AreEqual(0, oce.Parameters.Count); + Assert.AreEqual(1, oce.ObjectInitializer.CreateExpressions.Count); + + Assert.IsInstanceOf(typeof(IdentifierExpression), oce.ObjectInitializer.CreateExpressions[0]); + Assert.AreEqual("c", (oce.ObjectInitializer.CreateExpressions[0] as IdentifierExpression).Identifier); + } + [Test] public void VBNetSimpleObjectCreateExpressionTest() {