diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index b7b00759e1..99d50a52d0 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -183,7 +183,7 @@ out u); void GlobalAttributeSection() { Expect(40); -#line 2819 "VBNET.ATG" +#line 2817 "VBNET.ATG" Location startPos = t.Location; if (la.kind == 65) { lexer.NextToken(); @@ -191,20 +191,20 @@ out u); lexer.NextToken(); } else SynErr(243); -#line 2821 "VBNET.ATG" +#line 2819 "VBNET.ATG" string attributeTarget = t.val != null ? t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture) : null; List attributes = new List(); ASTAttribute attribute; Expect(21); Attribute( -#line 2825 "VBNET.ATG" +#line 2823 "VBNET.ATG" out attribute); -#line 2825 "VBNET.ATG" +#line 2823 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2826 "VBNET.ATG" +#line 2824 "VBNET.ATG" NotFinalComma()) { if (la.kind == 22) { lexer.NextToken(); @@ -216,10 +216,10 @@ NotFinalComma()) { Expect(21); } Attribute( -#line 2826 "VBNET.ATG" +#line 2824 "VBNET.ATG" out attribute); -#line 2826 "VBNET.ATG" +#line 2824 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 22) { @@ -228,7 +228,7 @@ out attribute); Expect(39); EndOfStmt(); -#line 2831 "VBNET.ATG" +#line 2829 "VBNET.ATG" AttributeSection section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -354,47 +354,47 @@ out aliasedType); } void Qualident( -#line 3596 "VBNET.ATG" +#line 3594 "VBNET.ATG" out string qualident) { -#line 3598 "VBNET.ATG" +#line 3596 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 3602 "VBNET.ATG" +#line 3600 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 3603 "VBNET.ATG" +#line 3601 "VBNET.ATG" DotAndIdentOrKw()) { Expect(26); IdentifierOrKeyword( -#line 3603 "VBNET.ATG" +#line 3601 "VBNET.ATG" out name); -#line 3603 "VBNET.ATG" +#line 3601 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 3605 "VBNET.ATG" +#line 3603 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 2690 "VBNET.ATG" +#line 2688 "VBNET.ATG" out TypeReference typeref) { -#line 2691 "VBNET.ATG" +#line 2689 "VBNET.ATG" ArrayList rank = null; Location startLocation = la.Location; NonArrayTypeName( -#line 2693 "VBNET.ATG" +#line 2691 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 2694 "VBNET.ATG" +#line 2692 "VBNET.ATG" out rank); -#line 2696 "VBNET.ATG" +#line 2694 "VBNET.ATG" if (typeref != null) { if (rank != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); @@ -429,10 +429,10 @@ out rank); } void AttributeSection( -#line 2897 "VBNET.ATG" +#line 2895 "VBNET.ATG" out AttributeSection section) { -#line 2899 "VBNET.ATG" +#line 2897 "VBNET.ATG" string attributeTarget = ""; List attributes = new List(); ASTAttribute attribute; @@ -440,22 +440,22 @@ out AttributeSection section) { Expect(40); if ( -#line 2905 "VBNET.ATG" +#line 2903 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 119) { lexer.NextToken(); -#line 2906 "VBNET.ATG" +#line 2904 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 195) { lexer.NextToken(); -#line 2907 "VBNET.ATG" +#line 2905 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2910 "VBNET.ATG" +#line 2908 "VBNET.ATG" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -468,20 +468,20 @@ IsLocalAttrTarget()) { Expect(21); } Attribute( -#line 2920 "VBNET.ATG" +#line 2918 "VBNET.ATG" out attribute); -#line 2920 "VBNET.ATG" +#line 2918 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2921 "VBNET.ATG" +#line 2919 "VBNET.ATG" NotFinalComma()) { Expect(22); Attribute( -#line 2921 "VBNET.ATG" +#line 2919 "VBNET.ATG" out attribute); -#line 2921 "VBNET.ATG" +#line 2919 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 22) { @@ -489,7 +489,7 @@ out attribute); } Expect(39); -#line 2925 "VBNET.ATG" +#line 2923 "VBNET.ATG" section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -500,69 +500,69 @@ out attribute); } void TypeModifier( -#line 3681 "VBNET.ATG" +#line 3679 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 188: { lexer.NextToken(); -#line 3682 "VBNET.ATG" +#line 3680 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 187: { lexer.NextToken(); -#line 3683 "VBNET.ATG" +#line 3681 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 125: { lexer.NextToken(); -#line 3684 "VBNET.ATG" +#line 3682 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 185: { lexer.NextToken(); -#line 3685 "VBNET.ATG" +#line 3683 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 200: { lexer.NextToken(); -#line 3686 "VBNET.ATG" +#line 3684 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 199: { lexer.NextToken(); -#line 3687 "VBNET.ATG" +#line 3685 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 156: { lexer.NextToken(); -#line 3688 "VBNET.ATG" +#line 3686 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 166: { lexer.NextToken(); -#line 3689 "VBNET.ATG" +#line 3687 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 183: { lexer.NextToken(); -#line 3690 "VBNET.ATG" +#line 3688 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -1014,28 +1014,28 @@ out typeRef); } void TypeImplementsClause( -#line 1626 "VBNET.ATG" +#line 1624 "VBNET.ATG" out List baseInterfaces) { -#line 1628 "VBNET.ATG" +#line 1626 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; Expect(136); TypeName( -#line 1631 "VBNET.ATG" +#line 1629 "VBNET.ATG" out type); -#line 1633 "VBNET.ATG" +#line 1631 "VBNET.ATG" if (type != null) baseInterfaces.Add(type); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 1636 "VBNET.ATG" +#line 1634 "VBNET.ATG" out type); -#line 1637 "VBNET.ATG" +#line 1635 "VBNET.ATG" if (type != null) baseInterfaces.Add(type); } EndOfStmt(); @@ -1165,10 +1165,10 @@ m, attributes); } void NonArrayTypeName( -#line 2718 "VBNET.ATG" +#line 2716 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2720 "VBNET.ATG" +#line 2718 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; @@ -1178,36 +1178,36 @@ out TypeReference typeref, bool canBeUnbound) { lexer.NextToken(); Expect(26); -#line 2725 "VBNET.ATG" +#line 2723 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 2726 "VBNET.ATG" +#line 2724 "VBNET.ATG" out typeref, canBeUnbound); -#line 2727 "VBNET.ATG" +#line 2725 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 26) { lexer.NextToken(); -#line 2728 "VBNET.ATG" +#line 2726 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 2729 "VBNET.ATG" +#line 2727 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 2730 "VBNET.ATG" +#line 2728 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 168) { lexer.NextToken(); -#line 2733 "VBNET.ATG" +#line 2731 "VBNET.ATG" typeref = new TypeReference("System.Object", true); if (la.kind == 33) { lexer.NextToken(); -#line 2737 "VBNET.ATG" +#line 2735 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1215,15 +1215,15 @@ out nestedTypeRef, canBeUnbound); } } else if (StartOf(12)) { PrimitiveTypeName( -#line 2743 "VBNET.ATG" +#line 2741 "VBNET.ATG" out name); -#line 2743 "VBNET.ATG" +#line 2741 "VBNET.ATG" typeref = new TypeReference(name, true); if (la.kind == 33) { lexer.NextToken(); -#line 2747 "VBNET.ATG" +#line 2745 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1262,27 +1262,27 @@ out f); } void InterfaceBase( -#line 1611 "VBNET.ATG" +#line 1609 "VBNET.ATG" out List bases) { -#line 1613 "VBNET.ATG" +#line 1611 "VBNET.ATG" TypeReference type; bases = new List(); Expect(140); TypeName( -#line 1617 "VBNET.ATG" +#line 1615 "VBNET.ATG" out type); -#line 1617 "VBNET.ATG" +#line 1615 "VBNET.ATG" if (type != null) bases.Add(type); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 1620 "VBNET.ATG" +#line 1618 "VBNET.ATG" out type); -#line 1620 "VBNET.ATG" +#line 1618 "VBNET.ATG" if (type != null) bases.Add(type); } EndOfStmt(); @@ -1309,162 +1309,162 @@ TypeDeclaration newType) { } void FormalParameterList( -#line 2935 "VBNET.ATG" +#line 2933 "VBNET.ATG" List parameter) { -#line 2936 "VBNET.ATG" +#line 2934 "VBNET.ATG" ParameterDeclarationExpression p; FormalParameter( -#line 2938 "VBNET.ATG" +#line 2936 "VBNET.ATG" out p); -#line 2938 "VBNET.ATG" +#line 2936 "VBNET.ATG" if (p != null) parameter.Add(p); while (la.kind == 22) { lexer.NextToken(); FormalParameter( -#line 2940 "VBNET.ATG" +#line 2938 "VBNET.ATG" out p); -#line 2940 "VBNET.ATG" +#line 2938 "VBNET.ATG" if (p != null) parameter.Add(p); } } void MemberModifier( -#line 3693 "VBNET.ATG" +#line 3691 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 156: { lexer.NextToken(); -#line 3694 "VBNET.ATG" +#line 3692 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 102: { lexer.NextToken(); -#line 3695 "VBNET.ATG" +#line 3693 "VBNET.ATG" m.Add(Modifiers.Default, t.Location); break; } case 125: { lexer.NextToken(); -#line 3696 "VBNET.ATG" +#line 3694 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 199: { lexer.NextToken(); -#line 3697 "VBNET.ATG" +#line 3695 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 181: { lexer.NextToken(); -#line 3698 "VBNET.ATG" +#line 3696 "VBNET.ATG" m.Add(Modifiers.Override, t.Location); break; } case 157: { lexer.NextToken(); -#line 3699 "VBNET.ATG" +#line 3697 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 185: { lexer.NextToken(); -#line 3700 "VBNET.ATG" +#line 3698 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 187: { lexer.NextToken(); -#line 3701 "VBNET.ATG" +#line 3699 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 188: { lexer.NextToken(); -#line 3702 "VBNET.ATG" +#line 3700 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 166: { lexer.NextToken(); -#line 3703 "VBNET.ATG" +#line 3701 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 167: { lexer.NextToken(); -#line 3704 "VBNET.ATG" +#line 3702 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 200: { lexer.NextToken(); -#line 3705 "VBNET.ATG" +#line 3703 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 180: { lexer.NextToken(); -#line 3706 "VBNET.ATG" +#line 3704 "VBNET.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 179: { lexer.NextToken(); -#line 3707 "VBNET.ATG" +#line 3705 "VBNET.ATG" m.Add(Modifiers.Overloads, t.Location); break; } case 190: { lexer.NextToken(); -#line 3708 "VBNET.ATG" +#line 3706 "VBNET.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 235: { lexer.NextToken(); -#line 3709 "VBNET.ATG" +#line 3707 "VBNET.ATG" m.Add(Modifiers.WriteOnly, t.Location); break; } case 234: { lexer.NextToken(); -#line 3710 "VBNET.ATG" +#line 3708 "VBNET.ATG" m.Add(Modifiers.WithEvents, t.Location); break; } case 105: { lexer.NextToken(); -#line 3711 "VBNET.ATG" +#line 3709 "VBNET.ATG" m.Add(Modifiers.Dim, t.Location); break; } case 183: { lexer.NextToken(); -#line 3712 "VBNET.ATG" +#line 3710 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -1569,31 +1569,30 @@ IsMustOverride(m)) { TypeReference = new TypeReference("System.Void", true), Templates = templates, HandlesClause = handlesClause, - InterfaceImplementations = implementsClause, - IsExtensionMethod = attributes.Any(section => section.Attributes.Any(a => a.Name.Contains("Extension"))) + InterfaceImplementations = implementsClause }; AddChild(methodDeclaration); -#line 880 "VBNET.ATG" +#line 879 "VBNET.ATG" if (ParseMethodBodies) { Block( -#line 881 "VBNET.ATG" +#line 880 "VBNET.ATG" out stmt); Expect(113); Expect(210); -#line 883 "VBNET.ATG" +#line 882 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 889 "VBNET.ATG" +#line 888 "VBNET.ATG" methodDeclaration.Body = (BlockStatement)stmt; -#line 890 "VBNET.ATG" +#line 889 "VBNET.ATG" methodDeclaration.Body.EndLocation = t.EndLocation; EndOfStmt(); } else SynErr(256); @@ -1603,39 +1602,39 @@ out stmt); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 894 "VBNET.ATG" +#line 893 "VBNET.ATG" p); } Expect(38); } -#line 895 "VBNET.ATG" +#line 894 "VBNET.ATG" m.Check(Modifiers.Constructors); -#line 896 "VBNET.ATG" +#line 895 "VBNET.ATG" Location constructorEndLocation = t.EndLocation; Expect(1); -#line 899 "VBNET.ATG" +#line 898 "VBNET.ATG" if (ParseMethodBodies) { Block( -#line 900 "VBNET.ATG" +#line 899 "VBNET.ATG" out stmt); Expect(113); Expect(210); -#line 902 "VBNET.ATG" +#line 901 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 908 "VBNET.ATG" +#line 907 "VBNET.ATG" Location endLocation = t.EndLocation; EndOfStmt(); -#line 911 "VBNET.ATG" +#line 910 "VBNET.ATG" ConstructorDeclaration cd = new ConstructorDeclaration("New", m.Modifier, p, attributes); cd.StartLocation = m.GetDeclarationLocation(startPos); cd.EndLocation = constructorEndLocation; @@ -1649,7 +1648,7 @@ out stmt); case 127: { lexer.NextToken(); -#line 923 "VBNET.ATG" +#line 922 "VBNET.ATG" m.Check(Modifiers.VBMethods); string name = String.Empty; Location startPos = t.Location; @@ -1659,16 +1658,16 @@ out stmt); Identifier(); -#line 930 "VBNET.ATG" +#line 929 "VBNET.ATG" name = t.val; TypeParameterList( -#line 931 "VBNET.ATG" +#line 930 "VBNET.ATG" templates); if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 932 "VBNET.ATG" +#line 931 "VBNET.ATG" p); } Expect(38); @@ -1677,10 +1676,10 @@ p); lexer.NextToken(); while (la.kind == 40) { AttributeSection( -#line 934 "VBNET.ATG" +#line 933 "VBNET.ATG" out returnTypeAttributeSection); -#line 936 "VBNET.ATG" +#line 935 "VBNET.ATG" if (returnTypeAttributeSection != null) { returnTypeAttributeSection.AttributeTarget = "return"; attributes.Add(returnTypeAttributeSection); @@ -1688,11 +1687,11 @@ out returnTypeAttributeSection); } TypeName( -#line 942 "VBNET.ATG" +#line 941 "VBNET.ATG" out type); } -#line 944 "VBNET.ATG" +#line 943 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object", true); } @@ -1700,23 +1699,23 @@ out type); if (la.kind == 134 || la.kind == 136) { if (la.kind == 136) { ImplementsClause( -#line 950 "VBNET.ATG" +#line 949 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 952 "VBNET.ATG" +#line 951 "VBNET.ATG" out handlesClause); } } -#line 955 "VBNET.ATG" +#line 954 "VBNET.ATG" Location endLocation = t.EndLocation; if ( -#line 958 "VBNET.ATG" +#line 957 "VBNET.ATG" IsMustOverride(m)) { EndOfStmt(); -#line 961 "VBNET.ATG" +#line 960 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1732,7 +1731,7 @@ IsMustOverride(m)) { } else if (la.kind == 1) { lexer.NextToken(); -#line 976 "VBNET.ATG" +#line 975 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1740,20 +1739,19 @@ IsMustOverride(m)) { EndLocation = endLocation, Templates = templates, HandlesClause = handlesClause, - InterfaceImplementations = implementsClause, - IsExtensionMethod = attributes.Any(section => section.Attributes.Any(a => a.Name.Contains("Extension"))) + InterfaceImplementations = implementsClause }; AddChild(methodDeclaration); if (ParseMethodBodies) { Block( -#line 990 "VBNET.ATG" +#line 988 "VBNET.ATG" out stmt); Expect(113); Expect(127); -#line 992 "VBNET.ATG" +#line 990 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Function); stmt = new BlockStatement(); @@ -1769,7 +1767,7 @@ out stmt); case 101: { lexer.NextToken(); -#line 1006 "VBNET.ATG" +#line 1004 "VBNET.ATG" m.Check(Modifiers.VBExternalMethods); Location startPos = t.Location; CharsetModifier charsetModifer = CharsetModifier.None; @@ -1779,39 +1777,39 @@ out stmt); if (StartOf(15)) { Charset( -#line 1013 "VBNET.ATG" +#line 1011 "VBNET.ATG" out charsetModifer); } if (la.kind == 210) { lexer.NextToken(); Identifier(); -#line 1016 "VBNET.ATG" +#line 1014 "VBNET.ATG" name = t.val; Expect(149); Expect(3); -#line 1017 "VBNET.ATG" +#line 1015 "VBNET.ATG" library = t.literalValue as string; if (la.kind == 59) { lexer.NextToken(); Expect(3); -#line 1018 "VBNET.ATG" +#line 1016 "VBNET.ATG" alias = t.literalValue as string; } if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1019 "VBNET.ATG" +#line 1017 "VBNET.ATG" p); } Expect(38); } EndOfStmt(); -#line 1022 "VBNET.ATG" +#line 1020 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, null, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -1821,25 +1819,25 @@ p); lexer.NextToken(); Identifier(); -#line 1029 "VBNET.ATG" +#line 1027 "VBNET.ATG" name = t.val; Expect(149); Expect(3); -#line 1030 "VBNET.ATG" +#line 1028 "VBNET.ATG" library = t.literalValue as string; if (la.kind == 59) { lexer.NextToken(); Expect(3); -#line 1031 "VBNET.ATG" +#line 1029 "VBNET.ATG" alias = t.literalValue as string; } if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1032 "VBNET.ATG" +#line 1030 "VBNET.ATG" p); } Expect(38); @@ -1847,12 +1845,12 @@ p); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1033 "VBNET.ATG" +#line 1031 "VBNET.ATG" out type); } EndOfStmt(); -#line 1036 "VBNET.ATG" +#line 1034 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, type, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -1864,7 +1862,7 @@ out type); case 119: { lexer.NextToken(); -#line 1046 "VBNET.ATG" +#line 1044 "VBNET.ATG" m.Check(Modifiers.VBEvents); Location startPos = t.Location; EventDeclaration eventDeclaration; @@ -1873,19 +1871,19 @@ out type); Identifier(); -#line 1052 "VBNET.ATG" +#line 1050 "VBNET.ATG" name= t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1054 "VBNET.ATG" +#line 1052 "VBNET.ATG" out type); } else if (StartOf(16)) { if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1056 "VBNET.ATG" +#line 1054 "VBNET.ATG" p); } Expect(38); @@ -1893,11 +1891,11 @@ p); } else SynErr(260); if (la.kind == 136) { ImplementsClause( -#line 1058 "VBNET.ATG" +#line 1056 "VBNET.ATG" out implementsClause); } -#line 1060 "VBNET.ATG" +#line 1058 "VBNET.ATG" eventDeclaration = new EventDeclaration { Name = name, TypeReference = type, Modifier = m.Modifier, Parameters = p, Attributes = attributes, InterfaceImplementations = implementsClause, @@ -1911,29 +1909,29 @@ out implementsClause); } case 2: case 58: case 62: case 64: case 65: case 66: case 67: case 70: case 87: case 104: case 107: case 116: case 121: case 126: case 133: case 139: case 143: case 146: case 147: case 170: case 176: case 178: case 184: case 203: case 212: case 213: case 223: case 224: case 230: { -#line 1071 "VBNET.ATG" +#line 1069 "VBNET.ATG" m.Check(Modifiers.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, null, m.Modifier); IdentifierForFieldDeclaration(); -#line 1074 "VBNET.ATG" +#line 1072 "VBNET.ATG" string name = t.val; -#line 1075 "VBNET.ATG" +#line 1073 "VBNET.ATG" fd.StartLocation = m.GetDeclarationLocation(t.Location); VariableDeclaratorPartAfterIdentifier( -#line 1077 "VBNET.ATG" +#line 1075 "VBNET.ATG" variableDeclarators, name); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 1078 "VBNET.ATG" +#line 1076 "VBNET.ATG" variableDeclarators); } EndOfStmt(); -#line 1081 "VBNET.ATG" +#line 1079 "VBNET.ATG" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; AddChild(fd); @@ -1942,35 +1940,35 @@ variableDeclarators); } case 88: { -#line 1086 "VBNET.ATG" +#line 1084 "VBNET.ATG" m.Check(Modifiers.Fields); lexer.NextToken(); -#line 1087 "VBNET.ATG" +#line 1085 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); -#line 1089 "VBNET.ATG" +#line 1087 "VBNET.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(t.Location); List constantDeclarators = new List(); ConstantDeclarator( -#line 1093 "VBNET.ATG" +#line 1091 "VBNET.ATG" constantDeclarators); while (la.kind == 22) { lexer.NextToken(); ConstantDeclarator( -#line 1094 "VBNET.ATG" +#line 1092 "VBNET.ATG" constantDeclarators); } -#line 1096 "VBNET.ATG" +#line 1094 "VBNET.ATG" fd.Fields = constantDeclarators; fd.EndLocation = t.Location; EndOfStmt(); -#line 1101 "VBNET.ATG" +#line 1099 "VBNET.ATG" fd.EndLocation = t.EndLocation; AddChild(fd); @@ -1979,7 +1977,7 @@ constantDeclarators); case 186: { lexer.NextToken(); -#line 1107 "VBNET.ATG" +#line 1105 "VBNET.ATG" m.Check(Modifiers.VBProperties); Location startPos = t.Location; List implementsClause = null; @@ -1988,13 +1986,13 @@ constantDeclarators); Identifier(); -#line 1113 "VBNET.ATG" +#line 1111 "VBNET.ATG" string propertyName = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1114 "VBNET.ATG" +#line 1112 "VBNET.ATG" p); } Expect(38); @@ -2003,10 +2001,10 @@ p); lexer.NextToken(); while (la.kind == 40) { AttributeSection( -#line 1117 "VBNET.ATG" +#line 1115 "VBNET.ATG" out returnTypeAttributeSection); -#line 1119 "VBNET.ATG" +#line 1117 "VBNET.ATG" if (returnTypeAttributeSection != null) { returnTypeAttributeSection.AttributeTarget = "return"; attributes.Add(returnTypeAttributeSection); @@ -2014,13 +2012,13 @@ out returnTypeAttributeSection); } if ( -#line 1126 "VBNET.ATG" +#line 1124 "VBNET.ATG" IsNewExpression()) { ObjectCreateExpression( -#line 1126 "VBNET.ATG" +#line 1124 "VBNET.ATG" out initializer); -#line 1128 "VBNET.ATG" +#line 1126 "VBNET.ATG" if (initializer is ObjectCreateExpression) { type = ((ObjectCreateExpression)initializer).CreateType.Clone(); } else { @@ -2029,27 +2027,27 @@ out initializer); } else if (StartOf(8)) { TypeName( -#line 1135 "VBNET.ATG" +#line 1133 "VBNET.ATG" out type); } else SynErr(261); } if (la.kind == 20) { lexer.NextToken(); Expr( -#line 1138 "VBNET.ATG" +#line 1136 "VBNET.ATG" out initializer); } if (la.kind == 136) { ImplementsClause( -#line 1139 "VBNET.ATG" +#line 1137 "VBNET.ATG" out implementsClause); } EndOfStmt(); if ( -#line 1143 "VBNET.ATG" +#line 1141 "VBNET.ATG" IsMustOverride(m) || IsAutomaticProperty()) { -#line 1145 "VBNET.ATG" +#line 1143 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2062,7 +2060,7 @@ IsMustOverride(m) || IsAutomaticProperty()) { } else if (StartOf(17)) { -#line 1157 "VBNET.ATG" +#line 1155 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2074,13 +2072,13 @@ IsMustOverride(m) || IsAutomaticProperty()) { PropertySetRegion setRegion; AccessorDecls( -#line 1167 "VBNET.ATG" +#line 1165 "VBNET.ATG" out getRegion, out setRegion); Expect(113); Expect(186); EndOfStmt(); -#line 1171 "VBNET.ATG" +#line 1169 "VBNET.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.Location; // t = EndOfStmt; not "Property" @@ -2092,11 +2090,11 @@ out getRegion, out setRegion); case 98: { lexer.NextToken(); -#line 1178 "VBNET.ATG" +#line 1176 "VBNET.ATG" Location startPos = t.Location; Expect(119); -#line 1180 "VBNET.ATG" +#line 1178 "VBNET.ATG" m.Check(Modifiers.VBCustomEvents); EventAddRemoveRegion eventAccessorDeclaration; EventAddRegion addHandlerAccessorDeclaration = null; @@ -2106,24 +2104,24 @@ out getRegion, out setRegion); Identifier(); -#line 1187 "VBNET.ATG" +#line 1185 "VBNET.ATG" string customEventName = t.val; Expect(63); TypeName( -#line 1188 "VBNET.ATG" +#line 1186 "VBNET.ATG" out type); if (la.kind == 136) { ImplementsClause( -#line 1189 "VBNET.ATG" +#line 1187 "VBNET.ATG" out implementsClause); } EndOfStmt(); while (StartOf(18)) { EventAccessorDeclaration( -#line 1192 "VBNET.ATG" +#line 1190 "VBNET.ATG" out eventAccessorDeclaration); -#line 1194 "VBNET.ATG" +#line 1192 "VBNET.ATG" if(eventAccessorDeclaration is EventAddRegion) { addHandlerAccessorDeclaration = (EventAddRegion)eventAccessorDeclaration; @@ -2142,7 +2140,7 @@ out eventAccessorDeclaration); Expect(119); EndOfStmt(); -#line 1210 "VBNET.ATG" +#line 1208 "VBNET.ATG" if(addHandlerAccessorDeclaration == null) { Error("Need to provide AddHandler accessor."); @@ -2173,24 +2171,24 @@ out eventAccessorDeclaration); } case 161: case 172: case 232: { -#line 1236 "VBNET.ATG" +#line 1234 "VBNET.ATG" ConversionType opConversionType = ConversionType.None; if (la.kind == 161 || la.kind == 232) { if (la.kind == 232) { lexer.NextToken(); -#line 1237 "VBNET.ATG" +#line 1235 "VBNET.ATG" opConversionType = ConversionType.Implicit; } else { lexer.NextToken(); -#line 1238 "VBNET.ATG" +#line 1236 "VBNET.ATG" opConversionType = ConversionType.Explicit; } } Expect(172); -#line 1241 "VBNET.ATG" +#line 1239 "VBNET.ATG" m.Check(Modifiers.VBOperators); Location startPos = t.Location; TypeReference returnType = NullTypeReference.Instance; @@ -2201,57 +2199,57 @@ out eventAccessorDeclaration); List parameters = new List(); OverloadableOperator( -#line 1250 "VBNET.ATG" +#line 1248 "VBNET.ATG" out operatorType); Expect(37); FormalParameter( -#line 1252 "VBNET.ATG" +#line 1250 "VBNET.ATG" out param); -#line 1253 "VBNET.ATG" +#line 1251 "VBNET.ATG" if (param != null) parameters.Add(param); if (la.kind == 22) { lexer.NextToken(); FormalParameter( -#line 1255 "VBNET.ATG" +#line 1253 "VBNET.ATG" out param); -#line 1256 "VBNET.ATG" +#line 1254 "VBNET.ATG" if (param != null) parameters.Add(param); } Expect(38); -#line 1259 "VBNET.ATG" +#line 1257 "VBNET.ATG" Location endPos = t.EndLocation; if (la.kind == 63) { lexer.NextToken(); while (la.kind == 40) { AttributeSection( -#line 1260 "VBNET.ATG" +#line 1258 "VBNET.ATG" out section); -#line 1261 "VBNET.ATG" +#line 1259 "VBNET.ATG" if (section != null) { section.AttributeTarget = "return"; attributes.Add(section); } } TypeName( -#line 1265 "VBNET.ATG" +#line 1263 "VBNET.ATG" out returnType); -#line 1265 "VBNET.ATG" +#line 1263 "VBNET.ATG" endPos = t.EndLocation; } Expect(1); Block( -#line 1267 "VBNET.ATG" +#line 1265 "VBNET.ATG" out stmt); Expect(113); Expect(172); EndOfStmt(); -#line 1269 "VBNET.ATG" +#line 1267 "VBNET.ATG" OperatorDeclaration operatorDeclaration = new OperatorDeclaration { Modifier = m.Modifier, Attributes = attributes, @@ -2512,28 +2510,28 @@ mod, attributes); } void Expr( -#line 1670 "VBNET.ATG" +#line 1668 "VBNET.ATG" out Expression expr) { -#line 1671 "VBNET.ATG" +#line 1669 "VBNET.ATG" expr = null; Location startLocation = la.Location; if ( -#line 1674 "VBNET.ATG" +#line 1672 "VBNET.ATG" IsQueryExpression() ) { QueryExpr( -#line 1675 "VBNET.ATG" +#line 1673 "VBNET.ATG" out expr); } else if (la.kind == 127 || la.kind == 210) { LambdaExpr( -#line 1676 "VBNET.ATG" +#line 1674 "VBNET.ATG" out expr); } else if (StartOf(21)) { DisjunctionExpr( -#line 1677 "VBNET.ATG" +#line 1675 "VBNET.ATG" out expr); } else SynErr(266); -#line 1680 "VBNET.ATG" +#line 1678 "VBNET.ATG" if (expr != null) { expr.StartLocation = startLocation; expr.EndLocation = t.EndLocation; @@ -2542,84 +2540,84 @@ out expr); } void ImplementsClause( -#line 1643 "VBNET.ATG" +#line 1641 "VBNET.ATG" out List baseInterfaces) { -#line 1645 "VBNET.ATG" +#line 1643 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; string memberName = null; Expect(136); NonArrayTypeName( -#line 1650 "VBNET.ATG" +#line 1648 "VBNET.ATG" out type, false); -#line 1651 "VBNET.ATG" +#line 1649 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1652 "VBNET.ATG" +#line 1650 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); while (la.kind == 22) { lexer.NextToken(); NonArrayTypeName( -#line 1654 "VBNET.ATG" +#line 1652 "VBNET.ATG" out type, false); -#line 1655 "VBNET.ATG" +#line 1653 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1656 "VBNET.ATG" +#line 1654 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); } } void HandlesClause( -#line 1601 "VBNET.ATG" +#line 1599 "VBNET.ATG" out List handlesClause) { -#line 1603 "VBNET.ATG" +#line 1601 "VBNET.ATG" handlesClause = new List(); string name; Expect(134); EventMemberSpecifier( -#line 1606 "VBNET.ATG" +#line 1604 "VBNET.ATG" out name); -#line 1606 "VBNET.ATG" +#line 1604 "VBNET.ATG" if (name != null) handlesClause.Add(name); while (la.kind == 22) { lexer.NextToken(); EventMemberSpecifier( -#line 1607 "VBNET.ATG" +#line 1605 "VBNET.ATG" out name); -#line 1607 "VBNET.ATG" +#line 1605 "VBNET.ATG" if (name != null) handlesClause.Add(name); } } void Block( -#line 2983 "VBNET.ATG" +#line 2981 "VBNET.ATG" out Statement stmt) { -#line 2986 "VBNET.ATG" +#line 2984 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); /* in snippet parsing mode, t might be null */ if (t != null) blockStmt.StartLocation = t.EndLocation; BlockStart(blockStmt); while (StartOf(22) || -#line 2992 "VBNET.ATG" +#line 2990 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2992 "VBNET.ATG" +#line 2990 "VBNET.ATG" IsEndStmtAhead()) { Expect(113); EndOfStmt(); -#line 2992 "VBNET.ATG" +#line 2990 "VBNET.ATG" AddChild(new EndStatement()); } else { Statement(); @@ -2627,7 +2625,7 @@ IsEndStmtAhead()) { } } -#line 2997 "VBNET.ATG" +#line 2995 "VBNET.ATG" stmt = blockStmt; if (t != null) blockStmt.EndLocation = t.EndLocation; BlockEnd(); @@ -2635,26 +2633,26 @@ IsEndStmtAhead()) { } void Charset( -#line 1593 "VBNET.ATG" +#line 1591 "VBNET.ATG" out CharsetModifier charsetModifier) { -#line 1594 "VBNET.ATG" +#line 1592 "VBNET.ATG" charsetModifier = CharsetModifier.None; if (la.kind == 127 || la.kind == 210) { } else if (la.kind == 62) { lexer.NextToken(); -#line 1595 "VBNET.ATG" +#line 1593 "VBNET.ATG" charsetModifier = CharsetModifier.Ansi; } else if (la.kind == 66) { lexer.NextToken(); -#line 1596 "VBNET.ATG" +#line 1594 "VBNET.ATG" charsetModifier = CharsetModifier.Auto; } else if (la.kind == 223) { lexer.NextToken(); -#line 1597 "VBNET.ATG" +#line 1595 "VBNET.ATG" charsetModifier = CharsetModifier.Unicode; } else SynErr(267); } @@ -2782,10 +2780,10 @@ out CharsetModifier charsetModifier) { } void VariableDeclaratorPartAfterIdentifier( -#line 1472 "VBNET.ATG" +#line 1470 "VBNET.ATG" List fieldDeclaration, string name) { -#line 1474 "VBNET.ATG" +#line 1472 "VBNET.ATG" Expression expr = null; TypeReference type = null; ArrayList rank = null; @@ -2793,28 +2791,28 @@ List fieldDeclaration, string name) { Location startLocation = t.Location; if ( -#line 1480 "VBNET.ATG" +#line 1478 "VBNET.ATG" IsSize() && !IsDims()) { ArrayInitializationModifier( -#line 1480 "VBNET.ATG" +#line 1478 "VBNET.ATG" out dimension); } if ( -#line 1481 "VBNET.ATG" +#line 1479 "VBNET.ATG" IsDims()) { ArrayNameModifier( -#line 1481 "VBNET.ATG" +#line 1479 "VBNET.ATG" out rank); } if ( -#line 1483 "VBNET.ATG" +#line 1481 "VBNET.ATG" IsObjectCreation()) { Expect(63); ObjectCreateExpression( -#line 1483 "VBNET.ATG" +#line 1481 "VBNET.ATG" out expr); -#line 1485 "VBNET.ATG" +#line 1483 "VBNET.ATG" if (expr is ObjectCreateExpression) { type = ((ObjectCreateExpression)expr).CreateType.Clone(); } else { @@ -2825,10 +2823,10 @@ out expr); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1492 "VBNET.ATG" +#line 1490 "VBNET.ATG" out type); -#line 1494 "VBNET.ATG" +#line 1492 "VBNET.ATG" if (type != null) { for (int i = fieldDeclaration.Count - 1; i >= 0; i--) { VariableDeclaration vd = fieldDeclaration[i]; @@ -2841,7 +2839,7 @@ out type); } -#line 1506 "VBNET.ATG" +#line 1504 "VBNET.ATG" if (type == null && (dimension != null || rank != null)) { type = new TypeReference(""); } @@ -2868,12 +2866,12 @@ out type); if (la.kind == 20) { lexer.NextToken(); Expr( -#line 1529 "VBNET.ATG" +#line 1527 "VBNET.ATG" out expr); } } else SynErr(269); -#line 1532 "VBNET.ATG" +#line 1530 "VBNET.ATG" VariableDeclaration varDecl = new VariableDeclaration(name, expr, type); varDecl.StartLocation = startLocation; varDecl.EndLocation = t.Location; @@ -2882,22 +2880,22 @@ out expr); } void VariableDeclarator( -#line 1466 "VBNET.ATG" +#line 1464 "VBNET.ATG" List fieldDeclaration) { Identifier(); -#line 1468 "VBNET.ATG" +#line 1466 "VBNET.ATG" string name = t.val; VariableDeclaratorPartAfterIdentifier( -#line 1469 "VBNET.ATG" +#line 1467 "VBNET.ATG" fieldDeclaration, name); } void ConstantDeclarator( -#line 1447 "VBNET.ATG" +#line 1445 "VBNET.ATG" List constantDeclaration) { -#line 1449 "VBNET.ATG" +#line 1447 "VBNET.ATG" Expression expr = null; TypeReference type = null; string name = String.Empty; @@ -2905,20 +2903,20 @@ List constantDeclaration) { Identifier(); -#line 1454 "VBNET.ATG" +#line 1452 "VBNET.ATG" name = t.val; location = t.Location; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 1455 "VBNET.ATG" +#line 1453 "VBNET.ATG" out type); } Expect(20); Expr( -#line 1456 "VBNET.ATG" +#line 1454 "VBNET.ATG" out expr); -#line 1458 "VBNET.ATG" +#line 1456 "VBNET.ATG" VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; f.StartLocation = location; @@ -2927,10 +2925,10 @@ out expr); } void ObjectCreateExpression( -#line 2132 "VBNET.ATG" +#line 2130 "VBNET.ATG" out Expression oce) { -#line 2134 "VBNET.ATG" +#line 2132 "VBNET.ATG" TypeReference type = null; CollectionInitializerExpression initializer = null; List arguments = null; @@ -2941,39 +2939,39 @@ out Expression oce) { Expect(162); if (StartOf(8)) { NonArrayTypeName( -#line 2142 "VBNET.ATG" +#line 2140 "VBNET.ATG" out type, false); if (la.kind == 37) { lexer.NextToken(); NormalOrReDimArgumentList( -#line 2143 "VBNET.ATG" +#line 2141 "VBNET.ATG" out arguments, out canBeNormal, out canBeReDim); Expect(38); if (la.kind == 35 || -#line 2144 "VBNET.ATG" +#line 2142 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { if ( -#line 2144 "VBNET.ATG" +#line 2142 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { ArrayTypeModifiers( -#line 2145 "VBNET.ATG" +#line 2143 "VBNET.ATG" out dimensions); CollectionInitializer( -#line 2146 "VBNET.ATG" +#line 2144 "VBNET.ATG" out initializer); } else { CollectionInitializer( -#line 2147 "VBNET.ATG" +#line 2145 "VBNET.ATG" out initializer); } } -#line 2149 "VBNET.ATG" +#line 2147 "VBNET.ATG" if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); } } -#line 2153 "VBNET.ATG" +#line 2151 "VBNET.ATG" if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); } else { @@ -2988,53 +2986,53 @@ out initializer); if (la.kind == 126 || la.kind == 233) { if (la.kind == 233) { -#line 2168 "VBNET.ATG" +#line 2166 "VBNET.ATG" MemberInitializerExpression memberInitializer = null; Expression anonymousMember = null; lexer.NextToken(); -#line 2173 "VBNET.ATG" +#line 2171 "VBNET.ATG" CollectionInitializerExpression memberInitializers = new CollectionInitializerExpression(); memberInitializers.StartLocation = la.Location; Expect(35); if (la.kind == 26 || la.kind == 147) { MemberInitializer( -#line 2178 "VBNET.ATG" +#line 2176 "VBNET.ATG" out memberInitializer); -#line 2179 "VBNET.ATG" +#line 2177 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); } else if (StartOf(24)) { Expr( -#line 2180 "VBNET.ATG" +#line 2178 "VBNET.ATG" out anonymousMember); -#line 2181 "VBNET.ATG" +#line 2179 "VBNET.ATG" memberInitializers.CreateExpressions.Add(anonymousMember); } else SynErr(270); while (la.kind == 22) { lexer.NextToken(); if (la.kind == 26 || la.kind == 147) { MemberInitializer( -#line 2185 "VBNET.ATG" +#line 2183 "VBNET.ATG" out memberInitializer); -#line 2186 "VBNET.ATG" +#line 2184 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); } else if (StartOf(24)) { Expr( -#line 2187 "VBNET.ATG" +#line 2185 "VBNET.ATG" out anonymousMember); -#line 2188 "VBNET.ATG" +#line 2186 "VBNET.ATG" memberInitializers.CreateExpressions.Add(anonymousMember); } else SynErr(271); } Expect(36); -#line 2193 "VBNET.ATG" +#line 2191 "VBNET.ATG" memberInitializers.EndLocation = t.Location; if(oce is ObjectCreateExpression) { @@ -3044,10 +3042,10 @@ out anonymousMember); } else { lexer.NextToken(); CollectionInitializer( -#line 2203 "VBNET.ATG" +#line 2201 "VBNET.ATG" out initializer); -#line 2205 "VBNET.ATG" +#line 2203 "VBNET.ATG" if(oce is ObjectCreateExpression) ((ObjectCreateExpression)oce).ObjectInitializer = initializer; @@ -3056,10 +3054,10 @@ out initializer); } void AccessorDecls( -#line 1381 "VBNET.ATG" +#line 1379 "VBNET.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1383 "VBNET.ATG" +#line 1381 "VBNET.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -3067,60 +3065,60 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 40) { AttributeSection( -#line 1388 "VBNET.ATG" +#line 1386 "VBNET.ATG" out section); -#line 1388 "VBNET.ATG" +#line 1386 "VBNET.ATG" attributes.Add(section); } if (StartOf(25)) { GetAccessorDecl( -#line 1390 "VBNET.ATG" +#line 1388 "VBNET.ATG" out getBlock, attributes); if (StartOf(26)) { -#line 1392 "VBNET.ATG" +#line 1390 "VBNET.ATG" attributes = new List(); while (la.kind == 40) { AttributeSection( -#line 1393 "VBNET.ATG" +#line 1391 "VBNET.ATG" out section); -#line 1393 "VBNET.ATG" +#line 1391 "VBNET.ATG" attributes.Add(section); } SetAccessorDecl( -#line 1394 "VBNET.ATG" +#line 1392 "VBNET.ATG" out setBlock, attributes); } } else if (StartOf(27)) { SetAccessorDecl( -#line 1397 "VBNET.ATG" +#line 1395 "VBNET.ATG" out setBlock, attributes); if (StartOf(28)) { -#line 1399 "VBNET.ATG" +#line 1397 "VBNET.ATG" attributes = new List(); while (la.kind == 40) { AttributeSection( -#line 1400 "VBNET.ATG" +#line 1398 "VBNET.ATG" out section); -#line 1400 "VBNET.ATG" +#line 1398 "VBNET.ATG" attributes.Add(section); } GetAccessorDecl( -#line 1401 "VBNET.ATG" +#line 1399 "VBNET.ATG" out getBlock, attributes); } } else SynErr(272); } void EventAccessorDeclaration( -#line 1344 "VBNET.ATG" +#line 1342 "VBNET.ATG" out EventAddRemoveRegion eventAccessorDeclaration) { -#line 1346 "VBNET.ATG" +#line 1344 "VBNET.ATG" Statement stmt = null; List p = new List(); AttributeSection section; @@ -3129,10 +3127,10 @@ out EventAddRemoveRegion eventAccessorDeclaration) { while (la.kind == 40) { AttributeSection( -#line 1352 "VBNET.ATG" +#line 1350 "VBNET.ATG" out section); -#line 1352 "VBNET.ATG" +#line 1350 "VBNET.ATG" attributes.Add(section); } if (la.kind == 56) { @@ -3141,20 +3139,20 @@ out section); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1354 "VBNET.ATG" +#line 1352 "VBNET.ATG" p); } Expect(38); } Expect(1); Block( -#line 1355 "VBNET.ATG" +#line 1353 "VBNET.ATG" out stmt); Expect(113); Expect(56); EndOfStmt(); -#line 1357 "VBNET.ATG" +#line 1355 "VBNET.ATG" eventAccessorDeclaration = new EventAddRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3165,20 +3163,20 @@ out stmt); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1362 "VBNET.ATG" +#line 1360 "VBNET.ATG" p); } Expect(38); } Expect(1); Block( -#line 1363 "VBNET.ATG" +#line 1361 "VBNET.ATG" out stmt); Expect(113); Expect(193); EndOfStmt(); -#line 1365 "VBNET.ATG" +#line 1363 "VBNET.ATG" eventAccessorDeclaration = new EventRemoveRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3189,20 +3187,20 @@ out stmt); lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1370 "VBNET.ATG" +#line 1368 "VBNET.ATG" p); } Expect(38); } Expect(1); Block( -#line 1371 "VBNET.ATG" +#line 1369 "VBNET.ATG" out stmt); Expect(113); Expect(189); EndOfStmt(); -#line 1373 "VBNET.ATG" +#line 1371 "VBNET.ATG" eventAccessorDeclaration = new EventRaiseRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3211,163 +3209,163 @@ out stmt); } void OverloadableOperator( -#line 1286 "VBNET.ATG" +#line 1284 "VBNET.ATG" out OverloadableOperatorType operatorType) { -#line 1287 "VBNET.ATG" +#line 1285 "VBNET.ATG" operatorType = OverloadableOperatorType.None; switch (la.kind) { case 31: { lexer.NextToken(); -#line 1289 "VBNET.ATG" +#line 1287 "VBNET.ATG" operatorType = OverloadableOperatorType.Add; break; } case 30: { lexer.NextToken(); -#line 1291 "VBNET.ATG" +#line 1289 "VBNET.ATG" operatorType = OverloadableOperatorType.Subtract; break; } case 34: { lexer.NextToken(); -#line 1293 "VBNET.ATG" +#line 1291 "VBNET.ATG" operatorType = OverloadableOperatorType.Multiply; break; } case 24: { lexer.NextToken(); -#line 1295 "VBNET.ATG" +#line 1293 "VBNET.ATG" operatorType = OverloadableOperatorType.Divide; break; } case 25: { lexer.NextToken(); -#line 1297 "VBNET.ATG" +#line 1295 "VBNET.ATG" operatorType = OverloadableOperatorType.DivideInteger; break; } case 23: { lexer.NextToken(); -#line 1299 "VBNET.ATG" +#line 1297 "VBNET.ATG" operatorType = OverloadableOperatorType.Concat; break; } case 150: { lexer.NextToken(); -#line 1301 "VBNET.ATG" +#line 1299 "VBNET.ATG" operatorType = OverloadableOperatorType.Like; break; } case 154: { lexer.NextToken(); -#line 1303 "VBNET.ATG" +#line 1301 "VBNET.ATG" operatorType = OverloadableOperatorType.Modulus; break; } case 60: { lexer.NextToken(); -#line 1305 "VBNET.ATG" +#line 1303 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseAnd; break; } case 175: { lexer.NextToken(); -#line 1307 "VBNET.ATG" +#line 1305 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseOr; break; } case 236: { lexer.NextToken(); -#line 1309 "VBNET.ATG" +#line 1307 "VBNET.ATG" operatorType = OverloadableOperatorType.ExclusiveOr; break; } case 32: { lexer.NextToken(); -#line 1311 "VBNET.ATG" +#line 1309 "VBNET.ATG" operatorType = OverloadableOperatorType.Power; break; } case 44: { lexer.NextToken(); -#line 1313 "VBNET.ATG" +#line 1311 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftLeft; break; } case 45: { lexer.NextToken(); -#line 1315 "VBNET.ATG" +#line 1313 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftRight; break; } case 20: { lexer.NextToken(); -#line 1317 "VBNET.ATG" +#line 1315 "VBNET.ATG" operatorType = OverloadableOperatorType.Equality; break; } case 41: { lexer.NextToken(); -#line 1319 "VBNET.ATG" +#line 1317 "VBNET.ATG" operatorType = OverloadableOperatorType.InEquality; break; } case 40: { lexer.NextToken(); -#line 1321 "VBNET.ATG" +#line 1319 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThan; break; } case 43: { lexer.NextToken(); -#line 1323 "VBNET.ATG" +#line 1321 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThanOrEqual; break; } case 39: { lexer.NextToken(); -#line 1325 "VBNET.ATG" +#line 1323 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThan; break; } case 42: { lexer.NextToken(); -#line 1327 "VBNET.ATG" +#line 1325 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThanOrEqual; break; } case 94: { lexer.NextToken(); -#line 1329 "VBNET.ATG" +#line 1327 "VBNET.ATG" operatorType = OverloadableOperatorType.CType; break; } case 2: case 58: case 62: case 64: case 65: case 66: case 67: case 70: case 87: case 98: case 104: case 107: case 116: case 121: case 126: case 133: case 139: case 143: case 146: case 147: case 170: case 176: case 178: case 184: case 203: case 212: case 213: case 223: case 224: case 230: { Identifier(); -#line 1333 "VBNET.ATG" +#line 1331 "VBNET.ATG" string opName = t.val; if (string.Equals(opName, "istrue", StringComparison.InvariantCultureIgnoreCase)) { operatorType = OverloadableOperatorType.IsTrue; @@ -3384,10 +3382,10 @@ out OverloadableOperatorType operatorType) { } void FormalParameter( -#line 2944 "VBNET.ATG" +#line 2942 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2946 "VBNET.ATG" +#line 2944 "VBNET.ATG" AttributeSection section; List attributes = new List(); TypeReference type = null; @@ -3399,36 +3397,36 @@ out ParameterDeclarationExpression p) { while (la.kind == 40) { AttributeSection( -#line 2956 "VBNET.ATG" +#line 2954 "VBNET.ATG" out section); -#line 2956 "VBNET.ATG" +#line 2954 "VBNET.ATG" attributes.Add(section); } while (StartOf(29)) { ParameterModifier( -#line 2957 "VBNET.ATG" +#line 2955 "VBNET.ATG" mod); } Identifier(); -#line 2958 "VBNET.ATG" +#line 2956 "VBNET.ATG" string parameterName = t.val; if ( -#line 2959 "VBNET.ATG" +#line 2957 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2959 "VBNET.ATG" +#line 2957 "VBNET.ATG" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2960 "VBNET.ATG" +#line 2958 "VBNET.ATG" out type); } -#line 2962 "VBNET.ATG" +#line 2960 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -3442,11 +3440,11 @@ out type); if (la.kind == 20) { lexer.NextToken(); Expr( -#line 2972 "VBNET.ATG" +#line 2970 "VBNET.ATG" out expr); } -#line 2974 "VBNET.ATG" +#line 2972 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); p.Attributes = attributes; @@ -3456,67 +3454,67 @@ out expr); } void GetAccessorDecl( -#line 1407 "VBNET.ATG" +#line 1405 "VBNET.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1408 "VBNET.ATG" +#line 1406 "VBNET.ATG" Statement stmt = null; Modifiers m; PropertyAccessorAccessModifier( -#line 1410 "VBNET.ATG" +#line 1408 "VBNET.ATG" out m); Expect(128); -#line 1412 "VBNET.ATG" +#line 1410 "VBNET.ATG" Location startLocation = t.Location; Expect(1); Block( -#line 1414 "VBNET.ATG" +#line 1412 "VBNET.ATG" out stmt); -#line 1415 "VBNET.ATG" +#line 1413 "VBNET.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); Expect(113); Expect(128); -#line 1417 "VBNET.ATG" +#line 1415 "VBNET.ATG" getBlock.Modifier = m; -#line 1418 "VBNET.ATG" +#line 1416 "VBNET.ATG" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; EndOfStmt(); } void SetAccessorDecl( -#line 1423 "VBNET.ATG" +#line 1421 "VBNET.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1425 "VBNET.ATG" +#line 1423 "VBNET.ATG" Statement stmt = null; List p = new List(); Modifiers m; PropertyAccessorAccessModifier( -#line 1430 "VBNET.ATG" +#line 1428 "VBNET.ATG" out m); Expect(198); -#line 1432 "VBNET.ATG" +#line 1430 "VBNET.ATG" Location startLocation = t.Location; if (la.kind == 37) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 1433 "VBNET.ATG" +#line 1431 "VBNET.ATG" p); } Expect(38); } Expect(1); Block( -#line 1435 "VBNET.ATG" +#line 1433 "VBNET.ATG" out stmt); -#line 1437 "VBNET.ATG" +#line 1435 "VBNET.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); setBlock.Modifier = m; setBlock.Parameters = p; @@ -3524,116 +3522,116 @@ out stmt); Expect(113); Expect(198); -#line 1442 "VBNET.ATG" +#line 1440 "VBNET.ATG" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; EndOfStmt(); } void PropertyAccessorAccessModifier( -#line 3715 "VBNET.ATG" +#line 3713 "VBNET.ATG" out Modifiers m) { -#line 3716 "VBNET.ATG" +#line 3714 "VBNET.ATG" m = Modifiers.None; while (StartOf(30)) { if (la.kind == 188) { lexer.NextToken(); -#line 3718 "VBNET.ATG" +#line 3716 "VBNET.ATG" m |= Modifiers.Public; } else if (la.kind == 187) { lexer.NextToken(); -#line 3719 "VBNET.ATG" +#line 3717 "VBNET.ATG" m |= Modifiers.Protected; } else if (la.kind == 125) { lexer.NextToken(); -#line 3720 "VBNET.ATG" +#line 3718 "VBNET.ATG" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 3721 "VBNET.ATG" +#line 3719 "VBNET.ATG" m |= Modifiers.Private; } } } void ArrayInitializationModifier( -#line 1540 "VBNET.ATG" +#line 1538 "VBNET.ATG" out List arrayModifiers) { -#line 1542 "VBNET.ATG" +#line 1540 "VBNET.ATG" arrayModifiers = null; Expect(37); InitializationRankList( -#line 1544 "VBNET.ATG" +#line 1542 "VBNET.ATG" out arrayModifiers); Expect(38); } void ArrayNameModifier( -#line 2771 "VBNET.ATG" +#line 2769 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2773 "VBNET.ATG" +#line 2771 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 2775 "VBNET.ATG" +#line 2773 "VBNET.ATG" out arrayModifiers); } void InitializationRankList( -#line 1548 "VBNET.ATG" +#line 1546 "VBNET.ATG" out List rank) { -#line 1550 "VBNET.ATG" +#line 1548 "VBNET.ATG" rank = new List(); Expression expr = null; Expr( -#line 1553 "VBNET.ATG" +#line 1551 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 1554 "VBNET.ATG" +#line 1552 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1555 "VBNET.ATG" +#line 1553 "VBNET.ATG" out expr); } -#line 1557 "VBNET.ATG" +#line 1555 "VBNET.ATG" if (expr != null) { rank.Add(expr); } while (la.kind == 22) { lexer.NextToken(); Expr( -#line 1559 "VBNET.ATG" +#line 1557 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 1560 "VBNET.ATG" +#line 1558 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1561 "VBNET.ATG" +#line 1559 "VBNET.ATG" out expr); } -#line 1563 "VBNET.ATG" +#line 1561 "VBNET.ATG" if (expr != null) { rank.Add(expr); } } } void CollectionInitializer( -#line 1568 "VBNET.ATG" +#line 1566 "VBNET.ATG" out CollectionInitializerExpression outExpr) { -#line 1570 "VBNET.ATG" +#line 1568 "VBNET.ATG" Expression expr = null; CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Location startLocation = la.Location; @@ -3641,27 +3639,27 @@ out CollectionInitializerExpression outExpr) { Expect(35); if (StartOf(24)) { Expr( -#line 1576 "VBNET.ATG" +#line 1574 "VBNET.ATG" out expr); -#line 1578 "VBNET.ATG" +#line 1576 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1581 "VBNET.ATG" +#line 1579 "VBNET.ATG" NotFinalComma()) { Expect(22); Expr( -#line 1581 "VBNET.ATG" +#line 1579 "VBNET.ATG" out expr); -#line 1582 "VBNET.ATG" +#line 1580 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(36); -#line 1587 "VBNET.ATG" +#line 1585 "VBNET.ATG" outExpr = initializer; outExpr.StartLocation = startLocation; outExpr.EndLocation = t.EndLocation; @@ -3669,10 +3667,10 @@ out expr); } void EventMemberSpecifier( -#line 1660 "VBNET.ATG" +#line 1658 "VBNET.ATG" out string name) { -#line 1661 "VBNET.ATG" +#line 1659 "VBNET.ATG" string eventName; if (StartOf(4)) { Identifier(); @@ -3682,182 +3680,182 @@ out string name) { lexer.NextToken(); } else SynErr(275); -#line 1664 "VBNET.ATG" +#line 1662 "VBNET.ATG" name = t.val; Expect(26); IdentifierOrKeyword( -#line 1666 "VBNET.ATG" +#line 1664 "VBNET.ATG" out eventName); -#line 1667 "VBNET.ATG" +#line 1665 "VBNET.ATG" name = name + "." + eventName; } void IdentifierOrKeyword( -#line 3648 "VBNET.ATG" +#line 3646 "VBNET.ATG" out string name) { lexer.NextToken(); -#line 3650 "VBNET.ATG" +#line 3648 "VBNET.ATG" name = t.val; } void QueryExpr( -#line 2292 "VBNET.ATG" +#line 2290 "VBNET.ATG" out Expression expr) { -#line 2294 "VBNET.ATG" +#line 2292 "VBNET.ATG" QueryExpressionVB qexpr = new QueryExpressionVB(); qexpr.StartLocation = la.Location; expr = qexpr; FromOrAggregateQueryOperator( -#line 2298 "VBNET.ATG" +#line 2296 "VBNET.ATG" qexpr.Clauses); while (StartOf(31)) { QueryOperator( -#line 2299 "VBNET.ATG" +#line 2297 "VBNET.ATG" qexpr.Clauses); } -#line 2301 "VBNET.ATG" +#line 2299 "VBNET.ATG" qexpr.EndLocation = t.EndLocation; } void LambdaExpr( -#line 2212 "VBNET.ATG" +#line 2210 "VBNET.ATG" out Expression expr) { -#line 2214 "VBNET.ATG" +#line 2212 "VBNET.ATG" LambdaExpression lambda = null; if (la.kind == 210) { SubLambdaExpression( -#line 2216 "VBNET.ATG" +#line 2214 "VBNET.ATG" out lambda); } else if (la.kind == 127) { FunctionLambdaExpression( -#line 2217 "VBNET.ATG" +#line 2215 "VBNET.ATG" out lambda); } else SynErr(276); -#line 2218 "VBNET.ATG" +#line 2216 "VBNET.ATG" expr = lambda; } void DisjunctionExpr( -#line 1969 "VBNET.ATG" +#line 1967 "VBNET.ATG" out Expression outExpr) { -#line 1971 "VBNET.ATG" +#line 1969 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; ConjunctionExpr( -#line 1975 "VBNET.ATG" +#line 1973 "VBNET.ATG" out outExpr); while (la.kind == 175 || la.kind == 177 || la.kind == 236) { if (la.kind == 175) { lexer.NextToken(); -#line 1978 "VBNET.ATG" +#line 1976 "VBNET.ATG" op = BinaryOperatorType.BitwiseOr; } else if (la.kind == 177) { lexer.NextToken(); -#line 1979 "VBNET.ATG" +#line 1977 "VBNET.ATG" op = BinaryOperatorType.LogicalOr; } else { lexer.NextToken(); -#line 1980 "VBNET.ATG" +#line 1978 "VBNET.ATG" op = BinaryOperatorType.ExclusiveOr; } ConjunctionExpr( -#line 1982 "VBNET.ATG" +#line 1980 "VBNET.ATG" out expr); -#line 1982 "VBNET.ATG" +#line 1980 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void AssignmentOperator( -#line 1687 "VBNET.ATG" +#line 1685 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1688 "VBNET.ATG" +#line 1686 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 20: { lexer.NextToken(); -#line 1689 "VBNET.ATG" +#line 1687 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 54: { lexer.NextToken(); -#line 1690 "VBNET.ATG" +#line 1688 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 46: { lexer.NextToken(); -#line 1691 "VBNET.ATG" +#line 1689 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 48: { lexer.NextToken(); -#line 1692 "VBNET.ATG" +#line 1690 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 49: { lexer.NextToken(); -#line 1693 "VBNET.ATG" +#line 1691 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 50: { lexer.NextToken(); -#line 1694 "VBNET.ATG" +#line 1692 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 51: { lexer.NextToken(); -#line 1695 "VBNET.ATG" +#line 1693 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 47: { lexer.NextToken(); -#line 1696 "VBNET.ATG" +#line 1694 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 52: { lexer.NextToken(); -#line 1697 "VBNET.ATG" +#line 1695 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 53: { lexer.NextToken(); -#line 1698 "VBNET.ATG" +#line 1696 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } @@ -3866,13 +3864,13 @@ out AssignmentOperatorType op) { } void SimpleExpr( -#line 1702 "VBNET.ATG" +#line 1700 "VBNET.ATG" out Expression pexpr) { -#line 1703 "VBNET.ATG" +#line 1701 "VBNET.ATG" string name; Location startLocation = la.Location; SimpleNonInvocationExpression( -#line 1706 "VBNET.ATG" +#line 1704 "VBNET.ATG" out pexpr); while (StartOf(32)) { if (la.kind == 26) { @@ -3880,73 +3878,73 @@ out pexpr); if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1709 "VBNET.ATG" +#line 1707 "VBNET.ATG" out name); Expect(11); -#line 1710 "VBNET.ATG" +#line 1708 "VBNET.ATG" pexpr = new XmlMemberAccessExpression(pexpr, XmlAxisType.Element, name, true); } else if (StartOf(33)) { IdentifierOrKeyword( -#line 1711 "VBNET.ATG" +#line 1709 "VBNET.ATG" out name); -#line 1712 "VBNET.ATG" +#line 1710 "VBNET.ATG" pexpr = new MemberReferenceExpression(pexpr, name); } else SynErr(278); if ( -#line 1714 "VBNET.ATG" +#line 1712 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); TypeArgumentList( -#line 1715 "VBNET.ATG" +#line 1713 "VBNET.ATG" ((MemberReferenceExpression)pexpr).TypeArguments); Expect(38); } } else if (la.kind == 29) { lexer.NextToken(); IdentifierOrKeyword( -#line 1717 "VBNET.ATG" +#line 1715 "VBNET.ATG" out name); -#line 1717 "VBNET.ATG" +#line 1715 "VBNET.ATG" pexpr = new BinaryOperatorExpression(pexpr, BinaryOperatorType.DictionaryAccess, new PrimitiveExpression(name, name) { StartLocation = t.Location, EndLocation = t.EndLocation }); } else if (la.kind == 27 || la.kind == 28) { -#line 1718 "VBNET.ATG" +#line 1716 "VBNET.ATG" XmlAxisType type = XmlAxisType.Attribute; bool isXmlName = false; if (la.kind == 28) { lexer.NextToken(); } else if (la.kind == 27) { lexer.NextToken(); -#line 1719 "VBNET.ATG" +#line 1717 "VBNET.ATG" type = XmlAxisType.Descendents; } else SynErr(279); if (la.kind == 10) { lexer.NextToken(); -#line 1719 "VBNET.ATG" +#line 1717 "VBNET.ATG" isXmlName = true; } IdentifierOrKeyword( -#line 1719 "VBNET.ATG" +#line 1717 "VBNET.ATG" out name); if (la.kind == 11) { lexer.NextToken(); } -#line 1720 "VBNET.ATG" +#line 1718 "VBNET.ATG" pexpr = new XmlMemberAccessExpression(pexpr, type, name, isXmlName); } else { InvocationExpression( -#line 1721 "VBNET.ATG" +#line 1719 "VBNET.ATG" ref pexpr); } } -#line 1725 "VBNET.ATG" +#line 1723 "VBNET.ATG" if (pexpr != null) { pexpr.StartLocation = startLocation; pexpr.EndLocation = t.EndLocation; @@ -3955,10 +3953,10 @@ ref pexpr); } void SimpleNonInvocationExpression( -#line 1732 "VBNET.ATG" +#line 1730 "VBNET.ATG" out Expression pexpr) { -#line 1734 "VBNET.ATG" +#line 1732 "VBNET.ATG" Expression expr; CollectionInitializerExpression cie; TypeReference type = null; @@ -3971,98 +3969,98 @@ out Expression pexpr) { case 3: { lexer.NextToken(); -#line 1744 "VBNET.ATG" +#line 1742 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 4: { lexer.NextToken(); -#line 1745 "VBNET.ATG" +#line 1743 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 7: { lexer.NextToken(); -#line 1746 "VBNET.ATG" +#line 1744 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 6: { lexer.NextToken(); -#line 1747 "VBNET.ATG" +#line 1745 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 5: { lexer.NextToken(); -#line 1748 "VBNET.ATG" +#line 1746 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 9: { lexer.NextToken(); -#line 1749 "VBNET.ATG" +#line 1747 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 8: { lexer.NextToken(); -#line 1750 "VBNET.ATG" +#line 1748 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 217: { lexer.NextToken(); -#line 1752 "VBNET.ATG" +#line 1750 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); break; } case 122: { lexer.NextToken(); -#line 1753 "VBNET.ATG" +#line 1751 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); break; } case 165: { lexer.NextToken(); -#line 1754 "VBNET.ATG" +#line 1752 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); break; } case 37: { lexer.NextToken(); Expr( -#line 1755 "VBNET.ATG" +#line 1753 "VBNET.ATG" out expr); Expect(38); -#line 1755 "VBNET.ATG" +#line 1753 "VBNET.ATG" pexpr = new ParenthesizedExpression(expr); break; } case 2: case 58: case 62: case 64: case 65: case 66: case 67: case 70: case 87: case 98: case 104: case 107: case 116: case 121: case 126: case 133: case 139: case 143: case 146: case 147: case 170: case 176: case 178: case 184: case 203: case 212: case 213: case 223: case 224: case 230: { Identifier(); -#line 1757 "VBNET.ATG" +#line 1755 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); pexpr.StartLocation = t.Location; pexpr.EndLocation = t.EndLocation; if ( -#line 1760 "VBNET.ATG" +#line 1758 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); TypeArgumentList( -#line 1761 "VBNET.ATG" +#line 1759 "VBNET.ATG" ((IdentifierExpression)pexpr).TypeArguments); Expect(38); } @@ -4070,51 +4068,51 @@ la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { } case 68: case 71: case 82: case 99: case 100: case 109: case 141: case 151: case 168: case 196: case 201: case 202: case 208: case 221: case 222: case 225: { -#line 1763 "VBNET.ATG" +#line 1761 "VBNET.ATG" string val = String.Empty; if (StartOf(12)) { PrimitiveTypeName( -#line 1764 "VBNET.ATG" +#line 1762 "VBNET.ATG" out val); } else if (la.kind == 168) { lexer.NextToken(); -#line 1764 "VBNET.ATG" +#line 1762 "VBNET.ATG" val = "System.Object"; } else SynErr(280); -#line 1765 "VBNET.ATG" +#line 1763 "VBNET.ATG" pexpr = new TypeReferenceExpression(new TypeReference(val, true)); break; } case 153: { lexer.NextToken(); -#line 1766 "VBNET.ATG" +#line 1764 "VBNET.ATG" pexpr = new ThisReferenceExpression(); break; } case 158: case 159: { -#line 1767 "VBNET.ATG" +#line 1765 "VBNET.ATG" Expression retExpr = null; if (la.kind == 158) { lexer.NextToken(); -#line 1768 "VBNET.ATG" +#line 1766 "VBNET.ATG" retExpr = new BaseReferenceExpression() { StartLocation = t.Location, EndLocation = t.EndLocation }; } else if (la.kind == 159) { lexer.NextToken(); -#line 1769 "VBNET.ATG" +#line 1767 "VBNET.ATG" retExpr = new ClassReferenceExpression() { StartLocation = t.Location, EndLocation = t.EndLocation }; } else SynErr(281); Expect(26); IdentifierOrKeyword( -#line 1771 "VBNET.ATG" +#line 1769 "VBNET.ATG" out name); -#line 1771 "VBNET.ATG" +#line 1769 "VBNET.ATG" pexpr = new MemberReferenceExpression(retExpr, name); break; } @@ -4123,86 +4121,86 @@ out name); Expect(26); Identifier(); -#line 1773 "VBNET.ATG" +#line 1771 "VBNET.ATG" type = new TypeReference(t.val ?? ""); -#line 1775 "VBNET.ATG" +#line 1773 "VBNET.ATG" type.IsGlobal = true; -#line 1776 "VBNET.ATG" +#line 1774 "VBNET.ATG" pexpr = new TypeReferenceExpression(type); break; } case 162: { ObjectCreateExpression( -#line 1777 "VBNET.ATG" +#line 1775 "VBNET.ATG" out expr); -#line 1777 "VBNET.ATG" +#line 1775 "VBNET.ATG" pexpr = expr; break; } case 35: { CollectionInitializer( -#line 1778 "VBNET.ATG" +#line 1776 "VBNET.ATG" out cie); -#line 1778 "VBNET.ATG" +#line 1776 "VBNET.ATG" pexpr = cie; break; } case 94: case 106: case 219: { -#line 1780 "VBNET.ATG" +#line 1778 "VBNET.ATG" CastType castType = CastType.Cast; if (la.kind == 106) { lexer.NextToken(); } else if (la.kind == 94) { lexer.NextToken(); -#line 1782 "VBNET.ATG" +#line 1780 "VBNET.ATG" castType = CastType.Conversion; } else if (la.kind == 219) { lexer.NextToken(); -#line 1783 "VBNET.ATG" +#line 1781 "VBNET.ATG" castType = CastType.TryCast; } else SynErr(282); Expect(37); Expr( -#line 1785 "VBNET.ATG" +#line 1783 "VBNET.ATG" out expr); Expect(22); TypeName( -#line 1785 "VBNET.ATG" +#line 1783 "VBNET.ATG" out type); Expect(38); -#line 1786 "VBNET.ATG" +#line 1784 "VBNET.ATG" pexpr = new CastExpression(type, expr, castType); break; } case 76: case 77: case 78: case 79: case 80: case 81: case 83: case 85: case 86: case 90: case 91: case 92: case 93: case 95: case 96: case 97: { CastTarget( -#line 1787 "VBNET.ATG" +#line 1785 "VBNET.ATG" out type); Expect(37); Expr( -#line 1787 "VBNET.ATG" +#line 1785 "VBNET.ATG" out expr); Expect(38); -#line 1787 "VBNET.ATG" +#line 1785 "VBNET.ATG" pexpr = new CastExpression(type, expr, CastType.PrimitiveConversion); break; } case 57: { lexer.NextToken(); Expr( -#line 1788 "VBNET.ATG" +#line 1786 "VBNET.ATG" out expr); -#line 1788 "VBNET.ATG" +#line 1786 "VBNET.ATG" pexpr = new AddressOfExpression(expr); break; } @@ -4210,37 +4208,37 @@ out expr); lexer.NextToken(); Expect(37); GetTypeTypeName( -#line 1789 "VBNET.ATG" +#line 1787 "VBNET.ATG" out type); Expect(38); -#line 1789 "VBNET.ATG" +#line 1787 "VBNET.ATG" pexpr = new TypeOfExpression(type); break; } case 220: { lexer.NextToken(); SimpleExpr( -#line 1790 "VBNET.ATG" +#line 1788 "VBNET.ATG" out expr); Expect(144); TypeName( -#line 1790 "VBNET.ATG" +#line 1788 "VBNET.ATG" out type); -#line 1790 "VBNET.ATG" +#line 1788 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); break; } case 135: { ConditionalExpression( -#line 1791 "VBNET.ATG" +#line 1789 "VBNET.ATG" out pexpr); break; } case 10: case 16: case 17: case 18: case 19: { XmlLiteralExpression( -#line 1792 "VBNET.ATG" +#line 1790 "VBNET.ATG" out pexpr); break; } @@ -4251,62 +4249,62 @@ out pexpr); if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1798 "VBNET.ATG" +#line 1796 "VBNET.ATG" out name); Expect(11); -#line 1799 "VBNET.ATG" +#line 1797 "VBNET.ATG" pexpr = new XmlMemberAccessExpression(null, XmlAxisType.Element, name, true); } else if (StartOf(33)) { IdentifierOrKeyword( -#line 1800 "VBNET.ATG" +#line 1798 "VBNET.ATG" out name); -#line 1801 "VBNET.ATG" +#line 1799 "VBNET.ATG" pexpr = new MemberReferenceExpression(null, name); } else SynErr(283); } else if (la.kind == 29) { lexer.NextToken(); IdentifierOrKeyword( -#line 1803 "VBNET.ATG" +#line 1801 "VBNET.ATG" out name); -#line 1803 "VBNET.ATG" +#line 1801 "VBNET.ATG" pexpr = new BinaryOperatorExpression(null, BinaryOperatorType.DictionaryAccess, new PrimitiveExpression(name, name) { StartLocation = t.Location, EndLocation = t.EndLocation }); } else { -#line 1804 "VBNET.ATG" +#line 1802 "VBNET.ATG" XmlAxisType axisType = XmlAxisType.Element; bool isXmlIdentifier = false; if (la.kind == 27) { lexer.NextToken(); -#line 1805 "VBNET.ATG" +#line 1803 "VBNET.ATG" axisType = XmlAxisType.Descendents; } else if (la.kind == 28) { lexer.NextToken(); -#line 1805 "VBNET.ATG" +#line 1803 "VBNET.ATG" axisType = XmlAxisType.Attribute; } else SynErr(284); if (la.kind == 10) { lexer.NextToken(); -#line 1806 "VBNET.ATG" +#line 1804 "VBNET.ATG" isXmlIdentifier = true; } IdentifierOrKeyword( -#line 1806 "VBNET.ATG" +#line 1804 "VBNET.ATG" out name); if (la.kind == 11) { lexer.NextToken(); } -#line 1807 "VBNET.ATG" +#line 1805 "VBNET.ATG" pexpr = new XmlMemberAccessExpression(null, axisType, name, isXmlIdentifier); } } else SynErr(285); -#line 1812 "VBNET.ATG" +#line 1810 "VBNET.ATG" if (pexpr != null) { pexpr.StartLocation = startLocation; pexpr.EndLocation = t.EndLocation; @@ -4315,161 +4313,161 @@ out name); } void TypeArgumentList( -#line 2807 "VBNET.ATG" +#line 2805 "VBNET.ATG" List typeArguments) { -#line 2809 "VBNET.ATG" +#line 2807 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2811 "VBNET.ATG" +#line 2809 "VBNET.ATG" out typeref); -#line 2811 "VBNET.ATG" +#line 2809 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 2814 "VBNET.ATG" +#line 2812 "VBNET.ATG" out typeref); -#line 2814 "VBNET.ATG" +#line 2812 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void InvocationExpression( -#line 1933 "VBNET.ATG" +#line 1931 "VBNET.ATG" ref Expression pexpr) { -#line 1934 "VBNET.ATG" +#line 1932 "VBNET.ATG" List parameters = null; Expect(37); -#line 1936 "VBNET.ATG" +#line 1934 "VBNET.ATG" Location start = t.Location; ArgumentList( -#line 1937 "VBNET.ATG" +#line 1935 "VBNET.ATG" out parameters); Expect(38); -#line 1940 "VBNET.ATG" +#line 1938 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); -#line 1942 "VBNET.ATG" +#line 1940 "VBNET.ATG" pexpr.StartLocation = start; pexpr.EndLocation = t.Location; } void PrimitiveTypeName( -#line 3655 "VBNET.ATG" +#line 3653 "VBNET.ATG" out string type) { -#line 3656 "VBNET.ATG" +#line 3654 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 68: { lexer.NextToken(); -#line 3657 "VBNET.ATG" +#line 3655 "VBNET.ATG" type = "System.Boolean"; break; } case 99: { lexer.NextToken(); -#line 3658 "VBNET.ATG" +#line 3656 "VBNET.ATG" type = "System.DateTime"; break; } case 82: { lexer.NextToken(); -#line 3659 "VBNET.ATG" +#line 3657 "VBNET.ATG" type = "System.Char"; break; } case 208: { lexer.NextToken(); -#line 3660 "VBNET.ATG" +#line 3658 "VBNET.ATG" type = "System.String"; break; } case 100: { lexer.NextToken(); -#line 3661 "VBNET.ATG" +#line 3659 "VBNET.ATG" type = "System.Decimal"; break; } case 71: { lexer.NextToken(); -#line 3662 "VBNET.ATG" +#line 3660 "VBNET.ATG" type = "System.Byte"; break; } case 201: { lexer.NextToken(); -#line 3663 "VBNET.ATG" +#line 3661 "VBNET.ATG" type = "System.Int16"; break; } case 141: { lexer.NextToken(); -#line 3664 "VBNET.ATG" +#line 3662 "VBNET.ATG" type = "System.Int32"; break; } case 151: { lexer.NextToken(); -#line 3665 "VBNET.ATG" +#line 3663 "VBNET.ATG" type = "System.Int64"; break; } case 202: { lexer.NextToken(); -#line 3666 "VBNET.ATG" +#line 3664 "VBNET.ATG" type = "System.Single"; break; } case 109: { lexer.NextToken(); -#line 3667 "VBNET.ATG" +#line 3665 "VBNET.ATG" type = "System.Double"; break; } case 221: { lexer.NextToken(); -#line 3668 "VBNET.ATG" +#line 3666 "VBNET.ATG" type = "System.UInt32"; break; } case 222: { lexer.NextToken(); -#line 3669 "VBNET.ATG" +#line 3667 "VBNET.ATG" type = "System.UInt64"; break; } case 225: { lexer.NextToken(); -#line 3670 "VBNET.ATG" +#line 3668 "VBNET.ATG" type = "System.UInt16"; break; } case 196: { lexer.NextToken(); -#line 3671 "VBNET.ATG" +#line 3669 "VBNET.ATG" type = "System.SByte"; break; } @@ -4478,122 +4476,122 @@ out string type) { } void CastTarget( -#line 1947 "VBNET.ATG" +#line 1945 "VBNET.ATG" out TypeReference type) { -#line 1949 "VBNET.ATG" +#line 1947 "VBNET.ATG" type = null; switch (la.kind) { case 76: { lexer.NextToken(); -#line 1951 "VBNET.ATG" +#line 1949 "VBNET.ATG" type = new TypeReference("System.Boolean", true); break; } case 77: { lexer.NextToken(); -#line 1952 "VBNET.ATG" +#line 1950 "VBNET.ATG" type = new TypeReference("System.Byte", true); break; } case 90: { lexer.NextToken(); -#line 1953 "VBNET.ATG" +#line 1951 "VBNET.ATG" type = new TypeReference("System.SByte", true); break; } case 78: { lexer.NextToken(); -#line 1954 "VBNET.ATG" +#line 1952 "VBNET.ATG" type = new TypeReference("System.Char", true); break; } case 79: { lexer.NextToken(); -#line 1955 "VBNET.ATG" +#line 1953 "VBNET.ATG" type = new TypeReference("System.DateTime", true); break; } case 81: { lexer.NextToken(); -#line 1956 "VBNET.ATG" +#line 1954 "VBNET.ATG" type = new TypeReference("System.Decimal", true); break; } case 80: { lexer.NextToken(); -#line 1957 "VBNET.ATG" +#line 1955 "VBNET.ATG" type = new TypeReference("System.Double", true); break; } case 91: { lexer.NextToken(); -#line 1958 "VBNET.ATG" +#line 1956 "VBNET.ATG" type = new TypeReference("System.Int16", true); break; } case 83: { lexer.NextToken(); -#line 1959 "VBNET.ATG" +#line 1957 "VBNET.ATG" type = new TypeReference("System.Int32", true); break; } case 85: { lexer.NextToken(); -#line 1960 "VBNET.ATG" +#line 1958 "VBNET.ATG" type = new TypeReference("System.Int64", true); break; } case 97: { lexer.NextToken(); -#line 1961 "VBNET.ATG" +#line 1959 "VBNET.ATG" type = new TypeReference("System.UInt16", true); break; } case 95: { lexer.NextToken(); -#line 1962 "VBNET.ATG" +#line 1960 "VBNET.ATG" type = new TypeReference("System.UInt32", true); break; } case 96: { lexer.NextToken(); -#line 1963 "VBNET.ATG" +#line 1961 "VBNET.ATG" type = new TypeReference("System.UInt64", true); break; } case 86: { lexer.NextToken(); -#line 1964 "VBNET.ATG" +#line 1962 "VBNET.ATG" type = new TypeReference("System.Object", true); break; } case 92: { lexer.NextToken(); -#line 1965 "VBNET.ATG" +#line 1963 "VBNET.ATG" type = new TypeReference("System.Single", true); break; } case 93: { lexer.NextToken(); -#line 1966 "VBNET.ATG" +#line 1964 "VBNET.ATG" type = new TypeReference("System.String", true); break; } @@ -4602,19 +4600,19 @@ out TypeReference type) { } void GetTypeTypeName( -#line 2706 "VBNET.ATG" +#line 2704 "VBNET.ATG" out TypeReference typeref) { -#line 2707 "VBNET.ATG" +#line 2705 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2709 "VBNET.ATG" +#line 2707 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 2710 "VBNET.ATG" +#line 2708 "VBNET.ATG" out rank); -#line 2711 "VBNET.ATG" +#line 2709 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4622,10 +4620,10 @@ out rank); } void ConditionalExpression( -#line 1899 "VBNET.ATG" +#line 1897 "VBNET.ATG" out Expression expr) { -#line 1901 "VBNET.ATG" +#line 1899 "VBNET.ATG" ConditionalExpression conditionalExpression = new ConditionalExpression(); BinaryOperatorExpression binaryOperatorExpression = new BinaryOperatorExpression(); conditionalExpression.StartLocation = binaryOperatorExpression.StartLocation = la.Location; @@ -4637,21 +4635,21 @@ out Expression expr) { Expect(135); Expect(37); Expr( -#line 1910 "VBNET.ATG" +#line 1908 "VBNET.ATG" out condition); Expect(22); Expr( -#line 1910 "VBNET.ATG" +#line 1908 "VBNET.ATG" out trueExpr); if (la.kind == 22) { lexer.NextToken(); Expr( -#line 1910 "VBNET.ATG" +#line 1908 "VBNET.ATG" out falseExpr); } Expect(38); -#line 1912 "VBNET.ATG" +#line 1910 "VBNET.ATG" if(falseExpr != null) { conditionalExpression.Condition = condition; @@ -4674,50 +4672,50 @@ out falseExpr); } void XmlLiteralExpression( -#line 1819 "VBNET.ATG" +#line 1817 "VBNET.ATG" out Expression pexpr) { -#line 1821 "VBNET.ATG" +#line 1819 "VBNET.ATG" List exprs = new List(); XmlExpression currentExpression = null; if (StartOf(36)) { XmlContentExpression( -#line 1826 "VBNET.ATG" +#line 1824 "VBNET.ATG" exprs); while (StartOf(36)) { XmlContentExpression( -#line 1826 "VBNET.ATG" +#line 1824 "VBNET.ATG" exprs); } if (la.kind == 10) { XmlElement( -#line 1826 "VBNET.ATG" +#line 1824 "VBNET.ATG" out currentExpression); -#line 1826 "VBNET.ATG" +#line 1824 "VBNET.ATG" exprs.Add(currentExpression); while (StartOf(36)) { XmlContentExpression( -#line 1826 "VBNET.ATG" +#line 1824 "VBNET.ATG" exprs); } } } else if (la.kind == 10) { XmlElement( -#line 1828 "VBNET.ATG" +#line 1826 "VBNET.ATG" out currentExpression); -#line 1828 "VBNET.ATG" +#line 1826 "VBNET.ATG" exprs.Add(currentExpression); while (StartOf(36)) { XmlContentExpression( -#line 1828 "VBNET.ATG" +#line 1826 "VBNET.ATG" exprs); } } else SynErr(288); -#line 1831 "VBNET.ATG" +#line 1829 "VBNET.ATG" if (exprs.Count > 1) { pexpr = new XmlDocumentExpression() { Expressions = exprs }; } else { @@ -4727,34 +4725,34 @@ exprs); } void XmlContentExpression( -#line 1839 "VBNET.ATG" +#line 1837 "VBNET.ATG" List exprs) { -#line 1840 "VBNET.ATG" +#line 1838 "VBNET.ATG" XmlContentExpression expr = null; if (la.kind == 16) { lexer.NextToken(); -#line 1842 "VBNET.ATG" +#line 1840 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.Text); } else if (la.kind == 18) { lexer.NextToken(); -#line 1843 "VBNET.ATG" +#line 1841 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.CData); } else if (la.kind == 17) { lexer.NextToken(); -#line 1844 "VBNET.ATG" +#line 1842 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.Comment); } else if (la.kind == 19) { lexer.NextToken(); -#line 1845 "VBNET.ATG" +#line 1843 "VBNET.ATG" expr = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); } else SynErr(289); -#line 1848 "VBNET.ATG" +#line 1846 "VBNET.ATG" expr.StartLocation = t.Location; expr.EndLocation = t.EndLocation; exprs.Add(expr); @@ -4762,54 +4760,54 @@ List exprs) { } void XmlElement( -#line 1874 "VBNET.ATG" +#line 1872 "VBNET.ATG" out XmlExpression expr) { -#line 1875 "VBNET.ATG" +#line 1873 "VBNET.ATG" XmlElementExpression el = new XmlElementExpression(); Expect(10); -#line 1878 "VBNET.ATG" +#line 1876 "VBNET.ATG" el.StartLocation = t.Location; if (la.kind == 12) { lexer.NextToken(); -#line 1879 "VBNET.ATG" +#line 1877 "VBNET.ATG" Expression innerExpression; Expr( -#line 1879 "VBNET.ATG" +#line 1877 "VBNET.ATG" out innerExpression); Expect(13); -#line 1880 "VBNET.ATG" +#line 1878 "VBNET.ATG" el.NameExpression = new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }; } else if (StartOf(4)) { Identifier(); -#line 1881 "VBNET.ATG" +#line 1879 "VBNET.ATG" el.XmlName = t.val; } else SynErr(290); while (StartOf(37)) { XmlAttribute( -#line 1881 "VBNET.ATG" +#line 1879 "VBNET.ATG" el.Attributes); } if (la.kind == 14) { lexer.NextToken(); -#line 1882 "VBNET.ATG" +#line 1880 "VBNET.ATG" el.EndLocation = t.EndLocation; } else if (la.kind == 11) { lexer.NextToken(); while (StartOf(38)) { -#line 1882 "VBNET.ATG" +#line 1880 "VBNET.ATG" XmlExpression child; XmlNestedContent( -#line 1882 "VBNET.ATG" +#line 1880 "VBNET.ATG" out child); -#line 1882 "VBNET.ATG" +#line 1880 "VBNET.ATG" el.Children.Add(child); } Expect(15); @@ -4818,73 +4816,73 @@ out child); } Expect(11); -#line 1882 "VBNET.ATG" +#line 1880 "VBNET.ATG" el.EndLocation = t.EndLocation; } else SynErr(291); -#line 1884 "VBNET.ATG" +#line 1882 "VBNET.ATG" expr = el; } void XmlNestedContent( -#line 1854 "VBNET.ATG" +#line 1852 "VBNET.ATG" out XmlExpression expr) { -#line 1855 "VBNET.ATG" +#line 1853 "VBNET.ATG" XmlExpression tmpExpr = null; Location start = la.Location; switch (la.kind) { case 16: { lexer.NextToken(); -#line 1858 "VBNET.ATG" +#line 1856 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.Text); break; } case 18: { lexer.NextToken(); -#line 1859 "VBNET.ATG" +#line 1857 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.CData); break; } case 17: { lexer.NextToken(); -#line 1860 "VBNET.ATG" +#line 1858 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.Comment); break; } case 19: { lexer.NextToken(); -#line 1861 "VBNET.ATG" +#line 1859 "VBNET.ATG" tmpExpr = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); break; } case 12: { lexer.NextToken(); -#line 1862 "VBNET.ATG" +#line 1860 "VBNET.ATG" Expression innerExpression; Expr( -#line 1862 "VBNET.ATG" +#line 1860 "VBNET.ATG" out innerExpression); Expect(13); -#line 1862 "VBNET.ATG" +#line 1860 "VBNET.ATG" tmpExpr = new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }; break; } case 10: { XmlElement( -#line 1863 "VBNET.ATG" +#line 1861 "VBNET.ATG" out tmpExpr); break; } default: SynErr(292); break; } -#line 1866 "VBNET.ATG" +#line 1864 "VBNET.ATG" if (tmpExpr.StartLocation.IsEmpty) tmpExpr.StartLocation = start; if (tmpExpr.EndLocation.IsEmpty) @@ -4894,401 +4892,401 @@ out tmpExpr); } void XmlAttribute( -#line 1887 "VBNET.ATG" +#line 1885 "VBNET.ATG" List attrs) { -#line 1888 "VBNET.ATG" +#line 1886 "VBNET.ATG" Location start = la.Location; if (StartOf(4)) { Identifier(); -#line 1890 "VBNET.ATG" +#line 1888 "VBNET.ATG" string name = t.val; Expect(20); -#line 1891 "VBNET.ATG" +#line 1889 "VBNET.ATG" string literalValue = null; Expression expressionValue = null; bool useDoubleQuotes = false; if (la.kind == 3) { lexer.NextToken(); -#line 1892 "VBNET.ATG" +#line 1890 "VBNET.ATG" literalValue = t.literalValue.ToString(); useDoubleQuotes = t.val[0] == '"'; } else if (la.kind == 12) { lexer.NextToken(); Expr( -#line 1892 "VBNET.ATG" +#line 1890 "VBNET.ATG" out expressionValue); Expect(13); } else SynErr(293); -#line 1893 "VBNET.ATG" +#line 1891 "VBNET.ATG" attrs.Add(new XmlAttributeExpression() { Name = name, ExpressionValue = expressionValue, LiteralValue = literalValue, UseDoubleQuotes = useDoubleQuotes, StartLocation = start, EndLocation = t.EndLocation }); } else if (la.kind == 12) { lexer.NextToken(); -#line 1895 "VBNET.ATG" +#line 1893 "VBNET.ATG" Expression innerExpression; Expr( -#line 1895 "VBNET.ATG" +#line 1893 "VBNET.ATG" out innerExpression); Expect(13); -#line 1896 "VBNET.ATG" +#line 1894 "VBNET.ATG" attrs.Add(new XmlEmbeddedExpression() { InlineVBExpression = innerExpression, StartLocation = start, EndLocation = t.EndLocation }); } else SynErr(294); } void ArgumentList( -#line 2635 "VBNET.ATG" +#line 2633 "VBNET.ATG" out List arguments) { -#line 2637 "VBNET.ATG" +#line 2635 "VBNET.ATG" arguments = new List(); Expression expr = null; if (StartOf(24)) { Argument( -#line 2640 "VBNET.ATG" +#line 2638 "VBNET.ATG" out expr); } while (la.kind == 22) { lexer.NextToken(); -#line 2641 "VBNET.ATG" +#line 2639 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; if (StartOf(24)) { Argument( -#line 2642 "VBNET.ATG" +#line 2640 "VBNET.ATG" out expr); } -#line 2643 "VBNET.ATG" +#line 2641 "VBNET.ATG" if (expr == null) expr = Expression.Null; } -#line 2645 "VBNET.ATG" +#line 2643 "VBNET.ATG" if (expr != null) arguments.Add(expr); } void ConjunctionExpr( -#line 1986 "VBNET.ATG" +#line 1984 "VBNET.ATG" out Expression outExpr) { -#line 1988 "VBNET.ATG" +#line 1986 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; NotExpr( -#line 1992 "VBNET.ATG" +#line 1990 "VBNET.ATG" out outExpr); while (la.kind == 60 || la.kind == 61) { if (la.kind == 60) { lexer.NextToken(); -#line 1995 "VBNET.ATG" +#line 1993 "VBNET.ATG" op = BinaryOperatorType.BitwiseAnd; } else { lexer.NextToken(); -#line 1996 "VBNET.ATG" +#line 1994 "VBNET.ATG" op = BinaryOperatorType.LogicalAnd; } NotExpr( -#line 1998 "VBNET.ATG" +#line 1996 "VBNET.ATG" out expr); -#line 1998 "VBNET.ATG" +#line 1996 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void NotExpr( -#line 2002 "VBNET.ATG" +#line 2000 "VBNET.ATG" out Expression outExpr) { -#line 2003 "VBNET.ATG" +#line 2001 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 164) { lexer.NextToken(); -#line 2004 "VBNET.ATG" +#line 2002 "VBNET.ATG" uop = UnaryOperatorType.Not; } ComparisonExpr( -#line 2005 "VBNET.ATG" +#line 2003 "VBNET.ATG" out outExpr); -#line 2006 "VBNET.ATG" +#line 2004 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void ComparisonExpr( -#line 2011 "VBNET.ATG" +#line 2009 "VBNET.ATG" out Expression outExpr) { -#line 2013 "VBNET.ATG" +#line 2011 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; ShiftExpr( -#line 2017 "VBNET.ATG" +#line 2015 "VBNET.ATG" out outExpr); while (StartOf(40)) { switch (la.kind) { case 40: { lexer.NextToken(); -#line 2020 "VBNET.ATG" +#line 2018 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 39: { lexer.NextToken(); -#line 2021 "VBNET.ATG" +#line 2019 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 43: { lexer.NextToken(); -#line 2022 "VBNET.ATG" +#line 2020 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 42: { lexer.NextToken(); -#line 2023 "VBNET.ATG" +#line 2021 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 41: { lexer.NextToken(); -#line 2024 "VBNET.ATG" +#line 2022 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } case 20: { lexer.NextToken(); -#line 2025 "VBNET.ATG" +#line 2023 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 150: { lexer.NextToken(); -#line 2026 "VBNET.ATG" +#line 2024 "VBNET.ATG" op = BinaryOperatorType.Like; break; } case 144: { lexer.NextToken(); -#line 2027 "VBNET.ATG" +#line 2025 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; break; } case 145: { lexer.NextToken(); -#line 2028 "VBNET.ATG" +#line 2026 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; break; } } if (StartOf(41)) { ShiftExpr( -#line 2031 "VBNET.ATG" +#line 2029 "VBNET.ATG" out expr); -#line 2031 "VBNET.ATG" +#line 2029 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else if (la.kind == 164) { -#line 2032 "VBNET.ATG" +#line 2030 "VBNET.ATG" Location startLocation2 = la.Location; lexer.NextToken(); ShiftExpr( -#line 2034 "VBNET.ATG" +#line 2032 "VBNET.ATG" out expr); -#line 2034 "VBNET.ATG" +#line 2032 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new UnaryOperatorExpression(expr, UnaryOperatorType.Not) { StartLocation = startLocation2, EndLocation = t.EndLocation }) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else SynErr(295); } } void ShiftExpr( -#line 2039 "VBNET.ATG" +#line 2037 "VBNET.ATG" out Expression outExpr) { -#line 2041 "VBNET.ATG" +#line 2039 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; ConcatenationExpr( -#line 2045 "VBNET.ATG" +#line 2043 "VBNET.ATG" out outExpr); while (la.kind == 44 || la.kind == 45) { if (la.kind == 44) { lexer.NextToken(); -#line 2048 "VBNET.ATG" +#line 2046 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 2049 "VBNET.ATG" +#line 2047 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } ConcatenationExpr( -#line 2051 "VBNET.ATG" +#line 2049 "VBNET.ATG" out expr); -#line 2051 "VBNET.ATG" +#line 2049 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void ConcatenationExpr( -#line 2055 "VBNET.ATG" +#line 2053 "VBNET.ATG" out Expression outExpr) { -#line 2056 "VBNET.ATG" +#line 2054 "VBNET.ATG" Expression expr; Location startLocation = la.Location; AdditiveExpr( -#line 2058 "VBNET.ATG" +#line 2056 "VBNET.ATG" out outExpr); while (la.kind == 23) { lexer.NextToken(); AdditiveExpr( -#line 2058 "VBNET.ATG" +#line 2056 "VBNET.ATG" out expr); -#line 2058 "VBNET.ATG" +#line 2056 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Concat, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void AdditiveExpr( -#line 2061 "VBNET.ATG" +#line 2059 "VBNET.ATG" out Expression outExpr) { -#line 2063 "VBNET.ATG" +#line 2061 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; ModuloExpr( -#line 2067 "VBNET.ATG" +#line 2065 "VBNET.ATG" out outExpr); while (la.kind == 30 || la.kind == 31) { if (la.kind == 31) { lexer.NextToken(); -#line 2070 "VBNET.ATG" +#line 2068 "VBNET.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 2071 "VBNET.ATG" +#line 2069 "VBNET.ATG" op = BinaryOperatorType.Subtract; } ModuloExpr( -#line 2073 "VBNET.ATG" +#line 2071 "VBNET.ATG" out expr); -#line 2073 "VBNET.ATG" +#line 2071 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void ModuloExpr( -#line 2077 "VBNET.ATG" +#line 2075 "VBNET.ATG" out Expression outExpr) { -#line 2078 "VBNET.ATG" +#line 2076 "VBNET.ATG" Expression expr; Location startLocation = la.Location; IntegerDivisionExpr( -#line 2080 "VBNET.ATG" +#line 2078 "VBNET.ATG" out outExpr); while (la.kind == 154) { lexer.NextToken(); IntegerDivisionExpr( -#line 2080 "VBNET.ATG" +#line 2078 "VBNET.ATG" out expr); -#line 2080 "VBNET.ATG" +#line 2078 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void IntegerDivisionExpr( -#line 2083 "VBNET.ATG" +#line 2081 "VBNET.ATG" out Expression outExpr) { -#line 2084 "VBNET.ATG" +#line 2082 "VBNET.ATG" Expression expr; Location startLocation = la.Location; MultiplicativeExpr( -#line 2086 "VBNET.ATG" +#line 2084 "VBNET.ATG" out outExpr); while (la.kind == 25) { lexer.NextToken(); MultiplicativeExpr( -#line 2086 "VBNET.ATG" +#line 2084 "VBNET.ATG" out expr); -#line 2086 "VBNET.ATG" +#line 2084 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.DivideInteger, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void MultiplicativeExpr( -#line 2089 "VBNET.ATG" +#line 2087 "VBNET.ATG" out Expression outExpr) { -#line 2091 "VBNET.ATG" +#line 2089 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; Location startLocation = la.Location; UnaryExpr( -#line 2095 "VBNET.ATG" +#line 2093 "VBNET.ATG" out outExpr); while (la.kind == 24 || la.kind == 34) { if (la.kind == 34) { lexer.NextToken(); -#line 2098 "VBNET.ATG" +#line 2096 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else { lexer.NextToken(); -#line 2099 "VBNET.ATG" +#line 2097 "VBNET.ATG" op = BinaryOperatorType.Divide; } UnaryExpr( -#line 2101 "VBNET.ATG" +#line 2099 "VBNET.ATG" out expr); -#line 2101 "VBNET.ATG" +#line 2099 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void UnaryExpr( -#line 2105 "VBNET.ATG" +#line 2103 "VBNET.ATG" out Expression uExpr) { -#line 2107 "VBNET.ATG" +#line 2105 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; Location startLocation = la.Location; @@ -5298,25 +5296,25 @@ out Expression uExpr) { if (la.kind == 31) { lexer.NextToken(); -#line 2112 "VBNET.ATG" +#line 2110 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 30) { lexer.NextToken(); -#line 2113 "VBNET.ATG" +#line 2111 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 2114 "VBNET.ATG" +#line 2112 "VBNET.ATG" uop = UnaryOperatorType.Dereference; isUOp = true; } } ExponentiationExpr( -#line 2116 "VBNET.ATG" +#line 2114 "VBNET.ATG" out expr); -#line 2118 "VBNET.ATG" +#line 2116 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else { @@ -5326,107 +5324,107 @@ out expr); } void ExponentiationExpr( -#line 2126 "VBNET.ATG" +#line 2124 "VBNET.ATG" out Expression outExpr) { -#line 2127 "VBNET.ATG" +#line 2125 "VBNET.ATG" Expression expr; Location startLocation = la.Location; SimpleExpr( -#line 2129 "VBNET.ATG" +#line 2127 "VBNET.ATG" out outExpr); while (la.kind == 32) { lexer.NextToken(); SimpleExpr( -#line 2129 "VBNET.ATG" +#line 2127 "VBNET.ATG" out expr); -#line 2129 "VBNET.ATG" +#line 2127 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Power, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } } void NormalOrReDimArgumentList( -#line 2649 "VBNET.ATG" +#line 2647 "VBNET.ATG" out List arguments, out bool canBeNormal, out bool canBeRedim) { -#line 2651 "VBNET.ATG" +#line 2649 "VBNET.ATG" arguments = new List(); canBeNormal = true; canBeRedim = !IsNamedAssign(); Expression expr = null; if (StartOf(24)) { Argument( -#line 2656 "VBNET.ATG" +#line 2654 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2657 "VBNET.ATG" +#line 2655 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2658 "VBNET.ATG" +#line 2656 "VBNET.ATG" out expr); } } while (la.kind == 22) { lexer.NextToken(); -#line 2661 "VBNET.ATG" +#line 2659 "VBNET.ATG" if (expr == null) canBeRedim = false; -#line 2662 "VBNET.ATG" +#line 2660 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; -#line 2663 "VBNET.ATG" +#line 2661 "VBNET.ATG" canBeRedim &= !IsNamedAssign(); if (StartOf(24)) { Argument( -#line 2664 "VBNET.ATG" +#line 2662 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2665 "VBNET.ATG" +#line 2663 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2666 "VBNET.ATG" +#line 2664 "VBNET.ATG" out expr); } } -#line 2668 "VBNET.ATG" +#line 2666 "VBNET.ATG" if (expr == null) { canBeRedim = false; expr = Expression.Null; } } -#line 2670 "VBNET.ATG" +#line 2668 "VBNET.ATG" if (expr != null) arguments.Add(expr); else canBeRedim = false; } void ArrayTypeModifiers( -#line 2780 "VBNET.ATG" +#line 2778 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2782 "VBNET.ATG" +#line 2780 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2785 "VBNET.ATG" +#line 2783 "VBNET.ATG" IsDims()) { Expect(37); if (la.kind == 22 || la.kind == 38) { RankList( -#line 2787 "VBNET.ATG" +#line 2785 "VBNET.ATG" out i); } -#line 2789 "VBNET.ATG" +#line 2787 "VBNET.ATG" arrayModifiers.Add(i); Expect(38); } -#line 2794 "VBNET.ATG" +#line 2792 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -5434,10 +5432,10 @@ out i); } void MemberInitializer( -#line 2616 "VBNET.ATG" +#line 2614 "VBNET.ATG" out MemberInitializerExpression memberInitializer) { -#line 2618 "VBNET.ATG" +#line 2616 "VBNET.ATG" memberInitializer = new MemberInitializerExpression(); memberInitializer.StartLocation = la.Location; Expression initExpr = null; @@ -5447,19 +5445,19 @@ out MemberInitializerExpression memberInitializer) { if (la.kind == 147) { lexer.NextToken(); -#line 2624 "VBNET.ATG" +#line 2622 "VBNET.ATG" isKey = true; } Expect(26); IdentifierOrKeyword( -#line 2625 "VBNET.ATG" +#line 2623 "VBNET.ATG" out name); Expect(20); Expr( -#line 2625 "VBNET.ATG" +#line 2623 "VBNET.ATG" out initExpr); -#line 2627 "VBNET.ATG" +#line 2625 "VBNET.ATG" memberInitializer.Name = name; memberInitializer.Expression = initExpr; memberInitializer.IsKey = isKey; @@ -5468,10 +5466,10 @@ out initExpr); } void SubLambdaExpression( -#line 2221 "VBNET.ATG" +#line 2219 "VBNET.ATG" out LambdaExpression lambda) { -#line 2223 "VBNET.ATG" +#line 2221 "VBNET.ATG" lambda = new LambdaExpression(); lambda.ReturnType = new TypeReference("System.Void", true); Expression inner = null; @@ -5483,7 +5481,7 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2230 "VBNET.ATG" +#line 2228 "VBNET.ATG" lambda.Parameters); } Expect(38); @@ -5491,19 +5489,19 @@ lambda.Parameters); if (StartOf(42)) { if (StartOf(24)) { Expr( -#line 2233 "VBNET.ATG" +#line 2231 "VBNET.ATG" out inner); -#line 2235 "VBNET.ATG" +#line 2233 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2239 "VBNET.ATG" +#line 2237 "VBNET.ATG" out statement); -#line 2241 "VBNET.ATG" +#line 2239 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5511,12 +5509,12 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2247 "VBNET.ATG" +#line 2245 "VBNET.ATG" out statement); Expect(113); Expect(210); -#line 2250 "VBNET.ATG" +#line 2248 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5524,10 +5522,10 @@ out statement); } void FunctionLambdaExpression( -#line 2256 "VBNET.ATG" +#line 2254 "VBNET.ATG" out LambdaExpression lambda) { -#line 2258 "VBNET.ATG" +#line 2256 "VBNET.ATG" lambda = new LambdaExpression(); TypeReference typeRef = null; Expression inner = null; @@ -5539,7 +5537,7 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2265 "VBNET.ATG" +#line 2263 "VBNET.ATG" lambda.Parameters); } Expect(38); @@ -5547,28 +5545,28 @@ lambda.Parameters); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2266 "VBNET.ATG" +#line 2264 "VBNET.ATG" out typeRef); -#line 2266 "VBNET.ATG" +#line 2264 "VBNET.ATG" lambda.ReturnType = typeRef; } if (StartOf(42)) { if (StartOf(24)) { Expr( -#line 2269 "VBNET.ATG" +#line 2267 "VBNET.ATG" out inner); -#line 2271 "VBNET.ATG" +#line 2269 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2275 "VBNET.ATG" +#line 2273 "VBNET.ATG" out statement); -#line 2277 "VBNET.ATG" +#line 2275 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5576,12 +5574,12 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2283 "VBNET.ATG" +#line 2281 "VBNET.ATG" out statement); Expect(113); Expect(127); -#line 2286 "VBNET.ATG" +#line 2284 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5589,10 +5587,10 @@ out statement); } void EmbeddedStatement( -#line 3058 "VBNET.ATG" +#line 3056 "VBNET.ATG" out Statement statement) { -#line 3060 "VBNET.ATG" +#line 3058 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5603,224 +5601,224 @@ out Statement statement) { if (la.kind == 120) { lexer.NextToken(); -#line 3068 "VBNET.ATG" +#line 3066 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 210: { lexer.NextToken(); -#line 3070 "VBNET.ATG" +#line 3068 "VBNET.ATG" exitType = ExitType.Sub; break; } case 127: { lexer.NextToken(); -#line 3072 "VBNET.ATG" +#line 3070 "VBNET.ATG" exitType = ExitType.Function; break; } case 186: { lexer.NextToken(); -#line 3074 "VBNET.ATG" +#line 3072 "VBNET.ATG" exitType = ExitType.Property; break; } case 108: { lexer.NextToken(); -#line 3076 "VBNET.ATG" +#line 3074 "VBNET.ATG" exitType = ExitType.Do; break; } case 124: { lexer.NextToken(); -#line 3078 "VBNET.ATG" +#line 3076 "VBNET.ATG" exitType = ExitType.For; break; } case 218: { lexer.NextToken(); -#line 3080 "VBNET.ATG" +#line 3078 "VBNET.ATG" exitType = ExitType.Try; break; } case 231: { lexer.NextToken(); -#line 3082 "VBNET.ATG" +#line 3080 "VBNET.ATG" exitType = ExitType.While; break; } case 197: { lexer.NextToken(); -#line 3084 "VBNET.ATG" +#line 3082 "VBNET.ATG" exitType = ExitType.Select; break; } default: SynErr(298); break; } -#line 3086 "VBNET.ATG" +#line 3084 "VBNET.ATG" statement = new ExitStatement(exitType); } else if (la.kind == 218) { TryStatement( -#line 3087 "VBNET.ATG" +#line 3085 "VBNET.ATG" out statement); } else if (la.kind == 89) { lexer.NextToken(); -#line 3088 "VBNET.ATG" +#line 3086 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 108 || la.kind == 124 || la.kind == 231) { if (la.kind == 108) { lexer.NextToken(); -#line 3088 "VBNET.ATG" +#line 3086 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 124) { lexer.NextToken(); -#line 3088 "VBNET.ATG" +#line 3086 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 3088 "VBNET.ATG" +#line 3086 "VBNET.ATG" continueType = ContinueType.While; } } -#line 3088 "VBNET.ATG" +#line 3086 "VBNET.ATG" statement = new ContinueStatement(continueType); } else if (la.kind == 215) { lexer.NextToken(); if (StartOf(24)) { Expr( -#line 3090 "VBNET.ATG" +#line 3088 "VBNET.ATG" out expr); } -#line 3090 "VBNET.ATG" +#line 3088 "VBNET.ATG" statement = new ThrowStatement(expr); } else if (la.kind == 195) { lexer.NextToken(); if (StartOf(24)) { Expr( -#line 3092 "VBNET.ATG" +#line 3090 "VBNET.ATG" out expr); } -#line 3092 "VBNET.ATG" +#line 3090 "VBNET.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 211) { lexer.NextToken(); Expr( -#line 3094 "VBNET.ATG" +#line 3092 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 3094 "VBNET.ATG" +#line 3092 "VBNET.ATG" out embeddedStatement); Expect(113); Expect(211); -#line 3095 "VBNET.ATG" +#line 3093 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 189) { lexer.NextToken(); Identifier(); -#line 3097 "VBNET.ATG" +#line 3095 "VBNET.ATG" name = t.val; if (la.kind == 37) { lexer.NextToken(); if (StartOf(43)) { ArgumentList( -#line 3098 "VBNET.ATG" +#line 3096 "VBNET.ATG" out p); } Expect(38); } -#line 3100 "VBNET.ATG" +#line 3098 "VBNET.ATG" statement = new RaiseEventStatement(name, p); } else if (la.kind == 233) { WithStatement( -#line 3103 "VBNET.ATG" +#line 3101 "VBNET.ATG" out statement); } else if (la.kind == 56) { lexer.NextToken(); -#line 3105 "VBNET.ATG" +#line 3103 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 3106 "VBNET.ATG" +#line 3104 "VBNET.ATG" out expr); Expect(22); Expr( -#line 3106 "VBNET.ATG" +#line 3104 "VBNET.ATG" out handlerExpr); -#line 3108 "VBNET.ATG" +#line 3106 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); } else if (la.kind == 193) { lexer.NextToken(); -#line 3111 "VBNET.ATG" +#line 3109 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 3112 "VBNET.ATG" +#line 3110 "VBNET.ATG" out expr); Expect(22); Expr( -#line 3112 "VBNET.ATG" +#line 3110 "VBNET.ATG" out handlerExpr); -#line 3114 "VBNET.ATG" +#line 3112 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); } else if (la.kind == 231) { lexer.NextToken(); Expr( -#line 3117 "VBNET.ATG" +#line 3115 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 3118 "VBNET.ATG" +#line 3116 "VBNET.ATG" out embeddedStatement); Expect(113); Expect(231); -#line 3120 "VBNET.ATG" +#line 3118 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 108) { lexer.NextToken(); -#line 3125 "VBNET.ATG" +#line 3123 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 3128 "VBNET.ATG" +#line 3126 "VBNET.ATG" out conditionType); Expr( -#line 3128 "VBNET.ATG" +#line 3126 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 3129 "VBNET.ATG" +#line 3127 "VBNET.ATG" out embeddedStatement); Expect(152); -#line 3132 "VBNET.ATG" +#line 3130 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5829,26 +5827,26 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 3139 "VBNET.ATG" +#line 3137 "VBNET.ATG" out embeddedStatement); Expect(152); if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 3140 "VBNET.ATG" +#line 3138 "VBNET.ATG" out conditionType); Expr( -#line 3140 "VBNET.ATG" +#line 3138 "VBNET.ATG" out expr); } -#line 3142 "VBNET.ATG" +#line 3140 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); } else SynErr(299); } else if (la.kind == 124) { lexer.NextToken(); -#line 3147 "VBNET.ATG" +#line 3145 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5856,24 +5854,24 @@ out expr); if (la.kind == 110) { lexer.NextToken(); LoopControlVariable( -#line 3153 "VBNET.ATG" +#line 3151 "VBNET.ATG" out typeReference, out typeName); Expect(138); Expr( -#line 3154 "VBNET.ATG" +#line 3152 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 3155 "VBNET.ATG" +#line 3153 "VBNET.ATG" out embeddedStatement); Expect(163); if (StartOf(24)) { Expr( -#line 3156 "VBNET.ATG" +#line 3154 "VBNET.ATG" out expr); } -#line 3158 "VBNET.ATG" +#line 3156 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5885,7 +5883,7 @@ out expr); } else if (StartOf(44)) { -#line 3169 "VBNET.ATG" +#line 3167 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; @@ -5894,59 +5892,59 @@ out expr); List nextExpressions = null; if ( -#line 3176 "VBNET.ATG" +#line 3174 "VBNET.ATG" IsLoopVariableDeclaration()) { LoopControlVariable( -#line 3177 "VBNET.ATG" +#line 3175 "VBNET.ATG" out typeReference, out typeName); } else { -#line 3179 "VBNET.ATG" +#line 3177 "VBNET.ATG" typeReference = null; typeName = null; SimpleExpr( -#line 3180 "VBNET.ATG" +#line 3178 "VBNET.ATG" out variableExpr); } Expect(20); Expr( -#line 3182 "VBNET.ATG" +#line 3180 "VBNET.ATG" out start); Expect(216); Expr( -#line 3182 "VBNET.ATG" +#line 3180 "VBNET.ATG" out end); if (la.kind == 205) { lexer.NextToken(); Expr( -#line 3182 "VBNET.ATG" +#line 3180 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 3183 "VBNET.ATG" +#line 3181 "VBNET.ATG" out embeddedStatement); Expect(163); if (StartOf(24)) { Expr( -#line 3186 "VBNET.ATG" +#line 3184 "VBNET.ATG" out nextExpr); -#line 3188 "VBNET.ATG" +#line 3186 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3191 "VBNET.ATG" +#line 3189 "VBNET.ATG" out nextExpr); -#line 3191 "VBNET.ATG" +#line 3189 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 3194 "VBNET.ATG" +#line 3192 "VBNET.ATG" statement = new ForNextStatement { TypeReference = typeReference, VariableName = typeName, @@ -5962,27 +5960,27 @@ out nextExpr); } else if (la.kind == 118) { lexer.NextToken(); Expr( -#line 3207 "VBNET.ATG" +#line 3205 "VBNET.ATG" out expr); -#line 3207 "VBNET.ATG" +#line 3205 "VBNET.ATG" statement = new ErrorStatement(expr); } else if (la.kind == 191) { lexer.NextToken(); -#line 3209 "VBNET.ATG" +#line 3207 "VBNET.ATG" bool isPreserve = false; if (la.kind == 184) { lexer.NextToken(); -#line 3209 "VBNET.ATG" +#line 3207 "VBNET.ATG" isPreserve = true; } ReDimClause( -#line 3210 "VBNET.ATG" +#line 3208 "VBNET.ATG" out expr); -#line 3212 "VBNET.ATG" +#line 3210 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); @@ -5990,48 +5988,48 @@ out expr); while (la.kind == 22) { lexer.NextToken(); ReDimClause( -#line 3216 "VBNET.ATG" +#line 3214 "VBNET.ATG" out expr); -#line 3217 "VBNET.ATG" +#line 3215 "VBNET.ATG" SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); } } else if (la.kind == 117) { lexer.NextToken(); Expr( -#line 3221 "VBNET.ATG" +#line 3219 "VBNET.ATG" out expr); -#line 3223 "VBNET.ATG" +#line 3221 "VBNET.ATG" EraseStatement eraseStatement = new EraseStatement(); if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr);} while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3226 "VBNET.ATG" +#line 3224 "VBNET.ATG" out expr); -#line 3226 "VBNET.ATG" +#line 3224 "VBNET.ATG" if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr); } } -#line 3227 "VBNET.ATG" +#line 3225 "VBNET.ATG" statement = eraseStatement; } else if (la.kind == 206) { lexer.NextToken(); -#line 3229 "VBNET.ATG" +#line 3227 "VBNET.ATG" statement = new StopStatement(); } else if ( -#line 3231 "VBNET.ATG" +#line 3229 "VBNET.ATG" la.kind == Tokens.If) { Expect(135); -#line 3232 "VBNET.ATG" +#line 3230 "VBNET.ATG" Location ifStartLocation = t.Location; Expr( -#line 3232 "VBNET.ATG" +#line 3230 "VBNET.ATG" out expr); if (la.kind == 214) { lexer.NextToken(); @@ -6039,46 +6037,46 @@ out expr); if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 3235 "VBNET.ATG" +#line 3233 "VBNET.ATG" out embeddedStatement); -#line 3237 "VBNET.ATG" +#line 3235 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; Location elseIfStart; while (la.kind == 112 || -#line 3243 "VBNET.ATG" +#line 3241 "VBNET.ATG" IsElseIf()) { if ( -#line 3243 "VBNET.ATG" +#line 3241 "VBNET.ATG" IsElseIf()) { Expect(111); -#line 3243 "VBNET.ATG" +#line 3241 "VBNET.ATG" elseIfStart = t.Location; Expect(135); } else { lexer.NextToken(); -#line 3244 "VBNET.ATG" +#line 3242 "VBNET.ATG" elseIfStart = t.Location; } -#line 3246 "VBNET.ATG" +#line 3244 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 3247 "VBNET.ATG" +#line 3245 "VBNET.ATG" out condition); if (la.kind == 214) { lexer.NextToken(); } EndOfStmt(); Block( -#line 3248 "VBNET.ATG" +#line 3246 "VBNET.ATG" out block); -#line 3250 "VBNET.ATG" +#line 3248 "VBNET.ATG" ElseIfSection elseIfSection = new ElseIfSection(condition, block); elseIfSection.StartLocation = elseIfStart; elseIfSection.EndLocation = t.Location; @@ -6092,39 +6090,39 @@ out block); EndOfStmt(); } Block( -#line 3259 "VBNET.ATG" +#line 3257 "VBNET.ATG" out embeddedStatement); -#line 3261 "VBNET.ATG" +#line 3259 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(113); Expect(135); -#line 3265 "VBNET.ATG" +#line 3263 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else if (StartOf(45)) { -#line 3270 "VBNET.ATG" +#line 3268 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr); ifStatement.StartLocation = ifStartLocation; SingleLineStatementList( -#line 3273 "VBNET.ATG" +#line 3271 "VBNET.ATG" ifStatement.TrueStatement); if (la.kind == 111) { lexer.NextToken(); if (StartOf(45)) { SingleLineStatementList( -#line 3276 "VBNET.ATG" +#line 3274 "VBNET.ATG" ifStatement.FalseStatement); } } -#line 3278 "VBNET.ATG" +#line 3276 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else SynErr(301); } else if (la.kind == 197) { @@ -6133,82 +6131,82 @@ ifStatement.FalseStatement); lexer.NextToken(); } Expr( -#line 3281 "VBNET.ATG" +#line 3279 "VBNET.ATG" out expr); EndOfStmt(); -#line 3282 "VBNET.ATG" +#line 3280 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 74) { -#line 3286 "VBNET.ATG" +#line 3284 "VBNET.ATG" List caseClauses = null; Location caseLocation = la.Location; lexer.NextToken(); CaseClauses( -#line 3287 "VBNET.ATG" +#line 3285 "VBNET.ATG" out caseClauses); if ( -#line 3287 "VBNET.ATG" +#line 3285 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 3289 "VBNET.ATG" +#line 3287 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); selectSection.StartLocation = caseLocation; Block( -#line 3292 "VBNET.ATG" +#line 3290 "VBNET.ATG" out block); -#line 3294 "VBNET.ATG" +#line 3292 "VBNET.ATG" selectSection.Children = block.Children; selectSection.EndLocation = t.EndLocation; selectSections.Add(selectSection); } -#line 3300 "VBNET.ATG" +#line 3298 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(113); Expect(197); } else if (la.kind == 171) { -#line 3303 "VBNET.ATG" +#line 3301 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 3304 "VBNET.ATG" +#line 3302 "VBNET.ATG" out onErrorStatement); -#line 3304 "VBNET.ATG" +#line 3302 "VBNET.ATG" statement = onErrorStatement; } else if (la.kind == 132) { -#line 3305 "VBNET.ATG" +#line 3303 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 3306 "VBNET.ATG" +#line 3304 "VBNET.ATG" out goToStatement); -#line 3306 "VBNET.ATG" +#line 3304 "VBNET.ATG" statement = goToStatement; } else if (la.kind == 194) { -#line 3307 "VBNET.ATG" +#line 3305 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 3308 "VBNET.ATG" +#line 3306 "VBNET.ATG" out resumeStatement); -#line 3308 "VBNET.ATG" +#line 3306 "VBNET.ATG" statement = resumeStatement; } else if (StartOf(44)) { -#line 3311 "VBNET.ATG" +#line 3309 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; Location startLoc = la.Location; @@ -6217,28 +6215,28 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 3318 "VBNET.ATG" +#line 3316 "VBNET.ATG" out expr); if (StartOf(46)) { AssignmentOperator( -#line 3320 "VBNET.ATG" +#line 3318 "VBNET.ATG" out op); Expr( -#line 3320 "VBNET.ATG" +#line 3318 "VBNET.ATG" out val); -#line 3322 "VBNET.ATG" +#line 3320 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); expr.StartLocation = startLoc; expr.EndLocation = t.EndLocation; } else if (StartOf(47)) { -#line 3326 "VBNET.ATG" +#line 3324 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(302); -#line 3329 "VBNET.ATG" +#line 3327 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is MemberReferenceExpression || expr is IdentifierExpression) { @@ -6249,58 +6247,58 @@ out val); } else if (la.kind == 73) { lexer.NextToken(); SimpleExpr( -#line 3336 "VBNET.ATG" +#line 3334 "VBNET.ATG" out expr); -#line 3336 "VBNET.ATG" +#line 3334 "VBNET.ATG" statement = new ExpressionStatement(expr); } else if (la.kind == 226) { lexer.NextToken(); -#line 3338 "VBNET.ATG" +#line 3336 "VBNET.ATG" Statement block; if ( -#line 3339 "VBNET.ATG" +#line 3337 "VBNET.ATG" Peek(1).kind == Tokens.As) { -#line 3340 "VBNET.ATG" +#line 3338 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 3341 "VBNET.ATG" +#line 3339 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 3343 "VBNET.ATG" +#line 3341 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 3345 "VBNET.ATG" +#line 3343 "VBNET.ATG" out block); -#line 3347 "VBNET.ATG" +#line 3345 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); } else if (StartOf(24)) { Expr( -#line 3349 "VBNET.ATG" +#line 3347 "VBNET.ATG" out expr); Block( -#line 3350 "VBNET.ATG" +#line 3348 "VBNET.ATG" out block); -#line 3351 "VBNET.ATG" +#line 3349 "VBNET.ATG" statement = new UsingStatement(new ExpressionStatement(expr), block); } else SynErr(303); Expect(113); Expect(226); } else if (StartOf(48)) { LocalDeclarationStatement( -#line 3354 "VBNET.ATG" +#line 3352 "VBNET.ATG" out statement); } else SynErr(304); -#line 3357 "VBNET.ATG" +#line 3355 "VBNET.ATG" if (statement != null) { statement.StartLocation = startLocation; statement.EndLocation = t.EndLocation; @@ -6309,35 +6307,35 @@ out statement); } void FromOrAggregateQueryOperator( -#line 2305 "VBNET.ATG" +#line 2303 "VBNET.ATG" List middleClauses) { -#line 2307 "VBNET.ATG" +#line 2305 "VBNET.ATG" QueryExpressionFromClause fromClause = null; QueryExpressionAggregateClause aggregateClause = null; if (la.kind == 126) { FromQueryOperator( -#line 2310 "VBNET.ATG" +#line 2308 "VBNET.ATG" out fromClause); -#line 2311 "VBNET.ATG" +#line 2309 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2312 "VBNET.ATG" +#line 2310 "VBNET.ATG" out aggregateClause); -#line 2313 "VBNET.ATG" +#line 2311 "VBNET.ATG" middleClauses.Add(aggregateClause); } else SynErr(305); } void QueryOperator( -#line 2316 "VBNET.ATG" +#line 2314 "VBNET.ATG" List middleClauses) { -#line 2318 "VBNET.ATG" +#line 2316 "VBNET.ATG" QueryExpressionJoinVBClause joinClause = null; QueryExpressionGroupVBClause groupByClause = null; QueryExpressionPartitionVBClause partitionClause = null; @@ -6347,94 +6345,94 @@ List middleClauses) { if (la.kind == 126) { FromQueryOperator( -#line 2325 "VBNET.ATG" +#line 2323 "VBNET.ATG" out fromClause); -#line 2326 "VBNET.ATG" +#line 2324 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2327 "VBNET.ATG" +#line 2325 "VBNET.ATG" out aggregateClause); -#line 2328 "VBNET.ATG" +#line 2326 "VBNET.ATG" middleClauses.Add(aggregateClause); } else if (la.kind == 197) { SelectQueryOperator( -#line 2329 "VBNET.ATG" +#line 2327 "VBNET.ATG" middleClauses); } else if (la.kind == 107) { DistinctQueryOperator( -#line 2330 "VBNET.ATG" +#line 2328 "VBNET.ATG" middleClauses); } else if (la.kind == 230) { WhereQueryOperator( -#line 2331 "VBNET.ATG" +#line 2329 "VBNET.ATG" middleClauses); } else if (la.kind == 176) { OrderByQueryOperator( -#line 2332 "VBNET.ATG" +#line 2330 "VBNET.ATG" middleClauses); } else if (la.kind == 203 || la.kind == 212) { PartitionQueryOperator( -#line 2333 "VBNET.ATG" +#line 2331 "VBNET.ATG" out partitionClause); -#line 2334 "VBNET.ATG" +#line 2332 "VBNET.ATG" middleClauses.Add(partitionClause); } else if (la.kind == 148) { LetQueryOperator( -#line 2335 "VBNET.ATG" +#line 2333 "VBNET.ATG" middleClauses); } else if (la.kind == 146) { JoinQueryOperator( -#line 2336 "VBNET.ATG" +#line 2334 "VBNET.ATG" out joinClause); -#line 2337 "VBNET.ATG" +#line 2335 "VBNET.ATG" middleClauses.Add(joinClause); } else if ( -#line 2338 "VBNET.ATG" +#line 2336 "VBNET.ATG" la.kind == Tokens.Group && Peek(1).kind == Tokens.Join) { GroupJoinQueryOperator( -#line 2338 "VBNET.ATG" +#line 2336 "VBNET.ATG" out groupJoinClause); -#line 2339 "VBNET.ATG" +#line 2337 "VBNET.ATG" middleClauses.Add(groupJoinClause); } else if (la.kind == 133) { GroupByQueryOperator( -#line 2340 "VBNET.ATG" +#line 2338 "VBNET.ATG" out groupByClause); -#line 2341 "VBNET.ATG" +#line 2339 "VBNET.ATG" middleClauses.Add(groupByClause); } else SynErr(306); } void FromQueryOperator( -#line 2416 "VBNET.ATG" +#line 2414 "VBNET.ATG" out QueryExpressionFromClause fromClause) { -#line 2418 "VBNET.ATG" +#line 2416 "VBNET.ATG" fromClause = new QueryExpressionFromClause(); fromClause.StartLocation = la.Location; Expect(126); CollectionRangeVariableDeclarationList( -#line 2421 "VBNET.ATG" +#line 2419 "VBNET.ATG" fromClause.Sources); -#line 2423 "VBNET.ATG" +#line 2421 "VBNET.ATG" fromClause.EndLocation = t.EndLocation; } void AggregateQueryOperator( -#line 2485 "VBNET.ATG" +#line 2483 "VBNET.ATG" out QueryExpressionAggregateClause aggregateClause) { -#line 2487 "VBNET.ATG" +#line 2485 "VBNET.ATG" aggregateClause = new QueryExpressionAggregateClause(); aggregateClause.IntoVariables = new List(); aggregateClause.StartLocation = la.Location; @@ -6442,77 +6440,77 @@ out QueryExpressionAggregateClause aggregateClause) { Expect(58); CollectionRangeVariableDeclaration( -#line 2492 "VBNET.ATG" +#line 2490 "VBNET.ATG" out source); -#line 2494 "VBNET.ATG" +#line 2492 "VBNET.ATG" aggregateClause.Source = source; while (StartOf(31)) { QueryOperator( -#line 2497 "VBNET.ATG" +#line 2495 "VBNET.ATG" aggregateClause.MiddleClauses); } Expect(143); ExpressionRangeVariableDeclarationList( -#line 2499 "VBNET.ATG" +#line 2497 "VBNET.ATG" aggregateClause.IntoVariables); -#line 2501 "VBNET.ATG" +#line 2499 "VBNET.ATG" aggregateClause.EndLocation = t.EndLocation; } void SelectQueryOperator( -#line 2427 "VBNET.ATG" +#line 2425 "VBNET.ATG" List middleClauses) { -#line 2429 "VBNET.ATG" +#line 2427 "VBNET.ATG" QueryExpressionSelectVBClause selectClause = new QueryExpressionSelectVBClause(); selectClause.StartLocation = la.Location; Expect(197); ExpressionRangeVariableDeclarationList( -#line 2432 "VBNET.ATG" +#line 2430 "VBNET.ATG" selectClause.Variables); -#line 2434 "VBNET.ATG" +#line 2432 "VBNET.ATG" selectClause.EndLocation = t.Location; middleClauses.Add(selectClause); } void DistinctQueryOperator( -#line 2439 "VBNET.ATG" +#line 2437 "VBNET.ATG" List middleClauses) { -#line 2441 "VBNET.ATG" +#line 2439 "VBNET.ATG" QueryExpressionDistinctClause distinctClause = new QueryExpressionDistinctClause(); distinctClause.StartLocation = la.Location; Expect(107); -#line 2446 "VBNET.ATG" +#line 2444 "VBNET.ATG" distinctClause.EndLocation = t.EndLocation; middleClauses.Add(distinctClause); } void WhereQueryOperator( -#line 2451 "VBNET.ATG" +#line 2449 "VBNET.ATG" List middleClauses) { -#line 2453 "VBNET.ATG" +#line 2451 "VBNET.ATG" QueryExpressionWhereClause whereClause = new QueryExpressionWhereClause(); whereClause.StartLocation = la.Location; Expression operand = null; Expect(230); Expr( -#line 2457 "VBNET.ATG" +#line 2455 "VBNET.ATG" out operand); -#line 2459 "VBNET.ATG" +#line 2457 "VBNET.ATG" whereClause.Condition = operand; whereClause.EndLocation = t.EndLocation; @@ -6521,10 +6519,10 @@ out operand); } void OrderByQueryOperator( -#line 2344 "VBNET.ATG" +#line 2342 "VBNET.ATG" List middleClauses) { -#line 2346 "VBNET.ATG" +#line 2344 "VBNET.ATG" QueryExpressionOrderClause orderClause = new QueryExpressionOrderClause(); orderClause.StartLocation = la.Location; List orderings = null; @@ -6532,10 +6530,10 @@ List middleClauses) { Expect(176); Expect(70); OrderExpressionList( -#line 2350 "VBNET.ATG" +#line 2348 "VBNET.ATG" out orderings); -#line 2352 "VBNET.ATG" +#line 2350 "VBNET.ATG" orderClause.Orderings = orderings; orderClause.EndLocation = t.EndLocation; middleClauses.Add(orderClause); @@ -6543,10 +6541,10 @@ out orderings); } void PartitionQueryOperator( -#line 2466 "VBNET.ATG" +#line 2464 "VBNET.ATG" out QueryExpressionPartitionVBClause partitionClause) { -#line 2468 "VBNET.ATG" +#line 2466 "VBNET.ATG" partitionClause = new QueryExpressionPartitionVBClause(); partitionClause.StartLocation = la.Location; Expression expr = null; @@ -6554,60 +6552,60 @@ out QueryExpressionPartitionVBClause partitionClause) { if (la.kind == 212) { lexer.NextToken(); -#line 2473 "VBNET.ATG" +#line 2471 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Take; if (la.kind == 231) { lexer.NextToken(); -#line 2474 "VBNET.ATG" +#line 2472 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.TakeWhile; } } else if (la.kind == 203) { lexer.NextToken(); -#line 2475 "VBNET.ATG" +#line 2473 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Skip; if (la.kind == 231) { lexer.NextToken(); -#line 2476 "VBNET.ATG" +#line 2474 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.SkipWhile; } } else SynErr(307); Expr( -#line 2478 "VBNET.ATG" +#line 2476 "VBNET.ATG" out expr); -#line 2480 "VBNET.ATG" +#line 2478 "VBNET.ATG" partitionClause.Expression = expr; partitionClause.EndLocation = t.EndLocation; } void LetQueryOperator( -#line 2505 "VBNET.ATG" +#line 2503 "VBNET.ATG" List middleClauses) { -#line 2507 "VBNET.ATG" +#line 2505 "VBNET.ATG" QueryExpressionLetVBClause letClause = new QueryExpressionLetVBClause(); letClause.StartLocation = la.Location; Expect(148); ExpressionRangeVariableDeclarationList( -#line 2510 "VBNET.ATG" +#line 2508 "VBNET.ATG" letClause.Variables); -#line 2512 "VBNET.ATG" +#line 2510 "VBNET.ATG" letClause.EndLocation = t.EndLocation; middleClauses.Add(letClause); } void JoinQueryOperator( -#line 2549 "VBNET.ATG" +#line 2547 "VBNET.ATG" out QueryExpressionJoinVBClause joinClause) { -#line 2551 "VBNET.ATG" +#line 2549 "VBNET.ATG" joinClause = new QueryExpressionJoinVBClause(); joinClause.StartLocation = la.Location; CollectionRangeVariable joinVariable = null; @@ -6617,203 +6615,203 @@ out QueryExpressionJoinVBClause joinClause) { Expect(146); CollectionRangeVariableDeclaration( -#line 2558 "VBNET.ATG" +#line 2556 "VBNET.ATG" out joinVariable); -#line 2559 "VBNET.ATG" +#line 2557 "VBNET.ATG" joinClause.JoinVariable = joinVariable; if (la.kind == 146) { JoinQueryOperator( -#line 2561 "VBNET.ATG" +#line 2559 "VBNET.ATG" out subJoin); -#line 2562 "VBNET.ATG" +#line 2560 "VBNET.ATG" joinClause.SubJoin = subJoin; } Expect(171); JoinCondition( -#line 2565 "VBNET.ATG" +#line 2563 "VBNET.ATG" out condition); -#line 2566 "VBNET.ATG" +#line 2564 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); while (la.kind == 60) { lexer.NextToken(); JoinCondition( -#line 2568 "VBNET.ATG" +#line 2566 "VBNET.ATG" out condition); -#line 2569 "VBNET.ATG" +#line 2567 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); } -#line 2572 "VBNET.ATG" +#line 2570 "VBNET.ATG" joinClause.EndLocation = t.EndLocation; } void GroupJoinQueryOperator( -#line 2402 "VBNET.ATG" +#line 2400 "VBNET.ATG" out QueryExpressionGroupJoinVBClause groupJoinClause) { -#line 2404 "VBNET.ATG" +#line 2402 "VBNET.ATG" groupJoinClause = new QueryExpressionGroupJoinVBClause(); groupJoinClause.StartLocation = la.Location; QueryExpressionJoinVBClause joinClause = null; Expect(133); JoinQueryOperator( -#line 2408 "VBNET.ATG" +#line 2406 "VBNET.ATG" out joinClause); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2409 "VBNET.ATG" +#line 2407 "VBNET.ATG" groupJoinClause.IntoVariables); -#line 2411 "VBNET.ATG" +#line 2409 "VBNET.ATG" groupJoinClause.JoinClause = joinClause; groupJoinClause.EndLocation = t.EndLocation; } void GroupByQueryOperator( -#line 2389 "VBNET.ATG" +#line 2387 "VBNET.ATG" out QueryExpressionGroupVBClause groupByClause) { -#line 2391 "VBNET.ATG" +#line 2389 "VBNET.ATG" groupByClause = new QueryExpressionGroupVBClause(); groupByClause.StartLocation = la.Location; Expect(133); ExpressionRangeVariableDeclarationList( -#line 2394 "VBNET.ATG" +#line 2392 "VBNET.ATG" groupByClause.GroupVariables); Expect(70); ExpressionRangeVariableDeclarationList( -#line 2395 "VBNET.ATG" +#line 2393 "VBNET.ATG" groupByClause.ByVariables); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2396 "VBNET.ATG" +#line 2394 "VBNET.ATG" groupByClause.IntoVariables); -#line 2398 "VBNET.ATG" +#line 2396 "VBNET.ATG" groupByClause.EndLocation = t.EndLocation; } void OrderExpressionList( -#line 2358 "VBNET.ATG" +#line 2356 "VBNET.ATG" out List orderings) { -#line 2360 "VBNET.ATG" +#line 2358 "VBNET.ATG" orderings = new List(); QueryExpressionOrdering ordering = null; OrderExpression( -#line 2363 "VBNET.ATG" +#line 2361 "VBNET.ATG" out ordering); -#line 2364 "VBNET.ATG" +#line 2362 "VBNET.ATG" orderings.Add(ordering); while (la.kind == 22) { lexer.NextToken(); OrderExpression( -#line 2366 "VBNET.ATG" +#line 2364 "VBNET.ATG" out ordering); -#line 2367 "VBNET.ATG" +#line 2365 "VBNET.ATG" orderings.Add(ordering); } } void OrderExpression( -#line 2371 "VBNET.ATG" +#line 2369 "VBNET.ATG" out QueryExpressionOrdering ordering) { -#line 2373 "VBNET.ATG" +#line 2371 "VBNET.ATG" ordering = new QueryExpressionOrdering(); ordering.StartLocation = la.Location; ordering.Direction = QueryExpressionOrderingDirection.None; Expression orderExpr = null; Expr( -#line 2378 "VBNET.ATG" +#line 2376 "VBNET.ATG" out orderExpr); -#line 2380 "VBNET.ATG" +#line 2378 "VBNET.ATG" ordering.Criteria = orderExpr; if (la.kind == 64 || la.kind == 104) { if (la.kind == 64) { lexer.NextToken(); -#line 2383 "VBNET.ATG" +#line 2381 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Ascending; } else { lexer.NextToken(); -#line 2384 "VBNET.ATG" +#line 2382 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Descending; } } -#line 2386 "VBNET.ATG" +#line 2384 "VBNET.ATG" ordering.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclarationList( -#line 2517 "VBNET.ATG" +#line 2515 "VBNET.ATG" List variables) { -#line 2519 "VBNET.ATG" +#line 2517 "VBNET.ATG" ExpressionRangeVariable variable = null; ExpressionRangeVariableDeclaration( -#line 2521 "VBNET.ATG" +#line 2519 "VBNET.ATG" out variable); -#line 2522 "VBNET.ATG" +#line 2520 "VBNET.ATG" variables.Add(variable); while (la.kind == 22) { lexer.NextToken(); ExpressionRangeVariableDeclaration( -#line 2523 "VBNET.ATG" +#line 2521 "VBNET.ATG" out variable); -#line 2523 "VBNET.ATG" +#line 2521 "VBNET.ATG" variables.Add(variable); } } void CollectionRangeVariableDeclarationList( -#line 2576 "VBNET.ATG" +#line 2574 "VBNET.ATG" List rangeVariables) { -#line 2577 "VBNET.ATG" +#line 2575 "VBNET.ATG" CollectionRangeVariable variableDeclaration; CollectionRangeVariableDeclaration( -#line 2579 "VBNET.ATG" +#line 2577 "VBNET.ATG" out variableDeclaration); -#line 2580 "VBNET.ATG" +#line 2578 "VBNET.ATG" rangeVariables.Add(variableDeclaration); while (la.kind == 22) { lexer.NextToken(); CollectionRangeVariableDeclaration( -#line 2581 "VBNET.ATG" +#line 2579 "VBNET.ATG" out variableDeclaration); -#line 2581 "VBNET.ATG" +#line 2579 "VBNET.ATG" rangeVariables.Add(variableDeclaration); } } void CollectionRangeVariableDeclaration( -#line 2584 "VBNET.ATG" +#line 2582 "VBNET.ATG" out CollectionRangeVariable rangeVariable) { -#line 2586 "VBNET.ATG" +#line 2584 "VBNET.ATG" rangeVariable = new CollectionRangeVariable(); rangeVariable.StartLocation = la.Location; TypeReference typeName = null; @@ -6821,71 +6819,71 @@ out CollectionRangeVariable rangeVariable) { Identifier(); -#line 2591 "VBNET.ATG" +#line 2589 "VBNET.ATG" rangeVariable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2592 "VBNET.ATG" +#line 2590 "VBNET.ATG" out typeName); -#line 2592 "VBNET.ATG" +#line 2590 "VBNET.ATG" rangeVariable.Type = typeName; } Expect(138); Expr( -#line 2593 "VBNET.ATG" +#line 2591 "VBNET.ATG" out inExpr); -#line 2595 "VBNET.ATG" +#line 2593 "VBNET.ATG" rangeVariable.Expression = inExpr; rangeVariable.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclaration( -#line 2526 "VBNET.ATG" +#line 2524 "VBNET.ATG" out ExpressionRangeVariable variable) { -#line 2528 "VBNET.ATG" +#line 2526 "VBNET.ATG" variable = new ExpressionRangeVariable(); variable.StartLocation = la.Location; Expression rhs = null; TypeReference typeName = null; if ( -#line 2534 "VBNET.ATG" +#line 2532 "VBNET.ATG" IsIdentifiedExpressionRange()) { Identifier(); -#line 2535 "VBNET.ATG" +#line 2533 "VBNET.ATG" variable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2537 "VBNET.ATG" +#line 2535 "VBNET.ATG" out typeName); -#line 2538 "VBNET.ATG" +#line 2536 "VBNET.ATG" variable.Type = typeName; } Expect(20); } Expr( -#line 2542 "VBNET.ATG" +#line 2540 "VBNET.ATG" out rhs); -#line 2544 "VBNET.ATG" +#line 2542 "VBNET.ATG" variable.Expression = rhs; variable.EndLocation = t.EndLocation; } void JoinCondition( -#line 2600 "VBNET.ATG" +#line 2598 "VBNET.ATG" out QueryExpressionJoinConditionVB condition) { -#line 2602 "VBNET.ATG" +#line 2600 "VBNET.ATG" condition = new QueryExpressionJoinConditionVB(); condition.StartLocation = la.Location; @@ -6893,14 +6891,14 @@ out QueryExpressionJoinConditionVB condition) { Expression rhs = null; Expr( -#line 2608 "VBNET.ATG" +#line 2606 "VBNET.ATG" out lhs); Expect(116); Expr( -#line 2608 "VBNET.ATG" +#line 2606 "VBNET.ATG" out rhs); -#line 2610 "VBNET.ATG" +#line 2608 "VBNET.ATG" condition.LeftSide = lhs; condition.RightSide = rhs; condition.EndLocation = t.EndLocation; @@ -6908,69 +6906,69 @@ out rhs); } void Argument( -#line 2674 "VBNET.ATG" +#line 2672 "VBNET.ATG" out Expression argumentexpr) { -#line 2676 "VBNET.ATG" +#line 2674 "VBNET.ATG" Expression expr; argumentexpr = null; string name; Location startLocation = la.Location; if ( -#line 2681 "VBNET.ATG" +#line 2679 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 2681 "VBNET.ATG" +#line 2679 "VBNET.ATG" name = t.val; Expect(55); Expr( -#line 2681 "VBNET.ATG" +#line 2679 "VBNET.ATG" out expr); -#line 2683 "VBNET.ATG" +#line 2681 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }; } else if (StartOf(24)) { Expr( -#line 2686 "VBNET.ATG" +#line 2684 "VBNET.ATG" out argumentexpr); } else SynErr(308); } void QualIdentAndTypeArguments( -#line 2754 "VBNET.ATG" +#line 2752 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2755 "VBNET.ATG" +#line 2753 "VBNET.ATG" string name; typeref = null; Qualident( -#line 2757 "VBNET.ATG" +#line 2755 "VBNET.ATG" out name); -#line 2758 "VBNET.ATG" +#line 2756 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 2759 "VBNET.ATG" +#line 2757 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); if ( -#line 2761 "VBNET.ATG" +#line 2759 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2762 "VBNET.ATG" +#line 2760 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 22) { lexer.NextToken(); -#line 2763 "VBNET.ATG" +#line 2761 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } } else if (StartOf(8)) { TypeArgumentList( -#line 2764 "VBNET.ATG" +#line 2762 "VBNET.ATG" typeref.GenericTypes); } else SynErr(309); Expect(38); @@ -6978,24 +6976,24 @@ typeref.GenericTypes); } void RankList( -#line 2801 "VBNET.ATG" +#line 2799 "VBNET.ATG" out int i) { -#line 2802 "VBNET.ATG" +#line 2800 "VBNET.ATG" i = 0; while (la.kind == 22) { lexer.NextToken(); -#line 2803 "VBNET.ATG" +#line 2801 "VBNET.ATG" ++i; } } void Attribute( -#line 2842 "VBNET.ATG" +#line 2840 "VBNET.ATG" out ASTAttribute attribute) { -#line 2844 "VBNET.ATG" +#line 2842 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -7006,43 +7004,43 @@ out ASTAttribute attribute) { Expect(26); } Qualident( -#line 2850 "VBNET.ATG" +#line 2848 "VBNET.ATG" out name); if (la.kind == 37) { AttributeArguments( -#line 2851 "VBNET.ATG" +#line 2849 "VBNET.ATG" positional, named); } -#line 2853 "VBNET.ATG" +#line 2851 "VBNET.ATG" attribute = new ASTAttribute(name, positional, named) { StartLocation = startLocation, EndLocation = t.EndLocation }; } void AttributeArguments( -#line 2858 "VBNET.ATG" +#line 2856 "VBNET.ATG" List positional, List named) { -#line 2860 "VBNET.ATG" +#line 2858 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(37); if ( -#line 2866 "VBNET.ATG" +#line 2864 "VBNET.ATG" IsNotClosingParenthesis()) { -#line 2867 "VBNET.ATG" +#line 2865 "VBNET.ATG" Location startLocation = la.Location; if ( -#line 2869 "VBNET.ATG" +#line 2867 "VBNET.ATG" IsNamedAssign()) { -#line 2869 "VBNET.ATG" +#line 2867 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2870 "VBNET.ATG" +#line 2868 "VBNET.ATG" out name); if (la.kind == 55) { lexer.NextToken(); @@ -7051,10 +7049,10 @@ out name); } else SynErr(310); } Expr( -#line 2872 "VBNET.ATG" +#line 2870 "VBNET.ATG" out expr); -#line 2874 "VBNET.ATG" +#line 2872 "VBNET.ATG" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }); name = ""; } @@ -7063,13 +7061,13 @@ out expr); while (la.kind == 22) { lexer.NextToken(); if ( -#line 2882 "VBNET.ATG" +#line 2880 "VBNET.ATG" IsNamedAssign()) { -#line 2882 "VBNET.ATG" +#line 2880 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2883 "VBNET.ATG" +#line 2881 "VBNET.ATG" out name); if (la.kind == 55) { lexer.NextToken(); @@ -7078,14 +7076,14 @@ out name); } else SynErr(311); } else if (StartOf(24)) { -#line 2885 "VBNET.ATG" +#line 2883 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); } else SynErr(312); Expr( -#line 2886 "VBNET.ATG" +#line 2884 "VBNET.ATG" out expr); -#line 2886 "VBNET.ATG" +#line 2884 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr) { StartLocation = startLocation, EndLocation = t.EndLocation }); name = ""; } } @@ -7096,34 +7094,34 @@ out expr); } void ParameterModifier( -#line 3674 "VBNET.ATG" +#line 3672 "VBNET.ATG" ParamModifierList m) { if (la.kind == 72) { lexer.NextToken(); -#line 3675 "VBNET.ATG" +#line 3673 "VBNET.ATG" m.Add(ParameterModifiers.In); } else if (la.kind == 69) { lexer.NextToken(); -#line 3676 "VBNET.ATG" +#line 3674 "VBNET.ATG" m.Add(ParameterModifiers.Ref); } else if (la.kind == 174) { lexer.NextToken(); -#line 3677 "VBNET.ATG" +#line 3675 "VBNET.ATG" m.Add(ParameterModifiers.Optional); } else if (la.kind == 182) { lexer.NextToken(); -#line 3678 "VBNET.ATG" +#line 3676 "VBNET.ATG" m.Add(ParameterModifiers.Params); } else SynErr(313); } void Statement() { -#line 3005 "VBNET.ATG" +#line 3003 "VBNET.ATG" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -7131,27 +7129,27 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 21) { } else if ( -#line 3011 "VBNET.ATG" +#line 3009 "VBNET.ATG" IsLabel()) { LabelName( -#line 3011 "VBNET.ATG" +#line 3009 "VBNET.ATG" out label); -#line 3013 "VBNET.ATG" +#line 3011 "VBNET.ATG" AddChild(new LabelStatement(t.val)); Expect(21); Statement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 3016 "VBNET.ATG" +#line 3014 "VBNET.ATG" out stmt); -#line 3016 "VBNET.ATG" +#line 3014 "VBNET.ATG" AddChild(stmt); } else SynErr(314); -#line 3019 "VBNET.ATG" +#line 3017 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -7160,30 +7158,30 @@ out stmt); } void LabelName( -#line 3448 "VBNET.ATG" +#line 3446 "VBNET.ATG" out string name) { -#line 3450 "VBNET.ATG" +#line 3448 "VBNET.ATG" name = String.Empty; if (StartOf(4)) { Identifier(); -#line 3452 "VBNET.ATG" +#line 3450 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 3453 "VBNET.ATG" +#line 3451 "VBNET.ATG" name = t.val; } else SynErr(315); } void LocalDeclarationStatement( -#line 3027 "VBNET.ATG" +#line 3025 "VBNET.ATG" out Statement statement) { -#line 3029 "VBNET.ATG" +#line 3027 "VBNET.ATG" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -7192,22 +7190,22 @@ out Statement statement) { if (la.kind == 88) { lexer.NextToken(); -#line 3035 "VBNET.ATG" +#line 3033 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); } else if (la.kind == 204) { lexer.NextToken(); -#line 3036 "VBNET.ATG" +#line 3034 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 3037 "VBNET.ATG" +#line 3035 "VBNET.ATG" dimfound = true; } } -#line 3040 "VBNET.ATG" +#line 3038 "VBNET.ATG" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -7220,135 +7218,135 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 3051 "VBNET.ATG" +#line 3049 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 3052 "VBNET.ATG" +#line 3050 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 3054 "VBNET.ATG" +#line 3052 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 3562 "VBNET.ATG" +#line 3560 "VBNET.ATG" out Statement tryStatement) { -#line 3564 "VBNET.ATG" +#line 3562 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(218); EndOfStmt(); Block( -#line 3567 "VBNET.ATG" +#line 3565 "VBNET.ATG" out blockStmt); if (la.kind == 75 || la.kind == 113 || la.kind == 123) { CatchClauses( -#line 3568 "VBNET.ATG" +#line 3566 "VBNET.ATG" out catchClauses); } if (la.kind == 123) { lexer.NextToken(); EndOfStmt(); Block( -#line 3569 "VBNET.ATG" +#line 3567 "VBNET.ATG" out finallyStmt); } Expect(113); Expect(218); -#line 3572 "VBNET.ATG" +#line 3570 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 3542 "VBNET.ATG" +#line 3540 "VBNET.ATG" out Statement withStatement) { -#line 3544 "VBNET.ATG" +#line 3542 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(233); -#line 3547 "VBNET.ATG" +#line 3545 "VBNET.ATG" Location start = t.Location; Expr( -#line 3548 "VBNET.ATG" +#line 3546 "VBNET.ATG" out expr); EndOfStmt(); -#line 3550 "VBNET.ATG" +#line 3548 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 3553 "VBNET.ATG" +#line 3551 "VBNET.ATG" out blockStmt); -#line 3555 "VBNET.ATG" +#line 3553 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; Expect(113); Expect(233); -#line 3558 "VBNET.ATG" +#line 3556 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 3535 "VBNET.ATG" +#line 3533 "VBNET.ATG" out ConditionType conditionType) { -#line 3536 "VBNET.ATG" +#line 3534 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 231) { lexer.NextToken(); -#line 3537 "VBNET.ATG" +#line 3535 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 224) { lexer.NextToken(); -#line 3538 "VBNET.ATG" +#line 3536 "VBNET.ATG" conditionType = ConditionType.Until; } else SynErr(316); } void LoopControlVariable( -#line 3378 "VBNET.ATG" +#line 3376 "VBNET.ATG" out TypeReference type, out string name) { -#line 3379 "VBNET.ATG" +#line 3377 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 3383 "VBNET.ATG" +#line 3381 "VBNET.ATG" out name); if ( -#line 3384 "VBNET.ATG" +#line 3382 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 3384 "VBNET.ATG" +#line 3382 "VBNET.ATG" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3385 "VBNET.ATG" +#line 3383 "VBNET.ATG" out type); -#line 3385 "VBNET.ATG" +#line 3383 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 3387 "VBNET.ATG" +#line 3385 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -7360,34 +7358,34 @@ out type); } void ReDimClause( -#line 3457 "VBNET.ATG" +#line 3455 "VBNET.ATG" out Expression expr) { SimpleNonInvocationExpression( -#line 3459 "VBNET.ATG" +#line 3457 "VBNET.ATG" out expr); ReDimClauseInternal( -#line 3460 "VBNET.ATG" +#line 3458 "VBNET.ATG" ref expr); } void SingleLineStatementList( -#line 3364 "VBNET.ATG" +#line 3362 "VBNET.ATG" List list) { -#line 3365 "VBNET.ATG" +#line 3363 "VBNET.ATG" Statement embeddedStatement = null; if (la.kind == 113) { lexer.NextToken(); -#line 3367 "VBNET.ATG" +#line 3365 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 3368 "VBNET.ATG" +#line 3366 "VBNET.ATG" out embeddedStatement); } else SynErr(317); -#line 3369 "VBNET.ATG" +#line 3367 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); while (la.kind == 21) { lexer.NextToken(); @@ -7397,62 +7395,62 @@ out embeddedStatement); if (la.kind == 113) { lexer.NextToken(); -#line 3371 "VBNET.ATG" +#line 3369 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(49)) { EmbeddedStatement( -#line 3372 "VBNET.ATG" +#line 3370 "VBNET.ATG" out embeddedStatement); } else SynErr(318); -#line 3373 "VBNET.ATG" +#line 3371 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); } } void CaseClauses( -#line 3495 "VBNET.ATG" +#line 3493 "VBNET.ATG" out List caseClauses) { -#line 3497 "VBNET.ATG" +#line 3495 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 3500 "VBNET.ATG" +#line 3498 "VBNET.ATG" out caseClause); -#line 3500 "VBNET.ATG" +#line 3498 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 22) { lexer.NextToken(); CaseClause( -#line 3501 "VBNET.ATG" +#line 3499 "VBNET.ATG" out caseClause); -#line 3501 "VBNET.ATG" +#line 3499 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 3398 "VBNET.ATG" +#line 3396 "VBNET.ATG" out OnErrorStatement stmt) { -#line 3400 "VBNET.ATG" +#line 3398 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(171); Expect(118); if ( -#line 3406 "VBNET.ATG" +#line 3404 "VBNET.ATG" IsNegativeLabelName()) { Expect(132); Expect(30); Expect(5); -#line 3408 "VBNET.ATG" +#line 3406 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -7461,10 +7459,10 @@ IsNegativeLabelName()) { } else if (la.kind == 132) { GotoStatement( -#line 3414 "VBNET.ATG" +#line 3412 "VBNET.ATG" out goToStatement); -#line 3416 "VBNET.ATG" +#line 3414 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -7481,88 +7479,88 @@ out goToStatement); lexer.NextToken(); Expect(163); -#line 3430 "VBNET.ATG" +#line 3428 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); } else SynErr(319); } void GotoStatement( -#line 3436 "VBNET.ATG" +#line 3434 "VBNET.ATG" out GotoStatement goToStatement) { -#line 3438 "VBNET.ATG" +#line 3436 "VBNET.ATG" string label = String.Empty; Expect(132); LabelName( -#line 3441 "VBNET.ATG" +#line 3439 "VBNET.ATG" out label); -#line 3443 "VBNET.ATG" +#line 3441 "VBNET.ATG" goToStatement = new GotoStatement(label); } void ResumeStatement( -#line 3484 "VBNET.ATG" +#line 3482 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 3486 "VBNET.ATG" +#line 3484 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 3489 "VBNET.ATG" +#line 3487 "VBNET.ATG" IsResumeNext()) { Expect(194); Expect(163); -#line 3490 "VBNET.ATG" +#line 3488 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 194) { lexer.NextToken(); if (StartOf(50)) { LabelName( -#line 3491 "VBNET.ATG" +#line 3489 "VBNET.ATG" out label); } -#line 3491 "VBNET.ATG" +#line 3489 "VBNET.ATG" resumeStatement = new ResumeStatement(label); } else SynErr(320); } void ReDimClauseInternal( -#line 3463 "VBNET.ATG" +#line 3461 "VBNET.ATG" ref Expression expr) { -#line 3464 "VBNET.ATG" +#line 3462 "VBNET.ATG" List arguments; bool canBeNormal; bool canBeRedim; string name; while (la.kind == 26 || -#line 3467 "VBNET.ATG" +#line 3465 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { if (la.kind == 26) { lexer.NextToken(); IdentifierOrKeyword( -#line 3466 "VBNET.ATG" +#line 3464 "VBNET.ATG" out name); -#line 3466 "VBNET.ATG" +#line 3464 "VBNET.ATG" expr = new MemberReferenceExpression(expr, name); } else { InvocationExpression( -#line 3468 "VBNET.ATG" +#line 3466 "VBNET.ATG" ref expr); } } Expect(37); NormalOrReDimArgumentList( -#line 3471 "VBNET.ATG" +#line 3469 "VBNET.ATG" out arguments, out canBeNormal, out canBeRedim); Expect(38); -#line 3473 "VBNET.ATG" +#line 3471 "VBNET.ATG" expr = new InvocationExpression(expr, arguments); if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { if (this.Errors.Count == 0) { @@ -7574,10 +7572,10 @@ out arguments, out canBeNormal, out canBeRedim); } void CaseClause( -#line 3505 "VBNET.ATG" +#line 3503 "VBNET.ATG" out CaseLabel caseClause) { -#line 3507 "VBNET.ATG" +#line 3505 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -7586,7 +7584,7 @@ out CaseLabel caseClause) { if (la.kind == 111) { lexer.NextToken(); -#line 3513 "VBNET.ATG" +#line 3511 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(51)) { if (la.kind == 144) { @@ -7596,76 +7594,76 @@ out CaseLabel caseClause) { case 40: { lexer.NextToken(); -#line 3517 "VBNET.ATG" +#line 3515 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 39: { lexer.NextToken(); -#line 3518 "VBNET.ATG" +#line 3516 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 43: { lexer.NextToken(); -#line 3519 "VBNET.ATG" +#line 3517 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 42: { lexer.NextToken(); -#line 3520 "VBNET.ATG" +#line 3518 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 20: { lexer.NextToken(); -#line 3521 "VBNET.ATG" +#line 3519 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 41: { lexer.NextToken(); -#line 3522 "VBNET.ATG" +#line 3520 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } default: SynErr(321); break; } Expr( -#line 3524 "VBNET.ATG" +#line 3522 "VBNET.ATG" out expr); -#line 3526 "VBNET.ATG" +#line 3524 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(24)) { Expr( -#line 3528 "VBNET.ATG" +#line 3526 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); Expr( -#line 3528 "VBNET.ATG" +#line 3526 "VBNET.ATG" out sexpr); } -#line 3530 "VBNET.ATG" +#line 3528 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); } else SynErr(322); } void CatchClauses( -#line 3577 "VBNET.ATG" +#line 3575 "VBNET.ATG" out List catchClauses) { -#line 3579 "VBNET.ATG" +#line 3577 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -7677,27 +7675,27 @@ out List catchClauses) { if (StartOf(4)) { Identifier(); -#line 3587 "VBNET.ATG" +#line 3585 "VBNET.ATG" name = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3587 "VBNET.ATG" +#line 3585 "VBNET.ATG" out type); } } if (la.kind == 229) { lexer.NextToken(); Expr( -#line 3588 "VBNET.ATG" +#line 3586 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 3590 "VBNET.ATG" +#line 3588 "VBNET.ATG" out blockStmt); -#line 3591 "VBNET.ATG" +#line 3589 "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 6b5549d594..92af44d379 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -871,8 +871,7 @@ StructureMemberDecl attributes> TypeReference = new TypeReference("System.Void", true), Templates = templates, HandlesClause = handlesClause, - InterfaceImplementations = implementsClause, - IsExtensionMethod = attributes.Any(section => section.Attributes.Any(a => a.Name.Contains("Extension"))) + InterfaceImplementations = implementsClause }; AddChild(methodDeclaration); .) @@ -980,8 +979,7 @@ StructureMemberDecl attributes> EndLocation = endLocation, Templates = templates, HandlesClause = handlesClause, - InterfaceImplementations = implementsClause, - IsExtensionMethod = attributes.Any(section => section.Attributes.Any(a => a.Name.Contains("Extension"))) + InterfaceImplementations = implementsClause }; AddChild(methodDeclaration);