diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Lexer.cs b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Lexer.cs index 1b5efa1809..eee9491d28 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Lexer.cs +++ b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Lexer.cs @@ -1049,5 +1049,10 @@ namespace ICSharpCode.NRefactory.Parser.VB kind = lastToken.kind; } } + + public void SetInitialContext(SnippetType type) + { + ef.SetContext(type); + } } } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.atg b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.atg index 5661e8b550..a596495960 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.atg +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.atg @@ -413,11 +413,12 @@ StatementTerminatorAndBlock = . Expression + (.NamedState:startOfExpression.) += (. if (la != null) CurrentBlock.lastExpressionStart = la.Location; .) -= SimpleExpressionWithSuffix { BinaryOperator SimpleExpressionWithSuffix } . diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.cs index 01d7d7851f..782e11f751 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.cs @@ -52,7 +52,7 @@ namespace ICSharpCode.NRefactory.Parser.VBNet.Experimental return; Block current = stack.Peek(); -// +// // switch (token.kind) { // case Tokens.EOL: // case Tokens.Colon: @@ -81,6 +81,15 @@ namespace ICSharpCode.NRefactory.Parser.VBNet.Experimental output.AppendLine(text); } + public void SetContext(SnippetType type) + { + switch (type) { + case SnippetType.Expression: + currentState = startOfExpression; + break; + } + } + public string Output { get { return output.ToString(); } } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/Parser.cs index a513231203..33b47efd11 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/Parser.cs @@ -14,11 +14,13 @@ namespace ICSharpCode.NRefactory.Parser.VBNet.Experimental { partial class ExpressionFinder { + const int startOfExpression = 35; + const int endOfStatementTerminatorAndBlock = 157; const bool T = true; const bool x = false; -int currentState = 0; + int currentState = 0; readonly Stack stateStack = new Stack(); bool nextTokenIsPotentialStartOfXmlMode = false; @@ -54,7 +56,6 @@ int currentState = 0; nextTokenIsPotentialStartOfXmlMode = false; readXmlIdentifier = false; nextTokenIsStartOfImportsOrAccessExpression = false; - const int endOfStatementTerminatorAndBlock = 157; switchlbl: switch (currentState) { case 0: { PushContext(Context.Global, t); diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index 2f9111f7bb..71e915f7b5 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -181,7 +181,7 @@ out u); void GlobalAttributeSection() { Expect(40); -#line 2653 "VBNET.ATG" +#line 2692 "VBNET.ATG" Location startPos = t.Location; if (la.kind == 65) { lexer.NextToken(); @@ -189,20 +189,20 @@ out u); lexer.NextToken(); } else SynErr(242); -#line 2655 "VBNET.ATG" +#line 2694 "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 2659 "VBNET.ATG" +#line 2698 "VBNET.ATG" out attribute); -#line 2659 "VBNET.ATG" +#line 2698 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2660 "VBNET.ATG" +#line 2699 "VBNET.ATG" NotFinalComma()) { if (la.kind == 22) { lexer.NextToken(); @@ -214,10 +214,10 @@ NotFinalComma()) { Expect(21); } Attribute( -#line 2660 "VBNET.ATG" +#line 2699 "VBNET.ATG" out attribute); -#line 2660 "VBNET.ATG" +#line 2699 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 22) { @@ -226,7 +226,7 @@ out attribute); Expect(39); EndOfStmt(); -#line 2665 "VBNET.ATG" +#line 2704 "VBNET.ATG" AttributeSection section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -352,47 +352,47 @@ out aliasedType); } void Qualident( -#line 3409 "VBNET.ATG" +#line 3448 "VBNET.ATG" out string qualident) { -#line 3411 "VBNET.ATG" +#line 3450 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 3415 "VBNET.ATG" +#line 3454 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 3416 "VBNET.ATG" +#line 3455 "VBNET.ATG" DotAndIdentOrKw()) { Expect(26); IdentifierOrKeyword( -#line 3416 "VBNET.ATG" +#line 3455 "VBNET.ATG" out name); -#line 3416 "VBNET.ATG" +#line 3455 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 3418 "VBNET.ATG" +#line 3457 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 2526 "VBNET.ATG" +#line 2565 "VBNET.ATG" out TypeReference typeref) { -#line 2527 "VBNET.ATG" +#line 2566 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2529 "VBNET.ATG" +#line 2568 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 2533 "VBNET.ATG" +#line 2572 "VBNET.ATG" out rank); -#line 2534 "VBNET.ATG" +#line 2573 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -423,35 +423,35 @@ out rank); } void AttributeSection( -#line 2728 "VBNET.ATG" +#line 2767 "VBNET.ATG" out AttributeSection section) { -#line 2730 "VBNET.ATG" +#line 2769 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(40); -#line 2734 "VBNET.ATG" +#line 2773 "VBNET.ATG" Location startPos = t.Location; if ( -#line 2735 "VBNET.ATG" +#line 2774 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 119) { lexer.NextToken(); -#line 2736 "VBNET.ATG" +#line 2775 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 195) { lexer.NextToken(); -#line 2737 "VBNET.ATG" +#line 2776 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2740 "VBNET.ATG" +#line 2779 "VBNET.ATG" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -464,20 +464,20 @@ IsLocalAttrTarget()) { Expect(21); } Attribute( -#line 2750 "VBNET.ATG" +#line 2789 "VBNET.ATG" out attribute); -#line 2750 "VBNET.ATG" +#line 2789 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2751 "VBNET.ATG" +#line 2790 "VBNET.ATG" NotFinalComma()) { Expect(22); Attribute( -#line 2751 "VBNET.ATG" +#line 2790 "VBNET.ATG" out attribute); -#line 2751 "VBNET.ATG" +#line 2790 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 22) { @@ -485,7 +485,7 @@ out attribute); } Expect(39); -#line 2755 "VBNET.ATG" +#line 2794 "VBNET.ATG" section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -496,69 +496,69 @@ out attribute); } void TypeModifier( -#line 3494 "VBNET.ATG" +#line 3533 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 188: { lexer.NextToken(); -#line 3495 "VBNET.ATG" +#line 3534 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 187: { lexer.NextToken(); -#line 3496 "VBNET.ATG" +#line 3535 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 125: { lexer.NextToken(); -#line 3497 "VBNET.ATG" +#line 3536 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 185: { lexer.NextToken(); -#line 3498 "VBNET.ATG" +#line 3537 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 200: { lexer.NextToken(); -#line 3499 "VBNET.ATG" +#line 3538 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 199: { lexer.NextToken(); -#line 3500 "VBNET.ATG" +#line 3539 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 156: { lexer.NextToken(); -#line 3501 "VBNET.ATG" +#line 3540 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 166: { lexer.NextToken(); -#line 3502 "VBNET.ATG" +#line 3541 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 183: { lexer.NextToken(); -#line 3503 "VBNET.ATG" +#line 3542 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -1131,10 +1131,10 @@ m, attributes); } void NonArrayTypeName( -#line 2552 "VBNET.ATG" +#line 2591 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2554 "VBNET.ATG" +#line 2593 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; @@ -1144,36 +1144,36 @@ out TypeReference typeref, bool canBeUnbound) { lexer.NextToken(); Expect(26); -#line 2559 "VBNET.ATG" +#line 2598 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 2560 "VBNET.ATG" +#line 2599 "VBNET.ATG" out typeref, canBeUnbound); -#line 2561 "VBNET.ATG" +#line 2600 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 26) { lexer.NextToken(); -#line 2562 "VBNET.ATG" +#line 2601 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 2563 "VBNET.ATG" +#line 2602 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 2564 "VBNET.ATG" +#line 2603 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 168) { lexer.NextToken(); -#line 2567 "VBNET.ATG" +#line 2606 "VBNET.ATG" typeref = new TypeReference("System.Object", true); if (la.kind == 33) { lexer.NextToken(); -#line 2571 "VBNET.ATG" +#line 2610 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1181,15 +1181,15 @@ out nestedTypeRef, canBeUnbound); } } else if (StartOf(12)) { PrimitiveTypeName( -#line 2577 "VBNET.ATG" +#line 2616 "VBNET.ATG" out name); -#line 2577 "VBNET.ATG" +#line 2616 "VBNET.ATG" typeref = new TypeReference(name, true); if (la.kind == 33) { lexer.NextToken(); -#line 2581 "VBNET.ATG" +#line 2620 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1275,162 +1275,162 @@ TypeDeclaration newType) { } void FormalParameterList( -#line 2765 "VBNET.ATG" +#line 2804 "VBNET.ATG" List parameter) { -#line 2766 "VBNET.ATG" +#line 2805 "VBNET.ATG" ParameterDeclarationExpression p; FormalParameter( -#line 2768 "VBNET.ATG" +#line 2807 "VBNET.ATG" out p); -#line 2768 "VBNET.ATG" +#line 2807 "VBNET.ATG" if (p != null) parameter.Add(p); while (la.kind == 22) { lexer.NextToken(); FormalParameter( -#line 2770 "VBNET.ATG" +#line 2809 "VBNET.ATG" out p); -#line 2770 "VBNET.ATG" +#line 2809 "VBNET.ATG" if (p != null) parameter.Add(p); } } void MemberModifier( -#line 3506 "VBNET.ATG" +#line 3545 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 156: { lexer.NextToken(); -#line 3507 "VBNET.ATG" +#line 3546 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 102: { lexer.NextToken(); -#line 3508 "VBNET.ATG" +#line 3547 "VBNET.ATG" m.Add(Modifiers.Default, t.Location); break; } case 125: { lexer.NextToken(); -#line 3509 "VBNET.ATG" +#line 3548 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 199: { lexer.NextToken(); -#line 3510 "VBNET.ATG" +#line 3549 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 181: { lexer.NextToken(); -#line 3511 "VBNET.ATG" +#line 3550 "VBNET.ATG" m.Add(Modifiers.Override, t.Location); break; } case 157: { lexer.NextToken(); -#line 3512 "VBNET.ATG" +#line 3551 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 185: { lexer.NextToken(); -#line 3513 "VBNET.ATG" +#line 3552 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 187: { lexer.NextToken(); -#line 3514 "VBNET.ATG" +#line 3553 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 188: { lexer.NextToken(); -#line 3515 "VBNET.ATG" +#line 3554 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 166: { lexer.NextToken(); -#line 3516 "VBNET.ATG" +#line 3555 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 167: { lexer.NextToken(); -#line 3517 "VBNET.ATG" +#line 3556 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 200: { lexer.NextToken(); -#line 3518 "VBNET.ATG" +#line 3557 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 180: { lexer.NextToken(); -#line 3519 "VBNET.ATG" +#line 3558 "VBNET.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 179: { lexer.NextToken(); -#line 3520 "VBNET.ATG" +#line 3559 "VBNET.ATG" m.Add(Modifiers.Overloads, t.Location); break; } case 190: { lexer.NextToken(); -#line 3521 "VBNET.ATG" +#line 3560 "VBNET.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 235: { lexer.NextToken(); -#line 3522 "VBNET.ATG" +#line 3561 "VBNET.ATG" m.Add(Modifiers.WriteOnly, t.Location); break; } case 234: { lexer.NextToken(); -#line 3523 "VBNET.ATG" +#line 3562 "VBNET.ATG" m.Add(Modifiers.WithEvents, t.Location); break; } case 105: { lexer.NextToken(); -#line 3524 "VBNET.ATG" +#line 3563 "VBNET.ATG" m.Add(Modifiers.Dim, t.Location); break; } case 183: { lexer.NextToken(); -#line 3525 "VBNET.ATG" +#line 3564 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -2514,6 +2514,10 @@ out expr); } else if (StartOf(21)) { DisjunctionExpr( #line 1653 "VBNET.ATG" +out expr); + } else if (StartOf(22)) { + XmlLiteralExpression( +#line 1654 "VBNET.ATG" out expr); } else SynErr(265); } @@ -2578,25 +2582,25 @@ out name); } void Block( -#line 2810 "VBNET.ATG" +#line 2849 "VBNET.ATG" out Statement stmt) { -#line 2813 "VBNET.ATG" +#line 2852 "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 2819 "VBNET.ATG" + while (StartOf(23) || +#line 2858 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2819 "VBNET.ATG" +#line 2858 "VBNET.ATG" IsEndStmtAhead()) { Expect(113); EndOfStmt(); -#line 2819 "VBNET.ATG" +#line 2858 "VBNET.ATG" AddChild(new EndStatement()); } else { Statement(); @@ -2604,7 +2608,7 @@ IsEndStmtAhead()) { } } -#line 2824 "VBNET.ATG" +#line 2863 "VBNET.ATG" stmt = blockStmt; if (t != null) blockStmt.EndLocation = t.EndLocation; BlockEnd(); @@ -2798,7 +2802,7 @@ out expr); type = ((ArrayCreateExpression)expr).CreateType.Clone(); } - } else if (StartOf(23)) { + } else if (StartOf(24)) { if (la.kind == 63) { lexer.NextToken(); TypeName( @@ -2904,10 +2908,10 @@ out expr); } void ObjectCreateExpression( -#line 1978 "VBNET.ATG" +#line 2017 "VBNET.ATG" out Expression oce) { -#line 1980 "VBNET.ATG" +#line 2019 "VBNET.ATG" TypeReference type = null; CollectionInitializerExpression initializer = null; List arguments = null; @@ -2918,39 +2922,39 @@ out Expression oce) { Expect(162); if (StartOf(8)) { NonArrayTypeName( -#line 1988 "VBNET.ATG" +#line 2027 "VBNET.ATG" out type, false); if (la.kind == 37) { lexer.NextToken(); NormalOrReDimArgumentList( -#line 1989 "VBNET.ATG" +#line 2028 "VBNET.ATG" out arguments, out canBeNormal, out canBeReDim); Expect(38); if (la.kind == 35 || -#line 1990 "VBNET.ATG" +#line 2029 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { if ( -#line 1990 "VBNET.ATG" +#line 2029 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { ArrayTypeModifiers( -#line 1991 "VBNET.ATG" +#line 2030 "VBNET.ATG" out dimensions); CollectionInitializer( -#line 1992 "VBNET.ATG" +#line 2031 "VBNET.ATG" out initializer); } else { CollectionInitializer( -#line 1993 "VBNET.ATG" +#line 2032 "VBNET.ATG" out initializer); } } -#line 1995 "VBNET.ATG" +#line 2034 "VBNET.ATG" if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); } } -#line 1999 "VBNET.ATG" +#line 2038 "VBNET.ATG" if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); } else { @@ -2965,34 +2969,34 @@ out initializer); if (la.kind == 126 || la.kind == 233) { if (la.kind == 233) { -#line 2014 "VBNET.ATG" +#line 2053 "VBNET.ATG" MemberInitializerExpression memberInitializer = null; lexer.NextToken(); -#line 2018 "VBNET.ATG" +#line 2057 "VBNET.ATG" CollectionInitializerExpression memberInitializers = new CollectionInitializerExpression(); memberInitializers.StartLocation = la.Location; Expect(35); MemberInitializer( -#line 2022 "VBNET.ATG" +#line 2061 "VBNET.ATG" out memberInitializer); -#line 2023 "VBNET.ATG" +#line 2062 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); while (la.kind == 22) { lexer.NextToken(); MemberInitializer( -#line 2025 "VBNET.ATG" +#line 2064 "VBNET.ATG" out memberInitializer); -#line 2026 "VBNET.ATG" +#line 2065 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); } Expect(36); -#line 2030 "VBNET.ATG" +#line 2069 "VBNET.ATG" memberInitializers.EndLocation = t.Location; if(oce is ObjectCreateExpression) { @@ -3002,10 +3006,10 @@ out memberInitializer); } else { lexer.NextToken(); CollectionInitializer( -#line 2040 "VBNET.ATG" +#line 2079 "VBNET.ATG" out initializer); -#line 2042 "VBNET.ATG" +#line 2081 "VBNET.ATG" if(oce is ObjectCreateExpression) ((ObjectCreateExpression)oce).ObjectInitializer = initializer; @@ -3031,11 +3035,11 @@ out section); #line 1372 "VBNET.ATG" attributes.Add(section); } - if (StartOf(24)) { + if (StartOf(25)) { GetAccessorDecl( #line 1374 "VBNET.ATG" out getBlock, attributes); - if (StartOf(25)) { + if (StartOf(26)) { #line 1376 "VBNET.ATG" attributes = new List(); @@ -3051,11 +3055,11 @@ out section); #line 1378 "VBNET.ATG" out setBlock, attributes); } - } else if (StartOf(26)) { + } else if (StartOf(27)) { SetAccessorDecl( #line 1381 "VBNET.ATG" out setBlock, attributes); - if (StartOf(27)) { + if (StartOf(28)) { #line 1383 "VBNET.ATG" attributes = new List(); @@ -3416,31 +3420,31 @@ out stmt); } void PropertyAccessorAccessModifier( -#line 3528 "VBNET.ATG" +#line 3567 "VBNET.ATG" out Modifiers m) { -#line 3529 "VBNET.ATG" +#line 3568 "VBNET.ATG" m = Modifiers.None; - while (StartOf(28)) { + while (StartOf(29)) { if (la.kind == 188) { lexer.NextToken(); -#line 3531 "VBNET.ATG" +#line 3570 "VBNET.ATG" m |= Modifiers.Public; } else if (la.kind == 187) { lexer.NextToken(); -#line 3532 "VBNET.ATG" +#line 3571 "VBNET.ATG" m |= Modifiers.Protected; } else if (la.kind == 125) { lexer.NextToken(); -#line 3533 "VBNET.ATG" +#line 3572 "VBNET.ATG" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 3534 "VBNET.ATG" +#line 3573 "VBNET.ATG" m |= Modifiers.Private; } } @@ -3461,14 +3465,14 @@ out arrayModifiers); } void ArrayNameModifier( -#line 2605 "VBNET.ATG" +#line 2644 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2607 "VBNET.ATG" +#line 2646 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 2609 "VBNET.ATG" +#line 2648 "VBNET.ATG" out arrayModifiers); } @@ -3524,7 +3528,7 @@ out CollectionInitializerExpression outExpr) { CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Expect(35); - if (StartOf(29)) { + if (StartOf(30)) { Expr( #line 1559 "VBNET.ATG" out expr); @@ -3576,328 +3580,405 @@ out eventName); } void IdentifierOrKeyword( -#line 3461 "VBNET.ATG" +#line 3500 "VBNET.ATG" out string name) { lexer.NextToken(); -#line 3463 "VBNET.ATG" +#line 3502 "VBNET.ATG" name = t.val; } void QueryExpr( -#line 2129 "VBNET.ATG" +#line 2168 "VBNET.ATG" out Expression expr) { -#line 2131 "VBNET.ATG" +#line 2170 "VBNET.ATG" QueryExpressionVB qexpr = new QueryExpressionVB(); qexpr.StartLocation = la.Location; expr = qexpr; FromOrAggregateQueryOperator( -#line 2135 "VBNET.ATG" +#line 2174 "VBNET.ATG" qexpr.Clauses); - while (StartOf(30)) { + while (StartOf(31)) { QueryOperator( -#line 2136 "VBNET.ATG" +#line 2175 "VBNET.ATG" qexpr.Clauses); } -#line 2138 "VBNET.ATG" +#line 2177 "VBNET.ATG" qexpr.EndLocation = t.EndLocation; } void LambdaExpr( -#line 2049 "VBNET.ATG" +#line 2088 "VBNET.ATG" out Expression expr) { -#line 2051 "VBNET.ATG" +#line 2090 "VBNET.ATG" LambdaExpression lambda = null; if (la.kind == 210) { SubLambdaExpression( -#line 2053 "VBNET.ATG" +#line 2092 "VBNET.ATG" out lambda); } else if (la.kind == 127) { FunctionLambdaExpression( -#line 2054 "VBNET.ATG" +#line 2093 "VBNET.ATG" out lambda); } else SynErr(273); -#line 2055 "VBNET.ATG" +#line 2094 "VBNET.ATG" expr = lambda; } void DisjunctionExpr( -#line 1822 "VBNET.ATG" +#line 1861 "VBNET.ATG" out Expression outExpr) { -#line 1824 "VBNET.ATG" +#line 1863 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConjunctionExpr( -#line 1827 "VBNET.ATG" +#line 1866 "VBNET.ATG" out outExpr); while (la.kind == 175 || la.kind == 177 || la.kind == 236) { if (la.kind == 175) { lexer.NextToken(); -#line 1830 "VBNET.ATG" +#line 1869 "VBNET.ATG" op = BinaryOperatorType.BitwiseOr; } else if (la.kind == 177) { lexer.NextToken(); -#line 1831 "VBNET.ATG" +#line 1870 "VBNET.ATG" op = BinaryOperatorType.LogicalOr; } else { lexer.NextToken(); -#line 1832 "VBNET.ATG" +#line 1871 "VBNET.ATG" op = BinaryOperatorType.ExclusiveOr; } ConjunctionExpr( -#line 1834 "VBNET.ATG" +#line 1873 "VBNET.ATG" out expr); -#line 1834 "VBNET.ATG" +#line 1873 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } + void XmlLiteralExpression( +#line 1770 "VBNET.ATG" +out Expression pexpr) { + +#line 1772 "VBNET.ATG" + XmlLiteralExpression expr = new XmlLiteralExpression(); + List exprs = expr.Expressions; + XmlExpression currentExpression = null; + + if (la.kind == 16) { + lexer.NextToken(); + +#line 1778 "VBNET.ATG" + currentExpression = new XmlContentExpression(t.val, XmlContentType.Text); + } else if (la.kind == 18) { + lexer.NextToken(); + +#line 1779 "VBNET.ATG" + currentExpression = new XmlContentExpression(t.val, XmlContentType.CData); + } else if (la.kind == 17) { + lexer.NextToken(); + +#line 1780 "VBNET.ATG" + currentExpression = new XmlContentExpression(t.val, XmlContentType.Comment); + } else if (la.kind == 19) { + lexer.NextToken(); + +#line 1781 "VBNET.ATG" + currentExpression = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); + } else SynErr(274); + +#line 1784 "VBNET.ATG" + currentExpression.StartLocation = t.Location; + currentExpression.EndLocation = t.EndLocation; + exprs.Add(currentExpression); + pexpr = expr; + + } + void AssignmentOperator( -#line 1656 "VBNET.ATG" +#line 1657 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1657 "VBNET.ATG" +#line 1658 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 20: { lexer.NextToken(); -#line 1658 "VBNET.ATG" +#line 1659 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 54: { lexer.NextToken(); -#line 1659 "VBNET.ATG" +#line 1660 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 46: { lexer.NextToken(); -#line 1660 "VBNET.ATG" +#line 1661 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 48: { lexer.NextToken(); -#line 1661 "VBNET.ATG" +#line 1662 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 49: { lexer.NextToken(); -#line 1662 "VBNET.ATG" +#line 1663 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 50: { lexer.NextToken(); -#line 1663 "VBNET.ATG" +#line 1664 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 51: { lexer.NextToken(); -#line 1664 "VBNET.ATG" +#line 1665 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 47: { lexer.NextToken(); -#line 1665 "VBNET.ATG" +#line 1666 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 52: { lexer.NextToken(); -#line 1666 "VBNET.ATG" +#line 1667 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 53: { lexer.NextToken(); -#line 1667 "VBNET.ATG" +#line 1668 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } - default: SynErr(274); break; + default: SynErr(275); break; } } void SimpleExpr( -#line 1671 "VBNET.ATG" +#line 1672 "VBNET.ATG" out Expression pexpr) { -#line 1672 "VBNET.ATG" +#line 1673 "VBNET.ATG" string name; SimpleNonInvocationExpression( -#line 1674 "VBNET.ATG" +#line 1675 "VBNET.ATG" out pexpr); - while (la.kind == 26 || la.kind == 29 || la.kind == 37) { + while (StartOf(32)) { if (la.kind == 26) { lexer.NextToken(); - IdentifierOrKeyword( -#line 1676 "VBNET.ATG" + if (la.kind == 10) { + lexer.NextToken(); + IdentifierOrKeyword( +#line 1678 "VBNET.ATG" +out name); + Expect(11); + +#line 1679 "VBNET.ATG" + pexpr = new XmlMemberAccessExpression(pexpr, XmlAxisType.Element, name, true); + } else if (StartOf(33)) { + IdentifierOrKeyword( +#line 1680 "VBNET.ATG" out name); -#line 1677 "VBNET.ATG" - pexpr = new MemberReferenceExpression(pexpr, name); +#line 1681 "VBNET.ATG" + pexpr = new MemberReferenceExpression(pexpr, name); + } else SynErr(276); if ( -#line 1678 "VBNET.ATG" +#line 1683 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); TypeArgumentList( -#line 1679 "VBNET.ATG" +#line 1684 "VBNET.ATG" ((MemberReferenceExpression)pexpr).TypeArguments); Expect(38); } } else if (la.kind == 29) { lexer.NextToken(); IdentifierOrKeyword( -#line 1681 "VBNET.ATG" +#line 1686 "VBNET.ATG" out name); -#line 1681 "VBNET.ATG" +#line 1686 "VBNET.ATG" pexpr = new BinaryOperatorExpression(pexpr, BinaryOperatorType.DictionaryAccess, new PrimitiveExpression(name, name)); + } else if (la.kind == 27 || la.kind == 28) { + +#line 1687 "VBNET.ATG" + XmlAxisType type = XmlAxisType.Attribute; bool isXmlName = false; + if (la.kind == 28) { + lexer.NextToken(); + } else if (la.kind == 27) { + lexer.NextToken(); + +#line 1688 "VBNET.ATG" + type = XmlAxisType.Descendents; + } else SynErr(277); + if (la.kind == 10) { + lexer.NextToken(); + +#line 1688 "VBNET.ATG" + isXmlName = true; + } + IdentifierOrKeyword( +#line 1688 "VBNET.ATG" +out name); + if (la.kind == 11) { + lexer.NextToken(); + } + +#line 1689 "VBNET.ATG" + pexpr = new XmlMemberAccessExpression(pexpr, type, name, isXmlName); } else { InvocationExpression( -#line 1682 "VBNET.ATG" +#line 1690 "VBNET.ATG" ref pexpr); } } } void SimpleNonInvocationExpression( -#line 1686 "VBNET.ATG" +#line 1694 "VBNET.ATG" out Expression pexpr) { -#line 1688 "VBNET.ATG" +#line 1696 "VBNET.ATG" Expression expr; CollectionInitializerExpression cie; TypeReference type = null; string name = String.Empty; pexpr = null; - if (StartOf(31)) { + if (StartOf(34)) { switch (la.kind) { case 3: { lexer.NextToken(); -#line 1697 "VBNET.ATG" +#line 1705 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 4: { lexer.NextToken(); -#line 1698 "VBNET.ATG" +#line 1706 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 7: { lexer.NextToken(); -#line 1699 "VBNET.ATG" +#line 1707 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 6: { lexer.NextToken(); -#line 1700 "VBNET.ATG" +#line 1708 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 5: { lexer.NextToken(); -#line 1701 "VBNET.ATG" +#line 1709 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 9: { lexer.NextToken(); -#line 1702 "VBNET.ATG" +#line 1710 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 8: { lexer.NextToken(); -#line 1703 "VBNET.ATG" +#line 1711 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 217: { lexer.NextToken(); -#line 1705 "VBNET.ATG" +#line 1713 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); break; } case 122: { lexer.NextToken(); -#line 1706 "VBNET.ATG" +#line 1714 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); break; } case 165: { lexer.NextToken(); -#line 1707 "VBNET.ATG" +#line 1715 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); break; } case 37: { lexer.NextToken(); Expr( -#line 1708 "VBNET.ATG" +#line 1716 "VBNET.ATG" out expr); Expect(38); -#line 1708 "VBNET.ATG" +#line 1716 "VBNET.ATG" pexpr = new ParenthesizedExpression(expr); break; } case 2: case 58: case 62: case 64: case 65: case 66: case 67: case 70: case 87: case 98: case 104: case 107: case 116: case 121: case 126: case 133: case 139: case 143: case 146: case 147: case 170: case 176: case 178: case 184: case 203: case 212: case 213: case 223: case 224: case 230: { Identifier(); -#line 1710 "VBNET.ATG" +#line 1718 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); pexpr.StartLocation = t.Location; pexpr.EndLocation = t.EndLocation; if ( -#line 1713 "VBNET.ATG" +#line 1721 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); TypeArgumentList( -#line 1714 "VBNET.ATG" +#line 1722 "VBNET.ATG" ((IdentifierExpression)pexpr).TypeArguments); Expect(38); } @@ -3905,51 +3986,51 @@ la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { } case 68: case 71: case 82: case 99: case 100: case 109: case 141: case 151: case 168: case 196: case 201: case 202: case 208: case 221: case 222: case 225: { -#line 1716 "VBNET.ATG" +#line 1724 "VBNET.ATG" string val = String.Empty; if (StartOf(12)) { PrimitiveTypeName( -#line 1717 "VBNET.ATG" +#line 1725 "VBNET.ATG" out val); } else if (la.kind == 168) { lexer.NextToken(); -#line 1717 "VBNET.ATG" +#line 1725 "VBNET.ATG" val = "System.Object"; - } else SynErr(275); + } else SynErr(278); -#line 1718 "VBNET.ATG" +#line 1726 "VBNET.ATG" pexpr = new TypeReferenceExpression(new TypeReference(val, true)); break; } case 153: { lexer.NextToken(); -#line 1719 "VBNET.ATG" +#line 1727 "VBNET.ATG" pexpr = new ThisReferenceExpression(); break; } case 158: case 159: { -#line 1720 "VBNET.ATG" +#line 1728 "VBNET.ATG" Expression retExpr = null; if (la.kind == 158) { lexer.NextToken(); -#line 1721 "VBNET.ATG" +#line 1729 "VBNET.ATG" retExpr = new BaseReferenceExpression(); } else if (la.kind == 159) { lexer.NextToken(); -#line 1722 "VBNET.ATG" +#line 1730 "VBNET.ATG" retExpr = new ClassReferenceExpression(); - } else SynErr(276); + } else SynErr(279); Expect(26); IdentifierOrKeyword( -#line 1724 "VBNET.ATG" +#line 1732 "VBNET.ATG" out name); -#line 1724 "VBNET.ATG" +#line 1732 "VBNET.ATG" pexpr = new MemberReferenceExpression(retExpr, name); break; } @@ -3958,86 +4039,86 @@ out name); Expect(26); Identifier(); -#line 1726 "VBNET.ATG" +#line 1734 "VBNET.ATG" type = new TypeReference(t.val ?? ""); -#line 1728 "VBNET.ATG" +#line 1736 "VBNET.ATG" type.IsGlobal = true; -#line 1729 "VBNET.ATG" +#line 1737 "VBNET.ATG" pexpr = new TypeReferenceExpression(type); break; } case 162: { ObjectCreateExpression( -#line 1730 "VBNET.ATG" +#line 1738 "VBNET.ATG" out expr); -#line 1730 "VBNET.ATG" +#line 1738 "VBNET.ATG" pexpr = expr; break; } case 35: { CollectionInitializer( -#line 1731 "VBNET.ATG" +#line 1739 "VBNET.ATG" out cie); -#line 1731 "VBNET.ATG" +#line 1739 "VBNET.ATG" pexpr = cie; break; } case 94: case 106: case 219: { -#line 1733 "VBNET.ATG" +#line 1741 "VBNET.ATG" CastType castType = CastType.Cast; if (la.kind == 106) { lexer.NextToken(); } else if (la.kind == 94) { lexer.NextToken(); -#line 1735 "VBNET.ATG" +#line 1743 "VBNET.ATG" castType = CastType.Conversion; } else if (la.kind == 219) { lexer.NextToken(); -#line 1736 "VBNET.ATG" +#line 1744 "VBNET.ATG" castType = CastType.TryCast; - } else SynErr(277); + } else SynErr(280); Expect(37); Expr( -#line 1738 "VBNET.ATG" +#line 1746 "VBNET.ATG" out expr); Expect(22); TypeName( -#line 1738 "VBNET.ATG" +#line 1746 "VBNET.ATG" out type); Expect(38); -#line 1739 "VBNET.ATG" +#line 1747 "VBNET.ATG" pexpr = new CastExpression(type, expr, castType); break; } case 76: case 77: case 78: case 79: case 80: case 81: case 83: case 85: case 86: case 90: case 91: case 92: case 93: case 95: case 96: case 97: { CastTarget( -#line 1740 "VBNET.ATG" +#line 1748 "VBNET.ATG" out type); Expect(37); Expr( -#line 1740 "VBNET.ATG" +#line 1748 "VBNET.ATG" out expr); Expect(38); -#line 1740 "VBNET.ATG" +#line 1748 "VBNET.ATG" pexpr = new CastExpression(type, expr, CastType.PrimitiveConversion); break; } case 57: { lexer.NextToken(); Expr( -#line 1741 "VBNET.ATG" +#line 1749 "VBNET.ATG" out expr); -#line 1741 "VBNET.ATG" +#line 1749 "VBNET.ATG" pexpr = new AddressOfExpression(expr); break; } @@ -4045,347 +4126,388 @@ out expr); lexer.NextToken(); Expect(37); GetTypeTypeName( -#line 1742 "VBNET.ATG" +#line 1750 "VBNET.ATG" out type); Expect(38); -#line 1742 "VBNET.ATG" +#line 1750 "VBNET.ATG" pexpr = new TypeOfExpression(type); break; } case 220: { lexer.NextToken(); SimpleExpr( -#line 1743 "VBNET.ATG" +#line 1751 "VBNET.ATG" out expr); Expect(144); TypeName( -#line 1743 "VBNET.ATG" +#line 1751 "VBNET.ATG" out type); -#line 1743 "VBNET.ATG" +#line 1751 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); break; } case 135: { ConditionalExpression( -#line 1744 "VBNET.ATG" +#line 1752 "VBNET.ATG" out pexpr); break; } } } else if (la.kind == 26) { lexer.NextToken(); + if (la.kind == 10) { + lexer.NextToken(); + IdentifierOrKeyword( +#line 1757 "VBNET.ATG" +out name); + Expect(11); + +#line 1758 "VBNET.ATG" + pexpr = new XmlMemberAccessExpression(null, XmlAxisType.Element, name, true); + } else if (StartOf(33)) { + IdentifierOrKeyword( +#line 1759 "VBNET.ATG" +out name); + +#line 1760 "VBNET.ATG" + pexpr = new MemberReferenceExpression(null, name); + } else SynErr(281); + } else if (la.kind == 27 || la.kind == 28) { + +#line 1762 "VBNET.ATG" + XmlAxisType axisType = XmlAxisType.Element; bool isXmlIdentifier = false; + if (la.kind == 27) { + lexer.NextToken(); + +#line 1763 "VBNET.ATG" + axisType = XmlAxisType.Descendents; + } else { + lexer.NextToken(); + +#line 1763 "VBNET.ATG" + axisType = XmlAxisType.Attribute; + } + if (la.kind == 10) { + lexer.NextToken(); + +#line 1764 "VBNET.ATG" + isXmlIdentifier = true; + } IdentifierOrKeyword( -#line 1748 "VBNET.ATG" +#line 1764 "VBNET.ATG" out name); + if (la.kind == 11) { + lexer.NextToken(); + } -#line 1748 "VBNET.ATG" - pexpr = new MemberReferenceExpression(null, name); - } else SynErr(278); +#line 1765 "VBNET.ATG" + pexpr = new XmlMemberAccessExpression(null, axisType, name, isXmlIdentifier); + } else SynErr(282); } void TypeArgumentList( -#line 2641 "VBNET.ATG" +#line 2680 "VBNET.ATG" List typeArguments) { -#line 2643 "VBNET.ATG" +#line 2682 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2645 "VBNET.ATG" +#line 2684 "VBNET.ATG" out typeref); -#line 2645 "VBNET.ATG" +#line 2684 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 2648 "VBNET.ATG" +#line 2687 "VBNET.ATG" out typeref); -#line 2648 "VBNET.ATG" +#line 2687 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void InvocationExpression( -#line 1786 "VBNET.ATG" +#line 1825 "VBNET.ATG" ref Expression pexpr) { -#line 1787 "VBNET.ATG" +#line 1826 "VBNET.ATG" List parameters = null; Expect(37); -#line 1789 "VBNET.ATG" +#line 1828 "VBNET.ATG" Location start = t.Location; ArgumentList( -#line 1790 "VBNET.ATG" +#line 1829 "VBNET.ATG" out parameters); Expect(38); -#line 1793 "VBNET.ATG" +#line 1832 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); -#line 1795 "VBNET.ATG" +#line 1834 "VBNET.ATG" pexpr.StartLocation = start; pexpr.EndLocation = t.Location; } void PrimitiveTypeName( -#line 3468 "VBNET.ATG" +#line 3507 "VBNET.ATG" out string type) { -#line 3469 "VBNET.ATG" +#line 3508 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 68: { lexer.NextToken(); -#line 3470 "VBNET.ATG" +#line 3509 "VBNET.ATG" type = "System.Boolean"; break; } case 99: { lexer.NextToken(); -#line 3471 "VBNET.ATG" +#line 3510 "VBNET.ATG" type = "System.DateTime"; break; } case 82: { lexer.NextToken(); -#line 3472 "VBNET.ATG" +#line 3511 "VBNET.ATG" type = "System.Char"; break; } case 208: { lexer.NextToken(); -#line 3473 "VBNET.ATG" +#line 3512 "VBNET.ATG" type = "System.String"; break; } case 100: { lexer.NextToken(); -#line 3474 "VBNET.ATG" +#line 3513 "VBNET.ATG" type = "System.Decimal"; break; } case 71: { lexer.NextToken(); -#line 3475 "VBNET.ATG" +#line 3514 "VBNET.ATG" type = "System.Byte"; break; } case 201: { lexer.NextToken(); -#line 3476 "VBNET.ATG" +#line 3515 "VBNET.ATG" type = "System.Int16"; break; } case 141: { lexer.NextToken(); -#line 3477 "VBNET.ATG" +#line 3516 "VBNET.ATG" type = "System.Int32"; break; } case 151: { lexer.NextToken(); -#line 3478 "VBNET.ATG" +#line 3517 "VBNET.ATG" type = "System.Int64"; break; } case 202: { lexer.NextToken(); -#line 3479 "VBNET.ATG" +#line 3518 "VBNET.ATG" type = "System.Single"; break; } case 109: { lexer.NextToken(); -#line 3480 "VBNET.ATG" +#line 3519 "VBNET.ATG" type = "System.Double"; break; } case 221: { lexer.NextToken(); -#line 3481 "VBNET.ATG" +#line 3520 "VBNET.ATG" type = "System.UInt32"; break; } case 222: { lexer.NextToken(); -#line 3482 "VBNET.ATG" +#line 3521 "VBNET.ATG" type = "System.UInt64"; break; } case 225: { lexer.NextToken(); -#line 3483 "VBNET.ATG" +#line 3522 "VBNET.ATG" type = "System.UInt16"; break; } case 196: { lexer.NextToken(); -#line 3484 "VBNET.ATG" +#line 3523 "VBNET.ATG" type = "System.SByte"; break; } - default: SynErr(279); break; + default: SynErr(283); break; } } void CastTarget( -#line 1800 "VBNET.ATG" +#line 1839 "VBNET.ATG" out TypeReference type) { -#line 1802 "VBNET.ATG" +#line 1841 "VBNET.ATG" type = null; switch (la.kind) { case 76: { lexer.NextToken(); -#line 1804 "VBNET.ATG" +#line 1843 "VBNET.ATG" type = new TypeReference("System.Boolean", true); break; } case 77: { lexer.NextToken(); -#line 1805 "VBNET.ATG" +#line 1844 "VBNET.ATG" type = new TypeReference("System.Byte", true); break; } case 90: { lexer.NextToken(); -#line 1806 "VBNET.ATG" +#line 1845 "VBNET.ATG" type = new TypeReference("System.SByte", true); break; } case 78: { lexer.NextToken(); -#line 1807 "VBNET.ATG" +#line 1846 "VBNET.ATG" type = new TypeReference("System.Char", true); break; } case 79: { lexer.NextToken(); -#line 1808 "VBNET.ATG" +#line 1847 "VBNET.ATG" type = new TypeReference("System.DateTime", true); break; } case 81: { lexer.NextToken(); -#line 1809 "VBNET.ATG" +#line 1848 "VBNET.ATG" type = new TypeReference("System.Decimal", true); break; } case 80: { lexer.NextToken(); -#line 1810 "VBNET.ATG" +#line 1849 "VBNET.ATG" type = new TypeReference("System.Double", true); break; } case 91: { lexer.NextToken(); -#line 1811 "VBNET.ATG" +#line 1850 "VBNET.ATG" type = new TypeReference("System.Int16", true); break; } case 83: { lexer.NextToken(); -#line 1812 "VBNET.ATG" +#line 1851 "VBNET.ATG" type = new TypeReference("System.Int32", true); break; } case 85: { lexer.NextToken(); -#line 1813 "VBNET.ATG" +#line 1852 "VBNET.ATG" type = new TypeReference("System.Int64", true); break; } case 97: { lexer.NextToken(); -#line 1814 "VBNET.ATG" +#line 1853 "VBNET.ATG" type = new TypeReference("System.UInt16", true); break; } case 95: { lexer.NextToken(); -#line 1815 "VBNET.ATG" +#line 1854 "VBNET.ATG" type = new TypeReference("System.UInt32", true); break; } case 96: { lexer.NextToken(); -#line 1816 "VBNET.ATG" +#line 1855 "VBNET.ATG" type = new TypeReference("System.UInt64", true); break; } case 86: { lexer.NextToken(); -#line 1817 "VBNET.ATG" +#line 1856 "VBNET.ATG" type = new TypeReference("System.Object", true); break; } case 92: { lexer.NextToken(); -#line 1818 "VBNET.ATG" +#line 1857 "VBNET.ATG" type = new TypeReference("System.Single", true); break; } case 93: { lexer.NextToken(); -#line 1819 "VBNET.ATG" +#line 1858 "VBNET.ATG" type = new TypeReference("System.String", true); break; } - default: SynErr(280); break; + default: SynErr(284); break; } } void GetTypeTypeName( -#line 2540 "VBNET.ATG" +#line 2579 "VBNET.ATG" out TypeReference typeref) { -#line 2541 "VBNET.ATG" +#line 2580 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2543 "VBNET.ATG" +#line 2582 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 2544 "VBNET.ATG" +#line 2583 "VBNET.ATG" out rank); -#line 2545 "VBNET.ATG" +#line 2584 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4393,10 +4515,10 @@ out rank); } void ConditionalExpression( -#line 1752 "VBNET.ATG" +#line 1791 "VBNET.ATG" out Expression expr) { -#line 1754 "VBNET.ATG" +#line 1793 "VBNET.ATG" ConditionalExpression conditionalExpression = new ConditionalExpression(); BinaryOperatorExpression binaryOperatorExpression = new BinaryOperatorExpression(); conditionalExpression.StartLocation = binaryOperatorExpression.StartLocation = la.Location; @@ -4408,21 +4530,21 @@ out Expression expr) { Expect(135); Expect(37); Expr( -#line 1763 "VBNET.ATG" +#line 1802 "VBNET.ATG" out condition); Expect(22); Expr( -#line 1763 "VBNET.ATG" +#line 1802 "VBNET.ATG" out trueExpr); if (la.kind == 22) { lexer.NextToken(); Expr( -#line 1763 "VBNET.ATG" +#line 1802 "VBNET.ATG" out falseExpr); } Expect(38); -#line 1765 "VBNET.ATG" +#line 1804 "VBNET.ATG" if(falseExpr != null) { conditionalExpression.Condition = condition; @@ -4445,348 +4567,348 @@ out falseExpr); } void ArgumentList( -#line 2472 "VBNET.ATG" +#line 2511 "VBNET.ATG" out List arguments) { -#line 2474 "VBNET.ATG" +#line 2513 "VBNET.ATG" arguments = new List(); Expression expr = null; - if (StartOf(29)) { + if (StartOf(30)) { Argument( -#line 2477 "VBNET.ATG" +#line 2516 "VBNET.ATG" out expr); } while (la.kind == 22) { lexer.NextToken(); -#line 2478 "VBNET.ATG" +#line 2517 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; - if (StartOf(29)) { + if (StartOf(30)) { Argument( -#line 2479 "VBNET.ATG" +#line 2518 "VBNET.ATG" out expr); } -#line 2480 "VBNET.ATG" +#line 2519 "VBNET.ATG" if (expr == null) expr = Expression.Null; } -#line 2482 "VBNET.ATG" +#line 2521 "VBNET.ATG" if (expr != null) arguments.Add(expr); } void ConjunctionExpr( -#line 1838 "VBNET.ATG" +#line 1877 "VBNET.ATG" out Expression outExpr) { -#line 1840 "VBNET.ATG" +#line 1879 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; NotExpr( -#line 1843 "VBNET.ATG" +#line 1882 "VBNET.ATG" out outExpr); while (la.kind == 60 || la.kind == 61) { if (la.kind == 60) { lexer.NextToken(); -#line 1846 "VBNET.ATG" +#line 1885 "VBNET.ATG" op = BinaryOperatorType.BitwiseAnd; } else { lexer.NextToken(); -#line 1847 "VBNET.ATG" +#line 1886 "VBNET.ATG" op = BinaryOperatorType.LogicalAnd; } NotExpr( -#line 1849 "VBNET.ATG" +#line 1888 "VBNET.ATG" out expr); -#line 1849 "VBNET.ATG" +#line 1888 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void NotExpr( -#line 1853 "VBNET.ATG" +#line 1892 "VBNET.ATG" out Expression outExpr) { -#line 1854 "VBNET.ATG" +#line 1893 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 164) { lexer.NextToken(); -#line 1855 "VBNET.ATG" +#line 1894 "VBNET.ATG" uop = UnaryOperatorType.Not; } ComparisonExpr( -#line 1856 "VBNET.ATG" +#line 1895 "VBNET.ATG" out outExpr); -#line 1857 "VBNET.ATG" +#line 1896 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void ComparisonExpr( -#line 1862 "VBNET.ATG" +#line 1901 "VBNET.ATG" out Expression outExpr) { -#line 1864 "VBNET.ATG" +#line 1903 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1867 "VBNET.ATG" +#line 1906 "VBNET.ATG" out outExpr); - while (StartOf(32)) { + while (StartOf(35)) { switch (la.kind) { case 40: { lexer.NextToken(); -#line 1870 "VBNET.ATG" +#line 1909 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 39: { lexer.NextToken(); -#line 1871 "VBNET.ATG" +#line 1910 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 43: { lexer.NextToken(); -#line 1872 "VBNET.ATG" +#line 1911 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 42: { lexer.NextToken(); -#line 1873 "VBNET.ATG" +#line 1912 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 41: { lexer.NextToken(); -#line 1874 "VBNET.ATG" +#line 1913 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } case 20: { lexer.NextToken(); -#line 1875 "VBNET.ATG" +#line 1914 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 150: { lexer.NextToken(); -#line 1876 "VBNET.ATG" +#line 1915 "VBNET.ATG" op = BinaryOperatorType.Like; break; } case 144: { lexer.NextToken(); -#line 1877 "VBNET.ATG" +#line 1916 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; break; } case 145: { lexer.NextToken(); -#line 1878 "VBNET.ATG" +#line 1917 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; break; } } - if (StartOf(33)) { + if (StartOf(36)) { ShiftExpr( -#line 1881 "VBNET.ATG" +#line 1920 "VBNET.ATG" out expr); -#line 1881 "VBNET.ATG" +#line 1920 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else if (la.kind == 164) { lexer.NextToken(); ShiftExpr( -#line 1884 "VBNET.ATG" +#line 1923 "VBNET.ATG" out expr); -#line 1884 "VBNET.ATG" +#line 1923 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new UnaryOperatorExpression(expr, UnaryOperatorType.Not)); - } else SynErr(281); + } else SynErr(285); } } void ShiftExpr( -#line 1889 "VBNET.ATG" +#line 1928 "VBNET.ATG" out Expression outExpr) { -#line 1891 "VBNET.ATG" +#line 1930 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConcatenationExpr( -#line 1894 "VBNET.ATG" +#line 1933 "VBNET.ATG" out outExpr); while (la.kind == 44 || la.kind == 45) { if (la.kind == 44) { lexer.NextToken(); -#line 1897 "VBNET.ATG" +#line 1936 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1898 "VBNET.ATG" +#line 1937 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } ConcatenationExpr( -#line 1900 "VBNET.ATG" +#line 1939 "VBNET.ATG" out expr); -#line 1900 "VBNET.ATG" +#line 1939 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ConcatenationExpr( -#line 1904 "VBNET.ATG" +#line 1943 "VBNET.ATG" out Expression outExpr) { -#line 1905 "VBNET.ATG" +#line 1944 "VBNET.ATG" Expression expr; AdditiveExpr( -#line 1907 "VBNET.ATG" +#line 1946 "VBNET.ATG" out outExpr); while (la.kind == 23) { lexer.NextToken(); AdditiveExpr( -#line 1907 "VBNET.ATG" +#line 1946 "VBNET.ATG" out expr); -#line 1907 "VBNET.ATG" +#line 1946 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Concat, expr); } } void AdditiveExpr( -#line 1910 "VBNET.ATG" +#line 1949 "VBNET.ATG" out Expression outExpr) { -#line 1912 "VBNET.ATG" +#line 1951 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ModuloExpr( -#line 1915 "VBNET.ATG" +#line 1954 "VBNET.ATG" out outExpr); while (la.kind == 30 || la.kind == 31) { if (la.kind == 31) { lexer.NextToken(); -#line 1918 "VBNET.ATG" +#line 1957 "VBNET.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 1919 "VBNET.ATG" +#line 1958 "VBNET.ATG" op = BinaryOperatorType.Subtract; } ModuloExpr( -#line 1921 "VBNET.ATG" +#line 1960 "VBNET.ATG" out expr); -#line 1921 "VBNET.ATG" +#line 1960 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ModuloExpr( -#line 1925 "VBNET.ATG" +#line 1964 "VBNET.ATG" out Expression outExpr) { -#line 1926 "VBNET.ATG" +#line 1965 "VBNET.ATG" Expression expr; IntegerDivisionExpr( -#line 1928 "VBNET.ATG" +#line 1967 "VBNET.ATG" out outExpr); while (la.kind == 154) { lexer.NextToken(); IntegerDivisionExpr( -#line 1928 "VBNET.ATG" +#line 1967 "VBNET.ATG" out expr); -#line 1928 "VBNET.ATG" +#line 1967 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr); } } void IntegerDivisionExpr( -#line 1931 "VBNET.ATG" +#line 1970 "VBNET.ATG" out Expression outExpr) { -#line 1932 "VBNET.ATG" +#line 1971 "VBNET.ATG" Expression expr; MultiplicativeExpr( -#line 1934 "VBNET.ATG" +#line 1973 "VBNET.ATG" out outExpr); while (la.kind == 25) { lexer.NextToken(); MultiplicativeExpr( -#line 1934 "VBNET.ATG" +#line 1973 "VBNET.ATG" out expr); -#line 1934 "VBNET.ATG" +#line 1973 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.DivideInteger, expr); } } void MultiplicativeExpr( -#line 1937 "VBNET.ATG" +#line 1976 "VBNET.ATG" out Expression outExpr) { -#line 1939 "VBNET.ATG" +#line 1978 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 1942 "VBNET.ATG" +#line 1981 "VBNET.ATG" out outExpr); while (la.kind == 24 || la.kind == 34) { if (la.kind == 34) { lexer.NextToken(); -#line 1945 "VBNET.ATG" +#line 1984 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else { lexer.NextToken(); -#line 1946 "VBNET.ATG" +#line 1985 "VBNET.ATG" op = BinaryOperatorType.Divide; } UnaryExpr( -#line 1948 "VBNET.ATG" +#line 1987 "VBNET.ATG" out expr); -#line 1948 "VBNET.ATG" +#line 1987 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void UnaryExpr( -#line 1952 "VBNET.ATG" +#line 1991 "VBNET.ATG" out Expression uExpr) { -#line 1954 "VBNET.ATG" +#line 1993 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -4795,25 +4917,25 @@ out Expression uExpr) { if (la.kind == 31) { lexer.NextToken(); -#line 1958 "VBNET.ATG" +#line 1997 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 30) { lexer.NextToken(); -#line 1959 "VBNET.ATG" +#line 1998 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 1960 "VBNET.ATG" +#line 1999 "VBNET.ATG" uop = UnaryOperatorType.Dereference; isUOp = true; } } ExponentiationExpr( -#line 1962 "VBNET.ATG" +#line 2001 "VBNET.ATG" out expr); -#line 1964 "VBNET.ATG" +#line 2003 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -4823,107 +4945,107 @@ out expr); } void ExponentiationExpr( -#line 1972 "VBNET.ATG" +#line 2011 "VBNET.ATG" out Expression outExpr) { -#line 1973 "VBNET.ATG" +#line 2012 "VBNET.ATG" Expression expr; SimpleExpr( -#line 1975 "VBNET.ATG" +#line 2014 "VBNET.ATG" out outExpr); while (la.kind == 32) { lexer.NextToken(); SimpleExpr( -#line 1975 "VBNET.ATG" +#line 2014 "VBNET.ATG" out expr); -#line 1975 "VBNET.ATG" +#line 2014 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Power, expr); } } void NormalOrReDimArgumentList( -#line 2486 "VBNET.ATG" +#line 2525 "VBNET.ATG" out List arguments, out bool canBeNormal, out bool canBeRedim) { -#line 2488 "VBNET.ATG" +#line 2527 "VBNET.ATG" arguments = new List(); canBeNormal = true; canBeRedim = !IsNamedAssign(); Expression expr = null; - if (StartOf(29)) { + if (StartOf(30)) { Argument( -#line 2493 "VBNET.ATG" +#line 2532 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2494 "VBNET.ATG" +#line 2533 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2495 "VBNET.ATG" +#line 2534 "VBNET.ATG" out expr); } } while (la.kind == 22) { lexer.NextToken(); -#line 2498 "VBNET.ATG" +#line 2537 "VBNET.ATG" if (expr == null) canBeRedim = false; -#line 2499 "VBNET.ATG" +#line 2538 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; -#line 2500 "VBNET.ATG" +#line 2539 "VBNET.ATG" canBeRedim &= !IsNamedAssign(); - if (StartOf(29)) { + if (StartOf(30)) { Argument( -#line 2501 "VBNET.ATG" +#line 2540 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2502 "VBNET.ATG" +#line 2541 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2503 "VBNET.ATG" +#line 2542 "VBNET.ATG" out expr); } } -#line 2505 "VBNET.ATG" +#line 2544 "VBNET.ATG" if (expr == null) { canBeRedim = false; expr = Expression.Null; } } -#line 2507 "VBNET.ATG" +#line 2546 "VBNET.ATG" if (expr != null) arguments.Add(expr); else canBeRedim = false; } void ArrayTypeModifiers( -#line 2614 "VBNET.ATG" +#line 2653 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2616 "VBNET.ATG" +#line 2655 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2619 "VBNET.ATG" +#line 2658 "VBNET.ATG" IsDims()) { Expect(37); if (la.kind == 22 || la.kind == 38) { RankList( -#line 2621 "VBNET.ATG" +#line 2660 "VBNET.ATG" out i); } -#line 2623 "VBNET.ATG" +#line 2662 "VBNET.ATG" arrayModifiers.Add(i); Expect(38); } -#line 2628 "VBNET.ATG" +#line 2667 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -4931,10 +5053,10 @@ out i); } void MemberInitializer( -#line 2453 "VBNET.ATG" +#line 2492 "VBNET.ATG" out MemberInitializerExpression memberInitializer) { -#line 2455 "VBNET.ATG" +#line 2494 "VBNET.ATG" memberInitializer = new MemberInitializerExpression(); memberInitializer.StartLocation = la.Location; Expression initExpr = null; @@ -4944,19 +5066,19 @@ out MemberInitializerExpression memberInitializer) { if (la.kind == 147) { lexer.NextToken(); -#line 2461 "VBNET.ATG" +#line 2500 "VBNET.ATG" isKey = true; } Expect(26); IdentifierOrKeyword( -#line 2462 "VBNET.ATG" +#line 2501 "VBNET.ATG" out name); Expect(20); Expr( -#line 2462 "VBNET.ATG" +#line 2501 "VBNET.ATG" out initExpr); -#line 2464 "VBNET.ATG" +#line 2503 "VBNET.ATG" memberInitializer.Name = name; memberInitializer.Expression = initExpr; memberInitializer.IsKey = isKey; @@ -4965,10 +5087,10 @@ out initExpr); } void SubLambdaExpression( -#line 2058 "VBNET.ATG" +#line 2097 "VBNET.ATG" out LambdaExpression lambda) { -#line 2060 "VBNET.ATG" +#line 2099 "VBNET.ATG" lambda = new LambdaExpression(); lambda.ReturnType = new TypeReference("System.Void", true); Expression inner = null; @@ -4980,27 +5102,27 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2067 "VBNET.ATG" +#line 2106 "VBNET.ATG" lambda.Parameters); } Expect(38); } - if (StartOf(34)) { - if (StartOf(29)) { + if (StartOf(37)) { + if (StartOf(30)) { Expr( -#line 2070 "VBNET.ATG" +#line 2109 "VBNET.ATG" out inner); -#line 2072 "VBNET.ATG" +#line 2111 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2076 "VBNET.ATG" +#line 2115 "VBNET.ATG" out statement); -#line 2078 "VBNET.ATG" +#line 2117 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5008,23 +5130,23 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2084 "VBNET.ATG" +#line 2123 "VBNET.ATG" out statement); Expect(113); Expect(210); -#line 2087 "VBNET.ATG" +#line 2126 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; - } else SynErr(282); + } else SynErr(286); } void FunctionLambdaExpression( -#line 2093 "VBNET.ATG" +#line 2132 "VBNET.ATG" out LambdaExpression lambda) { -#line 2095 "VBNET.ATG" +#line 2134 "VBNET.ATG" lambda = new LambdaExpression(); TypeReference typeRef = null; Expression inner = null; @@ -5036,7 +5158,7 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2102 "VBNET.ATG" +#line 2141 "VBNET.ATG" lambda.Parameters); } Expect(38); @@ -5044,28 +5166,28 @@ lambda.Parameters); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2103 "VBNET.ATG" +#line 2142 "VBNET.ATG" out typeRef); -#line 2103 "VBNET.ATG" +#line 2142 "VBNET.ATG" lambda.ReturnType = typeRef; } - if (StartOf(34)) { - if (StartOf(29)) { + if (StartOf(37)) { + if (StartOf(30)) { Expr( -#line 2106 "VBNET.ATG" +#line 2145 "VBNET.ATG" out inner); -#line 2108 "VBNET.ATG" +#line 2147 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2112 "VBNET.ATG" +#line 2151 "VBNET.ATG" out statement); -#line 2114 "VBNET.ATG" +#line 2153 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5073,23 +5195,23 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2120 "VBNET.ATG" +#line 2159 "VBNET.ATG" out statement); Expect(113); Expect(127); -#line 2123 "VBNET.ATG" +#line 2162 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; - } else SynErr(283); + } else SynErr(287); } void EmbeddedStatement( -#line 2885 "VBNET.ATG" +#line 2924 "VBNET.ATG" out Statement statement) { -#line 2887 "VBNET.ATG" +#line 2926 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5099,224 +5221,224 @@ out Statement statement) { if (la.kind == 120) { lexer.NextToken(); -#line 2893 "VBNET.ATG" +#line 2932 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 210: { lexer.NextToken(); -#line 2895 "VBNET.ATG" +#line 2934 "VBNET.ATG" exitType = ExitType.Sub; break; } case 127: { lexer.NextToken(); -#line 2897 "VBNET.ATG" +#line 2936 "VBNET.ATG" exitType = ExitType.Function; break; } case 186: { lexer.NextToken(); -#line 2899 "VBNET.ATG" +#line 2938 "VBNET.ATG" exitType = ExitType.Property; break; } case 108: { lexer.NextToken(); -#line 2901 "VBNET.ATG" +#line 2940 "VBNET.ATG" exitType = ExitType.Do; break; } case 124: { lexer.NextToken(); -#line 2903 "VBNET.ATG" +#line 2942 "VBNET.ATG" exitType = ExitType.For; break; } case 218: { lexer.NextToken(); -#line 2905 "VBNET.ATG" +#line 2944 "VBNET.ATG" exitType = ExitType.Try; break; } case 231: { lexer.NextToken(); -#line 2907 "VBNET.ATG" +#line 2946 "VBNET.ATG" exitType = ExitType.While; break; } case 197: { lexer.NextToken(); -#line 2909 "VBNET.ATG" +#line 2948 "VBNET.ATG" exitType = ExitType.Select; break; } - default: SynErr(284); break; + default: SynErr(288); break; } -#line 2911 "VBNET.ATG" +#line 2950 "VBNET.ATG" statement = new ExitStatement(exitType); } else if (la.kind == 218) { TryStatement( -#line 2912 "VBNET.ATG" +#line 2951 "VBNET.ATG" out statement); } else if (la.kind == 89) { lexer.NextToken(); -#line 2913 "VBNET.ATG" +#line 2952 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 108 || la.kind == 124 || la.kind == 231) { if (la.kind == 108) { lexer.NextToken(); -#line 2913 "VBNET.ATG" +#line 2952 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 124) { lexer.NextToken(); -#line 2913 "VBNET.ATG" +#line 2952 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2913 "VBNET.ATG" +#line 2952 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2913 "VBNET.ATG" +#line 2952 "VBNET.ATG" statement = new ContinueStatement(continueType); } else if (la.kind == 215) { lexer.NextToken(); - if (StartOf(29)) { + if (StartOf(30)) { Expr( -#line 2915 "VBNET.ATG" +#line 2954 "VBNET.ATG" out expr); } -#line 2915 "VBNET.ATG" +#line 2954 "VBNET.ATG" statement = new ThrowStatement(expr); } else if (la.kind == 195) { lexer.NextToken(); - if (StartOf(29)) { + if (StartOf(30)) { Expr( -#line 2917 "VBNET.ATG" +#line 2956 "VBNET.ATG" out expr); } -#line 2917 "VBNET.ATG" +#line 2956 "VBNET.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 211) { lexer.NextToken(); Expr( -#line 2919 "VBNET.ATG" +#line 2958 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2919 "VBNET.ATG" +#line 2958 "VBNET.ATG" out embeddedStatement); Expect(113); Expect(211); -#line 2920 "VBNET.ATG" +#line 2959 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 189) { lexer.NextToken(); Identifier(); -#line 2922 "VBNET.ATG" +#line 2961 "VBNET.ATG" name = t.val; if (la.kind == 37) { lexer.NextToken(); - if (StartOf(35)) { + if (StartOf(38)) { ArgumentList( -#line 2923 "VBNET.ATG" +#line 2962 "VBNET.ATG" out p); } Expect(38); } -#line 2925 "VBNET.ATG" +#line 2964 "VBNET.ATG" statement = new RaiseEventStatement(name, p); } else if (la.kind == 233) { WithStatement( -#line 2928 "VBNET.ATG" +#line 2967 "VBNET.ATG" out statement); } else if (la.kind == 56) { lexer.NextToken(); -#line 2930 "VBNET.ATG" +#line 2969 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2931 "VBNET.ATG" +#line 2970 "VBNET.ATG" out expr); Expect(22); Expr( -#line 2931 "VBNET.ATG" +#line 2970 "VBNET.ATG" out handlerExpr); -#line 2933 "VBNET.ATG" +#line 2972 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); } else if (la.kind == 193) { lexer.NextToken(); -#line 2936 "VBNET.ATG" +#line 2975 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2937 "VBNET.ATG" +#line 2976 "VBNET.ATG" out expr); Expect(22); Expr( -#line 2937 "VBNET.ATG" +#line 2976 "VBNET.ATG" out handlerExpr); -#line 2939 "VBNET.ATG" +#line 2978 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); } else if (la.kind == 231) { lexer.NextToken(); Expr( -#line 2942 "VBNET.ATG" +#line 2981 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2943 "VBNET.ATG" +#line 2982 "VBNET.ATG" out embeddedStatement); Expect(113); Expect(231); -#line 2945 "VBNET.ATG" +#line 2984 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 108) { lexer.NextToken(); -#line 2950 "VBNET.ATG" +#line 2989 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 2953 "VBNET.ATG" +#line 2992 "VBNET.ATG" out conditionType); Expr( -#line 2953 "VBNET.ATG" +#line 2992 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2954 "VBNET.ATG" +#line 2993 "VBNET.ATG" out embeddedStatement); Expect(152); -#line 2957 "VBNET.ATG" +#line 2996 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5325,26 +5447,26 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 2964 "VBNET.ATG" +#line 3003 "VBNET.ATG" out embeddedStatement); Expect(152); if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 2965 "VBNET.ATG" +#line 3004 "VBNET.ATG" out conditionType); Expr( -#line 2965 "VBNET.ATG" +#line 3004 "VBNET.ATG" out expr); } -#line 2967 "VBNET.ATG" +#line 3006 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); - } else SynErr(285); + } else SynErr(289); } else if (la.kind == 124) { lexer.NextToken(); -#line 2972 "VBNET.ATG" +#line 3011 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5353,24 +5475,24 @@ out expr); if (la.kind == 110) { lexer.NextToken(); LoopControlVariable( -#line 2979 "VBNET.ATG" +#line 3018 "VBNET.ATG" out typeReference, out typeName); Expect(138); Expr( -#line 2980 "VBNET.ATG" +#line 3019 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2981 "VBNET.ATG" +#line 3020 "VBNET.ATG" out embeddedStatement); Expect(163); - if (StartOf(29)) { + if (StartOf(30)) { Expr( -#line 2982 "VBNET.ATG" +#line 3021 "VBNET.ATG" out expr); } -#line 2984 "VBNET.ATG" +#line 3023 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5380,9 +5502,9 @@ out expr); statement.EndLocation = t.EndLocation; - } else if (StartOf(36)) { + } else if (StartOf(39)) { -#line 2995 "VBNET.ATG" +#line 3034 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; @@ -5391,59 +5513,59 @@ out expr); List nextExpressions = null; if ( -#line 3002 "VBNET.ATG" +#line 3041 "VBNET.ATG" IsLoopVariableDeclaration()) { LoopControlVariable( -#line 3003 "VBNET.ATG" +#line 3042 "VBNET.ATG" out typeReference, out typeName); } else { -#line 3005 "VBNET.ATG" +#line 3044 "VBNET.ATG" typeReference = null; typeName = null; SimpleExpr( -#line 3006 "VBNET.ATG" +#line 3045 "VBNET.ATG" out variableExpr); } Expect(20); Expr( -#line 3008 "VBNET.ATG" +#line 3047 "VBNET.ATG" out start); Expect(216); Expr( -#line 3008 "VBNET.ATG" +#line 3047 "VBNET.ATG" out end); if (la.kind == 205) { lexer.NextToken(); Expr( -#line 3008 "VBNET.ATG" +#line 3047 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 3009 "VBNET.ATG" +#line 3048 "VBNET.ATG" out embeddedStatement); Expect(163); - if (StartOf(29)) { + if (StartOf(30)) { Expr( -#line 3012 "VBNET.ATG" +#line 3051 "VBNET.ATG" out nextExpr); -#line 3014 "VBNET.ATG" +#line 3053 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3017 "VBNET.ATG" +#line 3056 "VBNET.ATG" out nextExpr); -#line 3017 "VBNET.ATG" +#line 3056 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 3020 "VBNET.ATG" +#line 3059 "VBNET.ATG" statement = new ForNextStatement { TypeReference = typeReference, VariableName = typeName, @@ -5455,31 +5577,31 @@ out nextExpr); NextExpressions = nextExpressions }; - } else SynErr(286); + } else SynErr(290); } else if (la.kind == 118) { lexer.NextToken(); Expr( -#line 3033 "VBNET.ATG" +#line 3072 "VBNET.ATG" out expr); -#line 3033 "VBNET.ATG" +#line 3072 "VBNET.ATG" statement = new ErrorStatement(expr); } else if (la.kind == 191) { lexer.NextToken(); -#line 3035 "VBNET.ATG" +#line 3074 "VBNET.ATG" bool isPreserve = false; if (la.kind == 184) { lexer.NextToken(); -#line 3035 "VBNET.ATG" +#line 3074 "VBNET.ATG" isPreserve = true; } ReDimClause( -#line 3036 "VBNET.ATG" +#line 3075 "VBNET.ATG" out expr); -#line 3038 "VBNET.ATG" +#line 3077 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); @@ -5487,48 +5609,48 @@ out expr); while (la.kind == 22) { lexer.NextToken(); ReDimClause( -#line 3042 "VBNET.ATG" +#line 3081 "VBNET.ATG" out expr); -#line 3043 "VBNET.ATG" +#line 3082 "VBNET.ATG" SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); } } else if (la.kind == 117) { lexer.NextToken(); Expr( -#line 3047 "VBNET.ATG" +#line 3086 "VBNET.ATG" out expr); -#line 3049 "VBNET.ATG" +#line 3088 "VBNET.ATG" EraseStatement eraseStatement = new EraseStatement(); if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr);} while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3052 "VBNET.ATG" +#line 3091 "VBNET.ATG" out expr); -#line 3052 "VBNET.ATG" +#line 3091 "VBNET.ATG" if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr); } } -#line 3053 "VBNET.ATG" +#line 3092 "VBNET.ATG" statement = eraseStatement; } else if (la.kind == 206) { lexer.NextToken(); -#line 3055 "VBNET.ATG" +#line 3094 "VBNET.ATG" statement = new StopStatement(); } else if ( -#line 3057 "VBNET.ATG" +#line 3096 "VBNET.ATG" la.kind == Tokens.If) { Expect(135); -#line 3058 "VBNET.ATG" +#line 3097 "VBNET.ATG" Location ifStartLocation = t.Location; Expr( -#line 3058 "VBNET.ATG" +#line 3097 "VBNET.ATG" out expr); if (la.kind == 214) { lexer.NextToken(); @@ -5536,46 +5658,46 @@ out expr); if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 3061 "VBNET.ATG" +#line 3100 "VBNET.ATG" out embeddedStatement); -#line 3063 "VBNET.ATG" +#line 3102 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; Location elseIfStart; while (la.kind == 112 || -#line 3069 "VBNET.ATG" +#line 3108 "VBNET.ATG" IsElseIf()) { if ( -#line 3069 "VBNET.ATG" +#line 3108 "VBNET.ATG" IsElseIf()) { Expect(111); -#line 3069 "VBNET.ATG" +#line 3108 "VBNET.ATG" elseIfStart = t.Location; Expect(135); } else { lexer.NextToken(); -#line 3070 "VBNET.ATG" +#line 3109 "VBNET.ATG" elseIfStart = t.Location; } -#line 3072 "VBNET.ATG" +#line 3111 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 3073 "VBNET.ATG" +#line 3112 "VBNET.ATG" out condition); if (la.kind == 214) { lexer.NextToken(); } EndOfStmt(); Block( -#line 3074 "VBNET.ATG" +#line 3113 "VBNET.ATG" out block); -#line 3076 "VBNET.ATG" +#line 3115 "VBNET.ATG" ElseIfSection elseIfSection = new ElseIfSection(condition, block); elseIfSection.StartLocation = elseIfStart; elseIfSection.EndLocation = t.Location; @@ -5589,123 +5711,123 @@ out block); EndOfStmt(); } Block( -#line 3085 "VBNET.ATG" +#line 3124 "VBNET.ATG" out embeddedStatement); -#line 3087 "VBNET.ATG" +#line 3126 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(113); Expect(135); -#line 3091 "VBNET.ATG" +#line 3130 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; - } else if (StartOf(37)) { + } else if (StartOf(40)) { -#line 3096 "VBNET.ATG" +#line 3135 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr); ifStatement.StartLocation = ifStartLocation; SingleLineStatementList( -#line 3099 "VBNET.ATG" +#line 3138 "VBNET.ATG" ifStatement.TrueStatement); if (la.kind == 111) { lexer.NextToken(); - if (StartOf(37)) { + if (StartOf(40)) { SingleLineStatementList( -#line 3102 "VBNET.ATG" +#line 3141 "VBNET.ATG" ifStatement.FalseStatement); } } -#line 3104 "VBNET.ATG" +#line 3143 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; - } else SynErr(287); + } else SynErr(291); } else if (la.kind == 197) { lexer.NextToken(); if (la.kind == 74) { lexer.NextToken(); } Expr( -#line 3107 "VBNET.ATG" +#line 3146 "VBNET.ATG" out expr); EndOfStmt(); -#line 3108 "VBNET.ATG" +#line 3147 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 74) { -#line 3112 "VBNET.ATG" +#line 3151 "VBNET.ATG" List caseClauses = null; Location caseLocation = la.Location; lexer.NextToken(); CaseClauses( -#line 3113 "VBNET.ATG" +#line 3152 "VBNET.ATG" out caseClauses); if ( -#line 3113 "VBNET.ATG" +#line 3152 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 3115 "VBNET.ATG" +#line 3154 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); selectSection.StartLocation = caseLocation; Block( -#line 3118 "VBNET.ATG" +#line 3157 "VBNET.ATG" out block); -#line 3120 "VBNET.ATG" +#line 3159 "VBNET.ATG" selectSection.Children = block.Children; selectSection.EndLocation = t.EndLocation; selectSections.Add(selectSection); } -#line 3126 "VBNET.ATG" +#line 3165 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(113); Expect(197); } else if (la.kind == 171) { -#line 3129 "VBNET.ATG" +#line 3168 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 3130 "VBNET.ATG" +#line 3169 "VBNET.ATG" out onErrorStatement); -#line 3130 "VBNET.ATG" +#line 3169 "VBNET.ATG" statement = onErrorStatement; } else if (la.kind == 132) { -#line 3131 "VBNET.ATG" +#line 3170 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 3132 "VBNET.ATG" +#line 3171 "VBNET.ATG" out goToStatement); -#line 3132 "VBNET.ATG" +#line 3171 "VBNET.ATG" statement = goToStatement; } else if (la.kind == 194) { -#line 3133 "VBNET.ATG" +#line 3172 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 3134 "VBNET.ATG" +#line 3173 "VBNET.ATG" out resumeStatement); -#line 3134 "VBNET.ATG" +#line 3173 "VBNET.ATG" statement = resumeStatement; - } else if (StartOf(36)) { + } else if (StartOf(39)) { -#line 3137 "VBNET.ATG" +#line 3176 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -5713,25 +5835,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 3143 "VBNET.ATG" +#line 3182 "VBNET.ATG" out expr); - if (StartOf(38)) { + if (StartOf(41)) { AssignmentOperator( -#line 3145 "VBNET.ATG" +#line 3184 "VBNET.ATG" out op); Expr( -#line 3145 "VBNET.ATG" +#line 3184 "VBNET.ATG" out val); -#line 3145 "VBNET.ATG" +#line 3184 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); - } else if (StartOf(39)) { + } else if (StartOf(42)) { -#line 3146 "VBNET.ATG" +#line 3185 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); - } else SynErr(288); + } else SynErr(292); -#line 3149 "VBNET.ATG" +#line 3188 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is MemberReferenceExpression || expr is IdentifierExpression) { @@ -5742,88 +5864,88 @@ out val); } else if (la.kind == 73) { lexer.NextToken(); SimpleExpr( -#line 3156 "VBNET.ATG" +#line 3195 "VBNET.ATG" out expr); -#line 3156 "VBNET.ATG" +#line 3195 "VBNET.ATG" statement = new ExpressionStatement(expr); } else if (la.kind == 226) { lexer.NextToken(); -#line 3158 "VBNET.ATG" +#line 3197 "VBNET.ATG" Statement block; if ( -#line 3159 "VBNET.ATG" +#line 3198 "VBNET.ATG" Peek(1).kind == Tokens.As) { -#line 3160 "VBNET.ATG" +#line 3199 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 3161 "VBNET.ATG" +#line 3200 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 3163 "VBNET.ATG" +#line 3202 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 3165 "VBNET.ATG" +#line 3204 "VBNET.ATG" out block); -#line 3167 "VBNET.ATG" +#line 3206 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); - } else if (StartOf(29)) { + } else if (StartOf(30)) { Expr( -#line 3169 "VBNET.ATG" +#line 3208 "VBNET.ATG" out expr); Block( -#line 3170 "VBNET.ATG" +#line 3209 "VBNET.ATG" out block); -#line 3171 "VBNET.ATG" +#line 3210 "VBNET.ATG" statement = new UsingStatement(new ExpressionStatement(expr), block); - } else SynErr(289); + } else SynErr(293); Expect(113); Expect(226); - } else if (StartOf(40)) { + } else if (StartOf(43)) { LocalDeclarationStatement( -#line 3174 "VBNET.ATG" +#line 3213 "VBNET.ATG" out statement); - } else SynErr(290); + } else SynErr(294); } void FromOrAggregateQueryOperator( -#line 2142 "VBNET.ATG" +#line 2181 "VBNET.ATG" List middleClauses) { -#line 2144 "VBNET.ATG" +#line 2183 "VBNET.ATG" QueryExpressionFromClause fromClause = null; QueryExpressionAggregateClause aggregateClause = null; if (la.kind == 126) { FromQueryOperator( -#line 2147 "VBNET.ATG" +#line 2186 "VBNET.ATG" out fromClause); -#line 2148 "VBNET.ATG" +#line 2187 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2149 "VBNET.ATG" +#line 2188 "VBNET.ATG" out aggregateClause); -#line 2150 "VBNET.ATG" +#line 2189 "VBNET.ATG" middleClauses.Add(aggregateClause); - } else SynErr(291); + } else SynErr(295); } void QueryOperator( -#line 2153 "VBNET.ATG" +#line 2192 "VBNET.ATG" List middleClauses) { -#line 2155 "VBNET.ATG" +#line 2194 "VBNET.ATG" QueryExpressionJoinVBClause joinClause = null; QueryExpressionGroupVBClause groupByClause = null; QueryExpressionPartitionVBClause partitionClause = null; @@ -5833,94 +5955,94 @@ List middleClauses) { if (la.kind == 126) { FromQueryOperator( -#line 2162 "VBNET.ATG" +#line 2201 "VBNET.ATG" out fromClause); -#line 2163 "VBNET.ATG" +#line 2202 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2164 "VBNET.ATG" +#line 2203 "VBNET.ATG" out aggregateClause); -#line 2165 "VBNET.ATG" +#line 2204 "VBNET.ATG" middleClauses.Add(aggregateClause); } else if (la.kind == 197) { SelectQueryOperator( -#line 2166 "VBNET.ATG" +#line 2205 "VBNET.ATG" middleClauses); } else if (la.kind == 107) { DistinctQueryOperator( -#line 2167 "VBNET.ATG" +#line 2206 "VBNET.ATG" middleClauses); } else if (la.kind == 230) { WhereQueryOperator( -#line 2168 "VBNET.ATG" +#line 2207 "VBNET.ATG" middleClauses); } else if (la.kind == 176) { OrderByQueryOperator( -#line 2169 "VBNET.ATG" +#line 2208 "VBNET.ATG" middleClauses); } else if (la.kind == 203 || la.kind == 212) { PartitionQueryOperator( -#line 2170 "VBNET.ATG" +#line 2209 "VBNET.ATG" out partitionClause); -#line 2171 "VBNET.ATG" +#line 2210 "VBNET.ATG" middleClauses.Add(partitionClause); } else if (la.kind == 148) { LetQueryOperator( -#line 2172 "VBNET.ATG" +#line 2211 "VBNET.ATG" middleClauses); } else if (la.kind == 146) { JoinQueryOperator( -#line 2173 "VBNET.ATG" +#line 2212 "VBNET.ATG" out joinClause); -#line 2174 "VBNET.ATG" +#line 2213 "VBNET.ATG" middleClauses.Add(joinClause); } else if ( -#line 2175 "VBNET.ATG" +#line 2214 "VBNET.ATG" la.kind == Tokens.Group && Peek(1).kind == Tokens.Join) { GroupJoinQueryOperator( -#line 2175 "VBNET.ATG" +#line 2214 "VBNET.ATG" out groupJoinClause); -#line 2176 "VBNET.ATG" +#line 2215 "VBNET.ATG" middleClauses.Add(groupJoinClause); } else if (la.kind == 133) { GroupByQueryOperator( -#line 2177 "VBNET.ATG" +#line 2216 "VBNET.ATG" out groupByClause); -#line 2178 "VBNET.ATG" +#line 2217 "VBNET.ATG" middleClauses.Add(groupByClause); - } else SynErr(292); + } else SynErr(296); } void FromQueryOperator( -#line 2253 "VBNET.ATG" +#line 2292 "VBNET.ATG" out QueryExpressionFromClause fromClause) { -#line 2255 "VBNET.ATG" +#line 2294 "VBNET.ATG" fromClause = new QueryExpressionFromClause(); fromClause.StartLocation = la.Location; Expect(126); CollectionRangeVariableDeclarationList( -#line 2258 "VBNET.ATG" +#line 2297 "VBNET.ATG" fromClause.Sources); -#line 2260 "VBNET.ATG" +#line 2299 "VBNET.ATG" fromClause.EndLocation = t.EndLocation; } void AggregateQueryOperator( -#line 2322 "VBNET.ATG" +#line 2361 "VBNET.ATG" out QueryExpressionAggregateClause aggregateClause) { -#line 2324 "VBNET.ATG" +#line 2363 "VBNET.ATG" aggregateClause = new QueryExpressionAggregateClause(); aggregateClause.IntoVariables = new List(); aggregateClause.StartLocation = la.Location; @@ -5928,77 +6050,77 @@ out QueryExpressionAggregateClause aggregateClause) { Expect(58); CollectionRangeVariableDeclaration( -#line 2329 "VBNET.ATG" +#line 2368 "VBNET.ATG" out source); -#line 2331 "VBNET.ATG" +#line 2370 "VBNET.ATG" aggregateClause.Source = source; - while (StartOf(30)) { + while (StartOf(31)) { QueryOperator( -#line 2334 "VBNET.ATG" +#line 2373 "VBNET.ATG" aggregateClause.MiddleClauses); } Expect(143); ExpressionRangeVariableDeclarationList( -#line 2336 "VBNET.ATG" +#line 2375 "VBNET.ATG" aggregateClause.IntoVariables); -#line 2338 "VBNET.ATG" +#line 2377 "VBNET.ATG" aggregateClause.EndLocation = t.EndLocation; } void SelectQueryOperator( -#line 2264 "VBNET.ATG" +#line 2303 "VBNET.ATG" List middleClauses) { -#line 2266 "VBNET.ATG" +#line 2305 "VBNET.ATG" QueryExpressionSelectVBClause selectClause = new QueryExpressionSelectVBClause(); selectClause.StartLocation = la.Location; Expect(197); ExpressionRangeVariableDeclarationList( -#line 2269 "VBNET.ATG" +#line 2308 "VBNET.ATG" selectClause.Variables); -#line 2271 "VBNET.ATG" +#line 2310 "VBNET.ATG" selectClause.EndLocation = t.Location; middleClauses.Add(selectClause); } void DistinctQueryOperator( -#line 2276 "VBNET.ATG" +#line 2315 "VBNET.ATG" List middleClauses) { -#line 2278 "VBNET.ATG" +#line 2317 "VBNET.ATG" QueryExpressionDistinctClause distinctClause = new QueryExpressionDistinctClause(); distinctClause.StartLocation = la.Location; Expect(107); -#line 2283 "VBNET.ATG" +#line 2322 "VBNET.ATG" distinctClause.EndLocation = t.EndLocation; middleClauses.Add(distinctClause); } void WhereQueryOperator( -#line 2288 "VBNET.ATG" +#line 2327 "VBNET.ATG" List middleClauses) { -#line 2290 "VBNET.ATG" +#line 2329 "VBNET.ATG" QueryExpressionWhereClause whereClause = new QueryExpressionWhereClause(); whereClause.StartLocation = la.Location; Expression operand = null; Expect(230); Expr( -#line 2294 "VBNET.ATG" +#line 2333 "VBNET.ATG" out operand); -#line 2296 "VBNET.ATG" +#line 2335 "VBNET.ATG" whereClause.Condition = operand; whereClause.EndLocation = t.EndLocation; @@ -6007,10 +6129,10 @@ out operand); } void OrderByQueryOperator( -#line 2181 "VBNET.ATG" +#line 2220 "VBNET.ATG" List middleClauses) { -#line 2183 "VBNET.ATG" +#line 2222 "VBNET.ATG" QueryExpressionOrderClause orderClause = new QueryExpressionOrderClause(); orderClause.StartLocation = la.Location; List orderings = null; @@ -6018,10 +6140,10 @@ List middleClauses) { Expect(176); Expect(70); OrderExpressionList( -#line 2187 "VBNET.ATG" +#line 2226 "VBNET.ATG" out orderings); -#line 2189 "VBNET.ATG" +#line 2228 "VBNET.ATG" orderClause.Orderings = orderings; orderClause.EndLocation = t.EndLocation; middleClauses.Add(orderClause); @@ -6029,10 +6151,10 @@ out orderings); } void PartitionQueryOperator( -#line 2303 "VBNET.ATG" +#line 2342 "VBNET.ATG" out QueryExpressionPartitionVBClause partitionClause) { -#line 2305 "VBNET.ATG" +#line 2344 "VBNET.ATG" partitionClause = new QueryExpressionPartitionVBClause(); partitionClause.StartLocation = la.Location; Expression expr = null; @@ -6040,60 +6162,60 @@ out QueryExpressionPartitionVBClause partitionClause) { if (la.kind == 212) { lexer.NextToken(); -#line 2310 "VBNET.ATG" +#line 2349 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Take; if (la.kind == 231) { lexer.NextToken(); -#line 2311 "VBNET.ATG" +#line 2350 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.TakeWhile; } } else if (la.kind == 203) { lexer.NextToken(); -#line 2312 "VBNET.ATG" +#line 2351 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Skip; if (la.kind == 231) { lexer.NextToken(); -#line 2313 "VBNET.ATG" +#line 2352 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.SkipWhile; } - } else SynErr(293); + } else SynErr(297); Expr( -#line 2315 "VBNET.ATG" +#line 2354 "VBNET.ATG" out expr); -#line 2317 "VBNET.ATG" +#line 2356 "VBNET.ATG" partitionClause.Expression = expr; partitionClause.EndLocation = t.EndLocation; } void LetQueryOperator( -#line 2342 "VBNET.ATG" +#line 2381 "VBNET.ATG" List middleClauses) { -#line 2344 "VBNET.ATG" +#line 2383 "VBNET.ATG" QueryExpressionLetVBClause letClause = new QueryExpressionLetVBClause(); letClause.StartLocation = la.Location; Expect(148); ExpressionRangeVariableDeclarationList( -#line 2347 "VBNET.ATG" +#line 2386 "VBNET.ATG" letClause.Variables); -#line 2349 "VBNET.ATG" +#line 2388 "VBNET.ATG" letClause.EndLocation = t.EndLocation; middleClauses.Add(letClause); } void JoinQueryOperator( -#line 2386 "VBNET.ATG" +#line 2425 "VBNET.ATG" out QueryExpressionJoinVBClause joinClause) { -#line 2388 "VBNET.ATG" +#line 2427 "VBNET.ATG" joinClause = new QueryExpressionJoinVBClause(); joinClause.StartLocation = la.Location; CollectionRangeVariable joinVariable = null; @@ -6103,203 +6225,203 @@ out QueryExpressionJoinVBClause joinClause) { Expect(146); CollectionRangeVariableDeclaration( -#line 2395 "VBNET.ATG" +#line 2434 "VBNET.ATG" out joinVariable); -#line 2396 "VBNET.ATG" +#line 2435 "VBNET.ATG" joinClause.JoinVariable = joinVariable; if (la.kind == 146) { JoinQueryOperator( -#line 2398 "VBNET.ATG" +#line 2437 "VBNET.ATG" out subJoin); -#line 2399 "VBNET.ATG" +#line 2438 "VBNET.ATG" joinClause.SubJoin = subJoin; } Expect(171); JoinCondition( -#line 2402 "VBNET.ATG" +#line 2441 "VBNET.ATG" out condition); -#line 2403 "VBNET.ATG" +#line 2442 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); while (la.kind == 60) { lexer.NextToken(); JoinCondition( -#line 2405 "VBNET.ATG" +#line 2444 "VBNET.ATG" out condition); -#line 2406 "VBNET.ATG" +#line 2445 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); } -#line 2409 "VBNET.ATG" +#line 2448 "VBNET.ATG" joinClause.EndLocation = t.EndLocation; } void GroupJoinQueryOperator( -#line 2239 "VBNET.ATG" +#line 2278 "VBNET.ATG" out QueryExpressionGroupJoinVBClause groupJoinClause) { -#line 2241 "VBNET.ATG" +#line 2280 "VBNET.ATG" groupJoinClause = new QueryExpressionGroupJoinVBClause(); groupJoinClause.StartLocation = la.Location; QueryExpressionJoinVBClause joinClause = null; Expect(133); JoinQueryOperator( -#line 2245 "VBNET.ATG" +#line 2284 "VBNET.ATG" out joinClause); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2246 "VBNET.ATG" +#line 2285 "VBNET.ATG" groupJoinClause.IntoVariables); -#line 2248 "VBNET.ATG" +#line 2287 "VBNET.ATG" groupJoinClause.JoinClause = joinClause; groupJoinClause.EndLocation = t.EndLocation; } void GroupByQueryOperator( -#line 2226 "VBNET.ATG" +#line 2265 "VBNET.ATG" out QueryExpressionGroupVBClause groupByClause) { -#line 2228 "VBNET.ATG" +#line 2267 "VBNET.ATG" groupByClause = new QueryExpressionGroupVBClause(); groupByClause.StartLocation = la.Location; Expect(133); ExpressionRangeVariableDeclarationList( -#line 2231 "VBNET.ATG" +#line 2270 "VBNET.ATG" groupByClause.GroupVariables); Expect(70); ExpressionRangeVariableDeclarationList( -#line 2232 "VBNET.ATG" +#line 2271 "VBNET.ATG" groupByClause.ByVariables); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2233 "VBNET.ATG" +#line 2272 "VBNET.ATG" groupByClause.IntoVariables); -#line 2235 "VBNET.ATG" +#line 2274 "VBNET.ATG" groupByClause.EndLocation = t.EndLocation; } void OrderExpressionList( -#line 2195 "VBNET.ATG" +#line 2234 "VBNET.ATG" out List orderings) { -#line 2197 "VBNET.ATG" +#line 2236 "VBNET.ATG" orderings = new List(); QueryExpressionOrdering ordering = null; OrderExpression( -#line 2200 "VBNET.ATG" +#line 2239 "VBNET.ATG" out ordering); -#line 2201 "VBNET.ATG" +#line 2240 "VBNET.ATG" orderings.Add(ordering); while (la.kind == 22) { lexer.NextToken(); OrderExpression( -#line 2203 "VBNET.ATG" +#line 2242 "VBNET.ATG" out ordering); -#line 2204 "VBNET.ATG" +#line 2243 "VBNET.ATG" orderings.Add(ordering); } } void OrderExpression( -#line 2208 "VBNET.ATG" +#line 2247 "VBNET.ATG" out QueryExpressionOrdering ordering) { -#line 2210 "VBNET.ATG" +#line 2249 "VBNET.ATG" ordering = new QueryExpressionOrdering(); ordering.StartLocation = la.Location; ordering.Direction = QueryExpressionOrderingDirection.None; Expression orderExpr = null; Expr( -#line 2215 "VBNET.ATG" +#line 2254 "VBNET.ATG" out orderExpr); -#line 2217 "VBNET.ATG" +#line 2256 "VBNET.ATG" ordering.Criteria = orderExpr; if (la.kind == 64 || la.kind == 104) { if (la.kind == 64) { lexer.NextToken(); -#line 2220 "VBNET.ATG" +#line 2259 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Ascending; } else { lexer.NextToken(); -#line 2221 "VBNET.ATG" +#line 2260 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Descending; } } -#line 2223 "VBNET.ATG" +#line 2262 "VBNET.ATG" ordering.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclarationList( -#line 2354 "VBNET.ATG" +#line 2393 "VBNET.ATG" List variables) { -#line 2356 "VBNET.ATG" +#line 2395 "VBNET.ATG" ExpressionRangeVariable variable = null; ExpressionRangeVariableDeclaration( -#line 2358 "VBNET.ATG" +#line 2397 "VBNET.ATG" out variable); -#line 2359 "VBNET.ATG" +#line 2398 "VBNET.ATG" variables.Add(variable); while (la.kind == 22) { lexer.NextToken(); ExpressionRangeVariableDeclaration( -#line 2360 "VBNET.ATG" +#line 2399 "VBNET.ATG" out variable); -#line 2360 "VBNET.ATG" +#line 2399 "VBNET.ATG" variables.Add(variable); } } void CollectionRangeVariableDeclarationList( -#line 2413 "VBNET.ATG" +#line 2452 "VBNET.ATG" List rangeVariables) { -#line 2414 "VBNET.ATG" +#line 2453 "VBNET.ATG" CollectionRangeVariable variableDeclaration; CollectionRangeVariableDeclaration( -#line 2416 "VBNET.ATG" +#line 2455 "VBNET.ATG" out variableDeclaration); -#line 2417 "VBNET.ATG" +#line 2456 "VBNET.ATG" rangeVariables.Add(variableDeclaration); while (la.kind == 22) { lexer.NextToken(); CollectionRangeVariableDeclaration( -#line 2418 "VBNET.ATG" +#line 2457 "VBNET.ATG" out variableDeclaration); -#line 2418 "VBNET.ATG" +#line 2457 "VBNET.ATG" rangeVariables.Add(variableDeclaration); } } void CollectionRangeVariableDeclaration( -#line 2421 "VBNET.ATG" +#line 2460 "VBNET.ATG" out CollectionRangeVariable rangeVariable) { -#line 2423 "VBNET.ATG" +#line 2462 "VBNET.ATG" rangeVariable = new CollectionRangeVariable(); rangeVariable.StartLocation = la.Location; TypeReference typeName = null; @@ -6307,71 +6429,71 @@ out CollectionRangeVariable rangeVariable) { Identifier(); -#line 2428 "VBNET.ATG" +#line 2467 "VBNET.ATG" rangeVariable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2429 "VBNET.ATG" +#line 2468 "VBNET.ATG" out typeName); -#line 2429 "VBNET.ATG" +#line 2468 "VBNET.ATG" rangeVariable.Type = typeName; } Expect(138); Expr( -#line 2430 "VBNET.ATG" +#line 2469 "VBNET.ATG" out inExpr); -#line 2432 "VBNET.ATG" +#line 2471 "VBNET.ATG" rangeVariable.Expression = inExpr; rangeVariable.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclaration( -#line 2363 "VBNET.ATG" +#line 2402 "VBNET.ATG" out ExpressionRangeVariable variable) { -#line 2365 "VBNET.ATG" +#line 2404 "VBNET.ATG" variable = new ExpressionRangeVariable(); variable.StartLocation = la.Location; Expression rhs = null; TypeReference typeName = null; if ( -#line 2371 "VBNET.ATG" +#line 2410 "VBNET.ATG" IsIdentifiedExpressionRange()) { Identifier(); -#line 2372 "VBNET.ATG" +#line 2411 "VBNET.ATG" variable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2374 "VBNET.ATG" +#line 2413 "VBNET.ATG" out typeName); -#line 2375 "VBNET.ATG" +#line 2414 "VBNET.ATG" variable.Type = typeName; } Expect(20); } Expr( -#line 2379 "VBNET.ATG" +#line 2418 "VBNET.ATG" out rhs); -#line 2381 "VBNET.ATG" +#line 2420 "VBNET.ATG" variable.Expression = rhs; variable.EndLocation = t.EndLocation; } void JoinCondition( -#line 2437 "VBNET.ATG" +#line 2476 "VBNET.ATG" out QueryExpressionJoinConditionVB condition) { -#line 2439 "VBNET.ATG" +#line 2478 "VBNET.ATG" condition = new QueryExpressionJoinConditionVB(); condition.StartLocation = la.Location; @@ -6379,14 +6501,14 @@ out QueryExpressionJoinConditionVB condition) { Expression rhs = null; Expr( -#line 2445 "VBNET.ATG" +#line 2484 "VBNET.ATG" out lhs); Expect(116); Expr( -#line 2445 "VBNET.ATG" +#line 2484 "VBNET.ATG" out rhs); -#line 2447 "VBNET.ATG" +#line 2486 "VBNET.ATG" condition.LeftSide = lhs; condition.RightSide = rhs; condition.EndLocation = t.EndLocation; @@ -6394,93 +6516,93 @@ out rhs); } void Argument( -#line 2511 "VBNET.ATG" +#line 2550 "VBNET.ATG" out Expression argumentexpr) { -#line 2513 "VBNET.ATG" +#line 2552 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 2517 "VBNET.ATG" +#line 2556 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 2517 "VBNET.ATG" +#line 2556 "VBNET.ATG" name = t.val; Expect(55); Expr( -#line 2517 "VBNET.ATG" +#line 2556 "VBNET.ATG" out expr); -#line 2519 "VBNET.ATG" +#line 2558 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); - } else if (StartOf(29)) { + } else if (StartOf(30)) { Expr( -#line 2522 "VBNET.ATG" +#line 2561 "VBNET.ATG" out argumentexpr); - } else SynErr(294); + } else SynErr(298); } void QualIdentAndTypeArguments( -#line 2588 "VBNET.ATG" +#line 2627 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2589 "VBNET.ATG" +#line 2628 "VBNET.ATG" string name; typeref = null; Qualident( -#line 2591 "VBNET.ATG" +#line 2630 "VBNET.ATG" out name); -#line 2592 "VBNET.ATG" +#line 2631 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 2593 "VBNET.ATG" +#line 2632 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); if ( -#line 2595 "VBNET.ATG" +#line 2634 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2596 "VBNET.ATG" +#line 2635 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 22) { lexer.NextToken(); -#line 2597 "VBNET.ATG" +#line 2636 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } } else if (StartOf(8)) { TypeArgumentList( -#line 2598 "VBNET.ATG" +#line 2637 "VBNET.ATG" typeref.GenericTypes); - } else SynErr(295); + } else SynErr(299); Expect(38); } } void RankList( -#line 2635 "VBNET.ATG" +#line 2674 "VBNET.ATG" out int i) { -#line 2636 "VBNET.ATG" +#line 2675 "VBNET.ATG" i = 0; while (la.kind == 22) { lexer.NextToken(); -#line 2637 "VBNET.ATG" +#line 2676 "VBNET.ATG" ++i; } } void Attribute( -#line 2676 "VBNET.ATG" +#line 2715 "VBNET.ATG" out ASTAttribute attribute) { -#line 2677 "VBNET.ATG" +#line 2716 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -6490,52 +6612,52 @@ out ASTAttribute attribute) { Expect(26); } Qualident( -#line 2682 "VBNET.ATG" +#line 2721 "VBNET.ATG" out name); if (la.kind == 37) { AttributeArguments( -#line 2683 "VBNET.ATG" +#line 2722 "VBNET.ATG" positional, named); } -#line 2685 "VBNET.ATG" +#line 2724 "VBNET.ATG" attribute = new ASTAttribute(name, positional, named); } void AttributeArguments( -#line 2690 "VBNET.ATG" +#line 2729 "VBNET.ATG" List positional, List named) { -#line 2692 "VBNET.ATG" +#line 2731 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(37); if ( -#line 2698 "VBNET.ATG" +#line 2737 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2700 "VBNET.ATG" +#line 2739 "VBNET.ATG" IsNamedAssign()) { -#line 2700 "VBNET.ATG" +#line 2739 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2701 "VBNET.ATG" +#line 2740 "VBNET.ATG" out name); if (la.kind == 55) { lexer.NextToken(); } else if (la.kind == 20) { lexer.NextToken(); - } else SynErr(296); + } else SynErr(300); } Expr( -#line 2703 "VBNET.ATG" +#line 2742 "VBNET.ATG" out expr); -#line 2705 "VBNET.ATG" +#line 2744 "VBNET.ATG" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } @@ -6544,29 +6666,29 @@ out expr); while (la.kind == 22) { lexer.NextToken(); if ( -#line 2713 "VBNET.ATG" +#line 2752 "VBNET.ATG" IsNamedAssign()) { -#line 2713 "VBNET.ATG" +#line 2752 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2714 "VBNET.ATG" +#line 2753 "VBNET.ATG" out name); if (la.kind == 55) { lexer.NextToken(); } else if (la.kind == 20) { lexer.NextToken(); - } else SynErr(297); - } else if (StartOf(29)) { + } else SynErr(301); + } else if (StartOf(30)) { -#line 2716 "VBNET.ATG" +#line 2755 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); - } else SynErr(298); + } else SynErr(302); Expr( -#line 2717 "VBNET.ATG" +#line 2756 "VBNET.ATG" out expr); -#line 2717 "VBNET.ATG" +#line 2756 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -6577,10 +6699,10 @@ out expr); } void FormalParameter( -#line 2774 "VBNET.ATG" +#line 2813 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2776 "VBNET.ATG" +#line 2815 "VBNET.ATG" AttributeSection section; List attributes = new List(); TypeReference type = null; @@ -6591,36 +6713,36 @@ out ParameterDeclarationExpression p) { while (la.kind == 40) { AttributeSection( -#line 2785 "VBNET.ATG" +#line 2824 "VBNET.ATG" out section); -#line 2785 "VBNET.ATG" +#line 2824 "VBNET.ATG" attributes.Add(section); } - while (StartOf(41)) { + while (StartOf(44)) { ParameterModifier( -#line 2786 "VBNET.ATG" +#line 2825 "VBNET.ATG" mod); } Identifier(); -#line 2787 "VBNET.ATG" +#line 2826 "VBNET.ATG" string parameterName = t.val; if ( -#line 2788 "VBNET.ATG" +#line 2827 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2788 "VBNET.ATG" +#line 2827 "VBNET.ATG" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2789 "VBNET.ATG" +#line 2828 "VBNET.ATG" out type); } -#line 2791 "VBNET.ATG" +#line 2830 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -6634,11 +6756,11 @@ out type); if (la.kind == 20) { lexer.NextToken(); Expr( -#line 2801 "VBNET.ATG" +#line 2840 "VBNET.ATG" out expr); } -#line 2803 "VBNET.ATG" +#line 2842 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); p.Attributes = attributes; @@ -6646,34 +6768,34 @@ out expr); } void ParameterModifier( -#line 3487 "VBNET.ATG" +#line 3526 "VBNET.ATG" ParamModifierList m) { if (la.kind == 72) { lexer.NextToken(); -#line 3488 "VBNET.ATG" +#line 3527 "VBNET.ATG" m.Add(ParameterModifiers.In); } else if (la.kind == 69) { lexer.NextToken(); -#line 3489 "VBNET.ATG" +#line 3528 "VBNET.ATG" m.Add(ParameterModifiers.Ref); } else if (la.kind == 174) { lexer.NextToken(); -#line 3490 "VBNET.ATG" +#line 3529 "VBNET.ATG" m.Add(ParameterModifiers.Optional); } else if (la.kind == 182) { lexer.NextToken(); -#line 3491 "VBNET.ATG" +#line 3530 "VBNET.ATG" m.Add(ParameterModifiers.Params); - } else SynErr(299); + } else SynErr(303); } void Statement() { -#line 2832 "VBNET.ATG" +#line 2871 "VBNET.ATG" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -6681,27 +6803,27 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 21) { } else if ( -#line 2838 "VBNET.ATG" +#line 2877 "VBNET.ATG" IsLabel()) { LabelName( -#line 2838 "VBNET.ATG" +#line 2877 "VBNET.ATG" out label); -#line 2840 "VBNET.ATG" +#line 2879 "VBNET.ATG" AddChild(new LabelStatement(t.val)); Expect(21); Statement(); - } else if (StartOf(42)) { + } else if (StartOf(45)) { EmbeddedStatement( -#line 2843 "VBNET.ATG" +#line 2882 "VBNET.ATG" out stmt); -#line 2843 "VBNET.ATG" +#line 2882 "VBNET.ATG" AddChild(stmt); - } else SynErr(300); + } else SynErr(304); -#line 2846 "VBNET.ATG" +#line 2885 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -6710,30 +6832,30 @@ out stmt); } void LabelName( -#line 3261 "VBNET.ATG" +#line 3300 "VBNET.ATG" out string name) { -#line 3263 "VBNET.ATG" +#line 3302 "VBNET.ATG" name = String.Empty; if (StartOf(4)) { Identifier(); -#line 3265 "VBNET.ATG" +#line 3304 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 3266 "VBNET.ATG" +#line 3305 "VBNET.ATG" name = t.val; - } else SynErr(301); + } else SynErr(305); } void LocalDeclarationStatement( -#line 2854 "VBNET.ATG" +#line 2893 "VBNET.ATG" out Statement statement) { -#line 2856 "VBNET.ATG" +#line 2895 "VBNET.ATG" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -6742,22 +6864,22 @@ out Statement statement) { if (la.kind == 88) { lexer.NextToken(); -#line 2862 "VBNET.ATG" +#line 2901 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); } else if (la.kind == 204) { lexer.NextToken(); -#line 2863 "VBNET.ATG" +#line 2902 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 2864 "VBNET.ATG" +#line 2903 "VBNET.ATG" dimfound = true; } } -#line 2867 "VBNET.ATG" +#line 2906 "VBNET.ATG" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -6770,135 +6892,135 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2878 "VBNET.ATG" +#line 2917 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 2879 "VBNET.ATG" +#line 2918 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2881 "VBNET.ATG" +#line 2920 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 3375 "VBNET.ATG" +#line 3414 "VBNET.ATG" out Statement tryStatement) { -#line 3377 "VBNET.ATG" +#line 3416 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(218); EndOfStmt(); Block( -#line 3380 "VBNET.ATG" +#line 3419 "VBNET.ATG" out blockStmt); if (la.kind == 75 || la.kind == 113 || la.kind == 123) { CatchClauses( -#line 3381 "VBNET.ATG" +#line 3420 "VBNET.ATG" out catchClauses); } if (la.kind == 123) { lexer.NextToken(); EndOfStmt(); Block( -#line 3382 "VBNET.ATG" +#line 3421 "VBNET.ATG" out finallyStmt); } Expect(113); Expect(218); -#line 3385 "VBNET.ATG" +#line 3424 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 3355 "VBNET.ATG" +#line 3394 "VBNET.ATG" out Statement withStatement) { -#line 3357 "VBNET.ATG" +#line 3396 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(233); -#line 3360 "VBNET.ATG" +#line 3399 "VBNET.ATG" Location start = t.Location; Expr( -#line 3361 "VBNET.ATG" +#line 3400 "VBNET.ATG" out expr); EndOfStmt(); -#line 3363 "VBNET.ATG" +#line 3402 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 3366 "VBNET.ATG" +#line 3405 "VBNET.ATG" out blockStmt); -#line 3368 "VBNET.ATG" +#line 3407 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; Expect(113); Expect(233); -#line 3371 "VBNET.ATG" +#line 3410 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 3348 "VBNET.ATG" +#line 3387 "VBNET.ATG" out ConditionType conditionType) { -#line 3349 "VBNET.ATG" +#line 3388 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 231) { lexer.NextToken(); -#line 3350 "VBNET.ATG" +#line 3389 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 224) { lexer.NextToken(); -#line 3351 "VBNET.ATG" +#line 3390 "VBNET.ATG" conditionType = ConditionType.Until; - } else SynErr(302); + } else SynErr(306); } void LoopControlVariable( -#line 3191 "VBNET.ATG" +#line 3230 "VBNET.ATG" out TypeReference type, out string name) { -#line 3192 "VBNET.ATG" +#line 3231 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 3196 "VBNET.ATG" +#line 3235 "VBNET.ATG" out name); if ( -#line 3197 "VBNET.ATG" +#line 3236 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 3197 "VBNET.ATG" +#line 3236 "VBNET.ATG" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3198 "VBNET.ATG" +#line 3237 "VBNET.ATG" out type); -#line 3198 "VBNET.ATG" +#line 3237 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 3200 "VBNET.ATG" +#line 3239 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -6910,34 +7032,34 @@ out type); } void ReDimClause( -#line 3270 "VBNET.ATG" +#line 3309 "VBNET.ATG" out Expression expr) { SimpleNonInvocationExpression( -#line 3272 "VBNET.ATG" +#line 3311 "VBNET.ATG" out expr); ReDimClauseInternal( -#line 3273 "VBNET.ATG" +#line 3312 "VBNET.ATG" ref expr); } void SingleLineStatementList( -#line 3177 "VBNET.ATG" +#line 3216 "VBNET.ATG" List list) { -#line 3178 "VBNET.ATG" +#line 3217 "VBNET.ATG" Statement embeddedStatement = null; if (la.kind == 113) { lexer.NextToken(); -#line 3180 "VBNET.ATG" +#line 3219 "VBNET.ATG" embeddedStatement = new EndStatement(); - } else if (StartOf(42)) { + } else if (StartOf(45)) { EmbeddedStatement( -#line 3181 "VBNET.ATG" +#line 3220 "VBNET.ATG" out embeddedStatement); - } else SynErr(303); + } else SynErr(307); -#line 3182 "VBNET.ATG" +#line 3221 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); while (la.kind == 21) { lexer.NextToken(); @@ -6947,62 +7069,62 @@ out embeddedStatement); if (la.kind == 113) { lexer.NextToken(); -#line 3184 "VBNET.ATG" +#line 3223 "VBNET.ATG" embeddedStatement = new EndStatement(); - } else if (StartOf(42)) { + } else if (StartOf(45)) { EmbeddedStatement( -#line 3185 "VBNET.ATG" +#line 3224 "VBNET.ATG" out embeddedStatement); - } else SynErr(304); + } else SynErr(308); -#line 3186 "VBNET.ATG" +#line 3225 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); } } void CaseClauses( -#line 3308 "VBNET.ATG" +#line 3347 "VBNET.ATG" out List caseClauses) { -#line 3310 "VBNET.ATG" +#line 3349 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 3313 "VBNET.ATG" +#line 3352 "VBNET.ATG" out caseClause); -#line 3313 "VBNET.ATG" +#line 3352 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 22) { lexer.NextToken(); CaseClause( -#line 3314 "VBNET.ATG" +#line 3353 "VBNET.ATG" out caseClause); -#line 3314 "VBNET.ATG" +#line 3353 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 3211 "VBNET.ATG" +#line 3250 "VBNET.ATG" out OnErrorStatement stmt) { -#line 3213 "VBNET.ATG" +#line 3252 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(171); Expect(118); if ( -#line 3219 "VBNET.ATG" +#line 3258 "VBNET.ATG" IsNegativeLabelName()) { Expect(132); Expect(30); Expect(5); -#line 3221 "VBNET.ATG" +#line 3260 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -7011,10 +7133,10 @@ IsNegativeLabelName()) { } else if (la.kind == 132) { GotoStatement( -#line 3227 "VBNET.ATG" +#line 3266 "VBNET.ATG" out goToStatement); -#line 3229 "VBNET.ATG" +#line 3268 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -7031,88 +7153,88 @@ out goToStatement); lexer.NextToken(); Expect(163); -#line 3243 "VBNET.ATG" +#line 3282 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); - } else SynErr(305); + } else SynErr(309); } void GotoStatement( -#line 3249 "VBNET.ATG" +#line 3288 "VBNET.ATG" out GotoStatement goToStatement) { -#line 3251 "VBNET.ATG" +#line 3290 "VBNET.ATG" string label = String.Empty; Expect(132); LabelName( -#line 3254 "VBNET.ATG" +#line 3293 "VBNET.ATG" out label); -#line 3256 "VBNET.ATG" +#line 3295 "VBNET.ATG" goToStatement = new GotoStatement(label); } void ResumeStatement( -#line 3297 "VBNET.ATG" +#line 3336 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 3299 "VBNET.ATG" +#line 3338 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 3302 "VBNET.ATG" +#line 3341 "VBNET.ATG" IsResumeNext()) { Expect(194); Expect(163); -#line 3303 "VBNET.ATG" +#line 3342 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 194) { lexer.NextToken(); - if (StartOf(43)) { + if (StartOf(46)) { LabelName( -#line 3304 "VBNET.ATG" +#line 3343 "VBNET.ATG" out label); } -#line 3304 "VBNET.ATG" +#line 3343 "VBNET.ATG" resumeStatement = new ResumeStatement(label); - } else SynErr(306); + } else SynErr(310); } void ReDimClauseInternal( -#line 3276 "VBNET.ATG" +#line 3315 "VBNET.ATG" ref Expression expr) { -#line 3277 "VBNET.ATG" +#line 3316 "VBNET.ATG" List arguments; bool canBeNormal; bool canBeRedim; string name; while (la.kind == 26 || -#line 3280 "VBNET.ATG" +#line 3319 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { if (la.kind == 26) { lexer.NextToken(); IdentifierOrKeyword( -#line 3279 "VBNET.ATG" +#line 3318 "VBNET.ATG" out name); -#line 3279 "VBNET.ATG" +#line 3318 "VBNET.ATG" expr = new MemberReferenceExpression(expr, name); } else { InvocationExpression( -#line 3281 "VBNET.ATG" +#line 3320 "VBNET.ATG" ref expr); } } Expect(37); NormalOrReDimArgumentList( -#line 3284 "VBNET.ATG" +#line 3323 "VBNET.ATG" out arguments, out canBeNormal, out canBeRedim); Expect(38); -#line 3286 "VBNET.ATG" +#line 3325 "VBNET.ATG" expr = new InvocationExpression(expr, arguments); if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { if (this.Errors.Count == 0) { @@ -7124,10 +7246,10 @@ out arguments, out canBeNormal, out canBeRedim); } void CaseClause( -#line 3318 "VBNET.ATG" +#line 3357 "VBNET.ATG" out CaseLabel caseClause) { -#line 3320 "VBNET.ATG" +#line 3359 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -7136,9 +7258,9 @@ out CaseLabel caseClause) { if (la.kind == 111) { lexer.NextToken(); -#line 3326 "VBNET.ATG" +#line 3365 "VBNET.ATG" caseClause = new CaseLabel(); - } else if (StartOf(44)) { + } else if (StartOf(47)) { if (la.kind == 144) { lexer.NextToken(); } @@ -7146,76 +7268,76 @@ out CaseLabel caseClause) { case 40: { lexer.NextToken(); -#line 3330 "VBNET.ATG" +#line 3369 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 39: { lexer.NextToken(); -#line 3331 "VBNET.ATG" +#line 3370 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 43: { lexer.NextToken(); -#line 3332 "VBNET.ATG" +#line 3371 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 42: { lexer.NextToken(); -#line 3333 "VBNET.ATG" +#line 3372 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 20: { lexer.NextToken(); -#line 3334 "VBNET.ATG" +#line 3373 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 41: { lexer.NextToken(); -#line 3335 "VBNET.ATG" +#line 3374 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } - default: SynErr(307); break; + default: SynErr(311); break; } Expr( -#line 3337 "VBNET.ATG" +#line 3376 "VBNET.ATG" out expr); -#line 3339 "VBNET.ATG" +#line 3378 "VBNET.ATG" caseClause = new CaseLabel(op, expr); - } else if (StartOf(29)) { + } else if (StartOf(30)) { Expr( -#line 3341 "VBNET.ATG" +#line 3380 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); Expr( -#line 3341 "VBNET.ATG" +#line 3380 "VBNET.ATG" out sexpr); } -#line 3343 "VBNET.ATG" +#line 3382 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); - } else SynErr(308); + } else SynErr(312); } void CatchClauses( -#line 3390 "VBNET.ATG" +#line 3429 "VBNET.ATG" out List catchClauses) { -#line 3392 "VBNET.ATG" +#line 3431 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -7227,27 +7349,27 @@ out List catchClauses) { if (StartOf(4)) { Identifier(); -#line 3400 "VBNET.ATG" +#line 3439 "VBNET.ATG" name = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3400 "VBNET.ATG" +#line 3439 "VBNET.ATG" out type); } } if (la.kind == 229) { lexer.NextToken(); Expr( -#line 3401 "VBNET.ATG" +#line 3440 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 3403 "VBNET.ATG" +#line 3442 "VBNET.ATG" out blockStmt); -#line 3404 "VBNET.ATG" +#line 3443 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } @@ -7538,41 +7660,45 @@ out blockStmt); case 271: s = "invalid OverloadableOperator"; break; case 272: s = "invalid EventMemberSpecifier"; break; case 273: s = "invalid LambdaExpr"; break; - case 274: s = "invalid AssignmentOperator"; break; - case 275: s = "invalid SimpleNonInvocationExpression"; break; - case 276: s = "invalid SimpleNonInvocationExpression"; break; - case 277: s = "invalid SimpleNonInvocationExpression"; break; + case 274: s = "invalid XmlLiteralExpression"; 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 PrimitiveTypeName"; break; - case 280: s = "invalid CastTarget"; break; - case 281: s = "invalid ComparisonExpr"; break; - case 282: s = "invalid SubLambdaExpression"; break; - case 283: s = "invalid FunctionLambdaExpression"; break; - case 284: s = "invalid EmbeddedStatement"; break; - case 285: s = "invalid EmbeddedStatement"; break; - case 286: s = "invalid EmbeddedStatement"; break; - case 287: s = "invalid EmbeddedStatement"; break; + case 279: s = "invalid SimpleNonInvocationExpression"; break; + case 280: s = "invalid SimpleNonInvocationExpression"; break; + case 281: s = "invalid SimpleNonInvocationExpression"; break; + case 282: s = "invalid SimpleNonInvocationExpression"; break; + case 283: s = "invalid PrimitiveTypeName"; break; + case 284: s = "invalid CastTarget"; break; + case 285: s = "invalid ComparisonExpr"; break; + case 286: s = "invalid SubLambdaExpression"; break; + case 287: s = "invalid FunctionLambdaExpression"; break; case 288: s = "invalid EmbeddedStatement"; break; case 289: s = "invalid EmbeddedStatement"; break; case 290: s = "invalid EmbeddedStatement"; break; - case 291: s = "invalid FromOrAggregateQueryOperator"; break; - case 292: s = "invalid QueryOperator"; break; - case 293: s = "invalid PartitionQueryOperator"; break; - case 294: s = "invalid Argument"; break; - case 295: s = "invalid QualIdentAndTypeArguments"; break; - case 296: s = "invalid AttributeArguments"; break; - case 297: s = "invalid AttributeArguments"; break; - case 298: s = "invalid AttributeArguments"; break; - case 299: s = "invalid ParameterModifier"; break; - case 300: s = "invalid Statement"; break; - case 301: s = "invalid LabelName"; break; - case 302: s = "invalid WhileOrUntil"; break; - case 303: s = "invalid SingleLineStatementList"; break; - case 304: s = "invalid SingleLineStatementList"; break; - case 305: s = "invalid OnErrorStatement"; break; - case 306: s = "invalid ResumeStatement"; break; - case 307: s = "invalid CaseClause"; break; - case 308: s = "invalid CaseClause"; break; + case 291: s = "invalid EmbeddedStatement"; break; + case 292: s = "invalid EmbeddedStatement"; break; + case 293: s = "invalid EmbeddedStatement"; break; + case 294: s = "invalid EmbeddedStatement"; break; + case 295: s = "invalid FromOrAggregateQueryOperator"; break; + case 296: s = "invalid QueryOperator"; break; + case 297: s = "invalid PartitionQueryOperator"; break; + case 298: s = "invalid Argument"; break; + case 299: s = "invalid QualIdentAndTypeArguments"; break; + case 300: s = "invalid AttributeArguments"; break; + case 301: s = "invalid AttributeArguments"; break; + case 302: s = "invalid AttributeArguments"; break; + case 303: s = "invalid ParameterModifier"; break; + case 304: s = "invalid Statement"; break; + case 305: s = "invalid LabelName"; break; + case 306: s = "invalid WhileOrUntil"; break; + case 307: s = "invalid SingleLineStatementList"; break; + case 308: s = "invalid SingleLineStatementList"; break; + case 309: s = "invalid OnErrorStatement"; break; + case 310: s = "invalid ResumeStatement"; break; + case 311: s = "invalid CaseClause"; break; + case 312: s = "invalid CaseClause"; break; default: s = "error " + errorNumber; break; } @@ -7606,28 +7732,31 @@ out blockStmt); {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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, 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,T,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, 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,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,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,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,T, T,T,x,T, x,T,T,T, T,x,T,x, x,x,x,x, x,x,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,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, 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,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,T,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,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,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,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,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,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, 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,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,x,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,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,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,x, x,x,x,x, x,T,x,x, x,x,T,T, T,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, 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,x,x, x,x,x,x, x,x,x,x, 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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,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,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,T,T,T, x,x,x,x, x,x,T,T, T,x,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}, {x,x,T,T, T,T,T,T, 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,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, x,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,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, T,T,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, 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,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,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, x,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,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,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, 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,T, 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, T,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,T,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,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,T,x, x,x,T,T, x,x,T,T, x,T,T,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,T,T, T,T,T,T, T,T,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,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, x,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,x,T,T, T,T,T,T, T,T,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,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,T,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,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,x,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, x,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,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,T,T,T, x,x,x,x, x,x,T,T, T,x,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, 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,T, 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, T,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,T,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,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,T,T,T, x,x,T,x, x,x,T,T, T,x,T,T, x,x,T,T, x,T,T,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,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,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,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, x,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,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,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, 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,T,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,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,T,T, T,T,T,T, T,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,x, x,x,x,x, x,x,x,x}, - {x,T,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,x, x,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,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,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,T,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, 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,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,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,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,T,x, T,T,T,T, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,T,x,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,T, x,x,x,T, x,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,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, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,T, T,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,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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,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,T, T,T,T,T, T,T,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,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,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,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, 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,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,T,x, x,x,T,x, T,T,T,T, x,x,T,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,T,x, x,x,x,x, T,x,x,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,T, x,x,x,T, x,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,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, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,T, T,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, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,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, 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} diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index 370a67f704..6876e7fb77 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -1675,10 +1675,10 @@ SimpleExpr SimpleNonInvocationExpression { "." ( - IdentifierOrKeyword - (. pexpr = new MemberReferenceExpression(pexpr, name); .) - | XmlOpenTag IdentifierOrKeyword XmlCloseTag + XmlOpenTag IdentifierOrKeyword XmlCloseTag (. pexpr = new XmlMemberAccessExpression(pexpr, XmlAxisType.Element, name, true); .) + | IdentifierOrKeyword + (. pexpr = new MemberReferenceExpression(pexpr, name); .) ) [ IF (la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) "(" "Of" TypeArgumentList<((MemberReferenceExpression)pexpr).TypeArguments> ")" @@ -1752,14 +1752,24 @@ SimpleNonInvocationExpression | /* 11.22 */ ConditionalExpression ) | - /* this form only occurs in WithStatements*/ - "." IdentifierOrKeyword (. pexpr = new MemberReferenceExpression(null, name);.) + /* this form only occurs in WithStatements */ + "." ( + XmlOpenTag IdentifierOrKeyword XmlCloseTag + (. pexpr = new XmlMemberAccessExpression(null, XmlAxisType.Element, name, true); .) + | IdentifierOrKeyword + (. pexpr = new MemberReferenceExpression(null, name); .) + ) | + (. XmlAxisType axisType = XmlAxisType.Element; bool isXmlIdentifier = false; .) + ( "..." (. axisType = XmlAxisType.Descendents; .) | ".@" (. axisType = XmlAxisType.Attribute; .) ) ( + [ XmlOpenTag (. isXmlIdentifier = true; .) ] IdentifierOrKeyword [ XmlCloseTag ] + (. pexpr = new XmlMemberAccessExpression(null, axisType, name, isXmlIdentifier); .) + ) ) . XmlLiteralExpression (. - XmlLiteralExpression expr = pexpr = new XmlLiteralExpression(); + XmlLiteralExpression expr = new XmlLiteralExpression(); List exprs = expr.Expressions; XmlExpression currentExpression = null; .) @@ -1771,9 +1781,10 @@ XmlLiteralExpression | XmlProcessingInstruction (. currentExpression = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); .) ) (. - currentExpression.Location = t.Location; + currentExpression.StartLocation = t.Location; currentExpression.EndLocation = t.EndLocation; exprs.Add(currentExpression); + pexpr = expr; .) . @@ -3541,7 +3552,7 @@ MemberModifier = | "Private" (.m.Add(Modifiers.Private, t.Location);.) | "Protected" (.m.Add(Modifiers.Protected, t.Location);.) | "Public" (.m.Add(Modifiers.Public, t.Location);.) - | "NotInheritable" (.m.Add(Modifiers.Sealed, t.Location);.) + | "NotInheritable" (.m.Add(Modifiers.Sealed, t.Location);.) | "NotOverridable" (.m.Add(Modifiers.Sealed, t.Location);.) | "Shared" (.m.Add(Modifiers.Static, t.Location);.) | "Overridable" (.m.Add(Modifiers.Virtual, t.Location);.) diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNetParser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNetParser.cs index 2d930891ff..884979723a 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNetParser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNetParser.cs @@ -96,6 +96,7 @@ namespace ICSharpCode.NRefactory.Parser.VB public override Expression ParseExpression() { + lexer.SetInitialContext(SnippetType.Expression); lexer.NextToken(); Location startLocation = la.Location; Expression expr; diff --git a/src/Libraries/NRefactory/Test/NRefactoryTests.csproj b/src/Libraries/NRefactory/Test/NRefactoryTests.csproj index 98fdf06be9..5e86026745 100644 --- a/src/Libraries/NRefactory/Test/NRefactoryTests.csproj +++ b/src/Libraries/NRefactory/Test/NRefactoryTests.csproj @@ -66,6 +66,7 @@ + diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/XmlMemberAccessExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/XmlMemberAccessExpressionTests.cs new file mode 100644 index 0000000000..046835393e --- /dev/null +++ b/src/Libraries/NRefactory/Test/Parser/Expressions/XmlMemberAccessExpressionTests.cs @@ -0,0 +1,60 @@ +// +// +// +// +// $Revision$ +// + +using System; +using System.IO; +using NUnit.Framework; +using ICSharpCode.NRefactory.Parser; +using ICSharpCode.NRefactory.Ast; + +namespace ICSharpCode.NRefactory.Tests.Ast +{ + [TestFixture] + public class XmlMemberAccessExpressionTests + { + #region C# + + // no C# representation + + #endregion + + #region VB.NET + [Test] + public void VBNetSimpleElementReferenceTest() + { + XmlMemberAccessExpression xmae = ParseUtilVBNet.ParseExpression("xml."); + Assert.AreEqual("ns:MyElement", xmae.Identifier); + Assert.IsTrue(xmae.IsXmlIdentifier); + Assert.AreEqual(XmlAxisType.Element, xmae.AxisType); + Assert.IsTrue(xmae.TargetObject is IdentifierExpression); + Assert.AreEqual("xml", ((IdentifierExpression)xmae.TargetObject).Identifier); + } + + [Test] + public void VBNetSimpleAttributeReferenceTest() + { + XmlMemberAccessExpression xmae = ParseUtilVBNet.ParseExpression("xml.@attribute"); + Assert.AreEqual("attribute", xmae.Identifier); + Assert.IsFalse(xmae.IsXmlIdentifier); + Assert.AreEqual(XmlAxisType.Attribute, xmae.AxisType); + Assert.IsTrue(xmae.TargetObject is IdentifierExpression); + Assert.AreEqual("xml", ((IdentifierExpression)xmae.TargetObject).Identifier); + } + + [Test] + public void VBNetXmlNameAttributeReferenceTest() + { + XmlMemberAccessExpression xmae = ParseUtilVBNet.ParseExpression("xml.@"); + Assert.AreEqual("ns:attribute", xmae.Identifier); + Assert.IsTrue(xmae.IsXmlIdentifier); + Assert.AreEqual(XmlAxisType.Attribute, xmae.AxisType); + Assert.IsTrue(xmae.TargetObject is IdentifierExpression); + Assert.AreEqual("xml", ((IdentifierExpression)xmae.TargetObject).Identifier); + } + #endregion + } +}