From 84f0895b3bb42461fc7ef6e46063cfe3a001285c Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 14 Feb 2010 17:32:41 +0000 Subject: [PATCH] Added support for default parameters and variance annotations to C# parser. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5507 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- samples/NRefactoryDemo/NRefactoryDemo.csproj | 5 +- src/Libraries/NRefactory/NRefactory.sln | 2 +- .../NRefactoryASTGenerator/AST/GlobalLevel.cs | 4 + .../NRefactoryASTGenerator.csproj | 5 +- .../NRefactory/Project/NRefactory.csproj | 5 +- .../NRefactory/Project/NRefactory.csproj.user | 3 +- .../NRefactory/Project/Src/Ast/Enums.cs | 7 + .../NRefactory/Project/Src/Ast/Generated.cs | 21 +- .../NRefactory/Project/Src/IAstVisitor.cs | 2 +- .../Project/Src/Lexer/CSharp/Lexer.cs | 12 +- .../Project/Src/Parser/CSharp/Parser.cs | 2357 +++++++++-------- .../Project/Src/Parser/CSharp/cs.ATG | 63 +- .../Project/Src/Parser/VBNet/Parser.cs | 9 +- .../CSharp/CSharpOutputVisitor.cs | 21 +- .../Src/Visitors/AbstractASTVisitor.cs | 2 +- .../Src/Visitors/AbstractAstTransformer.cs | 2 +- .../Src/Visitors/NodeTrackingAstVisitor.cs | 2 +- .../Src/Visitors/NotImplementedAstVisitor.cs | 2 +- .../Test/Lexer/CSharp/PreprocessingTests.cs | 4 +- .../NRefactory/Test/NRefactoryTests.csproj | 5 +- .../Test/Output/CSharp/CSharpOutputTest.cs | 12 + .../TypeLevel/MethodDeclarationTests.cs | 19 + 22 files changed, 1323 insertions(+), 1241 deletions(-) diff --git a/samples/NRefactoryDemo/NRefactoryDemo.csproj b/samples/NRefactoryDemo/NRefactoryDemo.csproj index 0e8ab42646..d3fbad7f3b 100644 --- a/samples/NRefactoryDemo/NRefactoryDemo.csproj +++ b/samples/NRefactoryDemo/NRefactoryDemo.csproj @@ -1,4 +1,5 @@ - + + WinExe NRefactoryDemo @@ -7,7 +8,7 @@ AnyCPU {63199047-9D5D-474C-B3CC-62ABBB071B67} C:\Users\Siegfried\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis - v4.0 + v3.5 obj\ diff --git a/src/Libraries/NRefactory/NRefactory.sln b/src/Libraries/NRefactory/NRefactory.sln index 6622ce37b1..30513b2045 100644 --- a/src/Libraries/NRefactory/NRefactory.sln +++ b/src/Libraries/NRefactory/NRefactory.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -# SharpDevelop 3.0.0.3337 +# SharpDevelop 4.0.0.5490 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryTests", "Test\NRefactoryTests.csproj", "{870115DD-960A-4406-A6B9-600BCDC36A03}" diff --git a/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/GlobalLevel.cs b/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/GlobalLevel.cs index f0f5b185e5..c273a0b367 100644 --- a/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/GlobalLevel.cs +++ b/src/Libraries/NRefactory/NRefactoryASTGenerator/AST/GlobalLevel.cs @@ -21,12 +21,16 @@ namespace NRefactoryASTGenerator.Ast public NamespaceDeclaration(string name) {} } + enum VarianceModifier { Invariant, Covariant, Contravariant }; + class TemplateDefinition : AttributedNode { [QuestionMarkDefault] string name; + VarianceModifier varianceModifier; List bases; + public TemplateDefinition() {} public TemplateDefinition(string name, List attributes) : base(attributes) {} } diff --git a/src/Libraries/NRefactory/NRefactoryASTGenerator/NRefactoryASTGenerator.csproj b/src/Libraries/NRefactory/NRefactoryASTGenerator/NRefactoryASTGenerator.csproj index 8f663d361d..d99a607a0c 100644 --- a/src/Libraries/NRefactory/NRefactoryASTGenerator/NRefactoryASTGenerator.csproj +++ b/src/Libraries/NRefactory/NRefactoryASTGenerator/NRefactoryASTGenerator.csproj @@ -1,4 +1,5 @@ - + + Exe NRefactoryASTGenerator @@ -16,7 +17,7 @@ 4 0169 false - v4.0 + v3.5 bin\Debug\ diff --git a/src/Libraries/NRefactory/Project/NRefactory.csproj b/src/Libraries/NRefactory/Project/NRefactory.csproj index 31509bafdb..c67e5ba440 100644 --- a/src/Libraries/NRefactory/Project/NRefactory.csproj +++ b/src/Libraries/NRefactory/Project/NRefactory.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -23,7 +24,7 @@ 4096 False -Microsoft.Design#CA1002;-Microsoft.Design#CA1020;-Microsoft.Design#CA1051;-Microsoft.Design#CA1062;-Microsoft.Globalization#CA1303;-Microsoft.Globalization#CA1305;-Microsoft.Naming#CA1704;-Microsoft.Performance#CA1800;-Microsoft.Performance#CA1805;-Microsoft.Usage#CA2211;-Microsoft.Usage#CA2227 - v4.0 + v3.5 False diff --git a/src/Libraries/NRefactory/Project/NRefactory.csproj.user b/src/Libraries/NRefactory/Project/NRefactory.csproj.user index e8726311fe..00ec70e298 100644 --- a/src/Libraries/NRefactory/Project/NRefactory.csproj.user +++ b/src/Libraries/NRefactory/Project/NRefactory.csproj.user @@ -1,4 +1,5 @@ - + + 8.0.41115 ShowAllFiles diff --git a/src/Libraries/NRefactory/Project/Src/Ast/Enums.cs b/src/Libraries/NRefactory/Project/Src/Ast/Enums.cs index 3fffc01098..eaa718f2e7 100644 --- a/src/Libraries/NRefactory/Project/Src/Ast/Enums.cs +++ b/src/Libraries/NRefactory/Project/Src/Ast/Enums.cs @@ -119,6 +119,13 @@ namespace ICSharpCode.NRefactory.Ast Optional = 16 } + public enum VarianceModifier + { + Invariant, + Covariant, + Contravariant + }; + public enum AssignmentOperatorType { None, diff --git a/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs b/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs index 457ae9648c..1426feeece 100644 --- a/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs +++ b/src/Libraries/NRefactory/Project/Src/Ast/Generated.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.20506.1 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -4740,6 +4740,8 @@ public Location ExtendedEndLocation { get; set; } string name; + VarianceModifier varianceModifier; + List bases; public string Name { @@ -4751,6 +4753,15 @@ public Location ExtendedEndLocation { get; set; } } } + public VarianceModifier VarianceModifier { + get { + return varianceModifier; + } + set { + varianceModifier = value; + } + } + public List Bases { get { return bases; @@ -4760,6 +4771,11 @@ public Location ExtendedEndLocation { get; set; } } } + public TemplateDefinition() { + name = "?"; + bases = new List(); + } + public TemplateDefinition(string name, List attributes) { Name = name; Attributes = attributes; @@ -4771,7 +4787,8 @@ public Location ExtendedEndLocation { get; set; } } public override string ToString() { - return string.Format("[TemplateDefinition Name={0} Bases={1} Attributes={2} Modifier={3}]", Name, GetCollectionString(Bases), GetCollectionString(Attributes), Modifier); + return string.Format("[TemplateDefinition Name={0} VarianceModifier={1} Bases={2} Attributes={3} Modifi" + + "er={4}]", Name, VarianceModifier, GetCollectionString(Bases), GetCollectionString(Attributes), Modifier); } } diff --git a/src/Libraries/NRefactory/Project/Src/IAstVisitor.cs b/src/Libraries/NRefactory/Project/Src/IAstVisitor.cs index cd17de9b0c..be52db676b 100644 --- a/src/Libraries/NRefactory/Project/Src/IAstVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/IAstVisitor.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.20506.1 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs b/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs index bb7f9c3378..4518cff1a2 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs +++ b/src/Libraries/NRefactory/Project/Src/Lexer/CSharp/Lexer.cs @@ -23,7 +23,6 @@ namespace ICSharpCode.NRefactory.Parser.CSharp protected override Token Next() { - int nextChar; char ch; bool hadLineEnd = false; if (Line == 1 && Col == 1) { @@ -31,7 +30,12 @@ namespace ICSharpCode.NRefactory.Parser.CSharp hadLineEnd = true; // beginning of document } - while ((nextChar = ReaderRead()) != -1) { + while (true) { + Location startLocation = new Location(Col, Line); + int nextChar = ReaderRead(); + if (nextChar == -1) + break; + Token token; switch (nextChar) { @@ -40,12 +44,12 @@ namespace ICSharpCode.NRefactory.Parser.CSharp continue; case '\r': case '\n': + HandleLineEnd((char)nextChar); if (hadLineEnd) { // second line end before getting to a token // -> here was a blank line - specialTracker.AddEndOfLine(new Location(Col, Line)); + specialTracker.AddEndOfLine(startLocation); } - HandleLineEnd((char)nextChar); hadLineEnd = true; isAtLineBegin = true; continue; diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs index 3c78839d1b..a2f2a297b3 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs @@ -487,68 +487,68 @@ out expr); } void Expr( -#line 1763 "cs.ATG" +#line 1755 "cs.ATG" out Expression expr) { -#line 1764 "cs.ATG" +#line 1756 "cs.ATG" expr = null; Expression expr1 = null, expr2 = null; AssignmentOperatorType op; -#line 1766 "cs.ATG" +#line 1758 "cs.ATG" Location startLocation = la.Location; UnaryExpr( -#line 1767 "cs.ATG" +#line 1759 "cs.ATG" out expr); if (StartOf(7)) { AssignmentOperator( -#line 1770 "cs.ATG" +#line 1762 "cs.ATG" out op); Expr( -#line 1770 "cs.ATG" +#line 1762 "cs.ATG" out expr1); -#line 1770 "cs.ATG" +#line 1762 "cs.ATG" expr = new AssignmentExpression(expr, op, expr1); } else if ( -#line 1771 "cs.ATG" +#line 1763 "cs.ATG" la.kind == Tokens.GreaterThan && Peek(1).kind == Tokens.GreaterEqual) { AssignmentOperator( -#line 1772 "cs.ATG" +#line 1764 "cs.ATG" out op); Expr( -#line 1772 "cs.ATG" +#line 1764 "cs.ATG" out expr1); -#line 1772 "cs.ATG" +#line 1764 "cs.ATG" expr = new AssignmentExpression(expr, op, expr1); } else if (StartOf(8)) { ConditionalOrExpr( -#line 1774 "cs.ATG" +#line 1766 "cs.ATG" ref expr); if (la.kind == 13) { lexer.NextToken(); Expr( -#line 1775 "cs.ATG" +#line 1767 "cs.ATG" out expr1); -#line 1775 "cs.ATG" +#line 1767 "cs.ATG" expr = new BinaryOperatorExpression(expr, BinaryOperatorType.NullCoalescing, expr1); } if (la.kind == 12) { lexer.NextToken(); Expr( -#line 1776 "cs.ATG" +#line 1768 "cs.ATG" out expr1); Expect(9); Expr( -#line 1776 "cs.ATG" +#line 1768 "cs.ATG" out expr2); -#line 1776 "cs.ATG" +#line 1768 "cs.ATG" expr = new ConditionalExpression(expr, expr1, expr2); } } else SynErr(150); -#line 1779 "cs.ATG" +#line 1771 "cs.ATG" if (expr != null) { if (expr.StartLocation.IsEmpty) expr.StartLocation = startLocation; @@ -626,76 +626,76 @@ out attribute); } void TypeModifier( -#line 686 "cs.ATG" +#line 678 "cs.ATG" ModifierList m) { switch (la.kind) { case 89: { lexer.NextToken(); -#line 688 "cs.ATG" +#line 680 "cs.ATG" m.Add(Modifiers.New, t.Location); break; } case 98: { lexer.NextToken(); -#line 689 "cs.ATG" +#line 681 "cs.ATG" m.Add(Modifiers.Public, t.Location); break; } case 97: { lexer.NextToken(); -#line 690 "cs.ATG" +#line 682 "cs.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 84: { lexer.NextToken(); -#line 691 "cs.ATG" +#line 683 "cs.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 96: { lexer.NextToken(); -#line 692 "cs.ATG" +#line 684 "cs.ATG" m.Add(Modifiers.Private, t.Location); break; } case 119: { lexer.NextToken(); -#line 693 "cs.ATG" +#line 685 "cs.ATG" m.Add(Modifiers.Unsafe, t.Location); break; } case 49: { lexer.NextToken(); -#line 694 "cs.ATG" +#line 686 "cs.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 103: { lexer.NextToken(); -#line 695 "cs.ATG" +#line 687 "cs.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 107: { lexer.NextToken(); -#line 696 "cs.ATG" +#line 688 "cs.ATG" m.Add(Modifiers.Static, t.Location); break; } case 126: { lexer.NextToken(); -#line 697 "cs.ATG" +#line 689 "cs.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -952,40 +952,27 @@ templates); } void TypeParameterList( -#line 2344 "cs.ATG" +#line 2336 "cs.ATG" List templates) { -#line 2346 "cs.ATG" - AttributeSection section; - List attributes = new List(); +#line 2338 "cs.ATG" + TemplateDefinition template; Expect(23); - while (la.kind == 18) { - AttributeSection( -#line 2350 "cs.ATG" -out section); - -#line 2350 "cs.ATG" - attributes.Add(section); - } - Identifier(); + VariantTypeParameter( +#line 2342 "cs.ATG" +out template); -#line 2351 "cs.ATG" - templates.Add(new TemplateDefinition(t.val, attributes)); +#line 2342 "cs.ATG" + templates.Add(template); while (la.kind == 14) { lexer.NextToken(); - while (la.kind == 18) { - AttributeSection( -#line 2352 "cs.ATG" -out section); - -#line 2352 "cs.ATG" - attributes.Add(section); - } - Identifier(); + VariantTypeParameter( +#line 2344 "cs.ATG" +out template); -#line 2353 "cs.ATG" - templates.Add(new TemplateDefinition(t.val, attributes)); +#line 2344 "cs.ATG" + templates.Add(template); } Expect(22); } @@ -1017,22 +1004,22 @@ out typeRef, false); } void TypeParameterConstraintsClause( -#line 2357 "cs.ATG" +#line 2364 "cs.ATG" List templates) { -#line 2358 "cs.ATG" +#line 2365 "cs.ATG" string name = ""; TypeReference type; Expect(127); Identifier(); -#line 2361 "cs.ATG" +#line 2368 "cs.ATG" name = t.val; Expect(9); TypeParameterConstraintsClauseBase( -#line 2363 "cs.ATG" +#line 2370 "cs.ATG" out type); -#line 2364 "cs.ATG" +#line 2371 "cs.ATG" TemplateDefinition td = null; foreach (TemplateDefinition d in templates) { if (d.Name == name) { @@ -1045,10 +1032,10 @@ out type); while (la.kind == 14) { lexer.NextToken(); TypeParameterConstraintsClauseBase( -#line 2373 "cs.ATG" +#line 2380 "cs.ATG" out type); -#line 2374 "cs.ATG" +#line 2381 "cs.ATG" td = null; foreach (TemplateDefinition d in templates) { if (d.Name == name) { @@ -1180,72 +1167,72 @@ out typeRef, false); } void IntegralType( -#line 708 "cs.ATG" +#line 700 "cs.ATG" out string name) { -#line 708 "cs.ATG" +#line 700 "cs.ATG" name = ""; switch (la.kind) { case 102: { lexer.NextToken(); -#line 710 "cs.ATG" +#line 702 "cs.ATG" name = "System.SByte"; break; } case 54: { lexer.NextToken(); -#line 711 "cs.ATG" +#line 703 "cs.ATG" name = "System.Byte"; break; } case 104: { lexer.NextToken(); -#line 712 "cs.ATG" +#line 704 "cs.ATG" name = "System.Int16"; break; } case 120: { lexer.NextToken(); -#line 713 "cs.ATG" +#line 705 "cs.ATG" name = "System.UInt16"; break; } case 82: { lexer.NextToken(); -#line 714 "cs.ATG" +#line 706 "cs.ATG" name = "System.Int32"; break; } case 116: { lexer.NextToken(); -#line 715 "cs.ATG" +#line 707 "cs.ATG" name = "System.UInt32"; break; } case 87: { lexer.NextToken(); -#line 716 "cs.ATG" +#line 708 "cs.ATG" name = "System.Int64"; break; } case 117: { lexer.NextToken(); -#line 717 "cs.ATG" +#line 709 "cs.ATG" name = "System.UInt64"; break; } case 57: { lexer.NextToken(); -#line 718 "cs.ATG" +#line 710 "cs.ATG" name = "System.Char"; break; } @@ -1308,110 +1295,91 @@ out section); #line 638 "cs.ATG" attributes.Add(section); } - if (StartOf(18)) { - FixedParameter( -#line 640 "cs.ATG" + FixedParameter( +#line 639 "cs.ATG" out p); -#line 640 "cs.ATG" - bool paramsFound = false; - p.Attributes = attributes; - parameter.Add(p); - - while (la.kind == 14) { - lexer.NextToken(); +#line 639 "cs.ATG" + p.Attributes = attributes; + parameter.Add(p); + + while (la.kind == 14) { + lexer.NextToken(); -#line 645 "cs.ATG" - attributes = new List(); if (paramsFound) Error("params array must be at end of parameter list"); - while (la.kind == 18) { - AttributeSection( -#line 646 "cs.ATG" +#line 643 "cs.ATG" + attributes = new List(); + while (la.kind == 18) { + AttributeSection( +#line 644 "cs.ATG" out section); -#line 646 "cs.ATG" - attributes.Add(section); - } - if (StartOf(18)) { - FixedParameter( -#line 648 "cs.ATG" -out p); - -#line 648 "cs.ATG" - p.Attributes = attributes; parameter.Add(p); - } else if (la.kind == 95) { - ParameterArray( -#line 649 "cs.ATG" -out p); - -#line 649 "cs.ATG" - paramsFound = true; p.Attributes = attributes; parameter.Add(p); - } else SynErr(157); +#line 644 "cs.ATG" + attributes.Add(section); } - } else if (la.kind == 95) { - ParameterArray( -#line 652 "cs.ATG" + FixedParameter( +#line 645 "cs.ATG" out p); -#line 652 "cs.ATG" +#line 645 "cs.ATG" p.Attributes = attributes; parameter.Add(p); - } else SynErr(158); + } } void ClassType( -#line 700 "cs.ATG" +#line 692 "cs.ATG" out TypeReference typeRef, bool canBeUnbound) { -#line 701 "cs.ATG" +#line 693 "cs.ATG" TypeReference r; typeRef = null; - if (StartOf(19)) { + if (StartOf(18)) { TypeName( -#line 703 "cs.ATG" +#line 695 "cs.ATG" out r, canBeUnbound); -#line 703 "cs.ATG" +#line 695 "cs.ATG" typeRef = r; } else if (la.kind == 91) { lexer.NextToken(); -#line 704 "cs.ATG" +#line 696 "cs.ATG" typeRef = new TypeReference("System.Object", true); typeRef.StartLocation = t.Location; } else if (la.kind == 108) { lexer.NextToken(); -#line 705 "cs.ATG" +#line 697 "cs.ATG" typeRef = new TypeReference("System.String", true); typeRef.StartLocation = t.Location; - } else SynErr(159); + } else SynErr(157); } void TypeName( -#line 2285 "cs.ATG" +#line 2277 "cs.ATG" out TypeReference typeRef, bool canBeUnbound) { -#line 2286 "cs.ATG" +#line 2278 "cs.ATG" List typeArguments = null; string alias = null; string qualident; Location startLocation = la.Location; if ( -#line 2292 "cs.ATG" +#line 2284 "cs.ATG" IdentAndDoubleColon()) { Identifier(); -#line 2293 "cs.ATG" +#line 2285 "cs.ATG" alias = t.val; Expect(10); } Qualident( -#line 2296 "cs.ATG" +#line 2288 "cs.ATG" out qualident); if (la.kind == 23) { TypeArgumentList( -#line 2297 "cs.ATG" +#line 2289 "cs.ATG" out typeArguments, canBeUnbound); } -#line 2299 "cs.ATG" +#line 2291 "cs.ATG" if (alias == null) { typeRef = new TypeReference(qualident, typeArguments); } else if (alias == "global") { @@ -1422,143 +1390,143 @@ out typeArguments, canBeUnbound); } while ( -#line 2308 "cs.ATG" +#line 2300 "cs.ATG" DotAndIdent()) { Expect(15); -#line 2309 "cs.ATG" +#line 2301 "cs.ATG" typeArguments = null; Qualident( -#line 2310 "cs.ATG" +#line 2302 "cs.ATG" out qualident); if (la.kind == 23) { TypeArgumentList( -#line 2311 "cs.ATG" +#line 2303 "cs.ATG" out typeArguments, canBeUnbound); } -#line 2312 "cs.ATG" +#line 2304 "cs.ATG" typeRef = new InnerClassTypeReference(typeRef, qualident, typeArguments); } -#line 2314 "cs.ATG" +#line 2306 "cs.ATG" typeRef.StartLocation = startLocation; } void MemberModifiers( -#line 721 "cs.ATG" +#line 713 "cs.ATG" ModifierList m) { - while (StartOf(20)) { + while (StartOf(19)) { switch (la.kind) { case 49: { lexer.NextToken(); -#line 724 "cs.ATG" +#line 716 "cs.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 71: { lexer.NextToken(); -#line 725 "cs.ATG" +#line 717 "cs.ATG" m.Add(Modifiers.Extern, t.Location); break; } case 84: { lexer.NextToken(); -#line 726 "cs.ATG" +#line 718 "cs.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 89: { lexer.NextToken(); -#line 727 "cs.ATG" +#line 719 "cs.ATG" m.Add(Modifiers.New, t.Location); break; } case 94: { lexer.NextToken(); -#line 728 "cs.ATG" +#line 720 "cs.ATG" m.Add(Modifiers.Override, t.Location); break; } case 96: { lexer.NextToken(); -#line 729 "cs.ATG" +#line 721 "cs.ATG" m.Add(Modifiers.Private, t.Location); break; } case 97: { lexer.NextToken(); -#line 730 "cs.ATG" +#line 722 "cs.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 98: { lexer.NextToken(); -#line 731 "cs.ATG" +#line 723 "cs.ATG" m.Add(Modifiers.Public, t.Location); break; } case 99: { lexer.NextToken(); -#line 732 "cs.ATG" +#line 724 "cs.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 103: { lexer.NextToken(); -#line 733 "cs.ATG" +#line 725 "cs.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 107: { lexer.NextToken(); -#line 734 "cs.ATG" +#line 726 "cs.ATG" m.Add(Modifiers.Static, t.Location); break; } case 74: { lexer.NextToken(); -#line 735 "cs.ATG" +#line 727 "cs.ATG" m.Add(Modifiers.Fixed, t.Location); break; } case 119: { lexer.NextToken(); -#line 736 "cs.ATG" +#line 728 "cs.ATG" m.Add(Modifiers.Unsafe, t.Location); break; } case 122: { lexer.NextToken(); -#line 737 "cs.ATG" +#line 729 "cs.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 124: { lexer.NextToken(); -#line 738 "cs.ATG" +#line 730 "cs.ATG" m.Add(Modifiers.Volatile, t.Location); break; } case 126: { lexer.NextToken(); -#line 739 "cs.ATG" +#line 731 "cs.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -1567,23 +1535,23 @@ ModifierList m) { } void ClassMemberDecl( -#line 1055 "cs.ATG" +#line 1047 "cs.ATG" ModifierList m, List attributes) { -#line 1056 "cs.ATG" +#line 1048 "cs.ATG" Statement stmt = null; - if (StartOf(21)) { + if (StartOf(20)) { StructMemberDecl( -#line 1058 "cs.ATG" +#line 1050 "cs.ATG" m, attributes); } else if (la.kind == 27) { -#line 1059 "cs.ATG" +#line 1051 "cs.ATG" m.Check(Modifiers.Destructors); Location startPos = la.Location; lexer.NextToken(); Identifier(); -#line 1060 "cs.ATG" +#line 1052 "cs.ATG" DestructorDeclaration d = new DestructorDeclaration(t.val, m.Modifier, attributes); d.Modifier = m.Modifier; d.StartLocation = m.GetDeclarationLocation(startPos); @@ -1591,28 +1559,28 @@ m, attributes); Expect(20); Expect(21); -#line 1064 "cs.ATG" +#line 1056 "cs.ATG" d.EndLocation = t.EndLocation; if (la.kind == 16) { Block( -#line 1064 "cs.ATG" +#line 1056 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); - } else SynErr(160); + } else SynErr(158); -#line 1065 "cs.ATG" +#line 1057 "cs.ATG" d.Body = (BlockStatement)stmt; compilationUnit.AddChild(d); - } else SynErr(161); + } else SynErr(159); } void StructMemberDecl( -#line 743 "cs.ATG" +#line 735 "cs.ATG" ModifierList m, List attributes) { -#line 745 "cs.ATG" +#line 737 "cs.ATG" string qualident = null; TypeReference type; Expression expr; @@ -1624,18 +1592,18 @@ ModifierList m, List attributes) { if (la.kind == 60) { -#line 755 "cs.ATG" +#line 747 "cs.ATG" m.Check(Modifiers.Constants); lexer.NextToken(); -#line 756 "cs.ATG" +#line 748 "cs.ATG" Location startPos = t.Location; Type( -#line 757 "cs.ATG" +#line 749 "cs.ATG" out type); Identifier(); -#line 757 "cs.ATG" +#line 749 "cs.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier | Modifiers.Const); fd.StartLocation = m.GetDeclarationLocation(startPos); VariableDeclaration f = new VariableDeclaration(t.val); @@ -1645,16 +1613,16 @@ out type); Expect(3); Expr( -#line 764 "cs.ATG" +#line 756 "cs.ATG" out expr); -#line 764 "cs.ATG" +#line 756 "cs.ATG" f.Initializer = expr; while (la.kind == 14) { lexer.NextToken(); Identifier(); -#line 765 "cs.ATG" +#line 757 "cs.ATG" f = new VariableDeclaration(t.val); f.StartLocation = t.Location; f.TypeReference = type; @@ -1662,63 +1630,63 @@ out expr); Expect(3); Expr( -#line 770 "cs.ATG" +#line 762 "cs.ATG" out expr); -#line 770 "cs.ATG" +#line 762 "cs.ATG" f.EndLocation = t.EndLocation; f.Initializer = expr; } Expect(11); -#line 771 "cs.ATG" +#line 763 "cs.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); } else if ( -#line 775 "cs.ATG" +#line 767 "cs.ATG" NotVoidPointer()) { -#line 775 "cs.ATG" +#line 767 "cs.ATG" m.Check(Modifiers.PropertysEventsMethods); Expect(123); -#line 776 "cs.ATG" +#line 768 "cs.ATG" Location startPos = t.Location; if ( -#line 777 "cs.ATG" +#line 769 "cs.ATG" IsExplicitInterfaceImplementation()) { TypeName( -#line 778 "cs.ATG" +#line 770 "cs.ATG" out explicitInterface, false); -#line 779 "cs.ATG" +#line 771 "cs.ATG" if (la.kind != Tokens.Dot || Peek(1).kind != Tokens.This) { qualident = TypeReference.StripLastIdentifierFromType(ref explicitInterface); } - } else if (StartOf(19)) { + } else if (StartOf(18)) { Identifier(); -#line 782 "cs.ATG" +#line 774 "cs.ATG" qualident = t.val; - } else SynErr(162); + } else SynErr(160); if (la.kind == 23) { TypeParameterList( -#line 785 "cs.ATG" +#line 777 "cs.ATG" templates); } Expect(20); if (la.kind == 111) { lexer.NextToken(); -#line 788 "cs.ATG" +#line 780 "cs.ATG" isExtensionMethod = true; /* C# 3.0 */ } if (StartOf(11)) { FormalParameterList( -#line 789 "cs.ATG" +#line 781 "cs.ATG" p); } Expect(21); -#line 790 "cs.ATG" +#line 782 "cs.ATG" MethodDeclaration methodDeclaration = new MethodDeclaration { Name = qualident, Modifier = m.Modifier, @@ -1737,28 +1705,28 @@ p); while (la.kind == 127) { TypeParameterConstraintsClause( -#line 808 "cs.ATG" +#line 800 "cs.ATG" templates); } if (la.kind == 16) { Block( -#line 810 "cs.ATG" +#line 802 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); - } else SynErr(163); + } else SynErr(161); -#line 810 "cs.ATG" +#line 802 "cs.ATG" compilationUnit.BlockEnd(); methodDeclaration.Body = (BlockStatement)stmt; } else if (la.kind == 69) { -#line 814 "cs.ATG" +#line 806 "cs.ATG" m.Check(Modifiers.PropertysEventsMethods); lexer.NextToken(); -#line 816 "cs.ATG" +#line 808 "cs.ATG" EventDeclaration eventDecl = new EventDeclaration { Modifier = m.Modifier, Attributes = attributes, @@ -1770,113 +1738,113 @@ out stmt); EventRemoveRegion removeBlock = null; Type( -#line 826 "cs.ATG" +#line 818 "cs.ATG" out type); -#line 826 "cs.ATG" +#line 818 "cs.ATG" eventDecl.TypeReference = type; if ( -#line 827 "cs.ATG" +#line 819 "cs.ATG" IsExplicitInterfaceImplementation()) { TypeName( -#line 828 "cs.ATG" +#line 820 "cs.ATG" out explicitInterface, false); -#line 829 "cs.ATG" +#line 821 "cs.ATG" qualident = TypeReference.StripLastIdentifierFromType(ref explicitInterface); -#line 830 "cs.ATG" +#line 822 "cs.ATG" eventDecl.InterfaceImplementations.Add(new InterfaceImplementation(explicitInterface, qualident)); - } else if (StartOf(19)) { + } else if (StartOf(18)) { Identifier(); -#line 832 "cs.ATG" +#line 824 "cs.ATG" qualident = t.val; - } else SynErr(164); + } else SynErr(162); -#line 834 "cs.ATG" +#line 826 "cs.ATG" eventDecl.Name = qualident; eventDecl.EndLocation = t.EndLocation; if (la.kind == 3) { lexer.NextToken(); Expr( -#line 835 "cs.ATG" +#line 827 "cs.ATG" out expr); -#line 835 "cs.ATG" +#line 827 "cs.ATG" eventDecl.Initializer = expr; } if (la.kind == 16) { lexer.NextToken(); -#line 836 "cs.ATG" +#line 828 "cs.ATG" eventDecl.BodyStart = t.Location; EventAccessorDecls( -#line 837 "cs.ATG" +#line 829 "cs.ATG" out addBlock, out removeBlock); Expect(17); -#line 838 "cs.ATG" +#line 830 "cs.ATG" eventDecl.BodyEnd = t.EndLocation; } if (la.kind == 11) { lexer.NextToken(); } -#line 841 "cs.ATG" +#line 833 "cs.ATG" compilationUnit.BlockEnd(); eventDecl.AddRegion = addBlock; eventDecl.RemoveRegion = removeBlock; } else if ( -#line 847 "cs.ATG" +#line 839 "cs.ATG" IdentAndLPar()) { -#line 847 "cs.ATG" +#line 839 "cs.ATG" m.Check(Modifiers.Constructors | Modifiers.StaticConstructors); Identifier(); -#line 848 "cs.ATG" +#line 840 "cs.ATG" string name = t.val; Location startPos = t.Location; Expect(20); if (StartOf(11)) { -#line 848 "cs.ATG" +#line 840 "cs.ATG" m.Check(Modifiers.Constructors); FormalParameterList( -#line 849 "cs.ATG" +#line 841 "cs.ATG" p); } Expect(21); -#line 851 "cs.ATG" +#line 843 "cs.ATG" ConstructorInitializer init = null; if (la.kind == 9) { -#line 852 "cs.ATG" +#line 844 "cs.ATG" m.Check(Modifiers.Constructors); ConstructorInitializer( -#line 853 "cs.ATG" +#line 845 "cs.ATG" out init); } -#line 855 "cs.ATG" +#line 847 "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 860 "cs.ATG" +#line 852 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); - } else SynErr(165); + } else SynErr(163); -#line 860 "cs.ATG" +#line 852 "cs.ATG" cd.Body = (BlockStatement)stmt; compilationUnit.AddChild(cd); } else if (la.kind == 70 || la.kind == 80) { -#line 863 "cs.ATG" +#line 855 "cs.ATG" m.Check(Modifiers.Operators); if (m.isNone) Error("at least one modifier must be set"); bool isImplicit = true; @@ -1885,45 +1853,45 @@ out stmt); if (la.kind == 80) { lexer.NextToken(); -#line 868 "cs.ATG" +#line 860 "cs.ATG" startPos = t.Location; } else { lexer.NextToken(); -#line 868 "cs.ATG" +#line 860 "cs.ATG" isImplicit = false; startPos = t.Location; } Expect(92); Type( -#line 869 "cs.ATG" +#line 861 "cs.ATG" out type); -#line 869 "cs.ATG" +#line 861 "cs.ATG" TypeReference operatorType = type; Expect(20); Type( -#line 870 "cs.ATG" +#line 862 "cs.ATG" out type); Identifier(); -#line 870 "cs.ATG" +#line 862 "cs.ATG" string varName = t.val; Expect(21); -#line 871 "cs.ATG" +#line 863 "cs.ATG" Location endPos = t.Location; if (la.kind == 16) { Block( -#line 872 "cs.ATG" +#line 864 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); -#line 872 "cs.ATG" +#line 864 "cs.ATG" stmt = null; - } else SynErr(166); + } else SynErr(164); -#line 875 "cs.ATG" +#line 867 "cs.ATG" List parameters = new List(); parameters.Add(new ParameterDeclarationExpression(type, varName)); OperatorDeclaration operatorDeclaration = new OperatorDeclaration { @@ -1939,63 +1907,63 @@ out stmt); }; compilationUnit.AddChild(operatorDeclaration); - } else if (StartOf(22)) { + } else if (StartOf(21)) { TypeDecl( -#line 893 "cs.ATG" +#line 885 "cs.ATG" m, attributes); } else if (StartOf(10)) { Type( -#line 895 "cs.ATG" +#line 887 "cs.ATG" out type); -#line 895 "cs.ATG" +#line 887 "cs.ATG" Location startPos = t.Location; if (la.kind == 92) { -#line 897 "cs.ATG" +#line 889 "cs.ATG" OverloadableOperatorType op; m.Check(Modifiers.Operators); if (m.isNone) Error("at least one modifier must be set"); lexer.NextToken(); OverloadableOperator( -#line 901 "cs.ATG" +#line 893 "cs.ATG" out op); -#line 901 "cs.ATG" +#line 893 "cs.ATG" TypeReference firstType, secondType = null; string secondName = null; Expect(20); Type( -#line 902 "cs.ATG" +#line 894 "cs.ATG" out firstType); Identifier(); -#line 902 "cs.ATG" +#line 894 "cs.ATG" string firstName = t.val; if (la.kind == 14) { lexer.NextToken(); Type( -#line 903 "cs.ATG" +#line 895 "cs.ATG" out secondType); Identifier(); -#line 903 "cs.ATG" +#line 895 "cs.ATG" secondName = t.val; } else if (la.kind == 21) { - } else SynErr(167); + } else SynErr(165); -#line 911 "cs.ATG" +#line 903 "cs.ATG" Location endPos = t.Location; Expect(21); if (la.kind == 16) { Block( -#line 912 "cs.ATG" +#line 904 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); - } else SynErr(168); + } else SynErr(166); -#line 914 "cs.ATG" +#line 906 "cs.ATG" if (op == OverloadableOperatorType.Add && secondType == null) op = OverloadableOperatorType.UnaryPlus; if (op == OverloadableOperatorType.Subtract && secondType == null) @@ -2017,75 +1985,75 @@ out stmt); compilationUnit.AddChild(operatorDeclaration); } else if ( -#line 936 "cs.ATG" +#line 928 "cs.ATG" IsVarDecl()) { -#line 937 "cs.ATG" +#line 929 "cs.ATG" m.Check(Modifiers.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(startPos); if ( -#line 941 "cs.ATG" +#line 933 "cs.ATG" m.Contains(Modifiers.Fixed)) { VariableDeclarator( -#line 942 "cs.ATG" +#line 934 "cs.ATG" fd); Expect(18); Expr( -#line 944 "cs.ATG" +#line 936 "cs.ATG" out expr); -#line 944 "cs.ATG" +#line 936 "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 948 "cs.ATG" +#line 940 "cs.ATG" fd); Expect(18); Expr( -#line 950 "cs.ATG" +#line 942 "cs.ATG" out expr); -#line 950 "cs.ATG" +#line 942 "cs.ATG" if (fd.Fields.Count > 0) fd.Fields[fd.Fields.Count-1].FixedArrayInitialization = expr; Expect(19); } - } else if (StartOf(19)) { + } else if (StartOf(18)) { VariableDeclarator( -#line 955 "cs.ATG" +#line 947 "cs.ATG" fd); while (la.kind == 14) { lexer.NextToken(); VariableDeclarator( -#line 956 "cs.ATG" +#line 948 "cs.ATG" fd); } - } else SynErr(169); + } else SynErr(167); Expect(11); -#line 958 "cs.ATG" +#line 950 "cs.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); } else if (la.kind == 111) { -#line 961 "cs.ATG" +#line 953 "cs.ATG" m.Check(Modifiers.Indexers); lexer.NextToken(); Expect(18); FormalParameterList( -#line 962 "cs.ATG" +#line 954 "cs.ATG" p); Expect(19); -#line 962 "cs.ATG" +#line 954 "cs.ATG" Location endLocation = t.EndLocation; Expect(16); -#line 963 "cs.ATG" +#line 955 "cs.ATG" IndexerDeclaration indexer = new IndexerDeclaration(type, p, m.Modifier, attributes); indexer.StartLocation = startPos; indexer.EndLocation = endLocation; @@ -2094,64 +2062,64 @@ p); PropertySetRegion setRegion; AccessorDecls( -#line 970 "cs.ATG" +#line 962 "cs.ATG" out getRegion, out setRegion); Expect(17); -#line 971 "cs.ATG" +#line 963 "cs.ATG" indexer.BodyEnd = t.EndLocation; indexer.GetRegion = getRegion; indexer.SetRegion = setRegion; compilationUnit.AddChild(indexer); } else if ( -#line 976 "cs.ATG" +#line 968 "cs.ATG" IsIdentifierToken(la)) { if ( -#line 977 "cs.ATG" +#line 969 "cs.ATG" IsExplicitInterfaceImplementation()) { TypeName( -#line 978 "cs.ATG" +#line 970 "cs.ATG" out explicitInterface, false); -#line 979 "cs.ATG" +#line 971 "cs.ATG" if (la.kind != Tokens.Dot || Peek(1).kind != Tokens.This) { qualident = TypeReference.StripLastIdentifierFromType(ref explicitInterface); } - } else if (StartOf(19)) { + } else if (StartOf(18)) { Identifier(); -#line 982 "cs.ATG" +#line 974 "cs.ATG" qualident = t.val; - } else SynErr(170); + } else SynErr(168); -#line 984 "cs.ATG" +#line 976 "cs.ATG" Location qualIdentEndLocation = t.EndLocation; if (la.kind == 16 || la.kind == 20 || la.kind == 23) { if (la.kind == 20 || la.kind == 23) { -#line 988 "cs.ATG" +#line 980 "cs.ATG" m.Check(Modifiers.PropertysEventsMethods); if (la.kind == 23) { TypeParameterList( -#line 990 "cs.ATG" +#line 982 "cs.ATG" templates); } Expect(20); if (la.kind == 111) { lexer.NextToken(); -#line 992 "cs.ATG" +#line 984 "cs.ATG" isExtensionMethod = true; } if (StartOf(11)) { FormalParameterList( -#line 993 "cs.ATG" +#line 985 "cs.ATG" p); } Expect(21); -#line 995 "cs.ATG" +#line 987 "cs.ATG" MethodDeclaration methodDeclaration = new MethodDeclaration { Name = qualident, Modifier = m.Modifier, @@ -2169,23 +2137,23 @@ p); while (la.kind == 127) { TypeParameterConstraintsClause( -#line 1010 "cs.ATG" +#line 1002 "cs.ATG" templates); } if (la.kind == 16) { Block( -#line 1011 "cs.ATG" +#line 1003 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); - } else SynErr(171); + } else SynErr(169); -#line 1011 "cs.ATG" +#line 1003 "cs.ATG" methodDeclaration.Body = (BlockStatement)stmt; } else { lexer.NextToken(); -#line 1014 "cs.ATG" +#line 1006 "cs.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(qualident, type, m.Modifier, attributes); if (explicitInterface != null) pDecl.InterfaceImplementations.Add(new InterfaceImplementation(explicitInterface, qualident)); @@ -2196,11 +2164,11 @@ out stmt); PropertySetRegion setRegion; AccessorDecls( -#line 1023 "cs.ATG" +#line 1015 "cs.ATG" out getRegion, out setRegion); Expect(17); -#line 1025 "cs.ATG" +#line 1017 "cs.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.EndLocation; @@ -2209,17 +2177,17 @@ out getRegion, out setRegion); } } else if (la.kind == 15) { -#line 1033 "cs.ATG" +#line 1025 "cs.ATG" m.Check(Modifiers.Indexers); lexer.NextToken(); Expect(111); Expect(18); FormalParameterList( -#line 1034 "cs.ATG" +#line 1026 "cs.ATG" p); Expect(19); -#line 1035 "cs.ATG" +#line 1027 "cs.ATG" IndexerDeclaration indexer = new IndexerDeclaration(type, p, m.Modifier, attributes); indexer.StartLocation = m.GetDeclarationLocation(startPos); indexer.EndLocation = t.EndLocation; @@ -2230,31 +2198,30 @@ p); Expect(16); -#line 1043 "cs.ATG" +#line 1035 "cs.ATG" Location bodyStart = t.Location; AccessorDecls( -#line 1044 "cs.ATG" +#line 1036 "cs.ATG" out getRegion, out setRegion); Expect(17); -#line 1045 "cs.ATG" +#line 1037 "cs.ATG" indexer.BodyStart = bodyStart; indexer.BodyEnd = t.EndLocation; indexer.GetRegion = getRegion; indexer.SetRegion = setRegion; compilationUnit.AddChild(indexer); - } else SynErr(172); - } else SynErr(173); - } else SynErr(174); + } else SynErr(170); + } else SynErr(171); + } else SynErr(172); } void InterfaceMemberDecl() { -#line 1072 "cs.ATG" +#line 1064 "cs.ATG" TypeReference type; - - AttributeSection section; + AttributeSection section; Modifiers mod = Modifiers.None; List attributes = new List(); List parameters = new List(); @@ -2266,49 +2233,49 @@ out getRegion, out setRegion); while (la.kind == 18) { AttributeSection( -#line 1085 "cs.ATG" +#line 1077 "cs.ATG" out section); -#line 1085 "cs.ATG" +#line 1077 "cs.ATG" attributes.Add(section); } if (la.kind == 89) { lexer.NextToken(); -#line 1086 "cs.ATG" +#line 1078 "cs.ATG" mod = Modifiers.New; startLocation = t.Location; } if ( -#line 1089 "cs.ATG" +#line 1081 "cs.ATG" NotVoidPointer()) { Expect(123); -#line 1089 "cs.ATG" +#line 1081 "cs.ATG" if (startLocation.IsEmpty) startLocation = t.Location; Identifier(); -#line 1090 "cs.ATG" +#line 1082 "cs.ATG" name = t.val; if (la.kind == 23) { TypeParameterList( -#line 1091 "cs.ATG" +#line 1083 "cs.ATG" templates); } Expect(20); if (StartOf(11)) { FormalParameterList( -#line 1092 "cs.ATG" +#line 1084 "cs.ATG" parameters); } Expect(21); while (la.kind == 127) { TypeParameterConstraintsClause( -#line 1093 "cs.ATG" +#line 1085 "cs.ATG" templates); } Expect(11); -#line 1095 "cs.ATG" +#line 1087 "cs.ATG" MethodDeclaration md = new MethodDeclaration { Name = name, Modifier = mod, TypeReference = new TypeReference("System.Void", true), Parameters = parameters, Attributes = attributes, Templates = templates, @@ -2316,40 +2283,40 @@ templates); }; compilationUnit.AddChild(md); - } else if (StartOf(23)) { + } else if (StartOf(22)) { if (StartOf(10)) { Type( -#line 1103 "cs.ATG" +#line 1095 "cs.ATG" out type); -#line 1103 "cs.ATG" +#line 1095 "cs.ATG" if (startLocation.IsEmpty) startLocation = t.Location; - if (StartOf(19)) { + if (StartOf(18)) { Identifier(); -#line 1105 "cs.ATG" +#line 1097 "cs.ATG" name = t.val; Location qualIdentEndLocation = t.EndLocation; if (la.kind == 20 || la.kind == 23) { if (la.kind == 23) { TypeParameterList( -#line 1109 "cs.ATG" +#line 1101 "cs.ATG" templates); } Expect(20); if (StartOf(11)) { FormalParameterList( -#line 1110 "cs.ATG" +#line 1102 "cs.ATG" parameters); } Expect(21); while (la.kind == 127) { TypeParameterConstraintsClause( -#line 1112 "cs.ATG" +#line 1104 "cs.ATG" templates); } Expect(11); -#line 1113 "cs.ATG" +#line 1105 "cs.ATG" MethodDeclaration md = new MethodDeclaration { Name = name, Modifier = mod, TypeReference = type, Parameters = parameters, Attributes = attributes, Templates = templates, @@ -2359,58 +2326,58 @@ templates); } else if (la.kind == 16) { -#line 1122 "cs.ATG" +#line 1114 "cs.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod, attributes); compilationUnit.AddChild(pd); lexer.NextToken(); -#line 1125 "cs.ATG" +#line 1117 "cs.ATG" Location bodyStart = t.Location; InterfaceAccessors( -#line 1126 "cs.ATG" +#line 1118 "cs.ATG" out getBlock, out setBlock); Expect(17); -#line 1127 "cs.ATG" +#line 1119 "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 SynErr(173); } else if (la.kind == 111) { lexer.NextToken(); Expect(18); FormalParameterList( -#line 1130 "cs.ATG" +#line 1122 "cs.ATG" parameters); Expect(19); -#line 1131 "cs.ATG" +#line 1123 "cs.ATG" Location bracketEndLocation = t.EndLocation; -#line 1132 "cs.ATG" +#line 1124 "cs.ATG" IndexerDeclaration id = new IndexerDeclaration(type, parameters, mod, attributes); compilationUnit.AddChild(id); Expect(16); -#line 1134 "cs.ATG" +#line 1126 "cs.ATG" Location bodyStart = t.Location; InterfaceAccessors( -#line 1135 "cs.ATG" +#line 1127 "cs.ATG" out getBlock, out setBlock); Expect(17); -#line 1137 "cs.ATG" +#line 1129 "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 SynErr(174); } else { lexer.NextToken(); -#line 1140 "cs.ATG" +#line 1132 "cs.ATG" if (startLocation.IsEmpty) startLocation = t.Location; Type( -#line 1141 "cs.ATG" +#line 1133 "cs.ATG" out type); Identifier(); -#line 1142 "cs.ATG" +#line 1134 "cs.ATG" EventDeclaration ed = new EventDeclaration { TypeReference = type, Name = t.val, Modifier = mod, Attributes = attributes }; @@ -2418,17 +2385,17 @@ out type); Expect(11); -#line 1148 "cs.ATG" +#line 1140 "cs.ATG" ed.StartLocation = startLocation; ed.EndLocation = t.EndLocation; } - } else SynErr(177); + } else SynErr(175); } void EnumMemberDecl( -#line 1153 "cs.ATG" +#line 1145 "cs.ATG" out FieldDeclaration f) { -#line 1155 "cs.ATG" +#line 1147 "cs.ATG" Expression expr = null; List attributes = new List(); AttributeSection section = null; @@ -2436,15 +2403,15 @@ out FieldDeclaration f) { while (la.kind == 18) { AttributeSection( -#line 1161 "cs.ATG" +#line 1153 "cs.ATG" out section); -#line 1161 "cs.ATG" +#line 1153 "cs.ATG" attributes.Add(section); } Identifier(); -#line 1162 "cs.ATG" +#line 1154 "cs.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2454,10 +2421,10 @@ out section); if (la.kind == 3) { lexer.NextToken(); Expr( -#line 1168 "cs.ATG" +#line 1160 "cs.ATG" out expr); -#line 1168 "cs.ATG" +#line 1160 "cs.ATG" varDecl.Initializer = expr; } } @@ -2489,7 +2456,7 @@ out name); #line 573 "cs.ATG" pointer = 1; type = new TypeReference("System.Void", true); - } else SynErr(178); + } else SynErr(176); #line 574 "cs.ATG" List r = new List(); @@ -2523,7 +2490,7 @@ IsPointerOrDims()) { #line 580 "cs.ATG" r.Add(i); - } else SynErr(179); + } else SynErr(177); } #line 583 "cs.ATG" @@ -2542,7 +2509,7 @@ out string name) { #line 620 "cs.ATG" name = String.Empty; - if (StartOf(24)) { + if (StartOf(23)) { IntegralType( #line 622 "cs.ATG" out name); @@ -2566,124 +2533,126 @@ out name); #line 626 "cs.ATG" name = "System.Boolean"; - } else SynErr(180); + } else SynErr(178); } void NullableQuestionMark( -#line 2318 "cs.ATG" +#line 2310 "cs.ATG" ref TypeReference typeRef) { -#line 2319 "cs.ATG" +#line 2311 "cs.ATG" List typeArguments = new List(1); Expect(12); -#line 2323 "cs.ATG" +#line 2315 "cs.ATG" if (typeRef != null) typeArguments.Add(typeRef); typeRef = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; } void FixedParameter( -#line 656 "cs.ATG" +#line 649 "cs.ATG" out ParameterDeclarationExpression p) { -#line 658 "cs.ATG" +#line 651 "cs.ATG" TypeReference type; ParameterModifiers mod = ParameterModifiers.In; Location start = la.Location; + Expression expr; - if (la.kind == 93 || la.kind == 100) { + if (la.kind == 93 || la.kind == 95 || la.kind == 100) { if (la.kind == 100) { lexer.NextToken(); -#line 664 "cs.ATG" +#line 658 "cs.ATG" mod = ParameterModifiers.Ref; - } else { + } else if (la.kind == 93) { lexer.NextToken(); -#line 665 "cs.ATG" +#line 659 "cs.ATG" mod = ParameterModifiers.Out; + } else { + lexer.NextToken(); + +#line 660 "cs.ATG" + mod = ParameterModifiers.Params; } } Type( -#line 667 "cs.ATG" +#line 662 "cs.ATG" out type); Identifier(); -#line 667 "cs.ATG" - p = new ParameterDeclarationExpression(type, t.val, mod); p.StartLocation = start; p.EndLocation = t.Location; - } - - void ParameterArray( -#line 670 "cs.ATG" -out ParameterDeclarationExpression p) { +#line 663 "cs.ATG" + p = new ParameterDeclarationExpression(type, t.val, mod); + if (la.kind == 3) { + lexer.NextToken(); + Expr( +#line 664 "cs.ATG" +out expr); -#line 671 "cs.ATG" - TypeReference type; - Expect(95); - Type( -#line 673 "cs.ATG" -out type); - Identifier(); +#line 664 "cs.ATG" + p.DefaultValue = expr; p.ParamModifier |= ParameterModifiers.Optional; + } -#line 673 "cs.ATG" - p = new ParameterDeclarationExpression(type, t.val, ParameterModifiers.Params); +#line 665 "cs.ATG" + p.StartLocation = start; p.EndLocation = t.EndLocation; } void AccessorModifiers( -#line 676 "cs.ATG" +#line 668 "cs.ATG" out ModifierList m) { -#line 677 "cs.ATG" +#line 669 "cs.ATG" m = new ModifierList(); if (la.kind == 96) { lexer.NextToken(); -#line 679 "cs.ATG" +#line 671 "cs.ATG" m.Add(Modifiers.Private, t.Location); } else if (la.kind == 97) { lexer.NextToken(); -#line 680 "cs.ATG" +#line 672 "cs.ATG" m.Add(Modifiers.Protected, t.Location); if (la.kind == 84) { lexer.NextToken(); -#line 681 "cs.ATG" +#line 673 "cs.ATG" m.Add(Modifiers.Internal, t.Location); } } else if (la.kind == 84) { lexer.NextToken(); -#line 682 "cs.ATG" +#line 674 "cs.ATG" m.Add(Modifiers.Internal, t.Location); if (la.kind == 97) { lexer.NextToken(); -#line 683 "cs.ATG" +#line 675 "cs.ATG" m.Add(Modifiers.Protected, t.Location); } - } else SynErr(181); + } else SynErr(179); } void Block( -#line 1288 "cs.ATG" +#line 1280 "cs.ATG" out Statement stmt) { Expect(16); -#line 1290 "cs.ATG" +#line 1282 "cs.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.Location; compilationUnit.BlockStart(blockStmt); if (!ParseMethodBodies) lexer.SkipCurrentBlock(0); - while (StartOf(25)) { + while (StartOf(24)) { Statement(); } - while (!(la.kind == 0 || la.kind == 17)) {SynErr(182); lexer.NextToken(); } + while (!(la.kind == 0 || la.kind == 17)) {SynErr(180); lexer.NextToken(); } Expect(17); -#line 1298 "cs.ATG" +#line 1290 "cs.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2691,10 +2660,10 @@ out Statement stmt) { } void EventAccessorDecls( -#line 1225 "cs.ATG" +#line 1217 "cs.ATG" out EventAddRegion addBlock, out EventRemoveRegion removeBlock) { -#line 1226 "cs.ATG" +#line 1218 "cs.ATG" AttributeSection section; List attributes = new List(); Statement stmt; @@ -2703,93 +2672,93 @@ out EventAddRegion addBlock, out EventRemoveRegion removeBlock) { while (la.kind == 18) { AttributeSection( -#line 1233 "cs.ATG" +#line 1225 "cs.ATG" out section); -#line 1233 "cs.ATG" +#line 1225 "cs.ATG" attributes.Add(section); } if (la.kind == 130) { -#line 1235 "cs.ATG" +#line 1227 "cs.ATG" addBlock = new EventAddRegion(attributes); AddAccessorDecl( -#line 1236 "cs.ATG" +#line 1228 "cs.ATG" out stmt); -#line 1236 "cs.ATG" +#line 1228 "cs.ATG" attributes = new List(); addBlock.Block = (BlockStatement)stmt; while (la.kind == 18) { AttributeSection( -#line 1237 "cs.ATG" +#line 1229 "cs.ATG" out section); -#line 1237 "cs.ATG" +#line 1229 "cs.ATG" attributes.Add(section); } RemoveAccessorDecl( -#line 1238 "cs.ATG" +#line 1230 "cs.ATG" out stmt); -#line 1238 "cs.ATG" +#line 1230 "cs.ATG" removeBlock = new EventRemoveRegion(attributes); removeBlock.Block = (BlockStatement)stmt; } else if (la.kind == 131) { RemoveAccessorDecl( -#line 1240 "cs.ATG" +#line 1232 "cs.ATG" out stmt); -#line 1240 "cs.ATG" +#line 1232 "cs.ATG" removeBlock = new EventRemoveRegion(attributes); removeBlock.Block = (BlockStatement)stmt; attributes = new List(); while (la.kind == 18) { AttributeSection( -#line 1241 "cs.ATG" +#line 1233 "cs.ATG" out section); -#line 1241 "cs.ATG" +#line 1233 "cs.ATG" attributes.Add(section); } AddAccessorDecl( -#line 1242 "cs.ATG" +#line 1234 "cs.ATG" out stmt); -#line 1242 "cs.ATG" +#line 1234 "cs.ATG" addBlock = new EventAddRegion(attributes); addBlock.Block = (BlockStatement)stmt; - } else SynErr(183); + } else SynErr(181); } void ConstructorInitializer( -#line 1318 "cs.ATG" +#line 1310 "cs.ATG" out ConstructorInitializer ci) { -#line 1319 "cs.ATG" +#line 1311 "cs.ATG" Expression expr; ci = new ConstructorInitializer(); Expect(9); if (la.kind == 51) { lexer.NextToken(); -#line 1323 "cs.ATG" +#line 1315 "cs.ATG" ci.ConstructorInitializerType = ConstructorInitializerType.Base; } else if (la.kind == 111) { lexer.NextToken(); -#line 1324 "cs.ATG" +#line 1316 "cs.ATG" ci.ConstructorInitializerType = ConstructorInitializerType.This; - } else SynErr(184); + } else SynErr(182); Expect(20); - if (StartOf(26)) { + if (StartOf(25)) { Argument( -#line 1327 "cs.ATG" +#line 1319 "cs.ATG" out expr); -#line 1327 "cs.ATG" +#line 1319 "cs.ATG" SafeAdd(ci, ci.Arguments, expr); while (la.kind == 14) { lexer.NextToken(); Argument( -#line 1328 "cs.ATG" +#line 1320 "cs.ATG" out expr); -#line 1328 "cs.ATG" +#line 1320 "cs.ATG" SafeAdd(ci, ci.Arguments, expr); } } @@ -2797,198 +2766,198 @@ out expr); } void OverloadableOperator( -#line 1341 "cs.ATG" +#line 1333 "cs.ATG" out OverloadableOperatorType op) { -#line 1342 "cs.ATG" +#line 1334 "cs.ATG" op = OverloadableOperatorType.None; switch (la.kind) { case 4: { lexer.NextToken(); -#line 1344 "cs.ATG" +#line 1336 "cs.ATG" op = OverloadableOperatorType.Add; break; } case 5: { lexer.NextToken(); -#line 1345 "cs.ATG" +#line 1337 "cs.ATG" op = OverloadableOperatorType.Subtract; break; } case 24: { lexer.NextToken(); -#line 1347 "cs.ATG" +#line 1339 "cs.ATG" op = OverloadableOperatorType.Not; break; } case 27: { lexer.NextToken(); -#line 1348 "cs.ATG" +#line 1340 "cs.ATG" op = OverloadableOperatorType.BitNot; break; } case 31: { lexer.NextToken(); -#line 1350 "cs.ATG" +#line 1342 "cs.ATG" op = OverloadableOperatorType.Increment; break; } case 32: { lexer.NextToken(); -#line 1351 "cs.ATG" +#line 1343 "cs.ATG" op = OverloadableOperatorType.Decrement; break; } case 113: { lexer.NextToken(); -#line 1353 "cs.ATG" +#line 1345 "cs.ATG" op = OverloadableOperatorType.IsTrue; break; } case 72: { lexer.NextToken(); -#line 1354 "cs.ATG" +#line 1346 "cs.ATG" op = OverloadableOperatorType.IsFalse; break; } case 6: { lexer.NextToken(); -#line 1356 "cs.ATG" +#line 1348 "cs.ATG" op = OverloadableOperatorType.Multiply; break; } case 7: { lexer.NextToken(); -#line 1357 "cs.ATG" +#line 1349 "cs.ATG" op = OverloadableOperatorType.Divide; break; } case 8: { lexer.NextToken(); -#line 1358 "cs.ATG" +#line 1350 "cs.ATG" op = OverloadableOperatorType.Modulus; break; } case 28: { lexer.NextToken(); -#line 1360 "cs.ATG" +#line 1352 "cs.ATG" op = OverloadableOperatorType.BitwiseAnd; break; } case 29: { lexer.NextToken(); -#line 1361 "cs.ATG" +#line 1353 "cs.ATG" op = OverloadableOperatorType.BitwiseOr; break; } case 30: { lexer.NextToken(); -#line 1362 "cs.ATG" +#line 1354 "cs.ATG" op = OverloadableOperatorType.ExclusiveOr; break; } case 37: { lexer.NextToken(); -#line 1364 "cs.ATG" +#line 1356 "cs.ATG" op = OverloadableOperatorType.ShiftLeft; break; } case 33: { lexer.NextToken(); -#line 1365 "cs.ATG" +#line 1357 "cs.ATG" op = OverloadableOperatorType.Equality; break; } case 34: { lexer.NextToken(); -#line 1366 "cs.ATG" +#line 1358 "cs.ATG" op = OverloadableOperatorType.InEquality; break; } case 23: { lexer.NextToken(); -#line 1367 "cs.ATG" +#line 1359 "cs.ATG" op = OverloadableOperatorType.LessThan; break; } case 35: { lexer.NextToken(); -#line 1368 "cs.ATG" +#line 1360 "cs.ATG" op = OverloadableOperatorType.GreaterThanOrEqual; break; } case 36: { lexer.NextToken(); -#line 1369 "cs.ATG" +#line 1361 "cs.ATG" op = OverloadableOperatorType.LessThanOrEqual; break; } case 22: { lexer.NextToken(); -#line 1370 "cs.ATG" +#line 1362 "cs.ATG" op = OverloadableOperatorType.GreaterThan; if (la.kind == 22) { lexer.NextToken(); -#line 1370 "cs.ATG" +#line 1362 "cs.ATG" op = OverloadableOperatorType.ShiftRight; } break; } - default: SynErr(185); break; + default: SynErr(183); break; } } void VariableDeclarator( -#line 1280 "cs.ATG" +#line 1272 "cs.ATG" FieldDeclaration parentFieldDeclaration) { -#line 1281 "cs.ATG" +#line 1273 "cs.ATG" Expression expr = null; Identifier(); -#line 1283 "cs.ATG" +#line 1275 "cs.ATG" VariableDeclaration f = new VariableDeclaration(t.val); f.StartLocation = t.Location; if (la.kind == 3) { lexer.NextToken(); VariableInitializer( -#line 1284 "cs.ATG" +#line 1276 "cs.ATG" out expr); -#line 1284 "cs.ATG" +#line 1276 "cs.ATG" f.Initializer = expr; } -#line 1285 "cs.ATG" +#line 1277 "cs.ATG" f.EndLocation = t.EndLocation; SafeAdd(parentFieldDeclaration, parentFieldDeclaration.Fields, f); } void AccessorDecls( -#line 1172 "cs.ATG" +#line 1164 "cs.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1174 "cs.ATG" +#line 1166 "cs.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -2997,92 +2966,92 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 18) { AttributeSection( -#line 1181 "cs.ATG" +#line 1173 "cs.ATG" out section); -#line 1181 "cs.ATG" +#line 1173 "cs.ATG" attributes.Add(section); } if (la.kind == 84 || la.kind == 96 || la.kind == 97) { AccessorModifiers( -#line 1182 "cs.ATG" +#line 1174 "cs.ATG" out modifiers); } if (la.kind == 128) { GetAccessorDecl( -#line 1184 "cs.ATG" +#line 1176 "cs.ATG" out getBlock, attributes); -#line 1185 "cs.ATG" +#line 1177 "cs.ATG" if (modifiers != null) {getBlock.Modifier = modifiers.Modifier; } - if (StartOf(27)) { + if (StartOf(26)) { -#line 1186 "cs.ATG" +#line 1178 "cs.ATG" attributes = new List(); modifiers = null; while (la.kind == 18) { AttributeSection( -#line 1187 "cs.ATG" +#line 1179 "cs.ATG" out section); -#line 1187 "cs.ATG" +#line 1179 "cs.ATG" attributes.Add(section); } if (la.kind == 84 || la.kind == 96 || la.kind == 97) { AccessorModifiers( -#line 1188 "cs.ATG" +#line 1180 "cs.ATG" out modifiers); } SetAccessorDecl( -#line 1189 "cs.ATG" +#line 1181 "cs.ATG" out setBlock, attributes); -#line 1190 "cs.ATG" +#line 1182 "cs.ATG" if (modifiers != null) {setBlock.Modifier = modifiers.Modifier; } } } else if (la.kind == 129) { SetAccessorDecl( -#line 1193 "cs.ATG" +#line 1185 "cs.ATG" out setBlock, attributes); -#line 1194 "cs.ATG" +#line 1186 "cs.ATG" if (modifiers != null) {setBlock.Modifier = modifiers.Modifier; } - if (StartOf(28)) { + if (StartOf(27)) { -#line 1195 "cs.ATG" +#line 1187 "cs.ATG" attributes = new List(); modifiers = null; while (la.kind == 18) { AttributeSection( -#line 1196 "cs.ATG" +#line 1188 "cs.ATG" out section); -#line 1196 "cs.ATG" +#line 1188 "cs.ATG" attributes.Add(section); } if (la.kind == 84 || la.kind == 96 || la.kind == 97) { AccessorModifiers( -#line 1197 "cs.ATG" +#line 1189 "cs.ATG" out modifiers); } GetAccessorDecl( -#line 1198 "cs.ATG" +#line 1190 "cs.ATG" out getBlock, attributes); -#line 1199 "cs.ATG" +#line 1191 "cs.ATG" if (modifiers != null) {getBlock.Modifier = modifiers.Modifier; } } - } else if (StartOf(19)) { + } else if (StartOf(18)) { Identifier(); -#line 1201 "cs.ATG" +#line 1193 "cs.ATG" Error("get or set accessor declaration expected"); - } else SynErr(186); + } else SynErr(184); } void InterfaceAccessors( -#line 1246 "cs.ATG" +#line 1238 "cs.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1248 "cs.ATG" +#line 1240 "cs.ATG" AttributeSection section; List attributes = new List(); getBlock = null; setBlock = null; @@ -3090,218 +3059,218 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 18) { AttributeSection( -#line 1254 "cs.ATG" +#line 1246 "cs.ATG" out section); -#line 1254 "cs.ATG" +#line 1246 "cs.ATG" attributes.Add(section); } -#line 1255 "cs.ATG" +#line 1247 "cs.ATG" Location startLocation = la.Location; if (la.kind == 128) { lexer.NextToken(); -#line 1257 "cs.ATG" +#line 1249 "cs.ATG" getBlock = new PropertyGetRegion(null, attributes); } else if (la.kind == 129) { lexer.NextToken(); -#line 1258 "cs.ATG" +#line 1250 "cs.ATG" setBlock = new PropertySetRegion(null, attributes); - } else SynErr(187); + } else SynErr(185); Expect(11); -#line 1261 "cs.ATG" +#line 1253 "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 1265 "cs.ATG" +#line 1257 "cs.ATG" out section); -#line 1265 "cs.ATG" +#line 1257 "cs.ATG" attributes.Add(section); } -#line 1266 "cs.ATG" +#line 1258 "cs.ATG" startLocation = la.Location; if (la.kind == 128) { lexer.NextToken(); -#line 1268 "cs.ATG" +#line 1260 "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 1271 "cs.ATG" +#line 1263 "cs.ATG" if (setBlock != null) Error("set already declared"); else { setBlock = new PropertySetRegion(null, attributes); lastBlock = setBlock; } - } else SynErr(188); + } else SynErr(186); Expect(11); -#line 1276 "cs.ATG" +#line 1268 "cs.ATG" if (lastBlock != null) { lastBlock.StartLocation = startLocation; lastBlock.EndLocation = t.EndLocation; } } } void GetAccessorDecl( -#line 1205 "cs.ATG" +#line 1197 "cs.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1206 "cs.ATG" +#line 1198 "cs.ATG" Statement stmt = null; Expect(128); -#line 1209 "cs.ATG" +#line 1201 "cs.ATG" Location startLocation = t.Location; if (la.kind == 16) { Block( -#line 1210 "cs.ATG" +#line 1202 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); - } else SynErr(189); + } else SynErr(187); -#line 1211 "cs.ATG" +#line 1203 "cs.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); -#line 1212 "cs.ATG" +#line 1204 "cs.ATG" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; } void SetAccessorDecl( -#line 1215 "cs.ATG" +#line 1207 "cs.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1216 "cs.ATG" +#line 1208 "cs.ATG" Statement stmt = null; Expect(129); -#line 1219 "cs.ATG" +#line 1211 "cs.ATG" Location startLocation = t.Location; if (la.kind == 16) { Block( -#line 1220 "cs.ATG" +#line 1212 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); - } else SynErr(190); + } else SynErr(188); -#line 1221 "cs.ATG" +#line 1213 "cs.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); -#line 1222 "cs.ATG" +#line 1214 "cs.ATG" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; } void AddAccessorDecl( -#line 1304 "cs.ATG" +#line 1296 "cs.ATG" out Statement stmt) { -#line 1305 "cs.ATG" +#line 1297 "cs.ATG" stmt = null; Expect(130); Block( -#line 1308 "cs.ATG" +#line 1300 "cs.ATG" out stmt); } void RemoveAccessorDecl( -#line 1311 "cs.ATG" +#line 1303 "cs.ATG" out Statement stmt) { -#line 1312 "cs.ATG" +#line 1304 "cs.ATG" stmt = null; Expect(131); Block( -#line 1315 "cs.ATG" +#line 1307 "cs.ATG" out stmt); } void VariableInitializer( -#line 1333 "cs.ATG" +#line 1325 "cs.ATG" out Expression initializerExpression) { -#line 1334 "cs.ATG" +#line 1326 "cs.ATG" TypeReference type = null; Expression expr = null; initializerExpression = null; if (StartOf(6)) { Expr( -#line 1336 "cs.ATG" +#line 1328 "cs.ATG" out initializerExpression); } else if (la.kind == 16) { CollectionInitializer( -#line 1337 "cs.ATG" +#line 1329 "cs.ATG" out initializerExpression); } else if (la.kind == 106) { lexer.NextToken(); Type( -#line 1338 "cs.ATG" +#line 1330 "cs.ATG" out type); Expect(18); Expr( -#line 1338 "cs.ATG" +#line 1330 "cs.ATG" out expr); Expect(19); -#line 1338 "cs.ATG" +#line 1330 "cs.ATG" initializerExpression = new StackAllocExpression(type, expr); - } else SynErr(191); + } else SynErr(189); } void Statement() { -#line 1481 "cs.ATG" +#line 1473 "cs.ATG" Statement stmt = null; Location startPos = la.Location; - while (!(StartOf(29))) {SynErr(192); lexer.NextToken(); } + while (!(StartOf(28))) {SynErr(190); lexer.NextToken(); } if ( -#line 1488 "cs.ATG" +#line 1480 "cs.ATG" IsLabel()) { Identifier(); -#line 1488 "cs.ATG" +#line 1480 "cs.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(9); Statement(); } else if (la.kind == 60) { lexer.NextToken(); LocalVariableDecl( -#line 1492 "cs.ATG" +#line 1484 "cs.ATG" out stmt); -#line 1493 "cs.ATG" +#line 1485 "cs.ATG" if (stmt != null) { ((LocalVariableDeclaration)stmt).Modifier |= Modifiers.Const; } Expect(11); -#line 1494 "cs.ATG" +#line 1486 "cs.ATG" compilationUnit.AddChild(stmt); } else if ( -#line 1496 "cs.ATG" +#line 1488 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1496 "cs.ATG" +#line 1488 "cs.ATG" out stmt); Expect(11); -#line 1496 "cs.ATG" +#line 1488 "cs.ATG" compilationUnit.AddChild(stmt); - } else if (StartOf(30)) { + } else if (StartOf(29)) { EmbeddedStatement( -#line 1498 "cs.ATG" +#line 1490 "cs.ATG" out stmt); -#line 1498 "cs.ATG" +#line 1490 "cs.ATG" compilationUnit.AddChild(stmt); - } else SynErr(193); + } else SynErr(191); -#line 1504 "cs.ATG" +#line 1496 "cs.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.EndLocation; @@ -3310,10 +3279,10 @@ out stmt); } void Argument( -#line 1373 "cs.ATG" +#line 1365 "cs.ATG" out Expression argumentexpr) { -#line 1375 "cs.ATG" +#line 1367 "cs.ATG" Expression expr; FieldDirection fd = FieldDirection.None; @@ -3321,51 +3290,51 @@ out Expression argumentexpr) { if (la.kind == 100) { lexer.NextToken(); -#line 1380 "cs.ATG" +#line 1372 "cs.ATG" fd = FieldDirection.Ref; } else { lexer.NextToken(); -#line 1381 "cs.ATG" +#line 1373 "cs.ATG" fd = FieldDirection.Out; } } Expr( -#line 1383 "cs.ATG" +#line 1375 "cs.ATG" out expr); -#line 1384 "cs.ATG" +#line 1376 "cs.ATG" argumentexpr = fd != FieldDirection.None ? argumentexpr = new DirectionExpression(fd, expr) : expr; } void CollectionInitializer( -#line 1404 "cs.ATG" +#line 1396 "cs.ATG" out Expression outExpr) { -#line 1406 "cs.ATG" +#line 1398 "cs.ATG" Expression expr = null; CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Expect(16); -#line 1410 "cs.ATG" +#line 1402 "cs.ATG" initializer.StartLocation = t.Location; - if (StartOf(31)) { + if (StartOf(30)) { VariableInitializer( -#line 1411 "cs.ATG" +#line 1403 "cs.ATG" out expr); -#line 1412 "cs.ATG" +#line 1404 "cs.ATG" SafeAdd(initializer, initializer.CreateExpressions, expr); while ( -#line 1413 "cs.ATG" +#line 1405 "cs.ATG" NotFinalComma()) { Expect(14); VariableInitializer( -#line 1414 "cs.ATG" +#line 1406 "cs.ATG" out expr); -#line 1415 "cs.ATG" +#line 1407 "cs.ATG" SafeAdd(initializer, initializer.CreateExpressions, expr); } if (la.kind == 14) { @@ -3374,105 +3343,105 @@ out expr); } Expect(17); -#line 1419 "cs.ATG" +#line 1411 "cs.ATG" initializer.EndLocation = t.Location; outExpr = initializer; } void AssignmentOperator( -#line 1387 "cs.ATG" +#line 1379 "cs.ATG" out AssignmentOperatorType op) { -#line 1388 "cs.ATG" +#line 1380 "cs.ATG" op = AssignmentOperatorType.None; if (la.kind == 3) { lexer.NextToken(); -#line 1390 "cs.ATG" +#line 1382 "cs.ATG" op = AssignmentOperatorType.Assign; } else if (la.kind == 38) { lexer.NextToken(); -#line 1391 "cs.ATG" +#line 1383 "cs.ATG" op = AssignmentOperatorType.Add; } else if (la.kind == 39) { lexer.NextToken(); -#line 1392 "cs.ATG" +#line 1384 "cs.ATG" op = AssignmentOperatorType.Subtract; } else if (la.kind == 40) { lexer.NextToken(); -#line 1393 "cs.ATG" +#line 1385 "cs.ATG" op = AssignmentOperatorType.Multiply; } else if (la.kind == 41) { lexer.NextToken(); -#line 1394 "cs.ATG" +#line 1386 "cs.ATG" op = AssignmentOperatorType.Divide; } else if (la.kind == 42) { lexer.NextToken(); -#line 1395 "cs.ATG" +#line 1387 "cs.ATG" op = AssignmentOperatorType.Modulus; } else if (la.kind == 43) { lexer.NextToken(); -#line 1396 "cs.ATG" +#line 1388 "cs.ATG" op = AssignmentOperatorType.BitwiseAnd; } else if (la.kind == 44) { lexer.NextToken(); -#line 1397 "cs.ATG" +#line 1389 "cs.ATG" op = AssignmentOperatorType.BitwiseOr; } else if (la.kind == 45) { lexer.NextToken(); -#line 1398 "cs.ATG" +#line 1390 "cs.ATG" op = AssignmentOperatorType.ExclusiveOr; } else if (la.kind == 46) { lexer.NextToken(); -#line 1399 "cs.ATG" +#line 1391 "cs.ATG" op = AssignmentOperatorType.ShiftLeft; } else if ( -#line 1400 "cs.ATG" +#line 1392 "cs.ATG" la.kind == Tokens.GreaterThan && Peek(1).kind == Tokens.GreaterEqual) { Expect(22); Expect(35); -#line 1401 "cs.ATG" +#line 1393 "cs.ATG" op = AssignmentOperatorType.ShiftRight; - } else SynErr(194); + } else SynErr(192); } void CollectionOrObjectInitializer( -#line 1422 "cs.ATG" +#line 1414 "cs.ATG" out Expression outExpr) { -#line 1424 "cs.ATG" +#line 1416 "cs.ATG" Expression expr = null; CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Expect(16); -#line 1428 "cs.ATG" +#line 1420 "cs.ATG" initializer.StartLocation = t.Location; - if (StartOf(31)) { + if (StartOf(30)) { ObjectPropertyInitializerOrVariableInitializer( -#line 1429 "cs.ATG" +#line 1421 "cs.ATG" out expr); -#line 1430 "cs.ATG" +#line 1422 "cs.ATG" SafeAdd(initializer, initializer.CreateExpressions, expr); while ( -#line 1431 "cs.ATG" +#line 1423 "cs.ATG" NotFinalComma()) { Expect(14); ObjectPropertyInitializerOrVariableInitializer( -#line 1432 "cs.ATG" +#line 1424 "cs.ATG" out expr); -#line 1433 "cs.ATG" +#line 1425 "cs.ATG" SafeAdd(initializer, initializer.CreateExpressions, expr); } if (la.kind == 14) { @@ -3481,371 +3450,371 @@ out expr); } Expect(17); -#line 1437 "cs.ATG" +#line 1429 "cs.ATG" initializer.EndLocation = t.Location; outExpr = initializer; } void ObjectPropertyInitializerOrVariableInitializer( -#line 1440 "cs.ATG" +#line 1432 "cs.ATG" out Expression expr) { -#line 1441 "cs.ATG" +#line 1433 "cs.ATG" expr = null; if ( -#line 1443 "cs.ATG" +#line 1435 "cs.ATG" IdentAndAsgn()) { Identifier(); -#line 1445 "cs.ATG" +#line 1437 "cs.ATG" NamedArgumentExpression nae = new NamedArgumentExpression(t.val, null); nae.StartLocation = t.Location; Expression r = null; Expect(3); if (la.kind == 16) { CollectionOrObjectInitializer( -#line 1449 "cs.ATG" +#line 1441 "cs.ATG" out r); - } else if (StartOf(31)) { + } else if (StartOf(30)) { VariableInitializer( -#line 1450 "cs.ATG" +#line 1442 "cs.ATG" out r); - } else SynErr(195); + } else SynErr(193); -#line 1451 "cs.ATG" +#line 1443 "cs.ATG" nae.Expression = r; nae.EndLocation = t.EndLocation; expr = nae; - } else if (StartOf(31)) { + } else if (StartOf(30)) { VariableInitializer( -#line 1453 "cs.ATG" +#line 1445 "cs.ATG" out expr); - } else SynErr(196); + } else SynErr(194); } void LocalVariableDecl( -#line 1457 "cs.ATG" +#line 1449 "cs.ATG" out Statement stmt) { -#line 1459 "cs.ATG" +#line 1451 "cs.ATG" TypeReference type; VariableDeclaration var = null; LocalVariableDeclaration localVariableDeclaration; Location startPos = la.Location; Type( -#line 1465 "cs.ATG" +#line 1457 "cs.ATG" out type); -#line 1465 "cs.ATG" +#line 1457 "cs.ATG" localVariableDeclaration = new LocalVariableDeclaration(type); localVariableDeclaration.StartLocation = startPos; LocalVariableDeclarator( -#line 1466 "cs.ATG" +#line 1458 "cs.ATG" out var); -#line 1466 "cs.ATG" +#line 1458 "cs.ATG" SafeAdd(localVariableDeclaration, localVariableDeclaration.Variables, var); while (la.kind == 14) { lexer.NextToken(); LocalVariableDeclarator( -#line 1467 "cs.ATG" +#line 1459 "cs.ATG" out var); -#line 1467 "cs.ATG" +#line 1459 "cs.ATG" SafeAdd(localVariableDeclaration, localVariableDeclaration.Variables, var); } -#line 1468 "cs.ATG" +#line 1460 "cs.ATG" stmt = localVariableDeclaration; stmt.EndLocation = t.EndLocation; } void LocalVariableDeclarator( -#line 1471 "cs.ATG" +#line 1463 "cs.ATG" out VariableDeclaration var) { -#line 1472 "cs.ATG" +#line 1464 "cs.ATG" Expression expr = null; Identifier(); -#line 1474 "cs.ATG" +#line 1466 "cs.ATG" var = new VariableDeclaration(t.val); var.StartLocation = t.Location; if (la.kind == 3) { lexer.NextToken(); VariableInitializer( -#line 1475 "cs.ATG" +#line 1467 "cs.ATG" out expr); -#line 1475 "cs.ATG" +#line 1467 "cs.ATG" var.Initializer = expr; } -#line 1476 "cs.ATG" +#line 1468 "cs.ATG" var.EndLocation = t.EndLocation; } void EmbeddedStatement( -#line 1511 "cs.ATG" +#line 1503 "cs.ATG" out Statement statement) { -#line 1513 "cs.ATG" +#line 1505 "cs.ATG" TypeReference type = null; Expression expr = null; Statement embeddedStatement = null; statement = null; -#line 1519 "cs.ATG" +#line 1511 "cs.ATG" Location startLocation = la.Location; if (la.kind == 16) { Block( -#line 1521 "cs.ATG" +#line 1513 "cs.ATG" out statement); } else if (la.kind == 11) { lexer.NextToken(); -#line 1524 "cs.ATG" +#line 1516 "cs.ATG" statement = new EmptyStatement(); } else if ( -#line 1527 "cs.ATG" +#line 1519 "cs.ATG" UnCheckedAndLBrace()) { -#line 1527 "cs.ATG" +#line 1519 "cs.ATG" Statement block; bool isChecked = true; if (la.kind == 58) { lexer.NextToken(); } else if (la.kind == 118) { lexer.NextToken(); -#line 1528 "cs.ATG" +#line 1520 "cs.ATG" isChecked = false; - } else SynErr(197); + } else SynErr(195); Block( -#line 1529 "cs.ATG" +#line 1521 "cs.ATG" out block); -#line 1529 "cs.ATG" +#line 1521 "cs.ATG" statement = isChecked ? (Statement)new CheckedStatement(block) : (Statement)new UncheckedStatement(block); } else if (la.kind == 79) { IfStatement( -#line 1532 "cs.ATG" +#line 1524 "cs.ATG" out statement); } else if (la.kind == 110) { lexer.NextToken(); -#line 1534 "cs.ATG" +#line 1526 "cs.ATG" List switchSections = new List(); Expect(20); Expr( -#line 1535 "cs.ATG" +#line 1527 "cs.ATG" out expr); Expect(21); Expect(16); SwitchSections( -#line 1536 "cs.ATG" +#line 1528 "cs.ATG" switchSections); Expect(17); -#line 1538 "cs.ATG" +#line 1530 "cs.ATG" statement = new SwitchStatement(expr, switchSections); } else if (la.kind == 125) { lexer.NextToken(); Expect(20); Expr( -#line 1541 "cs.ATG" +#line 1533 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1542 "cs.ATG" +#line 1534 "cs.ATG" out embeddedStatement); -#line 1543 "cs.ATG" +#line 1535 "cs.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 65) { lexer.NextToken(); EmbeddedStatement( -#line 1545 "cs.ATG" +#line 1537 "cs.ATG" out embeddedStatement); Expect(125); Expect(20); Expr( -#line 1546 "cs.ATG" +#line 1538 "cs.ATG" out expr); Expect(21); Expect(11); -#line 1547 "cs.ATG" +#line 1539 "cs.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.End); } else if (la.kind == 76) { lexer.NextToken(); -#line 1549 "cs.ATG" +#line 1541 "cs.ATG" List initializer = null; List iterator = null; Expect(20); if (StartOf(6)) { ForInitializer( -#line 1550 "cs.ATG" +#line 1542 "cs.ATG" out initializer); } Expect(11); if (StartOf(6)) { Expr( -#line 1551 "cs.ATG" +#line 1543 "cs.ATG" out expr); } Expect(11); if (StartOf(6)) { ForIterator( -#line 1552 "cs.ATG" +#line 1544 "cs.ATG" out iterator); } Expect(21); EmbeddedStatement( -#line 1553 "cs.ATG" +#line 1545 "cs.ATG" out embeddedStatement); -#line 1554 "cs.ATG" +#line 1546 "cs.ATG" statement = new ForStatement(initializer, expr, iterator, embeddedStatement); } else if (la.kind == 77) { lexer.NextToken(); Expect(20); Type( -#line 1556 "cs.ATG" +#line 1548 "cs.ATG" out type); Identifier(); -#line 1556 "cs.ATG" +#line 1548 "cs.ATG" string varName = t.val; Expect(81); Expr( -#line 1557 "cs.ATG" +#line 1549 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1558 "cs.ATG" +#line 1550 "cs.ATG" out embeddedStatement); -#line 1559 "cs.ATG" +#line 1551 "cs.ATG" statement = new ForeachStatement(type, varName , expr, embeddedStatement); } else if (la.kind == 53) { lexer.NextToken(); Expect(11); -#line 1562 "cs.ATG" +#line 1554 "cs.ATG" statement = new BreakStatement(); } else if (la.kind == 61) { lexer.NextToken(); Expect(11); -#line 1563 "cs.ATG" +#line 1555 "cs.ATG" statement = new ContinueStatement(); } else if (la.kind == 78) { GotoStatement( -#line 1564 "cs.ATG" +#line 1556 "cs.ATG" out statement); } else if ( -#line 1566 "cs.ATG" +#line 1558 "cs.ATG" IsYieldStatement()) { Expect(132); if (la.kind == 101) { lexer.NextToken(); Expr( -#line 1567 "cs.ATG" +#line 1559 "cs.ATG" out expr); -#line 1567 "cs.ATG" +#line 1559 "cs.ATG" statement = new YieldStatement(new ReturnStatement(expr)); } else if (la.kind == 53) { lexer.NextToken(); -#line 1568 "cs.ATG" +#line 1560 "cs.ATG" statement = new YieldStatement(new BreakStatement()); - } else SynErr(198); + } else SynErr(196); Expect(11); } else if (la.kind == 101) { lexer.NextToken(); if (StartOf(6)) { Expr( -#line 1571 "cs.ATG" +#line 1563 "cs.ATG" out expr); } Expect(11); -#line 1571 "cs.ATG" +#line 1563 "cs.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 112) { lexer.NextToken(); if (StartOf(6)) { Expr( -#line 1572 "cs.ATG" +#line 1564 "cs.ATG" out expr); } Expect(11); -#line 1572 "cs.ATG" +#line 1564 "cs.ATG" statement = new ThrowStatement(expr); } else if (StartOf(6)) { StatementExpr( -#line 1575 "cs.ATG" +#line 1567 "cs.ATG" out statement); - while (!(la.kind == 0 || la.kind == 11)) {SynErr(199); lexer.NextToken(); } + while (!(la.kind == 0 || la.kind == 11)) {SynErr(197); lexer.NextToken(); } Expect(11); } else if (la.kind == 114) { TryStatement( -#line 1578 "cs.ATG" +#line 1570 "cs.ATG" out statement); } else if (la.kind == 86) { lexer.NextToken(); Expect(20); Expr( -#line 1581 "cs.ATG" +#line 1573 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1582 "cs.ATG" +#line 1574 "cs.ATG" out embeddedStatement); -#line 1582 "cs.ATG" +#line 1574 "cs.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 121) { -#line 1585 "cs.ATG" +#line 1577 "cs.ATG" Statement resourceAcquisitionStmt = null; lexer.NextToken(); Expect(20); ResourceAcquisition( -#line 1587 "cs.ATG" +#line 1579 "cs.ATG" out resourceAcquisitionStmt); Expect(21); EmbeddedStatement( -#line 1588 "cs.ATG" +#line 1580 "cs.ATG" out embeddedStatement); -#line 1588 "cs.ATG" +#line 1580 "cs.ATG" statement = new UsingStatement(resourceAcquisitionStmt, embeddedStatement); } else if (la.kind == 119) { lexer.NextToken(); Block( -#line 1591 "cs.ATG" +#line 1583 "cs.ATG" out embeddedStatement); -#line 1591 "cs.ATG" +#line 1583 "cs.ATG" statement = new UnsafeStatement(embeddedStatement); } else if (la.kind == 74) { -#line 1593 "cs.ATG" +#line 1585 "cs.ATG" Statement pointerDeclarationStmt = null; lexer.NextToken(); Expect(20); ResourceAcquisition( -#line 1595 "cs.ATG" +#line 1587 "cs.ATG" out pointerDeclarationStmt); Expect(21); EmbeddedStatement( -#line 1596 "cs.ATG" +#line 1588 "cs.ATG" out embeddedStatement); -#line 1596 "cs.ATG" +#line 1588 "cs.ATG" statement = new FixedStatement(pointerDeclarationStmt, embeddedStatement); - } else SynErr(200); + } else SynErr(198); -#line 1598 "cs.ATG" +#line 1590 "cs.ATG" if (statement != null) { statement.StartLocation = startLocation; statement.EndLocation = t.EndLocation; @@ -3854,10 +3823,10 @@ out embeddedStatement); } void IfStatement( -#line 1605 "cs.ATG" +#line 1597 "cs.ATG" out Statement statement) { -#line 1607 "cs.ATG" +#line 1599 "cs.ATG" Expression expr = null; Statement embeddedStatement = null; statement = null; @@ -3865,26 +3834,26 @@ out Statement statement) { Expect(79); Expect(20); Expr( -#line 1613 "cs.ATG" +#line 1605 "cs.ATG" out expr); Expect(21); EmbeddedStatement( -#line 1614 "cs.ATG" +#line 1606 "cs.ATG" out embeddedStatement); -#line 1615 "cs.ATG" +#line 1607 "cs.ATG" Statement elseStatement = null; if (la.kind == 67) { lexer.NextToken(); EmbeddedStatement( -#line 1616 "cs.ATG" +#line 1608 "cs.ATG" out elseStatement); } -#line 1617 "cs.ATG" +#line 1609 "cs.ATG" statement = elseStatement != null ? new IfElseStatement(expr, embeddedStatement, elseStatement) : new IfElseStatement(expr, embeddedStatement); -#line 1618 "cs.ATG" +#line 1610 "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( @@ -3897,29 +3866,29 @@ out elseStatement); } void SwitchSections( -#line 1648 "cs.ATG" +#line 1640 "cs.ATG" List switchSections) { -#line 1650 "cs.ATG" +#line 1642 "cs.ATG" SwitchSection switchSection = new SwitchSection(); CaseLabel label; SwitchLabel( -#line 1654 "cs.ATG" +#line 1646 "cs.ATG" out label); -#line 1654 "cs.ATG" +#line 1646 "cs.ATG" SafeAdd(switchSection, switchSection.SwitchLabels, label); -#line 1655 "cs.ATG" +#line 1647 "cs.ATG" compilationUnit.BlockStart(switchSection); - while (StartOf(32)) { + while (StartOf(31)) { if (la.kind == 55 || la.kind == 63) { SwitchLabel( -#line 1657 "cs.ATG" +#line 1649 "cs.ATG" out label); -#line 1658 "cs.ATG" +#line 1650 "cs.ATG" if (label != null) { if (switchSection.Children.Count > 0) { // open new section @@ -3935,145 +3904,145 @@ out label); } } -#line 1670 "cs.ATG" +#line 1662 "cs.ATG" compilationUnit.BlockEnd(); switchSections.Add(switchSection); } void ForInitializer( -#line 1629 "cs.ATG" +#line 1621 "cs.ATG" out List initializer) { -#line 1631 "cs.ATG" +#line 1623 "cs.ATG" Statement stmt; initializer = new List(); if ( -#line 1635 "cs.ATG" +#line 1627 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1635 "cs.ATG" +#line 1627 "cs.ATG" out stmt); -#line 1635 "cs.ATG" +#line 1627 "cs.ATG" initializer.Add(stmt); } else if (StartOf(6)) { StatementExpr( -#line 1636 "cs.ATG" +#line 1628 "cs.ATG" out stmt); -#line 1636 "cs.ATG" +#line 1628 "cs.ATG" initializer.Add(stmt); while (la.kind == 14) { lexer.NextToken(); StatementExpr( -#line 1636 "cs.ATG" +#line 1628 "cs.ATG" out stmt); -#line 1636 "cs.ATG" +#line 1628 "cs.ATG" initializer.Add(stmt); } - } else SynErr(201); + } else SynErr(199); } void ForIterator( -#line 1639 "cs.ATG" +#line 1631 "cs.ATG" out List iterator) { -#line 1641 "cs.ATG" +#line 1633 "cs.ATG" Statement stmt; iterator = new List(); StatementExpr( -#line 1645 "cs.ATG" +#line 1637 "cs.ATG" out stmt); -#line 1645 "cs.ATG" +#line 1637 "cs.ATG" iterator.Add(stmt); while (la.kind == 14) { lexer.NextToken(); StatementExpr( -#line 1645 "cs.ATG" +#line 1637 "cs.ATG" out stmt); -#line 1645 "cs.ATG" +#line 1637 "cs.ATG" iterator.Add(stmt); } } void GotoStatement( -#line 1727 "cs.ATG" +#line 1719 "cs.ATG" out Statement stmt) { -#line 1728 "cs.ATG" +#line 1720 "cs.ATG" Expression expr; stmt = null; Expect(78); - if (StartOf(19)) { + if (StartOf(18)) { Identifier(); -#line 1732 "cs.ATG" +#line 1724 "cs.ATG" stmt = new GotoStatement(t.val); Expect(11); } else if (la.kind == 55) { lexer.NextToken(); Expr( -#line 1733 "cs.ATG" +#line 1725 "cs.ATG" out expr); Expect(11); -#line 1733 "cs.ATG" +#line 1725 "cs.ATG" stmt = new GotoCaseStatement(expr); } else if (la.kind == 63) { lexer.NextToken(); Expect(11); -#line 1734 "cs.ATG" +#line 1726 "cs.ATG" stmt = new GotoCaseStatement(null); - } else SynErr(202); + } else SynErr(200); } void StatementExpr( -#line 1754 "cs.ATG" +#line 1746 "cs.ATG" out Statement stmt) { -#line 1755 "cs.ATG" +#line 1747 "cs.ATG" Expression expr; Expr( -#line 1757 "cs.ATG" +#line 1749 "cs.ATG" out expr); -#line 1760 "cs.ATG" +#line 1752 "cs.ATG" stmt = new ExpressionStatement(expr); } void TryStatement( -#line 1680 "cs.ATG" +#line 1672 "cs.ATG" out Statement tryStatement) { -#line 1682 "cs.ATG" +#line 1674 "cs.ATG" Statement blockStmt = null, finallyStmt = null; CatchClause catchClause = null; List catchClauses = new List(); Expect(114); Block( -#line 1687 "cs.ATG" +#line 1679 "cs.ATG" out blockStmt); while (la.kind == 56) { CatchClause( -#line 1689 "cs.ATG" +#line 1681 "cs.ATG" out catchClause); -#line 1690 "cs.ATG" +#line 1682 "cs.ATG" if (catchClause != null) catchClauses.Add(catchClause); } if (la.kind == 73) { lexer.NextToken(); Block( -#line 1692 "cs.ATG" +#line 1684 "cs.ATG" out finallyStmt); } -#line 1694 "cs.ATG" +#line 1686 "cs.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); if (catchClauses != null) { foreach (CatchClause cc in catchClauses) cc.Parent = tryStatement; @@ -4082,59 +4051,59 @@ out finallyStmt); } void ResourceAcquisition( -#line 1738 "cs.ATG" +#line 1730 "cs.ATG" out Statement stmt) { -#line 1740 "cs.ATG" +#line 1732 "cs.ATG" stmt = null; Expression expr; if ( -#line 1745 "cs.ATG" +#line 1737 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1745 "cs.ATG" +#line 1737 "cs.ATG" out stmt); } else if (StartOf(6)) { Expr( -#line 1746 "cs.ATG" +#line 1738 "cs.ATG" out expr); -#line 1750 "cs.ATG" +#line 1742 "cs.ATG" stmt = new ExpressionStatement(expr); - } else SynErr(203); + } else SynErr(201); } void SwitchLabel( -#line 1673 "cs.ATG" +#line 1665 "cs.ATG" out CaseLabel label) { -#line 1674 "cs.ATG" +#line 1666 "cs.ATG" Expression expr = null; label = null; if (la.kind == 55) { lexer.NextToken(); Expr( -#line 1676 "cs.ATG" +#line 1668 "cs.ATG" out expr); Expect(9); -#line 1676 "cs.ATG" +#line 1668 "cs.ATG" label = new CaseLabel(expr); } else if (la.kind == 63) { lexer.NextToken(); Expect(9); -#line 1677 "cs.ATG" +#line 1669 "cs.ATG" label = new CaseLabel(); - } else SynErr(204); + } else SynErr(202); } void CatchClause( -#line 1701 "cs.ATG" +#line 1693 "cs.ATG" out CatchClause catchClause) { Expect(56); -#line 1703 "cs.ATG" +#line 1695 "cs.ATG" string identifier; Statement stmt; TypeReference typeRef; @@ -4143,35 +4112,35 @@ out CatchClause catchClause) { if (la.kind == 16) { Block( -#line 1711 "cs.ATG" +#line 1703 "cs.ATG" out stmt); -#line 1711 "cs.ATG" +#line 1703 "cs.ATG" catchClause = new CatchClause(stmt); } else if (la.kind == 20) { lexer.NextToken(); ClassType( -#line 1714 "cs.ATG" +#line 1706 "cs.ATG" out typeRef, false); -#line 1714 "cs.ATG" +#line 1706 "cs.ATG" identifier = null; - if (StartOf(19)) { + if (StartOf(18)) { Identifier(); -#line 1715 "cs.ATG" +#line 1707 "cs.ATG" identifier = t.val; } Expect(21); Block( -#line 1716 "cs.ATG" +#line 1708 "cs.ATG" out stmt); -#line 1717 "cs.ATG" +#line 1709 "cs.ATG" catchClause = new CatchClause(typeRef, identifier, stmt); - } else SynErr(205); + } else SynErr(203); -#line 1720 "cs.ATG" +#line 1712 "cs.ATG" if (catchClause != null) { catchClause.StartLocation = startPos; catchClause.EndLocation = t.Location; @@ -4180,75 +4149,75 @@ out stmt); } void UnaryExpr( -#line 1789 "cs.ATG" +#line 1781 "cs.ATG" out Expression uExpr) { -#line 1791 "cs.ATG" +#line 1783 "cs.ATG" TypeReference type = null; Expression expr = null; ArrayList expressions = new ArrayList(); uExpr = null; - while (StartOf(33) || -#line 1813 "cs.ATG" + while (StartOf(32) || +#line 1805 "cs.ATG" IsTypeCast()) { if (la.kind == 4) { lexer.NextToken(); -#line 1800 "cs.ATG" +#line 1792 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Plus)); } else if (la.kind == 5) { lexer.NextToken(); -#line 1801 "cs.ATG" +#line 1793 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Minus)); } else if (la.kind == 24) { lexer.NextToken(); -#line 1802 "cs.ATG" +#line 1794 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Not)); } else if (la.kind == 27) { lexer.NextToken(); -#line 1803 "cs.ATG" +#line 1795 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitNot)); } else if (la.kind == 6) { lexer.NextToken(); -#line 1804 "cs.ATG" +#line 1796 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Dereference)); } else if (la.kind == 31) { lexer.NextToken(); -#line 1805 "cs.ATG" +#line 1797 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Increment)); } else if (la.kind == 32) { lexer.NextToken(); -#line 1806 "cs.ATG" +#line 1798 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Decrement)); } else if (la.kind == 28) { lexer.NextToken(); -#line 1807 "cs.ATG" +#line 1799 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.AddressOf)); } else { Expect(20); Type( -#line 1813 "cs.ATG" +#line 1805 "cs.ATG" out type); Expect(21); -#line 1813 "cs.ATG" +#line 1805 "cs.ATG" expressions.Add(new CastExpression(type)); } } if ( -#line 1818 "cs.ATG" +#line 1810 "cs.ATG" LastExpressionIsUnaryMinus(expressions) && IsMostNegativeIntegerWithoutTypeSuffix()) { Expect(2); -#line 1821 "cs.ATG" +#line 1813 "cs.ATG" expressions.RemoveAt(expressions.Count - 1); if (t.literalValue is uint) { expr = new PrimitiveExpression(int.MinValue, int.MinValue.ToString()); @@ -4258,13 +4227,13 @@ LastExpressionIsUnaryMinus(expressions) && IsMostNegativeIntegerWithoutTypeSuffi throw new Exception("t.literalValue must be uint or ulong"); } - } else if (StartOf(34)) { + } else if (StartOf(33)) { PrimaryExpr( -#line 1830 "cs.ATG" +#line 1822 "cs.ATG" out expr); - } else SynErr(206); + } else SynErr(204); -#line 1832 "cs.ATG" +#line 1824 "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) { @@ -4282,325 +4251,325 @@ out expr); } void ConditionalOrExpr( -#line 2156 "cs.ATG" +#line 2148 "cs.ATG" ref Expression outExpr) { -#line 2157 "cs.ATG" +#line 2149 "cs.ATG" Expression expr; ConditionalAndExpr( -#line 2159 "cs.ATG" +#line 2151 "cs.ATG" ref outExpr); while (la.kind == 26) { lexer.NextToken(); UnaryExpr( -#line 2159 "cs.ATG" +#line 2151 "cs.ATG" out expr); ConditionalAndExpr( -#line 2159 "cs.ATG" +#line 2151 "cs.ATG" ref expr); -#line 2159 "cs.ATG" +#line 2151 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalOr, expr); } } void PrimaryExpr( -#line 1849 "cs.ATG" +#line 1841 "cs.ATG" out Expression pexpr) { -#line 1851 "cs.ATG" +#line 1843 "cs.ATG" TypeReference type = null; Expression expr; pexpr = null; -#line 1856 "cs.ATG" +#line 1848 "cs.ATG" Location startLocation = la.Location; if (la.kind == 113) { lexer.NextToken(); -#line 1858 "cs.ATG" +#line 1850 "cs.ATG" pexpr = new PrimitiveExpression(true, "true"); } else if (la.kind == 72) { lexer.NextToken(); -#line 1859 "cs.ATG" +#line 1851 "cs.ATG" pexpr = new PrimitiveExpression(false, "false"); } else if (la.kind == 90) { lexer.NextToken(); -#line 1860 "cs.ATG" +#line 1852 "cs.ATG" pexpr = new PrimitiveExpression(null, "null"); } else if (la.kind == 2) { lexer.NextToken(); -#line 1861 "cs.ATG" +#line 1853 "cs.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; } else if ( -#line 1862 "cs.ATG" +#line 1854 "cs.ATG" StartOfQueryExpression()) { QueryExpression( -#line 1863 "cs.ATG" +#line 1855 "cs.ATG" out pexpr); } else if ( -#line 1864 "cs.ATG" +#line 1856 "cs.ATG" IdentAndDoubleColon()) { Identifier(); -#line 1865 "cs.ATG" +#line 1857 "cs.ATG" type = new TypeReference(t.val); Expect(10); -#line 1866 "cs.ATG" +#line 1858 "cs.ATG" pexpr = new TypeReferenceExpression(type); Identifier(); -#line 1867 "cs.ATG" +#line 1859 "cs.ATG" if (type.Type == "global") { type.IsGlobal = true; type.Type = t.val ?? "?"; } else type.Type += "." + (t.val ?? "?"); - } else if (StartOf(19)) { + } else if (StartOf(18)) { Identifier(); -#line 1871 "cs.ATG" +#line 1863 "cs.ATG" pexpr = new IdentifierExpression(t.val); if (la.kind == 48 || -#line 1874 "cs.ATG" +#line 1866 "cs.ATG" IsGenericInSimpleNameOrMemberAccess()) { if (la.kind == 48) { ShortedLambdaExpression( -#line 1873 "cs.ATG" +#line 1865 "cs.ATG" (IdentifierExpression)pexpr, out pexpr); } else { -#line 1875 "cs.ATG" +#line 1867 "cs.ATG" List typeList; TypeArgumentList( -#line 1876 "cs.ATG" +#line 1868 "cs.ATG" out typeList, false); -#line 1877 "cs.ATG" +#line 1869 "cs.ATG" ((IdentifierExpression)pexpr).TypeArguments = typeList; } } } else if ( -#line 1879 "cs.ATG" +#line 1871 "cs.ATG" IsLambdaExpression()) { LambdaExpression( -#line 1880 "cs.ATG" +#line 1872 "cs.ATG" out pexpr); } else if (la.kind == 20) { lexer.NextToken(); Expr( -#line 1883 "cs.ATG" +#line 1875 "cs.ATG" out expr); Expect(21); -#line 1883 "cs.ATG" +#line 1875 "cs.ATG" pexpr = new ParenthesizedExpression(expr); - } else if (StartOf(35)) { + } else if (StartOf(34)) { -#line 1886 "cs.ATG" +#line 1878 "cs.ATG" string val = null; switch (la.kind) { case 52: { lexer.NextToken(); -#line 1887 "cs.ATG" +#line 1879 "cs.ATG" val = "System.Boolean"; break; } case 54: { lexer.NextToken(); -#line 1888 "cs.ATG" +#line 1880 "cs.ATG" val = "System.Byte"; break; } case 57: { lexer.NextToken(); -#line 1889 "cs.ATG" +#line 1881 "cs.ATG" val = "System.Char"; break; } case 62: { lexer.NextToken(); -#line 1890 "cs.ATG" +#line 1882 "cs.ATG" val = "System.Decimal"; break; } case 66: { lexer.NextToken(); -#line 1891 "cs.ATG" +#line 1883 "cs.ATG" val = "System.Double"; break; } case 75: { lexer.NextToken(); -#line 1892 "cs.ATG" +#line 1884 "cs.ATG" val = "System.Single"; break; } case 82: { lexer.NextToken(); -#line 1893 "cs.ATG" +#line 1885 "cs.ATG" val = "System.Int32"; break; } case 87: { lexer.NextToken(); -#line 1894 "cs.ATG" +#line 1886 "cs.ATG" val = "System.Int64"; break; } case 91: { lexer.NextToken(); -#line 1895 "cs.ATG" +#line 1887 "cs.ATG" val = "System.Object"; break; } case 102: { lexer.NextToken(); -#line 1896 "cs.ATG" +#line 1888 "cs.ATG" val = "System.SByte"; break; } case 104: { lexer.NextToken(); -#line 1897 "cs.ATG" +#line 1889 "cs.ATG" val = "System.Int16"; break; } case 108: { lexer.NextToken(); -#line 1898 "cs.ATG" +#line 1890 "cs.ATG" val = "System.String"; break; } case 116: { lexer.NextToken(); -#line 1899 "cs.ATG" +#line 1891 "cs.ATG" val = "System.UInt32"; break; } case 117: { lexer.NextToken(); -#line 1900 "cs.ATG" +#line 1892 "cs.ATG" val = "System.UInt64"; break; } case 120: { lexer.NextToken(); -#line 1901 "cs.ATG" +#line 1893 "cs.ATG" val = "System.UInt16"; break; } case 123: { lexer.NextToken(); -#line 1902 "cs.ATG" +#line 1894 "cs.ATG" val = "System.Void"; break; } } -#line 1904 "cs.ATG" +#line 1896 "cs.ATG" pexpr = new TypeReferenceExpression(new TypeReference(val, true)) { StartLocation = t.Location, EndLocation = t.EndLocation }; } else if (la.kind == 111) { lexer.NextToken(); -#line 1907 "cs.ATG" +#line 1899 "cs.ATG" pexpr = new ThisReferenceExpression(); pexpr.StartLocation = t.Location; pexpr.EndLocation = t.EndLocation; } else if (la.kind == 51) { lexer.NextToken(); -#line 1909 "cs.ATG" +#line 1901 "cs.ATG" pexpr = new BaseReferenceExpression(); pexpr.StartLocation = t.Location; pexpr.EndLocation = t.EndLocation; } else if (la.kind == 89) { NewExpression( -#line 1912 "cs.ATG" +#line 1904 "cs.ATG" out pexpr); } else if (la.kind == 115) { lexer.NextToken(); Expect(20); if ( -#line 1916 "cs.ATG" +#line 1908 "cs.ATG" NotVoidPointer()) { Expect(123); -#line 1916 "cs.ATG" +#line 1908 "cs.ATG" type = new TypeReference("System.Void", true); } else if (StartOf(10)) { TypeWithRestriction( -#line 1917 "cs.ATG" +#line 1909 "cs.ATG" out type, true, true); - } else SynErr(207); + } else SynErr(205); Expect(21); -#line 1919 "cs.ATG" +#line 1911 "cs.ATG" pexpr = new TypeOfExpression(type); } else if (la.kind == 63) { lexer.NextToken(); Expect(20); Type( -#line 1921 "cs.ATG" +#line 1913 "cs.ATG" out type); Expect(21); -#line 1921 "cs.ATG" +#line 1913 "cs.ATG" pexpr = new DefaultValueExpression(type); } else if (la.kind == 105) { lexer.NextToken(); Expect(20); Type( -#line 1922 "cs.ATG" +#line 1914 "cs.ATG" out type); Expect(21); -#line 1922 "cs.ATG" +#line 1914 "cs.ATG" pexpr = new SizeOfExpression(type); } else if (la.kind == 58) { lexer.NextToken(); Expect(20); Expr( -#line 1923 "cs.ATG" +#line 1915 "cs.ATG" out expr); Expect(21); -#line 1923 "cs.ATG" +#line 1915 "cs.ATG" pexpr = new CheckedExpression(expr); } else if (la.kind == 118) { lexer.NextToken(); Expect(20); Expr( -#line 1924 "cs.ATG" +#line 1916 "cs.ATG" out expr); Expect(21); -#line 1924 "cs.ATG" +#line 1916 "cs.ATG" pexpr = new UncheckedExpression(expr); } else if (la.kind == 64) { lexer.NextToken(); AnonymousMethodExpr( -#line 1925 "cs.ATG" +#line 1917 "cs.ATG" out expr); -#line 1925 "cs.ATG" +#line 1917 "cs.ATG" pexpr = expr; - } else SynErr(208); + } else SynErr(206); -#line 1927 "cs.ATG" +#line 1919 "cs.ATG" if (pexpr != null) { if (pexpr.StartLocation.IsEmpty) pexpr.StartLocation = startLocation; @@ -4608,59 +4577,59 @@ out expr); pexpr.EndLocation = t.EndLocation; } - while (StartOf(36)) { + while (StartOf(35)) { -#line 1935 "cs.ATG" +#line 1927 "cs.ATG" startLocation = la.Location; switch (la.kind) { case 31: { lexer.NextToken(); -#line 1937 "cs.ATG" +#line 1929 "cs.ATG" pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostIncrement); break; } case 32: { lexer.NextToken(); -#line 1939 "cs.ATG" +#line 1931 "cs.ATG" pexpr = new UnaryOperatorExpression(pexpr, UnaryOperatorType.PostDecrement); break; } case 47: { PointerMemberAccess( -#line 1941 "cs.ATG" +#line 1933 "cs.ATG" out pexpr, pexpr); break; } case 15: { MemberAccess( -#line 1942 "cs.ATG" +#line 1934 "cs.ATG" out pexpr, pexpr); break; } case 20: { lexer.NextToken(); -#line 1946 "cs.ATG" +#line 1938 "cs.ATG" List parameters = new List(); -#line 1947 "cs.ATG" +#line 1939 "cs.ATG" pexpr = new InvocationExpression(pexpr, parameters); - if (StartOf(26)) { + if (StartOf(25)) { Argument( -#line 1948 "cs.ATG" +#line 1940 "cs.ATG" out expr); -#line 1948 "cs.ATG" +#line 1940 "cs.ATG" SafeAdd(pexpr, parameters, expr); while (la.kind == 14) { lexer.NextToken(); Argument( -#line 1949 "cs.ATG" +#line 1941 "cs.ATG" out expr); -#line 1949 "cs.ATG" +#line 1941 "cs.ATG" SafeAdd(pexpr, parameters, expr); } } @@ -4669,24 +4638,24 @@ out expr); } case 18: { -#line 1955 "cs.ATG" +#line 1947 "cs.ATG" List indices = new List(); pexpr = new IndexerExpression(pexpr, indices); lexer.NextToken(); Expr( -#line 1958 "cs.ATG" +#line 1950 "cs.ATG" out expr); -#line 1958 "cs.ATG" +#line 1950 "cs.ATG" SafeAdd(pexpr, indices, expr); while (la.kind == 14) { lexer.NextToken(); Expr( -#line 1959 "cs.ATG" +#line 1951 "cs.ATG" out expr); -#line 1959 "cs.ATG" +#line 1951 "cs.ATG" SafeAdd(pexpr, indices, expr); } Expect(19); @@ -4694,7 +4663,7 @@ out expr); } } -#line 1962 "cs.ATG" +#line 1954 "cs.ATG" if (pexpr != null) { if (pexpr.StartLocation.IsEmpty) pexpr.StartLocation = startLocation; @@ -4706,129 +4675,129 @@ out expr); } void QueryExpression( -#line 2394 "cs.ATG" +#line 2401 "cs.ATG" out Expression outExpr) { -#line 2395 "cs.ATG" +#line 2402 "cs.ATG" QueryExpression q = new QueryExpression(); outExpr = q; q.StartLocation = la.Location; QueryExpressionFromClause fromClause; QueryExpressionFromClause( -#line 2399 "cs.ATG" +#line 2406 "cs.ATG" out fromClause); -#line 2399 "cs.ATG" +#line 2406 "cs.ATG" q.FromClause = fromClause; QueryExpressionBody( -#line 2400 "cs.ATG" +#line 2407 "cs.ATG" ref q); -#line 2401 "cs.ATG" +#line 2408 "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 2076 "cs.ATG" +#line 2068 "cs.ATG" IdentifierExpression ident, out Expression pexpr) { -#line 2077 "cs.ATG" +#line 2069 "cs.ATG" LambdaExpression lambda = new LambdaExpression(); pexpr = lambda; Expect(48); -#line 2082 "cs.ATG" +#line 2074 "cs.ATG" lambda.StartLocation = ident.StartLocation; SafeAdd(lambda, lambda.Parameters, new ParameterDeclarationExpression(null, ident.Identifier)); lambda.Parameters[0].StartLocation = ident.StartLocation; lambda.Parameters[0].EndLocation = ident.EndLocation; LambdaExpressionBody( -#line 2087 "cs.ATG" +#line 2079 "cs.ATG" lambda); } void TypeArgumentList( -#line 2328 "cs.ATG" +#line 2320 "cs.ATG" out List types, bool canBeUnbound) { -#line 2330 "cs.ATG" +#line 2322 "cs.ATG" types = new List(); TypeReference type = null; Expect(23); if ( -#line 2335 "cs.ATG" +#line 2327 "cs.ATG" canBeUnbound && (la.kind == Tokens.GreaterThan || la.kind == Tokens.Comma)) { -#line 2336 "cs.ATG" +#line 2328 "cs.ATG" types.Add(TypeReference.Null); while (la.kind == 14) { lexer.NextToken(); -#line 2337 "cs.ATG" +#line 2329 "cs.ATG" types.Add(TypeReference.Null); } } else if (StartOf(10)) { Type( -#line 2338 "cs.ATG" +#line 2330 "cs.ATG" out type); -#line 2338 "cs.ATG" +#line 2330 "cs.ATG" if (type != null) { types.Add(type); } while (la.kind == 14) { lexer.NextToken(); Type( -#line 2339 "cs.ATG" +#line 2331 "cs.ATG" out type); -#line 2339 "cs.ATG" +#line 2331 "cs.ATG" if (type != null) { types.Add(type); } } - } else SynErr(209); + } else SynErr(207); Expect(22); } void LambdaExpression( -#line 2056 "cs.ATG" +#line 2048 "cs.ATG" out Expression outExpr) { -#line 2058 "cs.ATG" +#line 2050 "cs.ATG" LambdaExpression lambda = new LambdaExpression(); lambda.StartLocation = la.Location; ParameterDeclarationExpression p; outExpr = lambda; Expect(20); - if (StartOf(18)) { + if (StartOf(36)) { LambdaExpressionParameter( -#line 2066 "cs.ATG" +#line 2058 "cs.ATG" out p); -#line 2066 "cs.ATG" +#line 2058 "cs.ATG" SafeAdd(lambda, lambda.Parameters, p); while (la.kind == 14) { lexer.NextToken(); LambdaExpressionParameter( -#line 2068 "cs.ATG" +#line 2060 "cs.ATG" out p); -#line 2068 "cs.ATG" +#line 2060 "cs.ATG" SafeAdd(lambda, lambda.Parameters, p); } } Expect(21); Expect(48); LambdaExpressionBody( -#line 2073 "cs.ATG" +#line 2065 "cs.ATG" lambda); } void NewExpression( -#line 2003 "cs.ATG" +#line 1995 "cs.ATG" out Expression pexpr) { -#line 2004 "cs.ATG" +#line 1996 "cs.ATG" pexpr = null; List parameters = new List(); TypeReference type = null; @@ -4837,65 +4806,65 @@ out Expression pexpr) { Expect(89); if (StartOf(10)) { NonArrayType( -#line 2011 "cs.ATG" +#line 2003 "cs.ATG" out type); } if (la.kind == 16 || la.kind == 20) { if (la.kind == 20) { -#line 2017 "cs.ATG" +#line 2009 "cs.ATG" ObjectCreateExpression oce = new ObjectCreateExpression(type, parameters); lexer.NextToken(); -#line 2018 "cs.ATG" +#line 2010 "cs.ATG" if (type == null) Error("Cannot use an anonymous type with arguments for the constructor"); - if (StartOf(26)) { + if (StartOf(25)) { Argument( -#line 2019 "cs.ATG" +#line 2011 "cs.ATG" out expr); -#line 2019 "cs.ATG" +#line 2011 "cs.ATG" SafeAdd(oce, parameters, expr); while (la.kind == 14) { lexer.NextToken(); Argument( -#line 2020 "cs.ATG" +#line 2012 "cs.ATG" out expr); -#line 2020 "cs.ATG" +#line 2012 "cs.ATG" SafeAdd(oce, parameters, expr); } } Expect(21); -#line 2022 "cs.ATG" +#line 2014 "cs.ATG" pexpr = oce; if (la.kind == 16) { CollectionOrObjectInitializer( -#line 2023 "cs.ATG" +#line 2015 "cs.ATG" out expr); -#line 2023 "cs.ATG" +#line 2015 "cs.ATG" oce.ObjectInitializer = (CollectionInitializerExpression)expr; } } else { -#line 2024 "cs.ATG" +#line 2016 "cs.ATG" ObjectCreateExpression oce = new ObjectCreateExpression(type, parameters); CollectionOrObjectInitializer( -#line 2025 "cs.ATG" +#line 2017 "cs.ATG" out expr); -#line 2025 "cs.ATG" +#line 2017 "cs.ATG" oce.ObjectInitializer = (CollectionInitializerExpression)expr; -#line 2026 "cs.ATG" +#line 2018 "cs.ATG" pexpr = oce; } } else if (la.kind == 18) { lexer.NextToken(); -#line 2031 "cs.ATG" +#line 2023 "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(""); } @@ -4906,91 +4875,91 @@ out expr); while (la.kind == 14) { lexer.NextToken(); -#line 2038 "cs.ATG" +#line 2030 "cs.ATG" dims += 1; } Expect(19); -#line 2039 "cs.ATG" +#line 2031 "cs.ATG" ranks.Add(dims); dims = 0; while (la.kind == 18) { lexer.NextToken(); while (la.kind == 14) { lexer.NextToken(); -#line 2040 "cs.ATG" +#line 2032 "cs.ATG" ++dims; } Expect(19); -#line 2040 "cs.ATG" +#line 2032 "cs.ATG" ranks.Add(dims); dims = 0; } -#line 2041 "cs.ATG" +#line 2033 "cs.ATG" ace.CreateType.RankSpecifier = ranks.ToArray(); CollectionInitializer( -#line 2042 "cs.ATG" +#line 2034 "cs.ATG" out expr); -#line 2042 "cs.ATG" +#line 2034 "cs.ATG" ace.ArrayInitializer = (CollectionInitializerExpression)expr; } else if (StartOf(6)) { Expr( -#line 2043 "cs.ATG" +#line 2035 "cs.ATG" out expr); -#line 2043 "cs.ATG" +#line 2035 "cs.ATG" if (expr != null) parameters.Add(expr); while (la.kind == 14) { lexer.NextToken(); -#line 2044 "cs.ATG" +#line 2036 "cs.ATG" dims += 1; Expr( -#line 2045 "cs.ATG" +#line 2037 "cs.ATG" out expr); -#line 2045 "cs.ATG" +#line 2037 "cs.ATG" if (expr != null) parameters.Add(expr); } Expect(19); -#line 2047 "cs.ATG" +#line 2039 "cs.ATG" ranks.Add(dims); ace.Arguments = parameters; dims = 0; while (la.kind == 18) { lexer.NextToken(); while (la.kind == 14) { lexer.NextToken(); -#line 2048 "cs.ATG" +#line 2040 "cs.ATG" ++dims; } Expect(19); -#line 2048 "cs.ATG" +#line 2040 "cs.ATG" ranks.Add(dims); dims = 0; } -#line 2049 "cs.ATG" +#line 2041 "cs.ATG" ace.CreateType.RankSpecifier = ranks.ToArray(); if (la.kind == 16) { CollectionInitializer( -#line 2050 "cs.ATG" +#line 2042 "cs.ATG" out expr); -#line 2050 "cs.ATG" +#line 2042 "cs.ATG" ace.ArrayInitializer = (CollectionInitializerExpression)expr; } - } else SynErr(210); - } else SynErr(211); + } else SynErr(208); + } else SynErr(209); } void AnonymousMethodExpr( -#line 2123 "cs.ATG" +#line 2115 "cs.ATG" out Expression outExpr) { -#line 2125 "cs.ATG" +#line 2117 "cs.ATG" AnonymousMethodExpression expr = new AnonymousMethodExpression(); expr.StartLocation = t.Location; BlockStatement stmt; @@ -5001,59 +4970,59 @@ out Expression outExpr) { lexer.NextToken(); if (StartOf(11)) { FormalParameterList( -#line 2134 "cs.ATG" +#line 2126 "cs.ATG" p); -#line 2134 "cs.ATG" +#line 2126 "cs.ATG" expr.Parameters = p; } Expect(21); -#line 2136 "cs.ATG" +#line 2128 "cs.ATG" expr.HasParameterList = true; } BlockInsideExpression( -#line 2138 "cs.ATG" +#line 2130 "cs.ATG" out stmt); -#line 2138 "cs.ATG" +#line 2130 "cs.ATG" expr.Body = stmt; -#line 2139 "cs.ATG" +#line 2131 "cs.ATG" expr.EndLocation = t.Location; } void PointerMemberAccess( -#line 1991 "cs.ATG" +#line 1983 "cs.ATG" out Expression expr, Expression target) { -#line 1992 "cs.ATG" +#line 1984 "cs.ATG" List typeList; Expect(47); Identifier(); -#line 1996 "cs.ATG" +#line 1988 "cs.ATG" expr = new PointerReferenceExpression(target, t.val); expr.StartLocation = t.Location; expr.EndLocation = t.EndLocation; if ( -#line 1997 "cs.ATG" +#line 1989 "cs.ATG" IsGenericInSimpleNameOrMemberAccess()) { TypeArgumentList( -#line 1998 "cs.ATG" +#line 1990 "cs.ATG" out typeList, false); -#line 1999 "cs.ATG" +#line 1991 "cs.ATG" ((MemberReferenceExpression)expr).TypeArguments = typeList; } } void MemberAccess( -#line 1972 "cs.ATG" +#line 1964 "cs.ATG" out Expression expr, Expression target) { -#line 1973 "cs.ATG" +#line 1965 "cs.ATG" List typeList; -#line 1975 "cs.ATG" +#line 1967 "cs.ATG" if (ShouldConvertTargetExpressionToTypeReference(target)) { TypeReference type = GetTypeReferenceFromExpression(target); if (type != null) { @@ -5063,410 +5032,410 @@ out Expression expr, Expression target) { Expect(15); -#line 1982 "cs.ATG" +#line 1974 "cs.ATG" Location startLocation = t.Location; Identifier(); -#line 1984 "cs.ATG" +#line 1976 "cs.ATG" expr = new MemberReferenceExpression(target, t.val); expr.StartLocation = startLocation; expr.EndLocation = t.EndLocation; if ( -#line 1985 "cs.ATG" +#line 1977 "cs.ATG" IsGenericInSimpleNameOrMemberAccess()) { TypeArgumentList( -#line 1986 "cs.ATG" +#line 1978 "cs.ATG" out typeList, false); -#line 1987 "cs.ATG" +#line 1979 "cs.ATG" ((MemberReferenceExpression)expr).TypeArguments = typeList; } } void LambdaExpressionParameter( -#line 2090 "cs.ATG" +#line 2082 "cs.ATG" out ParameterDeclarationExpression p) { -#line 2091 "cs.ATG" +#line 2083 "cs.ATG" Location start = la.Location; p = null; TypeReference type; ParameterModifiers mod = ParameterModifiers.In; if ( -#line 2096 "cs.ATG" +#line 2088 "cs.ATG" Peek(1).kind == Tokens.Comma || Peek(1).kind == Tokens.CloseParenthesis) { Identifier(); -#line 2098 "cs.ATG" +#line 2090 "cs.ATG" p = new ParameterDeclarationExpression(null, t.val); p.StartLocation = start; p.EndLocation = t.EndLocation; - } else if (StartOf(18)) { + } else if (StartOf(36)) { if (la.kind == 93 || la.kind == 100) { if (la.kind == 100) { lexer.NextToken(); -#line 2101 "cs.ATG" +#line 2093 "cs.ATG" mod = ParameterModifiers.Ref; } else { lexer.NextToken(); -#line 2102 "cs.ATG" +#line 2094 "cs.ATG" mod = ParameterModifiers.Out; } } Type( -#line 2104 "cs.ATG" +#line 2096 "cs.ATG" out type); Identifier(); -#line 2106 "cs.ATG" +#line 2098 "cs.ATG" p = new ParameterDeclarationExpression(type, t.val, mod); p.StartLocation = start; p.EndLocation = t.EndLocation; - } else SynErr(212); + } else SynErr(210); } void LambdaExpressionBody( -#line 2112 "cs.ATG" +#line 2104 "cs.ATG" LambdaExpression lambda) { -#line 2113 "cs.ATG" +#line 2105 "cs.ATG" Expression expr; BlockStatement stmt; if (la.kind == 16) { BlockInsideExpression( -#line 2116 "cs.ATG" +#line 2108 "cs.ATG" out stmt); -#line 2116 "cs.ATG" +#line 2108 "cs.ATG" lambda.StatementBody = stmt; } else if (StartOf(6)) { Expr( -#line 2117 "cs.ATG" +#line 2109 "cs.ATG" out expr); -#line 2117 "cs.ATG" +#line 2109 "cs.ATG" lambda.ExpressionBody = expr; - } else SynErr(213); + } else SynErr(211); -#line 2119 "cs.ATG" +#line 2111 "cs.ATG" lambda.EndLocation = t.EndLocation; -#line 2120 "cs.ATG" +#line 2112 "cs.ATG" lambda.ExtendedEndLocation = la.Location; } void BlockInsideExpression( -#line 2142 "cs.ATG" +#line 2134 "cs.ATG" out BlockStatement outStmt) { -#line 2143 "cs.ATG" +#line 2135 "cs.ATG" Statement stmt = null; outStmt = null; -#line 2147 "cs.ATG" +#line 2139 "cs.ATG" if (compilationUnit != null) { Block( -#line 2148 "cs.ATG" +#line 2140 "cs.ATG" out stmt); -#line 2148 "cs.ATG" +#line 2140 "cs.ATG" outStmt = (BlockStatement)stmt; -#line 2149 "cs.ATG" +#line 2141 "cs.ATG" } else { Expect(16); -#line 2151 "cs.ATG" +#line 2143 "cs.ATG" lexer.SkipCurrentBlock(0); Expect(17); -#line 2153 "cs.ATG" +#line 2145 "cs.ATG" } } void ConditionalAndExpr( -#line 2162 "cs.ATG" +#line 2154 "cs.ATG" ref Expression outExpr) { -#line 2163 "cs.ATG" +#line 2155 "cs.ATG" Expression expr; InclusiveOrExpr( -#line 2165 "cs.ATG" +#line 2157 "cs.ATG" ref outExpr); while (la.kind == 25) { lexer.NextToken(); UnaryExpr( -#line 2165 "cs.ATG" +#line 2157 "cs.ATG" out expr); InclusiveOrExpr( -#line 2165 "cs.ATG" +#line 2157 "cs.ATG" ref expr); -#line 2165 "cs.ATG" +#line 2157 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalAnd, expr); } } void InclusiveOrExpr( -#line 2168 "cs.ATG" +#line 2160 "cs.ATG" ref Expression outExpr) { -#line 2169 "cs.ATG" +#line 2161 "cs.ATG" Expression expr; ExclusiveOrExpr( -#line 2171 "cs.ATG" +#line 2163 "cs.ATG" ref outExpr); while (la.kind == 29) { lexer.NextToken(); UnaryExpr( -#line 2171 "cs.ATG" +#line 2163 "cs.ATG" out expr); ExclusiveOrExpr( -#line 2171 "cs.ATG" +#line 2163 "cs.ATG" ref expr); -#line 2171 "cs.ATG" +#line 2163 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseOr, expr); } } void ExclusiveOrExpr( -#line 2174 "cs.ATG" +#line 2166 "cs.ATG" ref Expression outExpr) { -#line 2175 "cs.ATG" +#line 2167 "cs.ATG" Expression expr; AndExpr( -#line 2177 "cs.ATG" +#line 2169 "cs.ATG" ref outExpr); while (la.kind == 30) { lexer.NextToken(); UnaryExpr( -#line 2177 "cs.ATG" +#line 2169 "cs.ATG" out expr); AndExpr( -#line 2177 "cs.ATG" +#line 2169 "cs.ATG" ref expr); -#line 2177 "cs.ATG" +#line 2169 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.ExclusiveOr, expr); } } void AndExpr( -#line 2180 "cs.ATG" +#line 2172 "cs.ATG" ref Expression outExpr) { -#line 2181 "cs.ATG" +#line 2173 "cs.ATG" Expression expr; EqualityExpr( -#line 2183 "cs.ATG" +#line 2175 "cs.ATG" ref outExpr); while (la.kind == 28) { lexer.NextToken(); UnaryExpr( -#line 2183 "cs.ATG" +#line 2175 "cs.ATG" out expr); EqualityExpr( -#line 2183 "cs.ATG" +#line 2175 "cs.ATG" ref expr); -#line 2183 "cs.ATG" +#line 2175 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseAnd, expr); } } void EqualityExpr( -#line 2186 "cs.ATG" +#line 2178 "cs.ATG" ref Expression outExpr) { -#line 2188 "cs.ATG" +#line 2180 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; RelationalExpr( -#line 2192 "cs.ATG" +#line 2184 "cs.ATG" ref outExpr); while (la.kind == 33 || la.kind == 34) { if (la.kind == 34) { lexer.NextToken(); -#line 2195 "cs.ATG" +#line 2187 "cs.ATG" op = BinaryOperatorType.InEquality; } else { lexer.NextToken(); -#line 2196 "cs.ATG" +#line 2188 "cs.ATG" op = BinaryOperatorType.Equality; } UnaryExpr( -#line 2198 "cs.ATG" +#line 2190 "cs.ATG" out expr); RelationalExpr( -#line 2198 "cs.ATG" +#line 2190 "cs.ATG" ref expr); -#line 2198 "cs.ATG" +#line 2190 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void RelationalExpr( -#line 2202 "cs.ATG" +#line 2194 "cs.ATG" ref Expression outExpr) { -#line 2204 "cs.ATG" +#line 2196 "cs.ATG" TypeReference type; Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 2209 "cs.ATG" +#line 2201 "cs.ATG" ref outExpr); while (StartOf(37)) { if (StartOf(38)) { if (la.kind == 23) { lexer.NextToken(); -#line 2211 "cs.ATG" +#line 2203 "cs.ATG" op = BinaryOperatorType.LessThan; } else if (la.kind == 22) { lexer.NextToken(); -#line 2212 "cs.ATG" +#line 2204 "cs.ATG" op = BinaryOperatorType.GreaterThan; } else if (la.kind == 36) { lexer.NextToken(); -#line 2213 "cs.ATG" +#line 2205 "cs.ATG" op = BinaryOperatorType.LessThanOrEqual; } else if (la.kind == 35) { lexer.NextToken(); -#line 2214 "cs.ATG" +#line 2206 "cs.ATG" op = BinaryOperatorType.GreaterThanOrEqual; - } else SynErr(214); + } else SynErr(212); UnaryExpr( -#line 2216 "cs.ATG" +#line 2208 "cs.ATG" out expr); ShiftExpr( -#line 2217 "cs.ATG" +#line 2209 "cs.ATG" ref expr); -#line 2218 "cs.ATG" +#line 2210 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else { if (la.kind == 85) { lexer.NextToken(); TypeWithRestriction( -#line 2221 "cs.ATG" +#line 2213 "cs.ATG" out type, false, false); if ( -#line 2222 "cs.ATG" +#line 2214 "cs.ATG" la.kind == Tokens.Question && !IsPossibleExpressionStart(Peek(1).kind)) { NullableQuestionMark( -#line 2223 "cs.ATG" +#line 2215 "cs.ATG" ref type); } -#line 2224 "cs.ATG" +#line 2216 "cs.ATG" outExpr = new TypeOfIsExpression(outExpr, type); } else if (la.kind == 50) { lexer.NextToken(); TypeWithRestriction( -#line 2226 "cs.ATG" +#line 2218 "cs.ATG" out type, false, false); if ( -#line 2227 "cs.ATG" +#line 2219 "cs.ATG" la.kind == Tokens.Question && !IsPossibleExpressionStart(Peek(1).kind)) { NullableQuestionMark( -#line 2228 "cs.ATG" +#line 2220 "cs.ATG" ref type); } -#line 2229 "cs.ATG" +#line 2221 "cs.ATG" outExpr = new CastExpression(type, outExpr, CastType.TryCast); - } else SynErr(215); + } else SynErr(213); } } } void ShiftExpr( -#line 2234 "cs.ATG" +#line 2226 "cs.ATG" ref Expression outExpr) { -#line 2236 "cs.ATG" +#line 2228 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; AdditiveExpr( -#line 2240 "cs.ATG" +#line 2232 "cs.ATG" ref outExpr); while (la.kind == 37 || -#line 2243 "cs.ATG" +#line 2235 "cs.ATG" IsShiftRight()) { if (la.kind == 37) { lexer.NextToken(); -#line 2242 "cs.ATG" +#line 2234 "cs.ATG" op = BinaryOperatorType.ShiftLeft; } else { Expect(22); Expect(22); -#line 2244 "cs.ATG" +#line 2236 "cs.ATG" op = BinaryOperatorType.ShiftRight; } UnaryExpr( -#line 2247 "cs.ATG" +#line 2239 "cs.ATG" out expr); AdditiveExpr( -#line 2247 "cs.ATG" +#line 2239 "cs.ATG" ref expr); -#line 2247 "cs.ATG" +#line 2239 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AdditiveExpr( -#line 2251 "cs.ATG" +#line 2243 "cs.ATG" ref Expression outExpr) { -#line 2253 "cs.ATG" +#line 2245 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; MultiplicativeExpr( -#line 2257 "cs.ATG" +#line 2249 "cs.ATG" ref outExpr); while (la.kind == 4 || la.kind == 5) { if (la.kind == 4) { lexer.NextToken(); -#line 2260 "cs.ATG" +#line 2252 "cs.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 2261 "cs.ATG" +#line 2253 "cs.ATG" op = BinaryOperatorType.Subtract; } UnaryExpr( -#line 2263 "cs.ATG" +#line 2255 "cs.ATG" out expr); MultiplicativeExpr( -#line 2263 "cs.ATG" +#line 2255 "cs.ATG" ref expr); -#line 2263 "cs.ATG" +#line 2255 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void MultiplicativeExpr( -#line 2267 "cs.ATG" +#line 2259 "cs.ATG" ref Expression outExpr) { -#line 2269 "cs.ATG" +#line 2261 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; @@ -5474,82 +5443,120 @@ ref Expression outExpr) { if (la.kind == 6) { lexer.NextToken(); -#line 2275 "cs.ATG" +#line 2267 "cs.ATG" op = BinaryOperatorType.Multiply; } else if (la.kind == 7) { lexer.NextToken(); -#line 2276 "cs.ATG" +#line 2268 "cs.ATG" op = BinaryOperatorType.Divide; } else { lexer.NextToken(); -#line 2277 "cs.ATG" +#line 2269 "cs.ATG" op = BinaryOperatorType.Modulus; } UnaryExpr( -#line 2279 "cs.ATG" +#line 2271 "cs.ATG" out expr); -#line 2279 "cs.ATG" +#line 2271 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } + void VariantTypeParameter( +#line 2349 "cs.ATG" +out TemplateDefinition typeParameter) { + +#line 2351 "cs.ATG" + typeParameter = new TemplateDefinition(); + AttributeSection section; + + while (la.kind == 18) { + AttributeSection( +#line 2355 "cs.ATG" +out section); + +#line 2355 "cs.ATG" + typeParameter.Attributes.Add(section); + } + if (la.kind == 81 || la.kind == 93) { + if (la.kind == 81) { + lexer.NextToken(); + +#line 2357 "cs.ATG" + typeParameter.VarianceModifier = VarianceModifier.Contravariant; + } else { + lexer.NextToken(); + +#line 2358 "cs.ATG" + typeParameter.VarianceModifier = VarianceModifier.Covariant; + } + } + Identifier(); + +#line 2360 "cs.ATG" + typeParameter.Name = t.val; typeParameter.StartLocation = t.Location; + +#line 2361 "cs.ATG" + typeParameter.EndLocation = t.EndLocation; + } + void TypeParameterConstraintsClauseBase( -#line 2385 "cs.ATG" +#line 2392 "cs.ATG" out TypeReference type) { -#line 2386 "cs.ATG" +#line 2393 "cs.ATG" TypeReference t; type = null; if (la.kind == 109) { lexer.NextToken(); -#line 2388 "cs.ATG" +#line 2395 "cs.ATG" type = TypeReference.StructConstraint; } else if (la.kind == 59) { lexer.NextToken(); -#line 2389 "cs.ATG" +#line 2396 "cs.ATG" type = TypeReference.ClassConstraint; } else if (la.kind == 89) { lexer.NextToken(); Expect(20); Expect(21); -#line 2390 "cs.ATG" +#line 2397 "cs.ATG" type = TypeReference.NewConstraint; } else if (StartOf(10)) { Type( -#line 2391 "cs.ATG" +#line 2398 "cs.ATG" out t); -#line 2391 "cs.ATG" +#line 2398 "cs.ATG" type = t; - } else SynErr(216); + } else SynErr(214); } void QueryExpressionFromClause( -#line 2406 "cs.ATG" +#line 2413 "cs.ATG" out QueryExpressionFromClause fc) { -#line 2407 "cs.ATG" +#line 2414 "cs.ATG" fc = new QueryExpressionFromClause(); fc.StartLocation = la.Location; Expect(137); QueryExpressionFromOrJoinClause( -#line 2411 "cs.ATG" +#line 2418 "cs.ATG" fc); -#line 2412 "cs.ATG" +#line 2419 "cs.ATG" fc.EndLocation = t.EndLocation; } void QueryExpressionBody( -#line 2442 "cs.ATG" +#line 2449 "cs.ATG" ref QueryExpression q) { -#line 2443 "cs.ATG" +#line 2450 "cs.ATG" QueryExpressionFromClause fromClause; QueryExpressionWhereClause whereClause; QueryExpressionLetClause letClause; QueryExpressionJoinClause joinClause; QueryExpressionOrderClause orderClause; @@ -5558,249 +5565,249 @@ ref QueryExpression q) { while (StartOf(39)) { if (la.kind == 137) { QueryExpressionFromClause( -#line 2449 "cs.ATG" +#line 2456 "cs.ATG" out fromClause); -#line 2449 "cs.ATG" +#line 2456 "cs.ATG" SafeAdd(q, q.MiddleClauses, fromClause); } else if (la.kind == 127) { QueryExpressionWhereClause( -#line 2450 "cs.ATG" +#line 2457 "cs.ATG" out whereClause); -#line 2450 "cs.ATG" +#line 2457 "cs.ATG" SafeAdd(q, q.MiddleClauses, whereClause); } else if (la.kind == 141) { QueryExpressionLetClause( -#line 2451 "cs.ATG" +#line 2458 "cs.ATG" out letClause); -#line 2451 "cs.ATG" +#line 2458 "cs.ATG" SafeAdd(q, q.MiddleClauses, letClause); } else if (la.kind == 142) { QueryExpressionJoinClause( -#line 2452 "cs.ATG" +#line 2459 "cs.ATG" out joinClause); -#line 2452 "cs.ATG" +#line 2459 "cs.ATG" SafeAdd(q, q.MiddleClauses, joinClause); } else { QueryExpressionOrderByClause( -#line 2453 "cs.ATG" +#line 2460 "cs.ATG" out orderClause); -#line 2453 "cs.ATG" +#line 2460 "cs.ATG" SafeAdd(q, q.MiddleClauses, orderClause); } } if (la.kind == 133) { QueryExpressionSelectClause( -#line 2455 "cs.ATG" +#line 2462 "cs.ATG" out selectClause); -#line 2455 "cs.ATG" +#line 2462 "cs.ATG" q.SelectOrGroupClause = selectClause; } else if (la.kind == 134) { QueryExpressionGroupClause( -#line 2456 "cs.ATG" +#line 2463 "cs.ATG" out groupClause); -#line 2456 "cs.ATG" +#line 2463 "cs.ATG" q.SelectOrGroupClause = groupClause; - } else SynErr(217); + } else SynErr(215); if (la.kind == 136) { QueryExpressionIntoClause( -#line 2458 "cs.ATG" +#line 2465 "cs.ATG" ref q); } } void QueryExpressionFromOrJoinClause( -#line 2432 "cs.ATG" +#line 2439 "cs.ATG" QueryExpressionFromOrJoinClause fjc) { -#line 2433 "cs.ATG" +#line 2440 "cs.ATG" TypeReference type; Expression expr; -#line 2435 "cs.ATG" +#line 2442 "cs.ATG" fjc.Type = null; if ( -#line 2436 "cs.ATG" +#line 2443 "cs.ATG" IsLocalVarDecl()) { Type( -#line 2436 "cs.ATG" +#line 2443 "cs.ATG" out type); -#line 2436 "cs.ATG" +#line 2443 "cs.ATG" fjc.Type = type; } Identifier(); -#line 2437 "cs.ATG" +#line 2444 "cs.ATG" fjc.Identifier = t.val; Expect(81); Expr( -#line 2439 "cs.ATG" +#line 2446 "cs.ATG" out expr); -#line 2439 "cs.ATG" +#line 2446 "cs.ATG" fjc.InExpression = expr; } void QueryExpressionJoinClause( -#line 2415 "cs.ATG" +#line 2422 "cs.ATG" out QueryExpressionJoinClause jc) { -#line 2416 "cs.ATG" +#line 2423 "cs.ATG" jc = new QueryExpressionJoinClause(); jc.StartLocation = la.Location; Expression expr; Expect(142); QueryExpressionFromOrJoinClause( -#line 2421 "cs.ATG" +#line 2428 "cs.ATG" jc); Expect(143); Expr( -#line 2423 "cs.ATG" +#line 2430 "cs.ATG" out expr); -#line 2423 "cs.ATG" +#line 2430 "cs.ATG" jc.OnExpression = expr; Expect(144); Expr( -#line 2425 "cs.ATG" +#line 2432 "cs.ATG" out expr); -#line 2425 "cs.ATG" +#line 2432 "cs.ATG" jc.EqualsExpression = expr; if (la.kind == 136) { lexer.NextToken(); Identifier(); -#line 2427 "cs.ATG" +#line 2434 "cs.ATG" jc.IntoIdentifier = t.val; } -#line 2429 "cs.ATG" +#line 2436 "cs.ATG" jc.EndLocation = t.EndLocation; } void QueryExpressionWhereClause( -#line 2461 "cs.ATG" +#line 2468 "cs.ATG" out QueryExpressionWhereClause wc) { -#line 2462 "cs.ATG" +#line 2469 "cs.ATG" Expression expr; wc = new QueryExpressionWhereClause(); wc.StartLocation = la.Location; Expect(127); Expr( -#line 2465 "cs.ATG" +#line 2472 "cs.ATG" out expr); -#line 2465 "cs.ATG" +#line 2472 "cs.ATG" wc.Condition = expr; -#line 2466 "cs.ATG" +#line 2473 "cs.ATG" wc.EndLocation = t.EndLocation; } void QueryExpressionLetClause( -#line 2469 "cs.ATG" +#line 2476 "cs.ATG" out QueryExpressionLetClause wc) { -#line 2470 "cs.ATG" +#line 2477 "cs.ATG" Expression expr; wc = new QueryExpressionLetClause(); wc.StartLocation = la.Location; Expect(141); Identifier(); -#line 2473 "cs.ATG" +#line 2480 "cs.ATG" wc.Identifier = t.val; Expect(3); Expr( -#line 2475 "cs.ATG" +#line 2482 "cs.ATG" out expr); -#line 2475 "cs.ATG" +#line 2482 "cs.ATG" wc.Expression = expr; -#line 2476 "cs.ATG" +#line 2483 "cs.ATG" wc.EndLocation = t.EndLocation; } void QueryExpressionOrderByClause( -#line 2479 "cs.ATG" +#line 2486 "cs.ATG" out QueryExpressionOrderClause oc) { -#line 2480 "cs.ATG" +#line 2487 "cs.ATG" QueryExpressionOrdering ordering; oc = new QueryExpressionOrderClause(); oc.StartLocation = la.Location; Expect(140); QueryExpressionOrdering( -#line 2483 "cs.ATG" +#line 2490 "cs.ATG" out ordering); -#line 2483 "cs.ATG" +#line 2490 "cs.ATG" SafeAdd(oc, oc.Orderings, ordering); while (la.kind == 14) { lexer.NextToken(); QueryExpressionOrdering( -#line 2485 "cs.ATG" +#line 2492 "cs.ATG" out ordering); -#line 2485 "cs.ATG" +#line 2492 "cs.ATG" SafeAdd(oc, oc.Orderings, ordering); } -#line 2487 "cs.ATG" +#line 2494 "cs.ATG" oc.EndLocation = t.EndLocation; } void QueryExpressionSelectClause( -#line 2500 "cs.ATG" +#line 2507 "cs.ATG" out QueryExpressionSelectClause sc) { -#line 2501 "cs.ATG" +#line 2508 "cs.ATG" Expression expr; sc = new QueryExpressionSelectClause(); sc.StartLocation = la.Location; Expect(133); Expr( -#line 2504 "cs.ATG" +#line 2511 "cs.ATG" out expr); -#line 2504 "cs.ATG" +#line 2511 "cs.ATG" sc.Projection = expr; -#line 2505 "cs.ATG" +#line 2512 "cs.ATG" sc.EndLocation = t.EndLocation; } void QueryExpressionGroupClause( -#line 2508 "cs.ATG" +#line 2515 "cs.ATG" out QueryExpressionGroupClause gc) { -#line 2509 "cs.ATG" +#line 2516 "cs.ATG" Expression expr; gc = new QueryExpressionGroupClause(); gc.StartLocation = la.Location; Expect(134); Expr( -#line 2512 "cs.ATG" +#line 2519 "cs.ATG" out expr); -#line 2512 "cs.ATG" +#line 2519 "cs.ATG" gc.Projection = expr; Expect(135); Expr( -#line 2514 "cs.ATG" +#line 2521 "cs.ATG" out expr); -#line 2514 "cs.ATG" +#line 2521 "cs.ATG" gc.GroupBy = expr; -#line 2515 "cs.ATG" +#line 2522 "cs.ATG" gc.EndLocation = t.EndLocation; } void QueryExpressionIntoClause( -#line 2518 "cs.ATG" +#line 2525 "cs.ATG" ref QueryExpression q) { -#line 2519 "cs.ATG" +#line 2526 "cs.ATG" QueryExpression firstQuery = q; QueryExpression continuedQuery = new QueryExpression(); continuedQuery.StartLocation = q.StartLocation; @@ -5815,43 +5822,43 @@ ref QueryExpression q) { Expect(136); Identifier(); -#line 2532 "cs.ATG" +#line 2539 "cs.ATG" continuedQuery.FromClause.Identifier = t.val; -#line 2533 "cs.ATG" +#line 2540 "cs.ATG" continuedQuery.FromClause.EndLocation = t.EndLocation; QueryExpressionBody( -#line 2534 "cs.ATG" +#line 2541 "cs.ATG" ref q); } void QueryExpressionOrdering( -#line 2490 "cs.ATG" +#line 2497 "cs.ATG" out QueryExpressionOrdering ordering) { -#line 2491 "cs.ATG" +#line 2498 "cs.ATG" Expression expr; ordering = new QueryExpressionOrdering(); ordering.StartLocation = la.Location; Expr( -#line 2493 "cs.ATG" +#line 2500 "cs.ATG" out expr); -#line 2493 "cs.ATG" +#line 2500 "cs.ATG" ordering.Criteria = expr; if (la.kind == 138 || la.kind == 139) { if (la.kind == 138) { lexer.NextToken(); -#line 2494 "cs.ATG" +#line 2501 "cs.ATG" ordering.Direction = QueryExpressionOrderingDirection.Ascending; } else { lexer.NextToken(); -#line 2495 "cs.ATG" +#line 2502 "cs.ATG" ordering.Direction = QueryExpressionOrderingDirection.Descending; } } -#line 2497 "cs.ATG" +#line 2504 "cs.ATG" ordering.EndLocation = t.EndLocation; } @@ -6024,11 +6031,11 @@ out expr); case 154: s = "this symbol not expected in ClassBody"; break; case 155: s = "this symbol not expected in InterfaceBody"; break; case 156: s = "invalid IntegralType"; break; - case 157: s = "invalid FormalParameterList"; break; - case 158: s = "invalid FormalParameterList"; break; - case 159: s = "invalid ClassType"; break; - case 160: s = "invalid ClassMemberDecl"; break; - case 161: s = "invalid ClassMemberDecl"; break; + case 157: s = "invalid ClassType"; break; + case 158: s = "invalid ClassMemberDecl"; break; + case 159: s = "invalid ClassMemberDecl"; break; + case 160: s = "invalid StructMemberDecl"; break; + case 161: s = "invalid StructMemberDecl"; break; case 162: s = "invalid StructMemberDecl"; break; case 163: s = "invalid StructMemberDecl"; break; case 164: s = "invalid StructMemberDecl"; break; @@ -6040,51 +6047,49 @@ out expr); case 170: s = "invalid StructMemberDecl"; break; case 171: s = "invalid StructMemberDecl"; break; case 172: s = "invalid StructMemberDecl"; break; - case 173: s = "invalid StructMemberDecl"; break; - case 174: s = "invalid StructMemberDecl"; break; + case 173: s = "invalid InterfaceMemberDecl"; break; + case 174: s = "invalid InterfaceMemberDecl"; break; case 175: s = "invalid InterfaceMemberDecl"; break; - case 176: s = "invalid InterfaceMemberDecl"; break; - case 177: s = "invalid InterfaceMemberDecl"; break; - case 178: s = "invalid TypeWithRestriction"; break; - case 179: s = "invalid TypeWithRestriction"; break; - case 180: s = "invalid SimpleType"; break; - case 181: s = "invalid AccessorModifiers"; break; - case 182: s = "this symbol not expected in Block"; break; - case 183: s = "invalid EventAccessorDecls"; break; - case 184: s = "invalid ConstructorInitializer"; break; - case 185: s = "invalid OverloadableOperator"; break; - case 186: s = "invalid AccessorDecls"; break; - case 187: s = "invalid InterfaceAccessors"; break; - case 188: s = "invalid InterfaceAccessors"; break; - case 189: s = "invalid GetAccessorDecl"; break; - case 190: s = "invalid SetAccessorDecl"; break; - case 191: s = "invalid VariableInitializer"; break; - case 192: s = "this symbol not expected in Statement"; break; - case 193: s = "invalid Statement"; break; - case 194: s = "invalid AssignmentOperator"; break; - case 195: s = "invalid ObjectPropertyInitializerOrVariableInitializer"; break; - case 196: s = "invalid ObjectPropertyInitializerOrVariableInitializer"; break; - case 197: s = "invalid EmbeddedStatement"; break; + case 176: s = "invalid TypeWithRestriction"; break; + case 177: s = "invalid TypeWithRestriction"; break; + case 178: s = "invalid SimpleType"; break; + case 179: s = "invalid AccessorModifiers"; break; + case 180: s = "this symbol not expected in Block"; break; + case 181: s = "invalid EventAccessorDecls"; break; + case 182: s = "invalid ConstructorInitializer"; break; + case 183: s = "invalid OverloadableOperator"; break; + case 184: s = "invalid AccessorDecls"; break; + case 185: s = "invalid InterfaceAccessors"; break; + case 186: s = "invalid InterfaceAccessors"; break; + case 187: s = "invalid GetAccessorDecl"; break; + case 188: s = "invalid SetAccessorDecl"; break; + case 189: s = "invalid VariableInitializer"; break; + case 190: s = "this symbol not expected in Statement"; break; + case 191: s = "invalid Statement"; break; + case 192: s = "invalid AssignmentOperator"; break; + case 193: s = "invalid ObjectPropertyInitializerOrVariableInitializer"; break; + case 194: s = "invalid ObjectPropertyInitializerOrVariableInitializer"; break; + case 195: s = "invalid EmbeddedStatement"; break; + case 196: s = "invalid EmbeddedStatement"; break; + case 197: s = "this symbol not expected in EmbeddedStatement"; break; case 198: s = "invalid EmbeddedStatement"; break; - case 199: s = "this symbol not expected in EmbeddedStatement"; break; - case 200: s = "invalid EmbeddedStatement"; break; - case 201: s = "invalid ForInitializer"; break; - case 202: s = "invalid GotoStatement"; break; - case 203: s = "invalid ResourceAcquisition"; break; - case 204: s = "invalid SwitchLabel"; break; - case 205: s = "invalid CatchClause"; break; - case 206: s = "invalid UnaryExpr"; break; - case 207: s = "invalid PrimaryExpr"; break; - case 208: s = "invalid PrimaryExpr"; break; - case 209: s = "invalid TypeArgumentList"; break; - case 210: s = "invalid NewExpression"; break; - case 211: s = "invalid NewExpression"; break; - case 212: s = "invalid LambdaExpressionParameter"; break; - case 213: s = "invalid LambdaExpressionBody"; break; - case 214: s = "invalid RelationalExpr"; break; - case 215: s = "invalid RelationalExpr"; break; - case 216: s = "invalid TypeParameterConstraintsClauseBase"; break; - case 217: s = "invalid QueryExpressionBody"; break; + case 199: s = "invalid ForInitializer"; break; + case 200: s = "invalid GotoStatement"; break; + case 201: s = "invalid ResourceAcquisition"; break; + case 202: s = "invalid SwitchLabel"; break; + case 203: s = "invalid CatchClause"; break; + case 204: s = "invalid UnaryExpr"; break; + case 205: s = "invalid PrimaryExpr"; break; + case 206: s = "invalid PrimaryExpr"; break; + case 207: s = "invalid TypeArgumentList"; break; + case 208: s = "invalid NewExpression"; break; + case 209: s = "invalid NewExpression"; break; + case 210: s = "invalid LambdaExpressionParameter"; break; + case 211: s = "invalid LambdaExpressionBody"; break; + case 212: s = "invalid RelationalExpr"; break; + case 213: s = "invalid RelationalExpr"; break; + case 214: s = "invalid TypeParameterConstraintsClauseBase"; break; + case 215: s = "invalid QueryExpressionBody"; break; default: s = "error " + errorNumber; break; } @@ -6115,7 +6120,6 @@ out expr); {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,T,x,x, x,x,T,x, x,x,T,x, x,T,x,x, x,x,x,T, x,x,x,x, x,x,T,x, x,x,x,T, x,T,x,T, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, T,x,x,x, x,x,x,x, T,T,x,x, T,x,x,T, x,x,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,x,x}, {T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,T,x,x, x,x,T,x, x,x,T,x, x,T,x,x, x,x,x,T, x,x,x,x, x,x,T,x, x,x,x,T, x,T,x,T, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, T,x,x,x, x,x,x,x, T,T,x,x, T,x,x,T, x,x,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,x,x}, {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,x,x}, - {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,T,x,x, x,x,T,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, x,x,x,T, x,x,x,T, x,T,x,x, x,x,x,x, T,x,T,x, T,x,x,x, T,x,x,x, x,x,x,x, T,T,x,x, T,x,x,T, x,x,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,x,x}, {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,x, x,x,T,x, T,T,T,T, x,x,x,T, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,T,x,T, T,x,T,x, T,x,T,x, T,T,T,x, x,x,x,T, x,x,x,x, T,x,T,T, x,x,x,T, x,x,x,T, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, T,T,x,x, x,x,x,x, T,T,x,x, T,x,x,T, x,x,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,x,x}, @@ -6134,6 +6138,7 @@ out expr); {x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,T,x, x,T,T,x, x,x,T,T, T,x,T,x, x,x,x,x, T,x,x,T, x,x,x,x, x,x,T,x, x,x,x,T, x,T,T,T, x,x,x,x, x,x,x,x, x,x,T,x, T,T,x,x, T,x,x,T, x,T,x,T, T,T,T,x, T,x,x,T, x,x,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,T,x,x, x,x,T,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, x,x,x,T, x,x,x,T, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, T,x,x,x, x,x,x,x, T,T,x,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, + {x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,T,x,x, x,x,T,x, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, x,x,x,T, x,x,x,T, x,T,x,x, x,x,x,x, T,x,T,x, T,x,x,x, T,x,x,x, x,x,x,x, T,T,x,x, T,x,x,T, x,x,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,T,x,x, T,T,T,x, x,x,x} diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG index 7056dc0f8f..26e3c7716e 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG @@ -636,21 +636,14 @@ FormalParameterList parameter> .) = { AttributeSection (.attributes.Add(section); .) } - ( - FixedParameter (. bool paramsFound = false; - p.Attributes = attributes; - parameter.Add(p); - .) - { - "," (. attributes = new List(); if (paramsFound) Error("params array must be at end of parameter list"); .) - { AttributeSection (.attributes.Add(section); .) } - ( - FixedParameter (. p.Attributes = attributes; parameter.Add(p); .) - | ParameterArray (. paramsFound = true; p.Attributes = attributes; parameter.Add(p); .) - ) - } - | ParameterArray (. p.Attributes = attributes; parameter.Add(p); .) - ) + FixedParameter (. p.Attributes = attributes; + parameter.Add(p); + .) + { + "," (. attributes = new List(); .) + { AttributeSection (.attributes.Add(section); .) } + FixedParameter (. p.Attributes = attributes; parameter.Add(p); .) + } . FixedParameter @@ -658,21 +651,20 @@ FixedParameter TypeReference type; ParameterModifiers mod = ParameterModifiers.In; Location start = la.Location; + Expression expr; .) = [ "ref" (. mod = ParameterModifiers.Ref; .) | "out" (. mod = ParameterModifiers.Out; .) + | "params" (. mod = ParameterModifiers.Params; .) ] - Type Identifier (. p = new ParameterDeclarationExpression(type, t.val, mod); p.StartLocation = start; p.EndLocation = t.Location; .) + Type + Identifier (. p = new ParameterDeclarationExpression(type, t.val, mod); .) + [ "=" Expr (. p.DefaultValue = expr; p.ParamModifier |= ParameterModifiers.Optional; .) ] + (. p.StartLocation = start; p.EndLocation = t.EndLocation; .) . -ParameterArray -(. TypeReference type; .) -= - "params" Type Identifier (. p = new ParameterDeclarationExpression(type, t.val, ParameterModifiers.Params); .) -. - AccessorModifiers (. m = new ModifierList(); .) = @@ -2343,17 +2335,32 @@ TypeArgumentList types, bool canBeUnbound> TypeParameterList templates> (. - AttributeSection section; - List attributes = new List(); + TemplateDefinition template; .) = - "<" { AttributeSection (. attributes.Add(section); .) } - Identifier (. templates.Add(new TemplateDefinition(t.val, attributes)); .) - { "," { AttributeSection (. attributes.Add(section); .) } - Identifier (. templates.Add(new TemplateDefinition(t.val, attributes)); .)} + "<" + VariantTypeParameter (. templates.Add(template); .) + { "," + VariantTypeParameter (. templates.Add(template); .) + } ">" . +VariantTypeParameter +(. + typeParameter = new TemplateDefinition(); + AttributeSection section; +.) += + { AttributeSection (. typeParameter.Attributes.Add(section); .) } + [ + "in" (. typeParameter.VarianceModifier = VarianceModifier.Contravariant; .) + | "out" (. typeParameter.VarianceModifier = VarianceModifier.Covariant; .) + ] + Identifier (. typeParameter.Name = t.val; typeParameter.StartLocation = t.Location; .) +(. typeParameter.EndLocation = t.EndLocation; .) +. + TypeParameterConstraintsClause templates> (. string name = ""; TypeReference type; .) = diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index 1024f3314f..4f88c33718 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -1688,8 +1688,7 @@ IsMustOverride(m)) { } compilationUnit.AddChild(methodDeclaration); - - if (ParseMethodBodies) { + if (ParseMethodBodies) { Block( #line 946 "VBNET.ATG" out stmt); @@ -2068,8 +2067,7 @@ out eventAccessorDeclaration); { Error("Need to provide RaiseEvent accessor."); } - - EventDeclaration decl = new EventDeclaration { + EventDeclaration decl = new EventDeclaration { TypeReference = type, Name = customEventName, Modifier = m.Modifier, Attributes = attributes, StartLocation = m.GetDeclarationLocation(startPos), @@ -6809,8 +6807,7 @@ out goToStatement); #line 3099 "VBNET.ATG" string val = goToStatement.Label; - - // if value is numeric, make sure that is 0 + // if value is numeric, make sure that is 0 try { long intLabel = Int64.Parse(val); if(intLabel != 0) { diff --git a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs index 8457bb09b7..2fe16ccdce 100644 --- a/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/PrettyPrinter/CSharp/CSharpOutputVisitor.cs @@ -119,6 +119,13 @@ namespace ICSharpCode.NRefactory.PrettyPrinter outputFormatter.PrintToken(Tokens.LessThan); for (int i = 0; i < templates.Count; i++) { if (i > 0) PrintFormattedComma(); + if (templates[i].VarianceModifier == VarianceModifier.Contravariant) { + outputFormatter.PrintToken(Tokens.In); + outputFormatter.Space(); + } else if (templates[i].VarianceModifier == VarianceModifier.Covariant) { + outputFormatter.PrintToken(Tokens.Out); + outputFormatter.Space(); + } outputFormatter.PrintIdentifier(templates[i].Name); } outputFormatter.PrintToken(Tokens.GreaterThan); @@ -741,17 +748,18 @@ namespace ICSharpCode.NRefactory.PrettyPrinter public override object TrackedVisitParameterDeclarationExpression(ParameterDeclarationExpression parameterDeclarationExpression, object data) { VisitAttributes(parameterDeclarationExpression.Attributes, data); - if (!parameterDeclarationExpression.DefaultValue.IsNull) { - outputFormatter.PrintText("[System.Runtime.InteropServices.OptionalAttribute, System.Runtime.InteropServices.DefaultParameterValueAttribute("); - TrackVisit(parameterDeclarationExpression.DefaultValue, data); - outputFormatter.PrintText(")] "); - } OutputModifier(parameterDeclarationExpression.ParamModifier, parameterDeclarationExpression); if (!parameterDeclarationExpression.TypeReference.IsNull) { TrackVisit(parameterDeclarationExpression.TypeReference, data); outputFormatter.Space(); } outputFormatter.PrintIdentifier(parameterDeclarationExpression.ParameterName); + if (!parameterDeclarationExpression.DefaultValue.IsNull) { + outputFormatter.Space(); + outputFormatter.PrintToken(Tokens.Assign); + outputFormatter.Space(); + TrackVisit(parameterDeclarationExpression.DefaultValue, data); + } return null; } @@ -2939,9 +2947,6 @@ namespace ICSharpCode.NRefactory.PrettyPrinter outputFormatter.PrintToken(Tokens.Params); outputFormatter.Space(); } - if ((modifier & ParameterModifiers.Optional) == ParameterModifiers.Optional) { - Error(node, String.Format("Optional parameters aren't supported in C#")); - } } void OutputModifier(Modifiers modifier) diff --git a/src/Libraries/NRefactory/Project/Src/Visitors/AbstractASTVisitor.cs b/src/Libraries/NRefactory/Project/Src/Visitors/AbstractASTVisitor.cs index 1541dcd1f4..a074a15c30 100644 --- a/src/Libraries/NRefactory/Project/Src/Visitors/AbstractASTVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Visitors/AbstractASTVisitor.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.20506.1 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/src/Libraries/NRefactory/Project/Src/Visitors/AbstractAstTransformer.cs b/src/Libraries/NRefactory/Project/Src/Visitors/AbstractAstTransformer.cs index ddf2d3dc2f..20d67e70dc 100644 --- a/src/Libraries/NRefactory/Project/Src/Visitors/AbstractAstTransformer.cs +++ b/src/Libraries/NRefactory/Project/Src/Visitors/AbstractAstTransformer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.20506.1 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/src/Libraries/NRefactory/Project/Src/Visitors/NodeTrackingAstVisitor.cs b/src/Libraries/NRefactory/Project/Src/Visitors/NodeTrackingAstVisitor.cs index 74885fbe53..05bbf2bb9e 100644 --- a/src/Libraries/NRefactory/Project/Src/Visitors/NodeTrackingAstVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Visitors/NodeTrackingAstVisitor.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.20506.1 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/src/Libraries/NRefactory/Project/Src/Visitors/NotImplementedAstVisitor.cs b/src/Libraries/NRefactory/Project/Src/Visitors/NotImplementedAstVisitor.cs index c08c2f6358..bf561379cb 100644 --- a/src/Libraries/NRefactory/Project/Src/Visitors/NotImplementedAstVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Visitors/NotImplementedAstVisitor.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.20506.1 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/src/Libraries/NRefactory/Test/Lexer/CSharp/PreprocessingTests.cs b/src/Libraries/NRefactory/Test/Lexer/CSharp/PreprocessingTests.cs index 61a80bf896..a56c0b1bae 100644 --- a/src/Libraries/NRefactory/Test/Lexer/CSharp/PreprocessingTests.cs +++ b/src/Libraries/NRefactory/Test/Lexer/CSharp/PreprocessingTests.cs @@ -152,8 +152,8 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.CSharp List specials = lexer.SpecialTracker.RetrieveSpecials(); Assert.IsTrue(specials[0] is BlankLine); - Assert.AreEqual(new Location(2, 1), specials[0].StartPosition); - Assert.AreEqual(new Location(2, 1), specials[0].EndPosition); + Assert.AreEqual(new Location(1, 1), specials[0].StartPosition); + Assert.AreEqual(new Location(1, 1), specials[0].EndPosition); Assert.AreEqual("#region", (specials[1] as PreprocessingDirective).Cmd); Assert.AreEqual("Region Title", (specials[1] as PreprocessingDirective).Arg); diff --git a/src/Libraries/NRefactory/Test/NRefactoryTests.csproj b/src/Libraries/NRefactory/Test/NRefactoryTests.csproj index b33310ca05..2585596823 100644 --- a/src/Libraries/NRefactory/Test/NRefactoryTests.csproj +++ b/src/Libraries/NRefactory/Test/NRefactoryTests.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -16,7 +17,7 @@ False AnyCPU 4 - v4.0 + v3.5 false diff --git a/src/Libraries/NRefactory/Test/Output/CSharp/CSharpOutputTest.cs b/src/Libraries/NRefactory/Test/Output/CSharp/CSharpOutputTest.cs index 8aaef637d5..cebde99528 100644 --- a/src/Libraries/NRefactory/Test/Output/CSharp/CSharpOutputTest.cs +++ b/src/Libraries/NRefactory/Test/Output/CSharp/CSharpOutputTest.cs @@ -777,5 +777,17 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter { TestProgram("extern alias Name;"); } + + [Test] + public void Variance() + { + TestProgram("interface C\n{\n}"); + } + + [Test] + public void OptionalParameters() + { + TestTypeMember("void M(int x = 0);"); + } } } diff --git a/src/Libraries/NRefactory/Test/Parser/TypeLevel/MethodDeclarationTests.cs b/src/Libraries/NRefactory/Test/Parser/TypeLevel/MethodDeclarationTests.cs index 26802514a3..44f7ebedce 100644 --- a/src/Libraries/NRefactory/Test/Parser/TypeLevel/MethodDeclarationTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/TypeLevel/MethodDeclarationTests.cs @@ -282,6 +282,25 @@ namespace ICSharpCode.NRefactory.Tests.Ast Assert.AreEqual(new Location(1, 2), md.Body.StartLocation); Assert.AreEqual(new Location(2, 5), md.Body.EndLocation); } + + [Test] + public void CSharpOptionalParameterTest() + { + MethodDeclaration md = ParseUtilCSharp.ParseTypeMember( + "public void Foo(string bar = null, int baz = 0) { }" + ); + Assert.AreEqual("Foo", md.Name); + + Assert.AreEqual("bar", md.Parameters[0].ParameterName); + Assert.AreEqual("System.String", md.Parameters[0].TypeReference.Type); + Assert.AreEqual(ParameterModifiers.In | ParameterModifiers.Optional, md.Parameters[0].ParamModifier); + Assert.IsNull(((PrimitiveExpression)md.Parameters[0].DefaultValue).Value); + + Assert.AreEqual("baz", md.Parameters[1].ParameterName); + Assert.AreEqual("System.Int32", md.Parameters[1].TypeReference.Type); + Assert.AreEqual(ParameterModifiers.In | ParameterModifiers.Optional, md.Parameters[1].ParamModifier); + Assert.AreEqual(0, ((PrimitiveExpression)md.Parameters[1].DefaultValue).Value); + } #endregion #region VB.NET