diff --git a/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/TypeLevel.cs b/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/TypeLevel.cs index 5f1d50ddc8..1d3fcc4f32 100644 --- a/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/TypeLevel.cs +++ b/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/TypeLevel.cs @@ -51,7 +51,7 @@ namespace NRefactoryASTGenerator.Ast } [ImplementNullable(NullableImplementation.Abstract)] - abstract class EventAddRemoveRegion : AttributedNode + abstract class EventAddRemoveRegion : AttributedNode, INullable { BlockStatement block; List parameters; @@ -192,7 +192,7 @@ namespace NRefactoryASTGenerator.Ast } [ImplementNullable(NullableImplementation.Abstract)] - abstract class PropertyGetSetRegion : AttributedNode + abstract class PropertyGetSetRegion : AttributedNode, INullable { // can be null if only the definition is there (interface declaration) BlockStatement block; diff --git a/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs b/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs index f060198dc6..28b952700f 100644 --- a/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs +++ b/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs @@ -1515,6 +1515,7 @@ namespace ICSharpCode.NRefactory.Ast { } set { addRegion = value ?? EventAddRegion.Null; + if (!addRegion.IsNull) addRegion.Parent = this; } } @@ -1524,6 +1525,7 @@ namespace ICSharpCode.NRefactory.Ast { } set { removeRegion = value ?? EventRemoveRegion.Null; + if (!removeRegion.IsNull) removeRegion.Parent = this; } } @@ -1533,6 +1535,7 @@ namespace ICSharpCode.NRefactory.Ast { } set { raiseRegion = value ?? EventRaiseRegion.Null; + if (!raiseRegion.IsNull) raiseRegion.Parent = this; } } @@ -2404,6 +2407,7 @@ namespace ICSharpCode.NRefactory.Ast { } set { getRegion = value ?? PropertyGetRegion.Null; + if (!getRegion.IsNull) getRegion.Parent = this; } } @@ -2413,6 +2417,7 @@ namespace ICSharpCode.NRefactory.Ast { } set { setRegion = value ?? PropertySetRegion.Null; + if (!setRegion.IsNull) setRegion.Parent = this; } } @@ -3339,6 +3344,7 @@ public Location ExtendedEndLocation { get; set; } } set { getRegion = value ?? PropertyGetRegion.Null; + if (!getRegion.IsNull) getRegion.Parent = this; } } @@ -3348,6 +3354,7 @@ public Location ExtendedEndLocation { get; set; } } set { setRegion = value ?? PropertySetRegion.Null; + if (!setRegion.IsNull) setRegion.Parent = this; } } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/CSharpParser.cs b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/CSharpParser.cs index 1f1f7c80da..4281ac9828 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/CSharpParser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/CSharpParser.cs @@ -600,5 +600,14 @@ namespace ICSharpCode.NRefactory.Parser.CSharp } } } + + static void SetParentNonNullable(List list, INode parent) where T : class, INode + { + if (list != null) { + foreach (T x in list) { + x.Parent = parent; + } + } + } } } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs index 53310ac66a..d8d4bdf534 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs @@ -453,68 +453,68 @@ out expr); } void Expr( -#line 1734 "cs.ATG" +#line 1738 "cs.ATG" out Expression expr) { -#line 1735 "cs.ATG" +#line 1739 "cs.ATG" expr = null; Expression expr1 = null, expr2 = null; AssignmentOperatorType op; -#line 1737 "cs.ATG" +#line 1741 "cs.ATG" Location startLocation = la.Location; UnaryExpr( -#line 1738 "cs.ATG" +#line 1742 "cs.ATG" out expr); if (StartOf(7)) { AssignmentOperator( -#line 1741 "cs.ATG" +#line 1745 "cs.ATG" out op); Expr( -#line 1741 "cs.ATG" +#line 1745 "cs.ATG" out expr1); -#line 1741 "cs.ATG" +#line 1745 "cs.ATG" expr = new AssignmentExpression(expr, op, expr1); } else if ( -#line 1742 "cs.ATG" +#line 1746 "cs.ATG" la.kind == Tokens.GreaterThan && Peek(1).kind == Tokens.GreaterEqual) { AssignmentOperator( -#line 1743 "cs.ATG" +#line 1747 "cs.ATG" out op); Expr( -#line 1743 "cs.ATG" +#line 1747 "cs.ATG" out expr1); -#line 1743 "cs.ATG" +#line 1747 "cs.ATG" expr = new AssignmentExpression(expr, op, expr1); } else if (StartOf(8)) { ConditionalOrExpr( -#line 1745 "cs.ATG" +#line 1749 "cs.ATG" ref expr); if (la.kind == 13) { lexer.NextToken(); Expr( -#line 1746 "cs.ATG" +#line 1750 "cs.ATG" out expr1); -#line 1746 "cs.ATG" +#line 1750 "cs.ATG" expr = new BinaryOperatorExpression(expr, BinaryOperatorType.NullCoalescing, expr1); } if (la.kind == 12) { lexer.NextToken(); Expr( -#line 1747 "cs.ATG" +#line 1751 "cs.ATG" out expr1); Expect(9); Expr( -#line 1747 "cs.ATG" +#line 1751 "cs.ATG" out expr2); -#line 1747 "cs.ATG" +#line 1751 "cs.ATG" expr = new ConditionalExpression(expr, expr1, expr2); } } else SynErr(150); -#line 1750 "cs.ATG" +#line 1754 "cs.ATG" if (expr != null) { expr.StartLocation = startLocation; expr.EndLocation = t.EndLocation; @@ -707,6 +707,9 @@ ModifierList m, List attributes) { #line 367 "cs.ATG" templates); } + +#line 367 "cs.ATG" + SetParentNonNullable(templates, newType); if (la.kind == 9) { ClassBase( #line 369 "cs.ATG" @@ -758,6 +761,9 @@ templates); #line 392 "cs.ATG" templates); } + +#line 392 "cs.ATG" + SetParentNonNullable(templates, newType); if (la.kind == 9) { StructInterfaces( #line 394 "cs.ATG" @@ -803,6 +809,9 @@ templates); #line 416 "cs.ATG" templates); } + +#line 416 "cs.ATG" + SetParentNonNullable(templates, newType); if (la.kind == 9) { InterfaceBase( #line 418 "cs.ATG" @@ -895,6 +904,9 @@ out type); #line 454 "cs.ATG" templates); } + +#line 454 "cs.ATG" + SetParentNonNullable(templates, delegateDeclr); Expect(20); if (StartOf(11)) { FormalParameterList( @@ -921,39 +933,39 @@ templates); } void TypeParameterList( -#line 2304 "cs.ATG" +#line 2308 "cs.ATG" List templates) { -#line 2306 "cs.ATG" +#line 2310 "cs.ATG" AttributeSection section; List attributes = new List(); Expect(23); while (la.kind == 18) { AttributeSection( -#line 2310 "cs.ATG" +#line 2314 "cs.ATG" out section); -#line 2310 "cs.ATG" +#line 2314 "cs.ATG" attributes.Add(section); } Identifier(); -#line 2311 "cs.ATG" +#line 2315 "cs.ATG" templates.Add(new TemplateDefinition(t.val, attributes)); while (la.kind == 14) { lexer.NextToken(); while (la.kind == 18) { AttributeSection( -#line 2312 "cs.ATG" +#line 2316 "cs.ATG" out section); -#line 2312 "cs.ATG" +#line 2316 "cs.ATG" attributes.Add(section); } Identifier(); -#line 2313 "cs.ATG" +#line 2317 "cs.ATG" templates.Add(new TemplateDefinition(t.val, attributes)); } Expect(22); @@ -986,22 +998,22 @@ out typeRef, false); } void TypeParameterConstraintsClause( -#line 2317 "cs.ATG" +#line 2321 "cs.ATG" List templates) { -#line 2318 "cs.ATG" +#line 2322 "cs.ATG" string name = ""; TypeReference type; Expect(127); Identifier(); -#line 2321 "cs.ATG" +#line 2325 "cs.ATG" name = t.val; Expect(9); TypeParameterConstraintsClauseBase( -#line 2323 "cs.ATG" +#line 2327 "cs.ATG" out type); -#line 2324 "cs.ATG" +#line 2328 "cs.ATG" TemplateDefinition td = null; foreach (TemplateDefinition d in templates) { if (d.Name == name) { @@ -1014,10 +1026,10 @@ out type); while (la.kind == 14) { lexer.NextToken(); TypeParameterConstraintsClauseBase( -#line 2333 "cs.ATG" +#line 2337 "cs.ATG" out type); -#line 2334 "cs.ATG" +#line 2338 "cs.ATG" td = null; foreach (TemplateDefinition d in templates) { if (d.Name == name) { @@ -1353,33 +1365,33 @@ out r, canBeUnbound); } void TypeName( -#line 2247 "cs.ATG" +#line 2251 "cs.ATG" out TypeReference typeRef, bool canBeUnbound) { -#line 2248 "cs.ATG" +#line 2252 "cs.ATG" List typeArguments = null; string alias = null; string qualident; if ( -#line 2253 "cs.ATG" +#line 2257 "cs.ATG" IdentAndDoubleColon()) { Identifier(); -#line 2254 "cs.ATG" +#line 2258 "cs.ATG" alias = t.val; Expect(10); } Qualident( -#line 2257 "cs.ATG" +#line 2261 "cs.ATG" out qualident); if (la.kind == 23) { TypeArgumentList( -#line 2258 "cs.ATG" +#line 2262 "cs.ATG" out typeArguments, canBeUnbound); } -#line 2260 "cs.ATG" +#line 2264 "cs.ATG" if (alias == null) { typeRef = new TypeReference(qualident, typeArguments); } else if (alias == "global") { @@ -1390,22 +1402,22 @@ out typeArguments, canBeUnbound); } while ( -#line 2269 "cs.ATG" +#line 2273 "cs.ATG" DotAndIdent()) { Expect(15); -#line 2270 "cs.ATG" +#line 2274 "cs.ATG" typeArguments = null; Qualident( -#line 2271 "cs.ATG" +#line 2275 "cs.ATG" out qualident); if (la.kind == 23) { TypeArgumentList( -#line 2272 "cs.ATG" +#line 2276 "cs.ATG" out typeArguments, canBeUnbound); } -#line 2273 "cs.ATG" +#line 2277 "cs.ATG" typeRef = new InnerClassTypeReference(typeRef, qualident, typeArguments); } } @@ -1532,23 +1544,23 @@ ModifierList m) { } void ClassMemberDecl( -#line 1033 "cs.ATG" +#line 1035 "cs.ATG" ModifierList m, List attributes) { -#line 1034 "cs.ATG" +#line 1036 "cs.ATG" Statement stmt = null; if (StartOf(21)) { StructMemberDecl( -#line 1036 "cs.ATG" +#line 1038 "cs.ATG" m, attributes); } else if (la.kind == 27) { -#line 1037 "cs.ATG" +#line 1039 "cs.ATG" m.Check(Modifiers.Destructors); Location startPos = t.Location; lexer.NextToken(); Identifier(); -#line 1038 "cs.ATG" +#line 1040 "cs.ATG" DestructorDeclaration d = new DestructorDeclaration(t.val, m.Modifier, attributes); d.Modifier = m.Modifier; d.StartLocation = m.GetDeclarationLocation(startPos); @@ -1556,17 +1568,17 @@ m, attributes); Expect(20); Expect(21); -#line 1042 "cs.ATG" +#line 1044 "cs.ATG" d.EndLocation = t.EndLocation; if (la.kind == 16) { Block( -#line 1042 "cs.ATG" +#line 1044 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(160); -#line 1043 "cs.ATG" +#line 1045 "cs.ATG" d.Body = (BlockStatement)stmt; compilationUnit.AddChild(d); @@ -1691,6 +1703,7 @@ p); Templates = templates, IsExtensionMethod = isExtensionMethod }; + SetParentNonNullable(templates, methodDeclaration); if (explicitInterface != null) methodDeclaration.InterfaceImplementations.Add(new InterfaceImplementation(explicitInterface, qualident)); compilationUnit.AddChild(methodDeclaration); @@ -1698,28 +1711,28 @@ p); while (la.kind == 127) { TypeParameterConstraintsClause( -#line 788 "cs.ATG" +#line 789 "cs.ATG" templates); } if (la.kind == 16) { Block( -#line 790 "cs.ATG" +#line 791 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(163); -#line 790 "cs.ATG" +#line 791 "cs.ATG" compilationUnit.BlockEnd(); methodDeclaration.Body = (BlockStatement)stmt; } else if (la.kind == 69) { -#line 794 "cs.ATG" +#line 795 "cs.ATG" m.Check(Modifiers.PropertysEventsMethods); lexer.NextToken(); -#line 796 "cs.ATG" +#line 797 "cs.ATG" EventDeclaration eventDecl = new EventDeclaration { Modifier = m.Modifier, Attributes = attributes, @@ -1731,113 +1744,113 @@ out stmt); EventRemoveRegion removeBlock = null; Type( -#line 806 "cs.ATG" +#line 807 "cs.ATG" out type); -#line 806 "cs.ATG" +#line 807 "cs.ATG" eventDecl.TypeReference = type; if ( -#line 807 "cs.ATG" +#line 808 "cs.ATG" IsExplicitInterfaceImplementation()) { TypeName( -#line 808 "cs.ATG" +#line 809 "cs.ATG" out explicitInterface, false); -#line 809 "cs.ATG" +#line 810 "cs.ATG" qualident = TypeReference.StripLastIdentifierFromType(ref explicitInterface); -#line 810 "cs.ATG" +#line 811 "cs.ATG" eventDecl.InterfaceImplementations.Add(new InterfaceImplementation(explicitInterface, qualident)); } else if (StartOf(19)) { Identifier(); -#line 812 "cs.ATG" +#line 813 "cs.ATG" qualident = t.val; } else SynErr(164); -#line 814 "cs.ATG" +#line 815 "cs.ATG" eventDecl.Name = qualident; eventDecl.EndLocation = t.EndLocation; if (la.kind == 3) { lexer.NextToken(); Expr( -#line 815 "cs.ATG" +#line 816 "cs.ATG" out expr); -#line 815 "cs.ATG" +#line 816 "cs.ATG" eventDecl.Initializer = expr; } if (la.kind == 16) { lexer.NextToken(); -#line 816 "cs.ATG" +#line 817 "cs.ATG" eventDecl.BodyStart = t.Location; EventAccessorDecls( -#line 817 "cs.ATG" +#line 818 "cs.ATG" out addBlock, out removeBlock); Expect(17); -#line 818 "cs.ATG" +#line 819 "cs.ATG" eventDecl.BodyEnd = t.EndLocation; } if (la.kind == 11) { lexer.NextToken(); } -#line 821 "cs.ATG" +#line 822 "cs.ATG" compilationUnit.BlockEnd(); eventDecl.AddRegion = addBlock; eventDecl.RemoveRegion = removeBlock; } else if ( -#line 827 "cs.ATG" +#line 828 "cs.ATG" IdentAndLPar()) { -#line 827 "cs.ATG" +#line 828 "cs.ATG" m.Check(Modifiers.Constructors | Modifiers.StaticConstructors); Identifier(); -#line 828 "cs.ATG" +#line 829 "cs.ATG" string name = t.val; Location startPos = t.Location; Expect(20); if (StartOf(11)) { -#line 828 "cs.ATG" +#line 829 "cs.ATG" m.Check(Modifiers.Constructors); FormalParameterList( -#line 829 "cs.ATG" +#line 830 "cs.ATG" p); } Expect(21); -#line 831 "cs.ATG" +#line 832 "cs.ATG" ConstructorInitializer init = null; if (la.kind == 9) { -#line 832 "cs.ATG" +#line 833 "cs.ATG" m.Check(Modifiers.Constructors); ConstructorInitializer( -#line 833 "cs.ATG" +#line 834 "cs.ATG" out init); } -#line 835 "cs.ATG" +#line 836 "cs.ATG" ConstructorDeclaration cd = new ConstructorDeclaration(name, m.Modifier, p, init, attributes); cd.StartLocation = startPos; cd.EndLocation = t.EndLocation; if (la.kind == 16) { Block( -#line 840 "cs.ATG" +#line 841 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(165); -#line 840 "cs.ATG" +#line 841 "cs.ATG" cd.Body = (BlockStatement)stmt; compilationUnit.AddChild(cd); } else if (la.kind == 70 || la.kind == 80) { -#line 843 "cs.ATG" +#line 844 "cs.ATG" m.Check(Modifiers.Operators); if (m.isNone) Error("at least one modifier must be set"); bool isImplicit = true; @@ -1846,45 +1859,45 @@ out stmt); if (la.kind == 80) { lexer.NextToken(); -#line 848 "cs.ATG" +#line 849 "cs.ATG" startPos = t.Location; } else { lexer.NextToken(); -#line 848 "cs.ATG" +#line 849 "cs.ATG" isImplicit = false; startPos = t.Location; } Expect(92); Type( -#line 849 "cs.ATG" +#line 850 "cs.ATG" out type); -#line 849 "cs.ATG" +#line 850 "cs.ATG" TypeReference operatorType = type; Expect(20); Type( -#line 850 "cs.ATG" +#line 851 "cs.ATG" out type); Identifier(); -#line 850 "cs.ATG" +#line 851 "cs.ATG" string varName = t.val; Expect(21); -#line 851 "cs.ATG" +#line 852 "cs.ATG" Location endPos = t.Location; if (la.kind == 16) { Block( -#line 852 "cs.ATG" +#line 853 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); -#line 852 "cs.ATG" +#line 853 "cs.ATG" stmt = null; } else SynErr(166); -#line 855 "cs.ATG" +#line 856 "cs.ATG" List parameters = new List(); parameters.Add(new ParameterDeclarationExpression(type, varName)); OperatorDeclaration operatorDeclaration = new OperatorDeclaration { @@ -1902,61 +1915,61 @@ out stmt); } else if (StartOf(22)) { TypeDecl( -#line 873 "cs.ATG" +#line 874 "cs.ATG" m, attributes); } else if (StartOf(10)) { Type( -#line 875 "cs.ATG" +#line 876 "cs.ATG" out type); -#line 875 "cs.ATG" +#line 876 "cs.ATG" Location startPos = t.Location; if (la.kind == 92) { -#line 877 "cs.ATG" +#line 878 "cs.ATG" OverloadableOperatorType op; m.Check(Modifiers.Operators); if (m.isNone) Error("at least one modifier must be set"); lexer.NextToken(); OverloadableOperator( -#line 881 "cs.ATG" +#line 882 "cs.ATG" out op); -#line 881 "cs.ATG" +#line 882 "cs.ATG" TypeReference firstType, secondType = null; string secondName = null; Expect(20); Type( -#line 882 "cs.ATG" +#line 883 "cs.ATG" out firstType); Identifier(); -#line 882 "cs.ATG" +#line 883 "cs.ATG" string firstName = t.val; if (la.kind == 14) { lexer.NextToken(); Type( -#line 883 "cs.ATG" +#line 884 "cs.ATG" out secondType); Identifier(); -#line 883 "cs.ATG" +#line 884 "cs.ATG" secondName = t.val; } else if (la.kind == 21) { } else SynErr(167); -#line 891 "cs.ATG" +#line 892 "cs.ATG" Location endPos = t.Location; Expect(21); if (la.kind == 16) { Block( -#line 892 "cs.ATG" +#line 893 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(168); -#line 894 "cs.ATG" +#line 895 "cs.ATG" List parameters = new List(); parameters.Add(new ParameterDeclarationExpression(firstType, firstName)); if (secondType != null) { @@ -1976,75 +1989,75 @@ out stmt); compilationUnit.AddChild(operatorDeclaration); } else if ( -#line 914 "cs.ATG" +#line 915 "cs.ATG" IsVarDecl()) { -#line 915 "cs.ATG" +#line 916 "cs.ATG" m.Check(Modifiers.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(startPos); if ( -#line 919 "cs.ATG" +#line 920 "cs.ATG" m.Contains(Modifiers.Fixed)) { VariableDeclarator( -#line 920 "cs.ATG" +#line 921 "cs.ATG" fd); Expect(18); Expr( -#line 922 "cs.ATG" +#line 923 "cs.ATG" out expr); -#line 922 "cs.ATG" +#line 923 "cs.ATG" if (fd.Fields.Count > 0) fd.Fields[fd.Fields.Count-1].FixedArrayInitialization = expr; Expect(19); while (la.kind == 14) { lexer.NextToken(); VariableDeclarator( -#line 926 "cs.ATG" +#line 927 "cs.ATG" fd); Expect(18); Expr( -#line 928 "cs.ATG" +#line 929 "cs.ATG" out expr); -#line 928 "cs.ATG" +#line 929 "cs.ATG" if (fd.Fields.Count > 0) fd.Fields[fd.Fields.Count-1].FixedArrayInitialization = expr; Expect(19); } } else if (StartOf(19)) { VariableDeclarator( -#line 933 "cs.ATG" +#line 934 "cs.ATG" fd); while (la.kind == 14) { lexer.NextToken(); VariableDeclarator( -#line 934 "cs.ATG" +#line 935 "cs.ATG" fd); } } else SynErr(169); Expect(11); -#line 936 "cs.ATG" +#line 937 "cs.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); } else if (la.kind == 111) { -#line 939 "cs.ATG" +#line 940 "cs.ATG" m.Check(Modifiers.Indexers); lexer.NextToken(); Expect(18); FormalParameterList( -#line 940 "cs.ATG" +#line 941 "cs.ATG" p); Expect(19); -#line 940 "cs.ATG" +#line 941 "cs.ATG" Location endLocation = t.EndLocation; Expect(16); -#line 941 "cs.ATG" +#line 942 "cs.ATG" IndexerDeclaration indexer = new IndexerDeclaration(type, p, m.Modifier, attributes); indexer.StartLocation = startPos; indexer.EndLocation = endLocation; @@ -2053,64 +2066,64 @@ p); PropertySetRegion setRegion; AccessorDecls( -#line 948 "cs.ATG" +#line 949 "cs.ATG" out getRegion, out setRegion); Expect(17); -#line 949 "cs.ATG" +#line 950 "cs.ATG" indexer.BodyEnd = t.EndLocation; indexer.GetRegion = getRegion; indexer.SetRegion = setRegion; compilationUnit.AddChild(indexer); } else if ( -#line 954 "cs.ATG" +#line 955 "cs.ATG" IsIdentifierToken(la)) { if ( -#line 955 "cs.ATG" +#line 956 "cs.ATG" IsExplicitInterfaceImplementation()) { TypeName( -#line 956 "cs.ATG" +#line 957 "cs.ATG" out explicitInterface, false); -#line 957 "cs.ATG" +#line 958 "cs.ATG" if (la.kind != Tokens.Dot || Peek(1).kind != Tokens.This) { qualident = TypeReference.StripLastIdentifierFromType(ref explicitInterface); } } else if (StartOf(19)) { Identifier(); -#line 960 "cs.ATG" +#line 961 "cs.ATG" qualident = t.val; } else SynErr(170); -#line 962 "cs.ATG" +#line 963 "cs.ATG" Location qualIdentEndLocation = t.EndLocation; if (la.kind == 16 || la.kind == 20 || la.kind == 23) { if (la.kind == 20 || la.kind == 23) { -#line 966 "cs.ATG" +#line 967 "cs.ATG" m.Check(Modifiers.PropertysEventsMethods); if (la.kind == 23) { TypeParameterList( -#line 968 "cs.ATG" +#line 969 "cs.ATG" templates); } Expect(20); if (la.kind == 111) { lexer.NextToken(); -#line 970 "cs.ATG" +#line 971 "cs.ATG" isExtensionMethod = true; } if (StartOf(11)) { FormalParameterList( -#line 971 "cs.ATG" +#line 972 "cs.ATG" p); } Expect(21); -#line 973 "cs.ATG" +#line 974 "cs.ATG" MethodDeclaration methodDeclaration = new MethodDeclaration { Name = qualident, Modifier = m.Modifier, @@ -2124,27 +2137,28 @@ p); methodDeclaration.EndLocation = t.EndLocation; methodDeclaration.IsExtensionMethod = isExtensionMethod; methodDeclaration.Templates = templates; + SetParentNonNullable(templates, methodDeclaration); compilationUnit.AddChild(methodDeclaration); while (la.kind == 127) { TypeParameterConstraintsClause( -#line 988 "cs.ATG" +#line 990 "cs.ATG" templates); } if (la.kind == 16) { Block( -#line 989 "cs.ATG" +#line 991 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(171); -#line 989 "cs.ATG" +#line 991 "cs.ATG" methodDeclaration.Body = (BlockStatement)stmt; } else { lexer.NextToken(); -#line 992 "cs.ATG" +#line 994 "cs.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(qualident, type, m.Modifier, attributes); if (explicitInterface != null) pDecl.InterfaceImplementations.Add(new InterfaceImplementation(explicitInterface, qualident)); @@ -2155,11 +2169,11 @@ out stmt); PropertySetRegion setRegion; AccessorDecls( -#line 1001 "cs.ATG" +#line 1003 "cs.ATG" out getRegion, out setRegion); Expect(17); -#line 1003 "cs.ATG" +#line 1005 "cs.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.EndLocation; @@ -2168,17 +2182,17 @@ out getRegion, out setRegion); } } else if (la.kind == 15) { -#line 1011 "cs.ATG" +#line 1013 "cs.ATG" m.Check(Modifiers.Indexers); lexer.NextToken(); Expect(111); Expect(18); FormalParameterList( -#line 1012 "cs.ATG" +#line 1014 "cs.ATG" p); Expect(19); -#line 1013 "cs.ATG" +#line 1015 "cs.ATG" IndexerDeclaration indexer = new IndexerDeclaration(type, p, m.Modifier, attributes); indexer.StartLocation = m.GetDeclarationLocation(startPos); indexer.EndLocation = t.EndLocation; @@ -2189,14 +2203,14 @@ p); Expect(16); -#line 1021 "cs.ATG" +#line 1023 "cs.ATG" Location bodyStart = t.Location; AccessorDecls( -#line 1022 "cs.ATG" +#line 1024 "cs.ATG" out getRegion, out setRegion); Expect(17); -#line 1023 "cs.ATG" +#line 1025 "cs.ATG" indexer.BodyStart = bodyStart; indexer.BodyEnd = t.EndLocation; indexer.GetRegion = getRegion; @@ -2210,7 +2224,7 @@ out getRegion, out setRegion); void InterfaceMemberDecl() { -#line 1050 "cs.ATG" +#line 1052 "cs.ATG" TypeReference type; AttributeSection section; @@ -2225,149 +2239,151 @@ out getRegion, out setRegion); while (la.kind == 18) { AttributeSection( -#line 1063 "cs.ATG" +#line 1065 "cs.ATG" out section); -#line 1063 "cs.ATG" +#line 1065 "cs.ATG" attributes.Add(section); } if (la.kind == 89) { lexer.NextToken(); -#line 1064 "cs.ATG" +#line 1066 "cs.ATG" mod = Modifiers.New; startLocation = t.Location; } if ( -#line 1067 "cs.ATG" +#line 1069 "cs.ATG" NotVoidPointer()) { Expect(123); -#line 1067 "cs.ATG" +#line 1069 "cs.ATG" if (startLocation.X == -1) startLocation = t.Location; Identifier(); -#line 1068 "cs.ATG" +#line 1070 "cs.ATG" name = t.val; if (la.kind == 23) { TypeParameterList( -#line 1069 "cs.ATG" +#line 1071 "cs.ATG" templates); } Expect(20); if (StartOf(11)) { FormalParameterList( -#line 1070 "cs.ATG" +#line 1072 "cs.ATG" parameters); } Expect(21); while (la.kind == 127) { TypeParameterConstraintsClause( -#line 1071 "cs.ATG" +#line 1073 "cs.ATG" templates); } Expect(11); -#line 1073 "cs.ATG" +#line 1075 "cs.ATG" MethodDeclaration md = new MethodDeclaration { Name = name, Modifier = mod, TypeReference = new TypeReference("System.Void", true), Parameters = parameters, Attributes = attributes, Templates = templates, StartLocation = startLocation, EndLocation = t.EndLocation }; + SetParentNonNullable(templates, md); compilationUnit.AddChild(md); } else if (StartOf(23)) { if (StartOf(10)) { Type( -#line 1081 "cs.ATG" +#line 1084 "cs.ATG" out type); -#line 1081 "cs.ATG" +#line 1084 "cs.ATG" if (startLocation.X == -1) startLocation = t.Location; if (StartOf(19)) { Identifier(); -#line 1083 "cs.ATG" +#line 1086 "cs.ATG" name = t.val; Location qualIdentEndLocation = t.EndLocation; if (la.kind == 20 || la.kind == 23) { if (la.kind == 23) { TypeParameterList( -#line 1087 "cs.ATG" +#line 1090 "cs.ATG" templates); } Expect(20); if (StartOf(11)) { FormalParameterList( -#line 1088 "cs.ATG" +#line 1091 "cs.ATG" parameters); } Expect(21); while (la.kind == 127) { TypeParameterConstraintsClause( -#line 1090 "cs.ATG" +#line 1093 "cs.ATG" templates); } Expect(11); -#line 1091 "cs.ATG" +#line 1094 "cs.ATG" MethodDeclaration md = new MethodDeclaration { Name = name, Modifier = mod, TypeReference = type, Parameters = parameters, Attributes = attributes, Templates = templates, StartLocation = startLocation, EndLocation = t.EndLocation }; + SetParentNonNullable(templates, md); compilationUnit.AddChild(md); } else if (la.kind == 16) { -#line 1099 "cs.ATG" +#line 1103 "cs.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod, attributes); compilationUnit.AddChild(pd); lexer.NextToken(); -#line 1100 "cs.ATG" +#line 1104 "cs.ATG" Location bodyStart = t.Location; InterfaceAccessors( -#line 1100 "cs.ATG" +#line 1104 "cs.ATG" out getBlock, out setBlock); Expect(17); -#line 1100 "cs.ATG" +#line 1104 "cs.ATG" pd.GetRegion = getBlock; pd.SetRegion = setBlock; pd.StartLocation = startLocation; pd.EndLocation = qualIdentEndLocation; pd.BodyStart = bodyStart; pd.BodyEnd = t.EndLocation; } else SynErr(175); } else if (la.kind == 111) { lexer.NextToken(); Expect(18); FormalParameterList( -#line 1103 "cs.ATG" +#line 1107 "cs.ATG" parameters); Expect(19); -#line 1103 "cs.ATG" +#line 1107 "cs.ATG" Location bracketEndLocation = t.EndLocation; -#line 1103 "cs.ATG" +#line 1107 "cs.ATG" IndexerDeclaration id = new IndexerDeclaration(type, parameters, mod, attributes); compilationUnit.AddChild(id); Expect(16); -#line 1104 "cs.ATG" +#line 1108 "cs.ATG" Location bodyStart = t.Location; InterfaceAccessors( -#line 1104 "cs.ATG" +#line 1108 "cs.ATG" out getBlock, out setBlock); Expect(17); -#line 1104 "cs.ATG" +#line 1108 "cs.ATG" id.GetRegion = getBlock; id.SetRegion = setBlock; id.StartLocation = startLocation; id.EndLocation = bracketEndLocation; id.BodyStart = bodyStart; id.BodyEnd = t.EndLocation; } else SynErr(176); } else { lexer.NextToken(); -#line 1107 "cs.ATG" +#line 1111 "cs.ATG" if (startLocation.X == -1) startLocation = t.Location; Type( -#line 1108 "cs.ATG" +#line 1112 "cs.ATG" out type); Identifier(); -#line 1109 "cs.ATG" +#line 1113 "cs.ATG" EventDeclaration ed = new EventDeclaration { TypeReference = type, Name = t.val, Modifier = mod, Attributes = attributes }; @@ -2375,17 +2391,17 @@ out type); Expect(11); -#line 1114 "cs.ATG" +#line 1118 "cs.ATG" ed.StartLocation = startLocation; ed.EndLocation = t.EndLocation; } } else SynErr(177); } void EnumMemberDecl( -#line 1119 "cs.ATG" +#line 1123 "cs.ATG" out FieldDeclaration f) { -#line 1121 "cs.ATG" +#line 1125 "cs.ATG" Expression expr = null; List attributes = new List(); AttributeSection section = null; @@ -2393,15 +2409,15 @@ out FieldDeclaration f) { while (la.kind == 18) { AttributeSection( -#line 1127 "cs.ATG" +#line 1131 "cs.ATG" out section); -#line 1127 "cs.ATG" +#line 1131 "cs.ATG" attributes.Add(section); } Identifier(); -#line 1128 "cs.ATG" +#line 1132 "cs.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2410,10 +2426,10 @@ out section); if (la.kind == 3) { lexer.NextToken(); Expr( -#line 1133 "cs.ATG" +#line 1137 "cs.ATG" out expr); -#line 1133 "cs.ATG" +#line 1137 "cs.ATG" varDecl.Initializer = expr; } } @@ -2523,14 +2539,14 @@ out name); } void NullableQuestionMark( -#line 2278 "cs.ATG" +#line 2282 "cs.ATG" ref TypeReference typeRef) { -#line 2279 "cs.ATG" +#line 2283 "cs.ATG" List typeArguments = new List(1); Expect(12); -#line 2283 "cs.ATG" +#line 2287 "cs.ATG" if (typeRef != null) typeArguments.Add(typeRef); typeRef = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -2620,11 +2636,11 @@ out ModifierList m) { } void Block( -#line 1253 "cs.ATG" +#line 1257 "cs.ATG" out Statement stmt) { Expect(16); -#line 1255 "cs.ATG" +#line 1259 "cs.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.Location; compilationUnit.BlockStart(blockStmt); @@ -2636,7 +2652,7 @@ out Statement stmt) { while (!(la.kind == 0 || la.kind == 17)) {SynErr(182); lexer.NextToken(); } Expect(17); -#line 1263 "cs.ATG" +#line 1267 "cs.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2644,10 +2660,10 @@ out Statement stmt) { } void EventAccessorDecls( -#line 1190 "cs.ATG" +#line 1194 "cs.ATG" out EventAddRegion addBlock, out EventRemoveRegion removeBlock) { -#line 1191 "cs.ATG" +#line 1195 "cs.ATG" AttributeSection section; List attributes = new List(); Statement stmt; @@ -2656,93 +2672,93 @@ out EventAddRegion addBlock, out EventRemoveRegion removeBlock) { while (la.kind == 18) { AttributeSection( -#line 1198 "cs.ATG" +#line 1202 "cs.ATG" out section); -#line 1198 "cs.ATG" +#line 1202 "cs.ATG" attributes.Add(section); } if (la.kind == 130) { -#line 1200 "cs.ATG" +#line 1204 "cs.ATG" addBlock = new EventAddRegion(attributes); AddAccessorDecl( -#line 1201 "cs.ATG" +#line 1205 "cs.ATG" out stmt); -#line 1201 "cs.ATG" +#line 1205 "cs.ATG" attributes = new List(); addBlock.Block = (BlockStatement)stmt; while (la.kind == 18) { AttributeSection( -#line 1202 "cs.ATG" +#line 1206 "cs.ATG" out section); -#line 1202 "cs.ATG" +#line 1206 "cs.ATG" attributes.Add(section); } RemoveAccessorDecl( -#line 1203 "cs.ATG" +#line 1207 "cs.ATG" out stmt); -#line 1203 "cs.ATG" +#line 1207 "cs.ATG" removeBlock = new EventRemoveRegion(attributes); removeBlock.Block = (BlockStatement)stmt; } else if (la.kind == 131) { RemoveAccessorDecl( -#line 1205 "cs.ATG" +#line 1209 "cs.ATG" out stmt); -#line 1205 "cs.ATG" +#line 1209 "cs.ATG" removeBlock = new EventRemoveRegion(attributes); removeBlock.Block = (BlockStatement)stmt; attributes = new List(); while (la.kind == 18) { AttributeSection( -#line 1206 "cs.ATG" +#line 1210 "cs.ATG" out section); -#line 1206 "cs.ATG" +#line 1210 "cs.ATG" attributes.Add(section); } AddAccessorDecl( -#line 1207 "cs.ATG" +#line 1211 "cs.ATG" out stmt); -#line 1207 "cs.ATG" +#line 1211 "cs.ATG" addBlock = new EventAddRegion(attributes); addBlock.Block = (BlockStatement)stmt; } else SynErr(183); } void ConstructorInitializer( -#line 1283 "cs.ATG" +#line 1287 "cs.ATG" out ConstructorInitializer ci) { -#line 1284 "cs.ATG" +#line 1288 "cs.ATG" Expression expr; ci = new ConstructorInitializer(); Expect(9); if (la.kind == 51) { lexer.NextToken(); -#line 1288 "cs.ATG" +#line 1292 "cs.ATG" ci.ConstructorInitializerType = ConstructorInitializerType.Base; } else if (la.kind == 111) { lexer.NextToken(); -#line 1289 "cs.ATG" +#line 1293 "cs.ATG" ci.ConstructorInitializerType = ConstructorInitializerType.This; } else SynErr(184); Expect(20); if (StartOf(26)) { Argument( -#line 1292 "cs.ATG" +#line 1296 "cs.ATG" out expr); -#line 1292 "cs.ATG" +#line 1296 "cs.ATG" SafeAdd(ci, ci.Arguments, expr); while (la.kind == 14) { lexer.NextToken(); Argument( -#line 1293 "cs.ATG" +#line 1297 "cs.ATG" out expr); -#line 1293 "cs.ATG" +#line 1297 "cs.ATG" SafeAdd(ci, ci.Arguments, expr); } } @@ -2750,161 +2766,161 @@ out expr); } void OverloadableOperator( -#line 1306 "cs.ATG" +#line 1310 "cs.ATG" out OverloadableOperatorType op) { -#line 1307 "cs.ATG" +#line 1311 "cs.ATG" op = OverloadableOperatorType.None; switch (la.kind) { case 4: { lexer.NextToken(); -#line 1309 "cs.ATG" +#line 1313 "cs.ATG" op = OverloadableOperatorType.Add; break; } case 5: { lexer.NextToken(); -#line 1310 "cs.ATG" +#line 1314 "cs.ATG" op = OverloadableOperatorType.Subtract; break; } case 24: { lexer.NextToken(); -#line 1312 "cs.ATG" +#line 1316 "cs.ATG" op = OverloadableOperatorType.Not; break; } case 27: { lexer.NextToken(); -#line 1313 "cs.ATG" +#line 1317 "cs.ATG" op = OverloadableOperatorType.BitNot; break; } case 31: { lexer.NextToken(); -#line 1315 "cs.ATG" +#line 1319 "cs.ATG" op = OverloadableOperatorType.Increment; break; } case 32: { lexer.NextToken(); -#line 1316 "cs.ATG" +#line 1320 "cs.ATG" op = OverloadableOperatorType.Decrement; break; } case 113: { lexer.NextToken(); -#line 1318 "cs.ATG" +#line 1322 "cs.ATG" op = OverloadableOperatorType.IsTrue; break; } case 72: { lexer.NextToken(); -#line 1319 "cs.ATG" +#line 1323 "cs.ATG" op = OverloadableOperatorType.IsFalse; break; } case 6: { lexer.NextToken(); -#line 1321 "cs.ATG" +#line 1325 "cs.ATG" op = OverloadableOperatorType.Multiply; break; } case 7: { lexer.NextToken(); -#line 1322 "cs.ATG" +#line 1326 "cs.ATG" op = OverloadableOperatorType.Divide; break; } case 8: { lexer.NextToken(); -#line 1323 "cs.ATG" +#line 1327 "cs.ATG" op = OverloadableOperatorType.Modulus; break; } case 28: { lexer.NextToken(); -#line 1325 "cs.ATG" +#line 1329 "cs.ATG" op = OverloadableOperatorType.BitwiseAnd; break; } case 29: { lexer.NextToken(); -#line 1326 "cs.ATG" +#line 1330 "cs.ATG" op = OverloadableOperatorType.BitwiseOr; break; } case 30: { lexer.NextToken(); -#line 1327 "cs.ATG" +#line 1331 "cs.ATG" op = OverloadableOperatorType.ExclusiveOr; break; } case 37: { lexer.NextToken(); -#line 1329 "cs.ATG" +#line 1333 "cs.ATG" op = OverloadableOperatorType.ShiftLeft; break; } case 33: { lexer.NextToken(); -#line 1330 "cs.ATG" +#line 1334 "cs.ATG" op = OverloadableOperatorType.Equality; break; } case 34: { lexer.NextToken(); -#line 1331 "cs.ATG" +#line 1335 "cs.ATG" op = OverloadableOperatorType.InEquality; break; } case 23: { lexer.NextToken(); -#line 1332 "cs.ATG" +#line 1336 "cs.ATG" op = OverloadableOperatorType.LessThan; break; } case 35: { lexer.NextToken(); -#line 1333 "cs.ATG" +#line 1337 "cs.ATG" op = OverloadableOperatorType.GreaterThanOrEqual; break; } case 36: { lexer.NextToken(); -#line 1334 "cs.ATG" +#line 1338 "cs.ATG" op = OverloadableOperatorType.LessThanOrEqual; break; } case 22: { lexer.NextToken(); -#line 1335 "cs.ATG" +#line 1339 "cs.ATG" op = OverloadableOperatorType.GreaterThan; if (la.kind == 22) { lexer.NextToken(); -#line 1335 "cs.ATG" +#line 1339 "cs.ATG" op = OverloadableOperatorType.ShiftRight; } break; @@ -2914,34 +2930,34 @@ out OverloadableOperatorType op) { } void VariableDeclarator( -#line 1245 "cs.ATG" +#line 1249 "cs.ATG" FieldDeclaration parentFieldDeclaration) { -#line 1246 "cs.ATG" +#line 1250 "cs.ATG" Expression expr = null; Identifier(); -#line 1248 "cs.ATG" +#line 1252 "cs.ATG" VariableDeclaration f = new VariableDeclaration(t.val); if (la.kind == 3) { lexer.NextToken(); VariableInitializer( -#line 1249 "cs.ATG" +#line 1253 "cs.ATG" out expr); -#line 1249 "cs.ATG" +#line 1253 "cs.ATG" f.Initializer = expr; } -#line 1250 "cs.ATG" +#line 1254 "cs.ATG" SafeAdd(parentFieldDeclaration, parentFieldDeclaration.Fields, f); } void AccessorDecls( -#line 1137 "cs.ATG" +#line 1141 "cs.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1139 "cs.ATG" +#line 1143 "cs.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -2950,92 +2966,92 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 18) { AttributeSection( -#line 1146 "cs.ATG" +#line 1150 "cs.ATG" out section); -#line 1146 "cs.ATG" +#line 1150 "cs.ATG" attributes.Add(section); } if (la.kind == 84 || la.kind == 96 || la.kind == 97) { AccessorModifiers( -#line 1147 "cs.ATG" +#line 1151 "cs.ATG" out modifiers); } if (la.kind == 128) { GetAccessorDecl( -#line 1149 "cs.ATG" +#line 1153 "cs.ATG" out getBlock, attributes); -#line 1150 "cs.ATG" +#line 1154 "cs.ATG" if (modifiers != null) {getBlock.Modifier = modifiers.Modifier; } if (StartOf(27)) { -#line 1151 "cs.ATG" +#line 1155 "cs.ATG" attributes = new List(); modifiers = null; while (la.kind == 18) { AttributeSection( -#line 1152 "cs.ATG" +#line 1156 "cs.ATG" out section); -#line 1152 "cs.ATG" +#line 1156 "cs.ATG" attributes.Add(section); } if (la.kind == 84 || la.kind == 96 || la.kind == 97) { AccessorModifiers( -#line 1153 "cs.ATG" +#line 1157 "cs.ATG" out modifiers); } SetAccessorDecl( -#line 1154 "cs.ATG" +#line 1158 "cs.ATG" out setBlock, attributes); -#line 1155 "cs.ATG" +#line 1159 "cs.ATG" if (modifiers != null) {setBlock.Modifier = modifiers.Modifier; } } } else if (la.kind == 129) { SetAccessorDecl( -#line 1158 "cs.ATG" +#line 1162 "cs.ATG" out setBlock, attributes); -#line 1159 "cs.ATG" +#line 1163 "cs.ATG" if (modifiers != null) {setBlock.Modifier = modifiers.Modifier; } if (StartOf(28)) { -#line 1160 "cs.ATG" +#line 1164 "cs.ATG" attributes = new List(); modifiers = null; while (la.kind == 18) { AttributeSection( -#line 1161 "cs.ATG" +#line 1165 "cs.ATG" out section); -#line 1161 "cs.ATG" +#line 1165 "cs.ATG" attributes.Add(section); } if (la.kind == 84 || la.kind == 96 || la.kind == 97) { AccessorModifiers( -#line 1162 "cs.ATG" +#line 1166 "cs.ATG" out modifiers); } GetAccessorDecl( -#line 1163 "cs.ATG" +#line 1167 "cs.ATG" out getBlock, attributes); -#line 1164 "cs.ATG" +#line 1168 "cs.ATG" if (modifiers != null) {getBlock.Modifier = modifiers.Modifier; } } } else if (StartOf(19)) { Identifier(); -#line 1166 "cs.ATG" +#line 1170 "cs.ATG" Error("get or set accessor declaration expected"); } else SynErr(186); } void InterfaceAccessors( -#line 1211 "cs.ATG" +#line 1215 "cs.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1213 "cs.ATG" +#line 1217 "cs.ATG" AttributeSection section; List attributes = new List(); getBlock = null; setBlock = null; @@ -3043,173 +3059,173 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 18) { AttributeSection( -#line 1219 "cs.ATG" +#line 1223 "cs.ATG" out section); -#line 1219 "cs.ATG" +#line 1223 "cs.ATG" attributes.Add(section); } -#line 1220 "cs.ATG" +#line 1224 "cs.ATG" Location startLocation = la.Location; if (la.kind == 128) { lexer.NextToken(); -#line 1222 "cs.ATG" +#line 1226 "cs.ATG" getBlock = new PropertyGetRegion(null, attributes); } else if (la.kind == 129) { lexer.NextToken(); -#line 1223 "cs.ATG" +#line 1227 "cs.ATG" setBlock = new PropertySetRegion(null, attributes); } else SynErr(187); Expect(11); -#line 1226 "cs.ATG" +#line 1230 "cs.ATG" if (getBlock != null) { getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; } if (setBlock != null) { setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; } attributes = new List(); if (la.kind == 18 || la.kind == 128 || la.kind == 129) { while (la.kind == 18) { AttributeSection( -#line 1230 "cs.ATG" +#line 1234 "cs.ATG" out section); -#line 1230 "cs.ATG" +#line 1234 "cs.ATG" attributes.Add(section); } -#line 1231 "cs.ATG" +#line 1235 "cs.ATG" startLocation = la.Location; if (la.kind == 128) { lexer.NextToken(); -#line 1233 "cs.ATG" +#line 1237 "cs.ATG" if (getBlock != null) Error("get already declared"); else { getBlock = new PropertyGetRegion(null, attributes); lastBlock = getBlock; } } else if (la.kind == 129) { lexer.NextToken(); -#line 1236 "cs.ATG" +#line 1240 "cs.ATG" if (setBlock != null) Error("set already declared"); else { setBlock = new PropertySetRegion(null, attributes); lastBlock = setBlock; } } else SynErr(188); Expect(11); -#line 1241 "cs.ATG" +#line 1245 "cs.ATG" if (lastBlock != null) { lastBlock.StartLocation = startLocation; lastBlock.EndLocation = t.EndLocation; } } } void GetAccessorDecl( -#line 1170 "cs.ATG" +#line 1174 "cs.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1171 "cs.ATG" +#line 1175 "cs.ATG" Statement stmt = null; Expect(128); -#line 1174 "cs.ATG" +#line 1178 "cs.ATG" Location startLocation = t.Location; if (la.kind == 16) { Block( -#line 1175 "cs.ATG" +#line 1179 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(189); -#line 1176 "cs.ATG" +#line 1180 "cs.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); -#line 1177 "cs.ATG" +#line 1181 "cs.ATG" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; } void SetAccessorDecl( -#line 1180 "cs.ATG" +#line 1184 "cs.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1181 "cs.ATG" +#line 1185 "cs.ATG" Statement stmt = null; Expect(129); -#line 1184 "cs.ATG" +#line 1188 "cs.ATG" Location startLocation = t.Location; if (la.kind == 16) { Block( -#line 1185 "cs.ATG" +#line 1189 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(190); -#line 1186 "cs.ATG" +#line 1190 "cs.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); -#line 1187 "cs.ATG" +#line 1191 "cs.ATG" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; } void AddAccessorDecl( -#line 1269 "cs.ATG" +#line 1273 "cs.ATG" out Statement stmt) { -#line 1270 "cs.ATG" +#line 1274 "cs.ATG" stmt = null; Expect(130); Block( -#line 1273 "cs.ATG" +#line 1277 "cs.ATG" out stmt); } void RemoveAccessorDecl( -#line 1276 "cs.ATG" +#line 1280 "cs.ATG" out Statement stmt) { -#line 1277 "cs.ATG" +#line 1281 "cs.ATG" stmt = null; Expect(131); Block( -#line 1280 "cs.ATG" +#line 1284 "cs.ATG" out stmt); } void VariableInitializer( -#line 1298 "cs.ATG" +#line 1302 "cs.ATG" out Expression initializerExpression) { -#line 1299 "cs.ATG" +#line 1303 "cs.ATG" TypeReference type = null; Expression expr = null; initializerExpression = null; if (StartOf(6)) { Expr( -#line 1301 "cs.ATG" +#line 1305 "cs.ATG" out initializerExpression); } else if (la.kind == 16) { CollectionInitializer( -#line 1302 "cs.ATG" +#line 1306 "cs.ATG" out initializerExpression); } else if (la.kind == 106) { lexer.NextToken(); Type( -#line 1303 "cs.ATG" +#line 1307 "cs.ATG" out type); Expect(18); Expr( -#line 1303 "cs.ATG" +#line 1307 "cs.ATG" out expr); Expect(19); -#line 1303 "cs.ATG" +#line 1307 "cs.ATG" initializerExpression = new StackAllocExpression(type, expr); } else SynErr(191); } void Statement() { -#line 1444 "cs.ATG" +#line 1448 "cs.ATG" TypeReference type; Expression expr; Statement stmt = null; @@ -3217,71 +3233,71 @@ out expr); while (!(StartOf(29))) {SynErr(192); lexer.NextToken(); } if ( -#line 1453 "cs.ATG" +#line 1457 "cs.ATG" IsLabel()) { Identifier(); -#line 1453 "cs.ATG" +#line 1457 "cs.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(9); Statement(); } else if (la.kind == 60) { lexer.NextToken(); Type( -#line 1456 "cs.ATG" +#line 1460 "cs.ATG" out type); -#line 1456 "cs.ATG" +#line 1460 "cs.ATG" LocalVariableDeclaration var = new LocalVariableDeclaration(type, Modifiers.Const); string ident = null; var.StartLocation = t.Location; Identifier(); -#line 1457 "cs.ATG" +#line 1461 "cs.ATG" ident = t.val; Expect(3); Expr( -#line 1458 "cs.ATG" +#line 1462 "cs.ATG" out expr); -#line 1458 "cs.ATG" +#line 1462 "cs.ATG" SafeAdd(var, var.Variables, new VariableDeclaration(ident, expr)); while (la.kind == 14) { lexer.NextToken(); Identifier(); -#line 1459 "cs.ATG" +#line 1463 "cs.ATG" ident = t.val; Expect(3); Expr( -#line 1459 "cs.ATG" +#line 1463 "cs.ATG" out expr); -#line 1459 "cs.ATG" +#line 1463 "cs.ATG" SafeAdd(var, var.Variables, new VariableDeclaration(ident, expr)); } Expect(11); -#line 1460 "cs.ATG" +#line 1464 "cs.ATG" compilationUnit.AddChild(var); } else if ( -#line 1463 "cs.ATG" +#line 1467 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1463 "cs.ATG" +#line 1467 "cs.ATG" out stmt); Expect(11); -#line 1463 "cs.ATG" +#line 1467 "cs.ATG" compilationUnit.AddChild(stmt); } else if (StartOf(30)) { EmbeddedStatement( -#line 1465 "cs.ATG" +#line 1469 "cs.ATG" out stmt); -#line 1465 "cs.ATG" +#line 1469 "cs.ATG" compilationUnit.AddChild(stmt); } else SynErr(193); -#line 1471 "cs.ATG" +#line 1475 "cs.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.EndLocation; @@ -3290,10 +3306,10 @@ out stmt); } void Argument( -#line 1338 "cs.ATG" +#line 1342 "cs.ATG" out Expression argumentexpr) { -#line 1340 "cs.ATG" +#line 1344 "cs.ATG" Expression expr; FieldDirection fd = FieldDirection.None; @@ -3301,51 +3317,51 @@ out Expression argumentexpr) { if (la.kind == 100) { lexer.NextToken(); -#line 1345 "cs.ATG" +#line 1349 "cs.ATG" fd = FieldDirection.Ref; } else { lexer.NextToken(); -#line 1346 "cs.ATG" +#line 1350 "cs.ATG" fd = FieldDirection.Out; } } Expr( -#line 1348 "cs.ATG" +#line 1352 "cs.ATG" out expr); -#line 1349 "cs.ATG" +#line 1353 "cs.ATG" argumentexpr = fd != FieldDirection.None ? argumentexpr = new DirectionExpression(fd, expr) : expr; } void CollectionInitializer( -#line 1369 "cs.ATG" +#line 1373 "cs.ATG" out Expression outExpr) { -#line 1371 "cs.ATG" +#line 1375 "cs.ATG" Expression expr = null; CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Expect(16); -#line 1375 "cs.ATG" +#line 1379 "cs.ATG" initializer.StartLocation = t.Location; if (StartOf(31)) { VariableInitializer( -#line 1376 "cs.ATG" +#line 1380 "cs.ATG" out expr); -#line 1377 "cs.ATG" +#line 1381 "cs.ATG" SafeAdd(initializer, initializer.CreateExpressions, expr); while ( -#line 1378 "cs.ATG" +#line 1382 "cs.ATG" NotFinalComma()) { Expect(14); VariableInitializer( -#line 1379 "cs.ATG" +#line 1383 "cs.ATG" out expr); -#line 1380 "cs.ATG" +#line 1384 "cs.ATG" SafeAdd(initializer, initializer.CreateExpressions, expr); } if (la.kind == 14) { @@ -3354,105 +3370,105 @@ out expr); } Expect(17); -#line 1384 "cs.ATG" +#line 1388 "cs.ATG" initializer.EndLocation = t.Location; outExpr = initializer; } void AssignmentOperator( -#line 1352 "cs.ATG" +#line 1356 "cs.ATG" out AssignmentOperatorType op) { -#line 1353 "cs.ATG" +#line 1357 "cs.ATG" op = AssignmentOperatorType.None; if (la.kind == 3) { lexer.NextToken(); -#line 1355 "cs.ATG" +#line 1359 "cs.ATG" op = AssignmentOperatorType.Assign; } else if (la.kind == 38) { lexer.NextToken(); -#line 1356 "cs.ATG" +#line 1360 "cs.ATG" op = AssignmentOperatorType.Add; } else if (la.kind == 39) { lexer.NextToken(); -#line 1357 "cs.ATG" +#line 1361 "cs.ATG" op = AssignmentOperatorType.Subtract; } else if (la.kind == 40) { lexer.NextToken(); -#line 1358 "cs.ATG" +#line 1362 "cs.ATG" op = AssignmentOperatorType.Multiply; } else if (la.kind == 41) { lexer.NextToken(); -#line 1359 "cs.ATG" +#line 1363 "cs.ATG" op = AssignmentOperatorType.Divide; } else if (la.kind == 42) { lexer.NextToken(); -#line 1360 "cs.ATG" +#line 1364 "cs.ATG" op = AssignmentOperatorType.Modulus; } else if (la.kind == 43) { lexer.NextToken(); -#line 1361 "cs.ATG" +#line 1365 "cs.ATG" op = AssignmentOperatorType.BitwiseAnd; } else if (la.kind == 44) { lexer.NextToken(); -#line 1362 "cs.ATG" +#line 1366 "cs.ATG" op = AssignmentOperatorType.BitwiseOr; } else if (la.kind == 45) { lexer.NextToken(); -#line 1363 "cs.ATG" +#line 1367 "cs.ATG" op = AssignmentOperatorType.ExclusiveOr; } else if (la.kind == 46) { lexer.NextToken(); -#line 1364 "cs.ATG" +#line 1368 "cs.ATG" op = AssignmentOperatorType.ShiftLeft; } else if ( -#line 1365 "cs.ATG" +#line 1369 "cs.ATG" la.kind == Tokens.GreaterThan && Peek(1).kind == Tokens.GreaterEqual) { Expect(22); Expect(35); -#line 1366 "cs.ATG" +#line 1370 "cs.ATG" op = AssignmentOperatorType.ShiftRight; } else SynErr(194); } void CollectionOrObjectInitializer( -#line 1387 "cs.ATG" +#line 1391 "cs.ATG" out Expression outExpr) { -#line 1389 "cs.ATG" +#line 1393 "cs.ATG" Expression expr = null; CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Expect(16); -#line 1393 "cs.ATG" +#line 1397 "cs.ATG" initializer.StartLocation = t.Location; if (StartOf(31)) { ObjectPropertyInitializerOrVariableInitializer( -#line 1394 "cs.ATG" +#line 1398 "cs.ATG" out expr); -#line 1395 "cs.ATG" +#line 1399 "cs.ATG" SafeAdd(initializer, initializer.CreateExpressions, expr); while ( -#line 1396 "cs.ATG" +#line 1400 "cs.ATG" NotFinalComma()) { Expect(14); ObjectPropertyInitializerOrVariableInitializer( -#line 1397 "cs.ATG" +#line 1401 "cs.ATG" out expr); -#line 1398 "cs.ATG" +#line 1402 "cs.ATG" SafeAdd(initializer, initializer.CreateExpressions, expr); } if (la.kind == 14) { @@ -3461,225 +3477,225 @@ out expr); } Expect(17); -#line 1402 "cs.ATG" +#line 1406 "cs.ATG" initializer.EndLocation = t.Location; outExpr = initializer; } void ObjectPropertyInitializerOrVariableInitializer( -#line 1405 "cs.ATG" +#line 1409 "cs.ATG" out Expression expr) { -#line 1406 "cs.ATG" +#line 1410 "cs.ATG" expr = null; if ( -#line 1408 "cs.ATG" +#line 1412 "cs.ATG" IdentAndAsgn()) { Identifier(); -#line 1410 "cs.ATG" +#line 1414 "cs.ATG" NamedArgumentExpression nae = new NamedArgumentExpression(t.val, null); nae.StartLocation = t.Location; Expression r = null; Expect(3); if (la.kind == 16) { CollectionOrObjectInitializer( -#line 1414 "cs.ATG" +#line 1418 "cs.ATG" out r); } else if (StartOf(31)) { VariableInitializer( -#line 1415 "cs.ATG" +#line 1419 "cs.ATG" out r); } else SynErr(195); -#line 1416 "cs.ATG" +#line 1420 "cs.ATG" nae.Expression = r; nae.EndLocation = t.EndLocation; expr = nae; } else if (StartOf(31)) { VariableInitializer( -#line 1418 "cs.ATG" +#line 1422 "cs.ATG" out expr); } else SynErr(196); } void LocalVariableDecl( -#line 1422 "cs.ATG" +#line 1426 "cs.ATG" out Statement stmt) { -#line 1424 "cs.ATG" +#line 1428 "cs.ATG" TypeReference type; VariableDeclaration var = null; LocalVariableDeclaration localVariableDeclaration; Type( -#line 1429 "cs.ATG" +#line 1433 "cs.ATG" out type); -#line 1429 "cs.ATG" +#line 1433 "cs.ATG" localVariableDeclaration = new LocalVariableDeclaration(type); localVariableDeclaration.StartLocation = t.Location; LocalVariableDeclarator( -#line 1430 "cs.ATG" +#line 1434 "cs.ATG" out var); -#line 1430 "cs.ATG" +#line 1434 "cs.ATG" SafeAdd(localVariableDeclaration, localVariableDeclaration.Variables, var); while (la.kind == 14) { lexer.NextToken(); LocalVariableDeclarator( -#line 1431 "cs.ATG" +#line 1435 "cs.ATG" out var); -#line 1431 "cs.ATG" +#line 1435 "cs.ATG" SafeAdd(localVariableDeclaration, localVariableDeclaration.Variables, var); } -#line 1432 "cs.ATG" +#line 1436 "cs.ATG" stmt = localVariableDeclaration; } void LocalVariableDeclarator( -#line 1435 "cs.ATG" +#line 1439 "cs.ATG" out VariableDeclaration var) { -#line 1436 "cs.ATG" +#line 1440 "cs.ATG" Expression expr = null; Identifier(); -#line 1438 "cs.ATG" +#line 1442 "cs.ATG" var = new VariableDeclaration(t.val); if (la.kind == 3) { lexer.NextToken(); VariableInitializer( -#line 1439 "cs.ATG" +#line 1443 "cs.ATG" out expr); -#line 1439 "cs.ATG" +#line 1443 "cs.ATG" var.Initializer = expr; } } void EmbeddedStatement( -#line 1478 "cs.ATG" +#line 1482 "cs.ATG" out Statement statement) { -#line 1480 "cs.ATG" +#line 1484 "cs.ATG" TypeReference type = null; Expression expr = null; Statement embeddedStatement = null; statement = null; -#line 1486 "cs.ATG" +#line 1490 "cs.ATG" Location startLocation = la.Location; if (la.kind == 16) { Block( -#line 1488 "cs.ATG" +#line 1492 "cs.ATG" out statement); } else if (la.kind == 11) { lexer.NextToken(); -#line 1491 "cs.ATG" +#line 1495 "cs.ATG" statement = new EmptyStatement(); } else if ( -#line 1494 "cs.ATG" +#line 1498 "cs.ATG" UnCheckedAndLBrace()) { -#line 1494 "cs.ATG" +#line 1498 "cs.ATG" Statement block; bool isChecked = true; if (la.kind == 58) { lexer.NextToken(); } else if (la.kind == 118) { lexer.NextToken(); -#line 1495 "cs.ATG" +#line 1499 "cs.ATG" isChecked = false; } else SynErr(197); Block( -#line 1496 "cs.ATG" +#line 1500 "cs.ATG" out block); -#line 1496 "cs.ATG" +#line 1500 "cs.ATG" statement = isChecked ? (Statement)new CheckedStatement(block) : (Statement)new UncheckedStatement(block); } else if (la.kind == 79) { IfStatement( -#line 1499 "cs.ATG" +#line 1503 "cs.ATG" out statement); } else if (la.kind == 110) { lexer.NextToken(); -#line 1501 "cs.ATG" +#line 1505 "cs.ATG" List switchSections = new List(); Expect(20); Expr( -#line 1502 "cs.ATG" +#line 1506 "cs.ATG" out expr); Expect(21); Expect(16); SwitchSections( -#line 1503 "cs.ATG" +#line 1507 "cs.ATG" switchSections); Expect(17); -#line 1505 "cs.ATG" +#line 1509 "cs.ATG" statement = new SwitchStatement(expr, switchSections); -#line 1506 "cs.ATG" +#line 1510 "cs.ATG" SetParent(switchSections, statement); } else if (la.kind == 125) { lexer.NextToken(); Expect(20); Expr( -#line 1509 "cs.ATG" +#line 1513 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1510 "cs.ATG" +#line 1514 "cs.ATG" out embeddedStatement); -#line 1511 "cs.ATG" +#line 1515 "cs.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 65) { lexer.NextToken(); EmbeddedStatement( -#line 1513 "cs.ATG" +#line 1517 "cs.ATG" out embeddedStatement); Expect(125); Expect(20); Expr( -#line 1514 "cs.ATG" +#line 1518 "cs.ATG" out expr); Expect(21); Expect(11); -#line 1515 "cs.ATG" +#line 1519 "cs.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.End); } else if (la.kind == 76) { lexer.NextToken(); -#line 1517 "cs.ATG" +#line 1521 "cs.ATG" List initializer = null; List iterator = null; Expect(20); if (StartOf(6)) { ForInitializer( -#line 1518 "cs.ATG" +#line 1522 "cs.ATG" out initializer); } Expect(11); if (StartOf(6)) { Expr( -#line 1519 "cs.ATG" +#line 1523 "cs.ATG" out expr); } Expect(11); if (StartOf(6)) { ForIterator( -#line 1520 "cs.ATG" +#line 1524 "cs.ATG" out iterator); } Expect(21); EmbeddedStatement( -#line 1521 "cs.ATG" +#line 1525 "cs.ATG" out embeddedStatement); -#line 1522 "cs.ATG" +#line 1526 "cs.ATG" statement = new ForStatement(initializer, expr, iterator, embeddedStatement); SetParent(initializer, statement); SetParent(iterator, statement); @@ -3688,55 +3704,55 @@ out embeddedStatement); lexer.NextToken(); Expect(20); Type( -#line 1527 "cs.ATG" +#line 1531 "cs.ATG" out type); Identifier(); -#line 1527 "cs.ATG" +#line 1531 "cs.ATG" string varName = t.val; Expect(81); Expr( -#line 1528 "cs.ATG" +#line 1532 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1529 "cs.ATG" +#line 1533 "cs.ATG" out embeddedStatement); -#line 1530 "cs.ATG" +#line 1534 "cs.ATG" statement = new ForeachStatement(type, varName , expr, embeddedStatement); } else if (la.kind == 53) { lexer.NextToken(); Expect(11); -#line 1533 "cs.ATG" +#line 1537 "cs.ATG" statement = new BreakStatement(); } else if (la.kind == 61) { lexer.NextToken(); Expect(11); -#line 1534 "cs.ATG" +#line 1538 "cs.ATG" statement = new ContinueStatement(); } else if (la.kind == 78) { GotoStatement( -#line 1535 "cs.ATG" +#line 1539 "cs.ATG" out statement); } else if ( -#line 1537 "cs.ATG" +#line 1541 "cs.ATG" IsYieldStatement()) { Expect(132); if (la.kind == 101) { lexer.NextToken(); Expr( -#line 1538 "cs.ATG" +#line 1542 "cs.ATG" out expr); -#line 1538 "cs.ATG" +#line 1542 "cs.ATG" statement = new YieldStatement(new ReturnStatement(expr)); } else if (la.kind == 53) { lexer.NextToken(); -#line 1539 "cs.ATG" +#line 1543 "cs.ATG" statement = new YieldStatement(new BreakStatement()); } else SynErr(198); Expect(11); @@ -3744,90 +3760,90 @@ out expr); lexer.NextToken(); if (StartOf(6)) { Expr( -#line 1542 "cs.ATG" +#line 1546 "cs.ATG" out expr); } Expect(11); -#line 1542 "cs.ATG" +#line 1546 "cs.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 112) { lexer.NextToken(); if (StartOf(6)) { Expr( -#line 1543 "cs.ATG" +#line 1547 "cs.ATG" out expr); } Expect(11); -#line 1543 "cs.ATG" +#line 1547 "cs.ATG" statement = new ThrowStatement(expr); } else if (StartOf(6)) { StatementExpr( -#line 1546 "cs.ATG" +#line 1550 "cs.ATG" out statement); while (!(la.kind == 0 || la.kind == 11)) {SynErr(199); lexer.NextToken(); } Expect(11); } else if (la.kind == 114) { TryStatement( -#line 1549 "cs.ATG" +#line 1553 "cs.ATG" out statement); } else if (la.kind == 86) { lexer.NextToken(); Expect(20); Expr( -#line 1552 "cs.ATG" +#line 1556 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1553 "cs.ATG" +#line 1557 "cs.ATG" out embeddedStatement); -#line 1553 "cs.ATG" +#line 1557 "cs.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 121) { -#line 1556 "cs.ATG" +#line 1560 "cs.ATG" Statement resourceAcquisitionStmt = null; lexer.NextToken(); Expect(20); ResourceAcquisition( -#line 1558 "cs.ATG" +#line 1562 "cs.ATG" out resourceAcquisitionStmt); Expect(21); EmbeddedStatement( -#line 1559 "cs.ATG" +#line 1563 "cs.ATG" out embeddedStatement); -#line 1559 "cs.ATG" +#line 1563 "cs.ATG" statement = new UsingStatement(resourceAcquisitionStmt, embeddedStatement); } else if (la.kind == 119) { lexer.NextToken(); Block( -#line 1562 "cs.ATG" +#line 1566 "cs.ATG" out embeddedStatement); -#line 1562 "cs.ATG" +#line 1566 "cs.ATG" statement = new UnsafeStatement(embeddedStatement); } else if (la.kind == 74) { -#line 1564 "cs.ATG" +#line 1568 "cs.ATG" Statement pointerDeclarationStmt = null; lexer.NextToken(); Expect(20); ResourceAcquisition( -#line 1566 "cs.ATG" +#line 1570 "cs.ATG" out pointerDeclarationStmt); Expect(21); EmbeddedStatement( -#line 1567 "cs.ATG" +#line 1571 "cs.ATG" out embeddedStatement); -#line 1567 "cs.ATG" +#line 1571 "cs.ATG" statement = new FixedStatement(pointerDeclarationStmt, embeddedStatement); } else SynErr(200); -#line 1569 "cs.ATG" +#line 1573 "cs.ATG" if (statement != null) { statement.StartLocation = startLocation; statement.EndLocation = t.EndLocation; @@ -3836,10 +3852,10 @@ out embeddedStatement); } void IfStatement( -#line 1576 "cs.ATG" +#line 1580 "cs.ATG" out Statement statement) { -#line 1578 "cs.ATG" +#line 1582 "cs.ATG" Expression expr = null; Statement embeddedStatement = null; statement = null; @@ -3847,26 +3863,26 @@ out Statement statement) { Expect(79); Expect(20); Expr( -#line 1584 "cs.ATG" +#line 1588 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1585 "cs.ATG" +#line 1589 "cs.ATG" out embeddedStatement); -#line 1586 "cs.ATG" +#line 1590 "cs.ATG" Statement elseStatement = null; if (la.kind == 67) { lexer.NextToken(); EmbeddedStatement( -#line 1587 "cs.ATG" +#line 1591 "cs.ATG" out elseStatement); } -#line 1588 "cs.ATG" +#line 1592 "cs.ATG" statement = elseStatement != null ? new IfElseStatement(expr, embeddedStatement, elseStatement) : new IfElseStatement(expr, embeddedStatement); -#line 1589 "cs.ATG" +#line 1593 "cs.ATG" if (elseStatement is IfElseStatement && (elseStatement as IfElseStatement).TrueStatement.Count == 1) { /* else if-section (otherwise we would have a BlockStatment) */ (statement as IfElseStatement).ElseIfSections.Add( @@ -3881,29 +3897,29 @@ out elseStatement); } void SwitchSections( -#line 1621 "cs.ATG" +#line 1625 "cs.ATG" List switchSections) { -#line 1623 "cs.ATG" +#line 1627 "cs.ATG" SwitchSection switchSection = new SwitchSection(); CaseLabel label; SwitchLabel( -#line 1627 "cs.ATG" +#line 1631 "cs.ATG" out label); -#line 1627 "cs.ATG" +#line 1631 "cs.ATG" SafeAdd(switchSection, switchSection.SwitchLabels, label); -#line 1628 "cs.ATG" +#line 1632 "cs.ATG" compilationUnit.BlockStart(switchSection); while (StartOf(32)) { if (la.kind == 55 || la.kind == 63) { SwitchLabel( -#line 1630 "cs.ATG" +#line 1634 "cs.ATG" out label); -#line 1631 "cs.ATG" +#line 1635 "cs.ATG" if (label != null) { if (switchSection.Children.Count > 0) { // open new section @@ -3919,146 +3935,146 @@ out label); } } -#line 1643 "cs.ATG" +#line 1647 "cs.ATG" compilationUnit.BlockEnd(); switchSections.Add(switchSection); } void ForInitializer( -#line 1602 "cs.ATG" +#line 1606 "cs.ATG" out List initializer) { -#line 1604 "cs.ATG" +#line 1608 "cs.ATG" Statement stmt; initializer = new List(); if ( -#line 1608 "cs.ATG" +#line 1612 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1608 "cs.ATG" +#line 1612 "cs.ATG" out stmt); -#line 1608 "cs.ATG" +#line 1612 "cs.ATG" initializer.Add(stmt); } else if (StartOf(6)) { StatementExpr( -#line 1609 "cs.ATG" +#line 1613 "cs.ATG" out stmt); -#line 1609 "cs.ATG" +#line 1613 "cs.ATG" initializer.Add(stmt); while (la.kind == 14) { lexer.NextToken(); StatementExpr( -#line 1609 "cs.ATG" +#line 1613 "cs.ATG" out stmt); -#line 1609 "cs.ATG" +#line 1613 "cs.ATG" initializer.Add(stmt); } } else SynErr(201); } void ForIterator( -#line 1612 "cs.ATG" +#line 1616 "cs.ATG" out List iterator) { -#line 1614 "cs.ATG" +#line 1618 "cs.ATG" Statement stmt; iterator = new List(); StatementExpr( -#line 1618 "cs.ATG" +#line 1622 "cs.ATG" out stmt); -#line 1618 "cs.ATG" +#line 1622 "cs.ATG" iterator.Add(stmt); while (la.kind == 14) { lexer.NextToken(); StatementExpr( -#line 1618 "cs.ATG" +#line 1622 "cs.ATG" out stmt); -#line 1618 "cs.ATG" +#line 1622 "cs.ATG" iterator.Add(stmt); } } void GotoStatement( -#line 1698 "cs.ATG" +#line 1702 "cs.ATG" out Statement stmt) { -#line 1699 "cs.ATG" +#line 1703 "cs.ATG" Expression expr; stmt = null; Expect(78); if (StartOf(19)) { Identifier(); -#line 1703 "cs.ATG" +#line 1707 "cs.ATG" stmt = new GotoStatement(t.val); Expect(11); } else if (la.kind == 55) { lexer.NextToken(); Expr( -#line 1704 "cs.ATG" +#line 1708 "cs.ATG" out expr); Expect(11); -#line 1704 "cs.ATG" +#line 1708 "cs.ATG" stmt = new GotoCaseStatement(expr); } else if (la.kind == 63) { lexer.NextToken(); Expect(11); -#line 1705 "cs.ATG" +#line 1709 "cs.ATG" stmt = new GotoCaseStatement(null); } else SynErr(202); } void StatementExpr( -#line 1725 "cs.ATG" +#line 1729 "cs.ATG" out Statement stmt) { -#line 1726 "cs.ATG" +#line 1730 "cs.ATG" Expression expr; Expr( -#line 1728 "cs.ATG" +#line 1732 "cs.ATG" out expr); -#line 1731 "cs.ATG" +#line 1735 "cs.ATG" stmt = new ExpressionStatement(expr); } void TryStatement( -#line 1653 "cs.ATG" +#line 1657 "cs.ATG" out Statement tryStatement) { -#line 1655 "cs.ATG" +#line 1659 "cs.ATG" Statement blockStmt = null, finallyStmt = null; List catchClauses = null; Expect(114); Block( -#line 1659 "cs.ATG" +#line 1663 "cs.ATG" out blockStmt); if (la.kind == 56) { CatchClauses( -#line 1661 "cs.ATG" +#line 1665 "cs.ATG" out catchClauses); if (la.kind == 73) { lexer.NextToken(); Block( -#line 1661 "cs.ATG" +#line 1665 "cs.ATG" out finallyStmt); } } else if (la.kind == 73) { lexer.NextToken(); Block( -#line 1662 "cs.ATG" +#line 1666 "cs.ATG" out finallyStmt); } else SynErr(203); -#line 1665 "cs.ATG" +#line 1669 "cs.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); if (catchClauses != null) { foreach (CatchClause cc in catchClauses) cc.Parent = tryStatement; @@ -4067,202 +4083,202 @@ out finallyStmt); } void ResourceAcquisition( -#line 1709 "cs.ATG" +#line 1713 "cs.ATG" out Statement stmt) { -#line 1711 "cs.ATG" +#line 1715 "cs.ATG" stmt = null; Expression expr; if ( -#line 1716 "cs.ATG" +#line 1720 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1716 "cs.ATG" +#line 1720 "cs.ATG" out stmt); } else if (StartOf(6)) { Expr( -#line 1717 "cs.ATG" +#line 1721 "cs.ATG" out expr); -#line 1721 "cs.ATG" +#line 1725 "cs.ATG" stmt = new ExpressionStatement(expr); } else SynErr(204); } void SwitchLabel( -#line 1646 "cs.ATG" +#line 1650 "cs.ATG" out CaseLabel label) { -#line 1647 "cs.ATG" +#line 1651 "cs.ATG" Expression expr = null; label = null; if (la.kind == 55) { lexer.NextToken(); Expr( -#line 1649 "cs.ATG" +#line 1653 "cs.ATG" out expr); Expect(9); -#line 1649 "cs.ATG" +#line 1653 "cs.ATG" label = new CaseLabel(expr); } else if (la.kind == 63) { lexer.NextToken(); Expect(9); -#line 1650 "cs.ATG" +#line 1654 "cs.ATG" label = new CaseLabel(); } else SynErr(205); } void CatchClauses( -#line 1672 "cs.ATG" +#line 1676 "cs.ATG" out List catchClauses) { -#line 1674 "cs.ATG" +#line 1678 "cs.ATG" catchClauses = new List(); Expect(56); -#line 1677 "cs.ATG" +#line 1681 "cs.ATG" string identifier; Statement stmt; TypeReference typeRef; if (la.kind == 16) { Block( -#line 1683 "cs.ATG" +#line 1687 "cs.ATG" out stmt); -#line 1683 "cs.ATG" +#line 1687 "cs.ATG" catchClauses.Add(new CatchClause(stmt)); } else if (la.kind == 20) { lexer.NextToken(); ClassType( -#line 1685 "cs.ATG" +#line 1689 "cs.ATG" out typeRef, false); -#line 1685 "cs.ATG" +#line 1689 "cs.ATG" identifier = null; if (StartOf(19)) { Identifier(); -#line 1686 "cs.ATG" +#line 1690 "cs.ATG" identifier = t.val; } Expect(21); Block( -#line 1687 "cs.ATG" +#line 1691 "cs.ATG" out stmt); -#line 1688 "cs.ATG" +#line 1692 "cs.ATG" catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); while ( -#line 1689 "cs.ATG" +#line 1693 "cs.ATG" IsTypedCatch()) { Expect(56); Expect(20); ClassType( -#line 1689 "cs.ATG" +#line 1693 "cs.ATG" out typeRef, false); -#line 1689 "cs.ATG" +#line 1693 "cs.ATG" identifier = null; if (StartOf(19)) { Identifier(); -#line 1690 "cs.ATG" +#line 1694 "cs.ATG" identifier = t.val; } Expect(21); Block( -#line 1691 "cs.ATG" +#line 1695 "cs.ATG" out stmt); -#line 1692 "cs.ATG" +#line 1696 "cs.ATG" catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); } if (la.kind == 56) { lexer.NextToken(); Block( -#line 1694 "cs.ATG" +#line 1698 "cs.ATG" out stmt); -#line 1694 "cs.ATG" +#line 1698 "cs.ATG" catchClauses.Add(new CatchClause(stmt)); } } else SynErr(206); } void UnaryExpr( -#line 1758 "cs.ATG" +#line 1762 "cs.ATG" out Expression uExpr) { -#line 1760 "cs.ATG" +#line 1764 "cs.ATG" TypeReference type = null; Expression expr = null; ArrayList expressions = new ArrayList(); uExpr = null; while (StartOf(33) || -#line 1782 "cs.ATG" +#line 1786 "cs.ATG" IsTypeCast()) { if (la.kind == 4) { lexer.NextToken(); -#line 1769 "cs.ATG" +#line 1773 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Plus)); } else if (la.kind == 5) { lexer.NextToken(); -#line 1770 "cs.ATG" +#line 1774 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Minus)); } else if (la.kind == 24) { lexer.NextToken(); -#line 1771 "cs.ATG" +#line 1775 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Not)); } else if (la.kind == 27) { lexer.NextToken(); -#line 1772 "cs.ATG" +#line 1776 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitNot)); } else if (la.kind == 6) { lexer.NextToken(); -#line 1773 "cs.ATG" +#line 1777 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Dereference)); } else if (la.kind == 31) { lexer.NextToken(); -#line 1774 "cs.ATG" +#line 1778 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Increment)); } else if (la.kind == 32) { lexer.NextToken(); -#line 1775 "cs.ATG" +#line 1779 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Decrement)); } else if (la.kind == 28) { lexer.NextToken(); -#line 1776 "cs.ATG" +#line 1780 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.AddressOf)); } else { Expect(20); Type( -#line 1782 "cs.ATG" +#line 1786 "cs.ATG" out type); Expect(21); -#line 1782 "cs.ATG" +#line 1786 "cs.ATG" expressions.Add(new CastExpression(type)); } } if ( -#line 1787 "cs.ATG" +#line 1791 "cs.ATG" LastExpressionIsUnaryMinus(expressions) && IsMostNegativeIntegerWithoutTypeSuffix()) { Expect(2); -#line 1790 "cs.ATG" +#line 1794 "cs.ATG" expressions.RemoveAt(expressions.Count - 1); if (t.literalValue is uint) { expr = new PrimitiveExpression(int.MinValue, int.MinValue.ToString()); @@ -4274,11 +4290,11 @@ LastExpressionIsUnaryMinus(expressions) && IsMostNegativeIntegerWithoutTypeSuffi } else if (StartOf(34)) { PrimaryExpr( -#line 1799 "cs.ATG" +#line 1803 "cs.ATG" out expr); } else SynErr(207); -#line 1801 "cs.ATG" +#line 1805 "cs.ATG" for (int i = 0; i < expressions.Count; ++i) { Expression nextExpression = i + 1 < expressions.Count ? (Expression)expressions[i + 1] : expr; if (expressions[i] is CastExpression) { @@ -4296,325 +4312,325 @@ out expr); } void ConditionalOrExpr( -#line 2118 "cs.ATG" +#line 2122 "cs.ATG" ref Expression outExpr) { -#line 2119 "cs.ATG" +#line 2123 "cs.ATG" Expression expr; ConditionalAndExpr( -#line 2121 "cs.ATG" +#line 2125 "cs.ATG" ref outExpr); while (la.kind == 26) { lexer.NextToken(); UnaryExpr( -#line 2121 "cs.ATG" +#line 2125 "cs.ATG" out expr); ConditionalAndExpr( -#line 2121 "cs.ATG" +#line 2125 "cs.ATG" ref expr); -#line 2121 "cs.ATG" +#line 2125 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalOr, expr); } } void PrimaryExpr( -#line 1818 "cs.ATG" +#line 1822 "cs.ATG" out Expression pexpr) { -#line 1820 "cs.ATG" +#line 1824 "cs.ATG" TypeReference type = null; Expression expr; pexpr = null; -#line 1825 "cs.ATG" +#line 1829 "cs.ATG" Location startLocation = la.Location; if (la.kind == 113) { lexer.NextToken(); -#line 1827 "cs.ATG" +#line 1831 "cs.ATG" pexpr = new PrimitiveExpression(true, "true"); } else if (la.kind == 72) { lexer.NextToken(); -#line 1828 "cs.ATG" +#line 1832 "cs.ATG" pexpr = new PrimitiveExpression(false, "false"); } else if (la.kind == 90) { lexer.NextToken(); -#line 1829 "cs.ATG" +#line 1833 "cs.ATG" pexpr = new PrimitiveExpression(null, "null"); } else if (la.kind == 2) { lexer.NextToken(); -#line 1830 "cs.ATG" +#line 1834 "cs.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; } else if ( -#line 1831 "cs.ATG" +#line 1835 "cs.ATG" StartOfQueryExpression()) { QueryExpression( -#line 1832 "cs.ATG" +#line 1836 "cs.ATG" out pexpr); } else if ( -#line 1833 "cs.ATG" +#line 1837 "cs.ATG" IdentAndDoubleColon()) { Identifier(); -#line 1834 "cs.ATG" +#line 1838 "cs.ATG" type = new TypeReference(t.val); Expect(10); -#line 1835 "cs.ATG" +#line 1839 "cs.ATG" pexpr = new TypeReferenceExpression(type); Identifier(); -#line 1836 "cs.ATG" +#line 1840 "cs.ATG" if (type.Type == "global") { type.IsGlobal = true; type.Type = (t.val ?? "?"); } else type.Type += "." + (t.val ?? "?"); } else if (StartOf(19)) { Identifier(); -#line 1840 "cs.ATG" +#line 1844 "cs.ATG" pexpr = new IdentifierExpression(t.val); if (la.kind == 48 || -#line 1843 "cs.ATG" +#line 1847 "cs.ATG" IsGenericInSimpleNameOrMemberAccess()) { if (la.kind == 48) { ShortedLambdaExpression( -#line 1842 "cs.ATG" +#line 1846 "cs.ATG" (IdentifierExpression)pexpr, out pexpr); } else { -#line 1844 "cs.ATG" +#line 1848 "cs.ATG" List typeList; TypeArgumentList( -#line 1845 "cs.ATG" +#line 1849 "cs.ATG" out typeList, false); -#line 1846 "cs.ATG" +#line 1850 "cs.ATG" ((IdentifierExpression)pexpr).TypeArguments = typeList; } } } else if ( -#line 1848 "cs.ATG" +#line 1852 "cs.ATG" IsLambdaExpression()) { LambdaExpression( -#line 1849 "cs.ATG" +#line 1853 "cs.ATG" out pexpr); } else if (la.kind == 20) { lexer.NextToken(); Expr( -#line 1852 "cs.ATG" +#line 1856 "cs.ATG" out expr); Expect(21); -#line 1852 "cs.ATG" +#line 1856 "cs.ATG" pexpr = new ParenthesizedExpression(expr); } else if (StartOf(35)) { -#line 1855 "cs.ATG" +#line 1859 "cs.ATG" string val = null; switch (la.kind) { case 52: { lexer.NextToken(); -#line 1856 "cs.ATG" +#line 1860 "cs.ATG" val = "System.Boolean"; break; } case 54: { lexer.NextToken(); -#line 1857 "cs.ATG" +#line 1861 "cs.ATG" val = "System.Byte"; break; } case 57: { lexer.NextToken(); -#line 1858 "cs.ATG" +#line 1862 "cs.ATG" val = "System.Char"; break; } case 62: { lexer.NextToken(); -#line 1859 "cs.ATG" +#line 1863 "cs.ATG" val = "System.Decimal"; break; } case 66: { lexer.NextToken(); -#line 1860 "cs.ATG" +#line 1864 "cs.ATG" val = "System.Double"; break; } case 75: { lexer.NextToken(); -#line 1861 "cs.ATG" +#line 1865 "cs.ATG" val = "System.Single"; break; } case 82: { lexer.NextToken(); -#line 1862 "cs.ATG" +#line 1866 "cs.ATG" val = "System.Int32"; break; } case 87: { lexer.NextToken(); -#line 1863 "cs.ATG" +#line 1867 "cs.ATG" val = "System.Int64"; break; } case 91: { lexer.NextToken(); -#line 1864 "cs.ATG" +#line 1868 "cs.ATG" val = "System.Object"; break; } case 102: { lexer.NextToken(); -#line 1865 "cs.ATG" +#line 1869 "cs.ATG" val = "System.SByte"; break; } case 104: { lexer.NextToken(); -#line 1866 "cs.ATG" +#line 1870 "cs.ATG" val = "System.Int16"; break; } case 108: { lexer.NextToken(); -#line 1867 "cs.ATG" +#line 1871 "cs.ATG" val = "System.String"; break; } case 116: { lexer.NextToken(); -#line 1868 "cs.ATG" +#line 1872 "cs.ATG" val = "System.UInt32"; break; } case 117: { lexer.NextToken(); -#line 1869 "cs.ATG" +#line 1873 "cs.ATG" val = "System.UInt64"; break; } case 120: { lexer.NextToken(); -#line 1870 "cs.ATG" +#line 1874 "cs.ATG" val = "System.UInt16"; break; } case 123: { lexer.NextToken(); -#line 1871 "cs.ATG" +#line 1875 "cs.ATG" val = "System.Void"; break; } } MemberAccess( -#line 1873 "cs.ATG" +#line 1877 "cs.ATG" out pexpr, new TypeReferenceExpression(new TypeReference(val, true)) { StartLocation = t.Location, EndLocation = t.EndLocation } ); } else if (la.kind == 111) { lexer.NextToken(); -#line 1876 "cs.ATG" +#line 1880 "cs.ATG" pexpr = new ThisReferenceExpression(); } else if (la.kind == 51) { lexer.NextToken(); -#line 1878 "cs.ATG" +#line 1882 "cs.ATG" pexpr = new BaseReferenceExpression(); } else if (la.kind == 89) { NewExpression( -#line 1881 "cs.ATG" +#line 1885 "cs.ATG" out pexpr); } else if (la.kind == 115) { lexer.NextToken(); Expect(20); if ( -#line 1885 "cs.ATG" +#line 1889 "cs.ATG" NotVoidPointer()) { Expect(123); -#line 1885 "cs.ATG" +#line 1889 "cs.ATG" type = new TypeReference("System.Void", true); } else if (StartOf(10)) { TypeWithRestriction( -#line 1886 "cs.ATG" +#line 1890 "cs.ATG" out type, true, true); } else SynErr(208); Expect(21); -#line 1888 "cs.ATG" +#line 1892 "cs.ATG" pexpr = new TypeOfExpression(type); } else if (la.kind == 63) { lexer.NextToken(); Expect(20); Type( -#line 1890 "cs.ATG" +#line 1894 "cs.ATG" out type); Expect(21); -#line 1890 "cs.ATG" +#line 1894 "cs.ATG" pexpr = new DefaultValueExpression(type); } else if (la.kind == 105) { lexer.NextToken(); Expect(20); Type( -#line 1891 "cs.ATG" +#line 1895 "cs.ATG" out type); Expect(21); -#line 1891 "cs.ATG" +#line 1895 "cs.ATG" pexpr = new SizeOfExpression(type); } else if (la.kind == 58) { lexer.NextToken(); Expect(20); Expr( -#line 1892 "cs.ATG" +#line 1896 "cs.ATG" out expr); Expect(21); -#line 1892 "cs.ATG" +#line 1896 "cs.ATG" pexpr = new CheckedExpression(expr); } else if (la.kind == 118) { lexer.NextToken(); Expect(20); Expr( -#line 1893 "cs.ATG" +#line 1897 "cs.ATG" out expr); Expect(21); -#line 1893 "cs.ATG" +#line 1897 "cs.ATG" pexpr = new UncheckedExpression(expr); } else if (la.kind == 64) { lexer.NextToken(); AnonymousMethodExpr( -#line 1894 "cs.ATG" +#line 1898 "cs.ATG" out expr); -#line 1894 "cs.ATG" +#line 1898 "cs.ATG" pexpr = expr; } else SynErr(209); -#line 1896 "cs.ATG" +#line 1900 "cs.ATG" if (pexpr != null) { pexpr.StartLocation = startLocation; pexpr.EndLocation = t.EndLocation; @@ -4623,78 +4639,78 @@ out expr); while (StartOf(36)) { if (la.kind == 31 || la.kind == 32) { -#line 1902 "cs.ATG" +#line 1906 "cs.ATG" startLocation = la.Location; if (la.kind == 31) { lexer.NextToken(); -#line 1904 "cs.ATG" +#line 1908 "cs.ATG" pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostIncrement); } else if (la.kind == 32) { lexer.NextToken(); -#line 1905 "cs.ATG" +#line 1909 "cs.ATG" pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostDecrement); } else SynErr(210); } else if (la.kind == 47) { PointerMemberAccess( -#line 1908 "cs.ATG" +#line 1912 "cs.ATG" out pexpr, pexpr); } else if (la.kind == 15) { MemberAccess( -#line 1909 "cs.ATG" +#line 1913 "cs.ATG" out pexpr, pexpr); } else if (la.kind == 20) { lexer.NextToken(); -#line 1913 "cs.ATG" +#line 1917 "cs.ATG" List parameters = new List(); -#line 1914 "cs.ATG" +#line 1918 "cs.ATG" pexpr = new InvocationExpression(pexpr, parameters); if (StartOf(26)) { Argument( -#line 1915 "cs.ATG" +#line 1919 "cs.ATG" out expr); -#line 1915 "cs.ATG" +#line 1919 "cs.ATG" SafeAdd(pexpr, parameters, expr); while (la.kind == 14) { lexer.NextToken(); Argument( -#line 1916 "cs.ATG" +#line 1920 "cs.ATG" out expr); -#line 1916 "cs.ATG" +#line 1920 "cs.ATG" SafeAdd(pexpr, parameters, expr); } } Expect(21); } else { -#line 1922 "cs.ATG" +#line 1926 "cs.ATG" List indices = new List(); pexpr = new IndexerExpression(pexpr, indices); lexer.NextToken(); Expr( -#line 1925 "cs.ATG" +#line 1929 "cs.ATG" out expr); -#line 1925 "cs.ATG" +#line 1929 "cs.ATG" SafeAdd(pexpr, indices, expr); while (la.kind == 14) { lexer.NextToken(); Expr( -#line 1926 "cs.ATG" +#line 1930 "cs.ATG" out expr); -#line 1926 "cs.ATG" +#line 1930 "cs.ATG" SafeAdd(pexpr, indices, expr); } Expect(19); -#line 1929 "cs.ATG" +#line 1933 "cs.ATG" if (pexpr != null) { pexpr.StartLocation = startLocation; pexpr.EndLocation = t.EndLocation; @@ -4705,83 +4721,83 @@ out expr); } void QueryExpression( -#line 2354 "cs.ATG" +#line 2358 "cs.ATG" out Expression outExpr) { -#line 2355 "cs.ATG" +#line 2359 "cs.ATG" QueryExpression q = new QueryExpression(); outExpr = q; q.StartLocation = la.Location; QueryExpressionFromClause fromClause; QueryExpressionFromClause( -#line 2359 "cs.ATG" +#line 2363 "cs.ATG" out fromClause); -#line 2359 "cs.ATG" +#line 2363 "cs.ATG" q.FromClause = fromClause; QueryExpressionBody( -#line 2360 "cs.ATG" +#line 2364 "cs.ATG" ref q); -#line 2361 "cs.ATG" +#line 2365 "cs.ATG" q.EndLocation = t.EndLocation; outExpr = q; /* set outExpr to q again if QueryExpressionBody changed it (can happen with 'into' clauses) */ } void ShortedLambdaExpression( -#line 2042 "cs.ATG" +#line 2046 "cs.ATG" IdentifierExpression ident, out Expression pexpr) { -#line 2043 "cs.ATG" +#line 2047 "cs.ATG" LambdaExpression lambda = new LambdaExpression(); pexpr = lambda; Expect(48); -#line 2048 "cs.ATG" +#line 2052 "cs.ATG" lambda.StartLocation = ident.StartLocation; lambda.Parameters.Add(new ParameterDeclarationExpression(null, ident.Identifier)); lambda.Parameters[0].StartLocation = ident.StartLocation; lambda.Parameters[0].EndLocation = ident.EndLocation; LambdaExpressionBody( -#line 2053 "cs.ATG" +#line 2057 "cs.ATG" lambda); } void TypeArgumentList( -#line 2288 "cs.ATG" +#line 2292 "cs.ATG" out List types, bool canBeUnbound) { -#line 2290 "cs.ATG" +#line 2294 "cs.ATG" types = new List(); TypeReference type = null; Expect(23); if ( -#line 2295 "cs.ATG" +#line 2299 "cs.ATG" canBeUnbound && (la.kind == Tokens.GreaterThan || la.kind == Tokens.Comma)) { -#line 2296 "cs.ATG" +#line 2300 "cs.ATG" types.Add(TypeReference.Null); while (la.kind == 14) { lexer.NextToken(); -#line 2297 "cs.ATG" +#line 2301 "cs.ATG" types.Add(TypeReference.Null); } } else if (StartOf(10)) { Type( -#line 2298 "cs.ATG" +#line 2302 "cs.ATG" out type); -#line 2298 "cs.ATG" +#line 2302 "cs.ATG" if (type != null) { types.Add(type); } while (la.kind == 14) { lexer.NextToken(); Type( -#line 2299 "cs.ATG" +#line 2303 "cs.ATG" out type); -#line 2299 "cs.ATG" +#line 2303 "cs.ATG" if (type != null) { types.Add(type); } } } else SynErr(211); @@ -4789,10 +4805,10 @@ out type); } void LambdaExpression( -#line 2022 "cs.ATG" +#line 2026 "cs.ATG" out Expression outExpr) { -#line 2024 "cs.ATG" +#line 2028 "cs.ATG" LambdaExpression lambda = new LambdaExpression(); lambda.StartLocation = la.Location; ParameterDeclarationExpression p; @@ -4801,36 +4817,36 @@ out Expression outExpr) { Expect(20); if (StartOf(10)) { LambdaExpressionParameter( -#line 2032 "cs.ATG" +#line 2036 "cs.ATG" out p); -#line 2032 "cs.ATG" +#line 2036 "cs.ATG" SafeAdd(lambda, lambda.Parameters, p); while (la.kind == 14) { lexer.NextToken(); LambdaExpressionParameter( -#line 2034 "cs.ATG" +#line 2038 "cs.ATG" out p); -#line 2034 "cs.ATG" +#line 2038 "cs.ATG" SafeAdd(lambda, lambda.Parameters, p); } } Expect(21); Expect(48); LambdaExpressionBody( -#line 2039 "cs.ATG" +#line 2043 "cs.ATG" lambda); } void MemberAccess( -#line 1937 "cs.ATG" +#line 1941 "cs.ATG" out Expression expr, Expression target) { -#line 1938 "cs.ATG" +#line 1942 "cs.ATG" List typeList; -#line 1940 "cs.ATG" +#line 1944 "cs.ATG" if (ShouldConvertTargetExpressionToTypeReference(target)) { TypeReference type = GetTypeReferenceFromExpression(target); if (type != null) { @@ -4842,25 +4858,25 @@ out Expression expr, Expression target) { Expect(15); Identifier(); -#line 1950 "cs.ATG" +#line 1954 "cs.ATG" expr = new MemberReferenceExpression(target, t.val); if ( -#line 1951 "cs.ATG" +#line 1955 "cs.ATG" IsGenericInSimpleNameOrMemberAccess()) { TypeArgumentList( -#line 1952 "cs.ATG" +#line 1956 "cs.ATG" out typeList, false); -#line 1953 "cs.ATG" +#line 1957 "cs.ATG" ((MemberReferenceExpression)expr).TypeArguments = typeList; } } void NewExpression( -#line 1969 "cs.ATG" +#line 1973 "cs.ATG" out Expression pexpr) { -#line 1970 "cs.ATG" +#line 1974 "cs.ATG" pexpr = null; List parameters = new List(); TypeReference type = null; @@ -4869,65 +4885,65 @@ out Expression pexpr) { Expect(89); if (StartOf(10)) { NonArrayType( -#line 1977 "cs.ATG" +#line 1981 "cs.ATG" out type); } if (la.kind == 16 || la.kind == 20) { if (la.kind == 20) { -#line 1983 "cs.ATG" +#line 1987 "cs.ATG" ObjectCreateExpression oce = new ObjectCreateExpression(type, parameters); lexer.NextToken(); -#line 1984 "cs.ATG" +#line 1988 "cs.ATG" if (type == null) Error("Cannot use an anonymous type with arguments for the constructor"); if (StartOf(26)) { Argument( -#line 1985 "cs.ATG" +#line 1989 "cs.ATG" out expr); -#line 1985 "cs.ATG" +#line 1989 "cs.ATG" SafeAdd(oce, parameters, expr); while (la.kind == 14) { lexer.NextToken(); Argument( -#line 1986 "cs.ATG" +#line 1990 "cs.ATG" out expr); -#line 1986 "cs.ATG" +#line 1990 "cs.ATG" SafeAdd(oce, parameters, expr); } } Expect(21); -#line 1988 "cs.ATG" +#line 1992 "cs.ATG" pexpr = oce; if (la.kind == 16) { CollectionOrObjectInitializer( -#line 1989 "cs.ATG" +#line 1993 "cs.ATG" out expr); -#line 1989 "cs.ATG" +#line 1993 "cs.ATG" oce.ObjectInitializer = (CollectionInitializerExpression)expr; } } else { -#line 1990 "cs.ATG" +#line 1994 "cs.ATG" ObjectCreateExpression oce = new ObjectCreateExpression(type, parameters); CollectionOrObjectInitializer( -#line 1991 "cs.ATG" +#line 1995 "cs.ATG" out expr); -#line 1991 "cs.ATG" +#line 1995 "cs.ATG" oce.ObjectInitializer = (CollectionInitializerExpression)expr; -#line 1992 "cs.ATG" +#line 1996 "cs.ATG" pexpr = oce; } } else if (la.kind == 18) { lexer.NextToken(); -#line 1997 "cs.ATG" +#line 2001 "cs.ATG" ArrayCreateExpression ace = new ArrayCreateExpression(type); /* we must not change RankSpecifier on the null type reference*/ if (ace.CreateType.IsNull) { ace.CreateType = new TypeReference(""); } @@ -4938,80 +4954,80 @@ out expr); while (la.kind == 14) { lexer.NextToken(); -#line 2004 "cs.ATG" +#line 2008 "cs.ATG" dims += 1; } Expect(19); -#line 2005 "cs.ATG" +#line 2009 "cs.ATG" ranks.Add(dims); dims = 0; while (la.kind == 18) { lexer.NextToken(); while (la.kind == 14) { lexer.NextToken(); -#line 2006 "cs.ATG" +#line 2010 "cs.ATG" ++dims; } Expect(19); -#line 2006 "cs.ATG" +#line 2010 "cs.ATG" ranks.Add(dims); dims = 0; } -#line 2007 "cs.ATG" +#line 2011 "cs.ATG" ace.CreateType.RankSpecifier = ranks.ToArray(); CollectionInitializer( -#line 2008 "cs.ATG" +#line 2012 "cs.ATG" out expr); -#line 2008 "cs.ATG" +#line 2012 "cs.ATG" ace.ArrayInitializer = (CollectionInitializerExpression)expr; } else if (StartOf(6)) { Expr( -#line 2009 "cs.ATG" +#line 2013 "cs.ATG" out expr); -#line 2009 "cs.ATG" +#line 2013 "cs.ATG" if (expr != null) parameters.Add(expr); while (la.kind == 14) { lexer.NextToken(); -#line 2010 "cs.ATG" +#line 2014 "cs.ATG" dims += 1; Expr( -#line 2011 "cs.ATG" +#line 2015 "cs.ATG" out expr); -#line 2011 "cs.ATG" +#line 2015 "cs.ATG" if (expr != null) parameters.Add(expr); } Expect(19); -#line 2013 "cs.ATG" +#line 2017 "cs.ATG" ranks.Add(dims); ace.Arguments = parameters; dims = 0; while (la.kind == 18) { lexer.NextToken(); while (la.kind == 14) { lexer.NextToken(); -#line 2014 "cs.ATG" +#line 2018 "cs.ATG" ++dims; } Expect(19); -#line 2014 "cs.ATG" +#line 2018 "cs.ATG" ranks.Add(dims); dims = 0; } -#line 2015 "cs.ATG" +#line 2019 "cs.ATG" ace.CreateType.RankSpecifier = ranks.ToArray(); if (la.kind == 16) { CollectionInitializer( -#line 2016 "cs.ATG" +#line 2020 "cs.ATG" out expr); -#line 2016 "cs.ATG" +#line 2020 "cs.ATG" ace.ArrayInitializer = (CollectionInitializerExpression)expr; } } else SynErr(212); @@ -5019,10 +5035,10 @@ out expr); } void AnonymousMethodExpr( -#line 2085 "cs.ATG" +#line 2089 "cs.ATG" out Expression outExpr) { -#line 2087 "cs.ATG" +#line 2091 "cs.ATG" AnonymousMethodExpression expr = new AnonymousMethodExpression(); expr.StartLocation = t.Location; BlockStatement stmt; @@ -5033,75 +5049,75 @@ out Expression outExpr) { lexer.NextToken(); if (StartOf(11)) { FormalParameterList( -#line 2096 "cs.ATG" +#line 2100 "cs.ATG" p); -#line 2096 "cs.ATG" +#line 2100 "cs.ATG" expr.Parameters = p; } Expect(21); -#line 2098 "cs.ATG" +#line 2102 "cs.ATG" expr.HasParameterList = true; } BlockInsideExpression( -#line 2100 "cs.ATG" +#line 2104 "cs.ATG" out stmt); -#line 2100 "cs.ATG" +#line 2104 "cs.ATG" expr.Body = stmt; -#line 2101 "cs.ATG" +#line 2105 "cs.ATG" expr.EndLocation = t.Location; } void PointerMemberAccess( -#line 1957 "cs.ATG" +#line 1961 "cs.ATG" out Expression expr, Expression target) { -#line 1958 "cs.ATG" +#line 1962 "cs.ATG" List typeList; Expect(47); Identifier(); -#line 1962 "cs.ATG" +#line 1966 "cs.ATG" expr = new PointerReferenceExpression(target, t.val); if ( -#line 1963 "cs.ATG" +#line 1967 "cs.ATG" IsGenericInSimpleNameOrMemberAccess()) { TypeArgumentList( -#line 1964 "cs.ATG" +#line 1968 "cs.ATG" out typeList, false); -#line 1965 "cs.ATG" +#line 1969 "cs.ATG" ((MemberReferenceExpression)expr).TypeArguments = typeList; } } void LambdaExpressionParameter( -#line 2056 "cs.ATG" +#line 2060 "cs.ATG" out ParameterDeclarationExpression p) { -#line 2057 "cs.ATG" +#line 2061 "cs.ATG" Location start = la.Location; p = null; TypeReference type; if ( -#line 2061 "cs.ATG" +#line 2065 "cs.ATG" Peek(1).kind == Tokens.Comma || Peek(1).kind == Tokens.CloseParenthesis) { Identifier(); -#line 2063 "cs.ATG" +#line 2067 "cs.ATG" p = new ParameterDeclarationExpression(null, t.val); p.StartLocation = start; p.EndLocation = t.EndLocation; } else if (StartOf(10)) { Type( -#line 2066 "cs.ATG" +#line 2070 "cs.ATG" out type); Identifier(); -#line 2068 "cs.ATG" +#line 2072 "cs.ATG" p = new ParameterDeclarationExpression(type, t.val); p.StartLocation = start; p.EndLocation = t.EndLocation; @@ -5109,263 +5125,263 @@ out type); } void LambdaExpressionBody( -#line 2074 "cs.ATG" +#line 2078 "cs.ATG" LambdaExpression lambda) { -#line 2075 "cs.ATG" +#line 2079 "cs.ATG" Expression expr; BlockStatement stmt; if (la.kind == 16) { BlockInsideExpression( -#line 2078 "cs.ATG" +#line 2082 "cs.ATG" out stmt); -#line 2078 "cs.ATG" +#line 2082 "cs.ATG" lambda.StatementBody = stmt; } else if (StartOf(6)) { Expr( -#line 2079 "cs.ATG" +#line 2083 "cs.ATG" out expr); -#line 2079 "cs.ATG" +#line 2083 "cs.ATG" lambda.ExpressionBody = expr; } else SynErr(215); -#line 2081 "cs.ATG" +#line 2085 "cs.ATG" lambda.EndLocation = t.EndLocation; -#line 2082 "cs.ATG" +#line 2086 "cs.ATG" lambda.ExtendedEndLocation = la.Location; } void BlockInsideExpression( -#line 2104 "cs.ATG" +#line 2108 "cs.ATG" out BlockStatement outStmt) { -#line 2105 "cs.ATG" +#line 2109 "cs.ATG" Statement stmt = null; outStmt = null; -#line 2109 "cs.ATG" +#line 2113 "cs.ATG" if (compilationUnit != null) { Block( -#line 2110 "cs.ATG" +#line 2114 "cs.ATG" out stmt); -#line 2110 "cs.ATG" +#line 2114 "cs.ATG" outStmt = (BlockStatement)stmt; -#line 2111 "cs.ATG" +#line 2115 "cs.ATG" } else { Expect(16); -#line 2113 "cs.ATG" +#line 2117 "cs.ATG" lexer.SkipCurrentBlock(0); Expect(17); -#line 2115 "cs.ATG" +#line 2119 "cs.ATG" } } void ConditionalAndExpr( -#line 2124 "cs.ATG" +#line 2128 "cs.ATG" ref Expression outExpr) { -#line 2125 "cs.ATG" +#line 2129 "cs.ATG" Expression expr; InclusiveOrExpr( -#line 2127 "cs.ATG" +#line 2131 "cs.ATG" ref outExpr); while (la.kind == 25) { lexer.NextToken(); UnaryExpr( -#line 2127 "cs.ATG" +#line 2131 "cs.ATG" out expr); InclusiveOrExpr( -#line 2127 "cs.ATG" +#line 2131 "cs.ATG" ref expr); -#line 2127 "cs.ATG" +#line 2131 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalAnd, expr); } } void InclusiveOrExpr( -#line 2130 "cs.ATG" +#line 2134 "cs.ATG" ref Expression outExpr) { -#line 2131 "cs.ATG" +#line 2135 "cs.ATG" Expression expr; ExclusiveOrExpr( -#line 2133 "cs.ATG" +#line 2137 "cs.ATG" ref outExpr); while (la.kind == 29) { lexer.NextToken(); UnaryExpr( -#line 2133 "cs.ATG" +#line 2137 "cs.ATG" out expr); ExclusiveOrExpr( -#line 2133 "cs.ATG" +#line 2137 "cs.ATG" ref expr); -#line 2133 "cs.ATG" +#line 2137 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseOr, expr); } } void ExclusiveOrExpr( -#line 2136 "cs.ATG" +#line 2140 "cs.ATG" ref Expression outExpr) { -#line 2137 "cs.ATG" +#line 2141 "cs.ATG" Expression expr; AndExpr( -#line 2139 "cs.ATG" +#line 2143 "cs.ATG" ref outExpr); while (la.kind == 30) { lexer.NextToken(); UnaryExpr( -#line 2139 "cs.ATG" +#line 2143 "cs.ATG" out expr); AndExpr( -#line 2139 "cs.ATG" +#line 2143 "cs.ATG" ref expr); -#line 2139 "cs.ATG" +#line 2143 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.ExclusiveOr, expr); } } void AndExpr( -#line 2142 "cs.ATG" +#line 2146 "cs.ATG" ref Expression outExpr) { -#line 2143 "cs.ATG" +#line 2147 "cs.ATG" Expression expr; EqualityExpr( -#line 2145 "cs.ATG" +#line 2149 "cs.ATG" ref outExpr); while (la.kind == 28) { lexer.NextToken(); UnaryExpr( -#line 2145 "cs.ATG" +#line 2149 "cs.ATG" out expr); EqualityExpr( -#line 2145 "cs.ATG" +#line 2149 "cs.ATG" ref expr); -#line 2145 "cs.ATG" +#line 2149 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseAnd, expr); } } void EqualityExpr( -#line 2148 "cs.ATG" +#line 2152 "cs.ATG" ref Expression outExpr) { -#line 2150 "cs.ATG" +#line 2154 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; RelationalExpr( -#line 2154 "cs.ATG" +#line 2158 "cs.ATG" ref outExpr); while (la.kind == 33 || la.kind == 34) { if (la.kind == 34) { lexer.NextToken(); -#line 2157 "cs.ATG" +#line 2161 "cs.ATG" op = BinaryOperatorType.InEquality; } else { lexer.NextToken(); -#line 2158 "cs.ATG" +#line 2162 "cs.ATG" op = BinaryOperatorType.Equality; } UnaryExpr( -#line 2160 "cs.ATG" +#line 2164 "cs.ATG" out expr); RelationalExpr( -#line 2160 "cs.ATG" +#line 2164 "cs.ATG" ref expr); -#line 2160 "cs.ATG" +#line 2164 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void RelationalExpr( -#line 2164 "cs.ATG" +#line 2168 "cs.ATG" ref Expression outExpr) { -#line 2166 "cs.ATG" +#line 2170 "cs.ATG" TypeReference type; Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 2171 "cs.ATG" +#line 2175 "cs.ATG" ref outExpr); while (StartOf(37)) { if (StartOf(38)) { if (la.kind == 23) { lexer.NextToken(); -#line 2173 "cs.ATG" +#line 2177 "cs.ATG" op = BinaryOperatorType.LessThan; } else if (la.kind == 22) { lexer.NextToken(); -#line 2174 "cs.ATG" +#line 2178 "cs.ATG" op = BinaryOperatorType.GreaterThan; } else if (la.kind == 36) { lexer.NextToken(); -#line 2175 "cs.ATG" +#line 2179 "cs.ATG" op = BinaryOperatorType.LessThanOrEqual; } else if (la.kind == 35) { lexer.NextToken(); -#line 2176 "cs.ATG" +#line 2180 "cs.ATG" op = BinaryOperatorType.GreaterThanOrEqual; } else SynErr(216); UnaryExpr( -#line 2178 "cs.ATG" +#line 2182 "cs.ATG" out expr); ShiftExpr( -#line 2179 "cs.ATG" +#line 2183 "cs.ATG" ref expr); -#line 2180 "cs.ATG" +#line 2184 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else { if (la.kind == 85) { lexer.NextToken(); TypeWithRestriction( -#line 2183 "cs.ATG" +#line 2187 "cs.ATG" out type, false, false); if ( -#line 2184 "cs.ATG" +#line 2188 "cs.ATG" la.kind == Tokens.Question && !IsPossibleExpressionStart(Peek(1).kind)) { NullableQuestionMark( -#line 2185 "cs.ATG" +#line 2189 "cs.ATG" ref type); } -#line 2186 "cs.ATG" +#line 2190 "cs.ATG" outExpr = new TypeOfIsExpression(outExpr, type); } else if (la.kind == 50) { lexer.NextToken(); TypeWithRestriction( -#line 2188 "cs.ATG" +#line 2192 "cs.ATG" out type, false, false); if ( -#line 2189 "cs.ATG" +#line 2193 "cs.ATG" la.kind == Tokens.Question && !IsPossibleExpressionStart(Peek(1).kind)) { NullableQuestionMark( -#line 2190 "cs.ATG" +#line 2194 "cs.ATG" ref type); } -#line 2191 "cs.ATG" +#line 2195 "cs.ATG" outExpr = new CastExpression(type, outExpr, CastType.TryCast); } else SynErr(217); } @@ -5373,83 +5389,83 @@ ref type); } void ShiftExpr( -#line 2196 "cs.ATG" +#line 2200 "cs.ATG" ref Expression outExpr) { -#line 2198 "cs.ATG" +#line 2202 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; AdditiveExpr( -#line 2202 "cs.ATG" +#line 2206 "cs.ATG" ref outExpr); while (la.kind == 37 || -#line 2205 "cs.ATG" +#line 2209 "cs.ATG" IsShiftRight()) { if (la.kind == 37) { lexer.NextToken(); -#line 2204 "cs.ATG" +#line 2208 "cs.ATG" op = BinaryOperatorType.ShiftLeft; } else { Expect(22); Expect(22); -#line 2206 "cs.ATG" +#line 2210 "cs.ATG" op = BinaryOperatorType.ShiftRight; } UnaryExpr( -#line 2209 "cs.ATG" +#line 2213 "cs.ATG" out expr); AdditiveExpr( -#line 2209 "cs.ATG" +#line 2213 "cs.ATG" ref expr); -#line 2209 "cs.ATG" +#line 2213 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AdditiveExpr( -#line 2213 "cs.ATG" +#line 2217 "cs.ATG" ref Expression outExpr) { -#line 2215 "cs.ATG" +#line 2219 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; MultiplicativeExpr( -#line 2219 "cs.ATG" +#line 2223 "cs.ATG" ref outExpr); while (la.kind == 4 || la.kind == 5) { if (la.kind == 4) { lexer.NextToken(); -#line 2222 "cs.ATG" +#line 2226 "cs.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 2223 "cs.ATG" +#line 2227 "cs.ATG" op = BinaryOperatorType.Subtract; } UnaryExpr( -#line 2225 "cs.ATG" +#line 2229 "cs.ATG" out expr); MultiplicativeExpr( -#line 2225 "cs.ATG" +#line 2229 "cs.ATG" ref expr); -#line 2225 "cs.ATG" +#line 2229 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void MultiplicativeExpr( -#line 2229 "cs.ATG" +#line 2233 "cs.ATG" ref Expression outExpr) { -#line 2231 "cs.ATG" +#line 2235 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; @@ -5457,82 +5473,82 @@ ref Expression outExpr) { if (la.kind == 6) { lexer.NextToken(); -#line 2237 "cs.ATG" +#line 2241 "cs.ATG" op = BinaryOperatorType.Multiply; } else if (la.kind == 7) { lexer.NextToken(); -#line 2238 "cs.ATG" +#line 2242 "cs.ATG" op = BinaryOperatorType.Divide; } else { lexer.NextToken(); -#line 2239 "cs.ATG" +#line 2243 "cs.ATG" op = BinaryOperatorType.Modulus; } UnaryExpr( -#line 2241 "cs.ATG" +#line 2245 "cs.ATG" out expr); -#line 2241 "cs.ATG" +#line 2245 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void TypeParameterConstraintsClauseBase( -#line 2345 "cs.ATG" +#line 2349 "cs.ATG" out TypeReference type) { -#line 2346 "cs.ATG" +#line 2350 "cs.ATG" TypeReference t; type = null; if (la.kind == 109) { lexer.NextToken(); -#line 2348 "cs.ATG" +#line 2352 "cs.ATG" type = TypeReference.StructConstraint; } else if (la.kind == 59) { lexer.NextToken(); -#line 2349 "cs.ATG" +#line 2353 "cs.ATG" type = TypeReference.ClassConstraint; } else if (la.kind == 89) { lexer.NextToken(); Expect(20); Expect(21); -#line 2350 "cs.ATG" +#line 2354 "cs.ATG" type = TypeReference.NewConstraint; } else if (StartOf(10)) { Type( -#line 2351 "cs.ATG" +#line 2355 "cs.ATG" out t); -#line 2351 "cs.ATG" +#line 2355 "cs.ATG" type = t; } else SynErr(218); } void QueryExpressionFromClause( -#line 2366 "cs.ATG" +#line 2370 "cs.ATG" out QueryExpressionFromClause fc) { -#line 2367 "cs.ATG" +#line 2371 "cs.ATG" fc = new QueryExpressionFromClause(); fc.StartLocation = la.Location; Expect(137); QueryExpressionFromOrJoinClause( -#line 2371 "cs.ATG" +#line 2375 "cs.ATG" fc); -#line 2372 "cs.ATG" +#line 2376 "cs.ATG" fc.EndLocation = t.EndLocation; } void QueryExpressionBody( -#line 2402 "cs.ATG" +#line 2406 "cs.ATG" ref QueryExpression q) { -#line 2403 "cs.ATG" +#line 2407 "cs.ATG" QueryExpressionFromClause fromClause; QueryExpressionWhereClause whereClause; QueryExpressionLetClause letClause; QueryExpressionJoinClause joinClause; QueryExpressionOrderClause orderClause; @@ -5541,249 +5557,249 @@ ref QueryExpression q) { while (StartOf(39)) { if (la.kind == 137) { QueryExpressionFromClause( -#line 2409 "cs.ATG" +#line 2413 "cs.ATG" out fromClause); -#line 2409 "cs.ATG" +#line 2413 "cs.ATG" SafeAdd(q, q.MiddleClauses, fromClause); } else if (la.kind == 127) { QueryExpressionWhereClause( -#line 2410 "cs.ATG" +#line 2414 "cs.ATG" out whereClause); -#line 2410 "cs.ATG" +#line 2414 "cs.ATG" SafeAdd(q, q.MiddleClauses, whereClause); } else if (la.kind == 141) { QueryExpressionLetClause( -#line 2411 "cs.ATG" +#line 2415 "cs.ATG" out letClause); -#line 2411 "cs.ATG" +#line 2415 "cs.ATG" SafeAdd(q, q.MiddleClauses, letClause); } else if (la.kind == 142) { QueryExpressionJoinClause( -#line 2412 "cs.ATG" +#line 2416 "cs.ATG" out joinClause); -#line 2412 "cs.ATG" +#line 2416 "cs.ATG" SafeAdd(q, q.MiddleClauses, joinClause); } else { QueryExpressionOrderByClause( -#line 2413 "cs.ATG" +#line 2417 "cs.ATG" out orderClause); -#line 2413 "cs.ATG" +#line 2417 "cs.ATG" SafeAdd(q, q.MiddleClauses, orderClause); } } if (la.kind == 133) { QueryExpressionSelectClause( -#line 2415 "cs.ATG" +#line 2419 "cs.ATG" out selectClause); -#line 2415 "cs.ATG" +#line 2419 "cs.ATG" q.SelectOrGroupClause = selectClause; } else if (la.kind == 134) { QueryExpressionGroupClause( -#line 2416 "cs.ATG" +#line 2420 "cs.ATG" out groupClause); -#line 2416 "cs.ATG" +#line 2420 "cs.ATG" q.SelectOrGroupClause = groupClause; } else SynErr(219); if (la.kind == 136) { QueryExpressionIntoClause( -#line 2418 "cs.ATG" +#line 2422 "cs.ATG" ref q); } } void QueryExpressionFromOrJoinClause( -#line 2392 "cs.ATG" +#line 2396 "cs.ATG" QueryExpressionFromOrJoinClause fjc) { -#line 2393 "cs.ATG" +#line 2397 "cs.ATG" TypeReference type; Expression expr; -#line 2395 "cs.ATG" +#line 2399 "cs.ATG" fjc.Type = null; if ( -#line 2396 "cs.ATG" +#line 2400 "cs.ATG" IsLocalVarDecl()) { Type( -#line 2396 "cs.ATG" +#line 2400 "cs.ATG" out type); -#line 2396 "cs.ATG" +#line 2400 "cs.ATG" fjc.Type = type; } Identifier(); -#line 2397 "cs.ATG" +#line 2401 "cs.ATG" fjc.Identifier = t.val; Expect(81); Expr( -#line 2399 "cs.ATG" +#line 2403 "cs.ATG" out expr); -#line 2399 "cs.ATG" +#line 2403 "cs.ATG" fjc.InExpression = expr; } void QueryExpressionJoinClause( -#line 2375 "cs.ATG" +#line 2379 "cs.ATG" out QueryExpressionJoinClause jc) { -#line 2376 "cs.ATG" +#line 2380 "cs.ATG" jc = new QueryExpressionJoinClause(); jc.StartLocation = la.Location; Expression expr; Expect(142); QueryExpressionFromOrJoinClause( -#line 2381 "cs.ATG" +#line 2385 "cs.ATG" jc); Expect(143); Expr( -#line 2383 "cs.ATG" +#line 2387 "cs.ATG" out expr); -#line 2383 "cs.ATG" +#line 2387 "cs.ATG" jc.OnExpression = expr; Expect(144); Expr( -#line 2385 "cs.ATG" +#line 2389 "cs.ATG" out expr); -#line 2385 "cs.ATG" +#line 2389 "cs.ATG" jc.EqualsExpression = expr; if (la.kind == 136) { lexer.NextToken(); Identifier(); -#line 2387 "cs.ATG" +#line 2391 "cs.ATG" jc.IntoIdentifier = t.val; } -#line 2389 "cs.ATG" +#line 2393 "cs.ATG" jc.EndLocation = t.EndLocation; } void QueryExpressionWhereClause( -#line 2421 "cs.ATG" +#line 2425 "cs.ATG" out QueryExpressionWhereClause wc) { -#line 2422 "cs.ATG" +#line 2426 "cs.ATG" Expression expr; wc = new QueryExpressionWhereClause(); wc.StartLocation = la.Location; Expect(127); Expr( -#line 2425 "cs.ATG" +#line 2429 "cs.ATG" out expr); -#line 2425 "cs.ATG" +#line 2429 "cs.ATG" wc.Condition = expr; -#line 2426 "cs.ATG" +#line 2430 "cs.ATG" wc.EndLocation = t.EndLocation; } void QueryExpressionLetClause( -#line 2429 "cs.ATG" +#line 2433 "cs.ATG" out QueryExpressionLetClause wc) { -#line 2430 "cs.ATG" +#line 2434 "cs.ATG" Expression expr; wc = new QueryExpressionLetClause(); wc.StartLocation = la.Location; Expect(141); Identifier(); -#line 2433 "cs.ATG" +#line 2437 "cs.ATG" wc.Identifier = t.val; Expect(3); Expr( -#line 2435 "cs.ATG" +#line 2439 "cs.ATG" out expr); -#line 2435 "cs.ATG" +#line 2439 "cs.ATG" wc.Expression = expr; -#line 2436 "cs.ATG" +#line 2440 "cs.ATG" wc.EndLocation = t.EndLocation; } void QueryExpressionOrderByClause( -#line 2439 "cs.ATG" +#line 2443 "cs.ATG" out QueryExpressionOrderClause oc) { -#line 2440 "cs.ATG" +#line 2444 "cs.ATG" QueryExpressionOrdering ordering; oc = new QueryExpressionOrderClause(); oc.StartLocation = la.Location; Expect(140); QueryExpressionOrdering( -#line 2443 "cs.ATG" +#line 2447 "cs.ATG" out ordering); -#line 2443 "cs.ATG" +#line 2447 "cs.ATG" SafeAdd(oc, oc.Orderings, ordering); while (la.kind == 14) { lexer.NextToken(); QueryExpressionOrdering( -#line 2445 "cs.ATG" +#line 2449 "cs.ATG" out ordering); -#line 2445 "cs.ATG" +#line 2449 "cs.ATG" SafeAdd(oc, oc.Orderings, ordering); } -#line 2447 "cs.ATG" +#line 2451 "cs.ATG" oc.EndLocation = t.EndLocation; } void QueryExpressionSelectClause( -#line 2460 "cs.ATG" +#line 2464 "cs.ATG" out QueryExpressionSelectClause sc) { -#line 2461 "cs.ATG" +#line 2465 "cs.ATG" Expression expr; sc = new QueryExpressionSelectClause(); sc.StartLocation = la.Location; Expect(133); Expr( -#line 2464 "cs.ATG" +#line 2468 "cs.ATG" out expr); -#line 2464 "cs.ATG" +#line 2468 "cs.ATG" sc.Projection = expr; -#line 2465 "cs.ATG" +#line 2469 "cs.ATG" sc.EndLocation = t.EndLocation; } void QueryExpressionGroupClause( -#line 2468 "cs.ATG" +#line 2472 "cs.ATG" out QueryExpressionGroupClause gc) { -#line 2469 "cs.ATG" +#line 2473 "cs.ATG" Expression expr; gc = new QueryExpressionGroupClause(); gc.StartLocation = la.Location; Expect(134); Expr( -#line 2472 "cs.ATG" +#line 2476 "cs.ATG" out expr); -#line 2472 "cs.ATG" +#line 2476 "cs.ATG" gc.Projection = expr; Expect(135); Expr( -#line 2474 "cs.ATG" +#line 2478 "cs.ATG" out expr); -#line 2474 "cs.ATG" +#line 2478 "cs.ATG" gc.GroupBy = expr; -#line 2475 "cs.ATG" +#line 2479 "cs.ATG" gc.EndLocation = t.EndLocation; } void QueryExpressionIntoClause( -#line 2478 "cs.ATG" +#line 2482 "cs.ATG" ref QueryExpression q) { -#line 2479 "cs.ATG" +#line 2483 "cs.ATG" QueryExpression firstQuery = q; QueryExpression continuedQuery = new QueryExpression(); continuedQuery.StartLocation = q.StartLocation; @@ -5798,43 +5814,43 @@ ref QueryExpression q) { Expect(136); Identifier(); -#line 2492 "cs.ATG" +#line 2496 "cs.ATG" continuedQuery.FromClause.Identifier = t.val; -#line 2493 "cs.ATG" +#line 2497 "cs.ATG" continuedQuery.FromClause.EndLocation = t.EndLocation; QueryExpressionBody( -#line 2494 "cs.ATG" +#line 2498 "cs.ATG" ref q); } void QueryExpressionOrdering( -#line 2450 "cs.ATG" +#line 2454 "cs.ATG" out QueryExpressionOrdering ordering) { -#line 2451 "cs.ATG" +#line 2455 "cs.ATG" Expression expr; ordering = new QueryExpressionOrdering(); ordering.StartLocation = la.Location; Expr( -#line 2453 "cs.ATG" +#line 2457 "cs.ATG" out expr); -#line 2453 "cs.ATG" +#line 2457 "cs.ATG" ordering.Criteria = expr; if (la.kind == 138 || la.kind == 139) { if (la.kind == 138) { lexer.NextToken(); -#line 2454 "cs.ATG" +#line 2458 "cs.ATG" ordering.Direction = QueryExpressionOrderingDirection.Ascending; } else { lexer.NextToken(); -#line 2455 "cs.ATG" +#line 2459 "cs.ATG" ordering.Direction = QueryExpressionOrderingDirection.Descending; } } -#line 2457 "cs.ATG" +#line 2461 "cs.ATG" ordering.EndLocation = t.EndLocation; } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG index 793a61da0f..b897a5fe6e 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG @@ -364,7 +364,7 @@ TypeDecl attributes> Identifier (. newType.Name = t.val; .) /* .NET 2.0 */ - [ TypeParameterList ] + [ TypeParameterList ] (. SetParentNonNullable(templates, newType); .) [ ClassBase (. newType.BaseTypes = names; .) ] @@ -389,7 +389,7 @@ TypeDecl attributes> Identifier (. newType.Name = t.val; .) /* .NET 2.0 */ - [ TypeParameterList ] + [ TypeParameterList ] (. SetParentNonNullable(templates, newType); .) [ StructInterfaces (. newType.BaseTypes = names; .) ] @@ -413,7 +413,7 @@ TypeDecl attributes> Identifier (. newType.Name = t.val; .) /* .NET 2.0 */ - [ TypeParameterList ] + [ TypeParameterList ] (. SetParentNonNullable(templates, newType); .) [ InterfaceBase (. newType.BaseTypes = names; .) ] @@ -451,7 +451,7 @@ TypeDecl attributes> Identifier (. delegateDeclr.Name = t.val; .) /* .NET 2.0 */ - [ TypeParameterList ] + [ TypeParameterList ] (. SetParentNonNullable(templates, delegateDeclr); .) "(" [ FormalParameterList

(. delegateDeclr.Parameters = p; .) ] ")" @@ -778,6 +778,7 @@ StructMemberDecl attributes> Templates = templates, IsExtensionMethod = isExtensionMethod }; + SetParentNonNullable(templates, methodDeclaration); if (explicitInterface != null) methodDeclaration.InterfaceImplementations.Add(new InterfaceImplementation(explicitInterface, qualident)); compilationUnit.AddChild(methodDeclaration); @@ -983,6 +984,7 @@ StructMemberDecl attributes> methodDeclaration.EndLocation = t.EndLocation; methodDeclaration.IsExtensionMethod = isExtensionMethod; methodDeclaration.Templates = templates; + SetParentNonNullable(templates, methodDeclaration); compilationUnit.AddChild(methodDeclaration); .) { TypeParameterConstraintsClause } @@ -1075,6 +1077,7 @@ InterfaceMemberDecl Parameters = parameters, Attributes = attributes, Templates = templates, StartLocation = startLocation, EndLocation = t.EndLocation }; + SetParentNonNullable(templates, md); compilationUnit.AddChild(md); .) | ( @@ -1093,6 +1096,7 @@ InterfaceMemberDecl Parameters = parameters, Attributes = attributes, Templates = templates, StartLocation = startLocation, EndLocation = t.EndLocation }; + SetParentNonNullable(templates, md); compilationUnit.AddChild(md); .) /*--- interface property declaration: */ diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index 733cf7f0f3..23fdb397f7 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -180,7 +180,7 @@ out u); void GlobalAttributeSection() { Expect(28); -#line 2534 "VBNET.ATG" +#line 2540 "VBNET.ATG" Location startPos = t.Location; if (la.kind == 52) { lexer.NextToken(); @@ -188,20 +188,20 @@ out u); lexer.NextToken(); } else SynErr(226); -#line 2536 "VBNET.ATG" +#line 2542 "VBNET.ATG" string attributeTarget = t.val != null ? t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture) : null; List attributes = new List(); ASTAttribute attribute; Expect(11); Attribute( -#line 2540 "VBNET.ATG" +#line 2546 "VBNET.ATG" out attribute); -#line 2540 "VBNET.ATG" +#line 2546 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2541 "VBNET.ATG" +#line 2547 "VBNET.ATG" NotFinalComma()) { if (la.kind == 12) { lexer.NextToken(); @@ -213,10 +213,10 @@ NotFinalComma()) { Expect(11); } Attribute( -#line 2541 "VBNET.ATG" +#line 2547 "VBNET.ATG" out attribute); -#line 2541 "VBNET.ATG" +#line 2547 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -225,7 +225,7 @@ out attribute); Expect(27); EndOfStmt(); -#line 2546 "VBNET.ATG" +#line 2552 "VBNET.ATG" AttributeSection section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -334,47 +334,47 @@ out aliasedType); } void Qualident( -#line 3304 "VBNET.ATG" +#line 3310 "VBNET.ATG" out string qualident) { -#line 3306 "VBNET.ATG" +#line 3312 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 3310 "VBNET.ATG" +#line 3316 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 3311 "VBNET.ATG" +#line 3317 "VBNET.ATG" DotAndIdentOrKw()) { Expect(16); IdentifierOrKeyword( -#line 3311 "VBNET.ATG" +#line 3317 "VBNET.ATG" out name); -#line 3311 "VBNET.ATG" +#line 3317 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 3313 "VBNET.ATG" +#line 3319 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 2407 "VBNET.ATG" +#line 2413 "VBNET.ATG" out TypeReference typeref) { -#line 2408 "VBNET.ATG" +#line 2414 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2410 "VBNET.ATG" +#line 2416 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 2414 "VBNET.ATG" +#line 2420 "VBNET.ATG" out rank); -#line 2415 "VBNET.ATG" +#line 2421 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -397,35 +397,35 @@ out rank); } void AttributeSection( -#line 2611 "VBNET.ATG" +#line 2617 "VBNET.ATG" out AttributeSection section) { -#line 2613 "VBNET.ATG" +#line 2619 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(28); -#line 2617 "VBNET.ATG" +#line 2623 "VBNET.ATG" Location startPos = t.Location; if ( -#line 2618 "VBNET.ATG" +#line 2624 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 106) { lexer.NextToken(); -#line 2619 "VBNET.ATG" +#line 2625 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 180) { lexer.NextToken(); -#line 2620 "VBNET.ATG" +#line 2626 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2623 "VBNET.ATG" +#line 2629 "VBNET.ATG" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -438,20 +438,20 @@ IsLocalAttrTarget()) { Expect(11); } Attribute( -#line 2633 "VBNET.ATG" +#line 2639 "VBNET.ATG" out attribute); -#line 2633 "VBNET.ATG" +#line 2639 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2634 "VBNET.ATG" +#line 2640 "VBNET.ATG" NotFinalComma()) { Expect(12); Attribute( -#line 2634 "VBNET.ATG" +#line 2640 "VBNET.ATG" out attribute); -#line 2634 "VBNET.ATG" +#line 2640 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -459,7 +459,7 @@ out attribute); } Expect(27); -#line 2638 "VBNET.ATG" +#line 2644 "VBNET.ATG" section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -470,69 +470,69 @@ out attribute); } void TypeModifier( -#line 3387 "VBNET.ATG" +#line 3393 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 173: { lexer.NextToken(); -#line 3388 "VBNET.ATG" +#line 3394 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 172: { lexer.NextToken(); -#line 3389 "VBNET.ATG" +#line 3395 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 112: { lexer.NextToken(); -#line 3390 "VBNET.ATG" +#line 3396 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 170: { lexer.NextToken(); -#line 3391 "VBNET.ATG" +#line 3397 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 185: { lexer.NextToken(); -#line 3392 "VBNET.ATG" +#line 3398 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 184: { lexer.NextToken(); -#line 3393 "VBNET.ATG" +#line 3399 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 142: { lexer.NextToken(); -#line 3394 "VBNET.ATG" +#line 3400 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 152: { lexer.NextToken(); -#line 3395 "VBNET.ATG" +#line 3401 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 168: { lexer.NextToken(); -#line 3396 "VBNET.ATG" +#line 3402 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -570,6 +570,9 @@ ModifierList m, List attributes) { TypeParameterList( #line 440 "VBNET.ATG" newType.Templates); + +#line 440 "VBNET.ATG" + SetParent(newType.Templates, newType); EndOfStmt(); #line 442 "VBNET.ATG" @@ -651,6 +654,9 @@ newType); TypeParameterList( #line 477 "VBNET.ATG" newType.Templates); + +#line 477 "VBNET.ATG" + SetParent(newType.Templates, newType); EndOfStmt(); #line 479 "VBNET.ATG" @@ -728,6 +734,9 @@ newType); TypeParameterList( #line 515 "VBNET.ATG" newType.Templates); + +#line 515 "VBNET.ATG" + SetParent(newType.Templates, newType); EndOfStmt(); #line 517 "VBNET.ATG" @@ -768,6 +777,9 @@ newType); TypeParameterList( #line 534 "VBNET.ATG" delegateDeclr.Templates); + +#line 534 "VBNET.ATG" + SetParent(delegateDeclr.Templates, delegateDeclr); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { @@ -789,6 +801,9 @@ p); TypeParameterList( #line 538 "VBNET.ATG" delegateDeclr.Templates); + +#line 538 "VBNET.ATG" + SetParent(delegateDeclr.Templates, delegateDeclr); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { @@ -948,42 +963,42 @@ out constraint); } void ClassBaseType( -#line 766 "VBNET.ATG" +#line 768 "VBNET.ATG" out TypeReference typeRef) { -#line 768 "VBNET.ATG" +#line 770 "VBNET.ATG" typeRef = null; Expect(127); TypeName( -#line 771 "VBNET.ATG" +#line 773 "VBNET.ATG" out typeRef); EndOfStmt(); } void TypeImplementsClause( -#line 1566 "VBNET.ATG" +#line 1572 "VBNET.ATG" out List baseInterfaces) { -#line 1568 "VBNET.ATG" +#line 1574 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; Expect(123); TypeName( -#line 1571 "VBNET.ATG" +#line 1577 "VBNET.ATG" out type); -#line 1573 "VBNET.ATG" +#line 1579 "VBNET.ATG" baseInterfaces.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1576 "VBNET.ATG" +#line 1582 "VBNET.ATG" out type); -#line 1577 "VBNET.ATG" +#line 1583 "VBNET.ATG" baseInterfaces.Add(type); } EndOfStmt(); @@ -1113,10 +1128,10 @@ m, attributes); } void NonArrayTypeName( -#line 2433 "VBNET.ATG" +#line 2439 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2435 "VBNET.ATG" +#line 2441 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; @@ -1126,36 +1141,36 @@ out TypeReference typeref, bool canBeUnbound) { lexer.NextToken(); Expect(16); -#line 2440 "VBNET.ATG" +#line 2446 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 2441 "VBNET.ATG" +#line 2447 "VBNET.ATG" out typeref, canBeUnbound); -#line 2442 "VBNET.ATG" +#line 2448 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 16) { lexer.NextToken(); -#line 2443 "VBNET.ATG" +#line 2449 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 2444 "VBNET.ATG" +#line 2450 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 2445 "VBNET.ATG" +#line 2451 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 154) { lexer.NextToken(); -#line 2448 "VBNET.ATG" +#line 2454 "VBNET.ATG" typeref = new TypeReference("System.Object", true); if (la.kind == 21) { lexer.NextToken(); -#line 2452 "VBNET.ATG" +#line 2458 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1163,15 +1178,15 @@ out nestedTypeRef, canBeUnbound); } } else if (StartOf(11)) { PrimitiveTypeName( -#line 2458 "VBNET.ATG" +#line 2464 "VBNET.ATG" out name); -#line 2458 "VBNET.ATG" +#line 2464 "VBNET.ATG" typeref = new TypeReference(name, true); if (la.kind == 21) { lexer.NextToken(); -#line 2462 "VBNET.ATG" +#line 2468 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1211,27 +1226,27 @@ out f); } void InterfaceBase( -#line 1551 "VBNET.ATG" +#line 1557 "VBNET.ATG" out List bases) { -#line 1553 "VBNET.ATG" +#line 1559 "VBNET.ATG" TypeReference type; bases = new List(); Expect(127); TypeName( -#line 1557 "VBNET.ATG" +#line 1563 "VBNET.ATG" out type); -#line 1557 "VBNET.ATG" +#line 1563 "VBNET.ATG" bases.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1560 "VBNET.ATG" +#line 1566 "VBNET.ATG" out type); -#line 1560 "VBNET.ATG" +#line 1566 "VBNET.ATG" bases.Add(type); } EndOfStmt(); @@ -1258,162 +1273,162 @@ TypeDeclaration newType) { } void FormalParameterList( -#line 2648 "VBNET.ATG" +#line 2654 "VBNET.ATG" List parameter) { -#line 2649 "VBNET.ATG" +#line 2655 "VBNET.ATG" ParameterDeclarationExpression p; FormalParameter( -#line 2651 "VBNET.ATG" +#line 2657 "VBNET.ATG" out p); -#line 2651 "VBNET.ATG" +#line 2657 "VBNET.ATG" if (p != null) parameter.Add(p); while (la.kind == 12) { lexer.NextToken(); FormalParameter( -#line 2653 "VBNET.ATG" +#line 2659 "VBNET.ATG" out p); -#line 2653 "VBNET.ATG" +#line 2659 "VBNET.ATG" if (p != null) parameter.Add(p); } } void MemberModifier( -#line 3399 "VBNET.ATG" +#line 3405 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 142: { lexer.NextToken(); -#line 3400 "VBNET.ATG" +#line 3406 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 89: { lexer.NextToken(); -#line 3401 "VBNET.ATG" +#line 3407 "VBNET.ATG" m.Add(Modifiers.Default, t.Location); break; } case 112: { lexer.NextToken(); -#line 3402 "VBNET.ATG" +#line 3408 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 184: { lexer.NextToken(); -#line 3403 "VBNET.ATG" +#line 3409 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 166: { lexer.NextToken(); -#line 3404 "VBNET.ATG" +#line 3410 "VBNET.ATG" m.Add(Modifiers.Override, t.Location); break; } case 143: { lexer.NextToken(); -#line 3405 "VBNET.ATG" +#line 3411 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 170: { lexer.NextToken(); -#line 3406 "VBNET.ATG" +#line 3412 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 172: { lexer.NextToken(); -#line 3407 "VBNET.ATG" +#line 3413 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 173: { lexer.NextToken(); -#line 3408 "VBNET.ATG" +#line 3414 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 152: { lexer.NextToken(); -#line 3409 "VBNET.ATG" +#line 3415 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 153: { lexer.NextToken(); -#line 3410 "VBNET.ATG" +#line 3416 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 185: { lexer.NextToken(); -#line 3411 "VBNET.ATG" +#line 3417 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 165: { lexer.NextToken(); -#line 3412 "VBNET.ATG" +#line 3418 "VBNET.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 164: { lexer.NextToken(); -#line 3413 "VBNET.ATG" +#line 3419 "VBNET.ATG" m.Add(Modifiers.Overloads, t.Location); break; } case 175: { lexer.NextToken(); -#line 3414 "VBNET.ATG" +#line 3420 "VBNET.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 220: { lexer.NextToken(); -#line 3415 "VBNET.ATG" +#line 3421 "VBNET.ATG" m.Add(Modifiers.WriteOnly, t.Location); break; } case 219: { lexer.NextToken(); -#line 3416 "VBNET.ATG" +#line 3422 "VBNET.ATG" m.Add(Modifiers.WithEvents, t.Location); break; } case 92: { lexer.NextToken(); -#line 3417 "VBNET.ATG" +#line 3423 "VBNET.ATG" m.Add(Modifiers.Dim, t.Location); break; } case 168: { lexer.NextToken(); -#line 3418 "VBNET.ATG" +#line 3424 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -1422,18 +1437,18 @@ ModifierList m) { } void ClassMemberDecl( -#line 762 "VBNET.ATG" +#line 764 "VBNET.ATG" ModifierList m, List attributes) { StructureMemberDecl( -#line 763 "VBNET.ATG" +#line 765 "VBNET.ATG" m, attributes); } void StructureMemberDecl( -#line 776 "VBNET.ATG" +#line 778 "VBNET.ATG" ModifierList m, List attributes) { -#line 778 "VBNET.ATG" +#line 780 "VBNET.ATG" TypeReference type = null; List p = new List(); Statement stmt = null; @@ -1443,37 +1458,37 @@ ModifierList m, List attributes) { switch (la.kind) { case 71: case 90: case 102: case 129: case 141: case 194: { NonModuleDeclaration( -#line 785 "VBNET.ATG" +#line 787 "VBNET.ATG" m, attributes); break; } case 195: { lexer.NextToken(); -#line 789 "VBNET.ATG" +#line 791 "VBNET.ATG" Location startPos = t.Location; if (StartOf(14)) { -#line 793 "VBNET.ATG" +#line 795 "VBNET.ATG" string name = String.Empty; MethodDeclaration methodDeclaration; List handlesClause = null; List implementsClause = null; Identifier(); -#line 799 "VBNET.ATG" +#line 801 "VBNET.ATG" name = t.val; m.Check(Modifiers.VBMethods); TypeParameterList( -#line 802 "VBNET.ATG" +#line 804 "VBNET.ATG" templates); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 803 "VBNET.ATG" +#line 805 "VBNET.ATG" p); } Expect(26); @@ -1481,23 +1496,23 @@ p); if (la.kind == 121 || la.kind == 123) { if (la.kind == 123) { ImplementsClause( -#line 806 "VBNET.ATG" +#line 808 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 808 "VBNET.ATG" +#line 810 "VBNET.ATG" out handlesClause); } } -#line 811 "VBNET.ATG" +#line 813 "VBNET.ATG" Location endLocation = t.EndLocation; if ( -#line 814 "VBNET.ATG" +#line 816 "VBNET.ATG" IsMustOverride(m)) { EndOfStmt(); -#line 817 "VBNET.ATG" +#line 819 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, Parameters = p, Attributes = attributes, StartLocation = m.GetDeclarationLocation(startPos), EndLocation = endLocation, @@ -1506,12 +1521,13 @@ IsMustOverride(m)) { HandlesClause = handlesClause, InterfaceImplementations = implementsClause }; + SetParent(templates, methodDeclaration); compilationUnit.AddChild(methodDeclaration); } else if (la.kind == 1) { lexer.NextToken(); -#line 830 "VBNET.ATG" +#line 833 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, Parameters = p, Attributes = attributes, StartLocation = m.GetDeclarationLocation(startPos), EndLocation = endLocation, @@ -1520,28 +1536,29 @@ IsMustOverride(m)) { HandlesClause = handlesClause, InterfaceImplementations = implementsClause }; + SetParent(templates, methodDeclaration); compilationUnit.AddChild(methodDeclaration); -#line 841 "VBNET.ATG" +#line 845 "VBNET.ATG" if (ParseMethodBodies) { Block( -#line 842 "VBNET.ATG" +#line 846 "VBNET.ATG" out stmt); Expect(100); Expect(195); -#line 844 "VBNET.ATG" +#line 848 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 850 "VBNET.ATG" +#line 854 "VBNET.ATG" methodDeclaration.Body = (BlockStatement)stmt; -#line 851 "VBNET.ATG" +#line 855 "VBNET.ATG" methodDeclaration.Body.EndLocation = t.EndLocation; EndOfStmt(); } else SynErr(238); @@ -1551,39 +1568,39 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 855 "VBNET.ATG" +#line 859 "VBNET.ATG" p); } Expect(26); } -#line 856 "VBNET.ATG" +#line 860 "VBNET.ATG" m.Check(Modifiers.Constructors); -#line 857 "VBNET.ATG" +#line 861 "VBNET.ATG" Location constructorEndLocation = t.EndLocation; Expect(1); -#line 860 "VBNET.ATG" +#line 864 "VBNET.ATG" if (ParseMethodBodies) { Block( -#line 861 "VBNET.ATG" +#line 865 "VBNET.ATG" out stmt); Expect(100); Expect(195); -#line 863 "VBNET.ATG" +#line 867 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 869 "VBNET.ATG" +#line 873 "VBNET.ATG" Location endLocation = t.EndLocation; EndOfStmt(); -#line 872 "VBNET.ATG" +#line 876 "VBNET.ATG" ConstructorDeclaration cd = new ConstructorDeclaration("New", m.Modifier, p, attributes); cd.StartLocation = m.GetDeclarationLocation(startPos); cd.EndLocation = constructorEndLocation; @@ -1597,7 +1614,7 @@ out stmt); case 114: { lexer.NextToken(); -#line 884 "VBNET.ATG" +#line 888 "VBNET.ATG" m.Check(Modifiers.VBMethods); string name = String.Empty; Location startPos = t.Location; @@ -1607,16 +1624,16 @@ out stmt); Identifier(); -#line 891 "VBNET.ATG" +#line 895 "VBNET.ATG" name = t.val; TypeParameterList( -#line 892 "VBNET.ATG" +#line 896 "VBNET.ATG" templates); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 893 "VBNET.ATG" +#line 897 "VBNET.ATG" p); } Expect(26); @@ -1625,15 +1642,15 @@ p); lexer.NextToken(); while (la.kind == 28) { AttributeSection( -#line 894 "VBNET.ATG" +#line 898 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 894 "VBNET.ATG" +#line 898 "VBNET.ATG" out type); } -#line 896 "VBNET.ATG" +#line 900 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object", true); } @@ -1641,20 +1658,20 @@ out type); if (la.kind == 121 || la.kind == 123) { if (la.kind == 123) { ImplementsClause( -#line 902 "VBNET.ATG" +#line 906 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 904 "VBNET.ATG" +#line 908 "VBNET.ATG" out handlesClause); } } if ( -#line 909 "VBNET.ATG" +#line 913 "VBNET.ATG" IsMustOverride(m)) { EndOfStmt(); -#line 912 "VBNET.ATG" +#line 916 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1664,6 +1681,7 @@ IsMustOverride(m)) { Templates = templates, InterfaceImplementations = implementsClause }; + SetParent(templates, methodDeclaration); if (returnTypeAttributeSection != null) { returnTypeAttributeSection.AttributeTarget = "return"; methodDeclaration.Attributes.Add(returnTypeAttributeSection); @@ -1673,7 +1691,7 @@ IsMustOverride(m)) { } else if (la.kind == 1) { lexer.NextToken(); -#line 930 "VBNET.ATG" +#line 935 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1683,6 +1701,7 @@ IsMustOverride(m)) { HandlesClause = handlesClause, InterfaceImplementations = implementsClause }; + SetParent(templates, methodDeclaration); if (returnTypeAttributeSection != null) { returnTypeAttributeSection.AttributeTarget = "return"; methodDeclaration.Attributes.Add(returnTypeAttributeSection); @@ -1692,12 +1711,12 @@ IsMustOverride(m)) { if (ParseMethodBodies) { Block( -#line 947 "VBNET.ATG" +#line 953 "VBNET.ATG" out stmt); Expect(100); Expect(114); -#line 949 "VBNET.ATG" +#line 955 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Function); stmt = new BlockStatement(); @@ -1713,7 +1732,7 @@ out stmt); case 88: { lexer.NextToken(); -#line 963 "VBNET.ATG" +#line 969 "VBNET.ATG" m.Check(Modifiers.VBExternalMethods); Location startPos = t.Location; CharsetModifier charsetModifer = CharsetModifier.None; @@ -1723,39 +1742,39 @@ out stmt); if (StartOf(15)) { Charset( -#line 970 "VBNET.ATG" +#line 976 "VBNET.ATG" out charsetModifer); } if (la.kind == 195) { lexer.NextToken(); Identifier(); -#line 973 "VBNET.ATG" +#line 979 "VBNET.ATG" name = t.val; Expect(135); Expect(3); -#line 974 "VBNET.ATG" +#line 980 "VBNET.ATG" library = t.literalValue as string; if (la.kind == 46) { lexer.NextToken(); Expect(3); -#line 975 "VBNET.ATG" +#line 981 "VBNET.ATG" alias = t.literalValue as string; } if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 976 "VBNET.ATG" +#line 982 "VBNET.ATG" p); } Expect(26); } EndOfStmt(); -#line 979 "VBNET.ATG" +#line 985 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, null, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -1765,25 +1784,25 @@ p); lexer.NextToken(); Identifier(); -#line 986 "VBNET.ATG" +#line 992 "VBNET.ATG" name = t.val; Expect(135); Expect(3); -#line 987 "VBNET.ATG" +#line 993 "VBNET.ATG" library = t.literalValue as string; if (la.kind == 46) { lexer.NextToken(); Expect(3); -#line 988 "VBNET.ATG" +#line 994 "VBNET.ATG" alias = t.literalValue as string; } if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 989 "VBNET.ATG" +#line 995 "VBNET.ATG" p); } Expect(26); @@ -1791,12 +1810,12 @@ p); if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 990 "VBNET.ATG" +#line 996 "VBNET.ATG" out type); } EndOfStmt(); -#line 993 "VBNET.ATG" +#line 999 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, type, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -1808,7 +1827,7 @@ out type); case 106: { lexer.NextToken(); -#line 1003 "VBNET.ATG" +#line 1009 "VBNET.ATG" m.Check(Modifiers.VBEvents); Location startPos = t.Location; EventDeclaration eventDeclaration; @@ -1817,19 +1836,19 @@ out type); Identifier(); -#line 1009 "VBNET.ATG" +#line 1015 "VBNET.ATG" name= t.val; if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1011 "VBNET.ATG" +#line 1017 "VBNET.ATG" out type); } else if (StartOf(16)) { if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1013 "VBNET.ATG" +#line 1019 "VBNET.ATG" p); } Expect(26); @@ -1837,11 +1856,11 @@ p); } else SynErr(242); if (la.kind == 123) { ImplementsClause( -#line 1015 "VBNET.ATG" +#line 1021 "VBNET.ATG" out implementsClause); } -#line 1017 "VBNET.ATG" +#line 1023 "VBNET.ATG" eventDeclaration = new EventDeclaration { Name = name, TypeReference = type, Modifier = m.Modifier, Parameters = p, Attributes = attributes, InterfaceImplementations = implementsClause, @@ -1855,30 +1874,30 @@ out implementsClause); } case 2: case 45: case 49: case 51: case 52: case 53: case 54: case 57: case 74: case 91: case 94: case 103: case 108: case 113: case 120: case 126: case 130: case 133: case 156: case 162: case 169: case 188: case 197: case 198: case 208: case 209: case 215: { -#line 1027 "VBNET.ATG" +#line 1033 "VBNET.ATG" Location startPos = t.Location; -#line 1029 "VBNET.ATG" +#line 1035 "VBNET.ATG" m.Check(Modifiers.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, null, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(startPos); IdentifierForFieldDeclaration(); -#line 1033 "VBNET.ATG" +#line 1039 "VBNET.ATG" string name = t.val; VariableDeclaratorPartAfterIdentifier( -#line 1034 "VBNET.ATG" +#line 1040 "VBNET.ATG" variableDeclarators, name); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 1035 "VBNET.ATG" +#line 1041 "VBNET.ATG" variableDeclarators); } EndOfStmt(); -#line 1038 "VBNET.ATG" +#line 1044 "VBNET.ATG" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; SetParent(variableDeclarators, fd); @@ -1888,35 +1907,35 @@ variableDeclarators); } case 75: { -#line 1044 "VBNET.ATG" +#line 1050 "VBNET.ATG" m.Check(Modifiers.Fields); lexer.NextToken(); -#line 1045 "VBNET.ATG" +#line 1051 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); -#line 1047 "VBNET.ATG" +#line 1053 "VBNET.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(t.Location); List constantDeclarators = new List(); ConstantDeclarator( -#line 1051 "VBNET.ATG" +#line 1057 "VBNET.ATG" constantDeclarators); while (la.kind == 12) { lexer.NextToken(); ConstantDeclarator( -#line 1052 "VBNET.ATG" +#line 1058 "VBNET.ATG" constantDeclarators); } -#line 1054 "VBNET.ATG" +#line 1060 "VBNET.ATG" fd.Fields = constantDeclarators; fd.EndLocation = t.Location; EndOfStmt(); -#line 1059 "VBNET.ATG" +#line 1065 "VBNET.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); @@ -1925,20 +1944,20 @@ constantDeclarators); case 171: { lexer.NextToken(); -#line 1065 "VBNET.ATG" +#line 1071 "VBNET.ATG" m.Check(Modifiers.VBProperties); Location startPos = t.Location; List implementsClause = null; Identifier(); -#line 1069 "VBNET.ATG" +#line 1075 "VBNET.ATG" string propertyName = t.val; if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1070 "VBNET.ATG" +#line 1076 "VBNET.ATG" p); } Expect(26); @@ -1946,26 +1965,26 @@ p); if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1071 "VBNET.ATG" +#line 1077 "VBNET.ATG" out type); } -#line 1073 "VBNET.ATG" +#line 1079 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object", true); } if (la.kind == 123) { ImplementsClause( -#line 1077 "VBNET.ATG" +#line 1083 "VBNET.ATG" out implementsClause); } EndOfStmt(); if ( -#line 1081 "VBNET.ATG" +#line 1087 "VBNET.ATG" IsMustOverride(m)) { -#line 1083 "VBNET.ATG" +#line 1089 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -1976,7 +1995,7 @@ IsMustOverride(m)) { } else if (StartOf(17)) { -#line 1093 "VBNET.ATG" +#line 1099 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -1988,13 +2007,13 @@ IsMustOverride(m)) { PropertySetRegion setRegion; AccessorDecls( -#line 1103 "VBNET.ATG" +#line 1109 "VBNET.ATG" out getRegion, out setRegion); Expect(100); Expect(171); EndOfStmt(); -#line 1107 "VBNET.ATG" +#line 1113 "VBNET.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.EndLocation; @@ -2006,11 +2025,11 @@ out getRegion, out setRegion); case 85: { lexer.NextToken(); -#line 1114 "VBNET.ATG" +#line 1120 "VBNET.ATG" Location startPos = t.Location; Expect(106); -#line 1116 "VBNET.ATG" +#line 1122 "VBNET.ATG" m.Check(Modifiers.VBCustomEvents); EventAddRemoveRegion eventAccessorDeclaration; EventAddRegion addHandlerAccessorDeclaration = null; @@ -2020,24 +2039,24 @@ out getRegion, out setRegion); Identifier(); -#line 1123 "VBNET.ATG" +#line 1129 "VBNET.ATG" string customEventName = t.val; Expect(50); TypeName( -#line 1124 "VBNET.ATG" +#line 1130 "VBNET.ATG" out type); if (la.kind == 123) { ImplementsClause( -#line 1125 "VBNET.ATG" +#line 1131 "VBNET.ATG" out implementsClause); } EndOfStmt(); while (StartOf(18)) { EventAccessorDeclaration( -#line 1128 "VBNET.ATG" +#line 1134 "VBNET.ATG" out eventAccessorDeclaration); -#line 1130 "VBNET.ATG" +#line 1136 "VBNET.ATG" if(eventAccessorDeclaration is EventAddRegion) { addHandlerAccessorDeclaration = (EventAddRegion)eventAccessorDeclaration; @@ -2056,7 +2075,7 @@ out eventAccessorDeclaration); Expect(106); EndOfStmt(); -#line 1146 "VBNET.ATG" +#line 1152 "VBNET.ATG" if(addHandlerAccessorDeclaration == null) { Error("Need to provide AddHandler accessor."); @@ -2087,24 +2106,24 @@ out eventAccessorDeclaration); } case 147: case 158: case 217: { -#line 1172 "VBNET.ATG" +#line 1178 "VBNET.ATG" ConversionType opConversionType = ConversionType.None; if (la.kind == 147 || la.kind == 217) { if (la.kind == 217) { lexer.NextToken(); -#line 1173 "VBNET.ATG" +#line 1179 "VBNET.ATG" opConversionType = ConversionType.Implicit; } else { lexer.NextToken(); -#line 1174 "VBNET.ATG" +#line 1180 "VBNET.ATG" opConversionType = ConversionType.Explicit; } } Expect(158); -#line 1177 "VBNET.ATG" +#line 1183 "VBNET.ATG" m.Check(Modifiers.VBOperators); Location startPos = t.Location; TypeReference returnType = NullTypeReference.Instance; @@ -2116,7 +2135,7 @@ out eventAccessorDeclaration); List returnTypeAttributes = new List(); OverloadableOperator( -#line 1187 "VBNET.ATG" +#line 1193 "VBNET.ATG" out operatorType); Expect(25); if (la.kind == 59) { @@ -2124,16 +2143,16 @@ out operatorType); } Identifier(); -#line 1188 "VBNET.ATG" +#line 1194 "VBNET.ATG" operandName = t.val; if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1189 "VBNET.ATG" +#line 1195 "VBNET.ATG" out operandType); } -#line 1190 "VBNET.ATG" +#line 1196 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParameterModifiers.In)); while (la.kind == 12) { lexer.NextToken(); @@ -2142,48 +2161,48 @@ out operandType); } Identifier(); -#line 1194 "VBNET.ATG" +#line 1200 "VBNET.ATG" operandName = t.val; if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1195 "VBNET.ATG" +#line 1201 "VBNET.ATG" out operandType); } -#line 1196 "VBNET.ATG" +#line 1202 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParameterModifiers.In)); } Expect(26); -#line 1199 "VBNET.ATG" +#line 1205 "VBNET.ATG" Location endPos = t.EndLocation; if (la.kind == 50) { lexer.NextToken(); while (la.kind == 28) { AttributeSection( -#line 1200 "VBNET.ATG" +#line 1206 "VBNET.ATG" out section); -#line 1200 "VBNET.ATG" +#line 1206 "VBNET.ATG" returnTypeAttributes.Add(section); } TypeName( -#line 1200 "VBNET.ATG" +#line 1206 "VBNET.ATG" out returnType); -#line 1200 "VBNET.ATG" +#line 1206 "VBNET.ATG" endPos = t.EndLocation; } Expect(1); Block( -#line 1202 "VBNET.ATG" +#line 1208 "VBNET.ATG" out stmt); Expect(100); Expect(158); EndOfStmt(); -#line 1204 "VBNET.ATG" +#line 1210 "VBNET.ATG" OperatorDeclaration operatorDeclaration = new OperatorDeclaration { Modifier = m.Modifier, Attributes = attributes, @@ -2207,25 +2226,25 @@ out stmt); } void EnumMemberDecl( -#line 744 "VBNET.ATG" +#line 746 "VBNET.ATG" out FieldDeclaration f) { -#line 746 "VBNET.ATG" +#line 748 "VBNET.ATG" Expression expr = null;List attributes = new List(); AttributeSection section = null; VariableDeclaration varDecl = null; while (la.kind == 28) { AttributeSection( -#line 750 "VBNET.ATG" +#line 752 "VBNET.ATG" out section); -#line 750 "VBNET.ATG" +#line 752 "VBNET.ATG" attributes.Add(section); } Identifier(); -#line 753 "VBNET.ATG" +#line 755 "VBNET.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2234,10 +2253,10 @@ out section); if (la.kind == 10) { lexer.NextToken(); Expr( -#line 758 "VBNET.ATG" +#line 760 "VBNET.ATG" out expr); -#line 758 "VBNET.ATG" +#line 760 "VBNET.ATG" varDecl.Initializer = expr; } EndOfStmt(); @@ -2340,27 +2359,28 @@ p); EndLocation = t.EndLocation, Templates = templates }; + SetParent(templates, md); compilationUnit.AddChild(md); } else if (la.kind == 114) { lexer.NextToken(); -#line 691 "VBNET.ATG" +#line 692 "VBNET.ATG" mod.Check(Modifiers.VBInterfaceMethods); Location startLocation = t.Location; Identifier(); -#line 694 "VBNET.ATG" +#line 695 "VBNET.ATG" name = t.val; TypeParameterList( -#line 695 "VBNET.ATG" +#line 696 "VBNET.ATG" templates); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 696 "VBNET.ATG" +#line 697 "VBNET.ATG" p); } Expect(26); @@ -2369,15 +2389,15 @@ p); lexer.NextToken(); while (la.kind == 28) { AttributeSection( -#line 697 "VBNET.ATG" +#line 698 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 697 "VBNET.ATG" +#line 698 "VBNET.ATG" out type); } -#line 699 "VBNET.ATG" +#line 700 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object", true); } @@ -2392,25 +2412,26 @@ out type); md.StartLocation = startLocation; md.EndLocation = t.EndLocation; md.Templates = templates; + SetParent(templates, md); compilationUnit.AddChild(md); EndOfStmt(); } else if (la.kind == 171) { lexer.NextToken(); -#line 719 "VBNET.ATG" +#line 721 "VBNET.ATG" Location startLocation = t.Location; mod.Check(Modifiers.VBInterfaceProperties); Identifier(); -#line 722 "VBNET.ATG" +#line 724 "VBNET.ATG" name = t.val; if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 723 "VBNET.ATG" +#line 725 "VBNET.ATG" p); } Expect(26); @@ -2418,18 +2439,18 @@ p); if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 724 "VBNET.ATG" +#line 726 "VBNET.ATG" out type); } -#line 726 "VBNET.ATG" +#line 728 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object", true); } EndOfStmt(); -#line 732 "VBNET.ATG" +#line 734 "VBNET.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod.Modifier, attributes); pd.Parameters = p; pd.EndLocation = t.EndLocation; @@ -2439,113 +2460,113 @@ out type); } else SynErr(245); } else if (StartOf(20)) { NonModuleDeclaration( -#line 740 "VBNET.ATG" +#line 742 "VBNET.ATG" mod, attributes); } else SynErr(246); } void Expr( -#line 1610 "VBNET.ATG" +#line 1616 "VBNET.ATG" out Expression expr) { -#line 1611 "VBNET.ATG" +#line 1617 "VBNET.ATG" expr = null; if ( -#line 1612 "VBNET.ATG" +#line 1618 "VBNET.ATG" IsQueryExpression() ) { QueryExpr( -#line 1613 "VBNET.ATG" +#line 1619 "VBNET.ATG" out expr); } else if (la.kind == 114) { LambdaExpr( -#line 1614 "VBNET.ATG" +#line 1620 "VBNET.ATG" out expr); } else if (StartOf(21)) { DisjunctionExpr( -#line 1615 "VBNET.ATG" +#line 1621 "VBNET.ATG" out expr); } else SynErr(247); } void ImplementsClause( -#line 1583 "VBNET.ATG" +#line 1589 "VBNET.ATG" out List baseInterfaces) { -#line 1585 "VBNET.ATG" +#line 1591 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; string memberName = null; Expect(123); NonArrayTypeName( -#line 1590 "VBNET.ATG" +#line 1596 "VBNET.ATG" out type, false); -#line 1591 "VBNET.ATG" +#line 1597 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1592 "VBNET.ATG" +#line 1598 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); while (la.kind == 12) { lexer.NextToken(); NonArrayTypeName( -#line 1594 "VBNET.ATG" +#line 1600 "VBNET.ATG" out type, false); -#line 1595 "VBNET.ATG" +#line 1601 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1596 "VBNET.ATG" +#line 1602 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); } } void HandlesClause( -#line 1541 "VBNET.ATG" +#line 1547 "VBNET.ATG" out List handlesClause) { -#line 1543 "VBNET.ATG" +#line 1549 "VBNET.ATG" handlesClause = new List(); string name; Expect(121); EventMemberSpecifier( -#line 1546 "VBNET.ATG" +#line 1552 "VBNET.ATG" out name); -#line 1546 "VBNET.ATG" +#line 1552 "VBNET.ATG" handlesClause.Add(name); while (la.kind == 12) { lexer.NextToken(); EventMemberSpecifier( -#line 1547 "VBNET.ATG" +#line 1553 "VBNET.ATG" out name); -#line 1547 "VBNET.ATG" +#line 1553 "VBNET.ATG" handlesClause.Add(name); } } void Block( -#line 2695 "VBNET.ATG" +#line 2701 "VBNET.ATG" out Statement stmt) { -#line 2698 "VBNET.ATG" +#line 2704 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); /* in snippet parsing mode, t might be null */ if (t != null) blockStmt.StartLocation = t.EndLocation; compilationUnit.BlockStart(blockStmt); while (StartOf(22) || -#line 2704 "VBNET.ATG" +#line 2710 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2704 "VBNET.ATG" +#line 2710 "VBNET.ATG" IsEndStmtAhead()) { Expect(100); EndOfStmt(); -#line 2704 "VBNET.ATG" +#line 2710 "VBNET.ATG" compilationUnit.AddChild(new EndStatement()); } else { Statement(); @@ -2553,7 +2574,7 @@ IsEndStmtAhead()) { } } -#line 2709 "VBNET.ATG" +#line 2715 "VBNET.ATG" stmt = blockStmt; if (t != null) blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2561,26 +2582,26 @@ IsEndStmtAhead()) { } void Charset( -#line 1533 "VBNET.ATG" +#line 1539 "VBNET.ATG" out CharsetModifier charsetModifier) { -#line 1534 "VBNET.ATG" +#line 1540 "VBNET.ATG" charsetModifier = CharsetModifier.None; if (la.kind == 114 || la.kind == 195) { } else if (la.kind == 49) { lexer.NextToken(); -#line 1535 "VBNET.ATG" +#line 1541 "VBNET.ATG" charsetModifier = CharsetModifier.Ansi; } else if (la.kind == 53) { lexer.NextToken(); -#line 1536 "VBNET.ATG" +#line 1542 "VBNET.ATG" charsetModifier = CharsetModifier.Auto; } else if (la.kind == 208) { lexer.NextToken(); -#line 1537 "VBNET.ATG" +#line 1543 "VBNET.ATG" charsetModifier = CharsetModifier.Unicode; } else SynErr(248); } @@ -2700,10 +2721,10 @@ out CharsetModifier charsetModifier) { } void VariableDeclaratorPartAfterIdentifier( -#line 1408 "VBNET.ATG" +#line 1414 "VBNET.ATG" List fieldDeclaration, string name) { -#line 1410 "VBNET.ATG" +#line 1416 "VBNET.ATG" Expression expr = null; TypeReference type = null; ArrayList rank = null; @@ -2711,28 +2732,28 @@ List fieldDeclaration, string name) { Location startLocation = t.Location; if ( -#line 1416 "VBNET.ATG" +#line 1422 "VBNET.ATG" IsSize() && !IsDims()) { ArrayInitializationModifier( -#line 1416 "VBNET.ATG" +#line 1422 "VBNET.ATG" out dimension); } if ( -#line 1417 "VBNET.ATG" +#line 1423 "VBNET.ATG" IsDims()) { ArrayNameModifier( -#line 1417 "VBNET.ATG" +#line 1423 "VBNET.ATG" out rank); } if ( -#line 1419 "VBNET.ATG" +#line 1425 "VBNET.ATG" IsObjectCreation()) { Expect(50); ObjectCreateExpression( -#line 1419 "VBNET.ATG" +#line 1425 "VBNET.ATG" out expr); -#line 1421 "VBNET.ATG" +#line 1427 "VBNET.ATG" if (expr is ObjectCreateExpression) { type = ((ObjectCreateExpression)expr).CreateType; } else { @@ -2743,10 +2764,10 @@ out expr); if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1428 "VBNET.ATG" +#line 1434 "VBNET.ATG" out type); -#line 1430 "VBNET.ATG" +#line 1436 "VBNET.ATG" if (type != null) { for (int i = fieldDeclaration.Count - 1; i >= 0; i--) { VariableDeclaration vd = fieldDeclaration[i]; @@ -2759,7 +2780,7 @@ out type); } -#line 1442 "VBNET.ATG" +#line 1448 "VBNET.ATG" if (type == null && (dimension != null || rank != null)) { type = new TypeReference(""); } @@ -2787,12 +2808,12 @@ out type); if (la.kind == 10) { lexer.NextToken(); VariableInitializer( -#line 1466 "VBNET.ATG" +#line 1472 "VBNET.ATG" out expr); } } else SynErr(250); -#line 1469 "VBNET.ATG" +#line 1475 "VBNET.ATG" VariableDeclaration varDecl = new VariableDeclaration(name, expr, type); varDecl.StartLocation = startLocation; varDecl.EndLocation = t.Location; @@ -2801,22 +2822,22 @@ out expr); } void VariableDeclarator( -#line 1402 "VBNET.ATG" +#line 1408 "VBNET.ATG" List fieldDeclaration) { Identifier(); -#line 1404 "VBNET.ATG" +#line 1410 "VBNET.ATG" string name = t.val; VariableDeclaratorPartAfterIdentifier( -#line 1405 "VBNET.ATG" +#line 1411 "VBNET.ATG" fieldDeclaration, name); } void ConstantDeclarator( -#line 1383 "VBNET.ATG" +#line 1389 "VBNET.ATG" List constantDeclaration) { -#line 1385 "VBNET.ATG" +#line 1391 "VBNET.ATG" Expression expr = null; TypeReference type = null; string name = String.Empty; @@ -2824,20 +2845,20 @@ List constantDeclaration) { Identifier(); -#line 1390 "VBNET.ATG" +#line 1396 "VBNET.ATG" name = t.val; location = t.Location; if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1391 "VBNET.ATG" +#line 1397 "VBNET.ATG" out type); } Expect(10); Expr( -#line 1392 "VBNET.ATG" +#line 1398 "VBNET.ATG" out expr); -#line 1394 "VBNET.ATG" +#line 1400 "VBNET.ATG" VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; f.StartLocation = location; @@ -2846,10 +2867,10 @@ out expr); } void AccessorDecls( -#line 1317 "VBNET.ATG" +#line 1323 "VBNET.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1319 "VBNET.ATG" +#line 1325 "VBNET.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -2857,60 +2878,60 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 28) { AttributeSection( -#line 1324 "VBNET.ATG" +#line 1330 "VBNET.ATG" out section); -#line 1324 "VBNET.ATG" +#line 1330 "VBNET.ATG" attributes.Add(section); } if (StartOf(24)) { GetAccessorDecl( -#line 1326 "VBNET.ATG" +#line 1332 "VBNET.ATG" out getBlock, attributes); if (StartOf(25)) { -#line 1328 "VBNET.ATG" +#line 1334 "VBNET.ATG" attributes = new List(); while (la.kind == 28) { AttributeSection( -#line 1329 "VBNET.ATG" +#line 1335 "VBNET.ATG" out section); -#line 1329 "VBNET.ATG" +#line 1335 "VBNET.ATG" attributes.Add(section); } SetAccessorDecl( -#line 1330 "VBNET.ATG" +#line 1336 "VBNET.ATG" out setBlock, attributes); } } else if (StartOf(26)) { SetAccessorDecl( -#line 1333 "VBNET.ATG" +#line 1339 "VBNET.ATG" out setBlock, attributes); if (StartOf(27)) { -#line 1335 "VBNET.ATG" +#line 1341 "VBNET.ATG" attributes = new List(); while (la.kind == 28) { AttributeSection( -#line 1336 "VBNET.ATG" +#line 1342 "VBNET.ATG" out section); -#line 1336 "VBNET.ATG" +#line 1342 "VBNET.ATG" attributes.Add(section); } GetAccessorDecl( -#line 1337 "VBNET.ATG" +#line 1343 "VBNET.ATG" out getBlock, attributes); } } else SynErr(251); } void EventAccessorDeclaration( -#line 1280 "VBNET.ATG" +#line 1286 "VBNET.ATG" out EventAddRemoveRegion eventAccessorDeclaration) { -#line 1282 "VBNET.ATG" +#line 1288 "VBNET.ATG" Statement stmt = null; List p = new List(); AttributeSection section; @@ -2919,10 +2940,10 @@ out EventAddRemoveRegion eventAccessorDeclaration) { while (la.kind == 28) { AttributeSection( -#line 1288 "VBNET.ATG" +#line 1294 "VBNET.ATG" out section); -#line 1288 "VBNET.ATG" +#line 1294 "VBNET.ATG" attributes.Add(section); } if (la.kind == 43) { @@ -2931,20 +2952,20 @@ out section); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1290 "VBNET.ATG" +#line 1296 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1291 "VBNET.ATG" +#line 1297 "VBNET.ATG" out stmt); Expect(100); Expect(43); EndOfStmt(); -#line 1293 "VBNET.ATG" +#line 1299 "VBNET.ATG" eventAccessorDeclaration = new EventAddRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -2955,20 +2976,20 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1298 "VBNET.ATG" +#line 1304 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1299 "VBNET.ATG" +#line 1305 "VBNET.ATG" out stmt); Expect(100); Expect(178); EndOfStmt(); -#line 1301 "VBNET.ATG" +#line 1307 "VBNET.ATG" eventAccessorDeclaration = new EventRemoveRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -2979,20 +3000,20 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1306 "VBNET.ATG" +#line 1312 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1307 "VBNET.ATG" +#line 1313 "VBNET.ATG" out stmt); Expect(100); Expect(174); EndOfStmt(); -#line 1309 "VBNET.ATG" +#line 1315 "VBNET.ATG" eventAccessorDeclaration = new EventRaiseRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -3001,163 +3022,163 @@ out stmt); } void OverloadableOperator( -#line 1222 "VBNET.ATG" +#line 1228 "VBNET.ATG" out OverloadableOperatorType operatorType) { -#line 1223 "VBNET.ATG" +#line 1229 "VBNET.ATG" operatorType = OverloadableOperatorType.None; switch (la.kind) { case 19: { lexer.NextToken(); -#line 1225 "VBNET.ATG" +#line 1231 "VBNET.ATG" operatorType = OverloadableOperatorType.Add; break; } case 18: { lexer.NextToken(); -#line 1227 "VBNET.ATG" +#line 1233 "VBNET.ATG" operatorType = OverloadableOperatorType.Subtract; break; } case 22: { lexer.NextToken(); -#line 1229 "VBNET.ATG" +#line 1235 "VBNET.ATG" operatorType = OverloadableOperatorType.Multiply; break; } case 14: { lexer.NextToken(); -#line 1231 "VBNET.ATG" +#line 1237 "VBNET.ATG" operatorType = OverloadableOperatorType.Divide; break; } case 15: { lexer.NextToken(); -#line 1233 "VBNET.ATG" +#line 1239 "VBNET.ATG" operatorType = OverloadableOperatorType.DivideInteger; break; } case 13: { lexer.NextToken(); -#line 1235 "VBNET.ATG" +#line 1241 "VBNET.ATG" operatorType = OverloadableOperatorType.Concat; break; } case 136: { lexer.NextToken(); -#line 1237 "VBNET.ATG" +#line 1243 "VBNET.ATG" operatorType = OverloadableOperatorType.Like; break; } case 140: { lexer.NextToken(); -#line 1239 "VBNET.ATG" +#line 1245 "VBNET.ATG" operatorType = OverloadableOperatorType.Modulus; break; } case 47: { lexer.NextToken(); -#line 1241 "VBNET.ATG" +#line 1247 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseAnd; break; } case 161: { lexer.NextToken(); -#line 1243 "VBNET.ATG" +#line 1249 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseOr; break; } case 221: { lexer.NextToken(); -#line 1245 "VBNET.ATG" +#line 1251 "VBNET.ATG" operatorType = OverloadableOperatorType.ExclusiveOr; break; } case 20: { lexer.NextToken(); -#line 1247 "VBNET.ATG" +#line 1253 "VBNET.ATG" operatorType = OverloadableOperatorType.Power; break; } case 32: { lexer.NextToken(); -#line 1249 "VBNET.ATG" +#line 1255 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftLeft; break; } case 33: { lexer.NextToken(); -#line 1251 "VBNET.ATG" +#line 1257 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftRight; break; } case 10: { lexer.NextToken(); -#line 1253 "VBNET.ATG" +#line 1259 "VBNET.ATG" operatorType = OverloadableOperatorType.Equality; break; } case 29: { lexer.NextToken(); -#line 1255 "VBNET.ATG" +#line 1261 "VBNET.ATG" operatorType = OverloadableOperatorType.InEquality; break; } case 28: { lexer.NextToken(); -#line 1257 "VBNET.ATG" +#line 1263 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThan; break; } case 31: { lexer.NextToken(); -#line 1259 "VBNET.ATG" +#line 1265 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThanOrEqual; break; } case 27: { lexer.NextToken(); -#line 1261 "VBNET.ATG" +#line 1267 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThan; break; } case 30: { lexer.NextToken(); -#line 1263 "VBNET.ATG" +#line 1269 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThanOrEqual; break; } case 81: { lexer.NextToken(); -#line 1265 "VBNET.ATG" +#line 1271 "VBNET.ATG" operatorType = OverloadableOperatorType.CType; break; } case 2: case 45: case 49: case 51: case 52: case 53: case 54: case 57: case 74: case 85: case 91: case 94: case 103: case 108: case 113: case 120: case 126: case 130: case 133: case 156: case 162: case 169: case 188: case 197: case 198: case 208: case 209: case 215: { Identifier(); -#line 1269 "VBNET.ATG" +#line 1275 "VBNET.ATG" string opName = t.val; if (string.Equals(opName, "istrue", StringComparison.InvariantCultureIgnoreCase)) { operatorType = OverloadableOperatorType.IsTrue; @@ -3174,67 +3195,67 @@ out OverloadableOperatorType operatorType) { } void GetAccessorDecl( -#line 1343 "VBNET.ATG" +#line 1349 "VBNET.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1344 "VBNET.ATG" +#line 1350 "VBNET.ATG" Statement stmt = null; Modifiers m; PropertyAccessorAccessModifier( -#line 1346 "VBNET.ATG" +#line 1352 "VBNET.ATG" out m); Expect(115); -#line 1348 "VBNET.ATG" +#line 1354 "VBNET.ATG" Location startLocation = t.Location; Expect(1); Block( -#line 1350 "VBNET.ATG" +#line 1356 "VBNET.ATG" out stmt); -#line 1351 "VBNET.ATG" +#line 1357 "VBNET.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); Expect(100); Expect(115); -#line 1353 "VBNET.ATG" +#line 1359 "VBNET.ATG" getBlock.Modifier = m; -#line 1354 "VBNET.ATG" +#line 1360 "VBNET.ATG" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; EndOfStmt(); } void SetAccessorDecl( -#line 1359 "VBNET.ATG" +#line 1365 "VBNET.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1361 "VBNET.ATG" +#line 1367 "VBNET.ATG" Statement stmt = null; List p = new List(); Modifiers m; PropertyAccessorAccessModifier( -#line 1366 "VBNET.ATG" +#line 1372 "VBNET.ATG" out m); Expect(183); -#line 1368 "VBNET.ATG" +#line 1374 "VBNET.ATG" Location startLocation = t.Location; if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1369 "VBNET.ATG" +#line 1375 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1371 "VBNET.ATG" +#line 1377 "VBNET.ATG" out stmt); -#line 1373 "VBNET.ATG" +#line 1379 "VBNET.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); setBlock.Modifier = m; setBlock.Parameters = p; @@ -3242,73 +3263,73 @@ out stmt); Expect(100); Expect(183); -#line 1378 "VBNET.ATG" +#line 1384 "VBNET.ATG" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; EndOfStmt(); } void PropertyAccessorAccessModifier( -#line 3421 "VBNET.ATG" +#line 3427 "VBNET.ATG" out Modifiers m) { -#line 3422 "VBNET.ATG" +#line 3428 "VBNET.ATG" m = Modifiers.None; while (StartOf(28)) { if (la.kind == 173) { lexer.NextToken(); -#line 3424 "VBNET.ATG" +#line 3430 "VBNET.ATG" m |= Modifiers.Public; } else if (la.kind == 172) { lexer.NextToken(); -#line 3425 "VBNET.ATG" +#line 3431 "VBNET.ATG" m |= Modifiers.Protected; } else if (la.kind == 112) { lexer.NextToken(); -#line 3426 "VBNET.ATG" +#line 3432 "VBNET.ATG" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 3427 "VBNET.ATG" +#line 3433 "VBNET.ATG" m |= Modifiers.Private; } } } void ArrayInitializationModifier( -#line 1477 "VBNET.ATG" +#line 1483 "VBNET.ATG" out List arrayModifiers) { -#line 1479 "VBNET.ATG" +#line 1485 "VBNET.ATG" arrayModifiers = null; Expect(25); InitializationRankList( -#line 1481 "VBNET.ATG" +#line 1487 "VBNET.ATG" out arrayModifiers); Expect(26); } void ArrayNameModifier( -#line 2486 "VBNET.ATG" +#line 2492 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2488 "VBNET.ATG" +#line 2494 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 2490 "VBNET.ATG" +#line 2496 "VBNET.ATG" out arrayModifiers); } void ObjectCreateExpression( -#line 1939 "VBNET.ATG" +#line 1945 "VBNET.ATG" out Expression oce) { -#line 1941 "VBNET.ATG" +#line 1947 "VBNET.ATG" TypeReference type = null; Expression initializer = null; List arguments = null; @@ -3319,39 +3340,39 @@ out Expression oce) { Expect(148); if (StartOf(7)) { NonArrayTypeName( -#line 1949 "VBNET.ATG" +#line 1955 "VBNET.ATG" out type, false); if (la.kind == 25) { lexer.NextToken(); NormalOrReDimArgumentList( -#line 1950 "VBNET.ATG" +#line 1956 "VBNET.ATG" out arguments, out canBeNormal, out canBeReDim); Expect(26); if (la.kind == 23 || -#line 1951 "VBNET.ATG" +#line 1957 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { if ( -#line 1951 "VBNET.ATG" +#line 1957 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { ArrayTypeModifiers( -#line 1952 "VBNET.ATG" +#line 1958 "VBNET.ATG" out dimensions); CollectionInitializer( -#line 1953 "VBNET.ATG" +#line 1959 "VBNET.ATG" out initializer); } else { CollectionInitializer( -#line 1954 "VBNET.ATG" +#line 1960 "VBNET.ATG" out initializer); } } -#line 1956 "VBNET.ATG" +#line 1962 "VBNET.ATG" if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); } } -#line 1960 "VBNET.ATG" +#line 1966 "VBNET.ATG" if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); SetParent(arguments, oce); @@ -3367,34 +3388,34 @@ out initializer); if (la.kind == 218) { -#line 1976 "VBNET.ATG" +#line 1982 "VBNET.ATG" NamedArgumentExpression memberInitializer = null; lexer.NextToken(); -#line 1980 "VBNET.ATG" +#line 1986 "VBNET.ATG" CollectionInitializerExpression memberInitializers = new CollectionInitializerExpression(); memberInitializers.StartLocation = la.Location; Expect(23); MemberInitializer( -#line 1984 "VBNET.ATG" +#line 1990 "VBNET.ATG" out memberInitializer); -#line 1985 "VBNET.ATG" +#line 1991 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); while (la.kind == 12) { lexer.NextToken(); MemberInitializer( -#line 1987 "VBNET.ATG" +#line 1993 "VBNET.ATG" out memberInitializer); -#line 1988 "VBNET.ATG" +#line 1994 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); } Expect(24); -#line 1992 "VBNET.ATG" +#line 1998 "VBNET.ATG" memberInitializers.EndLocation = t.Location; if(oce is ObjectCreateExpression) { @@ -3405,106 +3426,106 @@ out memberInitializer); } void VariableInitializer( -#line 1505 "VBNET.ATG" +#line 1511 "VBNET.ATG" out Expression initializerExpression) { -#line 1507 "VBNET.ATG" +#line 1513 "VBNET.ATG" initializerExpression = null; if (StartOf(29)) { Expr( -#line 1509 "VBNET.ATG" +#line 1515 "VBNET.ATG" out initializerExpression); } else if (la.kind == 23) { CollectionInitializer( -#line 1510 "VBNET.ATG" +#line 1516 "VBNET.ATG" out initializerExpression); } else SynErr(254); } void InitializationRankList( -#line 1485 "VBNET.ATG" +#line 1491 "VBNET.ATG" out List rank) { -#line 1487 "VBNET.ATG" +#line 1493 "VBNET.ATG" rank = new List(); Expression expr = null; Expr( -#line 1490 "VBNET.ATG" +#line 1496 "VBNET.ATG" out expr); if (la.kind == 201) { lexer.NextToken(); -#line 1491 "VBNET.ATG" +#line 1497 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1492 "VBNET.ATG" +#line 1498 "VBNET.ATG" out expr); } -#line 1494 "VBNET.ATG" +#line 1500 "VBNET.ATG" if (expr != null) { rank.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Expr( -#line 1496 "VBNET.ATG" +#line 1502 "VBNET.ATG" out expr); if (la.kind == 201) { lexer.NextToken(); -#line 1497 "VBNET.ATG" +#line 1503 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1498 "VBNET.ATG" +#line 1504 "VBNET.ATG" out expr); } -#line 1500 "VBNET.ATG" +#line 1506 "VBNET.ATG" if (expr != null) { rank.Add(expr); } } } void CollectionInitializer( -#line 1514 "VBNET.ATG" +#line 1520 "VBNET.ATG" out Expression outExpr) { -#line 1516 "VBNET.ATG" +#line 1522 "VBNET.ATG" Expression expr = null; CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Expect(23); if (StartOf(30)) { VariableInitializer( -#line 1521 "VBNET.ATG" +#line 1527 "VBNET.ATG" out expr); -#line 1523 "VBNET.ATG" +#line 1529 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1526 "VBNET.ATG" +#line 1532 "VBNET.ATG" NotFinalComma()) { Expect(12); VariableInitializer( -#line 1526 "VBNET.ATG" +#line 1532 "VBNET.ATG" out expr); -#line 1527 "VBNET.ATG" +#line 1533 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(24); -#line 1530 "VBNET.ATG" +#line 1536 "VBNET.ATG" outExpr = initializer; } void EventMemberSpecifier( -#line 1600 "VBNET.ATG" +#line 1606 "VBNET.ATG" out string name) { -#line 1601 "VBNET.ATG" +#line 1607 "VBNET.ATG" string eventName; if (StartOf(14)) { Identifier(); @@ -3514,54 +3535,54 @@ out string name) { lexer.NextToken(); } else SynErr(255); -#line 1604 "VBNET.ATG" +#line 1610 "VBNET.ATG" name = t.val; Expect(16); IdentifierOrKeyword( -#line 1606 "VBNET.ATG" +#line 1612 "VBNET.ATG" out eventName); -#line 1607 "VBNET.ATG" +#line 1613 "VBNET.ATG" name = name + "." + eventName; } void IdentifierOrKeyword( -#line 3354 "VBNET.ATG" +#line 3360 "VBNET.ATG" out string name) { -#line 3356 "VBNET.ATG" +#line 3362 "VBNET.ATG" lexer.NextToken(); name = t.val; } void QueryExpr( -#line 2019 "VBNET.ATG" +#line 2025 "VBNET.ATG" out Expression expr) { -#line 2021 "VBNET.ATG" +#line 2027 "VBNET.ATG" QueryExpression qexpr = new QueryExpression(); qexpr.StartLocation = la.Location; List middleClauses = new List(); expr = qexpr; FromOrAggregateQueryOperator( -#line 2026 "VBNET.ATG" +#line 2032 "VBNET.ATG" middleClauses); while (StartOf(31)) { QueryOperator( -#line 2027 "VBNET.ATG" +#line 2033 "VBNET.ATG" middleClauses); } -#line 2029 "VBNET.ATG" +#line 2035 "VBNET.ATG" qexpr.EndLocation = t.EndLocation; } void LambdaExpr( -#line 2001 "VBNET.ATG" +#line 2007 "VBNET.ATG" out Expression expr) { -#line 2003 "VBNET.ATG" +#line 2009 "VBNET.ATG" Expression inner = null; LambdaExpression lambda = new LambdaExpression(); lambda.StartLocation = la.Location; @@ -3571,16 +3592,16 @@ out Expression expr) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 2009 "VBNET.ATG" +#line 2015 "VBNET.ATG" lambda.Parameters); } Expect(26); } Expr( -#line 2010 "VBNET.ATG" +#line 2016 "VBNET.ATG" out inner); -#line 2012 "VBNET.ATG" +#line 2018 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? @@ -3589,116 +3610,116 @@ out inner); } void DisjunctionExpr( -#line 1783 "VBNET.ATG" +#line 1789 "VBNET.ATG" out Expression outExpr) { -#line 1785 "VBNET.ATG" +#line 1791 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConjunctionExpr( -#line 1788 "VBNET.ATG" +#line 1794 "VBNET.ATG" out outExpr); while (la.kind == 161 || la.kind == 163 || la.kind == 221) { if (la.kind == 161) { lexer.NextToken(); -#line 1791 "VBNET.ATG" +#line 1797 "VBNET.ATG" op = BinaryOperatorType.BitwiseOr; } else if (la.kind == 163) { lexer.NextToken(); -#line 1792 "VBNET.ATG" +#line 1798 "VBNET.ATG" op = BinaryOperatorType.LogicalOr; } else { lexer.NextToken(); -#line 1793 "VBNET.ATG" +#line 1799 "VBNET.ATG" op = BinaryOperatorType.ExclusiveOr; } ConjunctionExpr( -#line 1795 "VBNET.ATG" +#line 1801 "VBNET.ATG" out expr); -#line 1795 "VBNET.ATG" +#line 1801 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AssignmentOperator( -#line 1618 "VBNET.ATG" +#line 1624 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1619 "VBNET.ATG" +#line 1625 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 10: { lexer.NextToken(); -#line 1620 "VBNET.ATG" +#line 1626 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 42: { lexer.NextToken(); -#line 1621 "VBNET.ATG" +#line 1627 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 34: { lexer.NextToken(); -#line 1622 "VBNET.ATG" +#line 1628 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 36: { lexer.NextToken(); -#line 1623 "VBNET.ATG" +#line 1629 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 37: { lexer.NextToken(); -#line 1624 "VBNET.ATG" +#line 1630 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 38: { lexer.NextToken(); -#line 1625 "VBNET.ATG" +#line 1631 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 39: { lexer.NextToken(); -#line 1626 "VBNET.ATG" +#line 1632 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 35: { lexer.NextToken(); -#line 1627 "VBNET.ATG" +#line 1633 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 40: { lexer.NextToken(); -#line 1628 "VBNET.ATG" +#line 1634 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 41: { lexer.NextToken(); -#line 1629 "VBNET.ATG" +#line 1635 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } @@ -3707,54 +3728,54 @@ out AssignmentOperatorType op) { } void SimpleExpr( -#line 1633 "VBNET.ATG" +#line 1639 "VBNET.ATG" out Expression pexpr) { -#line 1634 "VBNET.ATG" +#line 1640 "VBNET.ATG" string name; SimpleNonInvocationExpression( -#line 1636 "VBNET.ATG" +#line 1642 "VBNET.ATG" out pexpr); while (la.kind == 16 || la.kind == 17 || la.kind == 25) { if (la.kind == 16) { lexer.NextToken(); IdentifierOrKeyword( -#line 1638 "VBNET.ATG" +#line 1644 "VBNET.ATG" out name); -#line 1639 "VBNET.ATG" +#line 1645 "VBNET.ATG" pexpr = new MemberReferenceExpression(pexpr, name); if ( -#line 1640 "VBNET.ATG" +#line 1646 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(155); TypeArgumentList( -#line 1641 "VBNET.ATG" +#line 1647 "VBNET.ATG" ((MemberReferenceExpression)pexpr).TypeArguments); Expect(26); } } else if (la.kind == 17) { lexer.NextToken(); IdentifierOrKeyword( -#line 1643 "VBNET.ATG" +#line 1649 "VBNET.ATG" out name); -#line 1643 "VBNET.ATG" +#line 1649 "VBNET.ATG" pexpr = new BinaryOperatorExpression(pexpr, BinaryOperatorType.DictionaryAccess, new PrimitiveExpression(name, name)); } else { InvocationExpression( -#line 1644 "VBNET.ATG" +#line 1650 "VBNET.ATG" ref pexpr); } } } void SimpleNonInvocationExpression( -#line 1648 "VBNET.ATG" +#line 1654 "VBNET.ATG" out Expression pexpr) { -#line 1650 "VBNET.ATG" +#line 1656 "VBNET.ATG" Expression expr; TypeReference type = null; string name = String.Empty; @@ -3765,98 +3786,98 @@ out Expression pexpr) { case 3: { lexer.NextToken(); -#line 1658 "VBNET.ATG" +#line 1664 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 4: { lexer.NextToken(); -#line 1659 "VBNET.ATG" +#line 1665 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 7: { lexer.NextToken(); -#line 1660 "VBNET.ATG" +#line 1666 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 6: { lexer.NextToken(); -#line 1661 "VBNET.ATG" +#line 1667 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 5: { lexer.NextToken(); -#line 1662 "VBNET.ATG" +#line 1668 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 9: { lexer.NextToken(); -#line 1663 "VBNET.ATG" +#line 1669 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 8: { lexer.NextToken(); -#line 1664 "VBNET.ATG" +#line 1670 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 202: { lexer.NextToken(); -#line 1666 "VBNET.ATG" +#line 1672 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); break; } case 109: { lexer.NextToken(); -#line 1667 "VBNET.ATG" +#line 1673 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); break; } case 151: { lexer.NextToken(); -#line 1668 "VBNET.ATG" +#line 1674 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); break; } case 25: { lexer.NextToken(); Expr( -#line 1669 "VBNET.ATG" +#line 1675 "VBNET.ATG" out expr); Expect(26); -#line 1669 "VBNET.ATG" +#line 1675 "VBNET.ATG" pexpr = new ParenthesizedExpression(expr); break; } case 2: case 45: case 49: case 51: case 52: case 53: case 54: case 57: case 74: case 85: case 91: case 94: case 103: case 108: case 113: case 120: case 126: case 130: case 133: case 156: case 162: case 169: case 188: case 197: case 198: case 208: case 209: case 215: { Identifier(); -#line 1671 "VBNET.ATG" +#line 1677 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); pexpr.StartLocation = t.Location; pexpr.EndLocation = t.EndLocation; if ( -#line 1674 "VBNET.ATG" +#line 1680 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(155); TypeArgumentList( -#line 1675 "VBNET.ATG" +#line 1681 "VBNET.ATG" ((IdentifierExpression)pexpr).TypeArguments); Expect(26); } @@ -3864,56 +3885,56 @@ la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { } case 55: case 58: case 69: case 86: case 87: case 96: case 128: case 137: case 154: case 181: case 186: case 187: case 193: case 206: case 207: case 210: { -#line 1677 "VBNET.ATG" +#line 1683 "VBNET.ATG" string val = String.Empty; if (StartOf(11)) { PrimitiveTypeName( -#line 1678 "VBNET.ATG" +#line 1684 "VBNET.ATG" out val); } else if (la.kind == 154) { lexer.NextToken(); -#line 1678 "VBNET.ATG" +#line 1684 "VBNET.ATG" val = "System.Object"; } else SynErr(257); Expect(16); -#line 1679 "VBNET.ATG" +#line 1685 "VBNET.ATG" t.val = ""; Identifier(); -#line 1679 "VBNET.ATG" +#line 1685 "VBNET.ATG" pexpr = new MemberReferenceExpression(new TypeReferenceExpression(new TypeReference(val, true)), t.val); break; } case 139: { lexer.NextToken(); -#line 1680 "VBNET.ATG" +#line 1686 "VBNET.ATG" pexpr = new ThisReferenceExpression(); break; } case 144: case 145: { -#line 1681 "VBNET.ATG" +#line 1687 "VBNET.ATG" Expression retExpr = null; if (la.kind == 144) { lexer.NextToken(); -#line 1682 "VBNET.ATG" +#line 1688 "VBNET.ATG" retExpr = new BaseReferenceExpression(); } else if (la.kind == 145) { lexer.NextToken(); -#line 1683 "VBNET.ATG" +#line 1689 "VBNET.ATG" retExpr = new ClassReferenceExpression(); } else SynErr(258); Expect(16); IdentifierOrKeyword( -#line 1685 "VBNET.ATG" +#line 1691 "VBNET.ATG" out name); -#line 1685 "VBNET.ATG" +#line 1691 "VBNET.ATG" pexpr = new MemberReferenceExpression(retExpr, name); break; } @@ -3922,77 +3943,77 @@ out name); Expect(16); Identifier(); -#line 1687 "VBNET.ATG" +#line 1693 "VBNET.ATG" type = new TypeReference(t.val ?? ""); -#line 1689 "VBNET.ATG" +#line 1695 "VBNET.ATG" type.IsGlobal = true; -#line 1690 "VBNET.ATG" +#line 1696 "VBNET.ATG" pexpr = new TypeReferenceExpression(type); break; } case 148: { ObjectCreateExpression( -#line 1691 "VBNET.ATG" +#line 1697 "VBNET.ATG" out expr); -#line 1691 "VBNET.ATG" +#line 1697 "VBNET.ATG" pexpr = expr; break; } case 81: case 93: case 204: { -#line 1693 "VBNET.ATG" +#line 1699 "VBNET.ATG" CastType castType = CastType.Cast; if (la.kind == 93) { lexer.NextToken(); } else if (la.kind == 81) { lexer.NextToken(); -#line 1695 "VBNET.ATG" +#line 1701 "VBNET.ATG" castType = CastType.Conversion; } else if (la.kind == 204) { lexer.NextToken(); -#line 1696 "VBNET.ATG" +#line 1702 "VBNET.ATG" castType = CastType.TryCast; } else SynErr(259); Expect(25); Expr( -#line 1698 "VBNET.ATG" +#line 1704 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1698 "VBNET.ATG" +#line 1704 "VBNET.ATG" out type); Expect(26); -#line 1699 "VBNET.ATG" +#line 1705 "VBNET.ATG" pexpr = new CastExpression(type, expr, castType); break; } case 63: case 64: case 65: case 66: case 67: case 68: case 70: case 72: case 73: case 77: case 78: case 79: case 80: case 82: case 83: case 84: { CastTarget( -#line 1700 "VBNET.ATG" +#line 1706 "VBNET.ATG" out type); Expect(25); Expr( -#line 1700 "VBNET.ATG" +#line 1706 "VBNET.ATG" out expr); Expect(26); -#line 1700 "VBNET.ATG" +#line 1706 "VBNET.ATG" pexpr = new CastExpression(type, expr, CastType.PrimitiveConversion); break; } case 44: { lexer.NextToken(); Expr( -#line 1701 "VBNET.ATG" +#line 1707 "VBNET.ATG" out expr); -#line 1701 "VBNET.ATG" +#line 1707 "VBNET.ATG" pexpr = new AddressOfExpression(expr); break; } @@ -4000,31 +4021,31 @@ out expr); lexer.NextToken(); Expect(25); GetTypeTypeName( -#line 1702 "VBNET.ATG" +#line 1708 "VBNET.ATG" out type); Expect(26); -#line 1702 "VBNET.ATG" +#line 1708 "VBNET.ATG" pexpr = new TypeOfExpression(type); break; } case 205: { lexer.NextToken(); SimpleExpr( -#line 1703 "VBNET.ATG" +#line 1709 "VBNET.ATG" out expr); Expect(131); TypeName( -#line 1703 "VBNET.ATG" +#line 1709 "VBNET.ATG" out type); -#line 1703 "VBNET.ATG" +#line 1709 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); break; } case 122: { ConditionalExpression( -#line 1704 "VBNET.ATG" +#line 1710 "VBNET.ATG" out pexpr); break; } @@ -4032,171 +4053,171 @@ out pexpr); } else if (la.kind == 16) { lexer.NextToken(); IdentifierOrKeyword( -#line 1708 "VBNET.ATG" +#line 1714 "VBNET.ATG" out name); -#line 1708 "VBNET.ATG" +#line 1714 "VBNET.ATG" pexpr = new MemberReferenceExpression(null, name); } else SynErr(260); } void TypeArgumentList( -#line 2522 "VBNET.ATG" +#line 2528 "VBNET.ATG" List typeArguments) { -#line 2524 "VBNET.ATG" +#line 2530 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2526 "VBNET.ATG" +#line 2532 "VBNET.ATG" out typeref); -#line 2526 "VBNET.ATG" +#line 2532 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 2529 "VBNET.ATG" +#line 2535 "VBNET.ATG" out typeref); -#line 2529 "VBNET.ATG" +#line 2535 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void InvocationExpression( -#line 1746 "VBNET.ATG" +#line 1752 "VBNET.ATG" ref Expression pexpr) { -#line 1747 "VBNET.ATG" +#line 1753 "VBNET.ATG" List parameters = null; Expect(25); -#line 1749 "VBNET.ATG" +#line 1755 "VBNET.ATG" Location start = t.Location; ArgumentList( -#line 1750 "VBNET.ATG" +#line 1756 "VBNET.ATG" out parameters); Expect(26); -#line 1753 "VBNET.ATG" +#line 1759 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); SetParent(parameters, pexpr); -#line 1756 "VBNET.ATG" +#line 1762 "VBNET.ATG" pexpr.StartLocation = start; pexpr.EndLocation = t.Location; } void PrimitiveTypeName( -#line 3361 "VBNET.ATG" +#line 3367 "VBNET.ATG" out string type) { -#line 3362 "VBNET.ATG" +#line 3368 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 55: { lexer.NextToken(); -#line 3363 "VBNET.ATG" +#line 3369 "VBNET.ATG" type = "System.Boolean"; break; } case 86: { lexer.NextToken(); -#line 3364 "VBNET.ATG" +#line 3370 "VBNET.ATG" type = "System.DateTime"; break; } case 69: { lexer.NextToken(); -#line 3365 "VBNET.ATG" +#line 3371 "VBNET.ATG" type = "System.Char"; break; } case 193: { lexer.NextToken(); -#line 3366 "VBNET.ATG" +#line 3372 "VBNET.ATG" type = "System.String"; break; } case 87: { lexer.NextToken(); -#line 3367 "VBNET.ATG" +#line 3373 "VBNET.ATG" type = "System.Decimal"; break; } case 58: { lexer.NextToken(); -#line 3368 "VBNET.ATG" +#line 3374 "VBNET.ATG" type = "System.Byte"; break; } case 186: { lexer.NextToken(); -#line 3369 "VBNET.ATG" +#line 3375 "VBNET.ATG" type = "System.Int16"; break; } case 128: { lexer.NextToken(); -#line 3370 "VBNET.ATG" +#line 3376 "VBNET.ATG" type = "System.Int32"; break; } case 137: { lexer.NextToken(); -#line 3371 "VBNET.ATG" +#line 3377 "VBNET.ATG" type = "System.Int64"; break; } case 187: { lexer.NextToken(); -#line 3372 "VBNET.ATG" +#line 3378 "VBNET.ATG" type = "System.Single"; break; } case 96: { lexer.NextToken(); -#line 3373 "VBNET.ATG" +#line 3379 "VBNET.ATG" type = "System.Double"; break; } case 206: { lexer.NextToken(); -#line 3374 "VBNET.ATG" +#line 3380 "VBNET.ATG" type = "System.UInt32"; break; } case 207: { lexer.NextToken(); -#line 3375 "VBNET.ATG" +#line 3381 "VBNET.ATG" type = "System.UInt64"; break; } case 210: { lexer.NextToken(); -#line 3376 "VBNET.ATG" +#line 3382 "VBNET.ATG" type = "System.UInt16"; break; } case 181: { lexer.NextToken(); -#line 3377 "VBNET.ATG" +#line 3383 "VBNET.ATG" type = "System.SByte"; break; } @@ -4205,122 +4226,122 @@ out string type) { } void CastTarget( -#line 1761 "VBNET.ATG" +#line 1767 "VBNET.ATG" out TypeReference type) { -#line 1763 "VBNET.ATG" +#line 1769 "VBNET.ATG" type = null; switch (la.kind) { case 63: { lexer.NextToken(); -#line 1765 "VBNET.ATG" +#line 1771 "VBNET.ATG" type = new TypeReference("System.Boolean", true); break; } case 64: { lexer.NextToken(); -#line 1766 "VBNET.ATG" +#line 1772 "VBNET.ATG" type = new TypeReference("System.Byte", true); break; } case 77: { lexer.NextToken(); -#line 1767 "VBNET.ATG" +#line 1773 "VBNET.ATG" type = new TypeReference("System.SByte", true); break; } case 65: { lexer.NextToken(); -#line 1768 "VBNET.ATG" +#line 1774 "VBNET.ATG" type = new TypeReference("System.Char", true); break; } case 66: { lexer.NextToken(); -#line 1769 "VBNET.ATG" +#line 1775 "VBNET.ATG" type = new TypeReference("System.DateTime", true); break; } case 68: { lexer.NextToken(); -#line 1770 "VBNET.ATG" +#line 1776 "VBNET.ATG" type = new TypeReference("System.Decimal", true); break; } case 67: { lexer.NextToken(); -#line 1771 "VBNET.ATG" +#line 1777 "VBNET.ATG" type = new TypeReference("System.Double", true); break; } case 78: { lexer.NextToken(); -#line 1772 "VBNET.ATG" +#line 1778 "VBNET.ATG" type = new TypeReference("System.Int16", true); break; } case 70: { lexer.NextToken(); -#line 1773 "VBNET.ATG" +#line 1779 "VBNET.ATG" type = new TypeReference("System.Int32", true); break; } case 72: { lexer.NextToken(); -#line 1774 "VBNET.ATG" +#line 1780 "VBNET.ATG" type = new TypeReference("System.Int64", true); break; } case 84: { lexer.NextToken(); -#line 1775 "VBNET.ATG" +#line 1781 "VBNET.ATG" type = new TypeReference("System.UInt16", true); break; } case 82: { lexer.NextToken(); -#line 1776 "VBNET.ATG" +#line 1782 "VBNET.ATG" type = new TypeReference("System.UInt32", true); break; } case 83: { lexer.NextToken(); -#line 1777 "VBNET.ATG" +#line 1783 "VBNET.ATG" type = new TypeReference("System.UInt64", true); break; } case 73: { lexer.NextToken(); -#line 1778 "VBNET.ATG" +#line 1784 "VBNET.ATG" type = new TypeReference("System.Object", true); break; } case 79: { lexer.NextToken(); -#line 1779 "VBNET.ATG" +#line 1785 "VBNET.ATG" type = new TypeReference("System.Single", true); break; } case 80: { lexer.NextToken(); -#line 1780 "VBNET.ATG" +#line 1786 "VBNET.ATG" type = new TypeReference("System.String", true); break; } @@ -4329,19 +4350,19 @@ out TypeReference type) { } void GetTypeTypeName( -#line 2421 "VBNET.ATG" +#line 2427 "VBNET.ATG" out TypeReference typeref) { -#line 2422 "VBNET.ATG" +#line 2428 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2424 "VBNET.ATG" +#line 2430 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 2425 "VBNET.ATG" +#line 2431 "VBNET.ATG" out rank); -#line 2426 "VBNET.ATG" +#line 2432 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4349,10 +4370,10 @@ out rank); } void ConditionalExpression( -#line 1712 "VBNET.ATG" +#line 1718 "VBNET.ATG" out Expression expr) { -#line 1714 "VBNET.ATG" +#line 1720 "VBNET.ATG" ConditionalExpression conditionalExpression = new ConditionalExpression(); BinaryOperatorExpression binaryOperatorExpression = new BinaryOperatorExpression(); conditionalExpression.StartLocation = binaryOperatorExpression.StartLocation = la.Location; @@ -4364,21 +4385,21 @@ out Expression expr) { Expect(122); Expect(25); Expr( -#line 1723 "VBNET.ATG" +#line 1729 "VBNET.ATG" out condition); Expect(12); Expr( -#line 1723 "VBNET.ATG" +#line 1729 "VBNET.ATG" out trueExpr); if (la.kind == 12) { lexer.NextToken(); Expr( -#line 1723 "VBNET.ATG" +#line 1729 "VBNET.ATG" out falseExpr); } Expect(26); -#line 1725 "VBNET.ATG" +#line 1731 "VBNET.ATG" if(falseExpr != null) { conditionalExpression.Condition = condition; @@ -4401,348 +4422,348 @@ out falseExpr); } void ArgumentList( -#line 2353 "VBNET.ATG" +#line 2359 "VBNET.ATG" out List arguments) { -#line 2355 "VBNET.ATG" +#line 2361 "VBNET.ATG" arguments = new List(); Expression expr = null; if (StartOf(29)) { Argument( -#line 2358 "VBNET.ATG" +#line 2364 "VBNET.ATG" out expr); } while (la.kind == 12) { lexer.NextToken(); -#line 2359 "VBNET.ATG" +#line 2365 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; if (StartOf(29)) { Argument( -#line 2360 "VBNET.ATG" +#line 2366 "VBNET.ATG" out expr); } -#line 2361 "VBNET.ATG" +#line 2367 "VBNET.ATG" if (expr == null) expr = Expression.Null; } -#line 2363 "VBNET.ATG" +#line 2369 "VBNET.ATG" if (expr != null) arguments.Add(expr); } void ConjunctionExpr( -#line 1799 "VBNET.ATG" +#line 1805 "VBNET.ATG" out Expression outExpr) { -#line 1801 "VBNET.ATG" +#line 1807 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; NotExpr( -#line 1804 "VBNET.ATG" +#line 1810 "VBNET.ATG" out outExpr); while (la.kind == 47 || la.kind == 48) { if (la.kind == 47) { lexer.NextToken(); -#line 1807 "VBNET.ATG" +#line 1813 "VBNET.ATG" op = BinaryOperatorType.BitwiseAnd; } else { lexer.NextToken(); -#line 1808 "VBNET.ATG" +#line 1814 "VBNET.ATG" op = BinaryOperatorType.LogicalAnd; } NotExpr( -#line 1810 "VBNET.ATG" +#line 1816 "VBNET.ATG" out expr); -#line 1810 "VBNET.ATG" +#line 1816 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void NotExpr( -#line 1814 "VBNET.ATG" +#line 1820 "VBNET.ATG" out Expression outExpr) { -#line 1815 "VBNET.ATG" +#line 1821 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 150) { lexer.NextToken(); -#line 1816 "VBNET.ATG" +#line 1822 "VBNET.ATG" uop = UnaryOperatorType.Not; } ComparisonExpr( -#line 1817 "VBNET.ATG" +#line 1823 "VBNET.ATG" out outExpr); -#line 1818 "VBNET.ATG" +#line 1824 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void ComparisonExpr( -#line 1823 "VBNET.ATG" +#line 1829 "VBNET.ATG" out Expression outExpr) { -#line 1825 "VBNET.ATG" +#line 1831 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1828 "VBNET.ATG" +#line 1834 "VBNET.ATG" out outExpr); while (StartOf(33)) { switch (la.kind) { case 28: { lexer.NextToken(); -#line 1831 "VBNET.ATG" +#line 1837 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 27: { lexer.NextToken(); -#line 1832 "VBNET.ATG" +#line 1838 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 31: { lexer.NextToken(); -#line 1833 "VBNET.ATG" +#line 1839 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 30: { lexer.NextToken(); -#line 1834 "VBNET.ATG" +#line 1840 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 29: { lexer.NextToken(); -#line 1835 "VBNET.ATG" +#line 1841 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } case 10: { lexer.NextToken(); -#line 1836 "VBNET.ATG" +#line 1842 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 136: { lexer.NextToken(); -#line 1837 "VBNET.ATG" +#line 1843 "VBNET.ATG" op = BinaryOperatorType.Like; break; } case 131: { lexer.NextToken(); -#line 1838 "VBNET.ATG" +#line 1844 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; break; } case 132: { lexer.NextToken(); -#line 1839 "VBNET.ATG" +#line 1845 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; break; } } if (StartOf(34)) { ShiftExpr( -#line 1842 "VBNET.ATG" +#line 1848 "VBNET.ATG" out expr); -#line 1842 "VBNET.ATG" +#line 1848 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else if (la.kind == 150) { lexer.NextToken(); ShiftExpr( -#line 1845 "VBNET.ATG" +#line 1851 "VBNET.ATG" out expr); -#line 1845 "VBNET.ATG" +#line 1851 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new UnaryOperatorExpression(expr, UnaryOperatorType.Not)); } else SynErr(263); } } void ShiftExpr( -#line 1850 "VBNET.ATG" +#line 1856 "VBNET.ATG" out Expression outExpr) { -#line 1852 "VBNET.ATG" +#line 1858 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConcatenationExpr( -#line 1855 "VBNET.ATG" +#line 1861 "VBNET.ATG" out outExpr); while (la.kind == 32 || la.kind == 33) { if (la.kind == 32) { lexer.NextToken(); -#line 1858 "VBNET.ATG" +#line 1864 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1859 "VBNET.ATG" +#line 1865 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } ConcatenationExpr( -#line 1861 "VBNET.ATG" +#line 1867 "VBNET.ATG" out expr); -#line 1861 "VBNET.ATG" +#line 1867 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ConcatenationExpr( -#line 1865 "VBNET.ATG" +#line 1871 "VBNET.ATG" out Expression outExpr) { -#line 1866 "VBNET.ATG" +#line 1872 "VBNET.ATG" Expression expr; AdditiveExpr( -#line 1868 "VBNET.ATG" +#line 1874 "VBNET.ATG" out outExpr); while (la.kind == 13) { lexer.NextToken(); AdditiveExpr( -#line 1868 "VBNET.ATG" +#line 1874 "VBNET.ATG" out expr); -#line 1868 "VBNET.ATG" +#line 1874 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Concat, expr); } } void AdditiveExpr( -#line 1871 "VBNET.ATG" +#line 1877 "VBNET.ATG" out Expression outExpr) { -#line 1873 "VBNET.ATG" +#line 1879 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ModuloExpr( -#line 1876 "VBNET.ATG" +#line 1882 "VBNET.ATG" out outExpr); while (la.kind == 18 || la.kind == 19) { if (la.kind == 19) { lexer.NextToken(); -#line 1879 "VBNET.ATG" +#line 1885 "VBNET.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 1880 "VBNET.ATG" +#line 1886 "VBNET.ATG" op = BinaryOperatorType.Subtract; } ModuloExpr( -#line 1882 "VBNET.ATG" +#line 1888 "VBNET.ATG" out expr); -#line 1882 "VBNET.ATG" +#line 1888 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ModuloExpr( -#line 1886 "VBNET.ATG" +#line 1892 "VBNET.ATG" out Expression outExpr) { -#line 1887 "VBNET.ATG" +#line 1893 "VBNET.ATG" Expression expr; IntegerDivisionExpr( -#line 1889 "VBNET.ATG" +#line 1895 "VBNET.ATG" out outExpr); while (la.kind == 140) { lexer.NextToken(); IntegerDivisionExpr( -#line 1889 "VBNET.ATG" +#line 1895 "VBNET.ATG" out expr); -#line 1889 "VBNET.ATG" +#line 1895 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr); } } void IntegerDivisionExpr( -#line 1892 "VBNET.ATG" +#line 1898 "VBNET.ATG" out Expression outExpr) { -#line 1893 "VBNET.ATG" +#line 1899 "VBNET.ATG" Expression expr; MultiplicativeExpr( -#line 1895 "VBNET.ATG" +#line 1901 "VBNET.ATG" out outExpr); while (la.kind == 15) { lexer.NextToken(); MultiplicativeExpr( -#line 1895 "VBNET.ATG" +#line 1901 "VBNET.ATG" out expr); -#line 1895 "VBNET.ATG" +#line 1901 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.DivideInteger, expr); } } void MultiplicativeExpr( -#line 1898 "VBNET.ATG" +#line 1904 "VBNET.ATG" out Expression outExpr) { -#line 1900 "VBNET.ATG" +#line 1906 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 1903 "VBNET.ATG" +#line 1909 "VBNET.ATG" out outExpr); while (la.kind == 14 || la.kind == 22) { if (la.kind == 22) { lexer.NextToken(); -#line 1906 "VBNET.ATG" +#line 1912 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else { lexer.NextToken(); -#line 1907 "VBNET.ATG" +#line 1913 "VBNET.ATG" op = BinaryOperatorType.Divide; } UnaryExpr( -#line 1909 "VBNET.ATG" +#line 1915 "VBNET.ATG" out expr); -#line 1909 "VBNET.ATG" +#line 1915 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void UnaryExpr( -#line 1913 "VBNET.ATG" +#line 1919 "VBNET.ATG" out Expression uExpr) { -#line 1915 "VBNET.ATG" +#line 1921 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -4751,25 +4772,25 @@ out Expression uExpr) { if (la.kind == 19) { lexer.NextToken(); -#line 1919 "VBNET.ATG" +#line 1925 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 18) { lexer.NextToken(); -#line 1920 "VBNET.ATG" +#line 1926 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 1921 "VBNET.ATG" +#line 1927 "VBNET.ATG" uop = UnaryOperatorType.Dereference; isUOp = true; } } ExponentiationExpr( -#line 1923 "VBNET.ATG" +#line 1929 "VBNET.ATG" out expr); -#line 1925 "VBNET.ATG" +#line 1931 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -4779,107 +4800,107 @@ out expr); } void ExponentiationExpr( -#line 1933 "VBNET.ATG" +#line 1939 "VBNET.ATG" out Expression outExpr) { -#line 1934 "VBNET.ATG" +#line 1940 "VBNET.ATG" Expression expr; SimpleExpr( -#line 1936 "VBNET.ATG" +#line 1942 "VBNET.ATG" out outExpr); while (la.kind == 20) { lexer.NextToken(); SimpleExpr( -#line 1936 "VBNET.ATG" +#line 1942 "VBNET.ATG" out expr); -#line 1936 "VBNET.ATG" +#line 1942 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Power, expr); } } void NormalOrReDimArgumentList( -#line 2367 "VBNET.ATG" +#line 2373 "VBNET.ATG" out List arguments, out bool canBeNormal, out bool canBeRedim) { -#line 2369 "VBNET.ATG" +#line 2375 "VBNET.ATG" arguments = new List(); canBeNormal = true; canBeRedim = !IsNamedAssign(); Expression expr = null; if (StartOf(29)) { Argument( -#line 2374 "VBNET.ATG" +#line 2380 "VBNET.ATG" out expr); if (la.kind == 201) { lexer.NextToken(); -#line 2375 "VBNET.ATG" +#line 2381 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2376 "VBNET.ATG" +#line 2382 "VBNET.ATG" out expr); } } while (la.kind == 12) { lexer.NextToken(); -#line 2379 "VBNET.ATG" +#line 2385 "VBNET.ATG" if (expr == null) canBeRedim = false; -#line 2380 "VBNET.ATG" +#line 2386 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; -#line 2381 "VBNET.ATG" +#line 2387 "VBNET.ATG" canBeRedim &= !IsNamedAssign(); if (StartOf(29)) { Argument( -#line 2382 "VBNET.ATG" +#line 2388 "VBNET.ATG" out expr); if (la.kind == 201) { lexer.NextToken(); -#line 2383 "VBNET.ATG" +#line 2389 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2384 "VBNET.ATG" +#line 2390 "VBNET.ATG" out expr); } } -#line 2386 "VBNET.ATG" +#line 2392 "VBNET.ATG" if (expr == null) { canBeRedim = false; expr = Expression.Null; } } -#line 2388 "VBNET.ATG" +#line 2394 "VBNET.ATG" if (expr != null) arguments.Add(expr); else canBeRedim = false; } void ArrayTypeModifiers( -#line 2495 "VBNET.ATG" +#line 2501 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2497 "VBNET.ATG" +#line 2503 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2500 "VBNET.ATG" +#line 2506 "VBNET.ATG" IsDims()) { Expect(25); if (la.kind == 12 || la.kind == 26) { RankList( -#line 2502 "VBNET.ATG" +#line 2508 "VBNET.ATG" out i); } -#line 2504 "VBNET.ATG" +#line 2510 "VBNET.ATG" arrayModifiers.Add(i); Expect(26); } -#line 2509 "VBNET.ATG" +#line 2515 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -4887,10 +4908,10 @@ out i); } void MemberInitializer( -#line 2337 "VBNET.ATG" +#line 2343 "VBNET.ATG" out NamedArgumentExpression memberInitializer) { -#line 2339 "VBNET.ATG" +#line 2345 "VBNET.ATG" memberInitializer = new NamedArgumentExpression(); memberInitializer.StartLocation = la.Location; Expression initExpr = null; @@ -4898,14 +4919,14 @@ out NamedArgumentExpression memberInitializer) { Expect(16); IdentifierOrKeyword( -#line 2344 "VBNET.ATG" +#line 2350 "VBNET.ATG" out name); Expect(10); Expr( -#line 2344 "VBNET.ATG" +#line 2350 "VBNET.ATG" out initExpr); -#line 2346 "VBNET.ATG" +#line 2352 "VBNET.ATG" memberInitializer.Name = name; memberInitializer.Expression = initExpr; memberInitializer.EndLocation = t.EndLocation; @@ -4913,27 +4934,27 @@ out initExpr); } void FromOrAggregateQueryOperator( -#line 2033 "VBNET.ATG" +#line 2039 "VBNET.ATG" List middleClauses) { -#line 2034 "VBNET.ATG" +#line 2040 "VBNET.ATG" if (la.kind == 113) { FromQueryOperator( -#line 2035 "VBNET.ATG" +#line 2041 "VBNET.ATG" middleClauses); } else if (la.kind == 45) { AggregateQueryOperator( -#line 2036 "VBNET.ATG" +#line 2042 "VBNET.ATG" middleClauses); } else SynErr(264); } void QueryOperator( -#line 2039 "VBNET.ATG" +#line 2045 "VBNET.ATG" List middleClauses) { -#line 2041 "VBNET.ATG" +#line 2047 "VBNET.ATG" QueryExpressionJoinVBClause joinClause = null; QueryExpressionGroupVBClause groupByClause = null; QueryExpressionPartitionVBClause partitionClause = null; @@ -4941,79 +4962,79 @@ List middleClauses) { if (la.kind == 113) { FromQueryOperator( -#line 2046 "VBNET.ATG" +#line 2052 "VBNET.ATG" middleClauses); } else if (la.kind == 45) { AggregateQueryOperator( -#line 2047 "VBNET.ATG" +#line 2053 "VBNET.ATG" middleClauses); } else if (la.kind == 182) { SelectQueryOperator( -#line 2048 "VBNET.ATG" +#line 2054 "VBNET.ATG" middleClauses); } else if (la.kind == 94) { DistinctQueryOperator( -#line 2049 "VBNET.ATG" +#line 2055 "VBNET.ATG" middleClauses); } else if (la.kind == 215) { WhereQueryOperator( -#line 2050 "VBNET.ATG" +#line 2056 "VBNET.ATG" middleClauses); } else if (la.kind == 162) { OrderByQueryOperator( -#line 2051 "VBNET.ATG" +#line 2057 "VBNET.ATG" middleClauses); } else if (la.kind == 188 || la.kind == 197) { PartitionQueryOperator( -#line 2052 "VBNET.ATG" +#line 2058 "VBNET.ATG" out partitionClause); } else if (la.kind == 134) { LetQueryOperator( -#line 2053 "VBNET.ATG" +#line 2059 "VBNET.ATG" middleClauses); } else if (la.kind == 133) { JoinQueryOperator( -#line 2054 "VBNET.ATG" +#line 2060 "VBNET.ATG" out joinClause); -#line 2055 "VBNET.ATG" +#line 2061 "VBNET.ATG" middleClauses.Add(joinClause); } else if ( -#line 2056 "VBNET.ATG" +#line 2062 "VBNET.ATG" la.kind == Tokens.Group && Peek(1).kind == Tokens.Join) { GroupJoinQueryOperator( -#line 2056 "VBNET.ATG" +#line 2062 "VBNET.ATG" out groupJoinClause); -#line 2057 "VBNET.ATG" +#line 2063 "VBNET.ATG" middleClauses.Add(groupJoinClause); } else if (la.kind == 120) { GroupByQueryOperator( -#line 2058 "VBNET.ATG" +#line 2064 "VBNET.ATG" out groupByClause); -#line 2059 "VBNET.ATG" +#line 2065 "VBNET.ATG" middleClauses.Add(groupByClause); } else SynErr(265); } void FromQueryOperator( -#line 2138 "VBNET.ATG" +#line 2144 "VBNET.ATG" List middleClauses) { -#line 2140 "VBNET.ATG" +#line 2146 "VBNET.ATG" Expect(113); CollectionRangeVariableDeclarationList( -#line 2141 "VBNET.ATG" +#line 2147 "VBNET.ATG" middleClauses); } void AggregateQueryOperator( -#line 2202 "VBNET.ATG" +#line 2208 "VBNET.ATG" List middleClauses) { -#line 2204 "VBNET.ATG" +#line 2210 "VBNET.ATG" QueryExpressionFromClause fromClause = null; QueryExpressionAggregateClause aggregateClause = new QueryExpressionAggregateClause(); aggregateClause.IntoVariables = new List(); @@ -5021,26 +5042,26 @@ List middleClauses) { Expect(45); CollectionRangeVariableDeclaration( -#line 2209 "VBNET.ATG" +#line 2215 "VBNET.ATG" out fromClause); -#line 2211 "VBNET.ATG" +#line 2217 "VBNET.ATG" aggregateClause.FromClause = fromClause; while (StartOf(31)) { QueryOperator( -#line 2214 "VBNET.ATG" +#line 2220 "VBNET.ATG" aggregateClause.MiddleClauses); } -#line 2216 "VBNET.ATG" +#line 2222 "VBNET.ATG" SetParent(aggregateClause.MiddleClauses, aggregateClause); Expect(130); ExpressionRangeVariableDeclarationList( -#line 2217 "VBNET.ATG" +#line 2223 "VBNET.ATG" aggregateClause.IntoVariables); -#line 2219 "VBNET.ATG" +#line 2225 "VBNET.ATG" SetParent(aggregateClause.IntoVariables, aggregateClause); aggregateClause.EndLocation = t.EndLocation; middleClauses.Add(aggregateClause); @@ -5048,19 +5069,19 @@ aggregateClause.IntoVariables); } void SelectQueryOperator( -#line 2144 "VBNET.ATG" +#line 2150 "VBNET.ATG" List middleClauses) { -#line 2146 "VBNET.ATG" +#line 2152 "VBNET.ATG" QueryExpressionSelectVBClause selectClause = new QueryExpressionSelectVBClause(); selectClause.StartLocation = la.Location; Expect(182); ExpressionRangeVariableDeclarationList( -#line 2149 "VBNET.ATG" +#line 2155 "VBNET.ATG" selectClause.Variables); -#line 2151 "VBNET.ATG" +#line 2157 "VBNET.ATG" SetParent(selectClause.Variables, selectClause); selectClause.EndLocation = t.Location; middleClauses.Add(selectClause); @@ -5068,36 +5089,36 @@ selectClause.Variables); } void DistinctQueryOperator( -#line 2157 "VBNET.ATG" +#line 2163 "VBNET.ATG" List middleClauses) { -#line 2159 "VBNET.ATG" +#line 2165 "VBNET.ATG" QueryExpressionDistinctClause distinctClause = new QueryExpressionDistinctClause(); distinctClause.StartLocation = la.Location; Expect(94); -#line 2164 "VBNET.ATG" +#line 2170 "VBNET.ATG" distinctClause.EndLocation = t.EndLocation; middleClauses.Add(distinctClause); } void WhereQueryOperator( -#line 2169 "VBNET.ATG" +#line 2175 "VBNET.ATG" List middleClauses) { -#line 2171 "VBNET.ATG" +#line 2177 "VBNET.ATG" QueryExpressionWhereClause whereClause = new QueryExpressionWhereClause(); whereClause.StartLocation = la.Location; Expression operand = null; Expect(215); Expr( -#line 2175 "VBNET.ATG" +#line 2181 "VBNET.ATG" out operand); -#line 2177 "VBNET.ATG" +#line 2183 "VBNET.ATG" whereClause.Condition = operand; whereClause.EndLocation = t.EndLocation; @@ -5106,10 +5127,10 @@ out operand); } void OrderByQueryOperator( -#line 2062 "VBNET.ATG" +#line 2068 "VBNET.ATG" List middleClauses) { -#line 2064 "VBNET.ATG" +#line 2070 "VBNET.ATG" QueryExpressionOrderClause orderClause = new QueryExpressionOrderClause(); orderClause.StartLocation = la.Location; List orderings = null; @@ -5117,10 +5138,10 @@ List middleClauses) { Expect(162); Expect(57); OrderExpressionList( -#line 2068 "VBNET.ATG" +#line 2074 "VBNET.ATG" out orderings); -#line 2070 "VBNET.ATG" +#line 2076 "VBNET.ATG" orderClause.Orderings = orderings; orderClause.EndLocation = t.EndLocation; middleClauses.Add(orderClause); @@ -5128,10 +5149,10 @@ out orderings); } void PartitionQueryOperator( -#line 2184 "VBNET.ATG" +#line 2190 "VBNET.ATG" out QueryExpressionPartitionVBClause partitionClause) { -#line 2186 "VBNET.ATG" +#line 2192 "VBNET.ATG" partitionClause = new QueryExpressionPartitionVBClause(); partitionClause.StartLocation = la.Location; Expression expr = null; @@ -5139,33 +5160,33 @@ out QueryExpressionPartitionVBClause partitionClause) { if (la.kind == 197) { lexer.NextToken(); -#line 2190 "VBNET.ATG" +#line 2196 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Take; if (la.kind == 216) { lexer.NextToken(); -#line 2191 "VBNET.ATG" +#line 2197 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.TakeWhile; } Expr( -#line 2192 "VBNET.ATG" +#line 2198 "VBNET.ATG" out expr); } else if (la.kind == 188) { lexer.NextToken(); -#line 2193 "VBNET.ATG" +#line 2199 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Skip; if (la.kind == 216) { lexer.NextToken(); } -#line 2194 "VBNET.ATG" +#line 2200 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.SkipWhile; Expr( -#line 2195 "VBNET.ATG" +#line 2201 "VBNET.ATG" out expr); -#line 2197 "VBNET.ATG" +#line 2203 "VBNET.ATG" partitionClause.Expression = expr; partitionClause.EndLocation = t.EndLocation; @@ -5173,29 +5194,29 @@ out expr); } void LetQueryOperator( -#line 2225 "VBNET.ATG" +#line 2231 "VBNET.ATG" List middleClauses) { -#line 2227 "VBNET.ATG" +#line 2233 "VBNET.ATG" QueryExpressionLetVBClause letClause = new QueryExpressionLetVBClause(); letClause.StartLocation = la.Location; Expect(134); ExpressionRangeVariableDeclarationList( -#line 2230 "VBNET.ATG" +#line 2236 "VBNET.ATG" letClause.Variables); -#line 2232 "VBNET.ATG" +#line 2238 "VBNET.ATG" letClause.EndLocation = t.EndLocation; middleClauses.Add(letClause); } void JoinQueryOperator( -#line 2269 "VBNET.ATG" +#line 2275 "VBNET.ATG" out QueryExpressionJoinVBClause joinClause) { -#line 2271 "VBNET.ATG" +#line 2277 "VBNET.ATG" joinClause = new QueryExpressionJoinVBClause(); joinClause.StartLocation = la.Location; QueryExpressionFromClause joinVariable = null; @@ -5205,87 +5226,87 @@ out QueryExpressionJoinVBClause joinClause) { Expect(133); CollectionRangeVariableDeclaration( -#line 2278 "VBNET.ATG" +#line 2284 "VBNET.ATG" out joinVariable); -#line 2279 "VBNET.ATG" +#line 2285 "VBNET.ATG" joinClause.JoinVariable = joinVariable; if (la.kind == 133) { JoinQueryOperator( -#line 2281 "VBNET.ATG" +#line 2287 "VBNET.ATG" out subJoin); -#line 2282 "VBNET.ATG" +#line 2288 "VBNET.ATG" joinClause.SubJoin = subJoin; } Expect(157); JoinCondition( -#line 2285 "VBNET.ATG" +#line 2291 "VBNET.ATG" out condition); -#line 2286 "VBNET.ATG" +#line 2292 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); while (la.kind == 47) { lexer.NextToken(); JoinCondition( -#line 2288 "VBNET.ATG" +#line 2294 "VBNET.ATG" out condition); -#line 2289 "VBNET.ATG" +#line 2295 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); } -#line 2292 "VBNET.ATG" +#line 2298 "VBNET.ATG" joinClause.EndLocation = t.EndLocation; } void GroupJoinQueryOperator( -#line 2124 "VBNET.ATG" +#line 2130 "VBNET.ATG" out QueryExpressionGroupJoinVBClause groupJoinClause) { -#line 2126 "VBNET.ATG" +#line 2132 "VBNET.ATG" groupJoinClause = new QueryExpressionGroupJoinVBClause(); groupJoinClause.StartLocation = la.Location; QueryExpressionJoinVBClause joinClause = null; Expect(120); JoinQueryOperator( -#line 2130 "VBNET.ATG" +#line 2136 "VBNET.ATG" out joinClause); Expect(130); ExpressionRangeVariableDeclarationList( -#line 2131 "VBNET.ATG" +#line 2137 "VBNET.ATG" groupJoinClause.IntoVariables); -#line 2133 "VBNET.ATG" +#line 2139 "VBNET.ATG" groupJoinClause.JoinClause = joinClause; groupJoinClause.EndLocation = t.EndLocation; } void GroupByQueryOperator( -#line 2107 "VBNET.ATG" +#line 2113 "VBNET.ATG" out QueryExpressionGroupVBClause groupByClause) { -#line 2109 "VBNET.ATG" +#line 2115 "VBNET.ATG" groupByClause = new QueryExpressionGroupVBClause(); groupByClause.StartLocation = la.Location; Expect(120); ExpressionRangeVariableDeclarationList( -#line 2112 "VBNET.ATG" +#line 2118 "VBNET.ATG" groupByClause.GroupVariables); Expect(57); ExpressionRangeVariableDeclarationList( -#line 2113 "VBNET.ATG" +#line 2119 "VBNET.ATG" groupByClause.ByVariables); Expect(130); ExpressionRangeVariableDeclarationList( -#line 2114 "VBNET.ATG" +#line 2120 "VBNET.ATG" groupByClause.IntoVariables); -#line 2116 "VBNET.ATG" +#line 2122 "VBNET.ATG" SetParent(groupByClause.GroupVariables, groupByClause); SetParent(groupByClause.ByVariables, groupByClause); SetParent(groupByClause.IntoVariables, groupByClause); @@ -5295,118 +5316,118 @@ groupByClause.IntoVariables); } void OrderExpressionList( -#line 2076 "VBNET.ATG" +#line 2082 "VBNET.ATG" out List orderings) { -#line 2078 "VBNET.ATG" +#line 2084 "VBNET.ATG" orderings = new List(); QueryExpressionOrdering ordering = null; OrderExpression( -#line 2081 "VBNET.ATG" +#line 2087 "VBNET.ATG" out ordering); -#line 2082 "VBNET.ATG" +#line 2088 "VBNET.ATG" orderings.Add(ordering); while (la.kind == 12) { lexer.NextToken(); OrderExpression( -#line 2084 "VBNET.ATG" +#line 2090 "VBNET.ATG" out ordering); -#line 2085 "VBNET.ATG" +#line 2091 "VBNET.ATG" orderings.Add(ordering); } } void OrderExpression( -#line 2089 "VBNET.ATG" +#line 2095 "VBNET.ATG" out QueryExpressionOrdering ordering) { -#line 2091 "VBNET.ATG" +#line 2097 "VBNET.ATG" ordering = new QueryExpressionOrdering(); ordering.StartLocation = la.Location; ordering.Direction = QueryExpressionOrderingDirection.None; Expression orderExpr = null; Expr( -#line 2096 "VBNET.ATG" +#line 2102 "VBNET.ATG" out orderExpr); -#line 2098 "VBNET.ATG" +#line 2104 "VBNET.ATG" ordering.Criteria = orderExpr; if (la.kind == 51 || la.kind == 91) { if (la.kind == 51) { lexer.NextToken(); -#line 2101 "VBNET.ATG" +#line 2107 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Ascending; } else { lexer.NextToken(); -#line 2102 "VBNET.ATG" +#line 2108 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Descending; } } -#line 2104 "VBNET.ATG" +#line 2110 "VBNET.ATG" ordering.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclarationList( -#line 2237 "VBNET.ATG" +#line 2243 "VBNET.ATG" List variables) { -#line 2239 "VBNET.ATG" +#line 2245 "VBNET.ATG" ExpressionRangeVariable variable = null; ExpressionRangeVariableDeclaration( -#line 2241 "VBNET.ATG" +#line 2247 "VBNET.ATG" out variable); -#line 2242 "VBNET.ATG" +#line 2248 "VBNET.ATG" variables.Add(variable); while (la.kind == 12) { lexer.NextToken(); ExpressionRangeVariableDeclaration( -#line 2243 "VBNET.ATG" +#line 2249 "VBNET.ATG" out variable); -#line 2243 "VBNET.ATG" +#line 2249 "VBNET.ATG" variables.Add(variable); } } void CollectionRangeVariableDeclarationList( -#line 2296 "VBNET.ATG" +#line 2302 "VBNET.ATG" List middleClauses) { -#line 2298 "VBNET.ATG" +#line 2304 "VBNET.ATG" QueryExpressionFromClause fromClause = null; CollectionRangeVariableDeclaration( -#line 2300 "VBNET.ATG" +#line 2306 "VBNET.ATG" out fromClause); -#line 2301 "VBNET.ATG" +#line 2307 "VBNET.ATG" middleClauses.Add(fromClause); while (la.kind == 12) { lexer.NextToken(); CollectionRangeVariableDeclaration( -#line 2302 "VBNET.ATG" +#line 2308 "VBNET.ATG" out fromClause); -#line 2302 "VBNET.ATG" +#line 2308 "VBNET.ATG" middleClauses.Add(fromClause); } } void CollectionRangeVariableDeclaration( -#line 2305 "VBNET.ATG" +#line 2311 "VBNET.ATG" out QueryExpressionFromClause fromClause) { -#line 2307 "VBNET.ATG" +#line 2313 "VBNET.ATG" fromClause = new QueryExpressionFromClause(); fromClause.StartLocation = la.Location; TypeReference typeName = null; @@ -5416,66 +5437,66 @@ out QueryExpressionFromClause fromClause) { if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 2313 "VBNET.ATG" +#line 2319 "VBNET.ATG" out typeName); -#line 2313 "VBNET.ATG" +#line 2319 "VBNET.ATG" fromClause.Type = typeName; } Expect(125); Expr( -#line 2314 "VBNET.ATG" +#line 2320 "VBNET.ATG" out inExpr); -#line 2316 "VBNET.ATG" +#line 2322 "VBNET.ATG" fromClause.InExpression = inExpr; fromClause.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclaration( -#line 2246 "VBNET.ATG" +#line 2252 "VBNET.ATG" out ExpressionRangeVariable variable) { -#line 2248 "VBNET.ATG" +#line 2254 "VBNET.ATG" variable = new ExpressionRangeVariable(); variable.StartLocation = la.Location; Expression rhs = null; TypeReference typeName = null; if ( -#line 2254 "VBNET.ATG" +#line 2260 "VBNET.ATG" IsIdentifiedExpressionRange()) { Identifier(); -#line 2255 "VBNET.ATG" +#line 2261 "VBNET.ATG" variable.Identifier = t.val; if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 2257 "VBNET.ATG" +#line 2263 "VBNET.ATG" out typeName); -#line 2258 "VBNET.ATG" +#line 2264 "VBNET.ATG" variable.Type = typeName; } Expect(10); } Expr( -#line 2262 "VBNET.ATG" +#line 2268 "VBNET.ATG" out rhs); -#line 2264 "VBNET.ATG" +#line 2270 "VBNET.ATG" variable.Expression = rhs; variable.EndLocation = t.EndLocation; } void JoinCondition( -#line 2321 "VBNET.ATG" +#line 2327 "VBNET.ATG" out QueryExpressionJoinConditionVB condition) { -#line 2323 "VBNET.ATG" +#line 2329 "VBNET.ATG" condition = new QueryExpressionJoinConditionVB(); condition.StartLocation = la.Location; @@ -5483,14 +5504,14 @@ out QueryExpressionJoinConditionVB condition) { Expression rhs = null; Expr( -#line 2329 "VBNET.ATG" +#line 2335 "VBNET.ATG" out lhs); Expect(103); Expr( -#line 2329 "VBNET.ATG" +#line 2335 "VBNET.ATG" out rhs); -#line 2331 "VBNET.ATG" +#line 2337 "VBNET.ATG" condition.LeftSide = lhs; condition.RightSide = rhs; condition.EndLocation = t.EndLocation; @@ -5498,69 +5519,69 @@ out rhs); } void Argument( -#line 2392 "VBNET.ATG" +#line 2398 "VBNET.ATG" out Expression argumentexpr) { -#line 2394 "VBNET.ATG" +#line 2400 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 2398 "VBNET.ATG" +#line 2404 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 2398 "VBNET.ATG" +#line 2404 "VBNET.ATG" name = t.val; Expect(11); Expect(10); Expr( -#line 2398 "VBNET.ATG" +#line 2404 "VBNET.ATG" out expr); -#line 2400 "VBNET.ATG" +#line 2406 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); } else if (StartOf(29)) { Expr( -#line 2403 "VBNET.ATG" +#line 2409 "VBNET.ATG" out argumentexpr); } else SynErr(267); } void QualIdentAndTypeArguments( -#line 2469 "VBNET.ATG" +#line 2475 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2470 "VBNET.ATG" +#line 2476 "VBNET.ATG" string name; typeref = null; Qualident( -#line 2472 "VBNET.ATG" +#line 2478 "VBNET.ATG" out name); -#line 2473 "VBNET.ATG" +#line 2479 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 2474 "VBNET.ATG" +#line 2480 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(155); if ( -#line 2476 "VBNET.ATG" +#line 2482 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2477 "VBNET.ATG" +#line 2483 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 12) { lexer.NextToken(); -#line 2478 "VBNET.ATG" +#line 2484 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } } else if (StartOf(7)) { TypeArgumentList( -#line 2479 "VBNET.ATG" +#line 2485 "VBNET.ATG" typeref.GenericTypes); } else SynErr(268); Expect(26); @@ -5568,24 +5589,24 @@ typeref.GenericTypes); } void RankList( -#line 2516 "VBNET.ATG" +#line 2522 "VBNET.ATG" out int i) { -#line 2517 "VBNET.ATG" +#line 2523 "VBNET.ATG" i = 0; while (la.kind == 12) { lexer.NextToken(); -#line 2518 "VBNET.ATG" +#line 2524 "VBNET.ATG" ++i; } } void Attribute( -#line 2557 "VBNET.ATG" +#line 2563 "VBNET.ATG" out ASTAttribute attribute) { -#line 2558 "VBNET.ATG" +#line 2564 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -5595,15 +5616,15 @@ out ASTAttribute attribute) { Expect(16); } Qualident( -#line 2563 "VBNET.ATG" +#line 2569 "VBNET.ATG" out name); if (la.kind == 25) { AttributeArguments( -#line 2564 "VBNET.ATG" +#line 2570 "VBNET.ATG" positional, named); } -#line 2566 "VBNET.ATG" +#line 2572 "VBNET.ATG" attribute = new ASTAttribute(name, positional, named); SetParent(positional, attribute); SetParent(named, attribute); @@ -5611,26 +5632,26 @@ positional, named); } void AttributeArguments( -#line 2573 "VBNET.ATG" +#line 2579 "VBNET.ATG" List positional, List named) { -#line 2575 "VBNET.ATG" +#line 2581 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(25); if ( -#line 2581 "VBNET.ATG" +#line 2587 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2583 "VBNET.ATG" +#line 2589 "VBNET.ATG" IsNamedAssign()) { -#line 2583 "VBNET.ATG" +#line 2589 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2584 "VBNET.ATG" +#line 2590 "VBNET.ATG" out name); if (la.kind == 11) { lexer.NextToken(); @@ -5638,10 +5659,10 @@ out name); Expect(10); } Expr( -#line 2586 "VBNET.ATG" +#line 2592 "VBNET.ATG" out expr); -#line 2588 "VBNET.ATG" +#line 2594 "VBNET.ATG" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } @@ -5650,13 +5671,13 @@ out expr); while (la.kind == 12) { lexer.NextToken(); if ( -#line 2596 "VBNET.ATG" +#line 2602 "VBNET.ATG" IsNamedAssign()) { -#line 2596 "VBNET.ATG" +#line 2602 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2597 "VBNET.ATG" +#line 2603 "VBNET.ATG" out name); if (la.kind == 11) { lexer.NextToken(); @@ -5664,14 +5685,14 @@ out name); Expect(10); } else if (StartOf(29)) { -#line 2599 "VBNET.ATG" +#line 2605 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); } else SynErr(269); Expr( -#line 2600 "VBNET.ATG" +#line 2606 "VBNET.ATG" out expr); -#line 2600 "VBNET.ATG" +#line 2606 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -5682,10 +5703,10 @@ out expr); } void FormalParameter( -#line 2657 "VBNET.ATG" +#line 2663 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2659 "VBNET.ATG" +#line 2665 "VBNET.ATG" AttributeSection section; List attributes = new List(); TypeReference type = null; @@ -5696,36 +5717,36 @@ out ParameterDeclarationExpression p) { while (la.kind == 28) { AttributeSection( -#line 2668 "VBNET.ATG" +#line 2674 "VBNET.ATG" out section); -#line 2668 "VBNET.ATG" +#line 2674 "VBNET.ATG" attributes.Add(section); } while (StartOf(35)) { ParameterModifier( -#line 2669 "VBNET.ATG" +#line 2675 "VBNET.ATG" mod); } Identifier(); -#line 2670 "VBNET.ATG" +#line 2676 "VBNET.ATG" string parameterName = t.val; if ( -#line 2671 "VBNET.ATG" +#line 2677 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2671 "VBNET.ATG" +#line 2677 "VBNET.ATG" out arrayModifiers); } if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 2672 "VBNET.ATG" +#line 2678 "VBNET.ATG" out type); } -#line 2674 "VBNET.ATG" +#line 2680 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -5741,11 +5762,11 @@ out type); if (la.kind == 10) { lexer.NextToken(); Expr( -#line 2686 "VBNET.ATG" +#line 2692 "VBNET.ATG" out expr); } -#line 2688 "VBNET.ATG" +#line 2694 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); p.Attributes = attributes; @@ -5753,34 +5774,34 @@ out expr); } void ParameterModifier( -#line 3380 "VBNET.ATG" +#line 3386 "VBNET.ATG" ParamModifierList m) { if (la.kind == 59) { lexer.NextToken(); -#line 3381 "VBNET.ATG" +#line 3387 "VBNET.ATG" m.Add(ParameterModifiers.In); } else if (la.kind == 56) { lexer.NextToken(); -#line 3382 "VBNET.ATG" +#line 3388 "VBNET.ATG" m.Add(ParameterModifiers.Ref); } else if (la.kind == 160) { lexer.NextToken(); -#line 3383 "VBNET.ATG" +#line 3389 "VBNET.ATG" m.Add(ParameterModifiers.Optional); } else if (la.kind == 167) { lexer.NextToken(); -#line 3384 "VBNET.ATG" +#line 3390 "VBNET.ATG" m.Add(ParameterModifiers.Params); } else SynErr(270); } void Statement() { -#line 2717 "VBNET.ATG" +#line 2723 "VBNET.ATG" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -5788,27 +5809,27 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 11) { } else if ( -#line 2723 "VBNET.ATG" +#line 2729 "VBNET.ATG" IsLabel()) { LabelName( -#line 2723 "VBNET.ATG" +#line 2729 "VBNET.ATG" out label); -#line 2725 "VBNET.ATG" +#line 2731 "VBNET.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(11); Statement(); } else if (StartOf(36)) { EmbeddedStatement( -#line 2728 "VBNET.ATG" +#line 2734 "VBNET.ATG" out stmt); -#line 2728 "VBNET.ATG" +#line 2734 "VBNET.ATG" compilationUnit.AddChild(stmt); } else SynErr(271); -#line 2731 "VBNET.ATG" +#line 2737 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -5817,30 +5838,30 @@ out stmt); } void LabelName( -#line 3155 "VBNET.ATG" +#line 3161 "VBNET.ATG" out string name) { -#line 3157 "VBNET.ATG" +#line 3163 "VBNET.ATG" name = String.Empty; if (StartOf(14)) { Identifier(); -#line 3159 "VBNET.ATG" +#line 3165 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 3160 "VBNET.ATG" +#line 3166 "VBNET.ATG" name = t.val; } else SynErr(272); } void EmbeddedStatement( -#line 2771 "VBNET.ATG" +#line 2777 "VBNET.ATG" out Statement statement) { -#line 2773 "VBNET.ATG" +#line 2779 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5850,225 +5871,225 @@ out Statement statement) { if (la.kind == 107) { lexer.NextToken(); -#line 2779 "VBNET.ATG" +#line 2785 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 195: { lexer.NextToken(); -#line 2781 "VBNET.ATG" +#line 2787 "VBNET.ATG" exitType = ExitType.Sub; break; } case 114: { lexer.NextToken(); -#line 2783 "VBNET.ATG" +#line 2789 "VBNET.ATG" exitType = ExitType.Function; break; } case 171: { lexer.NextToken(); -#line 2785 "VBNET.ATG" +#line 2791 "VBNET.ATG" exitType = ExitType.Property; break; } case 95: { lexer.NextToken(); -#line 2787 "VBNET.ATG" +#line 2793 "VBNET.ATG" exitType = ExitType.Do; break; } case 111: { lexer.NextToken(); -#line 2789 "VBNET.ATG" +#line 2795 "VBNET.ATG" exitType = ExitType.For; break; } case 203: { lexer.NextToken(); -#line 2791 "VBNET.ATG" +#line 2797 "VBNET.ATG" exitType = ExitType.Try; break; } case 216: { lexer.NextToken(); -#line 2793 "VBNET.ATG" +#line 2799 "VBNET.ATG" exitType = ExitType.While; break; } case 182: { lexer.NextToken(); -#line 2795 "VBNET.ATG" +#line 2801 "VBNET.ATG" exitType = ExitType.Select; break; } default: SynErr(273); break; } -#line 2797 "VBNET.ATG" +#line 2803 "VBNET.ATG" statement = new ExitStatement(exitType); } else if (la.kind == 203) { TryStatement( -#line 2798 "VBNET.ATG" +#line 2804 "VBNET.ATG" out statement); } else if (la.kind == 76) { lexer.NextToken(); -#line 2799 "VBNET.ATG" +#line 2805 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 95 || la.kind == 111 || la.kind == 216) { if (la.kind == 95) { lexer.NextToken(); -#line 2799 "VBNET.ATG" +#line 2805 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 111) { lexer.NextToken(); -#line 2799 "VBNET.ATG" +#line 2805 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2799 "VBNET.ATG" +#line 2805 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2799 "VBNET.ATG" +#line 2805 "VBNET.ATG" statement = new ContinueStatement(continueType); } else if (la.kind == 200) { lexer.NextToken(); if (StartOf(29)) { Expr( -#line 2801 "VBNET.ATG" +#line 2807 "VBNET.ATG" out expr); } -#line 2801 "VBNET.ATG" +#line 2807 "VBNET.ATG" statement = new ThrowStatement(expr); } else if (la.kind == 180) { lexer.NextToken(); if (StartOf(29)) { Expr( -#line 2803 "VBNET.ATG" +#line 2809 "VBNET.ATG" out expr); } -#line 2803 "VBNET.ATG" +#line 2809 "VBNET.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 196) { lexer.NextToken(); Expr( -#line 2805 "VBNET.ATG" +#line 2811 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2805 "VBNET.ATG" +#line 2811 "VBNET.ATG" out embeddedStatement); Expect(100); Expect(196); -#line 2806 "VBNET.ATG" +#line 2812 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 174) { lexer.NextToken(); Identifier(); -#line 2808 "VBNET.ATG" +#line 2814 "VBNET.ATG" name = t.val; if (la.kind == 25) { lexer.NextToken(); if (StartOf(37)) { ArgumentList( -#line 2809 "VBNET.ATG" +#line 2815 "VBNET.ATG" out p); } Expect(26); } -#line 2811 "VBNET.ATG" +#line 2817 "VBNET.ATG" statement = new RaiseEventStatement(name, p); SetParent(p, statement); } else if (la.kind == 218) { WithStatement( -#line 2815 "VBNET.ATG" +#line 2821 "VBNET.ATG" out statement); } else if (la.kind == 43) { lexer.NextToken(); -#line 2817 "VBNET.ATG" +#line 2823 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2818 "VBNET.ATG" +#line 2824 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2818 "VBNET.ATG" +#line 2824 "VBNET.ATG" out handlerExpr); -#line 2820 "VBNET.ATG" +#line 2826 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); } else if (la.kind == 178) { lexer.NextToken(); -#line 2823 "VBNET.ATG" +#line 2829 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2824 "VBNET.ATG" +#line 2830 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2824 "VBNET.ATG" +#line 2830 "VBNET.ATG" out handlerExpr); -#line 2826 "VBNET.ATG" +#line 2832 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); } else if (la.kind == 216) { lexer.NextToken(); Expr( -#line 2829 "VBNET.ATG" +#line 2835 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2830 "VBNET.ATG" +#line 2836 "VBNET.ATG" out embeddedStatement); Expect(100); Expect(216); -#line 2832 "VBNET.ATG" +#line 2838 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 95) { lexer.NextToken(); -#line 2837 "VBNET.ATG" +#line 2843 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 209 || la.kind == 216) { WhileOrUntil( -#line 2840 "VBNET.ATG" +#line 2846 "VBNET.ATG" out conditionType); Expr( -#line 2840 "VBNET.ATG" +#line 2846 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2841 "VBNET.ATG" +#line 2847 "VBNET.ATG" out embeddedStatement); Expect(138); -#line 2844 "VBNET.ATG" +#line 2850 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -6077,26 +6098,26 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 11) { EndOfStmt(); Block( -#line 2851 "VBNET.ATG" +#line 2857 "VBNET.ATG" out embeddedStatement); Expect(138); if (la.kind == 209 || la.kind == 216) { WhileOrUntil( -#line 2852 "VBNET.ATG" +#line 2858 "VBNET.ATG" out conditionType); Expr( -#line 2852 "VBNET.ATG" +#line 2858 "VBNET.ATG" out expr); } -#line 2854 "VBNET.ATG" +#line 2860 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); } else SynErr(274); } else if (la.kind == 111) { lexer.NextToken(); -#line 2859 "VBNET.ATG" +#line 2865 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -6105,24 +6126,24 @@ out expr); if (la.kind == 97) { lexer.NextToken(); LoopControlVariable( -#line 2866 "VBNET.ATG" +#line 2872 "VBNET.ATG" out typeReference, out typeName); Expect(125); Expr( -#line 2867 "VBNET.ATG" +#line 2873 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2868 "VBNET.ATG" +#line 2874 "VBNET.ATG" out embeddedStatement); Expect(149); if (StartOf(29)) { Expr( -#line 2869 "VBNET.ATG" +#line 2875 "VBNET.ATG" out expr); } -#line 2871 "VBNET.ATG" +#line 2877 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -6134,7 +6155,7 @@ out expr); } else if (StartOf(38)) { -#line 2882 "VBNET.ATG" +#line 2888 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; @@ -6143,59 +6164,59 @@ out expr); List nextExpressions = null; if ( -#line 2889 "VBNET.ATG" +#line 2895 "VBNET.ATG" IsLoopVariableDeclaration()) { LoopControlVariable( -#line 2890 "VBNET.ATG" +#line 2896 "VBNET.ATG" out typeReference, out typeName); } else { -#line 2892 "VBNET.ATG" +#line 2898 "VBNET.ATG" typeReference = null; typeName = null; SimpleExpr( -#line 2893 "VBNET.ATG" +#line 2899 "VBNET.ATG" out variableExpr); } Expect(10); Expr( -#line 2895 "VBNET.ATG" +#line 2901 "VBNET.ATG" out start); Expect(201); Expr( -#line 2895 "VBNET.ATG" +#line 2901 "VBNET.ATG" out end); if (la.kind == 190) { lexer.NextToken(); Expr( -#line 2895 "VBNET.ATG" +#line 2901 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 2896 "VBNET.ATG" +#line 2902 "VBNET.ATG" out embeddedStatement); Expect(149); if (StartOf(29)) { Expr( -#line 2899 "VBNET.ATG" +#line 2905 "VBNET.ATG" out nextExpr); -#line 2901 "VBNET.ATG" +#line 2907 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2904 "VBNET.ATG" +#line 2910 "VBNET.ATG" out nextExpr); -#line 2904 "VBNET.ATG" +#line 2910 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 2907 "VBNET.ATG" +#line 2913 "VBNET.ATG" statement = new ForNextStatement { TypeReference = typeReference, VariableName = typeName, @@ -6212,27 +6233,27 @@ out nextExpr); } else if (la.kind == 105) { lexer.NextToken(); Expr( -#line 2921 "VBNET.ATG" +#line 2927 "VBNET.ATG" out expr); -#line 2921 "VBNET.ATG" +#line 2927 "VBNET.ATG" statement = new ErrorStatement(expr); } else if (la.kind == 176) { lexer.NextToken(); -#line 2923 "VBNET.ATG" +#line 2929 "VBNET.ATG" bool isPreserve = false; if (la.kind == 169) { lexer.NextToken(); -#line 2923 "VBNET.ATG" +#line 2929 "VBNET.ATG" isPreserve = true; } ReDimClause( -#line 2924 "VBNET.ATG" +#line 2930 "VBNET.ATG" out expr); -#line 2926 "VBNET.ATG" +#line 2932 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); @@ -6240,48 +6261,48 @@ out expr); while (la.kind == 12) { lexer.NextToken(); ReDimClause( -#line 2930 "VBNET.ATG" +#line 2936 "VBNET.ATG" out expr); -#line 2931 "VBNET.ATG" +#line 2937 "VBNET.ATG" SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); } } else if (la.kind == 104) { lexer.NextToken(); Expr( -#line 2935 "VBNET.ATG" +#line 2941 "VBNET.ATG" out expr); -#line 2937 "VBNET.ATG" +#line 2943 "VBNET.ATG" EraseStatement eraseStatement = new EraseStatement(); if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr);} while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2940 "VBNET.ATG" +#line 2946 "VBNET.ATG" out expr); -#line 2940 "VBNET.ATG" +#line 2946 "VBNET.ATG" if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr); } } -#line 2941 "VBNET.ATG" +#line 2947 "VBNET.ATG" statement = eraseStatement; } else if (la.kind == 191) { lexer.NextToken(); -#line 2943 "VBNET.ATG" +#line 2949 "VBNET.ATG" statement = new StopStatement(); } else if ( -#line 2945 "VBNET.ATG" +#line 2951 "VBNET.ATG" la.kind == Tokens.If) { Expect(122); -#line 2946 "VBNET.ATG" +#line 2952 "VBNET.ATG" Location ifStartLocation = t.Location; Expr( -#line 2946 "VBNET.ATG" +#line 2952 "VBNET.ATG" out expr); if (la.kind == 199) { lexer.NextToken(); @@ -6289,46 +6310,46 @@ out expr); if (la.kind == 1 || la.kind == 11) { EndOfStmt(); Block( -#line 2949 "VBNET.ATG" +#line 2955 "VBNET.ATG" out embeddedStatement); -#line 2951 "VBNET.ATG" +#line 2957 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; Location elseIfStart; while (la.kind == 99 || -#line 2957 "VBNET.ATG" +#line 2963 "VBNET.ATG" IsElseIf()) { if ( -#line 2957 "VBNET.ATG" +#line 2963 "VBNET.ATG" IsElseIf()) { Expect(98); -#line 2957 "VBNET.ATG" +#line 2963 "VBNET.ATG" elseIfStart = t.Location; Expect(122); } else { lexer.NextToken(); -#line 2958 "VBNET.ATG" +#line 2964 "VBNET.ATG" elseIfStart = t.Location; } -#line 2960 "VBNET.ATG" +#line 2966 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 2961 "VBNET.ATG" +#line 2967 "VBNET.ATG" out condition); if (la.kind == 199) { lexer.NextToken(); } EndOfStmt(); Block( -#line 2962 "VBNET.ATG" +#line 2968 "VBNET.ATG" out block); -#line 2964 "VBNET.ATG" +#line 2970 "VBNET.ATG" ElseIfSection elseIfSection = new ElseIfSection(condition, block); elseIfSection.StartLocation = elseIfStart; elseIfSection.EndLocation = t.Location; @@ -6340,43 +6361,43 @@ out block); lexer.NextToken(); EndOfStmt(); Block( -#line 2973 "VBNET.ATG" +#line 2979 "VBNET.ATG" out embeddedStatement); -#line 2975 "VBNET.ATG" +#line 2981 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(100); Expect(122); -#line 2979 "VBNET.ATG" +#line 2985 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else if (StartOf(39)) { -#line 2984 "VBNET.ATG" +#line 2990 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr); ifStatement.StartLocation = ifStartLocation; SingleLineStatementList( -#line 2987 "VBNET.ATG" +#line 2993 "VBNET.ATG" ifStatement.TrueStatement); -#line 2989 "VBNET.ATG" +#line 2995 "VBNET.ATG" SetParent(ifStatement.TrueStatement, ifStatement); if (la.kind == 98) { lexer.NextToken(); if (StartOf(39)) { SingleLineStatementList( -#line 2993 "VBNET.ATG" +#line 2999 "VBNET.ATG" ifStatement.FalseStatement); } } -#line 2995 "VBNET.ATG" +#line 3001 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; } else SynErr(276); } else if (la.kind == 182) { @@ -6385,46 +6406,46 @@ ifStatement.FalseStatement); lexer.NextToken(); } Expr( -#line 2998 "VBNET.ATG" +#line 3004 "VBNET.ATG" out expr); EndOfStmt(); -#line 2999 "VBNET.ATG" +#line 3005 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 61) { -#line 3003 "VBNET.ATG" +#line 3009 "VBNET.ATG" List caseClauses = null; Location caseLocation = la.Location; lexer.NextToken(); CaseClauses( -#line 3004 "VBNET.ATG" +#line 3010 "VBNET.ATG" out caseClauses); if ( -#line 3004 "VBNET.ATG" +#line 3010 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 3006 "VBNET.ATG" +#line 3012 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); SetParent(caseClauses, selectSection); selectSection.StartLocation = caseLocation; Block( -#line 3010 "VBNET.ATG" +#line 3016 "VBNET.ATG" out block); -#line 3012 "VBNET.ATG" +#line 3018 "VBNET.ATG" selectSection.Children = block.Children; selectSection.EndLocation = t.EndLocation; selectSections.Add(selectSection); } -#line 3018 "VBNET.ATG" +#line 3024 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); SetParent(selectSections, statement); @@ -6432,37 +6453,37 @@ out block); Expect(182); } else if (la.kind == 157) { -#line 3022 "VBNET.ATG" +#line 3028 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 3023 "VBNET.ATG" +#line 3029 "VBNET.ATG" out onErrorStatement); -#line 3023 "VBNET.ATG" +#line 3029 "VBNET.ATG" statement = onErrorStatement; } else if (la.kind == 119) { -#line 3024 "VBNET.ATG" +#line 3030 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 3025 "VBNET.ATG" +#line 3031 "VBNET.ATG" out goToStatement); -#line 3025 "VBNET.ATG" +#line 3031 "VBNET.ATG" statement = goToStatement; } else if (la.kind == 179) { -#line 3026 "VBNET.ATG" +#line 3032 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 3027 "VBNET.ATG" +#line 3033 "VBNET.ATG" out resumeStatement); -#line 3027 "VBNET.ATG" +#line 3033 "VBNET.ATG" statement = resumeStatement; } else if (StartOf(38)) { -#line 3030 "VBNET.ATG" +#line 3036 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -6470,25 +6491,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 3036 "VBNET.ATG" +#line 3042 "VBNET.ATG" out expr); if (StartOf(40)) { AssignmentOperator( -#line 3038 "VBNET.ATG" +#line 3044 "VBNET.ATG" out op); Expr( -#line 3038 "VBNET.ATG" +#line 3044 "VBNET.ATG" out val); -#line 3038 "VBNET.ATG" +#line 3044 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 1 || la.kind == 11 || la.kind == 98) { -#line 3039 "VBNET.ATG" +#line 3045 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(277); -#line 3042 "VBNET.ATG" +#line 3048 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is MemberReferenceExpression || expr is IdentifierExpression) { @@ -6499,64 +6520,64 @@ out val); } else if (la.kind == 60) { lexer.NextToken(); SimpleExpr( -#line 3049 "VBNET.ATG" +#line 3055 "VBNET.ATG" out expr); -#line 3049 "VBNET.ATG" +#line 3055 "VBNET.ATG" statement = new ExpressionStatement(expr); } else if (la.kind == 211) { lexer.NextToken(); -#line 3051 "VBNET.ATG" +#line 3057 "VBNET.ATG" Statement block; if ( -#line 3052 "VBNET.ATG" +#line 3058 "VBNET.ATG" Peek(1).kind == Tokens.As) { -#line 3053 "VBNET.ATG" +#line 3059 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 3054 "VBNET.ATG" +#line 3060 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 3056 "VBNET.ATG" +#line 3062 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 3058 "VBNET.ATG" +#line 3064 "VBNET.ATG" out block); -#line 3060 "VBNET.ATG" +#line 3066 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); SetParent(resourceAquisition.Variables, resourceAquisition); } else if (StartOf(29)) { Expr( -#line 3063 "VBNET.ATG" +#line 3069 "VBNET.ATG" out expr); Block( -#line 3064 "VBNET.ATG" +#line 3070 "VBNET.ATG" out block); -#line 3065 "VBNET.ATG" +#line 3071 "VBNET.ATG" statement = new UsingStatement(new ExpressionStatement(expr), block); } else SynErr(278); Expect(100); Expect(211); } else if (StartOf(41)) { LocalDeclarationStatement( -#line 3068 "VBNET.ATG" +#line 3074 "VBNET.ATG" out statement); } else SynErr(279); } void LocalDeclarationStatement( -#line 2739 "VBNET.ATG" +#line 2745 "VBNET.ATG" out Statement statement) { -#line 2741 "VBNET.ATG" +#line 2747 "VBNET.ATG" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -6565,22 +6586,22 @@ out Statement statement) { if (la.kind == 75) { lexer.NextToken(); -#line 2747 "VBNET.ATG" +#line 2753 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); } else if (la.kind == 189) { lexer.NextToken(); -#line 2748 "VBNET.ATG" +#line 2754 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 2749 "VBNET.ATG" +#line 2755 "VBNET.ATG" dimfound = true; } } -#line 2752 "VBNET.ATG" +#line 2758 "VBNET.ATG" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -6593,136 +6614,136 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2763 "VBNET.ATG" +#line 2769 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2764 "VBNET.ATG" +#line 2770 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2766 "VBNET.ATG" +#line 2772 "VBNET.ATG" SetParent(localVariableDeclaration.Variables, localVariableDeclaration); statement = localVariableDeclaration; } void TryStatement( -#line 3270 "VBNET.ATG" +#line 3276 "VBNET.ATG" out Statement tryStatement) { -#line 3272 "VBNET.ATG" +#line 3278 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(203); EndOfStmt(); Block( -#line 3275 "VBNET.ATG" +#line 3281 "VBNET.ATG" out blockStmt); if (la.kind == 62 || la.kind == 100 || la.kind == 110) { CatchClauses( -#line 3276 "VBNET.ATG" +#line 3282 "VBNET.ATG" out catchClauses); } if (la.kind == 110) { lexer.NextToken(); EndOfStmt(); Block( -#line 3277 "VBNET.ATG" +#line 3283 "VBNET.ATG" out finallyStmt); } Expect(100); Expect(203); -#line 3280 "VBNET.ATG" +#line 3286 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 3250 "VBNET.ATG" +#line 3256 "VBNET.ATG" out Statement withStatement) { -#line 3252 "VBNET.ATG" +#line 3258 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(218); -#line 3255 "VBNET.ATG" +#line 3261 "VBNET.ATG" Location start = t.Location; Expr( -#line 3256 "VBNET.ATG" +#line 3262 "VBNET.ATG" out expr); EndOfStmt(); -#line 3258 "VBNET.ATG" +#line 3264 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 3261 "VBNET.ATG" +#line 3267 "VBNET.ATG" out blockStmt); -#line 3263 "VBNET.ATG" +#line 3269 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; Expect(100); Expect(218); -#line 3266 "VBNET.ATG" +#line 3272 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 3243 "VBNET.ATG" +#line 3249 "VBNET.ATG" out ConditionType conditionType) { -#line 3244 "VBNET.ATG" +#line 3250 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 216) { lexer.NextToken(); -#line 3245 "VBNET.ATG" +#line 3251 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 209) { lexer.NextToken(); -#line 3246 "VBNET.ATG" +#line 3252 "VBNET.ATG" conditionType = ConditionType.Until; } else SynErr(280); } void LoopControlVariable( -#line 3085 "VBNET.ATG" +#line 3091 "VBNET.ATG" out TypeReference type, out string name) { -#line 3086 "VBNET.ATG" +#line 3092 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 3090 "VBNET.ATG" +#line 3096 "VBNET.ATG" out name); if ( -#line 3091 "VBNET.ATG" +#line 3097 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 3091 "VBNET.ATG" +#line 3097 "VBNET.ATG" out arrayModifiers); } if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 3092 "VBNET.ATG" +#line 3098 "VBNET.ATG" out type); -#line 3092 "VBNET.ATG" +#line 3098 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 3094 "VBNET.ATG" +#line 3100 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -6734,34 +6755,34 @@ out type); } void ReDimClause( -#line 3164 "VBNET.ATG" +#line 3170 "VBNET.ATG" out Expression expr) { SimpleNonInvocationExpression( -#line 3166 "VBNET.ATG" +#line 3172 "VBNET.ATG" out expr); ReDimClauseInternal( -#line 3167 "VBNET.ATG" +#line 3173 "VBNET.ATG" ref expr); } void SingleLineStatementList( -#line 3071 "VBNET.ATG" +#line 3077 "VBNET.ATG" List list) { -#line 3072 "VBNET.ATG" +#line 3078 "VBNET.ATG" Statement embeddedStatement = null; if (la.kind == 100) { lexer.NextToken(); -#line 3074 "VBNET.ATG" +#line 3080 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(36)) { EmbeddedStatement( -#line 3075 "VBNET.ATG" +#line 3081 "VBNET.ATG" out embeddedStatement); } else SynErr(281); -#line 3076 "VBNET.ATG" +#line 3082 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); while (la.kind == 11) { lexer.NextToken(); @@ -6771,62 +6792,62 @@ out embeddedStatement); if (la.kind == 100) { lexer.NextToken(); -#line 3078 "VBNET.ATG" +#line 3084 "VBNET.ATG" embeddedStatement = new EndStatement(); } else if (StartOf(36)) { EmbeddedStatement( -#line 3079 "VBNET.ATG" +#line 3085 "VBNET.ATG" out embeddedStatement); } else SynErr(282); -#line 3080 "VBNET.ATG" +#line 3086 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); } } void CaseClauses( -#line 3203 "VBNET.ATG" +#line 3209 "VBNET.ATG" out List caseClauses) { -#line 3205 "VBNET.ATG" +#line 3211 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 3208 "VBNET.ATG" +#line 3214 "VBNET.ATG" out caseClause); -#line 3208 "VBNET.ATG" +#line 3214 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 12) { lexer.NextToken(); CaseClause( -#line 3209 "VBNET.ATG" +#line 3215 "VBNET.ATG" out caseClause); -#line 3209 "VBNET.ATG" +#line 3215 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 3105 "VBNET.ATG" +#line 3111 "VBNET.ATG" out OnErrorStatement stmt) { -#line 3107 "VBNET.ATG" +#line 3113 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(157); Expect(105); if ( -#line 3113 "VBNET.ATG" +#line 3119 "VBNET.ATG" IsNegativeLabelName()) { Expect(119); Expect(18); Expect(5); -#line 3115 "VBNET.ATG" +#line 3121 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -6835,10 +6856,10 @@ IsNegativeLabelName()) { } else if (la.kind == 119) { GotoStatement( -#line 3121 "VBNET.ATG" +#line 3127 "VBNET.ATG" out goToStatement); -#line 3123 "VBNET.ATG" +#line 3129 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -6855,88 +6876,88 @@ out goToStatement); lexer.NextToken(); Expect(149); -#line 3137 "VBNET.ATG" +#line 3143 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); } else SynErr(283); } void GotoStatement( -#line 3143 "VBNET.ATG" +#line 3149 "VBNET.ATG" out GotoStatement goToStatement) { -#line 3145 "VBNET.ATG" +#line 3151 "VBNET.ATG" string label = String.Empty; Expect(119); LabelName( -#line 3148 "VBNET.ATG" +#line 3154 "VBNET.ATG" out label); -#line 3150 "VBNET.ATG" +#line 3156 "VBNET.ATG" goToStatement = new GotoStatement(label); } void ResumeStatement( -#line 3192 "VBNET.ATG" +#line 3198 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 3194 "VBNET.ATG" +#line 3200 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 3197 "VBNET.ATG" +#line 3203 "VBNET.ATG" IsResumeNext()) { Expect(179); Expect(149); -#line 3198 "VBNET.ATG" +#line 3204 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 179) { lexer.NextToken(); if (StartOf(42)) { LabelName( -#line 3199 "VBNET.ATG" +#line 3205 "VBNET.ATG" out label); } -#line 3199 "VBNET.ATG" +#line 3205 "VBNET.ATG" resumeStatement = new ResumeStatement(label); } else SynErr(284); } void ReDimClauseInternal( -#line 3170 "VBNET.ATG" +#line 3176 "VBNET.ATG" ref Expression expr) { -#line 3171 "VBNET.ATG" +#line 3177 "VBNET.ATG" List arguments; bool canBeNormal; bool canBeRedim; string name; while (la.kind == 16 || -#line 3174 "VBNET.ATG" +#line 3180 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { if (la.kind == 16) { lexer.NextToken(); IdentifierOrKeyword( -#line 3173 "VBNET.ATG" +#line 3179 "VBNET.ATG" out name); -#line 3173 "VBNET.ATG" +#line 3179 "VBNET.ATG" expr = new MemberReferenceExpression(expr, name); } else { InvocationExpression( -#line 3175 "VBNET.ATG" +#line 3181 "VBNET.ATG" ref expr); } } Expect(25); NormalOrReDimArgumentList( -#line 3178 "VBNET.ATG" +#line 3184 "VBNET.ATG" out arguments, out canBeNormal, out canBeRedim); Expect(26); -#line 3180 "VBNET.ATG" +#line 3186 "VBNET.ATG" expr = new InvocationExpression(expr, arguments); SetParent(arguments, expr); if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { @@ -6949,10 +6970,10 @@ out arguments, out canBeNormal, out canBeRedim); } void CaseClause( -#line 3213 "VBNET.ATG" +#line 3219 "VBNET.ATG" out CaseLabel caseClause) { -#line 3215 "VBNET.ATG" +#line 3221 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -6961,7 +6982,7 @@ out CaseLabel caseClause) { if (la.kind == 98) { lexer.NextToken(); -#line 3221 "VBNET.ATG" +#line 3227 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(43)) { if (la.kind == 131) { @@ -6971,76 +6992,76 @@ out CaseLabel caseClause) { case 28: { lexer.NextToken(); -#line 3225 "VBNET.ATG" +#line 3231 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 27: { lexer.NextToken(); -#line 3226 "VBNET.ATG" +#line 3232 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 31: { lexer.NextToken(); -#line 3227 "VBNET.ATG" +#line 3233 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 30: { lexer.NextToken(); -#line 3228 "VBNET.ATG" +#line 3234 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 10: { lexer.NextToken(); -#line 3229 "VBNET.ATG" +#line 3235 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 29: { lexer.NextToken(); -#line 3230 "VBNET.ATG" +#line 3236 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } default: SynErr(285); break; } Expr( -#line 3232 "VBNET.ATG" +#line 3238 "VBNET.ATG" out expr); -#line 3234 "VBNET.ATG" +#line 3240 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(29)) { Expr( -#line 3236 "VBNET.ATG" +#line 3242 "VBNET.ATG" out expr); if (la.kind == 201) { lexer.NextToken(); Expr( -#line 3236 "VBNET.ATG" +#line 3242 "VBNET.ATG" out sexpr); } -#line 3238 "VBNET.ATG" +#line 3244 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); } else SynErr(286); } void CatchClauses( -#line 3285 "VBNET.ATG" +#line 3291 "VBNET.ATG" out List catchClauses) { -#line 3287 "VBNET.ATG" +#line 3293 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -7052,27 +7073,27 @@ out List catchClauses) { if (StartOf(14)) { Identifier(); -#line 3295 "VBNET.ATG" +#line 3301 "VBNET.ATG" name = t.val; if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 3295 "VBNET.ATG" +#line 3301 "VBNET.ATG" out type); } } if (la.kind == 214) { lexer.NextToken(); Expr( -#line 3296 "VBNET.ATG" +#line 3302 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 3298 "VBNET.ATG" +#line 3304 "VBNET.ATG" out blockStmt); -#line 3299 "VBNET.ATG" +#line 3305 "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 bd7eb24ca4..389e9663ed 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -437,7 +437,7 @@ NonModuleDeclaration attributes> newType.Type = ClassType.Class; .) Identifier (. newType.Name = t.val; .) - TypeParameterList + TypeParameterList (. SetParent(newType.Templates, newType); .) EndOfStmt (. newType.BodyStartLocation = t.Location; .) [ ClassBaseType (. newType.BaseTypes.Add(typeRef); .) ] @@ -474,7 +474,7 @@ NonModuleDeclaration attributes> newType.Type = ClassType.Struct; .) Identifier (. newType.Name = t.val; .) - TypeParameterList + TypeParameterList (. SetParent(newType.Templates, newType); .) EndOfStmt (. newType.BodyStartLocation = t.Location; .) { TypeImplementsClause (. newType.BaseTypes.AddRange(baseInterfaces);.) } @@ -512,7 +512,7 @@ NonModuleDeclaration attributes> newType.Type = ClassType.Interface; .) Identifier (. newType.Name = t.val; .) - TypeParameterList + TypeParameterList (. SetParent(newType.Templates, newType); .) EndOfStmt (. newType.BodyStartLocation = t.Location; .) { InterfaceBase (. newType.BaseTypes.AddRange(baseInterfaces); .) } @@ -531,11 +531,11 @@ NonModuleDeclaration attributes> .) ( "Sub" Identifier (. delegateDeclr.Name = t.val; .) - TypeParameterList + TypeParameterList (. SetParent(delegateDeclr.Templates, delegateDeclr); .) [ "(" [ FormalParameterList

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

] ")" (. delegateDeclr.Parameters = p; .) ] [ "As" (. TypeReference type; .) TypeName (. delegateDeclr.ReturnType = type; .)] ) @@ -683,6 +683,7 @@ InterfaceMemberDecl EndLocation = t.EndLocation, Templates = templates }; + SetParent(templates, md); compilationUnit.AddChild(md); .) | @@ -710,6 +711,7 @@ InterfaceMemberDecl md.StartLocation = startLocation; md.EndLocation = t.EndLocation; md.Templates = templates; + SetParent(templates, md); compilationUnit.AddChild(md); .) EndOfStmt @@ -822,6 +824,7 @@ StructureMemberDecl attributes> HandlesClause = handlesClause, InterfaceImplementations = implementsClause }; + SetParent(templates, methodDeclaration); compilationUnit.AddChild(methodDeclaration); .) | @@ -835,6 +838,7 @@ StructureMemberDecl attributes> HandlesClause = handlesClause, InterfaceImplementations = implementsClause }; + SetParent(templates, methodDeclaration); compilationUnit.AddChild(methodDeclaration); .) @@ -918,6 +922,7 @@ StructureMemberDecl attributes> Templates = templates, InterfaceImplementations = implementsClause }; + SetParent(templates, methodDeclaration); if (returnTypeAttributeSection != null) { returnTypeAttributeSection.AttributeTarget = "return"; methodDeclaration.Attributes.Add(returnTypeAttributeSection); @@ -936,6 +941,7 @@ StructureMemberDecl attributes> HandlesClause = handlesClause, InterfaceImplementations = implementsClause }; + SetParent(templates, methodDeclaration); if (returnTypeAttributeSection != null) { returnTypeAttributeSection.AttributeTarget = "return"; methodDeclaration.Attributes.Add(returnTypeAttributeSection); diff --git a/src/Libraries/NRefactory/Test/Parser/CheckParentVisitor.cs b/src/Libraries/NRefactory/Test/Parser/CheckParentVisitor.cs index 33a19c2599..91468c9f80 100644 --- a/src/Libraries/NRefactory/Test/Parser/CheckParentVisitor.cs +++ b/src/Libraries/NRefactory/Test/Parser/CheckParentVisitor.cs @@ -33,14 +33,13 @@ namespace ICSharpCode.NRefactory.Tests.Ast protected override void EndVisit(INode node) { - Assert.AreEqual(node, nodeStack.Pop(), "nodeStack was corrupted!"); + Assert.AreSame(node, nodeStack.Pop(), "nodeStack was corrupted!"); if (StrictCheck || !(node is TypeReference) && !(node is InterfaceImplementation) - && !(node is PropertyGetSetRegion) && !(node is ParameterDeclarationExpression) - && !(node is TemplateDefinition) && !(node is EventAddRemoveRegion) + && !(node is ParameterDeclarationExpression) && !(node is ICSharpCode.NRefactory.Ast.Attribute) && !(node is AttributeSection)) { - Assert.AreEqual(nodeStack.Peek(), node.Parent, "node " + node + " is missing parent: " + nodeStack.Peek()); + Assert.AreSame(nodeStack.Peek(), node.Parent, "node " + node + " is missing parent: " + nodeStack.Peek()); } } }