diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index 3634c41c5f..a595666538 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -350,7 +350,7 @@ out u); void GlobalAttributeSection() { -#line 1784 "VBNET.ATG" +#line 1808 "VBNET.ATG" Point startPos = t.Location; Expect(26); if (la.kind == 48) { @@ -359,20 +359,20 @@ out u); lexer.NextToken(); } else SynErr(203); -#line 1786 "VBNET.ATG" +#line 1810 "VBNET.ATG" string attributeTarget = t.val.ToLower(); List attributes = new List(); ASTAttribute attribute; Expect(13); Attribute( -#line 1790 "VBNET.ATG" +#line 1814 "VBNET.ATG" out attribute); -#line 1790 "VBNET.ATG" +#line 1814 "VBNET.ATG" attributes.Add(attribute); while ( -#line 1791 "VBNET.ATG" +#line 1815 "VBNET.ATG" NotFinalComma()) { if (la.kind == 12) { lexer.NextToken(); @@ -384,10 +384,10 @@ NotFinalComma()) { Expect(13); } Attribute( -#line 1791 "VBNET.ATG" +#line 1815 "VBNET.ATG" out attribute); -#line 1791 "VBNET.ATG" +#line 1815 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -396,7 +396,7 @@ out attribute); Expect(25); EndOfStmt(); -#line 1796 "VBNET.ATG" +#line 1820 "VBNET.ATG" AttributeSection section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -527,30 +527,30 @@ out qualident); } void Qualident( -#line 2508 "VBNET.ATG" +#line 2532 "VBNET.ATG" out string qualident) { -#line 2510 "VBNET.ATG" +#line 2534 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 2514 "VBNET.ATG" +#line 2538 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 2515 "VBNET.ATG" +#line 2539 "VBNET.ATG" DotAndIdentOrKw()) { Expect(10); IdentifierOrKeyword( -#line 2515 "VBNET.ATG" +#line 2539 "VBNET.ATG" out name); -#line 2515 "VBNET.ATG" +#line 2539 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 2517 "VBNET.ATG" +#line 2541 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } @@ -564,35 +564,35 @@ out name); } void AttributeSection( -#line 1854 "VBNET.ATG" +#line 1878 "VBNET.ATG" out AttributeSection section) { -#line 1856 "VBNET.ATG" +#line 1880 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(26); -#line 1860 "VBNET.ATG" +#line 1884 "VBNET.ATG" Point startPos = t.Location; if ( -#line 1861 "VBNET.ATG" +#line 1885 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 92) { lexer.NextToken(); -#line 1862 "VBNET.ATG" +#line 1886 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 154) { lexer.NextToken(); -#line 1863 "VBNET.ATG" +#line 1887 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 1866 "VBNET.ATG" +#line 1890 "VBNET.ATG" string val = t.val.ToLower(); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -605,20 +605,20 @@ IsLocalAttrTarget()) { Expect(13); } Attribute( -#line 1876 "VBNET.ATG" +#line 1900 "VBNET.ATG" out attribute); -#line 1876 "VBNET.ATG" +#line 1900 "VBNET.ATG" attributes.Add(attribute); while ( -#line 1877 "VBNET.ATG" +#line 1901 "VBNET.ATG" NotFinalComma()) { Expect(12); Attribute( -#line 1877 "VBNET.ATG" +#line 1901 "VBNET.ATG" out attribute); -#line 1877 "VBNET.ATG" +#line 1901 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -626,7 +626,7 @@ out attribute); } Expect(25); -#line 1881 "VBNET.ATG" +#line 1905 "VBNET.ATG" section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -634,62 +634,62 @@ out attribute); } void TypeModifier( -#line 2717 "VBNET.ATG" +#line 2741 "VBNET.ATG" Modifiers m) { switch (la.kind) { case 148: { lexer.NextToken(); -#line 2718 "VBNET.ATG" +#line 2742 "VBNET.ATG" m.Add(Modifier.Public); break; } case 147: { lexer.NextToken(); -#line 2719 "VBNET.ATG" +#line 2743 "VBNET.ATG" m.Add(Modifier.Protected); break; } case 98: { lexer.NextToken(); -#line 2720 "VBNET.ATG" +#line 2744 "VBNET.ATG" m.Add(Modifier.Internal); break; } case 145: { lexer.NextToken(); -#line 2721 "VBNET.ATG" +#line 2745 "VBNET.ATG" m.Add(Modifier.Private); break; } case 158: { lexer.NextToken(); -#line 2722 "VBNET.ATG" +#line 2746 "VBNET.ATG" m.Add(Modifier.Static); break; } case 157: { lexer.NextToken(); -#line 2723 "VBNET.ATG" +#line 2747 "VBNET.ATG" m.Add(Modifier.New); break; } case 121: { lexer.NextToken(); -#line 2724 "VBNET.ATG" +#line 2748 "VBNET.ATG" m.Add(Modifier.Abstract); break; } case 130: { lexer.NextToken(); -#line 2725 "VBNET.ATG" +#line 2749 "VBNET.ATG" m.Add(Modifier.Sealed); break; } @@ -698,27 +698,27 @@ Modifiers m) { } void NonModuleDeclaration( -#line 586 "VBNET.ATG" +#line 589 "VBNET.ATG" Modifiers m, List attributes) { -#line 588 "VBNET.ATG" +#line 591 "VBNET.ATG" string name = String.Empty; ArrayList names = null; switch (la.kind) { case 66: case 199: { -#line 591 "VBNET.ATG" +#line 594 "VBNET.ATG" m.Check(Modifier.Classes); if (la.kind == 199) { lexer.NextToken(); -#line 593 "VBNET.ATG" +#line 596 "VBNET.ATG" m.Add(Modifier.Partial); } Expect(66); -#line 595 "VBNET.ATG" +#line 598 "VBNET.ATG" TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); compilationUnit.BlockStart(newType); @@ -727,35 +727,33 @@ Modifiers m, List attributes) { Identifier(); -#line 602 "VBNET.ATG" +#line 605 "VBNET.ATG" newType.Name = t.val; newType.StartLocation = t.EndLocation; - if (la.kind == 23) { - TypeParameterList( -#line 603 "VBNET.ATG" + TypeParameterList( +#line 606 "VBNET.ATG" newType.Templates); - } EndOfStmt(); if (la.kind == 109) { ClassBaseType( -#line 605 "VBNET.ATG" +#line 608 "VBNET.ATG" out name); -#line 605 "VBNET.ATG" +#line 608 "VBNET.ATG" newType.BaseTypes.Add(name); } while (la.kind == 106) { TypeImplementsClause( -#line 606 "VBNET.ATG" +#line 609 "VBNET.ATG" out names); -#line 606 "VBNET.ATG" +#line 609 "VBNET.ATG" newType.BaseTypes.AddRange(names); } ClassBody( -#line 607 "VBNET.ATG" +#line 610 "VBNET.ATG" newType); -#line 609 "VBNET.ATG" +#line 612 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -763,7 +761,7 @@ newType); case 120: { lexer.NextToken(); -#line 613 "VBNET.ATG" +#line 616 "VBNET.ATG" m.Check(Modifier.VBModules); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); @@ -773,14 +771,14 @@ newType); Identifier(); -#line 620 "VBNET.ATG" +#line 623 "VBNET.ATG" newType.Name = t.val; newType.StartLocation = t.EndLocation; Expect(1); ModuleBody( -#line 622 "VBNET.ATG" +#line 625 "VBNET.ATG" newType); -#line 624 "VBNET.ATG" +#line 627 "VBNET.ATG" newType.EndLocation = t.Location; compilationUnit.BlockEnd(); @@ -789,7 +787,7 @@ newType); case 166: { lexer.NextToken(); -#line 629 "VBNET.ATG" +#line 632 "VBNET.ATG" m.Check(Modifier.VBStructures); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); @@ -799,27 +797,25 @@ newType); Identifier(); -#line 636 "VBNET.ATG" +#line 639 "VBNET.ATG" newType.Name = t.val; newType.StartLocation = t.EndLocation; - if (la.kind == 23) { - TypeParameterList( -#line 637 "VBNET.ATG" + TypeParameterList( +#line 640 "VBNET.ATG" newType.Templates); - } Expect(1); while (la.kind == 106) { TypeImplementsClause( -#line 638 "VBNET.ATG" +#line 641 "VBNET.ATG" out baseInterfaces); -#line 638 "VBNET.ATG" +#line 641 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } StructureBody( -#line 639 "VBNET.ATG" +#line 642 "VBNET.ATG" newType); -#line 641 "VBNET.ATG" +#line 644 "VBNET.ATG" newType.EndLocation = t.Location; compilationUnit.BlockEnd(); @@ -828,7 +824,7 @@ newType); case 89: { lexer.NextToken(); -#line 647 "VBNET.ATG" +#line 650 "VBNET.ATG" m.Check(Modifier.VBEnums); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); @@ -839,23 +835,23 @@ newType); Identifier(); -#line 655 "VBNET.ATG" +#line 658 "VBNET.ATG" newType.Name = t.val; newType.StartLocation = t.EndLocation; if (la.kind == 47) { lexer.NextToken(); PrimitiveTypeName( -#line 656 "VBNET.ATG" +#line 659 "VBNET.ATG" out name); -#line 656 "VBNET.ATG" +#line 659 "VBNET.ATG" newType.BaseTypes.Add(name); } Expect(1); EnumBody( -#line 658 "VBNET.ATG" +#line 661 "VBNET.ATG" newType); -#line 660 "VBNET.ATG" +#line 663 "VBNET.ATG" newType.EndLocation = t.Location; compilationUnit.BlockEnd(); @@ -864,7 +860,7 @@ newType); case 111: { lexer.NextToken(); -#line 666 "VBNET.ATG" +#line 669 "VBNET.ATG" m.Check(Modifier.VBInterfacs); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); @@ -873,27 +869,25 @@ newType); Identifier(); -#line 672 "VBNET.ATG" +#line 675 "VBNET.ATG" newType.Name = t.val; newType.StartLocation = t.EndLocation; - if (la.kind == 23) { - TypeParameterList( -#line 673 "VBNET.ATG" + TypeParameterList( +#line 676 "VBNET.ATG" newType.Templates); - } EndOfStmt(); while (la.kind == 109) { InterfaceBase( -#line 674 "VBNET.ATG" +#line 677 "VBNET.ATG" out baseInterfaces); -#line 674 "VBNET.ATG" +#line 677 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces.ToArray()); } InterfaceBody( -#line 675 "VBNET.ATG" +#line 678 "VBNET.ATG" newType); -#line 677 "VBNET.ATG" +#line 680 "VBNET.ATG" newType.EndLocation = t.Location; compilationUnit.BlockEnd(); @@ -902,7 +896,7 @@ newType); case 79: { lexer.NextToken(); -#line 683 "VBNET.ATG" +#line 686 "VBNET.ATG" m.Check(Modifier.VBDelegates); DelegateDeclaration delegateDeclr = new DelegateDeclaration(m.Modifier, attributes); delegateDeclr.ReturnType = new TypeReference("", "System.Void"); @@ -913,57 +907,63 @@ newType); lexer.NextToken(); Identifier(); -#line 690 "VBNET.ATG" +#line 693 "VBNET.ATG" delegateDeclr.Name = t.val; + TypeParameterList( +#line 694 "VBNET.ATG" +delegateDeclr.Templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 691 "VBNET.ATG" +#line 695 "VBNET.ATG" p); } Expect(24); -#line 691 "VBNET.ATG" +#line 695 "VBNET.ATG" delegateDeclr.Parameters = p; } } else if (la.kind == 99) { lexer.NextToken(); Identifier(); -#line 693 "VBNET.ATG" +#line 697 "VBNET.ATG" delegateDeclr.Name = t.val; + TypeParameterList( +#line 698 "VBNET.ATG" +delegateDeclr.Templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 694 "VBNET.ATG" +#line 699 "VBNET.ATG" p); } Expect(24); -#line 694 "VBNET.ATG" +#line 699 "VBNET.ATG" delegateDeclr.Parameters = p; } if (la.kind == 47) { lexer.NextToken(); -#line 695 "VBNET.ATG" +#line 700 "VBNET.ATG" TypeReference type; TypeName( -#line 695 "VBNET.ATG" +#line 700 "VBNET.ATG" out type); -#line 695 "VBNET.ATG" +#line 700 "VBNET.ATG" delegateDeclr.ReturnType = type; } } else SynErr(210); -#line 697 "VBNET.ATG" +#line 702 "VBNET.ATG" delegateDeclr.EndLocation = t.EndLocation; Expect(1); -#line 700 "VBNET.ATG" +#line 705 "VBNET.ATG" compilationUnit.AddChild(delegateDeclr); break; @@ -979,92 +979,96 @@ List templates) { #line 544 "VBNET.ATG" TemplateDefinition template; - Expect(23); - Expect(196); - TypeParameter( -#line 546 "VBNET.ATG" -out template); - -#line 548 "VBNET.ATG" - if (template != null) templates.Add(template); - - while (la.kind == 12) { + if ( +#line 547 "VBNET.ATG" +la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); + Expect(196); TypeParameter( -#line 551 "VBNET.ATG" +#line 548 "VBNET.ATG" out template); -#line 553 "VBNET.ATG" +#line 550 "VBNET.ATG" if (template != null) templates.Add(template); + while (la.kind == 12) { + lexer.NextToken(); + TypeParameter( +#line 553 "VBNET.ATG" +out template); + +#line 555 "VBNET.ATG" + if (template != null) templates.Add(template); + + } + Expect(24); } - Expect(24); } void TypeParameter( -#line 560 "VBNET.ATG" +#line 563 "VBNET.ATG" out TemplateDefinition template) { Identifier(); -#line 562 "VBNET.ATG" +#line 565 "VBNET.ATG" template = new TemplateDefinition(t.val, null); if (la.kind == 47) { TypeParameterConstraints( -#line 563 "VBNET.ATG" +#line 566 "VBNET.ATG" template); } } void TypeParameterConstraints( -#line 567 "VBNET.ATG" +#line 570 "VBNET.ATG" TemplateDefinition template) { -#line 569 "VBNET.ATG" +#line 572 "VBNET.ATG" TypeReference constraint; Expect(47); if (la.kind == 21) { lexer.NextToken(); TypeName( -#line 575 "VBNET.ATG" +#line 578 "VBNET.ATG" out constraint); -#line 575 "VBNET.ATG" +#line 578 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 578 "VBNET.ATG" +#line 581 "VBNET.ATG" out constraint); -#line 578 "VBNET.ATG" +#line 581 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } } Expect(22); } else if (StartOf(5)) { TypeName( -#line 581 "VBNET.ATG" +#line 584 "VBNET.ATG" out constraint); -#line 581 "VBNET.ATG" +#line 584 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } } else SynErr(212); } void TypeName( -#line 1709 "VBNET.ATG" +#line 1733 "VBNET.ATG" out TypeReference typeref) { -#line 1710 "VBNET.ATG" +#line 1734 "VBNET.ATG" ArrayList rank = null; typeref = null; NonArrayTypeName( -#line 1712 "VBNET.ATG" +#line 1736 "VBNET.ATG" out typeref); ArrayTypeModifiers( -#line 1713 "VBNET.ATG" +#line 1737 "VBNET.ATG" out rank); -#line 1715 "VBNET.ATG" +#line 1739 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -1072,271 +1076,271 @@ out rank); } void ClassBaseType( -#line 871 "VBNET.ATG" +#line 882 "VBNET.ATG" out string name) { -#line 873 "VBNET.ATG" +#line 884 "VBNET.ATG" TypeReference type; name = String.Empty; Expect(109); TypeName( -#line 877 "VBNET.ATG" +#line 888 "VBNET.ATG" out type); -#line 877 "VBNET.ATG" +#line 888 "VBNET.ATG" name = type.Type; EndOfStmt(); } void TypeImplementsClause( -#line 1362 "VBNET.ATG" +#line 1386 "VBNET.ATG" out ArrayList baseInterfaces) { -#line 1364 "VBNET.ATG" +#line 1388 "VBNET.ATG" baseInterfaces = new ArrayList(); TypeReference type = null; Expect(106); TypeName( -#line 1367 "VBNET.ATG" +#line 1391 "VBNET.ATG" out type); -#line 1369 "VBNET.ATG" +#line 1393 "VBNET.ATG" baseInterfaces.Add(type.Type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1372 "VBNET.ATG" +#line 1396 "VBNET.ATG" out type); -#line 1373 "VBNET.ATG" +#line 1397 "VBNET.ATG" baseInterfaces.Add(type.Type); } EndOfStmt(); } void ClassBody( -#line 710 "VBNET.ATG" +#line 715 "VBNET.ATG" TypeDeclaration newType) { -#line 711 "VBNET.ATG" +#line 716 "VBNET.ATG" AttributeSection section; while (StartOf(6)) { -#line 713 "VBNET.ATG" +#line 718 "VBNET.ATG" List attributes = new List(); Modifiers m = new Modifiers(); while (la.kind == 26) { AttributeSection( -#line 716 "VBNET.ATG" +#line 721 "VBNET.ATG" out section); -#line 716 "VBNET.ATG" +#line 721 "VBNET.ATG" attributes.Add(section); } while (StartOf(7)) { MemberModifier( -#line 717 "VBNET.ATG" +#line 722 "VBNET.ATG" m); } ClassMemberDecl( -#line 718 "VBNET.ATG" +#line 723 "VBNET.ATG" m, attributes); } Expect(87); Expect(66); -#line 720 "VBNET.ATG" +#line 725 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void ModuleBody( -#line 739 "VBNET.ATG" +#line 744 "VBNET.ATG" TypeDeclaration newType) { -#line 740 "VBNET.ATG" +#line 745 "VBNET.ATG" AttributeSection section; while (StartOf(6)) { -#line 742 "VBNET.ATG" +#line 747 "VBNET.ATG" List attributes = new List(); Modifiers m = new Modifiers(); while (la.kind == 26) { AttributeSection( -#line 745 "VBNET.ATG" +#line 750 "VBNET.ATG" out section); -#line 745 "VBNET.ATG" +#line 750 "VBNET.ATG" attributes.Add(section); } while (StartOf(7)) { MemberModifier( -#line 746 "VBNET.ATG" +#line 751 "VBNET.ATG" m); } ClassMemberDecl( -#line 747 "VBNET.ATG" +#line 752 "VBNET.ATG" m, attributes); } Expect(87); Expect(120); -#line 749 "VBNET.ATG" +#line 754 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void StructureBody( -#line 724 "VBNET.ATG" +#line 729 "VBNET.ATG" TypeDeclaration newType) { -#line 725 "VBNET.ATG" +#line 730 "VBNET.ATG" AttributeSection section; while (StartOf(6)) { -#line 727 "VBNET.ATG" +#line 732 "VBNET.ATG" List attributes = new List(); Modifiers m = new Modifiers(); while (la.kind == 26) { AttributeSection( -#line 730 "VBNET.ATG" +#line 735 "VBNET.ATG" out section); -#line 730 "VBNET.ATG" +#line 735 "VBNET.ATG" attributes.Add(section); } while (StartOf(7)) { MemberModifier( -#line 731 "VBNET.ATG" +#line 736 "VBNET.ATG" m); } StructureMemberDecl( -#line 732 "VBNET.ATG" +#line 737 "VBNET.ATG" m, attributes); } Expect(87); Expect(166); -#line 734 "VBNET.ATG" +#line 739 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void PrimitiveTypeName( -#line 2690 "VBNET.ATG" +#line 2714 "VBNET.ATG" out string type) { -#line 2691 "VBNET.ATG" +#line 2715 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 51: { lexer.NextToken(); -#line 2692 "VBNET.ATG" +#line 2716 "VBNET.ATG" type = "Boolean"; break; } case 75: { lexer.NextToken(); -#line 2693 "VBNET.ATG" +#line 2717 "VBNET.ATG" type = "Date"; break; } case 64: { lexer.NextToken(); -#line 2694 "VBNET.ATG" +#line 2718 "VBNET.ATG" type = "Char"; break; } case 165: { lexer.NextToken(); -#line 2695 "VBNET.ATG" +#line 2719 "VBNET.ATG" type = "String"; break; } case 76: { lexer.NextToken(); -#line 2696 "VBNET.ATG" +#line 2720 "VBNET.ATG" type = "Decimal"; break; } case 53: { lexer.NextToken(); -#line 2697 "VBNET.ATG" +#line 2721 "VBNET.ATG" type = "Byte"; break; } case 159: { lexer.NextToken(); -#line 2698 "VBNET.ATG" +#line 2722 "VBNET.ATG" type = "Short"; break; } case 110: { lexer.NextToken(); -#line 2699 "VBNET.ATG" +#line 2723 "VBNET.ATG" type = "Integer"; break; } case 116: { lexer.NextToken(); -#line 2700 "VBNET.ATG" +#line 2724 "VBNET.ATG" type = "Long"; break; } case 160: { lexer.NextToken(); -#line 2701 "VBNET.ATG" +#line 2725 "VBNET.ATG" type = "Single"; break; } case 83: { lexer.NextToken(); -#line 2702 "VBNET.ATG" +#line 2726 "VBNET.ATG" type = "Double"; break; } case 191: { lexer.NextToken(); -#line 2703 "VBNET.ATG" +#line 2727 "VBNET.ATG" type = "UInteger"; break; } case 192: { lexer.NextToken(); -#line 2704 "VBNET.ATG" +#line 2728 "VBNET.ATG" type = "ULong"; break; } case 193: { lexer.NextToken(); -#line 2705 "VBNET.ATG" +#line 2729 "VBNET.ATG" type = "UShort"; break; } case 190: { lexer.NextToken(); -#line 2706 "VBNET.ATG" +#line 2730 "VBNET.ATG" type = "SByte"; break; } @@ -1345,56 +1349,56 @@ out string type) { } void EnumBody( -#line 753 "VBNET.ATG" +#line 758 "VBNET.ATG" TypeDeclaration newType) { -#line 754 "VBNET.ATG" +#line 759 "VBNET.ATG" FieldDeclaration f; while (StartOf(8)) { EnumMemberDecl( -#line 756 "VBNET.ATG" +#line 761 "VBNET.ATG" out f); -#line 756 "VBNET.ATG" +#line 761 "VBNET.ATG" compilationUnit.AddChild(f); } Expect(87); Expect(89); -#line 758 "VBNET.ATG" +#line 763 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void InterfaceBase( -#line 1347 "VBNET.ATG" +#line 1371 "VBNET.ATG" out ArrayList bases) { -#line 1349 "VBNET.ATG" +#line 1373 "VBNET.ATG" TypeReference type; bases = new ArrayList(); Expect(109); TypeName( -#line 1353 "VBNET.ATG" +#line 1377 "VBNET.ATG" out type); -#line 1353 "VBNET.ATG" +#line 1377 "VBNET.ATG" bases.Add(type.Type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1356 "VBNET.ATG" +#line 1380 "VBNET.ATG" out type); -#line 1356 "VBNET.ATG" +#line 1380 "VBNET.ATG" bases.Add(type.Type); } Expect(1); } void InterfaceBody( -#line 762 "VBNET.ATG" +#line 767 "VBNET.ATG" TypeDeclaration newType) { while (StartOf(9)) { InterfaceMemberDecl(); @@ -1402,33 +1406,33 @@ TypeDeclaration newType) { Expect(87); Expect(111); -#line 764 "VBNET.ATG" +#line 769 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void FormalParameterList( -#line 1888 "VBNET.ATG" +#line 1912 "VBNET.ATG" List parameter) { -#line 1890 "VBNET.ATG" +#line 1914 "VBNET.ATG" ParameterDeclarationExpression p; AttributeSection section; List attributes = new List(); while (la.kind == 26) { AttributeSection( -#line 1894 "VBNET.ATG" +#line 1918 "VBNET.ATG" out section); -#line 1894 "VBNET.ATG" +#line 1918 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 1896 "VBNET.ATG" +#line 1920 "VBNET.ATG" out p); -#line 1898 "VBNET.ATG" +#line 1922 "VBNET.ATG" bool paramsFound = false; p.Attributes = attributes; parameter.Add(p); @@ -1436,152 +1440,152 @@ out p); while (la.kind == 12) { lexer.NextToken(); -#line 1903 "VBNET.ATG" +#line 1927 "VBNET.ATG" if (paramsFound) Error("params array must be at end of parameter list"); while (la.kind == 26) { AttributeSection( -#line 1904 "VBNET.ATG" +#line 1928 "VBNET.ATG" out section); -#line 1904 "VBNET.ATG" +#line 1928 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 1906 "VBNET.ATG" +#line 1930 "VBNET.ATG" out p); -#line 1906 "VBNET.ATG" +#line 1930 "VBNET.ATG" p.Attributes = attributes; parameter.Add(p); } } void MemberModifier( -#line 2728 "VBNET.ATG" +#line 2752 "VBNET.ATG" Modifiers m) { switch (la.kind) { case 121: { lexer.NextToken(); -#line 2729 "VBNET.ATG" +#line 2753 "VBNET.ATG" m.Add(Modifier.Abstract); break; } case 78: { lexer.NextToken(); -#line 2730 "VBNET.ATG" +#line 2754 "VBNET.ATG" m.Add(Modifier.Default); break; } case 98: { lexer.NextToken(); -#line 2731 "VBNET.ATG" +#line 2755 "VBNET.ATG" m.Add(Modifier.Internal); break; } case 157: { lexer.NextToken(); -#line 2732 "VBNET.ATG" +#line 2756 "VBNET.ATG" m.Add(Modifier.New); break; } case 142: { lexer.NextToken(); -#line 2733 "VBNET.ATG" +#line 2757 "VBNET.ATG" m.Add(Modifier.Override); break; } case 122: { lexer.NextToken(); -#line 2734 "VBNET.ATG" +#line 2758 "VBNET.ATG" m.Add(Modifier.Abstract); break; } case 145: { lexer.NextToken(); -#line 2735 "VBNET.ATG" +#line 2759 "VBNET.ATG" m.Add(Modifier.Private); break; } case 147: { lexer.NextToken(); -#line 2736 "VBNET.ATG" +#line 2760 "VBNET.ATG" m.Add(Modifier.Protected); break; } case 148: { lexer.NextToken(); -#line 2737 "VBNET.ATG" +#line 2761 "VBNET.ATG" m.Add(Modifier.Public); break; } case 130: { lexer.NextToken(); -#line 2738 "VBNET.ATG" +#line 2762 "VBNET.ATG" m.Add(Modifier.Sealed); break; } case 131: { lexer.NextToken(); -#line 2739 "VBNET.ATG" +#line 2763 "VBNET.ATG" m.Add(Modifier.Sealed); break; } case 158: { lexer.NextToken(); -#line 2740 "VBNET.ATG" +#line 2764 "VBNET.ATG" m.Add(Modifier.Static); break; } case 140: { lexer.NextToken(); -#line 2741 "VBNET.ATG" +#line 2765 "VBNET.ATG" m.Add(Modifier.Virtual); break; } case 139: { lexer.NextToken(); -#line 2742 "VBNET.ATG" +#line 2766 "VBNET.ATG" m.Add(Modifier.Overloads); break; } case 150: { lexer.NextToken(); -#line 2743 "VBNET.ATG" +#line 2767 "VBNET.ATG" break; } case 184: { lexer.NextToken(); -#line 2744 "VBNET.ATG" +#line 2768 "VBNET.ATG" break; } case 183: { lexer.NextToken(); -#line 2745 "VBNET.ATG" +#line 2769 "VBNET.ATG" m.Add(Modifier.WithEvents); break; } case 80: { lexer.NextToken(); -#line 2746 "VBNET.ATG" +#line 2770 "VBNET.ATG" m.Add(Modifier.Dim); break; } @@ -1590,51 +1594,57 @@ Modifiers m) { } void ClassMemberDecl( -#line 867 "VBNET.ATG" +#line 878 "VBNET.ATG" Modifiers m, List attributes) { StructureMemberDecl( -#line 868 "VBNET.ATG" +#line 879 "VBNET.ATG" m, attributes); } void StructureMemberDecl( -#line 882 "VBNET.ATG" +#line 893 "VBNET.ATG" Modifiers m, List attributes) { -#line 884 "VBNET.ATG" - TypeReference type = null; List p = new List(); - Statement stmt = null; List variableDeclarators = new List(); +#line 895 "VBNET.ATG" + TypeReference type = null; + List p = new List(); + Statement stmt = null; + List variableDeclarators = new List(); + List templates = new List(); switch (la.kind) { case 66: case 79: case 89: case 111: case 120: case 166: case 199: { NonModuleDeclaration( -#line 887 "VBNET.ATG" +#line 901 "VBNET.ATG" m, attributes); break; } case 167: { lexer.NextToken(); -#line 891 "VBNET.ATG" +#line 905 "VBNET.ATG" Point startPos = t.Location; if (StartOf(10)) { -#line 895 "VBNET.ATG" +#line 909 "VBNET.ATG" string name = String.Empty; MethodDeclaration methodDeclaration; ArrayList handlesClause = null; ArrayList implementsClause = null; Identifier(); -#line 900 "VBNET.ATG" +#line 914 "VBNET.ATG" name = t.val; m.Check(Modifier.VBMethods); + TypeParameterList( +#line 917 "VBNET.ATG" +templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 903 "VBNET.ATG" +#line 918 "VBNET.ATG" p); } Expect(24); @@ -1642,28 +1652,29 @@ p); if (la.kind == 104 || la.kind == 106) { if (la.kind == 106) { ImplementsClause( -#line 906 "VBNET.ATG" +#line 921 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 908 "VBNET.ATG" +#line 923 "VBNET.ATG" out handlesClause); } } -#line 911 "VBNET.ATG" +#line 926 "VBNET.ATG" Point endLocation = t.EndLocation; Expect(1); if ( -#line 915 "VBNET.ATG" +#line 930 "VBNET.ATG" IsMustOverride(m)) { -#line 917 "VBNET.ATG" +#line 932 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, null, p, attributes); methodDeclaration.StartLocation = startPos; methodDeclaration.EndLocation = endLocation; methodDeclaration.TypeReference = new TypeReference("", "System.Void"); + methodDeclaration.Templates = templates; methodDeclaration.HandlesClause = handlesClause; methodDeclaration.ImplementsClause = implementsClause; @@ -1671,12 +1682,13 @@ IsMustOverride(m)) { } else if (StartOf(11)) { -#line 929 "VBNET.ATG" +#line 945 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, null, p, attributes); methodDeclaration.StartLocation = startPos; methodDeclaration.EndLocation = endLocation; methodDeclaration.TypeReference = new TypeReference("", "System.Void"); + methodDeclaration.Templates = templates; methodDeclaration.HandlesClause = handlesClause; methodDeclaration.ImplementsClause = implementsClause; @@ -1684,17 +1696,17 @@ IsMustOverride(m)) { compilationUnit.BlockStart(methodDeclaration); Block( -#line 940 "VBNET.ATG" +#line 957 "VBNET.ATG" out stmt); -#line 942 "VBNET.ATG" +#line 959 "VBNET.ATG" compilationUnit.BlockEnd(); methodDeclaration.Body = (BlockStatement)stmt; Expect(87); Expect(167); -#line 945 "VBNET.ATG" +#line 962 "VBNET.ATG" methodDeclaration.Body.EndLocation = t.EndLocation; Expect(1); } else SynErr(215); @@ -1704,29 +1716,29 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 948 "VBNET.ATG" +#line 965 "VBNET.ATG" p); } Expect(24); } -#line 949 "VBNET.ATG" +#line 966 "VBNET.ATG" m.Check(Modifier.Constructors); -#line 950 "VBNET.ATG" +#line 967 "VBNET.ATG" Point constructorEndLocation = t.EndLocation; Expect(1); Block( -#line 952 "VBNET.ATG" +#line 969 "VBNET.ATG" out stmt); Expect(87); Expect(167); -#line 953 "VBNET.ATG" +#line 970 "VBNET.ATG" Point endLocation = t.EndLocation; Expect(1); -#line 955 "VBNET.ATG" +#line 972 "VBNET.ATG" ConstructorDeclaration cd = new ConstructorDeclaration("New", m.Modifier, p, attributes); cd.StartLocation = startPos; cd.EndLocation = constructorEndLocation; @@ -1740,7 +1752,7 @@ out stmt); case 99: { lexer.NextToken(); -#line 967 "VBNET.ATG" +#line 984 "VBNET.ATG" m.Check(Modifier.VBMethods); string name = String.Empty; Point startPos = t.Location; @@ -1749,13 +1761,16 @@ out stmt); Identifier(); -#line 973 "VBNET.ATG" +#line 990 "VBNET.ATG" name = t.val; + TypeParameterList( +#line 991 "VBNET.ATG" +templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 974 "VBNET.ATG" +#line 992 "VBNET.ATG" p); } Expect(24); @@ -1764,15 +1779,15 @@ p); lexer.NextToken(); while (la.kind == 26) { AttributeSection( -#line 975 "VBNET.ATG" +#line 993 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 975 "VBNET.ATG" +#line 993 "VBNET.ATG" out type); } -#line 977 "VBNET.ATG" +#line 995 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } @@ -1780,35 +1795,38 @@ out type); if (la.kind == 104 || la.kind == 106) { if (la.kind == 106) { ImplementsClause( -#line 983 "VBNET.ATG" +#line 1001 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 985 "VBNET.ATG" +#line 1003 "VBNET.ATG" out handlesClause); } } Expect(1); if ( -#line 991 "VBNET.ATG" +#line 1009 "VBNET.ATG" IsMustOverride(m)) { -#line 993 "VBNET.ATG" +#line 1011 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, type, p, attributes); methodDeclaration.StartLocation = startPos; methodDeclaration.EndLocation = t.EndLocation; + methodDeclaration.HandlesClause = handlesClause; + methodDeclaration.Templates = templates; methodDeclaration.ImplementsClause = implementsClause; methodDeclaration.ReturnTypeAttributeSection = returnTypeAttributeSection; compilationUnit.AddChild(methodDeclaration); } else if (StartOf(11)) { -#line 1003 "VBNET.ATG" +#line 1023 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, type, p, attributes); methodDeclaration.StartLocation = startPos; methodDeclaration.EndLocation = t.EndLocation; + methodDeclaration.Templates = templates; methodDeclaration.HandlesClause = handlesClause; methodDeclaration.ImplementsClause = implementsClause; methodDeclaration.ReturnTypeAttributeSection = returnTypeAttributeSection; @@ -1817,17 +1835,17 @@ IsMustOverride(m)) { compilationUnit.BlockStart(methodDeclaration); Block( -#line 1014 "VBNET.ATG" +#line 1035 "VBNET.ATG" out stmt); -#line 1016 "VBNET.ATG" +#line 1037 "VBNET.ATG" compilationUnit.BlockEnd(); methodDeclaration.Body = (BlockStatement)stmt; Expect(87); Expect(99); -#line 1021 "VBNET.ATG" +#line 1042 "VBNET.ATG" methodDeclaration.Body.StartLocation = methodDeclaration.EndLocation; methodDeclaration.Body.EndLocation = t.EndLocation; @@ -1838,7 +1856,7 @@ out stmt); case 77: { lexer.NextToken(); -#line 1030 "VBNET.ATG" +#line 1051 "VBNET.ATG" m.Check(Modifier.VBExternalMethods); Point startPos = t.Location; CharsetModifier charsetModifer = CharsetModifier.None; @@ -1848,39 +1866,39 @@ out stmt); if (StartOf(12)) { Charset( -#line 1037 "VBNET.ATG" +#line 1058 "VBNET.ATG" out charsetModifer); } if (la.kind == 167) { lexer.NextToken(); Identifier(); -#line 1040 "VBNET.ATG" +#line 1061 "VBNET.ATG" name = t.val; Expect(114); Expect(3); -#line 1041 "VBNET.ATG" +#line 1062 "VBNET.ATG" library = t.val.ToString(); if (la.kind == 43) { lexer.NextToken(); Expect(3); -#line 1042 "VBNET.ATG" +#line 1063 "VBNET.ATG" alias = t.val.ToString(); } if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1043 "VBNET.ATG" +#line 1064 "VBNET.ATG" p); } Expect(24); } Expect(1); -#line 1046 "VBNET.ATG" +#line 1067 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, null, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = startPos; declareDeclaration.EndLocation = t.EndLocation; @@ -1890,25 +1908,25 @@ p); lexer.NextToken(); Identifier(); -#line 1053 "VBNET.ATG" +#line 1074 "VBNET.ATG" name = t.val; Expect(114); Expect(3); -#line 1054 "VBNET.ATG" +#line 1075 "VBNET.ATG" library = t.val; if (la.kind == 43) { lexer.NextToken(); Expect(3); -#line 1055 "VBNET.ATG" +#line 1076 "VBNET.ATG" alias = t.val; } if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1056 "VBNET.ATG" +#line 1077 "VBNET.ATG" p); } Expect(24); @@ -1916,12 +1934,12 @@ p); if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1057 "VBNET.ATG" +#line 1078 "VBNET.ATG" out type); } Expect(1); -#line 1060 "VBNET.ATG" +#line 1081 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, type, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = startPos; declareDeclaration.EndLocation = t.EndLocation; @@ -1933,7 +1951,7 @@ out type); case 92: { lexer.NextToken(); -#line 1070 "VBNET.ATG" +#line 1091 "VBNET.ATG" m.Check(Modifier.VBEvents); Point startPos = t.Location; EventDeclaration eventDeclaration; @@ -1941,19 +1959,19 @@ out type); Identifier(); -#line 1075 "VBNET.ATG" +#line 1096 "VBNET.ATG" name= t.val; if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1077 "VBNET.ATG" +#line 1098 "VBNET.ATG" out type); } else if (la.kind == 1 || la.kind == 23 || la.kind == 106) { if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1079 "VBNET.ATG" +#line 1100 "VBNET.ATG" p); } Expect(24); @@ -1961,11 +1979,11 @@ p); } else SynErr(219); if (la.kind == 106) { ImplementsClause( -#line 1081 "VBNET.ATG" +#line 1102 "VBNET.ATG" out implementsClause); } -#line 1083 "VBNET.ATG" +#line 1104 "VBNET.ATG" eventDeclaration = new EventDeclaration(type, m.Modifier, p, attributes, name, implementsClause); eventDeclaration.StartLocation = startPos; eventDeclaration.EndLocation = t.EndLocation; @@ -1976,26 +1994,26 @@ out implementsClause); } case 2: case 50: case 69: case 169: { -#line 1090 "VBNET.ATG" +#line 1111 "VBNET.ATG" Point startPos = t.Location; -#line 1092 "VBNET.ATG" +#line 1113 "VBNET.ATG" m.Check(Modifier.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = startPos; VariableDeclarator( -#line 1096 "VBNET.ATG" +#line 1117 "VBNET.ATG" variableDeclarators); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 1097 "VBNET.ATG" +#line 1118 "VBNET.ATG" variableDeclarators); } Expect(1); -#line 1100 "VBNET.ATG" +#line 1121 "VBNET.ATG" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; compilationUnit.AddChild(fd); @@ -2004,34 +2022,35 @@ variableDeclarators); } case 70: { -#line 1105 "VBNET.ATG" +#line 1126 "VBNET.ATG" m.Check(Modifier.Fields); lexer.NextToken(); -#line 1106 "VBNET.ATG" +#line 1127 "VBNET.ATG" m.Add(Modifier.Const); -#line 1108 "VBNET.ATG" +#line 1129 "VBNET.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); - fd.StartLocation = t.Location;List constantDeclarators = new List(); + fd.StartLocation = t.Location; + List constantDeclarators = new List(); ConstantDeclarator( -#line 1111 "VBNET.ATG" +#line 1133 "VBNET.ATG" constantDeclarators); while (la.kind == 12) { lexer.NextToken(); ConstantDeclarator( -#line 1112 "VBNET.ATG" +#line 1134 "VBNET.ATG" constantDeclarators); } -#line 1114 "VBNET.ATG" +#line 1136 "VBNET.ATG" fd.Fields = constantDeclarators; fd.EndLocation = t.Location; Expect(1); -#line 1119 "VBNET.ATG" +#line 1141 "VBNET.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); @@ -2040,19 +2059,20 @@ constantDeclarators); case 146: { lexer.NextToken(); -#line 1125 "VBNET.ATG" +#line 1147 "VBNET.ATG" m.Check(Modifier.VBProperties); - Point startPos = t.Location;ArrayList implementsClause = null; + Point startPos = t.Location; + ArrayList implementsClause = null; Identifier(); -#line 1128 "VBNET.ATG" +#line 1151 "VBNET.ATG" string propertyName = t.val; if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1129 "VBNET.ATG" +#line 1152 "VBNET.ATG" p); } Expect(24); @@ -2060,26 +2080,26 @@ p); if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1130 "VBNET.ATG" +#line 1153 "VBNET.ATG" out type); } -#line 1132 "VBNET.ATG" +#line 1155 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } if (la.kind == 106) { ImplementsClause( -#line 1136 "VBNET.ATG" +#line 1159 "VBNET.ATG" out implementsClause); } Expect(1); if ( -#line 1140 "VBNET.ATG" +#line 1163 "VBNET.ATG" IsMustOverride(m)) { -#line 1142 "VBNET.ATG" +#line 1165 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = startPos; pDecl.EndLocation = t.Location; @@ -2090,7 +2110,7 @@ IsMustOverride(m)) { } else if (la.kind == 26 || la.kind == 100 || la.kind == 156) { -#line 1152 "VBNET.ATG" +#line 1175 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = startPos; pDecl.EndLocation = t.Location; @@ -2102,13 +2122,13 @@ IsMustOverride(m)) { PropertySetRegion setRegion; AccessorDecls( -#line 1162 "VBNET.ATG" +#line 1185 "VBNET.ATG" out getRegion, out setRegion); Expect(87); Expect(146); Expect(1); -#line 1166 "VBNET.ATG" +#line 1189 "VBNET.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.EndLocation; @@ -2122,25 +2142,25 @@ out getRegion, out setRegion); } void EnumMemberDecl( -#line 849 "VBNET.ATG" +#line 860 "VBNET.ATG" out FieldDeclaration f) { -#line 851 "VBNET.ATG" +#line 862 "VBNET.ATG" Expression expr = null;List attributes = new List(); AttributeSection section = null; VariableDeclaration varDecl = null; while (la.kind == 26) { AttributeSection( -#line 855 "VBNET.ATG" +#line 866 "VBNET.ATG" out section); -#line 855 "VBNET.ATG" +#line 866 "VBNET.ATG" attributes.Add(section); } Identifier(); -#line 858 "VBNET.ATG" +#line 869 "VBNET.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2149,10 +2169,10 @@ out section); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 863 "VBNET.ATG" +#line 874 "VBNET.ATG" out expr); -#line 863 "VBNET.ATG" +#line 874 "VBNET.ATG" varDecl.Initializer = expr; } Expect(1); @@ -2160,8 +2180,10 @@ out expr); void InterfaceMemberDecl() { -#line 774 "VBNET.ATG" - TypeReference type =null; List p = new List(); +#line 779 "VBNET.ATG" + TypeReference type =null; + List p = new List(); + List templates = new List(); AttributeSection section, returnTypeAttributeSection = null; Modifiers mod = new Modifiers(); List attributes = new List(); @@ -2170,31 +2192,31 @@ out expr); if (StartOf(13)) { while (la.kind == 26) { AttributeSection( -#line 780 "VBNET.ATG" +#line 787 "VBNET.ATG" out section); -#line 780 "VBNET.ATG" +#line 787 "VBNET.ATG" attributes.Add(section); } while (StartOf(7)) { MemberModifier( -#line 784 "VBNET.ATG" +#line 791 "VBNET.ATG" mod); } if (la.kind == 92) { lexer.NextToken(); -#line 787 "VBNET.ATG" +#line 794 "VBNET.ATG" mod.Check(Modifier.VBInterfaceEvents); Identifier(); -#line 788 "VBNET.ATG" +#line 795 "VBNET.ATG" name = t.val; if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 789 "VBNET.ATG" +#line 796 "VBNET.ATG" p); } Expect(24); @@ -2202,12 +2224,12 @@ p); if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 790 "VBNET.ATG" +#line 797 "VBNET.ATG" out type); } Expect(1); -#line 793 "VBNET.ATG" +#line 800 "VBNET.ATG" EventDeclaration ed = new EventDeclaration(type, mod.Modifier, p, attributes, name, null); compilationUnit.AddChild(ed); ed.EndLocation = t.EndLocation; @@ -2215,43 +2237,50 @@ out type); } else if (la.kind == 167) { lexer.NextToken(); -#line 799 "VBNET.ATG" +#line 806 "VBNET.ATG" mod.Check(Modifier.VBInterfaceMethods); Identifier(); -#line 800 "VBNET.ATG" +#line 807 "VBNET.ATG" name = t.val; + TypeParameterList( +#line 808 "VBNET.ATG" +templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 801 "VBNET.ATG" +#line 809 "VBNET.ATG" p); } Expect(24); } Expect(1); -#line 804 "VBNET.ATG" +#line 812 "VBNET.ATG" MethodDeclaration md = new MethodDeclaration(name, mod.Modifier, null, p, attributes); md.TypeReference = new TypeReference("", "System.Void"); md.EndLocation = t.EndLocation; + md.Templates = templates; compilationUnit.AddChild(md); } else if (la.kind == 99) { lexer.NextToken(); -#line 811 "VBNET.ATG" +#line 820 "VBNET.ATG" mod.Check(Modifier.VBInterfaceMethods); Identifier(); -#line 812 "VBNET.ATG" +#line 821 "VBNET.ATG" name = t.val; + TypeParameterList( +#line 822 "VBNET.ATG" +templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 813 "VBNET.ATG" +#line 823 "VBNET.ATG" p); } Expect(24); @@ -2260,38 +2289,39 @@ p); lexer.NextToken(); while (la.kind == 26) { AttributeSection( -#line 814 "VBNET.ATG" +#line 824 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 814 "VBNET.ATG" +#line 824 "VBNET.ATG" out type); } -#line 816 "VBNET.ATG" +#line 826 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } MethodDeclaration md = new MethodDeclaration(name, mod.Modifier, type, p, attributes); md.ReturnTypeAttributeSection = returnTypeAttributeSection; md.EndLocation = t.EndLocation; + md.Templates = templates; compilationUnit.AddChild(md); Expect(1); } else if (la.kind == 146) { lexer.NextToken(); -#line 827 "VBNET.ATG" +#line 838 "VBNET.ATG" mod.Check(Modifier.VBInterfaceProperties); Identifier(); -#line 828 "VBNET.ATG" +#line 839 "VBNET.ATG" name = t.val; if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 829 "VBNET.ATG" +#line 840 "VBNET.ATG" p); } Expect(24); @@ -2299,18 +2329,18 @@ p); if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 830 "VBNET.ATG" +#line 841 "VBNET.ATG" out type); } -#line 832 "VBNET.ATG" +#line 843 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } Expect(1); -#line 838 "VBNET.ATG" +#line 849 "VBNET.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod.Modifier, attributes); pd.Parameters = p; pd.EndLocation = t.EndLocation; @@ -2319,24 +2349,24 @@ out type); } else SynErr(222); } else if (StartOf(14)) { NonModuleDeclaration( -#line 845 "VBNET.ATG" +#line 856 "VBNET.ATG" mod, attributes); } else SynErr(223); } void Expr( -#line 1401 "VBNET.ATG" +#line 1425 "VBNET.ATG" out Expression expr) { ConditionalOrExpr( -#line 1403 "VBNET.ATG" +#line 1427 "VBNET.ATG" out expr); } void ImplementsClause( -#line 1379 "VBNET.ATG" +#line 1403 "VBNET.ATG" out ArrayList baseInterfaces) { -#line 1381 "VBNET.ATG" +#line 1405 "VBNET.ATG" baseInterfaces = new ArrayList(); string typename = String.Empty; string first; @@ -2344,76 +2374,76 @@ out ArrayList baseInterfaces) { Expect(106); Identifier(); -#line 1385 "VBNET.ATG" +#line 1409 "VBNET.ATG" first = t.val; Expect(10); Qualident( -#line 1385 "VBNET.ATG" +#line 1409 "VBNET.ATG" out typename); -#line 1385 "VBNET.ATG" +#line 1409 "VBNET.ATG" baseInterfaces.Add(first + "." + typename); while (la.kind == 12) { lexer.NextToken(); Identifier(); -#line 1386 "VBNET.ATG" +#line 1410 "VBNET.ATG" first = t.val; Expect(10); Qualident( -#line 1386 "VBNET.ATG" +#line 1410 "VBNET.ATG" out typename); -#line 1386 "VBNET.ATG" +#line 1410 "VBNET.ATG" baseInterfaces.Add(first + "." + typename); } } void HandlesClause( -#line 1337 "VBNET.ATG" +#line 1361 "VBNET.ATG" out ArrayList handlesClause) { -#line 1339 "VBNET.ATG" +#line 1363 "VBNET.ATG" handlesClause = new ArrayList(); string name; Expect(104); EventMemberSpecifier( -#line 1342 "VBNET.ATG" +#line 1366 "VBNET.ATG" out name); -#line 1342 "VBNET.ATG" +#line 1366 "VBNET.ATG" handlesClause.Add(name); while (la.kind == 12) { lexer.NextToken(); EventMemberSpecifier( -#line 1343 "VBNET.ATG" +#line 1367 "VBNET.ATG" out name); -#line 1343 "VBNET.ATG" +#line 1367 "VBNET.ATG" handlesClause.Add(name); } } void Block( -#line 1944 "VBNET.ATG" +#line 1968 "VBNET.ATG" out Statement stmt) { -#line 1947 "VBNET.ATG" +#line 1971 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.Location; compilationUnit.BlockStart(blockStmt); while (StartOf(15) || -#line 1952 "VBNET.ATG" +#line 1976 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 1952 "VBNET.ATG" +#line 1976 "VBNET.ATG" IsEndStmtAhead()) { Expect(87); EndOfStmt(); -#line 1952 "VBNET.ATG" +#line 1976 "VBNET.ATG" compilationUnit.AddChild(new EndStatement()); } else { Statement(); @@ -2421,7 +2451,7 @@ IsEndStmtAhead()) { } } -#line 1958 "VBNET.ATG" +#line 1982 "VBNET.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2429,65 +2459,65 @@ IsEndStmtAhead()) { } void Charset( -#line 1329 "VBNET.ATG" +#line 1353 "VBNET.ATG" out CharsetModifier charsetModifier) { -#line 1330 "VBNET.ATG" +#line 1354 "VBNET.ATG" charsetModifier = CharsetModifier.None; if (la.kind == 99 || la.kind == 167) { } else if (la.kind == 46) { lexer.NextToken(); -#line 1331 "VBNET.ATG" +#line 1355 "VBNET.ATG" charsetModifier = CharsetModifier.ANSI; } else if (la.kind == 49) { lexer.NextToken(); -#line 1332 "VBNET.ATG" +#line 1356 "VBNET.ATG" charsetModifier = CharsetModifier.Auto; } else if (la.kind == 176) { lexer.NextToken(); -#line 1333 "VBNET.ATG" +#line 1357 "VBNET.ATG" charsetModifier = CharsetModifier.Unicode; } else SynErr(224); } void VariableDeclarator( -#line 1247 "VBNET.ATG" +#line 1271 "VBNET.ATG" List fieldDeclaration) { -#line 1249 "VBNET.ATG" +#line 1273 "VBNET.ATG" Expression expr = null; TypeReference type = null;ArrayList rank = null;ArrayList dimension = null; Identifier(); -#line 1252 "VBNET.ATG" +#line 1276 "VBNET.ATG" string name = t.val; if ( -#line 1253 "VBNET.ATG" +#line 1277 "VBNET.ATG" IsDims()) { ArrayNameModifier( -#line 1253 "VBNET.ATG" +#line 1277 "VBNET.ATG" out rank); } if ( -#line 1254 "VBNET.ATG" +#line 1278 "VBNET.ATG" IsSize()) { ArrayInitializationModifier( -#line 1254 "VBNET.ATG" +#line 1278 "VBNET.ATG" out dimension); } if ( -#line 1256 "VBNET.ATG" +#line 1280 "VBNET.ATG" IsObjectCreation()) { Expect(47); ObjectCreateExpression( -#line 1256 "VBNET.ATG" +#line 1280 "VBNET.ATG" out expr); -#line 1258 "VBNET.ATG" +#line 1282 "VBNET.ATG" if (expr is ObjectCreateExpression) { type = ((ObjectCreateExpression)expr).CreateType; } else { @@ -2498,11 +2528,11 @@ out expr); if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1265 "VBNET.ATG" +#line 1289 "VBNET.ATG" out type); } -#line 1267 "VBNET.ATG" +#line 1291 "VBNET.ATG" if (type != null && rank != null) { if(type.RankSpecifier != null) { Error("array rank only allowed one time"); @@ -2514,40 +2544,40 @@ out type); if (la.kind == 11) { lexer.NextToken(); VariableInitializer( -#line 1275 "VBNET.ATG" +#line 1299 "VBNET.ATG" out expr); } } else SynErr(225); -#line 1277 "VBNET.ATG" +#line 1301 "VBNET.ATG" fieldDeclaration.Add(new VariableDeclaration(name, expr, type)); } void ConstantDeclarator( -#line 1230 "VBNET.ATG" +#line 1254 "VBNET.ATG" List constantDeclaration) { -#line 1232 "VBNET.ATG" +#line 1256 "VBNET.ATG" Expression expr = null; TypeReference type = null; string name = String.Empty; Identifier(); -#line 1236 "VBNET.ATG" +#line 1260 "VBNET.ATG" name = t.val; if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1237 "VBNET.ATG" +#line 1261 "VBNET.ATG" out type); } Expect(11); Expr( -#line 1238 "VBNET.ATG" +#line 1262 "VBNET.ATG" out expr); -#line 1240 "VBNET.ATG" +#line 1264 "VBNET.ATG" VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; constantDeclaration.Add(f); @@ -2555,79 +2585,79 @@ out expr); } void AccessorDecls( -#line 1175 "VBNET.ATG" +#line 1198 "VBNET.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1176 "VBNET.ATG" - List attributes = new List(); +#line 1200 "VBNET.ATG" + List attributes = new List(); AttributeSection section; getBlock = null; setBlock = null; while (la.kind == 26) { AttributeSection( -#line 1181 "VBNET.ATG" +#line 1205 "VBNET.ATG" out section); -#line 1181 "VBNET.ATG" +#line 1205 "VBNET.ATG" attributes.Add(section); } if (la.kind == 100) { GetAccessorDecl( -#line 1183 "VBNET.ATG" +#line 1207 "VBNET.ATG" out getBlock, attributes); if (la.kind == 26 || la.kind == 156) { -#line 1185 "VBNET.ATG" +#line 1209 "VBNET.ATG" attributes = new List(); while (la.kind == 26) { AttributeSection( -#line 1186 "VBNET.ATG" +#line 1210 "VBNET.ATG" out section); -#line 1186 "VBNET.ATG" +#line 1210 "VBNET.ATG" attributes.Add(section); } SetAccessorDecl( -#line 1187 "VBNET.ATG" +#line 1211 "VBNET.ATG" out setBlock, attributes); } } else if (la.kind == 156) { SetAccessorDecl( -#line 1190 "VBNET.ATG" +#line 1214 "VBNET.ATG" out setBlock, attributes); if (la.kind == 26 || la.kind == 100) { -#line 1192 "VBNET.ATG" +#line 1216 "VBNET.ATG" attributes = new List(); while (la.kind == 26) { AttributeSection( -#line 1193 "VBNET.ATG" +#line 1217 "VBNET.ATG" out section); -#line 1193 "VBNET.ATG" +#line 1217 "VBNET.ATG" attributes.Add(section); } GetAccessorDecl( -#line 1194 "VBNET.ATG" +#line 1218 "VBNET.ATG" out getBlock, attributes); } } else SynErr(226); } void GetAccessorDecl( -#line 1200 "VBNET.ATG" +#line 1224 "VBNET.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1201 "VBNET.ATG" +#line 1225 "VBNET.ATG" Statement stmt = null; Expect(100); Expect(1); Block( -#line 1204 "VBNET.ATG" +#line 1228 "VBNET.ATG" out stmt); -#line 1206 "VBNET.ATG" +#line 1230 "VBNET.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); Expect(87); @@ -2636,10 +2666,10 @@ out stmt); } void SetAccessorDecl( -#line 1213 "VBNET.ATG" +#line 1237 "VBNET.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1215 "VBNET.ATG" +#line 1239 "VBNET.ATG" Statement stmt = null; List p = new List(); Expect(156); @@ -2647,17 +2677,17 @@ out PropertySetRegion setBlock, List attributes) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1218 "VBNET.ATG" +#line 1242 "VBNET.ATG" p); } Expect(24); } Expect(1); Block( -#line 1220 "VBNET.ATG" +#line 1244 "VBNET.ATG" out stmt); -#line 1222 "VBNET.ATG" +#line 1246 "VBNET.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); setBlock.Parameters = p; @@ -2667,36 +2697,36 @@ out stmt); } void ArrayNameModifier( -#line 1736 "VBNET.ATG" +#line 1760 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1738 "VBNET.ATG" +#line 1762 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 1740 "VBNET.ATG" +#line 1764 "VBNET.ATG" out arrayModifiers); } void ArrayInitializationModifier( -#line 1281 "VBNET.ATG" +#line 1305 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1283 "VBNET.ATG" +#line 1307 "VBNET.ATG" arrayModifiers = null; Expect(23); InitializationRankList( -#line 1285 "VBNET.ATG" +#line 1309 "VBNET.ATG" out arrayModifiers); Expect(24); } void ObjectCreateExpression( -#line 1657 "VBNET.ATG" +#line 1681 "VBNET.ATG" out Expression oce) { -#line 1659 "VBNET.ATG" +#line 1683 "VBNET.ATG" TypeReference type = null; Expression initializer = null; ArrayList arguments = null; @@ -2704,24 +2734,24 @@ out Expression oce) { Expect(126); NonArrayTypeName( -#line 1664 "VBNET.ATG" +#line 1688 "VBNET.ATG" out type); if (la.kind == 23) { lexer.NextToken(); if (StartOf(17)) { ArgumentList( -#line 1665 "VBNET.ATG" +#line 1689 "VBNET.ATG" out arguments); } Expect(24); } if (la.kind == 21) { ArrayInitializer( -#line 1666 "VBNET.ATG" +#line 1690 "VBNET.ATG" out initializer); } -#line 1668 "VBNET.ATG" +#line 1692 "VBNET.ATG" if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); } else { @@ -2733,98 +2763,98 @@ out initializer); } void VariableInitializer( -#line 1301 "VBNET.ATG" +#line 1325 "VBNET.ATG" out Expression initializerExpression) { -#line 1303 "VBNET.ATG" +#line 1327 "VBNET.ATG" initializerExpression = null; if (StartOf(18)) { Expr( -#line 1305 "VBNET.ATG" +#line 1329 "VBNET.ATG" out initializerExpression); } else if (la.kind == 21) { ArrayInitializer( -#line 1306 "VBNET.ATG" +#line 1330 "VBNET.ATG" out initializerExpression); } else SynErr(227); } void InitializationRankList( -#line 1289 "VBNET.ATG" +#line 1313 "VBNET.ATG" out ArrayList rank) { -#line 1291 "VBNET.ATG" +#line 1315 "VBNET.ATG" rank = null; Expression expr = null; Expr( -#line 1294 "VBNET.ATG" +#line 1318 "VBNET.ATG" out expr); -#line 1294 "VBNET.ATG" +#line 1318 "VBNET.ATG" rank = new ArrayList(); if (expr != null) { rank.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Expr( -#line 1296 "VBNET.ATG" +#line 1320 "VBNET.ATG" out expr); -#line 1296 "VBNET.ATG" +#line 1320 "VBNET.ATG" if (expr != null) { rank.Add(expr); } } } void ArrayInitializer( -#line 1310 "VBNET.ATG" +#line 1334 "VBNET.ATG" out Expression outExpr) { -#line 1312 "VBNET.ATG" +#line 1336 "VBNET.ATG" Expression expr = null; ArrayInitializerExpression initializer = new ArrayInitializerExpression(); Expect(21); if (StartOf(19)) { VariableInitializer( -#line 1317 "VBNET.ATG" +#line 1341 "VBNET.ATG" out expr); -#line 1319 "VBNET.ATG" +#line 1343 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1322 "VBNET.ATG" +#line 1346 "VBNET.ATG" NotFinalComma()) { Expect(12); VariableInitializer( -#line 1322 "VBNET.ATG" +#line 1346 "VBNET.ATG" out expr); -#line 1323 "VBNET.ATG" +#line 1347 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(22); -#line 1326 "VBNET.ATG" +#line 1350 "VBNET.ATG" outExpr = initializer; } void EventMemberSpecifier( -#line 1389 "VBNET.ATG" +#line 1413 "VBNET.ATG" out string name) { -#line 1390 "VBNET.ATG" +#line 1414 "VBNET.ATG" string type; name = String.Empty; if (StartOf(10)) { Identifier(); -#line 1391 "VBNET.ATG" +#line 1415 "VBNET.ATG" type = t.val; Expect(10); Identifier(); -#line 1393 "VBNET.ATG" +#line 1417 "VBNET.ATG" name = type + "." + t.val; } else if (la.kind == 123) { lexer.NextToken(); @@ -2832,42 +2862,42 @@ out string name) { if (StartOf(10)) { Identifier(); -#line 1396 "VBNET.ATG" +#line 1420 "VBNET.ATG" name = "MyBase." + t.val; } else if (la.kind == 91) { lexer.NextToken(); -#line 1397 "VBNET.ATG" +#line 1421 "VBNET.ATG" name = "MyBase.Error"; } else SynErr(228); } else SynErr(229); } void ConditionalOrExpr( -#line 1536 "VBNET.ATG" +#line 1560 "VBNET.ATG" out Expression outExpr) { -#line 1537 "VBNET.ATG" +#line 1561 "VBNET.ATG" Expression expr; ConditionalAndExpr( -#line 1538 "VBNET.ATG" +#line 1562 "VBNET.ATG" out outExpr); while (la.kind == 138) { lexer.NextToken(); ConditionalAndExpr( -#line 1538 "VBNET.ATG" +#line 1562 "VBNET.ATG" out expr); -#line 1538 "VBNET.ATG" +#line 1562 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalOr, expr); } } void UnaryExpr( -#line 1410 "VBNET.ATG" +#line 1434 "VBNET.ATG" out Expression uExpr) { -#line 1412 "VBNET.ATG" +#line 1436 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -2876,25 +2906,25 @@ out Expression uExpr) { if (la.kind == 14) { lexer.NextToken(); -#line 1416 "VBNET.ATG" +#line 1440 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 15) { lexer.NextToken(); -#line 1417 "VBNET.ATG" +#line 1441 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 1419 "VBNET.ATG" +#line 1443 "VBNET.ATG" uop = UnaryOperatorType.Star; isUOp = true; } } SimpleExpr( -#line 1421 "VBNET.ATG" +#line 1445 "VBNET.ATG" out expr); -#line 1423 "VBNET.ATG" +#line 1447 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -2904,10 +2934,10 @@ out expr); } void SimpleExpr( -#line 1446 "VBNET.ATG" +#line 1470 "VBNET.ATG" out Expression pexpr) { -#line 1448 "VBNET.ATG" +#line 1472 "VBNET.ATG" Expression expr; TypeReference type = null; string name = String.Empty; @@ -2918,150 +2948,150 @@ out Expression pexpr) { case 3: { lexer.NextToken(); -#line 1456 "VBNET.ATG" +#line 1480 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 4: { lexer.NextToken(); -#line 1457 "VBNET.ATG" +#line 1481 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 7: { lexer.NextToken(); -#line 1458 "VBNET.ATG" +#line 1482 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 6: { lexer.NextToken(); -#line 1459 "VBNET.ATG" +#line 1483 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 5: { lexer.NextToken(); -#line 1460 "VBNET.ATG" +#line 1484 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 9: { lexer.NextToken(); -#line 1461 "VBNET.ATG" +#line 1485 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 8: { lexer.NextToken(); -#line 1462 "VBNET.ATG" +#line 1486 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 173: { lexer.NextToken(); -#line 1464 "VBNET.ATG" +#line 1488 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); break; } case 95: { lexer.NextToken(); -#line 1465 "VBNET.ATG" +#line 1489 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); break; } case 129: { lexer.NextToken(); -#line 1466 "VBNET.ATG" +#line 1490 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); break; } case 23: { lexer.NextToken(); Expr( -#line 1467 "VBNET.ATG" +#line 1491 "VBNET.ATG" out expr); Expect(24); -#line 1467 "VBNET.ATG" +#line 1491 "VBNET.ATG" pexpr = new ParenthesizedExpression(expr); break; } case 2: case 50: case 69: case 169: { Identifier(); -#line 1468 "VBNET.ATG" +#line 1492 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); break; } case 51: case 53: case 64: case 75: case 76: case 83: case 110: case 116: case 159: case 160: case 165: case 190: case 191: case 192: case 193: { -#line 1469 "VBNET.ATG" +#line 1493 "VBNET.ATG" string val = String.Empty; PrimitiveTypeName( -#line 1469 "VBNET.ATG" +#line 1493 "VBNET.ATG" out val); Expect(10); -#line 1470 "VBNET.ATG" +#line 1494 "VBNET.ATG" t.val = ""; Identifier(); -#line 1470 "VBNET.ATG" +#line 1494 "VBNET.ATG" pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); break; } case 118: { lexer.NextToken(); -#line 1471 "VBNET.ATG" +#line 1495 "VBNET.ATG" pexpr = new ThisReferenceExpression(); break; } case 123: case 124: case 194: { -#line 1472 "VBNET.ATG" +#line 1496 "VBNET.ATG" Expression retExpr = null; if (la.kind == 123) { lexer.NextToken(); -#line 1473 "VBNET.ATG" +#line 1497 "VBNET.ATG" retExpr = new BaseReferenceExpression(); } else if (la.kind == 124) { lexer.NextToken(); -#line 1474 "VBNET.ATG" +#line 1498 "VBNET.ATG" retExpr = new ClassReferenceExpression(); } else if (la.kind == 194) { lexer.NextToken(); -#line 1475 "VBNET.ATG" +#line 1499 "VBNET.ATG" retExpr = new GlobalReferenceExpression(); } else SynErr(230); Expect(10); IdentifierOrKeyword( -#line 1477 "VBNET.ATG" +#line 1501 "VBNET.ATG" out name); -#line 1477 "VBNET.ATG" +#line 1501 "VBNET.ATG" pexpr = new FieldReferenceExpression(retExpr, name); break; } case 126: { ObjectCreateExpression( -#line 1478 "VBNET.ATG" +#line 1502 "VBNET.ATG" out expr); -#line 1478 "VBNET.ATG" +#line 1502 "VBNET.ATG" pexpr = expr; break; } @@ -3073,15 +3103,15 @@ out expr); } else SynErr(231); Expect(23); Expr( -#line 1479 "VBNET.ATG" +#line 1503 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1479 "VBNET.ATG" +#line 1503 "VBNET.ATG" out type); Expect(24); -#line 1479 "VBNET.ATG" +#line 1503 "VBNET.ATG" pexpr = new CastExpression(type, expr); break; } @@ -3089,39 +3119,39 @@ out type); lexer.NextToken(); Expect(23); Expr( -#line 1480 "VBNET.ATG" +#line 1504 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1480 "VBNET.ATG" +#line 1504 "VBNET.ATG" out type); Expect(24); -#line 1480 "VBNET.ATG" +#line 1504 "VBNET.ATG" pexpr = new BinaryOperatorExpression(expr, BinaryOperatorType.AsCast, new TypeReferenceExpression(type)); break; } case 58: case 59: case 60: case 61: case 62: case 63: case 65: case 67: case 68: case 71: case 72: case 73: { CastTarget( -#line 1481 "VBNET.ATG" +#line 1505 "VBNET.ATG" out type); Expect(23); Expr( -#line 1481 "VBNET.ATG" +#line 1505 "VBNET.ATG" out expr); Expect(24); -#line 1481 "VBNET.ATG" +#line 1505 "VBNET.ATG" pexpr = new CastExpression(type, expr, true); break; } case 42: { lexer.NextToken(); Expr( -#line 1482 "VBNET.ATG" +#line 1506 "VBNET.ATG" out expr); -#line 1482 "VBNET.ATG" +#line 1506 "VBNET.ATG" pexpr = new AddressOfExpression(expr); break; } @@ -3129,25 +3159,25 @@ out expr); lexer.NextToken(); Expect(23); TypeName( -#line 1483 "VBNET.ATG" +#line 1507 "VBNET.ATG" out type); Expect(24); -#line 1483 "VBNET.ATG" +#line 1507 "VBNET.ATG" pexpr = new TypeOfExpression(type); break; } case 175: { lexer.NextToken(); SimpleExpr( -#line 1484 "VBNET.ATG" +#line 1508 "VBNET.ATG" out expr); Expect(112); TypeName( -#line 1484 "VBNET.ATG" +#line 1508 "VBNET.ATG" out type); -#line 1484 "VBNET.ATG" +#line 1508 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); break; } @@ -3156,95 +3186,95 @@ out type); if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1487 "VBNET.ATG" +#line 1511 "VBNET.ATG" out name); -#line 1487 "VBNET.ATG" +#line 1511 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); } else { lexer.NextToken(); -#line 1488 "VBNET.ATG" +#line 1512 "VBNET.ATG" ArrayList parameters = new ArrayList(); if (StartOf(21)) { if (StartOf(18)) { Argument( -#line 1490 "VBNET.ATG" +#line 1514 "VBNET.ATG" out expr); -#line 1490 "VBNET.ATG" +#line 1514 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } } while (la.kind == 12) { lexer.NextToken(); if (StartOf(18)) { Argument( -#line 1493 "VBNET.ATG" +#line 1517 "VBNET.ATG" out expr); -#line 1493 "VBNET.ATG" +#line 1517 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } } } } Expect(24); -#line 1496 "VBNET.ATG" +#line 1520 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); } } } else if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1500 "VBNET.ATG" +#line 1524 "VBNET.ATG" out name); -#line 1500 "VBNET.ATG" +#line 1524 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); while (la.kind == 10 || la.kind == 23) { if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1502 "VBNET.ATG" +#line 1526 "VBNET.ATG" out name); -#line 1502 "VBNET.ATG" +#line 1526 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); } else { lexer.NextToken(); -#line 1503 "VBNET.ATG" +#line 1527 "VBNET.ATG" ArrayList parameters = new ArrayList(); if (StartOf(21)) { -#line 1505 "VBNET.ATG" +#line 1529 "VBNET.ATG" expr = null; if (StartOf(18)) { Argument( -#line 1505 "VBNET.ATG" +#line 1529 "VBNET.ATG" out expr); } -#line 1505 "VBNET.ATG" +#line 1529 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } while (la.kind == 12) { lexer.NextToken(); -#line 1507 "VBNET.ATG" +#line 1531 "VBNET.ATG" expr = null; if (StartOf(18)) { Argument( -#line 1508 "VBNET.ATG" +#line 1532 "VBNET.ATG" out expr); } -#line 1508 "VBNET.ATG" +#line 1532 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } } } Expect(24); -#line 1511 "VBNET.ATG" +#line 1535 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); } } @@ -3252,79 +3282,79 @@ out expr); } void AssignmentOperator( -#line 1431 "VBNET.ATG" +#line 1455 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1432 "VBNET.ATG" +#line 1456 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 11: { lexer.NextToken(); -#line 1433 "VBNET.ATG" +#line 1457 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 40: { lexer.NextToken(); -#line 1434 "VBNET.ATG" +#line 1458 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 32: { lexer.NextToken(); -#line 1435 "VBNET.ATG" +#line 1459 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 34: { lexer.NextToken(); -#line 1436 "VBNET.ATG" +#line 1460 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 35: { lexer.NextToken(); -#line 1437 "VBNET.ATG" +#line 1461 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 36: { lexer.NextToken(); -#line 1438 "VBNET.ATG" +#line 1462 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 37: { lexer.NextToken(); -#line 1439 "VBNET.ATG" +#line 1463 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 33: { lexer.NextToken(); -#line 1440 "VBNET.ATG" +#line 1464 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 38: { lexer.NextToken(); -#line 1441 "VBNET.ATG" +#line 1465 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 39: { lexer.NextToken(); -#line 1442 "VBNET.ATG" +#line 1466 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } @@ -3333,1074 +3363,1074 @@ out AssignmentOperatorType op) { } void IdentifierOrKeyword( -#line 2529 "VBNET.ATG" +#line 2553 "VBNET.ATG" out string name) { -#line 2531 "VBNET.ATG" +#line 2555 "VBNET.ATG" name = String.Empty; switch (la.kind) { case 2: case 50: case 69: case 169: { Identifier(); -#line 2534 "VBNET.ATG" +#line 2558 "VBNET.ATG" name = t.val; break; } case 41: { lexer.NextToken(); -#line 2535 "VBNET.ATG" +#line 2559 "VBNET.ATG" name = t.val; break; } case 42: { lexer.NextToken(); -#line 2536 "VBNET.ATG" +#line 2560 "VBNET.ATG" name = t.val; break; } case 43: { lexer.NextToken(); -#line 2537 "VBNET.ATG" +#line 2561 "VBNET.ATG" name = t.val; break; } case 44: { lexer.NextToken(); -#line 2538 "VBNET.ATG" +#line 2562 "VBNET.ATG" name = t.val; break; } case 45: { lexer.NextToken(); -#line 2539 "VBNET.ATG" +#line 2563 "VBNET.ATG" name = t.val; break; } case 46: { lexer.NextToken(); -#line 2540 "VBNET.ATG" +#line 2564 "VBNET.ATG" name = t.val; break; } case 47: { lexer.NextToken(); -#line 2541 "VBNET.ATG" +#line 2565 "VBNET.ATG" name = t.val; break; } case 48: { lexer.NextToken(); -#line 2542 "VBNET.ATG" +#line 2566 "VBNET.ATG" name = t.val; break; } case 49: { lexer.NextToken(); -#line 2543 "VBNET.ATG" +#line 2567 "VBNET.ATG" name = t.val; break; } case 51: { lexer.NextToken(); -#line 2544 "VBNET.ATG" +#line 2568 "VBNET.ATG" name = t.val; break; } case 52: { lexer.NextToken(); -#line 2545 "VBNET.ATG" +#line 2569 "VBNET.ATG" name = t.val; break; } case 53: { lexer.NextToken(); -#line 2546 "VBNET.ATG" +#line 2570 "VBNET.ATG" name = t.val; break; } case 54: { lexer.NextToken(); -#line 2547 "VBNET.ATG" +#line 2571 "VBNET.ATG" name = t.val; break; } case 55: { lexer.NextToken(); -#line 2548 "VBNET.ATG" +#line 2572 "VBNET.ATG" name = t.val; break; } case 56: { lexer.NextToken(); -#line 2549 "VBNET.ATG" +#line 2573 "VBNET.ATG" name = t.val; break; } case 57: { lexer.NextToken(); -#line 2550 "VBNET.ATG" +#line 2574 "VBNET.ATG" name = t.val; break; } case 58: { lexer.NextToken(); -#line 2551 "VBNET.ATG" +#line 2575 "VBNET.ATG" name = t.val; break; } case 59: { lexer.NextToken(); -#line 2552 "VBNET.ATG" +#line 2576 "VBNET.ATG" name = t.val; break; } case 60: { lexer.NextToken(); -#line 2553 "VBNET.ATG" +#line 2577 "VBNET.ATG" name = t.val; break; } case 61: { lexer.NextToken(); -#line 2554 "VBNET.ATG" +#line 2578 "VBNET.ATG" name = t.val; break; } case 62: { lexer.NextToken(); -#line 2555 "VBNET.ATG" +#line 2579 "VBNET.ATG" name = t.val; break; } case 63: { lexer.NextToken(); -#line 2556 "VBNET.ATG" +#line 2580 "VBNET.ATG" name = t.val; break; } case 64: { lexer.NextToken(); -#line 2557 "VBNET.ATG" +#line 2581 "VBNET.ATG" name = t.val; break; } case 65: { lexer.NextToken(); -#line 2558 "VBNET.ATG" +#line 2582 "VBNET.ATG" name = t.val; break; } case 66: { lexer.NextToken(); -#line 2559 "VBNET.ATG" +#line 2583 "VBNET.ATG" name = t.val; break; } case 67: { lexer.NextToken(); -#line 2560 "VBNET.ATG" +#line 2584 "VBNET.ATG" name = t.val; break; } case 68: { lexer.NextToken(); -#line 2561 "VBNET.ATG" +#line 2585 "VBNET.ATG" name = t.val; break; } case 70: { lexer.NextToken(); -#line 2562 "VBNET.ATG" +#line 2586 "VBNET.ATG" name = t.val; break; } case 71: { lexer.NextToken(); -#line 2563 "VBNET.ATG" +#line 2587 "VBNET.ATG" name = t.val; break; } case 72: { lexer.NextToken(); -#line 2564 "VBNET.ATG" +#line 2588 "VBNET.ATG" name = t.val; break; } case 73: { lexer.NextToken(); -#line 2565 "VBNET.ATG" +#line 2589 "VBNET.ATG" name = t.val; break; } case 74: { lexer.NextToken(); -#line 2566 "VBNET.ATG" +#line 2590 "VBNET.ATG" name = t.val; break; } case 75: { lexer.NextToken(); -#line 2567 "VBNET.ATG" +#line 2591 "VBNET.ATG" name = t.val; break; } case 76: { lexer.NextToken(); -#line 2568 "VBNET.ATG" +#line 2592 "VBNET.ATG" name = t.val; break; } case 77: { lexer.NextToken(); -#line 2569 "VBNET.ATG" +#line 2593 "VBNET.ATG" name = t.val; break; } case 78: { lexer.NextToken(); -#line 2570 "VBNET.ATG" +#line 2594 "VBNET.ATG" name = t.val; break; } case 79: { lexer.NextToken(); -#line 2571 "VBNET.ATG" +#line 2595 "VBNET.ATG" name = t.val; break; } case 80: { lexer.NextToken(); -#line 2572 "VBNET.ATG" +#line 2596 "VBNET.ATG" name = t.val; break; } case 81: { lexer.NextToken(); -#line 2573 "VBNET.ATG" +#line 2597 "VBNET.ATG" name = t.val; break; } case 82: { lexer.NextToken(); -#line 2574 "VBNET.ATG" +#line 2598 "VBNET.ATG" name = t.val; break; } case 83: { lexer.NextToken(); -#line 2575 "VBNET.ATG" +#line 2599 "VBNET.ATG" name = t.val; break; } case 84: { lexer.NextToken(); -#line 2576 "VBNET.ATG" +#line 2600 "VBNET.ATG" name = t.val; break; } case 85: { lexer.NextToken(); -#line 2577 "VBNET.ATG" +#line 2601 "VBNET.ATG" name = t.val; break; } case 86: { lexer.NextToken(); -#line 2578 "VBNET.ATG" +#line 2602 "VBNET.ATG" name = t.val; break; } case 87: { lexer.NextToken(); -#line 2579 "VBNET.ATG" +#line 2603 "VBNET.ATG" name = t.val; break; } case 88: { lexer.NextToken(); -#line 2580 "VBNET.ATG" +#line 2604 "VBNET.ATG" name = t.val; break; } case 89: { lexer.NextToken(); -#line 2581 "VBNET.ATG" +#line 2605 "VBNET.ATG" name = t.val; break; } case 90: { lexer.NextToken(); -#line 2582 "VBNET.ATG" +#line 2606 "VBNET.ATG" name = t.val; break; } case 91: { lexer.NextToken(); -#line 2583 "VBNET.ATG" +#line 2607 "VBNET.ATG" name = t.val; break; } case 92: { lexer.NextToken(); -#line 2584 "VBNET.ATG" +#line 2608 "VBNET.ATG" name = t.val; break; } case 93: { lexer.NextToken(); -#line 2585 "VBNET.ATG" +#line 2609 "VBNET.ATG" name = t.val; break; } case 94: { lexer.NextToken(); -#line 2586 "VBNET.ATG" +#line 2610 "VBNET.ATG" name = t.val; break; } case 95: { lexer.NextToken(); -#line 2587 "VBNET.ATG" +#line 2611 "VBNET.ATG" name = t.val; break; } case 96: { lexer.NextToken(); -#line 2588 "VBNET.ATG" +#line 2612 "VBNET.ATG" name = t.val; break; } case 97: { lexer.NextToken(); -#line 2589 "VBNET.ATG" +#line 2613 "VBNET.ATG" name = t.val; break; } case 98: { lexer.NextToken(); -#line 2590 "VBNET.ATG" +#line 2614 "VBNET.ATG" name = t.val; break; } case 99: { lexer.NextToken(); -#line 2591 "VBNET.ATG" +#line 2615 "VBNET.ATG" name = t.val; break; } case 100: { lexer.NextToken(); -#line 2592 "VBNET.ATG" +#line 2616 "VBNET.ATG" name = t.val; break; } case 101: { lexer.NextToken(); -#line 2593 "VBNET.ATG" +#line 2617 "VBNET.ATG" name = t.val; break; } case 102: { lexer.NextToken(); -#line 2594 "VBNET.ATG" +#line 2618 "VBNET.ATG" name = t.val; break; } case 103: { lexer.NextToken(); -#line 2595 "VBNET.ATG" +#line 2619 "VBNET.ATG" name = t.val; break; } case 104: { lexer.NextToken(); -#line 2596 "VBNET.ATG" +#line 2620 "VBNET.ATG" name = t.val; break; } case 105: { lexer.NextToken(); -#line 2597 "VBNET.ATG" +#line 2621 "VBNET.ATG" name = t.val; break; } case 106: { lexer.NextToken(); -#line 2598 "VBNET.ATG" +#line 2622 "VBNET.ATG" name = t.val; break; } case 107: { lexer.NextToken(); -#line 2599 "VBNET.ATG" +#line 2623 "VBNET.ATG" name = t.val; break; } case 108: { lexer.NextToken(); -#line 2600 "VBNET.ATG" +#line 2624 "VBNET.ATG" name = t.val; break; } case 109: { lexer.NextToken(); -#line 2601 "VBNET.ATG" +#line 2625 "VBNET.ATG" name = t.val; break; } case 110: { lexer.NextToken(); -#line 2602 "VBNET.ATG" +#line 2626 "VBNET.ATG" name = t.val; break; } case 111: { lexer.NextToken(); -#line 2603 "VBNET.ATG" +#line 2627 "VBNET.ATG" name = t.val; break; } case 112: { lexer.NextToken(); -#line 2604 "VBNET.ATG" +#line 2628 "VBNET.ATG" name = t.val; break; } case 113: { lexer.NextToken(); -#line 2605 "VBNET.ATG" +#line 2629 "VBNET.ATG" name = t.val; break; } case 114: { lexer.NextToken(); -#line 2606 "VBNET.ATG" +#line 2630 "VBNET.ATG" name = t.val; break; } case 115: { lexer.NextToken(); -#line 2607 "VBNET.ATG" +#line 2631 "VBNET.ATG" name = t.val; break; } case 116: { lexer.NextToken(); -#line 2608 "VBNET.ATG" +#line 2632 "VBNET.ATG" name = t.val; break; } case 117: { lexer.NextToken(); -#line 2609 "VBNET.ATG" +#line 2633 "VBNET.ATG" name = t.val; break; } case 118: { lexer.NextToken(); -#line 2610 "VBNET.ATG" +#line 2634 "VBNET.ATG" name = t.val; break; } case 119: { lexer.NextToken(); -#line 2611 "VBNET.ATG" +#line 2635 "VBNET.ATG" name = t.val; break; } case 120: { lexer.NextToken(); -#line 2612 "VBNET.ATG" +#line 2636 "VBNET.ATG" name = t.val; break; } case 121: { lexer.NextToken(); -#line 2613 "VBNET.ATG" +#line 2637 "VBNET.ATG" name = t.val; break; } case 122: { lexer.NextToken(); -#line 2614 "VBNET.ATG" +#line 2638 "VBNET.ATG" name = t.val; break; } case 123: { lexer.NextToken(); -#line 2615 "VBNET.ATG" +#line 2639 "VBNET.ATG" name = t.val; break; } case 124: { lexer.NextToken(); -#line 2616 "VBNET.ATG" +#line 2640 "VBNET.ATG" name = t.val; break; } case 125: { lexer.NextToken(); -#line 2617 "VBNET.ATG" +#line 2641 "VBNET.ATG" name = t.val; break; } case 126: { lexer.NextToken(); -#line 2618 "VBNET.ATG" +#line 2642 "VBNET.ATG" name = t.val; break; } case 127: { lexer.NextToken(); -#line 2619 "VBNET.ATG" +#line 2643 "VBNET.ATG" name = t.val; break; } case 128: { lexer.NextToken(); -#line 2620 "VBNET.ATG" +#line 2644 "VBNET.ATG" name = t.val; break; } case 129: { lexer.NextToken(); -#line 2621 "VBNET.ATG" +#line 2645 "VBNET.ATG" name = t.val; break; } case 130: { lexer.NextToken(); -#line 2622 "VBNET.ATG" +#line 2646 "VBNET.ATG" name = t.val; break; } case 131: { lexer.NextToken(); -#line 2623 "VBNET.ATG" +#line 2647 "VBNET.ATG" name = t.val; break; } case 132: { lexer.NextToken(); -#line 2624 "VBNET.ATG" +#line 2648 "VBNET.ATG" name = t.val; break; } case 134: { lexer.NextToken(); -#line 2625 "VBNET.ATG" +#line 2649 "VBNET.ATG" name = t.val; break; } case 135: { lexer.NextToken(); -#line 2626 "VBNET.ATG" +#line 2650 "VBNET.ATG" name = t.val; break; } case 136: { lexer.NextToken(); -#line 2627 "VBNET.ATG" +#line 2651 "VBNET.ATG" name = t.val; break; } case 137: { lexer.NextToken(); -#line 2628 "VBNET.ATG" +#line 2652 "VBNET.ATG" name = t.val; break; } case 138: { lexer.NextToken(); -#line 2629 "VBNET.ATG" +#line 2653 "VBNET.ATG" name = t.val; break; } case 139: { lexer.NextToken(); -#line 2630 "VBNET.ATG" +#line 2654 "VBNET.ATG" name = t.val; break; } case 140: { lexer.NextToken(); -#line 2631 "VBNET.ATG" +#line 2655 "VBNET.ATG" name = t.val; break; } case 142: { lexer.NextToken(); -#line 2632 "VBNET.ATG" +#line 2656 "VBNET.ATG" name = t.val; break; } case 143: { lexer.NextToken(); -#line 2633 "VBNET.ATG" +#line 2657 "VBNET.ATG" name = t.val; break; } case 144: { lexer.NextToken(); -#line 2634 "VBNET.ATG" +#line 2658 "VBNET.ATG" name = t.val; break; } case 145: { lexer.NextToken(); -#line 2635 "VBNET.ATG" +#line 2659 "VBNET.ATG" name = t.val; break; } case 146: { lexer.NextToken(); -#line 2636 "VBNET.ATG" +#line 2660 "VBNET.ATG" name = t.val; break; } case 147: { lexer.NextToken(); -#line 2637 "VBNET.ATG" +#line 2661 "VBNET.ATG" name = t.val; break; } case 148: { lexer.NextToken(); -#line 2638 "VBNET.ATG" +#line 2662 "VBNET.ATG" name = t.val; break; } case 149: { lexer.NextToken(); -#line 2639 "VBNET.ATG" +#line 2663 "VBNET.ATG" name = t.val; break; } case 150: { lexer.NextToken(); -#line 2640 "VBNET.ATG" +#line 2664 "VBNET.ATG" name = t.val; break; } case 151: { lexer.NextToken(); -#line 2641 "VBNET.ATG" +#line 2665 "VBNET.ATG" name = t.val; break; } case 152: { lexer.NextToken(); -#line 2642 "VBNET.ATG" +#line 2666 "VBNET.ATG" name = t.val; break; } case 153: { lexer.NextToken(); -#line 2643 "VBNET.ATG" +#line 2667 "VBNET.ATG" name = t.val; break; } case 154: { lexer.NextToken(); -#line 2644 "VBNET.ATG" +#line 2668 "VBNET.ATG" name = t.val; break; } case 155: { lexer.NextToken(); -#line 2645 "VBNET.ATG" +#line 2669 "VBNET.ATG" name = t.val; break; } case 156: { lexer.NextToken(); -#line 2646 "VBNET.ATG" +#line 2670 "VBNET.ATG" name = t.val; break; } case 157: { lexer.NextToken(); -#line 2647 "VBNET.ATG" +#line 2671 "VBNET.ATG" name = t.val; break; } case 158: { lexer.NextToken(); -#line 2648 "VBNET.ATG" +#line 2672 "VBNET.ATG" name = t.val; break; } case 159: { lexer.NextToken(); -#line 2649 "VBNET.ATG" +#line 2673 "VBNET.ATG" name = t.val; break; } case 160: { lexer.NextToken(); -#line 2650 "VBNET.ATG" +#line 2674 "VBNET.ATG" name = t.val; break; } case 161: { lexer.NextToken(); -#line 2651 "VBNET.ATG" +#line 2675 "VBNET.ATG" name = t.val; break; } case 162: { lexer.NextToken(); -#line 2652 "VBNET.ATG" +#line 2676 "VBNET.ATG" name = t.val; break; } case 163: { lexer.NextToken(); -#line 2653 "VBNET.ATG" +#line 2677 "VBNET.ATG" name = t.val; break; } case 165: { lexer.NextToken(); -#line 2654 "VBNET.ATG" +#line 2678 "VBNET.ATG" name = t.val; break; } case 166: { lexer.NextToken(); -#line 2655 "VBNET.ATG" +#line 2679 "VBNET.ATG" name = t.val; break; } case 167: { lexer.NextToken(); -#line 2656 "VBNET.ATG" +#line 2680 "VBNET.ATG" name = t.val; break; } case 168: { lexer.NextToken(); -#line 2657 "VBNET.ATG" +#line 2681 "VBNET.ATG" name = t.val; break; } case 170: { lexer.NextToken(); -#line 2658 "VBNET.ATG" +#line 2682 "VBNET.ATG" name = t.val; break; } case 171: { lexer.NextToken(); -#line 2659 "VBNET.ATG" +#line 2683 "VBNET.ATG" name = t.val; break; } case 172: { lexer.NextToken(); -#line 2660 "VBNET.ATG" +#line 2684 "VBNET.ATG" name = t.val; break; } case 173: { lexer.NextToken(); -#line 2661 "VBNET.ATG" +#line 2685 "VBNET.ATG" name = t.val; break; } case 174: { lexer.NextToken(); -#line 2662 "VBNET.ATG" +#line 2686 "VBNET.ATG" name = t.val; break; } case 175: { lexer.NextToken(); -#line 2663 "VBNET.ATG" +#line 2687 "VBNET.ATG" name = t.val; break; } case 176: { lexer.NextToken(); -#line 2664 "VBNET.ATG" +#line 2688 "VBNET.ATG" name = t.val; break; } case 177: { lexer.NextToken(); -#line 2665 "VBNET.ATG" +#line 2689 "VBNET.ATG" name = t.val; break; } case 178: { lexer.NextToken(); -#line 2666 "VBNET.ATG" +#line 2690 "VBNET.ATG" name = t.val; break; } case 179: { lexer.NextToken(); -#line 2667 "VBNET.ATG" +#line 2691 "VBNET.ATG" name = t.val; break; } case 180: { lexer.NextToken(); -#line 2668 "VBNET.ATG" +#line 2692 "VBNET.ATG" name = t.val; break; } case 181: { lexer.NextToken(); -#line 2669 "VBNET.ATG" +#line 2693 "VBNET.ATG" name = t.val; break; } case 182: { lexer.NextToken(); -#line 2670 "VBNET.ATG" +#line 2694 "VBNET.ATG" name = t.val; break; } case 183: { lexer.NextToken(); -#line 2671 "VBNET.ATG" +#line 2695 "VBNET.ATG" name = t.val; break; } case 184: { lexer.NextToken(); -#line 2672 "VBNET.ATG" +#line 2696 "VBNET.ATG" name = t.val; break; } case 185: { lexer.NextToken(); -#line 2673 "VBNET.ATG" +#line 2697 "VBNET.ATG" name = t.val; break; } case 186: { lexer.NextToken(); -#line 2674 "VBNET.ATG" +#line 2698 "VBNET.ATG" name = t.val; break; } case 187: { lexer.NextToken(); -#line 2675 "VBNET.ATG" +#line 2699 "VBNET.ATG" name = t.val; break; } case 188: { lexer.NextToken(); -#line 2676 "VBNET.ATG" +#line 2700 "VBNET.ATG" name = t.val; break; } case 189: { lexer.NextToken(); -#line 2677 "VBNET.ATG" +#line 2701 "VBNET.ATG" name = t.val; break; } case 190: { lexer.NextToken(); -#line 2678 "VBNET.ATG" +#line 2702 "VBNET.ATG" name = t.val; break; } case 191: { lexer.NextToken(); -#line 2679 "VBNET.ATG" +#line 2703 "VBNET.ATG" name = t.val; break; } case 192: { lexer.NextToken(); -#line 2680 "VBNET.ATG" +#line 2704 "VBNET.ATG" name = t.val; break; } case 193: { lexer.NextToken(); -#line 2681 "VBNET.ATG" +#line 2705 "VBNET.ATG" name = t.val; break; } case 196: { lexer.NextToken(); -#line 2682 "VBNET.ATG" +#line 2706 "VBNET.ATG" name = t.val; break; } case 197: { lexer.NextToken(); -#line 2683 "VBNET.ATG" +#line 2707 "VBNET.ATG" name = t.val; break; } case 198: { lexer.NextToken(); -#line 2684 "VBNET.ATG" +#line 2708 "VBNET.ATG" name = t.val; break; } case 199: { lexer.NextToken(); -#line 2685 "VBNET.ATG" +#line 2709 "VBNET.ATG" name = t.val; break; } @@ -4409,94 +4439,94 @@ out string name) { } void CastTarget( -#line 1518 "VBNET.ATG" +#line 1542 "VBNET.ATG" out TypeReference type) { -#line 1520 "VBNET.ATG" +#line 1544 "VBNET.ATG" type = null; switch (la.kind) { case 58: { lexer.NextToken(); -#line 1522 "VBNET.ATG" +#line 1546 "VBNET.ATG" type = new TypeReference("System.Boolean"); break; } case 59: { lexer.NextToken(); -#line 1523 "VBNET.ATG" +#line 1547 "VBNET.ATG" type = new TypeReference("System.Byte"); break; } case 60: { lexer.NextToken(); -#line 1524 "VBNET.ATG" +#line 1548 "VBNET.ATG" type = new TypeReference("System.Char"); break; } case 61: { lexer.NextToken(); -#line 1525 "VBNET.ATG" +#line 1549 "VBNET.ATG" type = new TypeReference("System.DateTime"); break; } case 63: { lexer.NextToken(); -#line 1526 "VBNET.ATG" +#line 1550 "VBNET.ATG" type = new TypeReference("System.Decimal"); break; } case 62: { lexer.NextToken(); -#line 1527 "VBNET.ATG" +#line 1551 "VBNET.ATG" type = new TypeReference("System.Double"); break; } case 65: { lexer.NextToken(); -#line 1528 "VBNET.ATG" +#line 1552 "VBNET.ATG" type = new TypeReference("System.Int32"); break; } case 67: { lexer.NextToken(); -#line 1529 "VBNET.ATG" +#line 1553 "VBNET.ATG" type = new TypeReference("System.Int64"); break; } case 68: { lexer.NextToken(); -#line 1530 "VBNET.ATG" +#line 1554 "VBNET.ATG" type = new TypeReference("System.Object"); break; } case 71: { lexer.NextToken(); -#line 1531 "VBNET.ATG" +#line 1555 "VBNET.ATG" type = new TypeReference("System.Int16"); break; } case 72: { lexer.NextToken(); -#line 1532 "VBNET.ATG" +#line 1556 "VBNET.ATG" type = new TypeReference("System.Single"); break; } case 73: { lexer.NextToken(); -#line 1533 "VBNET.ATG" +#line 1557 "VBNET.ATG" type = new TypeReference("System.String"); break; } @@ -4505,446 +4535,446 @@ out TypeReference type) { } void Argument( -#line 1694 "VBNET.ATG" +#line 1718 "VBNET.ATG" out Expression argumentexpr) { -#line 1696 "VBNET.ATG" +#line 1720 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 1700 "VBNET.ATG" +#line 1724 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 1700 "VBNET.ATG" +#line 1724 "VBNET.ATG" name = t.val; Expect(13); Expect(11); Expr( -#line 1700 "VBNET.ATG" +#line 1724 "VBNET.ATG" out expr); -#line 1702 "VBNET.ATG" +#line 1726 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); } else if (StartOf(18)) { Expr( -#line 1705 "VBNET.ATG" +#line 1729 "VBNET.ATG" out argumentexpr); } else SynErr(236); } void ConditionalAndExpr( -#line 1541 "VBNET.ATG" +#line 1565 "VBNET.ATG" out Expression outExpr) { -#line 1542 "VBNET.ATG" +#line 1566 "VBNET.ATG" Expression expr; InclusiveOrExpr( -#line 1543 "VBNET.ATG" +#line 1567 "VBNET.ATG" out outExpr); while (la.kind == 45) { lexer.NextToken(); InclusiveOrExpr( -#line 1543 "VBNET.ATG" +#line 1567 "VBNET.ATG" out expr); -#line 1543 "VBNET.ATG" +#line 1567 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalAnd, expr); } } void InclusiveOrExpr( -#line 1546 "VBNET.ATG" +#line 1570 "VBNET.ATG" out Expression outExpr) { -#line 1547 "VBNET.ATG" +#line 1571 "VBNET.ATG" Expression expr; ExclusiveOrExpr( -#line 1548 "VBNET.ATG" +#line 1572 "VBNET.ATG" out outExpr); while (la.kind == 185) { lexer.NextToken(); ExclusiveOrExpr( -#line 1548 "VBNET.ATG" +#line 1572 "VBNET.ATG" out expr); -#line 1548 "VBNET.ATG" +#line 1572 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.ExclusiveOr, expr); } } void ExclusiveOrExpr( -#line 1551 "VBNET.ATG" +#line 1575 "VBNET.ATG" out Expression outExpr) { -#line 1552 "VBNET.ATG" +#line 1576 "VBNET.ATG" Expression expr; AndExpr( -#line 1553 "VBNET.ATG" +#line 1577 "VBNET.ATG" out outExpr); while (la.kind == 137) { lexer.NextToken(); AndExpr( -#line 1553 "VBNET.ATG" +#line 1577 "VBNET.ATG" out expr); -#line 1553 "VBNET.ATG" +#line 1577 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseOr, expr); } } void AndExpr( -#line 1556 "VBNET.ATG" +#line 1580 "VBNET.ATG" out Expression outExpr) { -#line 1557 "VBNET.ATG" +#line 1581 "VBNET.ATG" Expression expr; NotExpr( -#line 1558 "VBNET.ATG" +#line 1582 "VBNET.ATG" out outExpr); while (la.kind == 44) { lexer.NextToken(); NotExpr( -#line 1558 "VBNET.ATG" +#line 1582 "VBNET.ATG" out expr); -#line 1558 "VBNET.ATG" +#line 1582 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseAnd, expr); } } void NotExpr( -#line 1561 "VBNET.ATG" +#line 1585 "VBNET.ATG" out Expression outExpr) { -#line 1562 "VBNET.ATG" +#line 1586 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 128) { lexer.NextToken(); -#line 1563 "VBNET.ATG" +#line 1587 "VBNET.ATG" uop = UnaryOperatorType.Not; } EqualityExpr( -#line 1564 "VBNET.ATG" +#line 1588 "VBNET.ATG" out outExpr); -#line 1565 "VBNET.ATG" +#line 1589 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void EqualityExpr( -#line 1570 "VBNET.ATG" +#line 1594 "VBNET.ATG" out Expression outExpr) { -#line 1572 "VBNET.ATG" +#line 1596 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; RelationalExpr( -#line 1575 "VBNET.ATG" +#line 1599 "VBNET.ATG" out outExpr); while (la.kind == 11 || la.kind == 27 || la.kind == 115) { if (la.kind == 27) { lexer.NextToken(); -#line 1578 "VBNET.ATG" +#line 1602 "VBNET.ATG" op = BinaryOperatorType.InEquality; } else if (la.kind == 11) { lexer.NextToken(); -#line 1579 "VBNET.ATG" +#line 1603 "VBNET.ATG" op = BinaryOperatorType.Equality; } else { lexer.NextToken(); -#line 1580 "VBNET.ATG" +#line 1604 "VBNET.ATG" op = BinaryOperatorType.Like; } RelationalExpr( -#line 1582 "VBNET.ATG" +#line 1606 "VBNET.ATG" out expr); -#line 1582 "VBNET.ATG" +#line 1606 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void RelationalExpr( -#line 1586 "VBNET.ATG" +#line 1610 "VBNET.ATG" out Expression outExpr) { -#line 1588 "VBNET.ATG" +#line 1612 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1591 "VBNET.ATG" +#line 1615 "VBNET.ATG" out outExpr); while (StartOf(22)) { if (StartOf(23)) { if (la.kind == 26) { lexer.NextToken(); -#line 1594 "VBNET.ATG" +#line 1618 "VBNET.ATG" op = BinaryOperatorType.LessThan; } else if (la.kind == 25) { lexer.NextToken(); -#line 1595 "VBNET.ATG" +#line 1619 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; } else if (la.kind == 29) { lexer.NextToken(); -#line 1596 "VBNET.ATG" +#line 1620 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; } else if (la.kind == 28) { lexer.NextToken(); -#line 1597 "VBNET.ATG" +#line 1621 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; } else SynErr(237); ShiftExpr( -#line 1599 "VBNET.ATG" +#line 1623 "VBNET.ATG" out expr); -#line 1599 "VBNET.ATG" +#line 1623 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else { if (la.kind == 112) { lexer.NextToken(); -#line 1602 "VBNET.ATG" +#line 1626 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; } else if (la.kind == 189) { lexer.NextToken(); -#line 1603 "VBNET.ATG" +#line 1627 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; } else SynErr(238); Expr( -#line 1604 "VBNET.ATG" +#line 1628 "VBNET.ATG" out expr); -#line 1604 "VBNET.ATG" +#line 1628 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } } void ShiftExpr( -#line 1608 "VBNET.ATG" +#line 1632 "VBNET.ATG" out Expression outExpr) { -#line 1610 "VBNET.ATG" +#line 1634 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; AdditiveExpr( -#line 1613 "VBNET.ATG" +#line 1637 "VBNET.ATG" out outExpr); while (la.kind == 30 || la.kind == 31) { if (la.kind == 30) { lexer.NextToken(); -#line 1616 "VBNET.ATG" +#line 1640 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1617 "VBNET.ATG" +#line 1641 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } AdditiveExpr( -#line 1619 "VBNET.ATG" +#line 1643 "VBNET.ATG" out expr); -#line 1619 "VBNET.ATG" +#line 1643 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AdditiveExpr( -#line 1623 "VBNET.ATG" +#line 1647 "VBNET.ATG" out Expression outExpr) { -#line 1625 "VBNET.ATG" +#line 1649 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; MultiplicativeExpr( -#line 1628 "VBNET.ATG" +#line 1652 "VBNET.ATG" out outExpr); while (la.kind == 14 || la.kind == 15 || la.kind == 19) { if (la.kind == 14) { lexer.NextToken(); -#line 1631 "VBNET.ATG" +#line 1655 "VBNET.ATG" op = BinaryOperatorType.Add; } else if (la.kind == 15) { lexer.NextToken(); -#line 1632 "VBNET.ATG" +#line 1656 "VBNET.ATG" op = BinaryOperatorType.Subtract; } else { lexer.NextToken(); -#line 1633 "VBNET.ATG" +#line 1657 "VBNET.ATG" op = BinaryOperatorType.Concat; } MultiplicativeExpr( -#line 1635 "VBNET.ATG" +#line 1659 "VBNET.ATG" out expr); -#line 1635 "VBNET.ATG" +#line 1659 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void MultiplicativeExpr( -#line 1639 "VBNET.ATG" +#line 1663 "VBNET.ATG" out Expression outExpr) { -#line 1641 "VBNET.ATG" +#line 1665 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 1644 "VBNET.ATG" +#line 1668 "VBNET.ATG" out outExpr); while (StartOf(24)) { if (la.kind == 16) { lexer.NextToken(); -#line 1647 "VBNET.ATG" +#line 1671 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else if (la.kind == 17) { lexer.NextToken(); -#line 1648 "VBNET.ATG" +#line 1672 "VBNET.ATG" op = BinaryOperatorType.Divide; } else if (la.kind == 18) { lexer.NextToken(); -#line 1649 "VBNET.ATG" +#line 1673 "VBNET.ATG" op = BinaryOperatorType.DivideInteger; } else if (la.kind == 119) { lexer.NextToken(); -#line 1650 "VBNET.ATG" +#line 1674 "VBNET.ATG" op = BinaryOperatorType.Modulus; } else { lexer.NextToken(); -#line 1651 "VBNET.ATG" +#line 1675 "VBNET.ATG" op = BinaryOperatorType.Power; } UnaryExpr( -#line 1653 "VBNET.ATG" +#line 1677 "VBNET.ATG" out expr); -#line 1653 "VBNET.ATG" +#line 1677 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void NonArrayTypeName( -#line 1722 "VBNET.ATG" +#line 1746 "VBNET.ATG" out TypeReference typeref) { -#line 1724 "VBNET.ATG" +#line 1748 "VBNET.ATG" string name; typeref = null; if (StartOf(10)) { Qualident( -#line 1727 "VBNET.ATG" +#line 1751 "VBNET.ATG" out name); -#line 1727 "VBNET.ATG" +#line 1751 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 1728 "VBNET.ATG" +#line 1752 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(196); TypeArgumentList( -#line 1729 "VBNET.ATG" +#line 1753 "VBNET.ATG" typeref.GenericTypes); Expect(24); } } else if (la.kind == 132) { lexer.NextToken(); -#line 1731 "VBNET.ATG" +#line 1755 "VBNET.ATG" typeref = new TypeReference("System.Object"); } else if (StartOf(25)) { PrimitiveTypeName( -#line 1732 "VBNET.ATG" +#line 1756 "VBNET.ATG" out name); -#line 1732 "VBNET.ATG" +#line 1756 "VBNET.ATG" typeref = new TypeReference(name); } else SynErr(239); } void ArgumentList( -#line 1679 "VBNET.ATG" +#line 1703 "VBNET.ATG" out ArrayList arguments) { -#line 1681 "VBNET.ATG" +#line 1705 "VBNET.ATG" arguments = new ArrayList(); Expression expr = null; if (StartOf(18)) { Argument( -#line 1685 "VBNET.ATG" +#line 1709 "VBNET.ATG" out expr); -#line 1685 "VBNET.ATG" +#line 1709 "VBNET.ATG" if (expr != null) { arguments.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Argument( -#line 1688 "VBNET.ATG" +#line 1712 "VBNET.ATG" out expr); -#line 1688 "VBNET.ATG" +#line 1712 "VBNET.ATG" if (expr != null) { arguments.Add(expr); } } } } void ArrayTypeModifiers( -#line 1745 "VBNET.ATG" +#line 1769 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1747 "VBNET.ATG" +#line 1771 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 1750 "VBNET.ATG" +#line 1774 "VBNET.ATG" IsDims()) { Expect(23); if (la.kind == 12 || la.kind == 24) { RankList( -#line 1752 "VBNET.ATG" +#line 1776 "VBNET.ATG" out i); } -#line 1754 "VBNET.ATG" +#line 1778 "VBNET.ATG" arrayModifiers.Add(i); Expect(24); } -#line 1759 "VBNET.ATG" +#line 1783 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -4952,89 +4982,89 @@ out i); } void TypeArgumentList( -#line 1772 "VBNET.ATG" +#line 1796 "VBNET.ATG" List typeArguments) { -#line 1774 "VBNET.ATG" +#line 1798 "VBNET.ATG" TypeReference typeref; TypeName( -#line 1776 "VBNET.ATG" +#line 1800 "VBNET.ATG" out typeref); -#line 1776 "VBNET.ATG" +#line 1800 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1779 "VBNET.ATG" +#line 1803 "VBNET.ATG" out typeref); -#line 1779 "VBNET.ATG" +#line 1803 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void RankList( -#line 1766 "VBNET.ATG" +#line 1790 "VBNET.ATG" out int i) { -#line 1767 "VBNET.ATG" +#line 1791 "VBNET.ATG" i = 0; while (la.kind == 12) { lexer.NextToken(); -#line 1768 "VBNET.ATG" +#line 1792 "VBNET.ATG" ++i; } } void Attribute( -#line 1804 "VBNET.ATG" +#line 1828 "VBNET.ATG" out ICSharpCode.NRefactory.Parser.AST.Attribute attribute) { -#line 1805 "VBNET.ATG" +#line 1829 "VBNET.ATG" string name; Qualident( -#line 1806 "VBNET.ATG" +#line 1830 "VBNET.ATG" out name); -#line 1807 "VBNET.ATG" +#line 1831 "VBNET.ATG" List positional = new List(); List named = new List(); if (la.kind == 23) { AttributeArguments( -#line 1810 "VBNET.ATG" +#line 1834 "VBNET.ATG" positional, named); } -#line 1812 "VBNET.ATG" +#line 1836 "VBNET.ATG" attribute = new ICSharpCode.NRefactory.Parser.AST.Attribute(name, positional, named); } void AttributeArguments( -#line 1817 "VBNET.ATG" +#line 1841 "VBNET.ATG" List positional, List named) { -#line 1819 "VBNET.ATG" +#line 1843 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(23); if ( -#line 1825 "VBNET.ATG" +#line 1849 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 1827 "VBNET.ATG" +#line 1851 "VBNET.ATG" IsNamedAssign()) { -#line 1827 "VBNET.ATG" +#line 1851 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 1828 "VBNET.ATG" +#line 1852 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -5042,10 +5072,10 @@ out name); Expect(11); } Expr( -#line 1830 "VBNET.ATG" +#line 1854 "VBNET.ATG" out expr); -#line 1832 "VBNET.ATG" +#line 1856 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -5053,13 +5083,13 @@ out expr); while (la.kind == 12) { lexer.NextToken(); if ( -#line 1839 "VBNET.ATG" +#line 1863 "VBNET.ATG" IsNamedAssign()) { -#line 1839 "VBNET.ATG" +#line 1863 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 1840 "VBNET.ATG" +#line 1864 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -5067,14 +5097,14 @@ out name); Expect(11); } else if (StartOf(18)) { -#line 1842 "VBNET.ATG" +#line 1866 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); } else SynErr(240); Expr( -#line 1843 "VBNET.ATG" +#line 1867 "VBNET.ATG" out expr); -#line 1843 "VBNET.ATG" +#line 1867 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -5085,10 +5115,10 @@ out expr); } void FormalParameter( -#line 1912 "VBNET.ATG" +#line 1936 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 1914 "VBNET.ATG" +#line 1938 "VBNET.ATG" TypeReference type = null; ParamModifiers mod = new ParamModifiers(this); Expression expr = null; @@ -5096,28 +5126,28 @@ out ParameterDeclarationExpression p) { while (StartOf(26)) { ParameterModifier( -#line 1919 "VBNET.ATG" +#line 1943 "VBNET.ATG" mod); } Identifier(); -#line 1920 "VBNET.ATG" +#line 1944 "VBNET.ATG" string parameterName = t.val; if ( -#line 1921 "VBNET.ATG" +#line 1945 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 1921 "VBNET.ATG" +#line 1945 "VBNET.ATG" out arrayModifiers); } if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1922 "VBNET.ATG" +#line 1946 "VBNET.ATG" out type); } -#line 1924 "VBNET.ATG" +#line 1948 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -5133,45 +5163,45 @@ out type); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 1936 "VBNET.ATG" +#line 1960 "VBNET.ATG" out expr); } -#line 1938 "VBNET.ATG" +#line 1962 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); } void ParameterModifier( -#line 2710 "VBNET.ATG" +#line 2734 "VBNET.ATG" ParamModifiers m) { if (la.kind == 54) { lexer.NextToken(); -#line 2711 "VBNET.ATG" +#line 2735 "VBNET.ATG" m.Add(ParamModifier.In); } else if (la.kind == 52) { lexer.NextToken(); -#line 2712 "VBNET.ATG" +#line 2736 "VBNET.ATG" m.Add(ParamModifier.Ref); } else if (la.kind == 136) { lexer.NextToken(); -#line 2713 "VBNET.ATG" +#line 2737 "VBNET.ATG" m.Add(ParamModifier.Optional); } else if (la.kind == 143) { lexer.NextToken(); -#line 2714 "VBNET.ATG" +#line 2738 "VBNET.ATG" m.Add(ParamModifier.Params); } else SynErr(241); } void Statement() { -#line 1966 "VBNET.ATG" +#line 1990 "VBNET.ATG" Statement stmt = null; Point startPos = la.Location; string label = String.Empty; @@ -5179,34 +5209,34 @@ ParamModifiers m) { if (la.kind == 1 || la.kind == 13) { } else if ( -#line 1972 "VBNET.ATG" +#line 1996 "VBNET.ATG" IsLabel()) { LabelName( -#line 1972 "VBNET.ATG" +#line 1996 "VBNET.ATG" out label); -#line 1974 "VBNET.ATG" +#line 1998 "VBNET.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(13); Statement(); } else if (StartOf(27)) { EmbeddedStatement( -#line 1977 "VBNET.ATG" +#line 2001 "VBNET.ATG" out stmt); -#line 1977 "VBNET.ATG" +#line 2001 "VBNET.ATG" compilationUnit.AddChild(stmt); } else if (StartOf(28)) { LocalDeclarationStatement( -#line 1978 "VBNET.ATG" +#line 2002 "VBNET.ATG" out stmt); -#line 1978 "VBNET.ATG" +#line 2002 "VBNET.ATG" compilationUnit.AddChild(stmt); } else SynErr(242); -#line 1981 "VBNET.ATG" +#line 2005 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -5215,30 +5245,30 @@ out stmt); } void LabelName( -#line 2362 "VBNET.ATG" +#line 2386 "VBNET.ATG" out string name) { -#line 2364 "VBNET.ATG" +#line 2388 "VBNET.ATG" name = String.Empty; if (StartOf(10)) { Identifier(); -#line 2366 "VBNET.ATG" +#line 2390 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 2367 "VBNET.ATG" +#line 2391 "VBNET.ATG" name = t.val; } else SynErr(243); } void EmbeddedStatement( -#line 2020 "VBNET.ATG" +#line 2044 "VBNET.ATG" out Statement statement) { -#line 2022 "VBNET.ATG" +#line 2046 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5248,103 +5278,103 @@ out Statement statement) { case 93: { lexer.NextToken(); -#line 2027 "VBNET.ATG" +#line 2051 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 167: { lexer.NextToken(); -#line 2029 "VBNET.ATG" +#line 2053 "VBNET.ATG" exitType = ExitType.Sub; break; } case 99: { lexer.NextToken(); -#line 2031 "VBNET.ATG" +#line 2055 "VBNET.ATG" exitType = ExitType.Function; break; } case 146: { lexer.NextToken(); -#line 2033 "VBNET.ATG" +#line 2057 "VBNET.ATG" exitType = ExitType.Property; break; } case 82: { lexer.NextToken(); -#line 2035 "VBNET.ATG" +#line 2059 "VBNET.ATG" exitType = ExitType.Do; break; } case 97: { lexer.NextToken(); -#line 2037 "VBNET.ATG" +#line 2061 "VBNET.ATG" exitType = ExitType.For; break; } case 174: { lexer.NextToken(); -#line 2039 "VBNET.ATG" +#line 2063 "VBNET.ATG" exitType = ExitType.Try; break; } case 181: { lexer.NextToken(); -#line 2041 "VBNET.ATG" +#line 2065 "VBNET.ATG" exitType = ExitType.While; break; } case 155: { lexer.NextToken(); -#line 2043 "VBNET.ATG" +#line 2067 "VBNET.ATG" exitType = ExitType.Select; break; } default: SynErr(244); break; } -#line 2045 "VBNET.ATG" +#line 2069 "VBNET.ATG" statement = new ExitStatement(exitType); break; } case 174: { TryStatement( -#line 2046 "VBNET.ATG" +#line 2070 "VBNET.ATG" out statement); break; } case 186: { lexer.NextToken(); -#line 2047 "VBNET.ATG" +#line 2071 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 82 || la.kind == 97 || la.kind == 181) { if (la.kind == 82) { lexer.NextToken(); -#line 2047 "VBNET.ATG" +#line 2071 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 97) { lexer.NextToken(); -#line 2047 "VBNET.ATG" +#line 2071 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2047 "VBNET.ATG" +#line 2071 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2047 "VBNET.ATG" +#line 2071 "VBNET.ATG" statement = new ContinueStatement(continueType); break; } @@ -5352,11 +5382,11 @@ out statement); lexer.NextToken(); if (StartOf(18)) { Expr( -#line 2049 "VBNET.ATG" +#line 2073 "VBNET.ATG" out expr); } -#line 2049 "VBNET.ATG" +#line 2073 "VBNET.ATG" statement = new ThrowStatement(expr); break; } @@ -5364,27 +5394,27 @@ out expr); lexer.NextToken(); if (StartOf(18)) { Expr( -#line 2051 "VBNET.ATG" +#line 2075 "VBNET.ATG" out expr); } -#line 2051 "VBNET.ATG" +#line 2075 "VBNET.ATG" statement = new ReturnStatement(expr); break; } case 168: { lexer.NextToken(); Expr( -#line 2053 "VBNET.ATG" +#line 2077 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2053 "VBNET.ATG" +#line 2077 "VBNET.ATG" out embeddedStatement); Expect(87); Expect(168); -#line 2054 "VBNET.ATG" +#line 2078 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); break; } @@ -5392,42 +5422,42 @@ out embeddedStatement); lexer.NextToken(); Identifier(); -#line 2056 "VBNET.ATG" +#line 2080 "VBNET.ATG" name = t.val; if (la.kind == 23) { lexer.NextToken(); if (StartOf(17)) { ArgumentList( -#line 2057 "VBNET.ATG" +#line 2081 "VBNET.ATG" out p); } Expect(24); } -#line 2058 "VBNET.ATG" +#line 2082 "VBNET.ATG" statement = new RaiseEventStatement(name, p); break; } case 182: { WithStatement( -#line 2060 "VBNET.ATG" +#line 2084 "VBNET.ATG" out statement); break; } case 41: { lexer.NextToken(); -#line 2062 "VBNET.ATG" +#line 2086 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2063 "VBNET.ATG" +#line 2087 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2063 "VBNET.ATG" +#line 2087 "VBNET.ATG" out handlerExpr); -#line 2065 "VBNET.ATG" +#line 2089 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); break; @@ -5435,17 +5465,17 @@ out handlerExpr); case 152: { lexer.NextToken(); -#line 2068 "VBNET.ATG" +#line 2092 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2069 "VBNET.ATG" +#line 2093 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2069 "VBNET.ATG" +#line 2093 "VBNET.ATG" out handlerExpr); -#line 2071 "VBNET.ATG" +#line 2095 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); break; @@ -5453,16 +5483,16 @@ out handlerExpr); case 181: { lexer.NextToken(); Expr( -#line 2074 "VBNET.ATG" +#line 2098 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2075 "VBNET.ATG" +#line 2099 "VBNET.ATG" out embeddedStatement); Expect(87); Expect(181); -#line 2077 "VBNET.ATG" +#line 2101 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); break; @@ -5470,23 +5500,23 @@ out embeddedStatement); case 82: { lexer.NextToken(); -#line 2082 "VBNET.ATG" +#line 2106 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2085 "VBNET.ATG" +#line 2109 "VBNET.ATG" out conditionType); Expr( -#line 2085 "VBNET.ATG" +#line 2109 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2086 "VBNET.ATG" +#line 2110 "VBNET.ATG" out embeddedStatement); Expect(117); -#line 2089 "VBNET.ATG" +#line 2113 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5495,19 +5525,19 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2096 "VBNET.ATG" +#line 2120 "VBNET.ATG" out embeddedStatement); Expect(117); if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2097 "VBNET.ATG" +#line 2121 "VBNET.ATG" out conditionType); Expr( -#line 2097 "VBNET.ATG" +#line 2121 "VBNET.ATG" out expr); } -#line 2099 "VBNET.ATG" +#line 2123 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); } else SynErr(245); @@ -5516,7 +5546,7 @@ out expr); case 97: { lexer.NextToken(); -#line 2104 "VBNET.ATG" +#line 2128 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5525,24 +5555,24 @@ out expr); if (la.kind == 84) { lexer.NextToken(); LoopControlVariable( -#line 2111 "VBNET.ATG" +#line 2135 "VBNET.ATG" out typeReference, out typeName); Expect(108); Expr( -#line 2112 "VBNET.ATG" +#line 2136 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2113 "VBNET.ATG" +#line 2137 "VBNET.ATG" out embeddedStatement); Expect(127); if (StartOf(18)) { Expr( -#line 2114 "VBNET.ATG" +#line 2138 "VBNET.ATG" out expr); } -#line 2116 "VBNET.ATG" +#line 2140 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5554,53 +5584,53 @@ out expr); } else if (StartOf(10)) { -#line 2127 "VBNET.ATG" +#line 2151 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; Expression nextExpr = null;ArrayList nextExpressions = null; LoopControlVariable( -#line 2132 "VBNET.ATG" +#line 2156 "VBNET.ATG" out typeReference, out typeName); Expect(11); Expr( -#line 2133 "VBNET.ATG" +#line 2157 "VBNET.ATG" out start); Expect(172); Expr( -#line 2133 "VBNET.ATG" +#line 2157 "VBNET.ATG" out end); if (la.kind == 162) { lexer.NextToken(); Expr( -#line 2133 "VBNET.ATG" +#line 2157 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 2134 "VBNET.ATG" +#line 2158 "VBNET.ATG" out embeddedStatement); Expect(127); if (StartOf(18)) { Expr( -#line 2137 "VBNET.ATG" +#line 2161 "VBNET.ATG" out nextExpr); -#line 2137 "VBNET.ATG" +#line 2161 "VBNET.ATG" nextExpressions = new ArrayList(); nextExpressions.Add(nextExpr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2138 "VBNET.ATG" +#line 2162 "VBNET.ATG" out nextExpr); -#line 2138 "VBNET.ATG" +#line 2162 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 2141 "VBNET.ATG" +#line 2165 "VBNET.ATG" statement = new ForNextStatement(typeReference, typeName, start, end, step, embeddedStatement, nextExpressions); } else SynErr(246); @@ -5609,29 +5639,29 @@ out nextExpr); case 91: { lexer.NextToken(); Expr( -#line 2145 "VBNET.ATG" +#line 2169 "VBNET.ATG" out expr); -#line 2145 "VBNET.ATG" +#line 2169 "VBNET.ATG" statement = new ErrorStatement(expr); break; } case 151: { lexer.NextToken(); -#line 2147 "VBNET.ATG" +#line 2171 "VBNET.ATG" Expression redimclause = null; bool isPreserve = false; if (la.kind == 144) { lexer.NextToken(); -#line 2147 "VBNET.ATG" +#line 2171 "VBNET.ATG" isPreserve = true; } Expr( -#line 2148 "VBNET.ATG" +#line 2172 "VBNET.ATG" out redimclause); -#line 2150 "VBNET.ATG" +#line 2174 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; reDimStatement.ReDimClauses.Add(redimclause as InvocationExpression); @@ -5639,10 +5669,10 @@ out redimclause); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2154 "VBNET.ATG" +#line 2178 "VBNET.ATG" out redimclause); -#line 2154 "VBNET.ATG" +#line 2178 "VBNET.ATG" reDimStatement.ReDimClauses.Add(redimclause as InvocationExpression); } break; @@ -5650,10 +5680,10 @@ out redimclause); case 90: { lexer.NextToken(); Expr( -#line 2157 "VBNET.ATG" +#line 2181 "VBNET.ATG" out expr); -#line 2158 "VBNET.ATG" +#line 2182 "VBNET.ATG" ArrayList arrays = new ArrayList(); if (expr != null) { arrays.Add(expr);} EraseStatement eraseStatement = new EraseStatement(arrays); @@ -5662,53 +5692,53 @@ out expr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2163 "VBNET.ATG" +#line 2187 "VBNET.ATG" out expr); -#line 2163 "VBNET.ATG" +#line 2187 "VBNET.ATG" if (expr != null) { arrays.Add(expr); } } -#line 2164 "VBNET.ATG" +#line 2188 "VBNET.ATG" statement = eraseStatement; break; } case 163: { lexer.NextToken(); -#line 2166 "VBNET.ATG" +#line 2190 "VBNET.ATG" statement = new StopStatement(); break; } case 105: { lexer.NextToken(); Expr( -#line 2168 "VBNET.ATG" +#line 2192 "VBNET.ATG" out expr); if (la.kind == 170) { lexer.NextToken(); } if ( -#line 2170 "VBNET.ATG" +#line 2194 "VBNET.ATG" IsEndStmtAhead()) { Expect(87); -#line 2170 "VBNET.ATG" +#line 2194 "VBNET.ATG" statement = new IfElseStatement(expr, new EndStatement()); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2173 "VBNET.ATG" +#line 2197 "VBNET.ATG" out embeddedStatement); -#line 2175 "VBNET.ATG" +#line 2199 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 86 || -#line 2179 "VBNET.ATG" +#line 2203 "VBNET.ATG" IsElseIf()) { if ( -#line 2179 "VBNET.ATG" +#line 2203 "VBNET.ATG" IsElseIf()) { Expect(85); Expect(105); @@ -5716,20 +5746,20 @@ IsElseIf()) { lexer.NextToken(); } -#line 2182 "VBNET.ATG" +#line 2206 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 2183 "VBNET.ATG" +#line 2207 "VBNET.ATG" out condition); if (la.kind == 170) { lexer.NextToken(); } EndOfStmt(); Block( -#line 2184 "VBNET.ATG" +#line 2208 "VBNET.ATG" out block); -#line 2186 "VBNET.ATG" +#line 2210 "VBNET.ATG" ifStatement.ElseIfSections.Add(new ElseIfSection(condition, block)); } @@ -5737,59 +5767,59 @@ out block); lexer.NextToken(); EndOfStmt(); Block( -#line 2191 "VBNET.ATG" +#line 2215 "VBNET.ATG" out embeddedStatement); -#line 2193 "VBNET.ATG" +#line 2217 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(87); Expect(105); -#line 2197 "VBNET.ATG" +#line 2221 "VBNET.ATG" statement = ifStatement; } else if (StartOf(27)) { EmbeddedStatement( -#line 2200 "VBNET.ATG" +#line 2224 "VBNET.ATG" out embeddedStatement); -#line 2202 "VBNET.ATG" +#line 2226 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2204 "VBNET.ATG" +#line 2228 "VBNET.ATG" out embeddedStatement); -#line 2204 "VBNET.ATG" +#line 2228 "VBNET.ATG" ifStatement.TrueStatement.Add(embeddedStatement); } if (la.kind == 85) { lexer.NextToken(); if (StartOf(27)) { EmbeddedStatement( -#line 2206 "VBNET.ATG" +#line 2230 "VBNET.ATG" out embeddedStatement); } -#line 2208 "VBNET.ATG" +#line 2232 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2211 "VBNET.ATG" +#line 2235 "VBNET.ATG" out embeddedStatement); -#line 2212 "VBNET.ATG" +#line 2236 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } } -#line 2215 "VBNET.ATG" +#line 2239 "VBNET.ATG" statement = ifStatement; } else SynErr(247); break; @@ -5800,43 +5830,43 @@ out embeddedStatement); lexer.NextToken(); } Expr( -#line 2218 "VBNET.ATG" +#line 2242 "VBNET.ATG" out expr); EndOfStmt(); -#line 2219 "VBNET.ATG" +#line 2243 "VBNET.ATG" ArrayList selectSections = new ArrayList(); Statement block = null; while (la.kind == 56) { -#line 2223 "VBNET.ATG" +#line 2247 "VBNET.ATG" ArrayList caseClauses = null; lexer.NextToken(); CaseClauses( -#line 2224 "VBNET.ATG" +#line 2248 "VBNET.ATG" out caseClauses); if ( -#line 2224 "VBNET.ATG" +#line 2248 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 2226 "VBNET.ATG" +#line 2250 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); Block( -#line 2228 "VBNET.ATG" +#line 2252 "VBNET.ATG" out block); -#line 2230 "VBNET.ATG" +#line 2254 "VBNET.ATG" selectSection.Children = block.Children; selectSections.Add(selectSection); } -#line 2234 "VBNET.ATG" +#line 2258 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(87); Expect(155); @@ -5844,43 +5874,43 @@ out block); } case 134: { -#line 2236 "VBNET.ATG" +#line 2260 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 2237 "VBNET.ATG" +#line 2261 "VBNET.ATG" out onErrorStatement); -#line 2237 "VBNET.ATG" +#line 2261 "VBNET.ATG" statement = onErrorStatement; break; } case 103: { -#line 2238 "VBNET.ATG" +#line 2262 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 2239 "VBNET.ATG" +#line 2263 "VBNET.ATG" out goToStatement); -#line 2239 "VBNET.ATG" +#line 2263 "VBNET.ATG" statement = goToStatement; break; } case 153: { -#line 2240 "VBNET.ATG" +#line 2264 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 2241 "VBNET.ATG" +#line 2265 "VBNET.ATG" out resumeStatement); -#line 2241 "VBNET.ATG" +#line 2265 "VBNET.ATG" statement = resumeStatement; break; } case 2: case 3: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 14: case 15: case 16: case 23: case 42: case 50: case 51: case 53: case 58: case 59: case 60: case 61: case 62: case 63: case 64: case 65: case 67: case 68: case 69: case 71: case 72: case 73: case 74: case 75: case 76: case 81: case 83: case 95: case 101: case 110: case 116: case 118: case 123: case 124: case 126: case 129: case 159: case 160: case 165: case 169: case 173: case 175: case 190: case 191: case 192: case 193: case 194: case 195: { -#line 2244 "VBNET.ATG" +#line 2268 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -5888,25 +5918,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; UnaryExpr( -#line 2250 "VBNET.ATG" +#line 2274 "VBNET.ATG" out expr); if (StartOf(29)) { AssignmentOperator( -#line 2252 "VBNET.ATG" +#line 2276 "VBNET.ATG" out op); Expr( -#line 2252 "VBNET.ATG" +#line 2276 "VBNET.ATG" out val); -#line 2252 "VBNET.ATG" +#line 2276 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 1 || la.kind == 13 || la.kind == 85) { -#line 2253 "VBNET.ATG" +#line 2277 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(248); -#line 2256 "VBNET.ATG" +#line 2280 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is FieldReferenceExpression || expr is IdentifierExpression) { @@ -5919,10 +5949,10 @@ out val); case 55: { lexer.NextToken(); UnaryExpr( -#line 2263 "VBNET.ATG" +#line 2287 "VBNET.ATG" out expr); -#line 2263 "VBNET.ATG" +#line 2287 "VBNET.ATG" statement = new StatementExpression(expr); break; } @@ -5930,7 +5960,7 @@ out expr); lexer.NextToken(); Identifier(); -#line 2265 "VBNET.ATG" +#line 2289 "VBNET.ATG" string resourcename = t.val, typeName; Statement resourceAquisition = null, block = null; @@ -5938,45 +5968,45 @@ out expr); if (la.kind == 126) { lexer.NextToken(); Qualident( -#line 2269 "VBNET.ATG" +#line 2293 "VBNET.ATG" out typeName); -#line 2269 "VBNET.ATG" +#line 2293 "VBNET.ATG" ArrayList initializer = null; if (la.kind == 23) { lexer.NextToken(); if (StartOf(17)) { ArgumentList( -#line 2269 "VBNET.ATG" +#line 2293 "VBNET.ATG" out initializer); } Expect(24); } -#line 2271 "VBNET.ATG" +#line 2295 "VBNET.ATG" resourceAquisition = new LocalVariableDeclaration(new VariableDeclaration(resourcename, new ArrayInitializerExpression(initializer), new TypeReference(typeName))); } else if (StartOf(10)) { Qualident( -#line 2274 "VBNET.ATG" +#line 2298 "VBNET.ATG" out typeName); Expect(11); Expr( -#line 2274 "VBNET.ATG" +#line 2298 "VBNET.ATG" out expr); -#line 2276 "VBNET.ATG" +#line 2300 "VBNET.ATG" resourceAquisition = new LocalVariableDeclaration(new VariableDeclaration(resourcename, expr, new TypeReference(typeName))); } else SynErr(249); Block( -#line 2279 "VBNET.ATG" +#line 2303 "VBNET.ATG" out block); Expect(87); Expect(188); -#line 2281 "VBNET.ATG" +#line 2305 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); break; } @@ -5985,10 +6015,10 @@ out block); } void LocalDeclarationStatement( -#line 1989 "VBNET.ATG" +#line 2013 "VBNET.ATG" out Statement statement) { -#line 1991 "VBNET.ATG" +#line 2015 "VBNET.ATG" Modifiers m = new Modifiers(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -5997,22 +6027,22 @@ out Statement statement) { if (la.kind == 70) { lexer.NextToken(); -#line 1997 "VBNET.ATG" +#line 2021 "VBNET.ATG" m.Add(Modifier.Const); } else if (la.kind == 161) { lexer.NextToken(); -#line 1998 "VBNET.ATG" +#line 2022 "VBNET.ATG" m.Add(Modifier.Static); } else { lexer.NextToken(); -#line 1999 "VBNET.ATG" +#line 2023 "VBNET.ATG" dimfound = true; } } -#line 2002 "VBNET.ATG" +#line 2026 "VBNET.ATG" if(dimfound && (m.Modifier & Modifier.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -6025,137 +6055,137 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2013 "VBNET.ATG" +#line 2037 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2014 "VBNET.ATG" +#line 2038 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2016 "VBNET.ATG" +#line 2040 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 2474 "VBNET.ATG" +#line 2498 "VBNET.ATG" out Statement tryStatement) { -#line 2476 "VBNET.ATG" +#line 2500 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;ArrayList catchClauses = null; Expect(174); EndOfStmt(); Block( -#line 2479 "VBNET.ATG" +#line 2503 "VBNET.ATG" out blockStmt); if (la.kind == 57 || la.kind == 87 || la.kind == 96) { CatchClauses( -#line 2480 "VBNET.ATG" +#line 2504 "VBNET.ATG" out catchClauses); } if (la.kind == 96) { lexer.NextToken(); EndOfStmt(); Block( -#line 2481 "VBNET.ATG" +#line 2505 "VBNET.ATG" out finallyStmt); } Expect(87); Expect(174); -#line 2484 "VBNET.ATG" +#line 2508 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 2452 "VBNET.ATG" +#line 2476 "VBNET.ATG" out Statement withStatement) { -#line 2454 "VBNET.ATG" +#line 2478 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(182); -#line 2457 "VBNET.ATG" +#line 2481 "VBNET.ATG" Point start = t.Location; Expr( -#line 2458 "VBNET.ATG" +#line 2482 "VBNET.ATG" out expr); EndOfStmt(); -#line 2460 "VBNET.ATG" +#line 2484 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; withStatements.Push(withStatement); Block( -#line 2464 "VBNET.ATG" +#line 2488 "VBNET.ATG" out blockStmt); -#line 2466 "VBNET.ATG" +#line 2490 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; withStatements.Pop(); Expect(87); Expect(182); -#line 2470 "VBNET.ATG" +#line 2494 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 2445 "VBNET.ATG" +#line 2469 "VBNET.ATG" out ConditionType conditionType) { -#line 2446 "VBNET.ATG" +#line 2470 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 181) { lexer.NextToken(); -#line 2447 "VBNET.ATG" +#line 2471 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 177) { lexer.NextToken(); -#line 2448 "VBNET.ATG" +#line 2472 "VBNET.ATG" conditionType = ConditionType.Until; } else SynErr(251); } void LoopControlVariable( -#line 2286 "VBNET.ATG" +#line 2310 "VBNET.ATG" out TypeReference type, out string name) { -#line 2287 "VBNET.ATG" +#line 2311 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 2291 "VBNET.ATG" +#line 2315 "VBNET.ATG" out name); if ( -#line 2292 "VBNET.ATG" +#line 2316 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2292 "VBNET.ATG" +#line 2316 "VBNET.ATG" out arrayModifiers); } if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 2293 "VBNET.ATG" +#line 2317 "VBNET.ATG" out type); -#line 2293 "VBNET.ATG" +#line 2317 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 2295 "VBNET.ATG" +#line 2319 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -6173,48 +6203,48 @@ out type); } void CaseClauses( -#line 2405 "VBNET.ATG" +#line 2429 "VBNET.ATG" out ArrayList caseClauses) { -#line 2407 "VBNET.ATG" +#line 2431 "VBNET.ATG" caseClauses = new ArrayList(); CaseLabel caseClause = null; CaseClause( -#line 2410 "VBNET.ATG" +#line 2434 "VBNET.ATG" out caseClause); -#line 2410 "VBNET.ATG" +#line 2434 "VBNET.ATG" caseClauses.Add(caseClause); while (la.kind == 12) { lexer.NextToken(); CaseClause( -#line 2411 "VBNET.ATG" +#line 2435 "VBNET.ATG" out caseClause); -#line 2411 "VBNET.ATG" +#line 2435 "VBNET.ATG" caseClauses.Add(caseClause); } } void OnErrorStatement( -#line 2312 "VBNET.ATG" +#line 2336 "VBNET.ATG" out OnErrorStatement stmt) { -#line 2314 "VBNET.ATG" +#line 2338 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(134); Expect(91); if ( -#line 2320 "VBNET.ATG" +#line 2344 "VBNET.ATG" IsNegativeLabelName()) { Expect(103); Expect(15); Expect(5); -#line 2322 "VBNET.ATG" +#line 2346 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -6223,10 +6253,10 @@ IsNegativeLabelName()) { } else if (la.kind == 103) { GotoStatement( -#line 2328 "VBNET.ATG" +#line 2352 "VBNET.ATG" out goToStatement); -#line 2330 "VBNET.ATG" +#line 2354 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -6243,63 +6273,63 @@ out goToStatement); lexer.NextToken(); Expect(127); -#line 2344 "VBNET.ATG" +#line 2368 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); } else SynErr(252); } void GotoStatement( -#line 2350 "VBNET.ATG" +#line 2374 "VBNET.ATG" out ICSharpCode.NRefactory.Parser.AST.GotoStatement goToStatement) { -#line 2352 "VBNET.ATG" +#line 2376 "VBNET.ATG" string label = String.Empty; Expect(103); LabelName( -#line 2355 "VBNET.ATG" +#line 2379 "VBNET.ATG" out label); -#line 2357 "VBNET.ATG" +#line 2381 "VBNET.ATG" goToStatement = new ICSharpCode.NRefactory.Parser.AST.GotoStatement(label); } void ResumeStatement( -#line 2394 "VBNET.ATG" +#line 2418 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 2396 "VBNET.ATG" +#line 2420 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 2399 "VBNET.ATG" +#line 2423 "VBNET.ATG" IsResumeNext()) { Expect(153); Expect(127); -#line 2400 "VBNET.ATG" +#line 2424 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 153) { lexer.NextToken(); if (StartOf(30)) { LabelName( -#line 2401 "VBNET.ATG" +#line 2425 "VBNET.ATG" out label); } -#line 2401 "VBNET.ATG" +#line 2425 "VBNET.ATG" resumeStatement = new ResumeStatement(label); } else SynErr(253); } void CaseClause( -#line 2415 "VBNET.ATG" +#line 2439 "VBNET.ATG" out CaseLabel caseClause) { -#line 2417 "VBNET.ATG" +#line 2441 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -6308,7 +6338,7 @@ out CaseLabel caseClause) { if (la.kind == 85) { lexer.NextToken(); -#line 2423 "VBNET.ATG" +#line 2447 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(31)) { if (la.kind == 112) { @@ -6318,76 +6348,76 @@ out CaseLabel caseClause) { case 26: { lexer.NextToken(); -#line 2427 "VBNET.ATG" +#line 2451 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 25: { lexer.NextToken(); -#line 2428 "VBNET.ATG" +#line 2452 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 29: { lexer.NextToken(); -#line 2429 "VBNET.ATG" +#line 2453 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 28: { lexer.NextToken(); -#line 2430 "VBNET.ATG" +#line 2454 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 11: { lexer.NextToken(); -#line 2431 "VBNET.ATG" +#line 2455 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 27: { lexer.NextToken(); -#line 2432 "VBNET.ATG" +#line 2456 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } default: SynErr(254); break; } Expr( -#line 2434 "VBNET.ATG" +#line 2458 "VBNET.ATG" out expr); -#line 2436 "VBNET.ATG" +#line 2460 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(18)) { Expr( -#line 2438 "VBNET.ATG" +#line 2462 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); Expr( -#line 2438 "VBNET.ATG" +#line 2462 "VBNET.ATG" out sexpr); } -#line 2440 "VBNET.ATG" +#line 2464 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); } else SynErr(255); } void CatchClauses( -#line 2489 "VBNET.ATG" +#line 2513 "VBNET.ATG" out ArrayList catchClauses) { -#line 2491 "VBNET.ATG" +#line 2515 "VBNET.ATG" catchClauses = new ArrayList(); TypeReference type = null; Statement blockStmt = null; @@ -6399,27 +6429,27 @@ out ArrayList catchClauses) { if (StartOf(10)) { Identifier(); -#line 2499 "VBNET.ATG" +#line 2523 "VBNET.ATG" name = t.val; if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 2499 "VBNET.ATG" +#line 2523 "VBNET.ATG" out type); } } if (la.kind == 180) { lexer.NextToken(); Expr( -#line 2500 "VBNET.ATG" +#line 2524 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 2502 "VBNET.ATG" +#line 2526 "VBNET.ATG" out blockStmt); -#line 2503 "VBNET.ATG" +#line 2527 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index e348253fdf..5626547b08 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -543,17 +543,20 @@ TypeParameterList templates> (. TemplateDefinition template; .) = - "(" "Of" TypeParameter - (. - if (template != null) templates.Add(template); - .) - { - "," TypeParameter + [ + IF (la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) + "(" "Of" TypeParameter (. if (template != null) templates.Add(template); .) - } - ")" + { + "," TypeParameter + (. + if (template != null) templates.Add(template); + .) + } + ")" + ] . /* 4.9.1 */ @@ -600,7 +603,7 @@ NonModuleDeclaration attributes> newType.Type = Types.Class; .) Identifier (. newType.Name = t.val; newType.StartLocation = t.EndLocation; .) - [ TypeParameterList ] + TypeParameterList EndOfStmt [ ClassBaseType (. newType.BaseTypes.Add(name); .) ] { TypeImplementsClause (. newType.BaseTypes.AddRange(names); .) } @@ -634,7 +637,7 @@ NonModuleDeclaration attributes> newType.Type = Types.Struct; ArrayList baseInterfaces = new ArrayList(); .) Identifier (. newType.Name = t.val; newType.StartLocation = t.EndLocation; .) - [ TypeParameterList ] + TypeParameterList EOL { TypeImplementsClause (. newType.BaseTypes.AddRange(baseInterfaces);.) } StructureBody (. @@ -670,7 +673,7 @@ NonModuleDeclaration attributes> newType.Type = Types.Interface;ArrayList baseInterfaces; .) Identifier (. newType.Name = t.val; newType.StartLocation = t.EndLocation; .) - [ TypeParameterList ] + TypeParameterList EndOfStmt { InterfaceBase (. newType.BaseTypes.AddRange(baseInterfaces.ToArray()); .) } InterfaceBody (. @@ -688,9 +691,11 @@ NonModuleDeclaration attributes> .) ( "Sub" Identifier (. delegateDeclr.Name = t.val; .) + TypeParameterList [ "(" [ FormalParameterList

] ")" (. delegateDeclr.Parameters = p; .) ] | "Function" Identifier (. delegateDeclr.Name = t.val; .) + TypeParameterList [ "(" [ FormalParameterList

] ")" (. delegateDeclr.Parameters = p; .) ] [ "As" (. TypeReference type; .) TypeName (. delegateDeclr.ReturnType = type; .)] ) @@ -771,7 +776,9 @@ InterfaceBody = */ InterfaceMemberDecl (. - TypeReference type =null; List p = new List(); + TypeReference type =null; + List p = new List(); + List templates = new List(); AttributeSection section, returnTypeAttributeSection = null; Modifiers mod = new Modifiers(); List attributes = new List(); @@ -798,18 +805,21 @@ InterfaceMemberDecl "Sub" (. mod.Check(Modifier.VBInterfaceMethods); .) Identifier (. name = t.val; .) + TypeParameterList [ "(" [ FormalParameterList

] ")" ] EOL (. MethodDeclaration md = new MethodDeclaration(name, mod.Modifier, null, p, attributes); md.TypeReference = new TypeReference("", "System.Void"); md.EndLocation = t.EndLocation; + md.Templates = templates; compilationUnit.AddChild(md); .) | "Function" (. mod.Check(Modifier.VBInterfaceMethods); .) Identifier (. name = t.val; .) + TypeParameterList [ "(" [ FormalParameterList

] ")" ] [ "As" { AttributeSection } TypeName ] (. @@ -819,6 +829,7 @@ InterfaceMemberDecl MethodDeclaration md = new MethodDeclaration(name, mod.Modifier, type, p, attributes); md.ReturnTypeAttributeSection = returnTypeAttributeSection; md.EndLocation = t.EndLocation; + md.Templates = templates; compilationUnit.AddChild(md); .) EOL @@ -881,8 +892,11 @@ ClassBaseType /* 7.6.1 */ StructureMemberDecl attributes> (. - TypeReference type = null; List p = new List(); - Statement stmt = null; List variableDeclarators = new List(); + TypeReference type = null; + List p = new List(); + Statement stmt = null; + List variableDeclarators = new List(); + List templates = new List(); .)= NonModuleDeclaration | /* 9.2.1 */ @@ -900,6 +914,7 @@ StructureMemberDecl attributes> name = t.val; m.Check(Modifier.VBMethods); .) + TypeParameterList [ "(" [ FormalParameterList

] ")" ] [ ( @@ -918,7 +933,8 @@ StructureMemberDecl attributes> methodDeclaration.StartLocation = startPos; methodDeclaration.EndLocation = endLocation; methodDeclaration.TypeReference = new TypeReference("", "System.Void"); - + + methodDeclaration.Templates = templates; methodDeclaration.HandlesClause = handlesClause; methodDeclaration.ImplementsClause = implementsClause; @@ -931,6 +947,7 @@ StructureMemberDecl attributes> methodDeclaration.EndLocation = endLocation; methodDeclaration.TypeReference = new TypeReference("", "System.Void"); + methodDeclaration.Templates = templates; methodDeclaration.HandlesClause = handlesClause; methodDeclaration.ImplementsClause = implementsClause; @@ -971,6 +988,7 @@ StructureMemberDecl attributes> AttributeSection returnTypeAttributeSection = null; .) Identifier (. name = t.val; .) + TypeParameterList [ "(" [ FormalParameterList

] ")" ] ["As" { AttributeSection } TypeName ] (. @@ -993,7 +1011,9 @@ StructureMemberDecl attributes> methodDeclaration = new MethodDeclaration(name, m.Modifier, type, p, attributes); methodDeclaration.StartLocation = startPos; methodDeclaration.EndLocation = t.EndLocation; + methodDeclaration.HandlesClause = handlesClause; + methodDeclaration.Templates = templates; methodDeclaration.ImplementsClause = implementsClause; methodDeclaration.ReturnTypeAttributeSection = returnTypeAttributeSection; compilationUnit.AddChild(methodDeclaration); @@ -1004,6 +1024,7 @@ StructureMemberDecl attributes> methodDeclaration.StartLocation = startPos; methodDeclaration.EndLocation = t.EndLocation; + methodDeclaration.Templates = templates; methodDeclaration.HandlesClause = handlesClause; methodDeclaration.ImplementsClause = implementsClause; methodDeclaration.ReturnTypeAttributeSection = returnTypeAttributeSection; @@ -1106,7 +1127,8 @@ StructureMemberDecl attributes> "Const" (. m.Add(Modifier.Const); .) (. FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); - fd.StartLocation = t.Location;List constantDeclarators = new List(); + fd.StartLocation = t.Location; + List constantDeclarators = new List(); .) ConstantDeclarator { "," ConstantDeclarator } @@ -1123,7 +1145,8 @@ StructureMemberDecl attributes> "Property" (. m.Check(Modifier.VBProperties); - Point startPos = t.Location;ArrayList implementsClause = null; + Point startPos = t.Location; + ArrayList implementsClause = null; .) Identifier (. string propertyName = t.val; .) [ "(" [ FormalParameterList

] ")" ] @@ -1173,7 +1196,8 @@ StructureMemberDecl attributes> /* 9.7 */ AccessorDecls - (.List attributes = new List(); + (. + List attributes = new List(); AttributeSection section; getBlock = null; setBlock = null; diff --git a/src/SharpDevelop.sln b/src/SharpDevelop.sln index d347045a45..269b40b834 100644 --- a/src/SharpDevelop.sln +++ b/src/SharpDevelop.sln @@ -1,35 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 9.00 -# SharpDevelop 2.0.0.225 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}" -EndProject +# SharpDevelop 2.0.0.226 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}" ProjectSection(SolutionItems) = postProject EndProjectSection @@ -78,6 +48,36 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\St EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}" + ProjectSection(SolutionItems) = postProject + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}" + ProjectSection(SolutionItems) = postProject + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -159,17 +159,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {4980B743-B32F-4aba-AABD-45E2CAD3568D} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {98B10E98-003C-45A0-9587-119142E39986} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} @@ -188,5 +177,16 @@ Global {B08385CD-F0CC-488C-B4F4-EEB34B6D2688} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} {1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} + {98B10E98-003C-45A0-9587-119142E39986} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} + {AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} + {4980B743-B32F-4aba-AABD-45E2CAD3568D} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} EndGlobalSection EndGlobal