From 80c70338c7c0493edfa3f09b40b842fd1271c755 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 24 Jul 2005 13:55:05 +0000 Subject: [PATCH] Fixed code completion bugs regarding "global::"/"Global". git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@240 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Src/Parser/ExpressionFinder.cs | 6 + .../NRefactory/Project/NRefactory.csproj | 1 - .../Src/Output/CSharp/CSharpOutputVisitor.cs | 10 +- .../Src/Output/VBNet/VBNetOutputVisitor.cs | 16 +- .../Expressions/GlobalReferenceExpression.cs | 25 - .../General/GlobalScope/TypeDeclaration.cs | 4 +- .../Src/Parser/AST/General/TypeReference.cs | 20 + .../Project/Src/Parser/CSharp/Parser.cs | 1835 ++++++++--------- .../Project/Src/Parser/CSharp/cs.ATG | 139 +- .../Project/Src/Parser/VBNet/Parser.cs | 1528 +++++++------- .../Project/Src/Parser/VBNet/VBNET.ATG | 53 +- .../Src/Parser/Visitors/AbstractASTVisitor.cs | 6 - .../Src/Parser/Visitors/IASTVisitor.cs | 1 - .../GlobalReferenceExpressionTests.cs | 32 +- .../GlobalScope/TypeDeclarationTests.cs | 14 +- .../NRefactoryASTConvertVisitor.cs | 4 +- .../NRefactoryResolver/NRefactoryResolver.cs | 4 + .../Src/Dom/NRefactoryResolver/TypeVisitor.cs | 45 +- 18 files changed, 1887 insertions(+), 1856 deletions(-) delete mode 100644 src/Libraries/NRefactory/Project/Src/Parser/AST/General/Expressions/GlobalReferenceExpression.cs diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/ExpressionFinder.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/ExpressionFinder.cs index 11037902db..e08c6b22f4 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/ExpressionFinder.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Parser/ExpressionFinder.cs @@ -509,6 +509,12 @@ namespace CSharpBinding.Parser case '.': curTokenType = Dot; break; + case ':': + if (GetNext() == ':') { + // treat :: like dot + curTokenType = Dot; + } + break; case '\'': case '"': if (ReadStringLiteral(ch)) { diff --git a/src/Libraries/NRefactory/Project/NRefactory.csproj b/src/Libraries/NRefactory/Project/NRefactory.csproj index 62011d385f..710297cad7 100644 --- a/src/Libraries/NRefactory/Project/NRefactory.csproj +++ b/src/Libraries/NRefactory/Project/NRefactory.csproj @@ -188,7 +188,6 @@ - diff --git a/src/Libraries/NRefactory/Project/Src/Output/CSharp/CSharpOutputVisitor.cs b/src/Libraries/NRefactory/Project/Src/Output/CSharp/CSharpOutputVisitor.cs index 4471f4d808..702f8c111e 100644 --- a/src/Libraries/NRefactory/Project/Src/Output/CSharp/CSharpOutputVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Output/CSharp/CSharpOutputVisitor.cs @@ -123,6 +123,9 @@ namespace ICSharpCode.NRefactory.PrettyPrinter public object Visit(TypeReference typeReference, object data) { + if (typeReference.IsGlobal) { + outputFormatter.PrintText("global::"); + } if (typeReference.Type == null || typeReference.Type.Length ==0) { outputFormatter.PrintText("void"); } else { @@ -342,7 +345,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter if (i > 0) { PrintFormattedComma(); } - outputFormatter.PrintIdentifier((string)typeDeclaration.BaseTypes[i]); + nodeTracker.TrackedVisit(typeDeclaration.BaseTypes[i], data); } } @@ -2073,11 +2076,6 @@ namespace ICSharpCode.NRefactory.PrettyPrinter return null; } - public object Visit(GlobalReferenceExpression globalReferenceExpression, object data) { - outputFormatter.PrintText("global::"); - return null; - } - public object Visit(ObjectCreateExpression objectCreateExpression, object data) { outputFormatter.PrintToken(Tokens.New); diff --git a/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputVisitor.cs b/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputVisitor.cs index 4f65b122b4..63f5a238bd 100644 --- a/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputVisitor.cs @@ -125,6 +125,10 @@ namespace ICSharpCode.NRefactory.PrettyPrinter public object Visit(TypeReference typeReference, object data) { + if (typeReference.IsGlobal) { + outputFormatter.PrintToken(Tokens.Global); + outputFormatter.PrintToken(Tokens.Dot); + } if (typeReference.Type == null || typeReference.Type.Length ==0) { outputFormatter.PrintText("Void"); } else { @@ -309,9 +313,10 @@ namespace ICSharpCode.NRefactory.PrettyPrinter outputFormatter.NewLine(); if (typeDeclaration.BaseTypes != null) { - foreach (string baseType in typeDeclaration.BaseTypes) { + foreach (TypeReference baseTypeRef in typeDeclaration.BaseTypes) { outputFormatter.Indent(); + string baseType = baseTypeRef.Type; bool baseTypeIsInterface = baseType.StartsWith("I") && (baseType.Length <= 1 || Char.IsUpper(baseType[1])); if (!baseTypeIsInterface || typeDeclaration.Type == Types.Interface) { @@ -320,7 +325,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter outputFormatter.PrintToken(Tokens.Implements); } outputFormatter.Space(); - outputFormatter.PrintIdentifier(baseType); + nodeTracker.TrackedVisit(baseTypeRef, data); outputFormatter.NewLine(); } } @@ -2126,13 +2131,6 @@ namespace ICSharpCode.NRefactory.PrettyPrinter return null; } - public object Visit(GlobalReferenceExpression globalReferenceExpression, object data) - { - outputFormatter.PrintToken(Tokens.Global); - outputFormatter.PrintToken(Tokens.Dot); - return null; - } - public object Visit(ObjectCreateExpression objectCreateExpression, object data) { outputFormatter.PrintToken(Tokens.New); diff --git a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/Expressions/GlobalReferenceExpression.cs b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/Expressions/GlobalReferenceExpression.cs deleted file mode 100644 index 94cedb8a92..0000000000 --- a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/Expressions/GlobalReferenceExpression.cs +++ /dev/null @@ -1,25 +0,0 @@ -// -// 2002-2005 AlphaSierraPapa -// GNU General Public License -// -// $Revision$ -// - -using System; -using System.Collections; - -namespace ICSharpCode.NRefactory.Parser.AST -{ - public class GlobalReferenceExpression : Expression - { - public override object AcceptVisitor(IASTVisitor visitor, object data) - { - return visitor.Visit(this, data); - } - - public override string ToString() - { - return String.Format("[GlobalReferenceExpression]"); - } - } -} diff --git a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/GlobalScope/TypeDeclaration.cs b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/GlobalScope/TypeDeclaration.cs index 77b9bba024..b109d4e549 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/GlobalScope/TypeDeclaration.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/GlobalScope/TypeDeclaration.cs @@ -22,7 +22,7 @@ namespace ICSharpCode.NRefactory.Parser.AST // Children of Enum: FieldDeclaration string name = ""; Types type = Types.Class; // Class | Interface | Struct | Enum - ArrayList bases = new ArrayList(); // TODO: can be generics too! + List bases = new List(); List templates = new List(); public string Name { @@ -43,7 +43,7 @@ namespace ICSharpCode.NRefactory.Parser.AST } } - public ArrayList BaseTypes { + public List BaseTypes { get { return bases; } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/TypeReference.cs b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/TypeReference.cs index 4012ca74de..d5002ee915 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/TypeReference.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/TypeReference.cs @@ -20,6 +20,7 @@ namespace ICSharpCode.NRefactory.Parser.AST int pointerNestingLevel = 0; int[] rankSpecifier = null; List genericTypes = new List(1); + bool isGlobal = false; static Dictionary types = new Dictionary(); static Dictionary vbtypes = new Dictionary(); @@ -131,6 +132,18 @@ namespace ICSharpCode.NRefactory.Parser.AST } } + /// + /// Gets/Sets if the type reference had a "global::" prefix. + /// + public bool IsGlobal { + get { + return isGlobal; + } + set { + isGlobal = value; + } + } + public static TypeReference CheckNull(TypeReference typeReference) { return typeReference == null ? NullTypeReference.Instance : typeReference; @@ -161,6 +174,13 @@ namespace ICSharpCode.NRefactory.Parser.AST this.systemType = systemType; } + public TypeReference(string type, List genericTypes) : this(type) + { + if (genericTypes != null) { + this.genericTypes = genericTypes; + } + } + public TypeReference(string type, int[] rankSpecifier) : this(type, 0, rankSpecifier) { } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs index 725cb2afac..a225802402 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs @@ -142,7 +142,7 @@ bool IsQualident(ref Token pt, out string qualident) if (pt.kind == Tokens.Identifier) { qualidentBuilder.Length = 0; qualidentBuilder.Append(pt.val); pt = Peek(); - while (pt.kind == Tokens.Dot) { + while (pt.kind == Tokens.Dot || pt.kind == Tokens.DoubleColon) { pt = Peek(); if (pt.kind != Tokens.Identifier) { qualident = String.Empty; @@ -592,25 +592,25 @@ m, attributes); } void Qualident( -#line 816 "cs.ATG" +#line 814 "cs.ATG" out string qualident) { Expect(1); -#line 818 "cs.ATG" +#line 816 "cs.ATG" qualidentBuilder.Length = 0; qualidentBuilder.Append(t.val); while ( -#line 819 "cs.ATG" +#line 817 "cs.ATG" DotAndIdent()) { Expect(14); Expect(1); -#line 819 "cs.ATG" +#line 817 "cs.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(t.val); } -#line 822 "cs.ATG" +#line 820 "cs.ATG" qualident = qualidentBuilder.ToString(); } @@ -704,43 +704,43 @@ out expr); } void Expr( -#line 1858 "cs.ATG" +#line 1856 "cs.ATG" out Expression expr) { -#line 1859 "cs.ATG" +#line 1857 "cs.ATG" expr = null; Expression expr1 = null, expr2 = null; UnaryExpr( -#line 1861 "cs.ATG" +#line 1859 "cs.ATG" out expr); if (StartOf(5)) { ConditionalOrExpr( -#line 1864 "cs.ATG" +#line 1862 "cs.ATG" ref expr); if (la.kind == 12) { lexer.NextToken(); Expr( -#line 1864 "cs.ATG" +#line 1862 "cs.ATG" out expr1); Expect(9); Expr( -#line 1864 "cs.ATG" +#line 1862 "cs.ATG" out expr2); -#line 1864 "cs.ATG" +#line 1862 "cs.ATG" expr = new ConditionalExpression(expr, expr1, expr2); } } else if (StartOf(6)) { -#line 1866 "cs.ATG" +#line 1864 "cs.ATG" AssignmentOperatorType op; Expression val; AssignmentOperator( -#line 1866 "cs.ATG" +#line 1864 "cs.ATG" out op); Expr( -#line 1866 "cs.ATG" +#line 1864 "cs.ATG" out val); -#line 1866 "cs.ATG" +#line 1864 "cs.ATG" expr = new AssignmentExpression(expr, op, val); } else SynErr(127); } @@ -816,76 +816,76 @@ out attribute); } void TypeModifier( -#line 992 "cs.ATG" +#line 988 "cs.ATG" Modifiers m) { switch (la.kind) { case 87: { lexer.NextToken(); -#line 994 "cs.ATG" +#line 990 "cs.ATG" m.Add(Modifier.New); break; } case 96: { lexer.NextToken(); -#line 995 "cs.ATG" +#line 991 "cs.ATG" m.Add(Modifier.Public); break; } case 95: { lexer.NextToken(); -#line 996 "cs.ATG" +#line 992 "cs.ATG" m.Add(Modifier.Protected); break; } case 82: { lexer.NextToken(); -#line 997 "cs.ATG" +#line 993 "cs.ATG" m.Add(Modifier.Internal); break; } case 94: { lexer.NextToken(); -#line 998 "cs.ATG" +#line 994 "cs.ATG" m.Add(Modifier.Private); break; } case 117: { lexer.NextToken(); -#line 999 "cs.ATG" +#line 995 "cs.ATG" m.Add(Modifier.Unsafe); break; } case 47: { lexer.NextToken(); -#line 1000 "cs.ATG" +#line 996 "cs.ATG" m.Add(Modifier.Abstract); break; } case 101: { lexer.NextToken(); -#line 1001 "cs.ATG" +#line 997 "cs.ATG" m.Add(Modifier.Sealed); break; } case 105: { lexer.NextToken(); -#line 1002 "cs.ATG" +#line 998 "cs.ATG" m.Add(Modifier.Static); break; } case 1: { lexer.NextToken(); -#line 1003 "cs.ATG" +#line 999 "cs.ATG" if (t.val == "partial") { m.Add(Modifier.Partial); } break; } @@ -899,7 +899,7 @@ Modifiers m, List attributes) { #line 705 "cs.ATG" TypeReference type; - ArrayList names; + List names; List p = new List(); string name; List templates; @@ -1070,74 +1070,72 @@ templates); out name); #line 783 "cs.ATG" - newType.BaseTypes = new ArrayList(); - newType.BaseTypes.Add(name); - + newType.BaseTypes.Add(new TypeReference(name)); } -#line 786 "cs.ATG" +#line 784 "cs.ATG" newType.StartLocation = t.EndLocation; EnumBody(); if (la.kind == 11) { lexer.NextToken(); } -#line 788 "cs.ATG" +#line 786 "cs.ATG" newType.EndLocation = t.Location; compilationUnit.BlockEnd(); } else { lexer.NextToken(); -#line 792 "cs.ATG" +#line 790 "cs.ATG" DelegateDeclaration delegateDeclr = new DelegateDeclaration(m.Modifier, attributes); templates = delegateDeclr.Templates; delegateDeclr.StartLocation = t.Location; if ( -#line 796 "cs.ATG" +#line 794 "cs.ATG" NotVoidPointer()) { Expect(121); -#line 796 "cs.ATG" +#line 794 "cs.ATG" delegateDeclr.ReturnType = new TypeReference("void", 0, null); } else if (StartOf(8)) { Type( -#line 797 "cs.ATG" +#line 795 "cs.ATG" out type); -#line 797 "cs.ATG" +#line 795 "cs.ATG" delegateDeclr.ReturnType = type; } else SynErr(129); Expect(1); -#line 799 "cs.ATG" +#line 797 "cs.ATG" delegateDeclr.Name = t.val; if (la.kind == 22) { TypeParameterList( -#line 802 "cs.ATG" +#line 800 "cs.ATG" templates); } Expect(19); if (StartOf(9)) { FormalParameterList( -#line 804 "cs.ATG" +#line 802 "cs.ATG" p); -#line 804 "cs.ATG" +#line 802 "cs.ATG" delegateDeclr.Parameters = p; } Expect(20); while ( -#line 808 "cs.ATG" +#line 806 "cs.ATG" IdentIsWhere()) { TypeParameterConstraintsClause( -#line 808 "cs.ATG" +#line 806 "cs.ATG" templates); } Expect(11); -#line 810 "cs.ATG" +#line 808 "cs.ATG" delegateDeclr.EndLocation = t.Location; compilationUnit.AddChild(delegateDeclr); @@ -1146,91 +1144,90 @@ templates); } void TypeParameterList( -#line 2212 "cs.ATG" +#line 2239 "cs.ATG" List templates) { -#line 2214 "cs.ATG" +#line 2241 "cs.ATG" AttributeSection section; List attributes = new List(); Expect(22); while (la.kind == 17) { AttributeSection( -#line 2218 "cs.ATG" +#line 2245 "cs.ATG" out section); -#line 2218 "cs.ATG" +#line 2245 "cs.ATG" attributes.Add(section); } Expect(1); -#line 2219 "cs.ATG" +#line 2246 "cs.ATG" templates.Add(new TemplateDefinition(t.val, attributes)); while (la.kind == 13) { lexer.NextToken(); while (la.kind == 17) { AttributeSection( -#line 2220 "cs.ATG" +#line 2247 "cs.ATG" out section); -#line 2220 "cs.ATG" +#line 2247 "cs.ATG" attributes.Add(section); } Expect(1); -#line 2221 "cs.ATG" +#line 2248 "cs.ATG" templates.Add(new TemplateDefinition(t.val, attributes)); } Expect(21); } void ClassBase( -#line 825 "cs.ATG" -out ArrayList names) { +#line 823 "cs.ATG" +out List names) { -#line 827 "cs.ATG" - string qualident; - names = new ArrayList(); - List types; +#line 825 "cs.ATG" + TypeReference typeRef; + names = new List(); Expect(9); ClassType( -#line 832 "cs.ATG" -out qualident, out types); +#line 829 "cs.ATG" +out typeRef); -#line 832 "cs.ATG" - names.Add(qualident); // TODO: enter the types +#line 829 "cs.ATG" + if (typeRef != null) { names.Add(typeRef); } while (la.kind == 13) { lexer.NextToken(); - Qualident( -#line 833 "cs.ATG" -out qualident); + TypeName( +#line 830 "cs.ATG" +out typeRef); -#line 833 "cs.ATG" - names.Add(qualident); +#line 830 "cs.ATG" + if (typeRef != null) { names.Add(typeRef); } } } void TypeParameterConstraintsClause( -#line 2225 "cs.ATG" +#line 2252 "cs.ATG" List templates) { -#line 2226 "cs.ATG" +#line 2253 "cs.ATG" string name = ""; TypeReference type; Expect(1); -#line 2228 "cs.ATG" +#line 2255 "cs.ATG" if (t.val != "where") Error("where expected"); Expect(1); -#line 2229 "cs.ATG" +#line 2256 "cs.ATG" name = t.val; Expect(9); TypeParameterConstraintsClauseBase( -#line 2231 "cs.ATG" +#line 2258 "cs.ATG" out type); -#line 2232 "cs.ATG" +#line 2259 "cs.ATG" TemplateDefinition td = null; foreach (TemplateDefinition d in templates) { if (d.Name == name) { @@ -1243,10 +1240,10 @@ out type); while (la.kind == 13) { lexer.NextToken(); TypeParameterConstraintsClauseBase( -#line 2241 "cs.ATG" +#line 2268 "cs.ATG" out type); -#line 2242 "cs.ATG" +#line 2269 "cs.ATG" td = null; foreach (TemplateDefinition d in templates) { if (d.Name == name) { @@ -1261,115 +1258,115 @@ out type); void ClassBody() { -#line 837 "cs.ATG" +#line 834 "cs.ATG" AttributeSection section; Expect(15); while (StartOf(10)) { -#line 840 "cs.ATG" +#line 837 "cs.ATG" List attributes = new List(); Modifiers m = new Modifiers(); while (la.kind == 17) { AttributeSection( -#line 843 "cs.ATG" +#line 840 "cs.ATG" out section); -#line 843 "cs.ATG" +#line 840 "cs.ATG" attributes.Add(section); } while (StartOf(11)) { MemberModifier( -#line 844 "cs.ATG" +#line 841 "cs.ATG" m); } ClassMemberDecl( -#line 845 "cs.ATG" +#line 842 "cs.ATG" m, attributes); } Expect(16); } void StructInterfaces( -#line 850 "cs.ATG" -out ArrayList names) { +#line 847 "cs.ATG" +out List names) { -#line 852 "cs.ATG" - string qualident; - names = new ArrayList(); +#line 849 "cs.ATG" + TypeReference typeRef; + names = new List(); Expect(9); - Qualident( -#line 856 "cs.ATG" -out qualident); + TypeName( +#line 853 "cs.ATG" +out typeRef); -#line 856 "cs.ATG" - names.Add(qualident); +#line 853 "cs.ATG" + if (typeRef != null) { names.Add(typeRef); } while (la.kind == 13) { lexer.NextToken(); - Qualident( -#line 857 "cs.ATG" -out qualident); + TypeName( +#line 854 "cs.ATG" +out typeRef); -#line 857 "cs.ATG" - names.Add(qualident); +#line 854 "cs.ATG" + if (typeRef != null) { names.Add(typeRef); } } } void StructBody() { -#line 861 "cs.ATG" +#line 858 "cs.ATG" AttributeSection section; Expect(15); while (StartOf(12)) { -#line 864 "cs.ATG" +#line 861 "cs.ATG" List attributes = new List(); Modifiers m = new Modifiers(); while (la.kind == 17) { AttributeSection( -#line 867 "cs.ATG" +#line 864 "cs.ATG" out section); -#line 867 "cs.ATG" +#line 864 "cs.ATG" attributes.Add(section); } while (StartOf(11)) { MemberModifier( -#line 868 "cs.ATG" +#line 865 "cs.ATG" m); } StructMemberDecl( -#line 869 "cs.ATG" +#line 866 "cs.ATG" m, attributes); } Expect(16); } void InterfaceBase( -#line 874 "cs.ATG" -out ArrayList names) { +#line 871 "cs.ATG" +out List names) { -#line 876 "cs.ATG" - string qualident; - names = new ArrayList(); +#line 873 "cs.ATG" + TypeReference typeRef; + names = new List(); Expect(9); - Qualident( -#line 880 "cs.ATG" -out qualident); + TypeName( +#line 877 "cs.ATG" +out typeRef); -#line 880 "cs.ATG" - names.Add(qualident); +#line 877 "cs.ATG" + if (typeRef != null) { names.Add(typeRef); } while (la.kind == 13) { lexer.NextToken(); - Qualident( -#line 881 "cs.ATG" -out qualident); + TypeName( +#line 878 "cs.ATG" +out typeRef); -#line 881 "cs.ATG" - names.Add(qualident); +#line 878 "cs.ATG" + if (typeRef != null) { names.Add(typeRef); } } } @@ -1382,72 +1379,72 @@ out qualident); } void IntegralType( -#line 1017 "cs.ATG" +#line 1010 "cs.ATG" out string name) { -#line 1017 "cs.ATG" +#line 1010 "cs.ATG" name = ""; switch (la.kind) { case 100: { lexer.NextToken(); -#line 1019 "cs.ATG" +#line 1012 "cs.ATG" name = "sbyte"; break; } case 52: { lexer.NextToken(); -#line 1020 "cs.ATG" +#line 1013 "cs.ATG" name = "byte"; break; } case 102: { lexer.NextToken(); -#line 1021 "cs.ATG" +#line 1014 "cs.ATG" name = "short"; break; } case 118: { lexer.NextToken(); -#line 1022 "cs.ATG" +#line 1015 "cs.ATG" name = "ushort"; break; } case 80: { lexer.NextToken(); -#line 1023 "cs.ATG" +#line 1016 "cs.ATG" name = "int"; break; } case 114: { lexer.NextToken(); -#line 1024 "cs.ATG" +#line 1017 "cs.ATG" name = "uint"; break; } case 85: { lexer.NextToken(); -#line 1025 "cs.ATG" +#line 1018 "cs.ATG" name = "long"; break; } case 115: { lexer.NextToken(); -#line 1026 "cs.ATG" +#line 1019 "cs.ATG" name = "ulong"; break; } case 55: { lexer.NextToken(); -#line 1027 "cs.ATG" +#line 1020 "cs.ATG" name = "char"; break; } @@ -1457,25 +1454,25 @@ out string name) { void EnumBody() { -#line 887 "cs.ATG" +#line 884 "cs.ATG" FieldDeclaration f; Expect(15); if (la.kind == 1 || la.kind == 17) { EnumMemberDecl( -#line 889 "cs.ATG" +#line 886 "cs.ATG" out f); -#line 889 "cs.ATG" +#line 886 "cs.ATG" compilationUnit.AddChild(f); while ( -#line 890 "cs.ATG" +#line 887 "cs.ATG" NotFinalComma()) { Expect(13); EnumMemberDecl( -#line 890 "cs.ATG" +#line 887 "cs.ATG" out f); -#line 890 "cs.ATG" +#line 887 "cs.ATG" compilationUnit.AddChild(f); } if (la.kind == 13) { @@ -1486,88 +1483,90 @@ out f); } void Type( -#line 895 "cs.ATG" +#line 892 "cs.ATG" out TypeReference type) { -#line 897 "cs.ATG" - string name = ""; +#line 894 "cs.ATG" + string name; int pointer = 0; - List types = null; type = null; if (la.kind == 1 || la.kind == 89 || la.kind == 106) { ClassType( -#line 903 "cs.ATG" -out name, out types); +#line 899 "cs.ATG" +out type); } else if (StartOf(14)) { SimpleType( -#line 904 "cs.ATG" +#line 900 "cs.ATG" out name); + +#line 900 "cs.ATG" + type = new TypeReference(name); } else if (la.kind == 121) { lexer.NextToken(); Expect(6); -#line 905 "cs.ATG" - pointer = 1; name = "void"; +#line 901 "cs.ATG" + pointer = 1; type = new TypeReference("void"); } else SynErr(132); -#line 906 "cs.ATG" - ArrayList r = new ArrayList(); +#line 902 "cs.ATG" + List r = new List(); while ( -#line 908 "cs.ATG" +#line 904 "cs.ATG" IsPointerOrDims()) { -#line 908 "cs.ATG" +#line 904 "cs.ATG" int i = 0; if (la.kind == 6) { lexer.NextToken(); -#line 909 "cs.ATG" +#line 905 "cs.ATG" ++pointer; } else if (la.kind == 17) { lexer.NextToken(); while (la.kind == 13) { lexer.NextToken(); -#line 910 "cs.ATG" +#line 906 "cs.ATG" ++i; } Expect(18); -#line 910 "cs.ATG" +#line 906 "cs.ATG" r.Add(i); } else SynErr(133); } -#line 912 "cs.ATG" - int[] rank = new int[r.Count]; r.CopyTo(rank); - type = new TypeReference(name, pointer, rank, types); +#line 909 "cs.ATG" + type.RankSpecifier = r.ToArray(); + type.PointerNestingLevel = pointer; } void FormalParameterList( -#line 947 "cs.ATG" +#line 943 "cs.ATG" List parameter) { -#line 950 "cs.ATG" +#line 946 "cs.ATG" ParameterDeclarationExpression p; AttributeSection section; List attributes = new List(); while (la.kind == 17) { AttributeSection( -#line 955 "cs.ATG" +#line 951 "cs.ATG" out section); -#line 955 "cs.ATG" +#line 951 "cs.ATG" attributes.Add(section); } if (StartOf(15)) { FixedParameter( -#line 957 "cs.ATG" +#line 953 "cs.ATG" out p); -#line 957 "cs.ATG" +#line 953 "cs.ATG" bool paramsFound = false; p.Attributes = attributes; parameter.Add(p); @@ -1575,170 +1574,206 @@ out p); while (la.kind == 13) { lexer.NextToken(); -#line 962 "cs.ATG" +#line 958 "cs.ATG" attributes = new List(); if (paramsFound) Error("params array must be at end of parameter list"); while (la.kind == 17) { AttributeSection( -#line 963 "cs.ATG" +#line 959 "cs.ATG" out section); -#line 963 "cs.ATG" +#line 959 "cs.ATG" attributes.Add(section); } if (StartOf(15)) { FixedParameter( -#line 965 "cs.ATG" +#line 961 "cs.ATG" out p); -#line 965 "cs.ATG" +#line 961 "cs.ATG" p.Attributes = attributes; parameter.Add(p); } else if (la.kind == 93) { ParameterArray( -#line 966 "cs.ATG" +#line 962 "cs.ATG" out p); -#line 966 "cs.ATG" +#line 962 "cs.ATG" paramsFound = true; p.Attributes = attributes; parameter.Add(p); } else SynErr(134); } } else if (la.kind == 93) { ParameterArray( -#line 969 "cs.ATG" +#line 965 "cs.ATG" out p); -#line 969 "cs.ATG" +#line 965 "cs.ATG" p.Attributes = attributes; parameter.Add(p); } else SynErr(135); } void ClassType( -#line 1006 "cs.ATG" -out string name, out List types) { +#line 1002 "cs.ATG" +out TypeReference typeRef) { -#line 1007 "cs.ATG" - string qualident; name = ""; - List t; - types = null; - +#line 1003 "cs.ATG" + TypeReference r; typeRef = null; if (la.kind == 1) { TypeName( -#line 1012 "cs.ATG" -out qualident, out t); +#line 1005 "cs.ATG" +out r); -#line 1012 "cs.ATG" - name = qualident; types = t; +#line 1005 "cs.ATG" + typeRef = r; } else if (la.kind == 89) { lexer.NextToken(); -#line 1013 "cs.ATG" - name = "object"; +#line 1006 "cs.ATG" + typeRef = new TypeReference("object"); } else if (la.kind == 106) { lexer.NextToken(); -#line 1014 "cs.ATG" - name = "string"; +#line 1007 "cs.ATG" + typeRef = new TypeReference("string"); } else SynErr(136); } + void TypeName( +#line 2204 "cs.ATG" +out TypeReference typeRef) { + +#line 2205 "cs.ATG" + List typeArguments = null; + string alias = null; + string qualident; + + if ( +#line 2210 "cs.ATG" +la.kind == Tokens.Identifier && Peek(1).kind == Tokens.DoubleColon) { + lexer.NextToken(); + +#line 2211 "cs.ATG" + alias = t.val; + Expect(10); + } + Qualident( +#line 2214 "cs.ATG" +out qualident); + if (la.kind == 22) { + TypeArgumentList( +#line 2215 "cs.ATG" +out typeArguments); + } + +#line 2217 "cs.ATG" + if (alias == null) { + typeRef = new TypeReference(qualident, typeArguments); + } else if (alias == "global") { + typeRef = new TypeReference(qualident, typeArguments); + typeRef.IsGlobal = true; + } else { + typeRef = new TypeReference(alias + "." + qualident, typeArguments); + } + + } + void MemberModifier( -#line 1030 "cs.ATG" +#line 1023 "cs.ATG" Modifiers m) { switch (la.kind) { case 47: { lexer.NextToken(); -#line 1032 "cs.ATG" +#line 1025 "cs.ATG" m.Add(Modifier.Abstract); break; } case 69: { lexer.NextToken(); -#line 1033 "cs.ATG" +#line 1026 "cs.ATG" m.Add(Modifier.Extern); break; } case 82: { lexer.NextToken(); -#line 1034 "cs.ATG" +#line 1027 "cs.ATG" m.Add(Modifier.Internal); break; } case 87: { lexer.NextToken(); -#line 1035 "cs.ATG" +#line 1028 "cs.ATG" m.Add(Modifier.New); break; } case 92: { lexer.NextToken(); -#line 1036 "cs.ATG" +#line 1029 "cs.ATG" m.Add(Modifier.Override); break; } case 94: { lexer.NextToken(); -#line 1037 "cs.ATG" +#line 1030 "cs.ATG" m.Add(Modifier.Private); break; } case 95: { lexer.NextToken(); -#line 1038 "cs.ATG" +#line 1031 "cs.ATG" m.Add(Modifier.Protected); break; } case 96: { lexer.NextToken(); -#line 1039 "cs.ATG" +#line 1032 "cs.ATG" m.Add(Modifier.Public); break; } case 97: { lexer.NextToken(); -#line 1040 "cs.ATG" +#line 1033 "cs.ATG" m.Add(Modifier.Readonly); break; } case 101: { lexer.NextToken(); -#line 1041 "cs.ATG" +#line 1034 "cs.ATG" m.Add(Modifier.Sealed); break; } case 105: { lexer.NextToken(); -#line 1042 "cs.ATG" +#line 1035 "cs.ATG" m.Add(Modifier.Static); break; } case 117: { lexer.NextToken(); -#line 1043 "cs.ATG" +#line 1036 "cs.ATG" m.Add(Modifier.Unsafe); break; } case 120: { lexer.NextToken(); -#line 1044 "cs.ATG" +#line 1037 "cs.ATG" m.Add(Modifier.Virtual); break; } case 122: { lexer.NextToken(); -#line 1045 "cs.ATG" +#line 1038 "cs.ATG" m.Add(Modifier.Volatile); break; } @@ -1747,23 +1782,23 @@ Modifiers m) { } void ClassMemberDecl( -#line 1278 "cs.ATG" +#line 1271 "cs.ATG" Modifiers m, List attributes) { -#line 1279 "cs.ATG" +#line 1272 "cs.ATG" Statement stmt = null; if (StartOf(16)) { StructMemberDecl( -#line 1281 "cs.ATG" +#line 1274 "cs.ATG" m, attributes); } else if (la.kind == 26) { -#line 1282 "cs.ATG" +#line 1275 "cs.ATG" m.Check(Modifier.Destructors); Point startPos = t.Location; lexer.NextToken(); Expect(1); -#line 1283 "cs.ATG" +#line 1276 "cs.ATG" DestructorDeclaration d = new DestructorDeclaration(t.val, m.Modifier, attributes); d.Modifier = m.Modifier; d.StartLocation = startPos; @@ -1771,17 +1806,17 @@ m, attributes); Expect(19); Expect(20); -#line 1287 "cs.ATG" +#line 1280 "cs.ATG" d.EndLocation = t.EndLocation; if (la.kind == 15) { Block( -#line 1287 "cs.ATG" +#line 1280 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(138); -#line 1288 "cs.ATG" +#line 1281 "cs.ATG" d.Body = (BlockStatement)stmt; compilationUnit.AddChild(d); @@ -1789,10 +1824,10 @@ out stmt); } void StructMemberDecl( -#line 1048 "cs.ATG" +#line 1041 "cs.ATG" Modifiers m, List attributes) { -#line 1050 "cs.ATG" +#line 1043 "cs.ATG" string qualident = null; TypeReference type; Expression expr; @@ -1803,18 +1838,18 @@ Modifiers m, List attributes) { if (la.kind == 58) { -#line 1059 "cs.ATG" +#line 1052 "cs.ATG" m.Check(Modifier.Constants); lexer.NextToken(); -#line 1060 "cs.ATG" +#line 1053 "cs.ATG" Point startPos = t.Location; Type( -#line 1061 "cs.ATG" +#line 1054 "cs.ATG" out type); Expect(1); -#line 1061 "cs.ATG" +#line 1054 "cs.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier | Modifier.Const); fd.StartLocation = startPos; VariableDeclaration f = new VariableDeclaration(t.val); @@ -1822,58 +1857,58 @@ out type); Expect(3); Expr( -#line 1066 "cs.ATG" +#line 1059 "cs.ATG" out expr); -#line 1066 "cs.ATG" +#line 1059 "cs.ATG" f.Initializer = expr; while (la.kind == 13) { lexer.NextToken(); Expect(1); -#line 1067 "cs.ATG" +#line 1060 "cs.ATG" f = new VariableDeclaration(t.val); fd.Fields.Add(f); Expect(3); Expr( -#line 1070 "cs.ATG" +#line 1063 "cs.ATG" out expr); -#line 1070 "cs.ATG" +#line 1063 "cs.ATG" f.Initializer = expr; } Expect(11); -#line 1071 "cs.ATG" +#line 1064 "cs.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); } else if ( -#line 1074 "cs.ATG" +#line 1067 "cs.ATG" NotVoidPointer()) { -#line 1074 "cs.ATG" +#line 1067 "cs.ATG" m.Check(Modifier.PropertysEventsMethods); Expect(121); -#line 1075 "cs.ATG" +#line 1068 "cs.ATG" Point startPos = t.Location; Qualident( -#line 1076 "cs.ATG" +#line 1069 "cs.ATG" out qualident); if (la.kind == 22) { TypeParameterList( -#line 1078 "cs.ATG" +#line 1071 "cs.ATG" templates); } Expect(19); if (StartOf(9)) { FormalParameterList( -#line 1081 "cs.ATG" +#line 1074 "cs.ATG" p); } Expect(20); -#line 1081 "cs.ATG" +#line 1074 "cs.ATG" MethodDeclaration methodDeclaration = new MethodDeclaration(qualident, m.Modifier, new TypeReference("void"), @@ -1886,31 +1921,31 @@ p); compilationUnit.BlockStart(methodDeclaration); while ( -#line 1094 "cs.ATG" +#line 1087 "cs.ATG" IdentIsWhere()) { TypeParameterConstraintsClause( -#line 1094 "cs.ATG" +#line 1087 "cs.ATG" templates); } if (la.kind == 15) { Block( -#line 1096 "cs.ATG" +#line 1089 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(140); -#line 1096 "cs.ATG" +#line 1089 "cs.ATG" compilationUnit.BlockEnd(); methodDeclaration.Body = (BlockStatement)stmt; } else if (la.kind == 67) { -#line 1100 "cs.ATG" +#line 1093 "cs.ATG" m.Check(Modifier.PropertysEventsMethods); lexer.NextToken(); -#line 1101 "cs.ATG" +#line 1094 "cs.ATG" EventDeclaration eventDecl = new EventDeclaration(m.Modifier, attributes); eventDecl.StartLocation = t.Location; compilationUnit.AddChild(eventDecl); @@ -1919,103 +1954,103 @@ out stmt); EventRemoveRegion removeBlock = null; Type( -#line 1108 "cs.ATG" +#line 1101 "cs.ATG" out type); -#line 1108 "cs.ATG" +#line 1101 "cs.ATG" eventDecl.TypeReference = type; if ( -#line 1110 "cs.ATG" +#line 1103 "cs.ATG" IsVarDecl()) { VariableDeclarator( -#line 1110 "cs.ATG" +#line 1103 "cs.ATG" variableDeclarators); while (la.kind == 13) { lexer.NextToken(); VariableDeclarator( -#line 1111 "cs.ATG" +#line 1104 "cs.ATG" variableDeclarators); } Expect(11); -#line 1111 "cs.ATG" +#line 1104 "cs.ATG" eventDecl.VariableDeclarators = variableDeclarators; eventDecl.EndLocation = t.EndLocation; } else if (la.kind == 1) { Qualident( -#line 1112 "cs.ATG" +#line 1105 "cs.ATG" out qualident); -#line 1112 "cs.ATG" +#line 1105 "cs.ATG" eventDecl.Name = qualident; eventDecl.EndLocation = t.EndLocation; Expect(15); -#line 1113 "cs.ATG" +#line 1106 "cs.ATG" eventDecl.BodyStart = t.Location; EventAccessorDecls( -#line 1114 "cs.ATG" +#line 1107 "cs.ATG" out addBlock, out removeBlock); Expect(16); -#line 1115 "cs.ATG" +#line 1108 "cs.ATG" eventDecl.BodyEnd = t.EndLocation; } else SynErr(141); -#line 1116 "cs.ATG" +#line 1109 "cs.ATG" compilationUnit.BlockEnd(); eventDecl.AddRegion = addBlock; eventDecl.RemoveRegion = removeBlock; } else if ( -#line 1123 "cs.ATG" +#line 1116 "cs.ATG" IdentAndLPar()) { -#line 1123 "cs.ATG" +#line 1116 "cs.ATG" m.Check(Modifier.Constructors | Modifier.StaticConstructors); Expect(1); -#line 1124 "cs.ATG" +#line 1117 "cs.ATG" string name = t.val; Point startPos = t.Location; Expect(19); if (StartOf(9)) { -#line 1124 "cs.ATG" +#line 1117 "cs.ATG" m.Check(Modifier.Constructors); FormalParameterList( -#line 1125 "cs.ATG" +#line 1118 "cs.ATG" p); } Expect(20); -#line 1127 "cs.ATG" +#line 1120 "cs.ATG" ConstructorInitializer init = null; if (la.kind == 9) { -#line 1128 "cs.ATG" +#line 1121 "cs.ATG" m.Check(Modifier.Constructors); ConstructorInitializer( -#line 1129 "cs.ATG" +#line 1122 "cs.ATG" out init); } -#line 1131 "cs.ATG" +#line 1124 "cs.ATG" ConstructorDeclaration cd = new ConstructorDeclaration(name, m.Modifier, p, init, attributes); cd.StartLocation = startPos; cd.EndLocation = t.EndLocation; if (la.kind == 15) { Block( -#line 1136 "cs.ATG" +#line 1129 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(142); -#line 1136 "cs.ATG" +#line 1129 "cs.ATG" cd.Body = (BlockStatement)stmt; compilationUnit.AddChild(cd); } else if (la.kind == 68 || la.kind == 78) { -#line 1139 "cs.ATG" +#line 1132 "cs.ATG" m.Check(Modifier.Operators); if (m.isNone) Error("at least one modifier must be set"); bool isImplicit = true; @@ -2025,37 +2060,37 @@ out stmt); } else { lexer.NextToken(); -#line 1143 "cs.ATG" +#line 1136 "cs.ATG" isImplicit = false; } Expect(90); Type( -#line 1144 "cs.ATG" +#line 1137 "cs.ATG" out type); -#line 1144 "cs.ATG" +#line 1137 "cs.ATG" TypeReference operatorType = type; Expect(19); Type( -#line 1145 "cs.ATG" +#line 1138 "cs.ATG" out type); Expect(1); -#line 1145 "cs.ATG" +#line 1138 "cs.ATG" string varName = t.val; Expect(20); if (la.kind == 15) { Block( -#line 1145 "cs.ATG" +#line 1138 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); -#line 1145 "cs.ATG" +#line 1138 "cs.ATG" stmt = null; } else SynErr(143); -#line 1148 "cs.ATG" +#line 1141 "cs.ATG" List parameters = new List(); parameters.Add(new ParameterDeclarationExpression(type, varName)); OperatorDeclaration operatorDeclaration = new OperatorDeclaration(m.Modifier, @@ -2069,58 +2104,58 @@ out stmt); } else if (StartOf(17)) { TypeDecl( -#line 1161 "cs.ATG" +#line 1154 "cs.ATG" m, attributes); } else if (StartOf(8)) { Type( -#line 1162 "cs.ATG" +#line 1155 "cs.ATG" out type); -#line 1162 "cs.ATG" +#line 1155 "cs.ATG" Point startPos = t.Location; if (la.kind == 90) { -#line 1164 "cs.ATG" +#line 1157 "cs.ATG" OverloadableOperatorType op; m.Check(Modifier.Operators); if (m.isNone) Error("at least one modifier must be set"); lexer.NextToken(); OverloadableOperator( -#line 1168 "cs.ATG" +#line 1161 "cs.ATG" out op); -#line 1168 "cs.ATG" +#line 1161 "cs.ATG" TypeReference firstType, secondType = null; string secondName = null; Expect(19); Type( -#line 1169 "cs.ATG" +#line 1162 "cs.ATG" out firstType); Expect(1); -#line 1169 "cs.ATG" +#line 1162 "cs.ATG" string firstName = t.val; if (la.kind == 13) { lexer.NextToken(); Type( -#line 1170 "cs.ATG" +#line 1163 "cs.ATG" out secondType); Expect(1); -#line 1170 "cs.ATG" +#line 1163 "cs.ATG" secondName = t.val; } else if (la.kind == 20) { } else SynErr(144); Expect(20); if (la.kind == 15) { Block( -#line 1178 "cs.ATG" +#line 1171 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(145); -#line 1180 "cs.ATG" +#line 1173 "cs.ATG" List parameters = new List(); parameters.Add(new ParameterDeclarationExpression(firstType, firstName)); if (secondType != null) { @@ -2135,43 +2170,43 @@ out stmt); compilationUnit.AddChild(operatorDeclaration); } else if ( -#line 1195 "cs.ATG" +#line 1188 "cs.ATG" IsVarDecl()) { -#line 1195 "cs.ATG" +#line 1188 "cs.ATG" m.Check(Modifier.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = startPos; VariableDeclarator( -#line 1199 "cs.ATG" +#line 1192 "cs.ATG" variableDeclarators); while (la.kind == 13) { lexer.NextToken(); VariableDeclarator( -#line 1200 "cs.ATG" +#line 1193 "cs.ATG" variableDeclarators); } Expect(11); -#line 1201 "cs.ATG" +#line 1194 "cs.ATG" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; compilationUnit.AddChild(fd); } else if (la.kind == 109) { -#line 1204 "cs.ATG" +#line 1197 "cs.ATG" m.Check(Modifier.Indexers); lexer.NextToken(); Expect(17); FormalParameterList( -#line 1205 "cs.ATG" +#line 1198 "cs.ATG" p); Expect(18); -#line 1205 "cs.ATG" +#line 1198 "cs.ATG" Point endLocation = t.EndLocation; Expect(15); -#line 1206 "cs.ATG" +#line 1199 "cs.ATG" IndexerDeclaration indexer = new IndexerDeclaration(type, p, m.Modifier, attributes); indexer.StartLocation = startPos; indexer.EndLocation = endLocation; @@ -2180,11 +2215,11 @@ p); PropertySetRegion setRegion; AccessorDecls( -#line 1213 "cs.ATG" +#line 1206 "cs.ATG" out getRegion, out setRegion); Expect(16); -#line 1214 "cs.ATG" +#line 1207 "cs.ATG" indexer.BodyEnd = t.EndLocation; indexer.GetRegion = getRegion; indexer.SetRegion = setRegion; @@ -2192,30 +2227,30 @@ out getRegion, out setRegion); } else if (la.kind == 1) { Qualident( -#line 1219 "cs.ATG" +#line 1212 "cs.ATG" out qualident); -#line 1219 "cs.ATG" +#line 1212 "cs.ATG" Point qualIdentEndLocation = t.EndLocation; if (la.kind == 15 || la.kind == 19 || la.kind == 22) { if (la.kind == 19 || la.kind == 22) { -#line 1222 "cs.ATG" +#line 1215 "cs.ATG" m.Check(Modifier.PropertysEventsMethods); if (la.kind == 22) { TypeParameterList( -#line 1224 "cs.ATG" +#line 1217 "cs.ATG" templates); } Expect(19); if (StartOf(9)) { FormalParameterList( -#line 1225 "cs.ATG" +#line 1218 "cs.ATG" p); } Expect(20); -#line 1226 "cs.ATG" +#line 1219 "cs.ATG" MethodDeclaration methodDeclaration = new MethodDeclaration(qualident, m.Modifier, type, @@ -2227,26 +2262,26 @@ p); compilationUnit.AddChild(methodDeclaration); while ( -#line 1236 "cs.ATG" +#line 1229 "cs.ATG" IdentIsWhere()) { TypeParameterConstraintsClause( -#line 1236 "cs.ATG" +#line 1229 "cs.ATG" templates); } if (la.kind == 15) { Block( -#line 1237 "cs.ATG" +#line 1230 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(146); -#line 1237 "cs.ATG" +#line 1230 "cs.ATG" methodDeclaration.Body = (BlockStatement)stmt; } else { lexer.NextToken(); -#line 1240 "cs.ATG" +#line 1233 "cs.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(qualident, type, m.Modifier, attributes); pDecl.StartLocation = startPos; pDecl.EndLocation = qualIdentEndLocation; @@ -2255,11 +2290,11 @@ out stmt); PropertySetRegion setRegion; AccessorDecls( -#line 1247 "cs.ATG" +#line 1240 "cs.ATG" out getRegion, out setRegion); Expect(16); -#line 1249 "cs.ATG" +#line 1242 "cs.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.EndLocation; @@ -2268,17 +2303,17 @@ out getRegion, out setRegion); } } else if (la.kind == 14) { -#line 1257 "cs.ATG" +#line 1250 "cs.ATG" m.Check(Modifier.Indexers); lexer.NextToken(); Expect(109); Expect(17); FormalParameterList( -#line 1258 "cs.ATG" +#line 1251 "cs.ATG" p); Expect(18); -#line 1259 "cs.ATG" +#line 1252 "cs.ATG" IndexerDeclaration indexer = new IndexerDeclaration(type, p, m.Modifier, attributes); indexer.StartLocation = startPos; indexer.EndLocation = t.EndLocation; @@ -2288,14 +2323,14 @@ p); Expect(15); -#line 1266 "cs.ATG" +#line 1259 "cs.ATG" Point bodyStart = t.Location; AccessorDecls( -#line 1267 "cs.ATG" +#line 1260 "cs.ATG" out getRegion, out setRegion); Expect(16); -#line 1268 "cs.ATG" +#line 1261 "cs.ATG" indexer.BodyStart = bodyStart; indexer.BodyEnd = t.EndLocation; indexer.GetRegion = getRegion; @@ -2309,7 +2344,7 @@ out getRegion, out setRegion); void InterfaceMemberDecl() { -#line 1295 "cs.ATG" +#line 1288 "cs.ATG" TypeReference type; AttributeSection section; @@ -2324,39 +2359,39 @@ out getRegion, out setRegion); while (la.kind == 17) { AttributeSection( -#line 1308 "cs.ATG" +#line 1301 "cs.ATG" out section); -#line 1308 "cs.ATG" +#line 1301 "cs.ATG" attributes.Add(section); } if (la.kind == 87) { lexer.NextToken(); -#line 1309 "cs.ATG" +#line 1302 "cs.ATG" mod = Modifier.New; startLocation = t.Location; } if ( -#line 1312 "cs.ATG" +#line 1305 "cs.ATG" NotVoidPointer()) { Expect(121); -#line 1312 "cs.ATG" +#line 1305 "cs.ATG" if (startLocation.X == -1) startLocation = t.Location; Expect(1); -#line 1312 "cs.ATG" +#line 1305 "cs.ATG" name = t.val; Expect(19); if (StartOf(9)) { FormalParameterList( -#line 1313 "cs.ATG" +#line 1306 "cs.ATG" parameters); } Expect(20); Expect(11); -#line 1313 "cs.ATG" +#line 1306 "cs.ATG" MethodDeclaration md = new MethodDeclaration(name, mod, new TypeReference("void"), parameters, attributes); md.StartLocation = startLocation; md.EndLocation = t.EndLocation; @@ -2365,39 +2400,39 @@ parameters); } else if (StartOf(18)) { if (StartOf(8)) { Type( -#line 1319 "cs.ATG" +#line 1312 "cs.ATG" out type); -#line 1319 "cs.ATG" +#line 1312 "cs.ATG" if (startLocation.X == -1) startLocation = t.Location; if (la.kind == 1) { lexer.NextToken(); -#line 1321 "cs.ATG" +#line 1314 "cs.ATG" name = t.val; Point qualIdentEndLocation = t.EndLocation; if (la.kind == 19 || la.kind == 22) { if (la.kind == 22) { TypeParameterList( -#line 1325 "cs.ATG" +#line 1318 "cs.ATG" templates); } Expect(19); if (StartOf(9)) { FormalParameterList( -#line 1326 "cs.ATG" +#line 1319 "cs.ATG" parameters); } Expect(20); while ( -#line 1328 "cs.ATG" +#line 1321 "cs.ATG" IdentIsWhere()) { TypeParameterConstraintsClause( -#line 1328 "cs.ATG" +#line 1321 "cs.ATG" templates); } Expect(11); -#line 1329 "cs.ATG" +#line 1322 "cs.ATG" MethodDeclaration md = new MethodDeclaration(name, mod, type, parameters, attributes); md.StartLocation = startLocation; md.EndLocation = t.EndLocation; @@ -2405,72 +2440,72 @@ templates); } else if (la.kind == 15) { -#line 1335 "cs.ATG" +#line 1328 "cs.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod, attributes); compilationUnit.AddChild(pd); lexer.NextToken(); -#line 1336 "cs.ATG" +#line 1329 "cs.ATG" Point bodyStart = t.Location; InterfaceAccessors( -#line 1336 "cs.ATG" +#line 1329 "cs.ATG" out getBlock, out setBlock); Expect(16); -#line 1336 "cs.ATG" +#line 1329 "cs.ATG" pd.GetRegion = getBlock; pd.SetRegion = setBlock; pd.StartLocation = startLocation; pd.EndLocation = qualIdentEndLocation; pd.BodyStart = bodyStart; pd.BodyEnd = t.EndLocation; } else SynErr(150); } else if (la.kind == 109) { lexer.NextToken(); Expect(17); FormalParameterList( -#line 1339 "cs.ATG" +#line 1332 "cs.ATG" parameters); Expect(18); -#line 1339 "cs.ATG" +#line 1332 "cs.ATG" Point bracketEndLocation = t.EndLocation; -#line 1339 "cs.ATG" +#line 1332 "cs.ATG" IndexerDeclaration id = new IndexerDeclaration(type, parameters, mod, attributes); compilationUnit.AddChild(id); Expect(15); -#line 1340 "cs.ATG" +#line 1333 "cs.ATG" Point bodyStart = t.Location; InterfaceAccessors( -#line 1340 "cs.ATG" +#line 1333 "cs.ATG" out getBlock, out setBlock); Expect(16); -#line 1340 "cs.ATG" +#line 1333 "cs.ATG" id.GetRegion = getBlock; id.SetRegion = setBlock; id.StartLocation = startLocation; id.EndLocation = bracketEndLocation; id.BodyStart = bodyStart; id.BodyEnd = t.EndLocation; } else SynErr(151); } else { lexer.NextToken(); -#line 1343 "cs.ATG" +#line 1336 "cs.ATG" if (startLocation.X == -1) startLocation = t.Location; Type( -#line 1343 "cs.ATG" +#line 1336 "cs.ATG" out type); Expect(1); -#line 1343 "cs.ATG" +#line 1336 "cs.ATG" EventDeclaration ed = new EventDeclaration(type, t.val, mod, attributes); compilationUnit.AddChild(ed); Expect(11); -#line 1346 "cs.ATG" +#line 1339 "cs.ATG" ed.StartLocation = startLocation; ed.EndLocation = t.EndLocation; } } else SynErr(152); } void EnumMemberDecl( -#line 1351 "cs.ATG" +#line 1344 "cs.ATG" out FieldDeclaration f) { -#line 1353 "cs.ATG" +#line 1346 "cs.ATG" Expression expr = null; List attributes = new List(); AttributeSection section = null; @@ -2478,15 +2513,15 @@ out FieldDeclaration f) { while (la.kind == 17) { AttributeSection( -#line 1359 "cs.ATG" +#line 1352 "cs.ATG" out section); -#line 1359 "cs.ATG" +#line 1352 "cs.ATG" attributes.Add(section); } Expect(1); -#line 1360 "cs.ATG" +#line 1353 "cs.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2495,90 +2530,92 @@ out section); if (la.kind == 3) { lexer.NextToken(); Expr( -#line 1365 "cs.ATG" +#line 1358 "cs.ATG" out expr); -#line 1365 "cs.ATG" +#line 1358 "cs.ATG" varDecl.Initializer = expr; } } void SimpleType( -#line 936 "cs.ATG" +#line 932 "cs.ATG" out string name) { -#line 937 "cs.ATG" +#line 933 "cs.ATG" name = String.Empty; if (StartOf(19)) { IntegralType( -#line 939 "cs.ATG" +#line 935 "cs.ATG" out name); } else if (la.kind == 73) { lexer.NextToken(); -#line 940 "cs.ATG" +#line 936 "cs.ATG" name = "float"; } else if (la.kind == 64) { lexer.NextToken(); -#line 941 "cs.ATG" +#line 937 "cs.ATG" name = "double"; } else if (la.kind == 60) { lexer.NextToken(); -#line 942 "cs.ATG" +#line 938 "cs.ATG" name = "decimal"; } else if (la.kind == 50) { lexer.NextToken(); -#line 943 "cs.ATG" +#line 939 "cs.ATG" name = "bool"; } else SynErr(153); } void NonArrayType( -#line 917 "cs.ATG" +#line 914 "cs.ATG" out TypeReference type) { -#line 919 "cs.ATG" - string name = ""; +#line 916 "cs.ATG" + string name; int pointer = 0; - List genericTypes = null; + type = null; if (la.kind == 1 || la.kind == 89 || la.kind == 106) { ClassType( -#line 924 "cs.ATG" -out name, out genericTypes); +#line 921 "cs.ATG" +out type); } else if (StartOf(14)) { SimpleType( -#line 925 "cs.ATG" +#line 922 "cs.ATG" out name); + +#line 922 "cs.ATG" + type = new TypeReference(name); } else if (la.kind == 121) { lexer.NextToken(); Expect(6); -#line 926 "cs.ATG" - pointer = 1; name = "void"; +#line 923 "cs.ATG" + pointer = 1; type = new TypeReference("void"); } else SynErr(154); while ( -#line 929 "cs.ATG" +#line 926 "cs.ATG" IsPointer()) { Expect(6); -#line 930 "cs.ATG" +#line 927 "cs.ATG" ++pointer; } -#line 932 "cs.ATG" - type = new TypeReference(name, pointer, null, genericTypes); - +#line 929 "cs.ATG" + type.PointerNestingLevel = pointer; } void FixedParameter( -#line 973 "cs.ATG" +#line 969 "cs.ATG" out ParameterDeclarationExpression p) { -#line 975 "cs.ATG" +#line 971 "cs.ATG" TypeReference type; ParamModifier mod = ParamModifier.In; @@ -2586,65 +2623,46 @@ out ParameterDeclarationExpression p) { if (la.kind == 98) { lexer.NextToken(); -#line 980 "cs.ATG" +#line 976 "cs.ATG" mod = ParamModifier.Ref; } else { lexer.NextToken(); -#line 981 "cs.ATG" +#line 977 "cs.ATG" mod = ParamModifier.Out; } } Type( -#line 983 "cs.ATG" +#line 979 "cs.ATG" out type); Expect(1); -#line 983 "cs.ATG" +#line 979 "cs.ATG" p = new ParameterDeclarationExpression(type, t.val, mod); } void ParameterArray( -#line 986 "cs.ATG" +#line 982 "cs.ATG" out ParameterDeclarationExpression p) { -#line 987 "cs.ATG" +#line 983 "cs.ATG" TypeReference type; Expect(93); Type( -#line 989 "cs.ATG" +#line 985 "cs.ATG" out type); Expect(1); -#line 989 "cs.ATG" +#line 985 "cs.ATG" p = new ParameterDeclarationExpression(type, t.val, ParamModifier.Params); } - void TypeName( -#line 2194 "cs.ATG" -out string qualident, out List types) { - -#line 2195 "cs.ATG" - List t; types = new List(); - Qualident( -#line 2197 "cs.ATG" -out qualident); - if (la.kind == 22) { - TypeArgumentList( -#line 2198 "cs.ATG" -out t); - -#line 2198 "cs.ATG" - types = t; - } - } - void Block( -#line 1469 "cs.ATG" +#line 1462 "cs.ATG" out Statement stmt) { Expect(15); -#line 1471 "cs.ATG" +#line 1464 "cs.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.EndLocation; compilationUnit.BlockStart(blockStmt); @@ -2655,7 +2673,7 @@ out Statement stmt) { } Expect(16); -#line 1478 "cs.ATG" +#line 1471 "cs.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2663,34 +2681,34 @@ out Statement stmt) { } void VariableDeclarator( -#line 1462 "cs.ATG" +#line 1455 "cs.ATG" List fieldDeclaration) { -#line 1463 "cs.ATG" +#line 1456 "cs.ATG" Expression expr = null; Expect(1); -#line 1465 "cs.ATG" +#line 1458 "cs.ATG" VariableDeclaration f = new VariableDeclaration(t.val); if (la.kind == 3) { lexer.NextToken(); VariableInitializer( -#line 1466 "cs.ATG" +#line 1459 "cs.ATG" out expr); -#line 1466 "cs.ATG" +#line 1459 "cs.ATG" f.Initializer = expr; } -#line 1466 "cs.ATG" +#line 1459 "cs.ATG" fieldDeclaration.Add(f); } void EventAccessorDecls( -#line 1411 "cs.ATG" +#line 1404 "cs.ATG" out EventAddRegion addBlock, out EventRemoveRegion removeBlock) { -#line 1412 "cs.ATG" +#line 1405 "cs.ATG" AttributeSection section; List attributes = new List(); Statement stmt; @@ -2699,102 +2717,102 @@ out EventAddRegion addBlock, out EventRemoveRegion removeBlock) { while (la.kind == 17) { AttributeSection( -#line 1419 "cs.ATG" +#line 1412 "cs.ATG" out section); -#line 1419 "cs.ATG" +#line 1412 "cs.ATG" attributes.Add(section); } if ( -#line 1421 "cs.ATG" +#line 1414 "cs.ATG" IdentIsAdd()) { -#line 1421 "cs.ATG" +#line 1414 "cs.ATG" addBlock = new EventAddRegion(attributes); AddAccessorDecl( -#line 1422 "cs.ATG" +#line 1415 "cs.ATG" out stmt); -#line 1422 "cs.ATG" +#line 1415 "cs.ATG" attributes = new List(); addBlock.Block = (BlockStatement)stmt; while (la.kind == 17) { AttributeSection( -#line 1423 "cs.ATG" +#line 1416 "cs.ATG" out section); -#line 1423 "cs.ATG" +#line 1416 "cs.ATG" attributes.Add(section); } RemoveAccessorDecl( -#line 1424 "cs.ATG" +#line 1417 "cs.ATG" out stmt); -#line 1424 "cs.ATG" +#line 1417 "cs.ATG" removeBlock = new EventRemoveRegion(attributes); removeBlock.Block = (BlockStatement)stmt; } else if ( -#line 1425 "cs.ATG" +#line 1418 "cs.ATG" IdentIsRemove()) { RemoveAccessorDecl( -#line 1426 "cs.ATG" +#line 1419 "cs.ATG" out stmt); -#line 1426 "cs.ATG" +#line 1419 "cs.ATG" removeBlock = new EventRemoveRegion(attributes); removeBlock.Block = (BlockStatement)stmt; attributes = new List(); while (la.kind == 17) { AttributeSection( -#line 1427 "cs.ATG" +#line 1420 "cs.ATG" out section); -#line 1427 "cs.ATG" +#line 1420 "cs.ATG" attributes.Add(section); } AddAccessorDecl( -#line 1428 "cs.ATG" +#line 1421 "cs.ATG" out stmt); -#line 1428 "cs.ATG" +#line 1421 "cs.ATG" addBlock = new EventAddRegion(attributes); addBlock.Block = (BlockStatement)stmt; } else if (la.kind == 1) { lexer.NextToken(); -#line 1429 "cs.ATG" +#line 1422 "cs.ATG" Error("add or remove accessor declaration expected"); } else SynErr(155); } void ConstructorInitializer( -#line 1500 "cs.ATG" +#line 1493 "cs.ATG" out ConstructorInitializer ci) { -#line 1501 "cs.ATG" +#line 1494 "cs.ATG" Expression expr; ci = new ConstructorInitializer(); Expect(9); if (la.kind == 49) { lexer.NextToken(); -#line 1505 "cs.ATG" +#line 1498 "cs.ATG" ci.ConstructorInitializerType = ConstructorInitializerType.Base; } else if (la.kind == 109) { lexer.NextToken(); -#line 1506 "cs.ATG" +#line 1499 "cs.ATG" ci.ConstructorInitializerType = ConstructorInitializerType.This; } else SynErr(156); Expect(19); if (StartOf(21)) { Argument( -#line 1509 "cs.ATG" +#line 1502 "cs.ATG" out expr); -#line 1509 "cs.ATG" +#line 1502 "cs.ATG" if (expr != null) { ci.Arguments.Add(expr); } while (la.kind == 13) { lexer.NextToken(); Argument( -#line 1509 "cs.ATG" +#line 1502 "cs.ATG" out expr); -#line 1509 "cs.ATG" +#line 1502 "cs.ATG" if (expr != null) { ci.Arguments.Add(expr); } } } @@ -2802,161 +2820,161 @@ out expr); } void OverloadableOperator( -#line 1521 "cs.ATG" +#line 1514 "cs.ATG" out OverloadableOperatorType op) { -#line 1522 "cs.ATG" +#line 1515 "cs.ATG" op = OverloadableOperatorType.None; switch (la.kind) { case 4: { lexer.NextToken(); -#line 1524 "cs.ATG" +#line 1517 "cs.ATG" op = OverloadableOperatorType.Add; break; } case 5: { lexer.NextToken(); -#line 1525 "cs.ATG" +#line 1518 "cs.ATG" op = OverloadableOperatorType.Subtract; break; } case 23: { lexer.NextToken(); -#line 1527 "cs.ATG" +#line 1520 "cs.ATG" op = OverloadableOperatorType.Not; break; } case 26: { lexer.NextToken(); -#line 1528 "cs.ATG" +#line 1521 "cs.ATG" op = OverloadableOperatorType.BitNot; break; } case 30: { lexer.NextToken(); -#line 1530 "cs.ATG" +#line 1523 "cs.ATG" op = OverloadableOperatorType.Increment; break; } case 31: { lexer.NextToken(); -#line 1531 "cs.ATG" +#line 1524 "cs.ATG" op = OverloadableOperatorType.Decrement; break; } case 111: { lexer.NextToken(); -#line 1533 "cs.ATG" +#line 1526 "cs.ATG" op = OverloadableOperatorType.True; break; } case 70: { lexer.NextToken(); -#line 1534 "cs.ATG" +#line 1527 "cs.ATG" op = OverloadableOperatorType.False; break; } case 6: { lexer.NextToken(); -#line 1536 "cs.ATG" +#line 1529 "cs.ATG" op = OverloadableOperatorType.Multiply; break; } case 7: { lexer.NextToken(); -#line 1537 "cs.ATG" +#line 1530 "cs.ATG" op = OverloadableOperatorType.Divide; break; } case 8: { lexer.NextToken(); -#line 1538 "cs.ATG" +#line 1531 "cs.ATG" op = OverloadableOperatorType.Modulus; break; } case 27: { lexer.NextToken(); -#line 1540 "cs.ATG" +#line 1533 "cs.ATG" op = OverloadableOperatorType.BitwiseAnd; break; } case 28: { lexer.NextToken(); -#line 1541 "cs.ATG" +#line 1534 "cs.ATG" op = OverloadableOperatorType.BitwiseOr; break; } case 29: { lexer.NextToken(); -#line 1542 "cs.ATG" +#line 1535 "cs.ATG" op = OverloadableOperatorType.ExclusiveOr; break; } case 36: { lexer.NextToken(); -#line 1544 "cs.ATG" +#line 1537 "cs.ATG" op = OverloadableOperatorType.ShiftLeft; break; } case 32: { lexer.NextToken(); -#line 1545 "cs.ATG" +#line 1538 "cs.ATG" op = OverloadableOperatorType.Equality; break; } case 33: { lexer.NextToken(); -#line 1546 "cs.ATG" +#line 1539 "cs.ATG" op = OverloadableOperatorType.InEquality; break; } case 22: { lexer.NextToken(); -#line 1547 "cs.ATG" +#line 1540 "cs.ATG" op = OverloadableOperatorType.LessThan; break; } case 34: { lexer.NextToken(); -#line 1548 "cs.ATG" +#line 1541 "cs.ATG" op = OverloadableOperatorType.GreaterThanOrEqual; break; } case 35: { lexer.NextToken(); -#line 1549 "cs.ATG" +#line 1542 "cs.ATG" op = OverloadableOperatorType.LessThanOrEqual; break; } case 21: { lexer.NextToken(); -#line 1550 "cs.ATG" +#line 1543 "cs.ATG" op = OverloadableOperatorType.GreaterThan; if (la.kind == 21) { lexer.NextToken(); -#line 1550 "cs.ATG" +#line 1543 "cs.ATG" op = OverloadableOperatorType.ShiftRight; } break; @@ -2966,10 +2984,10 @@ out OverloadableOperatorType op) { } void AccessorDecls( -#line 1369 "cs.ATG" +#line 1362 "cs.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1371 "cs.ATG" +#line 1364 "cs.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -2977,136 +2995,136 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 17) { AttributeSection( -#line 1377 "cs.ATG" +#line 1370 "cs.ATG" out section); -#line 1377 "cs.ATG" +#line 1370 "cs.ATG" attributes.Add(section); } if ( -#line 1379 "cs.ATG" +#line 1372 "cs.ATG" IdentIsGet()) { GetAccessorDecl( -#line 1380 "cs.ATG" +#line 1373 "cs.ATG" out getBlock, attributes); if (la.kind == 1 || la.kind == 17) { -#line 1381 "cs.ATG" +#line 1374 "cs.ATG" attributes = new List(); while (la.kind == 17) { AttributeSection( -#line 1382 "cs.ATG" +#line 1375 "cs.ATG" out section); -#line 1382 "cs.ATG" +#line 1375 "cs.ATG" attributes.Add(section); } SetAccessorDecl( -#line 1383 "cs.ATG" +#line 1376 "cs.ATG" out setBlock, attributes); } } else if ( -#line 1385 "cs.ATG" +#line 1378 "cs.ATG" IdentIsSet()) { SetAccessorDecl( -#line 1386 "cs.ATG" +#line 1379 "cs.ATG" out setBlock, attributes); if (la.kind == 1 || la.kind == 17) { -#line 1387 "cs.ATG" +#line 1380 "cs.ATG" attributes = new List(); while (la.kind == 17) { AttributeSection( -#line 1388 "cs.ATG" +#line 1381 "cs.ATG" out section); -#line 1388 "cs.ATG" +#line 1381 "cs.ATG" attributes.Add(section); } GetAccessorDecl( -#line 1389 "cs.ATG" +#line 1382 "cs.ATG" out getBlock, attributes); } } else if (la.kind == 1) { lexer.NextToken(); -#line 1391 "cs.ATG" +#line 1384 "cs.ATG" Error("get or set accessor declaration expected"); } else SynErr(158); } void InterfaceAccessors( -#line 1433 "cs.ATG" +#line 1426 "cs.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1435 "cs.ATG" +#line 1428 "cs.ATG" AttributeSection section; List attributes = new List(); getBlock = null; setBlock = null; while (la.kind == 17) { AttributeSection( -#line 1440 "cs.ATG" +#line 1433 "cs.ATG" out section); -#line 1440 "cs.ATG" +#line 1433 "cs.ATG" attributes.Add(section); } if ( -#line 1442 "cs.ATG" +#line 1435 "cs.ATG" IdentIsGet()) { Expect(1); -#line 1442 "cs.ATG" +#line 1435 "cs.ATG" getBlock = new PropertyGetRegion(null, attributes); } else if ( -#line 1443 "cs.ATG" +#line 1436 "cs.ATG" IdentIsSet()) { Expect(1); -#line 1443 "cs.ATG" +#line 1436 "cs.ATG" setBlock = new PropertySetRegion(null, attributes); } else if (la.kind == 1) { lexer.NextToken(); -#line 1444 "cs.ATG" +#line 1437 "cs.ATG" Error("set or get expected"); } else SynErr(159); Expect(11); -#line 1446 "cs.ATG" +#line 1439 "cs.ATG" attributes = new List(); if (la.kind == 1 || la.kind == 17) { while (la.kind == 17) { AttributeSection( -#line 1448 "cs.ATG" +#line 1441 "cs.ATG" out section); -#line 1448 "cs.ATG" +#line 1441 "cs.ATG" attributes.Add(section); } if ( -#line 1450 "cs.ATG" +#line 1443 "cs.ATG" IdentIsGet()) { Expect(1); -#line 1450 "cs.ATG" +#line 1443 "cs.ATG" if (getBlock != null) Error("get already declared"); else getBlock = new PropertyGetRegion(null, attributes); } else if ( -#line 1453 "cs.ATG" +#line 1446 "cs.ATG" IdentIsSet()) { Expect(1); -#line 1453 "cs.ATG" +#line 1446 "cs.ATG" if (setBlock != null) Error("set already declared"); else setBlock = new PropertySetRegion(null, attributes); } else if (la.kind == 1) { lexer.NextToken(); -#line 1456 "cs.ATG" +#line 1449 "cs.ATG" Error("set or get expected"); } else SynErr(160); Expect(11); @@ -3114,183 +3132,183 @@ IdentIsSet()) { } void GetAccessorDecl( -#line 1395 "cs.ATG" +#line 1388 "cs.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1396 "cs.ATG" +#line 1389 "cs.ATG" Statement stmt = null; Expect(1); -#line 1399 "cs.ATG" +#line 1392 "cs.ATG" if (t.val != "get") Error("get expected"); if (la.kind == 15) { Block( -#line 1400 "cs.ATG" +#line 1393 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(161); -#line 1400 "cs.ATG" +#line 1393 "cs.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); } void SetAccessorDecl( -#line 1403 "cs.ATG" +#line 1396 "cs.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1404 "cs.ATG" +#line 1397 "cs.ATG" Statement stmt = null; Expect(1); -#line 1407 "cs.ATG" +#line 1400 "cs.ATG" if (t.val != "set") Error("set expected"); if (la.kind == 15) { Block( -#line 1408 "cs.ATG" +#line 1401 "cs.ATG" out stmt); } else if (la.kind == 11) { lexer.NextToken(); } else SynErr(162); -#line 1408 "cs.ATG" +#line 1401 "cs.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); } void AddAccessorDecl( -#line 1484 "cs.ATG" +#line 1477 "cs.ATG" out Statement stmt) { -#line 1485 "cs.ATG" +#line 1478 "cs.ATG" stmt = null; Expect(1); -#line 1488 "cs.ATG" +#line 1481 "cs.ATG" if (t.val != "add") Error("add expected"); Block( -#line 1489 "cs.ATG" +#line 1482 "cs.ATG" out stmt); } void RemoveAccessorDecl( -#line 1492 "cs.ATG" +#line 1485 "cs.ATG" out Statement stmt) { -#line 1493 "cs.ATG" +#line 1486 "cs.ATG" stmt = null; Expect(1); -#line 1496 "cs.ATG" +#line 1489 "cs.ATG" if (t.val != "remove") Error("remove expected"); Block( -#line 1497 "cs.ATG" +#line 1490 "cs.ATG" out stmt); } void VariableInitializer( -#line 1513 "cs.ATG" +#line 1506 "cs.ATG" out Expression initializerExpression) { -#line 1514 "cs.ATG" +#line 1507 "cs.ATG" TypeReference type = null; Expression expr = null; initializerExpression = null; if (StartOf(4)) { Expr( -#line 1516 "cs.ATG" +#line 1509 "cs.ATG" out initializerExpression); } else if (la.kind == 15) { ArrayInitializer( -#line 1517 "cs.ATG" +#line 1510 "cs.ATG" out initializerExpression); } else if (la.kind == 104) { lexer.NextToken(); Type( -#line 1518 "cs.ATG" +#line 1511 "cs.ATG" out type); Expect(17); Expr( -#line 1518 "cs.ATG" +#line 1511 "cs.ATG" out expr); Expect(18); -#line 1518 "cs.ATG" +#line 1511 "cs.ATG" initializerExpression = new StackAllocExpression(type, expr); } else SynErr(163); } void Statement() { -#line 1622 "cs.ATG" +#line 1615 "cs.ATG" TypeReference type; Expression expr; Statement stmt = null; Point startPos = la.Location; if ( -#line 1630 "cs.ATG" +#line 1623 "cs.ATG" IsLabel()) { Expect(1); -#line 1630 "cs.ATG" +#line 1623 "cs.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(9); Statement(); } else if (la.kind == 58) { lexer.NextToken(); Type( -#line 1633 "cs.ATG" +#line 1626 "cs.ATG" out type); -#line 1633 "cs.ATG" +#line 1626 "cs.ATG" LocalVariableDeclaration var = new LocalVariableDeclaration(type, Modifier.Const); string ident = null; var.StartLocation = t.Location; Expect(1); -#line 1634 "cs.ATG" +#line 1627 "cs.ATG" ident = t.val; Expect(3); Expr( -#line 1635 "cs.ATG" +#line 1628 "cs.ATG" out expr); -#line 1635 "cs.ATG" +#line 1628 "cs.ATG" var.Variables.Add(new VariableDeclaration(ident, expr)); while (la.kind == 13) { lexer.NextToken(); Expect(1); -#line 1636 "cs.ATG" +#line 1629 "cs.ATG" ident = t.val; Expect(3); Expr( -#line 1636 "cs.ATG" +#line 1629 "cs.ATG" out expr); -#line 1636 "cs.ATG" +#line 1629 "cs.ATG" var.Variables.Add(new VariableDeclaration(ident, expr)); } Expect(11); -#line 1637 "cs.ATG" +#line 1630 "cs.ATG" compilationUnit.AddChild(var); } else if ( -#line 1639 "cs.ATG" +#line 1632 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1639 "cs.ATG" +#line 1632 "cs.ATG" out stmt); Expect(11); -#line 1639 "cs.ATG" +#line 1632 "cs.ATG" compilationUnit.AddChild(stmt); } else if (StartOf(22)) { EmbeddedStatement( -#line 1640 "cs.ATG" +#line 1633 "cs.ATG" out stmt); -#line 1640 "cs.ATG" +#line 1633 "cs.ATG" compilationUnit.AddChild(stmt); } else SynErr(164); -#line 1646 "cs.ATG" +#line 1639 "cs.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.EndLocation; @@ -3299,10 +3317,10 @@ out stmt); } void Argument( -#line 1553 "cs.ATG" +#line 1546 "cs.ATG" out Expression argumentexpr) { -#line 1555 "cs.ATG" +#line 1548 "cs.ATG" Expression expr; FieldDirection fd = FieldDirection.None; @@ -3310,48 +3328,48 @@ out Expression argumentexpr) { if (la.kind == 98) { lexer.NextToken(); -#line 1560 "cs.ATG" +#line 1553 "cs.ATG" fd = FieldDirection.Ref; } else { lexer.NextToken(); -#line 1561 "cs.ATG" +#line 1554 "cs.ATG" fd = FieldDirection.Out; } } Expr( -#line 1563 "cs.ATG" +#line 1556 "cs.ATG" out expr); -#line 1563 "cs.ATG" +#line 1556 "cs.ATG" argumentexpr = fd != FieldDirection.None ? argumentexpr = new DirectionExpression(fd, expr) : expr; } void ArrayInitializer( -#line 1582 "cs.ATG" +#line 1575 "cs.ATG" out Expression outExpr) { -#line 1584 "cs.ATG" +#line 1577 "cs.ATG" Expression expr = null; ArrayInitializerExpression initializer = new ArrayInitializerExpression(); Expect(15); if (StartOf(23)) { VariableInitializer( -#line 1589 "cs.ATG" +#line 1582 "cs.ATG" out expr); -#line 1589 "cs.ATG" +#line 1582 "cs.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1589 "cs.ATG" +#line 1582 "cs.ATG" NotFinalComma()) { Expect(13); VariableInitializer( -#line 1589 "cs.ATG" +#line 1582 "cs.ATG" out expr); -#line 1589 "cs.ATG" +#line 1582 "cs.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } if (la.kind == 13) { @@ -3360,84 +3378,84 @@ out expr); } Expect(16); -#line 1590 "cs.ATG" +#line 1583 "cs.ATG" outExpr = initializer; } void AssignmentOperator( -#line 1566 "cs.ATG" +#line 1559 "cs.ATG" out AssignmentOperatorType op) { -#line 1567 "cs.ATG" +#line 1560 "cs.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 3: { lexer.NextToken(); -#line 1569 "cs.ATG" +#line 1562 "cs.ATG" op = AssignmentOperatorType.Assign; break; } case 37: { lexer.NextToken(); -#line 1570 "cs.ATG" +#line 1563 "cs.ATG" op = AssignmentOperatorType.Add; break; } case 38: { lexer.NextToken(); -#line 1571 "cs.ATG" +#line 1564 "cs.ATG" op = AssignmentOperatorType.Subtract; break; } case 39: { lexer.NextToken(); -#line 1572 "cs.ATG" +#line 1565 "cs.ATG" op = AssignmentOperatorType.Multiply; break; } case 40: { lexer.NextToken(); -#line 1573 "cs.ATG" +#line 1566 "cs.ATG" op = AssignmentOperatorType.Divide; break; } case 41: { lexer.NextToken(); -#line 1574 "cs.ATG" +#line 1567 "cs.ATG" op = AssignmentOperatorType.Modulus; break; } case 42: { lexer.NextToken(); -#line 1575 "cs.ATG" +#line 1568 "cs.ATG" op = AssignmentOperatorType.BitwiseAnd; break; } case 43: { lexer.NextToken(); -#line 1576 "cs.ATG" +#line 1569 "cs.ATG" op = AssignmentOperatorType.BitwiseOr; break; } case 44: { lexer.NextToken(); -#line 1577 "cs.ATG" +#line 1570 "cs.ATG" op = AssignmentOperatorType.ExclusiveOr; break; } case 45: { lexer.NextToken(); -#line 1578 "cs.ATG" +#line 1571 "cs.ATG" op = AssignmentOperatorType.ShiftLeft; break; } @@ -3445,7 +3463,7 @@ out AssignmentOperatorType op) { lexer.NextToken(); Expect(34); -#line 1579 "cs.ATG" +#line 1572 "cs.ATG" op = AssignmentOperatorType.ShiftRight; break; } @@ -3454,66 +3472,66 @@ out AssignmentOperatorType op) { } void LocalVariableDecl( -#line 1593 "cs.ATG" +#line 1586 "cs.ATG" out Statement stmt) { -#line 1595 "cs.ATG" +#line 1588 "cs.ATG" TypeReference type; VariableDeclaration var = null; LocalVariableDeclaration localVariableDeclaration; Type( -#line 1600 "cs.ATG" +#line 1593 "cs.ATG" out type); -#line 1600 "cs.ATG" +#line 1593 "cs.ATG" localVariableDeclaration = new LocalVariableDeclaration(type); localVariableDeclaration.StartLocation = t.Location; LocalVariableDeclarator( -#line 1601 "cs.ATG" +#line 1594 "cs.ATG" out var); -#line 1601 "cs.ATG" +#line 1594 "cs.ATG" localVariableDeclaration.Variables.Add(var); while (la.kind == 13) { lexer.NextToken(); LocalVariableDeclarator( -#line 1602 "cs.ATG" +#line 1595 "cs.ATG" out var); -#line 1602 "cs.ATG" +#line 1595 "cs.ATG" localVariableDeclaration.Variables.Add(var); } -#line 1603 "cs.ATG" +#line 1596 "cs.ATG" stmt = localVariableDeclaration; } void LocalVariableDeclarator( -#line 1606 "cs.ATG" +#line 1599 "cs.ATG" out VariableDeclaration var) { -#line 1607 "cs.ATG" +#line 1600 "cs.ATG" Expression expr = null; Expect(1); -#line 1610 "cs.ATG" +#line 1603 "cs.ATG" var = new VariableDeclaration(t.val); if (la.kind == 3) { lexer.NextToken(); VariableInitializer( -#line 1610 "cs.ATG" +#line 1603 "cs.ATG" out expr); -#line 1610 "cs.ATG" +#line 1603 "cs.ATG" var.Initializer = expr; } } void EmbeddedStatement( -#line 1653 "cs.ATG" +#line 1646 "cs.ATG" out Statement statement) { -#line 1655 "cs.ATG" +#line 1648 "cs.ATG" TypeReference type = null; Expression expr = null; Statement embeddedStatement = null; @@ -3521,156 +3539,156 @@ out Statement statement) { if (la.kind == 15) { Block( -#line 1661 "cs.ATG" +#line 1654 "cs.ATG" out statement); } else if (la.kind == 11) { lexer.NextToken(); -#line 1663 "cs.ATG" +#line 1656 "cs.ATG" statement = new EmptyStatement(); } else if ( -#line 1665 "cs.ATG" +#line 1658 "cs.ATG" UnCheckedAndLBrace()) { -#line 1665 "cs.ATG" +#line 1658 "cs.ATG" Statement block; bool isChecked = true; if (la.kind == 56) { lexer.NextToken(); } else if (la.kind == 116) { lexer.NextToken(); -#line 1666 "cs.ATG" +#line 1659 "cs.ATG" isChecked = false; } else SynErr(166); Block( -#line 1667 "cs.ATG" +#line 1660 "cs.ATG" out block); -#line 1667 "cs.ATG" +#line 1660 "cs.ATG" statement = isChecked ? (Statement)new CheckedStatement(block) : (Statement)new UncheckedStatement(block); } else if (la.kind == 77) { lexer.NextToken(); -#line 1669 "cs.ATG" +#line 1662 "cs.ATG" Statement elseStatement = null; Expect(19); Expr( -#line 1670 "cs.ATG" +#line 1663 "cs.ATG" out expr); Expect(20); EmbeddedStatement( -#line 1671 "cs.ATG" +#line 1664 "cs.ATG" out embeddedStatement); if (la.kind == 65) { lexer.NextToken(); EmbeddedStatement( -#line 1672 "cs.ATG" +#line 1665 "cs.ATG" out elseStatement); } -#line 1673 "cs.ATG" +#line 1666 "cs.ATG" statement = elseStatement != null ? (Statement)new IfElseStatement(expr, embeddedStatement, elseStatement) : (Statement)new IfElseStatement(expr, embeddedStatement); } else if (la.kind == 108) { lexer.NextToken(); -#line 1674 "cs.ATG" +#line 1667 "cs.ATG" ArrayList switchSections = new ArrayList(); SwitchSection switchSection; Expect(19); Expr( -#line 1675 "cs.ATG" +#line 1668 "cs.ATG" out expr); Expect(20); Expect(15); while (la.kind == 53 || la.kind == 61) { SwitchSection( -#line 1676 "cs.ATG" +#line 1669 "cs.ATG" out switchSection); -#line 1676 "cs.ATG" +#line 1669 "cs.ATG" switchSections.Add(switchSection); } Expect(16); -#line 1677 "cs.ATG" +#line 1670 "cs.ATG" statement = new SwitchStatement(expr, switchSections); } else if (la.kind == 123) { lexer.NextToken(); Expect(19); Expr( -#line 1679 "cs.ATG" +#line 1672 "cs.ATG" out expr); Expect(20); EmbeddedStatement( -#line 1681 "cs.ATG" +#line 1674 "cs.ATG" out embeddedStatement); -#line 1681 "cs.ATG" +#line 1674 "cs.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 63) { lexer.NextToken(); EmbeddedStatement( -#line 1682 "cs.ATG" +#line 1675 "cs.ATG" out embeddedStatement); Expect(123); Expect(19); Expr( -#line 1683 "cs.ATG" +#line 1676 "cs.ATG" out expr); Expect(20); Expect(11); -#line 1683 "cs.ATG" +#line 1676 "cs.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.End); } else if (la.kind == 74) { lexer.NextToken(); -#line 1684 "cs.ATG" +#line 1677 "cs.ATG" ArrayList initializer = null; ArrayList iterator = null; Expect(19); if (StartOf(4)) { ForInitializer( -#line 1685 "cs.ATG" +#line 1678 "cs.ATG" out initializer); } Expect(11); if (StartOf(4)) { Expr( -#line 1686 "cs.ATG" +#line 1679 "cs.ATG" out expr); } Expect(11); if (StartOf(4)) { ForIterator( -#line 1687 "cs.ATG" +#line 1680 "cs.ATG" out iterator); } Expect(20); EmbeddedStatement( -#line 1688 "cs.ATG" +#line 1681 "cs.ATG" out embeddedStatement); -#line 1688 "cs.ATG" +#line 1681 "cs.ATG" statement = new ForStatement(initializer, expr, iterator, embeddedStatement); } else if (la.kind == 75) { lexer.NextToken(); Expect(19); Type( -#line 1689 "cs.ATG" +#line 1682 "cs.ATG" out type); Expect(1); -#line 1689 "cs.ATG" +#line 1682 "cs.ATG" string varName = t.val; Point start = t.Location; Expect(79); Expr( -#line 1690 "cs.ATG" +#line 1683 "cs.ATG" out expr); Expect(20); EmbeddedStatement( -#line 1691 "cs.ATG" +#line 1684 "cs.ATG" out embeddedStatement); -#line 1691 "cs.ATG" +#line 1684 "cs.ATG" statement = new ForeachStatement(type, varName , expr, embeddedStatement); statement.EndLocation = t.EndLocation; @@ -3678,34 +3696,34 @@ out embeddedStatement); lexer.NextToken(); Expect(11); -#line 1695 "cs.ATG" +#line 1688 "cs.ATG" statement = new BreakStatement(); } else if (la.kind == 59) { lexer.NextToken(); Expect(11); -#line 1696 "cs.ATG" +#line 1689 "cs.ATG" statement = new ContinueStatement(); } else if (la.kind == 76) { GotoStatement( -#line 1697 "cs.ATG" +#line 1690 "cs.ATG" out statement); } else if ( -#line 1698 "cs.ATG" +#line 1691 "cs.ATG" IsYieldStatement()) { Expect(1); if (la.kind == 99) { lexer.NextToken(); Expr( -#line 1698 "cs.ATG" +#line 1691 "cs.ATG" out expr); -#line 1698 "cs.ATG" +#line 1691 "cs.ATG" statement = new YieldStatement(new ReturnStatement(expr)); } else if (la.kind == 51) { lexer.NextToken(); -#line 1699 "cs.ATG" +#line 1692 "cs.ATG" statement = new YieldStatement(new BreakStatement()); } else SynErr(167); Expect(11); @@ -3713,514 +3731,513 @@ out expr); lexer.NextToken(); if (StartOf(4)) { Expr( -#line 1700 "cs.ATG" +#line 1693 "cs.ATG" out expr); } Expect(11); -#line 1700 "cs.ATG" +#line 1693 "cs.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 110) { lexer.NextToken(); if (StartOf(4)) { Expr( -#line 1701 "cs.ATG" +#line 1694 "cs.ATG" out expr); } Expect(11); -#line 1701 "cs.ATG" +#line 1694 "cs.ATG" statement = new ThrowStatement(expr); } else if (StartOf(4)) { StatementExpr( -#line 1703 "cs.ATG" +#line 1696 "cs.ATG" out statement); Expect(11); } else if (la.kind == 112) { TryStatement( -#line 1705 "cs.ATG" +#line 1698 "cs.ATG" out statement); } else if (la.kind == 84) { lexer.NextToken(); Expect(19); Expr( -#line 1707 "cs.ATG" +#line 1700 "cs.ATG" out expr); Expect(20); EmbeddedStatement( -#line 1708 "cs.ATG" +#line 1701 "cs.ATG" out embeddedStatement); -#line 1708 "cs.ATG" +#line 1701 "cs.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 119) { -#line 1710 "cs.ATG" +#line 1703 "cs.ATG" Statement resourceAcquisitionStmt = null; lexer.NextToken(); Expect(19); ResourceAcquisition( -#line 1712 "cs.ATG" +#line 1705 "cs.ATG" out resourceAcquisitionStmt); Expect(20); EmbeddedStatement( -#line 1713 "cs.ATG" +#line 1706 "cs.ATG" out embeddedStatement); -#line 1713 "cs.ATG" +#line 1706 "cs.ATG" statement = new UsingStatement(resourceAcquisitionStmt, embeddedStatement); } else if (la.kind == 117) { lexer.NextToken(); Block( -#line 1715 "cs.ATG" +#line 1708 "cs.ATG" out embeddedStatement); -#line 1715 "cs.ATG" +#line 1708 "cs.ATG" statement = new UnsafeStatement(embeddedStatement); } else if (la.kind == 72) { lexer.NextToken(); Expect(19); Type( -#line 1718 "cs.ATG" +#line 1711 "cs.ATG" out type); -#line 1718 "cs.ATG" +#line 1711 "cs.ATG" if (type.PointerNestingLevel == 0) Error("can only fix pointer types"); ArrayList pointerDeclarators = new ArrayList(1); Expect(1); -#line 1721 "cs.ATG" +#line 1714 "cs.ATG" string identifier = t.val; Expect(3); Expr( -#line 1722 "cs.ATG" +#line 1715 "cs.ATG" out expr); -#line 1722 "cs.ATG" +#line 1715 "cs.ATG" pointerDeclarators.Add(new VariableDeclaration(identifier, expr)); while (la.kind == 13) { lexer.NextToken(); Expect(1); -#line 1724 "cs.ATG" +#line 1717 "cs.ATG" identifier = t.val; Expect(3); Expr( -#line 1725 "cs.ATG" +#line 1718 "cs.ATG" out expr); -#line 1725 "cs.ATG" +#line 1718 "cs.ATG" pointerDeclarators.Add(new VariableDeclaration(identifier, expr)); } Expect(20); EmbeddedStatement( -#line 1727 "cs.ATG" +#line 1720 "cs.ATG" out embeddedStatement); -#line 1727 "cs.ATG" +#line 1720 "cs.ATG" statement = new FixedStatement(type, pointerDeclarators, embeddedStatement); } else SynErr(168); } void SwitchSection( -#line 1749 "cs.ATG" +#line 1742 "cs.ATG" out SwitchSection stmt) { -#line 1751 "cs.ATG" +#line 1744 "cs.ATG" SwitchSection switchSection = new SwitchSection(); CaseLabel label; SwitchLabel( -#line 1755 "cs.ATG" +#line 1748 "cs.ATG" out label); -#line 1755 "cs.ATG" +#line 1748 "cs.ATG" switchSection.SwitchLabels.Add(label); while (la.kind == 53 || la.kind == 61) { SwitchLabel( -#line 1757 "cs.ATG" +#line 1750 "cs.ATG" out label); -#line 1757 "cs.ATG" +#line 1750 "cs.ATG" switchSection.SwitchLabels.Add(label); } -#line 1759 "cs.ATG" +#line 1752 "cs.ATG" compilationUnit.BlockStart(switchSection); Statement(); while (StartOf(20)) { Statement(); } -#line 1762 "cs.ATG" +#line 1755 "cs.ATG" compilationUnit.BlockEnd(); stmt = switchSection; } void ForInitializer( -#line 1730 "cs.ATG" +#line 1723 "cs.ATG" out ArrayList initializer) { -#line 1732 "cs.ATG" +#line 1725 "cs.ATG" Statement stmt; initializer = new ArrayList(); if ( -#line 1736 "cs.ATG" +#line 1729 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1736 "cs.ATG" +#line 1729 "cs.ATG" out stmt); -#line 1736 "cs.ATG" +#line 1729 "cs.ATG" initializer.Add(stmt); } else if (StartOf(4)) { StatementExpr( -#line 1737 "cs.ATG" +#line 1730 "cs.ATG" out stmt); -#line 1737 "cs.ATG" +#line 1730 "cs.ATG" initializer.Add(stmt); while (la.kind == 13) { lexer.NextToken(); StatementExpr( -#line 1737 "cs.ATG" +#line 1730 "cs.ATG" out stmt); -#line 1737 "cs.ATG" +#line 1730 "cs.ATG" initializer.Add(stmt); } -#line 1737 "cs.ATG" +#line 1730 "cs.ATG" initializer.Add(stmt); } else SynErr(169); } void ForIterator( -#line 1740 "cs.ATG" +#line 1733 "cs.ATG" out ArrayList iterator) { -#line 1742 "cs.ATG" +#line 1735 "cs.ATG" Statement stmt; iterator = new ArrayList(); StatementExpr( -#line 1746 "cs.ATG" +#line 1739 "cs.ATG" out stmt); -#line 1746 "cs.ATG" +#line 1739 "cs.ATG" iterator.Add(stmt); while (la.kind == 13) { lexer.NextToken(); StatementExpr( -#line 1746 "cs.ATG" +#line 1739 "cs.ATG" out stmt); -#line 1746 "cs.ATG" +#line 1739 "cs.ATG" iterator.Add(stmt); } } void GotoStatement( -#line 1812 "cs.ATG" +#line 1810 "cs.ATG" out Statement stmt) { -#line 1813 "cs.ATG" +#line 1811 "cs.ATG" Expression expr; stmt = null; Expect(76); if (la.kind == 1) { lexer.NextToken(); -#line 1817 "cs.ATG" +#line 1815 "cs.ATG" stmt = new GotoStatement(t.val); Expect(11); } else if (la.kind == 53) { lexer.NextToken(); Expr( -#line 1818 "cs.ATG" +#line 1816 "cs.ATG" out expr); Expect(11); -#line 1818 "cs.ATG" +#line 1816 "cs.ATG" stmt = new GotoCaseStatement(expr); } else if (la.kind == 61) { lexer.NextToken(); Expect(11); -#line 1819 "cs.ATG" +#line 1817 "cs.ATG" stmt = new GotoCaseStatement(null); } else SynErr(170); } void StatementExpr( -#line 1839 "cs.ATG" +#line 1837 "cs.ATG" out Statement stmt) { -#line 1844 "cs.ATG" +#line 1842 "cs.ATG" bool mustBeAssignment = la.kind == Tokens.Plus || la.kind == Tokens.Minus || la.kind == Tokens.Not || la.kind == Tokens.BitwiseComplement || la.kind == Tokens.Times || la.kind == Tokens.BitwiseAnd || IsTypeCast(); Expression expr = null; UnaryExpr( -#line 1850 "cs.ATG" +#line 1848 "cs.ATG" out expr); if (StartOf(6)) { -#line 1853 "cs.ATG" +#line 1851 "cs.ATG" AssignmentOperatorType op; Expression val; AssignmentOperator( -#line 1853 "cs.ATG" +#line 1851 "cs.ATG" out op); Expr( -#line 1853 "cs.ATG" +#line 1851 "cs.ATG" out val); -#line 1853 "cs.ATG" +#line 1851 "cs.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 11 || la.kind == 13 || la.kind == 20) { -#line 1854 "cs.ATG" +#line 1852 "cs.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(171); -#line 1855 "cs.ATG" +#line 1853 "cs.ATG" stmt = new StatementExpression(expr); } void TryStatement( -#line 1774 "cs.ATG" +#line 1767 "cs.ATG" out Statement tryStatement) { -#line 1776 "cs.ATG" +#line 1769 "cs.ATG" Statement blockStmt = null, finallyStmt = null; ArrayList catchClauses = null; Expect(112); Block( -#line 1780 "cs.ATG" +#line 1773 "cs.ATG" out blockStmt); if (la.kind == 54) { CatchClauses( -#line 1782 "cs.ATG" +#line 1775 "cs.ATG" out catchClauses); if (la.kind == 71) { lexer.NextToken(); Block( -#line 1782 "cs.ATG" +#line 1775 "cs.ATG" out finallyStmt); } } else if (la.kind == 71) { lexer.NextToken(); Block( -#line 1783 "cs.ATG" +#line 1776 "cs.ATG" out finallyStmt); } else SynErr(172); -#line 1786 "cs.ATG" +#line 1779 "cs.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void ResourceAcquisition( -#line 1823 "cs.ATG" +#line 1821 "cs.ATG" out Statement stmt) { -#line 1825 "cs.ATG" +#line 1823 "cs.ATG" stmt = null; Expression expr; if ( -#line 1830 "cs.ATG" +#line 1828 "cs.ATG" IsLocalVarDecl()) { LocalVariableDecl( -#line 1830 "cs.ATG" +#line 1828 "cs.ATG" out stmt); } else if (StartOf(4)) { Expr( -#line 1831 "cs.ATG" +#line 1829 "cs.ATG" out expr); -#line 1835 "cs.ATG" +#line 1833 "cs.ATG" stmt = new StatementExpression(expr); } else SynErr(173); } void SwitchLabel( -#line 1767 "cs.ATG" +#line 1760 "cs.ATG" out CaseLabel label) { -#line 1768 "cs.ATG" +#line 1761 "cs.ATG" Expression expr = null; label = null; if (la.kind == 53) { lexer.NextToken(); Expr( -#line 1770 "cs.ATG" +#line 1763 "cs.ATG" out expr); Expect(9); -#line 1770 "cs.ATG" +#line 1763 "cs.ATG" label = new CaseLabel(expr); } else if (la.kind == 61) { lexer.NextToken(); Expect(9); -#line 1771 "cs.ATG" +#line 1764 "cs.ATG" label = new CaseLabel(); } else SynErr(174); } void CatchClauses( -#line 1791 "cs.ATG" +#line 1784 "cs.ATG" out ArrayList catchClauses) { -#line 1793 "cs.ATG" +#line 1786 "cs.ATG" catchClauses = new ArrayList(); Expect(54); -#line 1796 "cs.ATG" - string name; +#line 1789 "cs.ATG" string identifier; Statement stmt; - List types; + TypeReference typeRef; if (la.kind == 15) { Block( -#line 1803 "cs.ATG" +#line 1795 "cs.ATG" out stmt); -#line 1803 "cs.ATG" +#line 1795 "cs.ATG" catchClauses.Add(new CatchClause(stmt)); } else if (la.kind == 19) { lexer.NextToken(); ClassType( -#line 1805 "cs.ATG" -out name, out types); +#line 1797 "cs.ATG" +out typeRef); -#line 1805 "cs.ATG" +#line 1797 "cs.ATG" identifier = null; if (la.kind == 1) { lexer.NextToken(); -#line 1805 "cs.ATG" +#line 1798 "cs.ATG" identifier = t.val; } Expect(20); Block( -#line 1805 "cs.ATG" +#line 1799 "cs.ATG" out stmt); -#line 1805 "cs.ATG" - catchClauses.Add(new CatchClause(new TypeReference(name, 0, null, types), identifier, stmt)); +#line 1800 "cs.ATG" + catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); while ( -#line 1806 "cs.ATG" +#line 1801 "cs.ATG" IsTypedCatch()) { Expect(54); Expect(19); ClassType( -#line 1806 "cs.ATG" -out name, out types); +#line 1801 "cs.ATG" +out typeRef); -#line 1806 "cs.ATG" +#line 1801 "cs.ATG" identifier = null; if (la.kind == 1) { lexer.NextToken(); -#line 1806 "cs.ATG" +#line 1802 "cs.ATG" identifier = t.val; } Expect(20); Block( -#line 1806 "cs.ATG" +#line 1803 "cs.ATG" out stmt); -#line 1806 "cs.ATG" - catchClauses.Add(new CatchClause(new TypeReference(name, 0, null, types), identifier, stmt)); +#line 1804 "cs.ATG" + catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); } if (la.kind == 54) { lexer.NextToken(); Block( -#line 1808 "cs.ATG" +#line 1806 "cs.ATG" out stmt); -#line 1808 "cs.ATG" +#line 1806 "cs.ATG" catchClauses.Add(new CatchClause(stmt)); } } else SynErr(175); } void UnaryExpr( -#line 1871 "cs.ATG" +#line 1869 "cs.ATG" out Expression uExpr) { -#line 1873 "cs.ATG" +#line 1871 "cs.ATG" TypeReference type = null; Expression expr; ArrayList expressions = new ArrayList(); uExpr = null; while (StartOf(24) || -#line 1897 "cs.ATG" +#line 1895 "cs.ATG" IsTypeCast()) { if (la.kind == 4) { lexer.NextToken(); -#line 1882 "cs.ATG" +#line 1880 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Plus)); } else if (la.kind == 5) { lexer.NextToken(); -#line 1883 "cs.ATG" +#line 1881 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Minus)); } else if (la.kind == 23) { lexer.NextToken(); -#line 1884 "cs.ATG" +#line 1882 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Not)); } else if (la.kind == 26) { lexer.NextToken(); -#line 1885 "cs.ATG" +#line 1883 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitNot)); } else if (la.kind == 6) { lexer.NextToken(); -#line 1886 "cs.ATG" +#line 1884 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Star)); } else if (la.kind == 30) { lexer.NextToken(); -#line 1887 "cs.ATG" +#line 1885 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Increment)); } else if (la.kind == 31) { lexer.NextToken(); -#line 1888 "cs.ATG" +#line 1886 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.Decrement)); } else if (la.kind == 27) { lexer.NextToken(); -#line 1889 "cs.ATG" +#line 1887 "cs.ATG" expressions.Add(new UnaryOperatorExpression(UnaryOperatorType.BitWiseAnd)); } else { Expect(19); Type( -#line 1897 "cs.ATG" +#line 1895 "cs.ATG" out type); Expect(20); -#line 1897 "cs.ATG" +#line 1895 "cs.ATG" expressions.Add(new CastExpression(type)); } } PrimaryExpr( -#line 1901 "cs.ATG" +#line 1899 "cs.ATG" out expr); -#line 1901 "cs.ATG" +#line 1899 "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) { @@ -4238,76 +4255,74 @@ out expr); } void ConditionalOrExpr( -#line 2072 "cs.ATG" +#line 2082 "cs.ATG" ref Expression outExpr) { -#line 2073 "cs.ATG" +#line 2083 "cs.ATG" Expression expr; ConditionalAndExpr( -#line 2075 "cs.ATG" +#line 2085 "cs.ATG" ref outExpr); while (la.kind == 25) { lexer.NextToken(); UnaryExpr( -#line 2075 "cs.ATG" +#line 2085 "cs.ATG" out expr); ConditionalAndExpr( -#line 2075 "cs.ATG" +#line 2085 "cs.ATG" ref expr); -#line 2075 "cs.ATG" +#line 2085 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalOr, expr); } } void PrimaryExpr( -#line 1918 "cs.ATG" +#line 1916 "cs.ATG" out Expression pexpr) { -#line 1920 "cs.ATG" +#line 1918 "cs.ATG" TypeReference type = null; List typeList = null; bool isArrayCreation = false; Expression expr; pexpr = null; - switch (la.kind) { - case 111: { + if (la.kind == 111) { lexer.NextToken(); -#line 1928 "cs.ATG" +#line 1926 "cs.ATG" pexpr = new PrimitiveExpression(true, "true"); - break; - } - case 70: { + } else if (la.kind == 70) { lexer.NextToken(); -#line 1929 "cs.ATG" +#line 1927 "cs.ATG" pexpr = new PrimitiveExpression(false, "false"); - break; - } - case 88: { + } else if (la.kind == 88) { lexer.NextToken(); -#line 1930 "cs.ATG" +#line 1928 "cs.ATG" pexpr = new PrimitiveExpression(null, "null"); - break; - } - case 2: { + } else if (la.kind == 2) { lexer.NextToken(); -#line 1931 "cs.ATG" +#line 1929 "cs.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); - break; - } - case 1: { + } else if ( +#line 1930 "cs.ATG" +la.kind == Tokens.Identifier && Peek(1).kind == Tokens.DoubleColon) { + TypeName( +#line 1931 "cs.ATG" +out type); + +#line 1931 "cs.ATG" + pexpr = new TypeReferenceExpression(type); + } else if (la.kind == 1) { lexer.NextToken(); #line 1933 "cs.ATG" pexpr = new IdentifierExpression(t.val); - break; - } - case 19: { + } else if (la.kind == 19) { lexer.NextToken(); Expr( #line 1935 "cs.ATG" @@ -4316,9 +4331,7 @@ out expr); #line 1935 "cs.ATG" pexpr = new ParenthesizedExpression(expr); - break; - } - case 50: case 52: case 55: case 60: case 64: case 73: case 80: case 85: case 89: case 100: case 102: case 106: case 114: case 115: case 118: { + } else if (StartOf(25)) { #line 1937 "cs.ATG" string val = null; @@ -4437,16 +4450,12 @@ out expr); #line 1954 "cs.ATG" pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); - break; - } - case 109: { + } else if (la.kind == 109) { lexer.NextToken(); #line 1956 "cs.ATG" pexpr = new ThisReferenceExpression(); - break; - } - case 49: { + } else if (la.kind == 49) { lexer.NextToken(); #line 1958 "cs.ATG" @@ -4482,9 +4491,7 @@ out expr); #line 1964 "cs.ATG" pexpr = retExpr; - break; - } - case 87: { + } else if (la.kind == 87) { lexer.NextToken(); NonArrayType( #line 1965 "cs.ATG" @@ -4621,9 +4628,7 @@ out expr); ace.ArrayInitializer = (ArrayInitializerExpression)expr; ace.Parameters = parameters; } else SynErr(177); } else SynErr(178); - break; - } - case 113: { + } else if (la.kind == 113) { lexer.NextToken(); Expect(19); if ( @@ -4642,9 +4647,7 @@ out type); #line 2010 "cs.ATG" pexpr = new TypeOfExpression(type); - break; - } - case 103: { + } else if (la.kind == 103) { lexer.NextToken(); Expect(19); Type( @@ -4654,9 +4657,7 @@ out type); #line 2011 "cs.ATG" pexpr = new SizeOfExpression(type); - break; - } - case 56: { + } else if (la.kind == 56) { lexer.NextToken(); Expect(19); Expr( @@ -4666,9 +4667,7 @@ out expr); #line 2012 "cs.ATG" pexpr = new CheckedExpression(expr); - break; - } - case 116: { + } else if (la.kind == 116) { lexer.NextToken(); Expect(19); Expr( @@ -4678,9 +4677,7 @@ out expr); #line 2013 "cs.ATG" pexpr = new UncheckedExpression(expr); - break; - } - case 62: { + } else if (la.kind == 62) { lexer.NextToken(); AnonymousMethodExpr( #line 2014 "cs.ATG" @@ -4688,14 +4685,11 @@ out expr); #line 2014 "cs.ATG" pexpr = expr; - break; - } - default: SynErr(180); break; - } - while (StartOf(25) || -#line 2025 "cs.ATG" + } else SynErr(180); + while (StartOf(26) || +#line 2035 "cs.ATG" IsGenericFollowedBy(Tokens.Dot) && IsTypeReferenceExpression(pexpr) || -#line 2033 "cs.ATG" +#line 2043 "cs.ATG" IsGenericFollowedBy(Tokens.OpenParenthesis)) { if (la.kind == 30 || la.kind == 31) { if (la.kind == 30) { @@ -4722,108 +4716,108 @@ IsGenericFollowedBy(Tokens.OpenParenthesis)) { #line 2023 "cs.ATG" pexpr = new FieldReferenceExpression(pexpr, t.val); } else if ( -#line 2025 "cs.ATG" +#line 2035 "cs.ATG" IsGenericFollowedBy(Tokens.Dot) && IsTypeReferenceExpression(pexpr)) { TypeArgumentList( -#line 2026 "cs.ATG" +#line 2036 "cs.ATG" out typeList); Expect(14); Expect(1); -#line 2027 "cs.ATG" +#line 2037 "cs.ATG" pexpr = new FieldReferenceExpression(GetTypeReferenceExpression(pexpr, typeList), t.val); } else if (la.kind == 19) { lexer.NextToken(); -#line 2029 "cs.ATG" +#line 2039 "cs.ATG" ArrayList parameters = new ArrayList(); if (StartOf(21)) { Argument( -#line 2030 "cs.ATG" +#line 2040 "cs.ATG" out expr); -#line 2030 "cs.ATG" +#line 2040 "cs.ATG" if (expr != null) {parameters.Add(expr);} while (la.kind == 13) { lexer.NextToken(); Argument( -#line 2031 "cs.ATG" +#line 2041 "cs.ATG" out expr); -#line 2031 "cs.ATG" +#line 2041 "cs.ATG" if (expr != null) {parameters.Add(expr);} } } Expect(20); -#line 2032 "cs.ATG" +#line 2042 "cs.ATG" pexpr = new InvocationExpression(pexpr, parameters); } else if ( -#line 2033 "cs.ATG" +#line 2043 "cs.ATG" IsGenericFollowedBy(Tokens.OpenParenthesis)) { TypeArgumentList( -#line 2033 "cs.ATG" +#line 2043 "cs.ATG" out typeList); Expect(19); -#line 2034 "cs.ATG" +#line 2044 "cs.ATG" ArrayList parameters = new ArrayList(); if (StartOf(21)) { Argument( -#line 2035 "cs.ATG" +#line 2045 "cs.ATG" out expr); -#line 2035 "cs.ATG" +#line 2045 "cs.ATG" if (expr != null) {parameters.Add(expr);} while (la.kind == 13) { lexer.NextToken(); Argument( -#line 2036 "cs.ATG" +#line 2046 "cs.ATG" out expr); -#line 2036 "cs.ATG" +#line 2046 "cs.ATG" if (expr != null) {parameters.Add(expr);} } } Expect(20); -#line 2037 "cs.ATG" +#line 2047 "cs.ATG" pexpr = new InvocationExpression(pexpr, parameters, typeList); } else { -#line 2039 "cs.ATG" +#line 2049 "cs.ATG" if (isArrayCreation) Error("element access not allow on array creation"); ArrayList indices = new ArrayList(); lexer.NextToken(); Expr( -#line 2042 "cs.ATG" +#line 2052 "cs.ATG" out expr); -#line 2042 "cs.ATG" +#line 2052 "cs.ATG" if (expr != null) { indices.Add(expr); } while (la.kind == 13) { lexer.NextToken(); Expr( -#line 2043 "cs.ATG" +#line 2053 "cs.ATG" out expr); -#line 2043 "cs.ATG" +#line 2053 "cs.ATG" if (expr != null) { indices.Add(expr); } } Expect(18); -#line 2044 "cs.ATG" +#line 2054 "cs.ATG" pexpr = new IndexerExpression(pexpr, indices); } } } void AnonymousMethodExpr( -#line 2048 "cs.ATG" +#line 2058 "cs.ATG" out Expression outExpr) { -#line 2050 "cs.ATG" +#line 2060 "cs.ATG" AnonymousMethodExpression expr = new AnonymousMethodExpression(); expr.StartLocation = t.Location; Statement stmt; @@ -4833,336 +4827,336 @@ out Expression outExpr) { Expect(19); if (StartOf(9)) { FormalParameterList( -#line 2058 "cs.ATG" +#line 2068 "cs.ATG" p); -#line 2058 "cs.ATG" +#line 2068 "cs.ATG" expr.Parameters = p; } Expect(20); -#line 2062 "cs.ATG" +#line 2072 "cs.ATG" if (compilationUnit != null) { Block( -#line 2063 "cs.ATG" +#line 2073 "cs.ATG" out stmt); -#line 2063 "cs.ATG" +#line 2073 "cs.ATG" expr.Body = (BlockStatement)stmt; -#line 2064 "cs.ATG" +#line 2074 "cs.ATG" } else { Expect(15); -#line 2066 "cs.ATG" +#line 2076 "cs.ATG" lexer.SkipCurrentBlock(); Expect(16); -#line 2068 "cs.ATG" +#line 2078 "cs.ATG" } -#line 2069 "cs.ATG" +#line 2079 "cs.ATG" expr.EndLocation = t.Location; } void TypeArgumentList( -#line 2201 "cs.ATG" +#line 2228 "cs.ATG" out List types) { -#line 2203 "cs.ATG" +#line 2230 "cs.ATG" types = new List(); TypeReference type = null; Expect(22); Type( -#line 2207 "cs.ATG" +#line 2234 "cs.ATG" out type); -#line 2207 "cs.ATG" +#line 2234 "cs.ATG" types.Add(type); while (la.kind == 13) { lexer.NextToken(); Type( -#line 2208 "cs.ATG" +#line 2235 "cs.ATG" out type); -#line 2208 "cs.ATG" +#line 2235 "cs.ATG" types.Add(type); } Expect(21); } void ConditionalAndExpr( -#line 2078 "cs.ATG" +#line 2088 "cs.ATG" ref Expression outExpr) { -#line 2079 "cs.ATG" +#line 2089 "cs.ATG" Expression expr; InclusiveOrExpr( -#line 2081 "cs.ATG" +#line 2091 "cs.ATG" ref outExpr); while (la.kind == 24) { lexer.NextToken(); UnaryExpr( -#line 2081 "cs.ATG" +#line 2091 "cs.ATG" out expr); InclusiveOrExpr( -#line 2081 "cs.ATG" +#line 2091 "cs.ATG" ref expr); -#line 2081 "cs.ATG" +#line 2091 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalAnd, expr); } } void InclusiveOrExpr( -#line 2084 "cs.ATG" +#line 2094 "cs.ATG" ref Expression outExpr) { -#line 2085 "cs.ATG" +#line 2095 "cs.ATG" Expression expr; ExclusiveOrExpr( -#line 2087 "cs.ATG" +#line 2097 "cs.ATG" ref outExpr); while (la.kind == 28) { lexer.NextToken(); UnaryExpr( -#line 2087 "cs.ATG" +#line 2097 "cs.ATG" out expr); ExclusiveOrExpr( -#line 2087 "cs.ATG" +#line 2097 "cs.ATG" ref expr); -#line 2087 "cs.ATG" +#line 2097 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseOr, expr); } } void ExclusiveOrExpr( -#line 2090 "cs.ATG" +#line 2100 "cs.ATG" ref Expression outExpr) { -#line 2091 "cs.ATG" +#line 2101 "cs.ATG" Expression expr; AndExpr( -#line 2093 "cs.ATG" +#line 2103 "cs.ATG" ref outExpr); while (la.kind == 29) { lexer.NextToken(); UnaryExpr( -#line 2093 "cs.ATG" +#line 2103 "cs.ATG" out expr); AndExpr( -#line 2093 "cs.ATG" +#line 2103 "cs.ATG" ref expr); -#line 2093 "cs.ATG" +#line 2103 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.ExclusiveOr, expr); } } void AndExpr( -#line 2096 "cs.ATG" +#line 2106 "cs.ATG" ref Expression outExpr) { -#line 2097 "cs.ATG" +#line 2107 "cs.ATG" Expression expr; EqualityExpr( -#line 2099 "cs.ATG" +#line 2109 "cs.ATG" ref outExpr); while (la.kind == 27) { lexer.NextToken(); UnaryExpr( -#line 2099 "cs.ATG" +#line 2109 "cs.ATG" out expr); EqualityExpr( -#line 2099 "cs.ATG" +#line 2109 "cs.ATG" ref expr); -#line 2099 "cs.ATG" +#line 2109 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseAnd, expr); } } void EqualityExpr( -#line 2102 "cs.ATG" +#line 2112 "cs.ATG" ref Expression outExpr) { -#line 2104 "cs.ATG" +#line 2114 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; RelationalExpr( -#line 2108 "cs.ATG" +#line 2118 "cs.ATG" ref outExpr); while (la.kind == 32 || la.kind == 33) { if (la.kind == 33) { lexer.NextToken(); -#line 2111 "cs.ATG" +#line 2121 "cs.ATG" op = BinaryOperatorType.InEquality; } else { lexer.NextToken(); -#line 2112 "cs.ATG" +#line 2122 "cs.ATG" op = BinaryOperatorType.Equality; } UnaryExpr( -#line 2114 "cs.ATG" +#line 2124 "cs.ATG" out expr); RelationalExpr( -#line 2114 "cs.ATG" +#line 2124 "cs.ATG" ref expr); -#line 2114 "cs.ATG" +#line 2124 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void RelationalExpr( -#line 2118 "cs.ATG" +#line 2128 "cs.ATG" ref Expression outExpr) { -#line 2120 "cs.ATG" +#line 2130 "cs.ATG" TypeReference type; Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 2125 "cs.ATG" +#line 2135 "cs.ATG" ref outExpr); - while (StartOf(26)) { - if (StartOf(27)) { + while (StartOf(27)) { + if (StartOf(28)) { if (la.kind == 22) { lexer.NextToken(); -#line 2128 "cs.ATG" +#line 2138 "cs.ATG" op = BinaryOperatorType.LessThan; } else if (la.kind == 21) { lexer.NextToken(); -#line 2129 "cs.ATG" +#line 2139 "cs.ATG" op = BinaryOperatorType.GreaterThan; } else if (la.kind == 35) { lexer.NextToken(); -#line 2130 "cs.ATG" +#line 2140 "cs.ATG" op = BinaryOperatorType.LessThanOrEqual; } else if (la.kind == 34) { lexer.NextToken(); -#line 2131 "cs.ATG" +#line 2141 "cs.ATG" op = BinaryOperatorType.GreaterThanOrEqual; } else SynErr(182); UnaryExpr( -#line 2133 "cs.ATG" +#line 2143 "cs.ATG" out expr); ShiftExpr( -#line 2133 "cs.ATG" +#line 2143 "cs.ATG" ref expr); -#line 2133 "cs.ATG" +#line 2143 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else { if (la.kind == 83) { lexer.NextToken(); -#line 2136 "cs.ATG" +#line 2146 "cs.ATG" op = BinaryOperatorType.TypeCheck; } else if (la.kind == 48) { lexer.NextToken(); -#line 2137 "cs.ATG" +#line 2147 "cs.ATG" op = BinaryOperatorType.AsCast; } else SynErr(183); Type( -#line 2139 "cs.ATG" +#line 2149 "cs.ATG" out type); -#line 2139 "cs.ATG" +#line 2149 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new TypeReferenceExpression(type)); } } } void ShiftExpr( -#line 2143 "cs.ATG" +#line 2153 "cs.ATG" ref Expression outExpr) { -#line 2145 "cs.ATG" +#line 2155 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; AdditiveExpr( -#line 2149 "cs.ATG" +#line 2159 "cs.ATG" ref outExpr); while (la.kind == 36 || -#line 2152 "cs.ATG" +#line 2162 "cs.ATG" IsShiftRight()) { if (la.kind == 36) { lexer.NextToken(); -#line 2151 "cs.ATG" +#line 2161 "cs.ATG" op = BinaryOperatorType.ShiftLeft; } else { Expect(21); Expect(21); -#line 2153 "cs.ATG" +#line 2163 "cs.ATG" op = BinaryOperatorType.ShiftRight; } UnaryExpr( -#line 2156 "cs.ATG" +#line 2166 "cs.ATG" out expr); AdditiveExpr( -#line 2156 "cs.ATG" +#line 2166 "cs.ATG" ref expr); -#line 2156 "cs.ATG" +#line 2166 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AdditiveExpr( -#line 2160 "cs.ATG" +#line 2170 "cs.ATG" ref Expression outExpr) { -#line 2162 "cs.ATG" +#line 2172 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; MultiplicativeExpr( -#line 2166 "cs.ATG" +#line 2176 "cs.ATG" ref outExpr); while (la.kind == 4 || la.kind == 5) { if (la.kind == 4) { lexer.NextToken(); -#line 2169 "cs.ATG" +#line 2179 "cs.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 2170 "cs.ATG" +#line 2180 "cs.ATG" op = BinaryOperatorType.Subtract; } UnaryExpr( -#line 2172 "cs.ATG" +#line 2182 "cs.ATG" out expr); MultiplicativeExpr( -#line 2172 "cs.ATG" +#line 2182 "cs.ATG" ref expr); -#line 2172 "cs.ATG" +#line 2182 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void MultiplicativeExpr( -#line 2176 "cs.ATG" +#line 2186 "cs.ATG" ref Expression outExpr) { -#line 2178 "cs.ATG" +#line 2188 "cs.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; @@ -5170,57 +5164,57 @@ ref Expression outExpr) { if (la.kind == 6) { lexer.NextToken(); -#line 2184 "cs.ATG" +#line 2194 "cs.ATG" op = BinaryOperatorType.Multiply; } else if (la.kind == 7) { lexer.NextToken(); -#line 2185 "cs.ATG" +#line 2195 "cs.ATG" op = BinaryOperatorType.Divide; } else { lexer.NextToken(); -#line 2186 "cs.ATG" +#line 2196 "cs.ATG" op = BinaryOperatorType.Modulus; } UnaryExpr( -#line 2188 "cs.ATG" +#line 2198 "cs.ATG" out expr); -#line 2188 "cs.ATG" +#line 2198 "cs.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void TypeParameterConstraintsClauseBase( -#line 2253 "cs.ATG" +#line 2280 "cs.ATG" out TypeReference type) { -#line 2254 "cs.ATG" +#line 2281 "cs.ATG" TypeReference t; type = null; if (la.kind == 107) { lexer.NextToken(); -#line 2256 "cs.ATG" +#line 2283 "cs.ATG" type = new TypeReference("struct"); } else if (la.kind == 57) { lexer.NextToken(); -#line 2257 "cs.ATG" +#line 2284 "cs.ATG" type = new TypeReference("struct"); } else if (la.kind == 87) { lexer.NextToken(); Expect(19); Expect(20); -#line 2258 "cs.ATG" +#line 2285 "cs.ATG" type = new TypeReference("struct"); } else if (StartOf(8)) { Type( -#line 2259 "cs.ATG" +#line 2286 "cs.ATG" out t); -#line 2259 "cs.ATG" +#line 2286 "cs.ATG" type = t; } else SynErr(184); } @@ -5496,6 +5490,7 @@ out t); {x,T,T,x, T,T,T,x, x,x,x,T, x,x,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,T, T,x,x,T, T,x,x,T, T,x,T,T, T,x,x,x, x,x,T,x, T,T,T,T, T,T,x,x, T,x,x,x, T,T,x,T, T,T,x,x, x,x,x,x, x,x,x,T, T,x,T,T, x,x,T,x, T,T,T,T, T,T,T,T, T,T,T,T, x,x,x,T, x,x}, {x,T,T,x, T,T,T,x, x,x,x,x, x,x,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,T,T, 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,x,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, T,x,T,x, x,T,x,T, x,T,T,T, T,x,T,x, x,x,x,x, x,x}, {x,x,x,x, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,T, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,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,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, 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,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} diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG index 547413a9d0..a53dfb3c8d 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG @@ -125,7 +125,7 @@ bool IsQualident(ref Token pt, out string qualident) if (pt.kind == Tokens.Identifier) { qualidentBuilder.Length = 0; qualidentBuilder.Append(pt.val); pt = Peek(); - while (pt.kind == Tokens.Dot) { + while (pt.kind == Tokens.Dot || pt.kind == Tokens.DoubleColon) { pt = Peek(); if (pt.kind != Tokens.Identifier) { qualident = String.Empty; @@ -703,7 +703,7 @@ NamespaceMemberDecl TypeDecl attributes> (. TypeReference type; - ArrayList names; + List names; List p = new List(); string name; List templates; @@ -780,9 +780,7 @@ TypeDecl attributes> newType.Type = Types.Enum; .) ident (. newType.Name = t.val; .) - [ ":" IntegralType (. newType.BaseTypes = new ArrayList(); - newType.BaseTypes.Add(name); - .) + [ ":" IntegralType (. newType.BaseTypes.Add(new TypeReference(name)); .) ] (. newType.StartLocation = t.EndLocation; .) EnumBody [ ";" ] (. newType.EndLocation = t.Location; @@ -822,15 +820,14 @@ Qualident } (. qualident = qualidentBuilder.ToString(); .) . -ClassBase +ClassBase names> (. - string qualident; - names = new ArrayList(); - List types; + TypeReference typeRef; + names = new List(); .) = - ":" ClassType (. names.Add(qualident); // TODO: enter the types .) - { "," Qualident (. names.Add(qualident); .) } + ":" ClassType (. if (typeRef != null) { names.Add(typeRef); } .) + { "," TypeName (. if (typeRef != null) { names.Add(typeRef); } .) } . ClassBody @@ -847,14 +844,14 @@ ClassBody "}" . -StructInterfaces +StructInterfaces names> (. - string qualident; - names = new ArrayList(); + TypeReference typeRef; + names = new List(); .) = - ":" Qualident (. names.Add(qualident); .) - { "," Qualident (. names.Add(qualident); .) } + ":" TypeName (. if (typeRef != null) { names.Add(typeRef); } .) + { "," TypeName (. if (typeRef != null) { names.Add(typeRef); } .) } . StructBody @@ -871,14 +868,14 @@ StructBody "}" . -InterfaceBase +InterfaceBase names> (. - string qualident; - names = new ArrayList(); + TypeReference typeRef; + names = new List(); .) = - ":" Qualident (. names.Add(qualident); .) - { "," Qualident (. names.Add(qualident); .) } + ":" TypeName (. if (typeRef != null) { names.Add(typeRef); } .) + { "," TypeName (. if (typeRef != null) { names.Add(typeRef); } .) } . InterfaceBody @@ -894,43 +891,42 @@ EnumBody (. FieldDeclaration f; .) Type (. - string name = ""; + string name; int pointer = 0; - List types = null; type = null; .) = - ( ClassType - | SimpleType - | "void" "*" (. pointer = 1; name = "void"; .) - ) (. ArrayList r = new ArrayList(); .) + ( ClassType + | SimpleType (. type = new TypeReference(name); .) + | "void" "*" (. pointer = 1; type = new TypeReference("void"); .) + ) (. List r = new List(); .) { IF (IsPointerOrDims()) (. int i = 0; .) ( "*" (. ++pointer; .) | "[" { "," (. ++i; .) } "]" (. r.Add(i); .) ) - } (. int[] rank = new int[r.Count]; r.CopyTo(rank); - type = new TypeReference(name, pointer, rank, types); - .) + } + (. type.RankSpecifier = r.ToArray(); + type.PointerNestingLevel = pointer; + .) . NonArrayType (. - string name = ""; + string name; int pointer = 0; - List genericTypes = null; + type = null; .) = - ( ClassType - | SimpleType - | "void" "*" (. pointer = 1; name = "void"; .) - ) + ( ClassType + | SimpleType (. type = new TypeReference(name); .) + | "void" "*" (. pointer = 1; type = new TypeReference("void"); .) + ) { IF (IsPointer()) "*" (. ++pointer; .) - } (. - type = new TypeReference(name, pointer, null, genericTypes); - .) + } + (. type.PointerNestingLevel = pointer; .) . SimpleType @@ -1003,15 +999,12 @@ TypeModifier | ident (. if (t.val == "partial") { m.Add(Modifier.Partial); } .) . -ClassType types> -(. string qualident; name = ""; - List t; - types = null; -.) +ClassType +(. TypeReference r; typeRef = null; .) = - TypeName (. name = qualident; types = t; .) - | "object" (. name = "object"; .) - | "string" (. name = "string"; .) + TypeName (. typeRef = r; .) + | "object" (. typeRef = new TypeReference("object"); .) + | "string" (. typeRef = new TypeReference("string"); .) . IntegralType (. name = ""; .) @@ -1793,17 +1786,22 @@ CatchClauses catchClauses = new ArrayList(); .) = - "catch" (. string name; - string identifier; + "catch" (. string identifier; Statement stmt; - List types; + TypeReference typeRef; .) /*--- general catch clause (as only catch clause) */ ( Block (. catchClauses.Add(new CatchClause(stmt)); .) /*--- specific catch clause */ - | "(" ClassType (. identifier = null; .) [ ident (. identifier = t.val; .) ] ")" Block (. catchClauses.Add(new CatchClause(new TypeReference(name, 0, null, types), identifier, stmt)); .) - { IF (IsTypedCatch()) "catch" "(" ClassType (. identifier = null; .) [ ident (. identifier = t.val; .) ] ")" Block (. catchClauses.Add(new CatchClause(new TypeReference(name, 0, null, types), identifier, stmt)); .) } + | "(" ClassType (. identifier = null; .) + [ ident (. identifier = t.val; .) ] + ")" Block + (. catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); .) + { IF (IsTypedCatch()) "catch" "(" ClassType (. identifier = null; .) + [ ident (. identifier = t.val; .) ] + ")" Block + (. catchClauses.Add(new CatchClause(typeRef, identifier, stmt)); .) } /*--- general catch clause (after specific catch clauses, optional) */ [ "catch" Block (. catchClauses.Add(new CatchClause(stmt)); .) ] ) @@ -1929,6 +1927,8 @@ PrimaryExpr | "false" (.pexpr = new PrimitiveExpression(false, "false"); .) | "null" (.pexpr = new PrimitiveExpression(null, "null"); .) /* from literal token */ | Literal (.pexpr = new PrimitiveExpression(t.literalValue, t.val); .) + | IF (la.kind == Tokens.Identifier && Peek(1).kind == Tokens.DoubleColon) + TypeName (. pexpr = new TypeReferenceExpression(type); .) /*--- simple name: */ | ident (. pexpr = new IdentifierExpression(t.val); .) /*--- parenthesized expression: */ @@ -2020,7 +2020,17 @@ PrimaryExpr ) /*--- member access */ | "->" ident (. pexpr = new PointerReferenceExpression(pexpr, t.val); .) - | "." ident (. pexpr = new FieldReferenceExpression(pexpr, t.val);.) + | "." ident (. pexpr = new FieldReferenceExpression(pexpr, t.val);.) + /*| "::" ident (. + if (pexpr is IdentifierExpression) { + if (((IdentifierExpression)pexpr).Identifier == "global") { + pexpr = new GlobalReferenceExpression(); + } + } else { + Error("expression before :: must be an identifier"); + } + pexpr = new FieldReferenceExpression(pexpr, t.val); + .) */ /* member access on generic type */ | ( IF (IsGenericFollowedBy(Tokens.Dot) && IsTypeReferenceExpression(pexpr)) TypeArgumentList ) @@ -2191,11 +2201,28 @@ MultiplicativeExpr /* .NET 2.0 rules */ -TypeName types> -(. List t; types = new List(); .) +TypeName +(. List typeArguments = null; + string alias = null; + string qualident; +.) = + [ IF (la.kind == Tokens.Identifier && Peek(1).kind == Tokens.DoubleColon) + ident (. alias = t.val; .) + "::" + ] Qualident - [ TypeArgumentList (. types = t; .)] + [ TypeArgumentList ] + (. + if (alias == null) { + typeRef = new TypeReference(qualident, typeArguments); + } else if (alias == "global") { + typeRef = new TypeReference(qualident, typeArguments); + typeRef.IsGlobal = true; + } else { + typeRef = new TypeReference(alias + "." + qualident, typeArguments); + } + .) . TypeArgumentList types> diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index a595666538..020fe25453 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -350,7 +350,7 @@ out u); void GlobalAttributeSection() { -#line 1808 "VBNET.ATG" +#line 1813 "VBNET.ATG" Point startPos = t.Location; Expect(26); if (la.kind == 48) { @@ -359,20 +359,20 @@ out u); lexer.NextToken(); } else SynErr(203); -#line 1810 "VBNET.ATG" +#line 1815 "VBNET.ATG" string attributeTarget = t.val.ToLower(); List attributes = new List(); ASTAttribute attribute; Expect(13); Attribute( -#line 1814 "VBNET.ATG" +#line 1819 "VBNET.ATG" out attribute); -#line 1814 "VBNET.ATG" +#line 1819 "VBNET.ATG" attributes.Add(attribute); while ( -#line 1815 "VBNET.ATG" +#line 1820 "VBNET.ATG" NotFinalComma()) { if (la.kind == 12) { lexer.NextToken(); @@ -384,10 +384,10 @@ NotFinalComma()) { Expect(13); } Attribute( -#line 1815 "VBNET.ATG" +#line 1820 "VBNET.ATG" out attribute); -#line 1815 "VBNET.ATG" +#line 1820 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -396,7 +396,7 @@ out attribute); Expect(25); EndOfStmt(); -#line 1820 "VBNET.ATG" +#line 1825 "VBNET.ATG" AttributeSection section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -527,30 +527,30 @@ out qualident); } void Qualident( -#line 2532 "VBNET.ATG" +#line 2537 "VBNET.ATG" out string qualident) { -#line 2534 "VBNET.ATG" +#line 2539 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 2538 "VBNET.ATG" +#line 2543 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 2539 "VBNET.ATG" +#line 2544 "VBNET.ATG" DotAndIdentOrKw()) { Expect(10); IdentifierOrKeyword( -#line 2539 "VBNET.ATG" +#line 2544 "VBNET.ATG" out name); -#line 2539 "VBNET.ATG" +#line 2544 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 2541 "VBNET.ATG" +#line 2546 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } @@ -564,35 +564,35 @@ out name); } void AttributeSection( -#line 1878 "VBNET.ATG" +#line 1883 "VBNET.ATG" out AttributeSection section) { -#line 1880 "VBNET.ATG" +#line 1885 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(26); -#line 1884 "VBNET.ATG" +#line 1889 "VBNET.ATG" Point startPos = t.Location; if ( -#line 1885 "VBNET.ATG" +#line 1890 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 92) { lexer.NextToken(); -#line 1886 "VBNET.ATG" +#line 1891 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 154) { lexer.NextToken(); -#line 1887 "VBNET.ATG" +#line 1892 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 1890 "VBNET.ATG" +#line 1895 "VBNET.ATG" string val = t.val.ToLower(); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -605,20 +605,20 @@ IsLocalAttrTarget()) { Expect(13); } Attribute( -#line 1900 "VBNET.ATG" +#line 1905 "VBNET.ATG" out attribute); -#line 1900 "VBNET.ATG" +#line 1905 "VBNET.ATG" attributes.Add(attribute); while ( -#line 1901 "VBNET.ATG" +#line 1906 "VBNET.ATG" NotFinalComma()) { Expect(12); Attribute( -#line 1901 "VBNET.ATG" +#line 1906 "VBNET.ATG" out attribute); -#line 1901 "VBNET.ATG" +#line 1906 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -626,7 +626,7 @@ out attribute); } Expect(25); -#line 1905 "VBNET.ATG" +#line 1910 "VBNET.ATG" section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -634,62 +634,62 @@ out attribute); } void TypeModifier( -#line 2741 "VBNET.ATG" +#line 2746 "VBNET.ATG" Modifiers m) { switch (la.kind) { case 148: { lexer.NextToken(); -#line 2742 "VBNET.ATG" +#line 2747 "VBNET.ATG" m.Add(Modifier.Public); break; } case 147: { lexer.NextToken(); -#line 2743 "VBNET.ATG" +#line 2748 "VBNET.ATG" m.Add(Modifier.Protected); break; } case 98: { lexer.NextToken(); -#line 2744 "VBNET.ATG" +#line 2749 "VBNET.ATG" m.Add(Modifier.Internal); break; } case 145: { lexer.NextToken(); -#line 2745 "VBNET.ATG" +#line 2750 "VBNET.ATG" m.Add(Modifier.Private); break; } case 158: { lexer.NextToken(); -#line 2746 "VBNET.ATG" +#line 2751 "VBNET.ATG" m.Add(Modifier.Static); break; } case 157: { lexer.NextToken(); -#line 2747 "VBNET.ATG" +#line 2752 "VBNET.ATG" m.Add(Modifier.New); break; } case 121: { lexer.NextToken(); -#line 2748 "VBNET.ATG" +#line 2753 "VBNET.ATG" m.Add(Modifier.Abstract); break; } case 130: { lexer.NextToken(); -#line 2749 "VBNET.ATG" +#line 2754 "VBNET.ATG" m.Add(Modifier.Sealed); break; } @@ -702,23 +702,24 @@ Modifiers m) { Modifiers m, List attributes) { #line 591 "VBNET.ATG" - string name = String.Empty; - ArrayList names = null; + string name = null; + TypeReference typeRef = null; + List baseInterfaces = null; switch (la.kind) { case 66: case 199: { -#line 594 "VBNET.ATG" +#line 595 "VBNET.ATG" m.Check(Modifier.Classes); if (la.kind == 199) { lexer.NextToken(); -#line 596 "VBNET.ATG" +#line 597 "VBNET.ATG" m.Add(Modifier.Partial); } Expect(66); -#line 598 "VBNET.ATG" +#line 599 "VBNET.ATG" TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); compilationUnit.BlockStart(newType); @@ -727,33 +728,33 @@ Modifiers m, List attributes) { Identifier(); -#line 605 "VBNET.ATG" +#line 606 "VBNET.ATG" newType.Name = t.val; newType.StartLocation = t.EndLocation; TypeParameterList( -#line 606 "VBNET.ATG" +#line 607 "VBNET.ATG" newType.Templates); EndOfStmt(); if (la.kind == 109) { ClassBaseType( -#line 608 "VBNET.ATG" -out name); +#line 609 "VBNET.ATG" +out typeRef); -#line 608 "VBNET.ATG" - newType.BaseTypes.Add(name); +#line 609 "VBNET.ATG" + newType.BaseTypes.Add(typeRef); } while (la.kind == 106) { TypeImplementsClause( -#line 609 "VBNET.ATG" -out names); +#line 610 "VBNET.ATG" +out baseInterfaces); -#line 609 "VBNET.ATG" - newType.BaseTypes.AddRange(names); +#line 610 "VBNET.ATG" + newType.BaseTypes.AddRange(baseInterfaces); } ClassBody( -#line 610 "VBNET.ATG" +#line 611 "VBNET.ATG" newType); -#line 612 "VBNET.ATG" +#line 613 "VBNET.ATG" compilationUnit.BlockEnd(); break; @@ -761,7 +762,7 @@ newType); case 120: { lexer.NextToken(); -#line 616 "VBNET.ATG" +#line 617 "VBNET.ATG" m.Check(Modifier.VBModules); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); @@ -771,14 +772,14 @@ newType); Identifier(); -#line 623 "VBNET.ATG" +#line 624 "VBNET.ATG" newType.Name = t.val; newType.StartLocation = t.EndLocation; Expect(1); ModuleBody( -#line 625 "VBNET.ATG" +#line 626 "VBNET.ATG" newType); -#line 627 "VBNET.ATG" +#line 628 "VBNET.ATG" newType.EndLocation = t.Location; compilationUnit.BlockEnd(); @@ -787,35 +788,35 @@ newType); case 166: { lexer.NextToken(); -#line 632 "VBNET.ATG" +#line 633 "VBNET.ATG" m.Check(Modifier.VBStructures); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); compilationUnit.BlockStart(newType); newType.StartLocation = t.Location; - newType.Type = Types.Struct; ArrayList baseInterfaces = new ArrayList(); + newType.Type = Types.Struct; Identifier(); -#line 639 "VBNET.ATG" +#line 640 "VBNET.ATG" newType.Name = t.val; newType.StartLocation = t.EndLocation; TypeParameterList( -#line 640 "VBNET.ATG" +#line 641 "VBNET.ATG" newType.Templates); Expect(1); while (la.kind == 106) { TypeImplementsClause( -#line 641 "VBNET.ATG" +#line 642 "VBNET.ATG" out baseInterfaces); -#line 641 "VBNET.ATG" +#line 642 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } StructureBody( -#line 642 "VBNET.ATG" +#line 643 "VBNET.ATG" newType); -#line 644 "VBNET.ATG" +#line 645 "VBNET.ATG" newType.EndLocation = t.Location; compilationUnit.BlockEnd(); @@ -824,7 +825,7 @@ newType); case 89: { lexer.NextToken(); -#line 650 "VBNET.ATG" +#line 651 "VBNET.ATG" m.Check(Modifier.VBEnums); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); @@ -835,23 +836,23 @@ newType); Identifier(); -#line 658 "VBNET.ATG" +#line 659 "VBNET.ATG" newType.Name = t.val; newType.StartLocation = t.EndLocation; if (la.kind == 47) { lexer.NextToken(); PrimitiveTypeName( -#line 659 "VBNET.ATG" +#line 660 "VBNET.ATG" out name); -#line 659 "VBNET.ATG" - newType.BaseTypes.Add(name); +#line 660 "VBNET.ATG" + newType.BaseTypes.Add(new TypeReference(name)); } Expect(1); EnumBody( -#line 661 "VBNET.ATG" +#line 662 "VBNET.ATG" newType); -#line 663 "VBNET.ATG" +#line 664 "VBNET.ATG" newType.EndLocation = t.Location; compilationUnit.BlockEnd(); @@ -860,34 +861,34 @@ newType); case 111: { lexer.NextToken(); -#line 669 "VBNET.ATG" +#line 670 "VBNET.ATG" m.Check(Modifier.VBInterfacs); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); compilationUnit.BlockStart(newType); - newType.Type = Types.Interface;ArrayList baseInterfaces; + newType.Type = Types.Interface; Identifier(); -#line 675 "VBNET.ATG" +#line 676 "VBNET.ATG" newType.Name = t.val; newType.StartLocation = t.EndLocation; TypeParameterList( -#line 676 "VBNET.ATG" +#line 677 "VBNET.ATG" newType.Templates); EndOfStmt(); while (la.kind == 109) { InterfaceBase( -#line 677 "VBNET.ATG" +#line 678 "VBNET.ATG" out baseInterfaces); -#line 677 "VBNET.ATG" - newType.BaseTypes.AddRange(baseInterfaces.ToArray()); +#line 678 "VBNET.ATG" + newType.BaseTypes.AddRange(baseInterfaces); } InterfaceBody( -#line 678 "VBNET.ATG" +#line 679 "VBNET.ATG" newType); -#line 680 "VBNET.ATG" +#line 681 "VBNET.ATG" newType.EndLocation = t.Location; compilationUnit.BlockEnd(); @@ -896,7 +897,7 @@ newType); case 79: { lexer.NextToken(); -#line 686 "VBNET.ATG" +#line 687 "VBNET.ATG" m.Check(Modifier.VBDelegates); DelegateDeclaration delegateDeclr = new DelegateDeclaration(m.Modifier, attributes); delegateDeclr.ReturnType = new TypeReference("", "System.Void"); @@ -907,63 +908,63 @@ newType); lexer.NextToken(); Identifier(); -#line 693 "VBNET.ATG" +#line 694 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 694 "VBNET.ATG" +#line 695 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 695 "VBNET.ATG" +#line 696 "VBNET.ATG" p); } Expect(24); -#line 695 "VBNET.ATG" +#line 696 "VBNET.ATG" delegateDeclr.Parameters = p; } } else if (la.kind == 99) { lexer.NextToken(); Identifier(); -#line 697 "VBNET.ATG" +#line 698 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 698 "VBNET.ATG" +#line 699 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 699 "VBNET.ATG" +#line 700 "VBNET.ATG" p); } Expect(24); -#line 699 "VBNET.ATG" +#line 700 "VBNET.ATG" delegateDeclr.Parameters = p; } if (la.kind == 47) { lexer.NextToken(); -#line 700 "VBNET.ATG" +#line 701 "VBNET.ATG" TypeReference type; TypeName( -#line 700 "VBNET.ATG" +#line 701 "VBNET.ATG" out type); -#line 700 "VBNET.ATG" +#line 701 "VBNET.ATG" delegateDeclr.ReturnType = type; } } else SynErr(210); -#line 702 "VBNET.ATG" +#line 703 "VBNET.ATG" delegateDeclr.EndLocation = t.EndLocation; Expect(1); -#line 705 "VBNET.ATG" +#line 706 "VBNET.ATG" compilationUnit.AddChild(delegateDeclr); break; @@ -1076,29 +1077,25 @@ out rank); } void ClassBaseType( -#line 882 "VBNET.ATG" -out string name) { +#line 883 "VBNET.ATG" +out TypeReference typeRef) { -#line 884 "VBNET.ATG" - TypeReference type; - name = String.Empty; +#line 885 "VBNET.ATG" + typeRef = null; Expect(109); TypeName( #line 888 "VBNET.ATG" -out type); - -#line 888 "VBNET.ATG" - name = type.Type; +out typeRef); EndOfStmt(); } void TypeImplementsClause( #line 1386 "VBNET.ATG" -out ArrayList baseInterfaces) { +out List baseInterfaces) { #line 1388 "VBNET.ATG" - baseInterfaces = new ArrayList(); + baseInterfaces = new List(); TypeReference type = null; Expect(106); @@ -1107,7 +1104,7 @@ out ArrayList baseInterfaces) { out type); #line 1393 "VBNET.ATG" - baseInterfaces.Add(type.Type); + baseInterfaces.Add(type); while (la.kind == 12) { lexer.NextToken(); @@ -1116,231 +1113,231 @@ out type); out type); #line 1397 "VBNET.ATG" - baseInterfaces.Add(type.Type); + baseInterfaces.Add(type); } EndOfStmt(); } void ClassBody( -#line 715 "VBNET.ATG" +#line 716 "VBNET.ATG" TypeDeclaration newType) { -#line 716 "VBNET.ATG" +#line 717 "VBNET.ATG" AttributeSection section; while (StartOf(6)) { -#line 718 "VBNET.ATG" +#line 719 "VBNET.ATG" List attributes = new List(); Modifiers m = new Modifiers(); while (la.kind == 26) { AttributeSection( -#line 721 "VBNET.ATG" +#line 722 "VBNET.ATG" out section); -#line 721 "VBNET.ATG" +#line 722 "VBNET.ATG" attributes.Add(section); } while (StartOf(7)) { MemberModifier( -#line 722 "VBNET.ATG" +#line 723 "VBNET.ATG" m); } ClassMemberDecl( -#line 723 "VBNET.ATG" +#line 724 "VBNET.ATG" m, attributes); } Expect(87); Expect(66); -#line 725 "VBNET.ATG" +#line 726 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void ModuleBody( -#line 744 "VBNET.ATG" +#line 745 "VBNET.ATG" TypeDeclaration newType) { -#line 745 "VBNET.ATG" +#line 746 "VBNET.ATG" AttributeSection section; while (StartOf(6)) { -#line 747 "VBNET.ATG" +#line 748 "VBNET.ATG" List attributes = new List(); Modifiers m = new Modifiers(); while (la.kind == 26) { AttributeSection( -#line 750 "VBNET.ATG" +#line 751 "VBNET.ATG" out section); -#line 750 "VBNET.ATG" +#line 751 "VBNET.ATG" attributes.Add(section); } while (StartOf(7)) { MemberModifier( -#line 751 "VBNET.ATG" +#line 752 "VBNET.ATG" m); } ClassMemberDecl( -#line 752 "VBNET.ATG" +#line 753 "VBNET.ATG" m, attributes); } Expect(87); Expect(120); -#line 754 "VBNET.ATG" +#line 755 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void StructureBody( -#line 729 "VBNET.ATG" +#line 730 "VBNET.ATG" TypeDeclaration newType) { -#line 730 "VBNET.ATG" +#line 731 "VBNET.ATG" AttributeSection section; while (StartOf(6)) { -#line 732 "VBNET.ATG" +#line 733 "VBNET.ATG" List attributes = new List(); Modifiers m = new Modifiers(); while (la.kind == 26) { AttributeSection( -#line 735 "VBNET.ATG" +#line 736 "VBNET.ATG" out section); -#line 735 "VBNET.ATG" +#line 736 "VBNET.ATG" attributes.Add(section); } while (StartOf(7)) { MemberModifier( -#line 736 "VBNET.ATG" +#line 737 "VBNET.ATG" m); } StructureMemberDecl( -#line 737 "VBNET.ATG" +#line 738 "VBNET.ATG" m, attributes); } Expect(87); Expect(166); -#line 739 "VBNET.ATG" +#line 740 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void PrimitiveTypeName( -#line 2714 "VBNET.ATG" +#line 2719 "VBNET.ATG" out string type) { -#line 2715 "VBNET.ATG" +#line 2720 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 51: { lexer.NextToken(); -#line 2716 "VBNET.ATG" +#line 2721 "VBNET.ATG" type = "Boolean"; break; } case 75: { lexer.NextToken(); -#line 2717 "VBNET.ATG" +#line 2722 "VBNET.ATG" type = "Date"; break; } case 64: { lexer.NextToken(); -#line 2718 "VBNET.ATG" +#line 2723 "VBNET.ATG" type = "Char"; break; } case 165: { lexer.NextToken(); -#line 2719 "VBNET.ATG" +#line 2724 "VBNET.ATG" type = "String"; break; } case 76: { lexer.NextToken(); -#line 2720 "VBNET.ATG" +#line 2725 "VBNET.ATG" type = "Decimal"; break; } case 53: { lexer.NextToken(); -#line 2721 "VBNET.ATG" +#line 2726 "VBNET.ATG" type = "Byte"; break; } case 159: { lexer.NextToken(); -#line 2722 "VBNET.ATG" +#line 2727 "VBNET.ATG" type = "Short"; break; } case 110: { lexer.NextToken(); -#line 2723 "VBNET.ATG" +#line 2728 "VBNET.ATG" type = "Integer"; break; } case 116: { lexer.NextToken(); -#line 2724 "VBNET.ATG" +#line 2729 "VBNET.ATG" type = "Long"; break; } case 160: { lexer.NextToken(); -#line 2725 "VBNET.ATG" +#line 2730 "VBNET.ATG" type = "Single"; break; } case 83: { lexer.NextToken(); -#line 2726 "VBNET.ATG" +#line 2731 "VBNET.ATG" type = "Double"; break; } case 191: { lexer.NextToken(); -#line 2727 "VBNET.ATG" +#line 2732 "VBNET.ATG" type = "UInteger"; break; } case 192: { lexer.NextToken(); -#line 2728 "VBNET.ATG" +#line 2733 "VBNET.ATG" type = "ULong"; break; } case 193: { lexer.NextToken(); -#line 2729 "VBNET.ATG" +#line 2734 "VBNET.ATG" type = "UShort"; break; } case 190: { lexer.NextToken(); -#line 2730 "VBNET.ATG" +#line 2735 "VBNET.ATG" type = "SByte"; break; } @@ -1349,34 +1346,34 @@ out string type) { } void EnumBody( -#line 758 "VBNET.ATG" +#line 759 "VBNET.ATG" TypeDeclaration newType) { -#line 759 "VBNET.ATG" +#line 760 "VBNET.ATG" FieldDeclaration f; while (StartOf(8)) { EnumMemberDecl( -#line 761 "VBNET.ATG" +#line 762 "VBNET.ATG" out f); -#line 761 "VBNET.ATG" +#line 762 "VBNET.ATG" compilationUnit.AddChild(f); } Expect(87); Expect(89); -#line 763 "VBNET.ATG" +#line 764 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void InterfaceBase( #line 1371 "VBNET.ATG" -out ArrayList bases) { +out List bases) { #line 1373 "VBNET.ATG" TypeReference type; - bases = new ArrayList(); + bases = new List(); Expect(109); TypeName( @@ -1384,7 +1381,7 @@ out ArrayList bases) { out type); #line 1377 "VBNET.ATG" - bases.Add(type.Type); + bases.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( @@ -1392,13 +1389,13 @@ out type); out type); #line 1380 "VBNET.ATG" - bases.Add(type.Type); + bases.Add(type); } Expect(1); } void InterfaceBody( -#line 767 "VBNET.ATG" +#line 768 "VBNET.ATG" TypeDeclaration newType) { while (StartOf(9)) { InterfaceMemberDecl(); @@ -1406,33 +1403,33 @@ TypeDeclaration newType) { Expect(87); Expect(111); -#line 769 "VBNET.ATG" +#line 770 "VBNET.ATG" newType.EndLocation = t.EndLocation; Expect(1); } void FormalParameterList( -#line 1912 "VBNET.ATG" +#line 1917 "VBNET.ATG" List parameter) { -#line 1914 "VBNET.ATG" +#line 1919 "VBNET.ATG" ParameterDeclarationExpression p; AttributeSection section; List attributes = new List(); while (la.kind == 26) { AttributeSection( -#line 1918 "VBNET.ATG" +#line 1923 "VBNET.ATG" out section); -#line 1918 "VBNET.ATG" +#line 1923 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 1920 "VBNET.ATG" +#line 1925 "VBNET.ATG" out p); -#line 1922 "VBNET.ATG" +#line 1927 "VBNET.ATG" bool paramsFound = false; p.Attributes = attributes; parameter.Add(p); @@ -1440,152 +1437,152 @@ out p); while (la.kind == 12) { lexer.NextToken(); -#line 1927 "VBNET.ATG" +#line 1932 "VBNET.ATG" if (paramsFound) Error("params array must be at end of parameter list"); while (la.kind == 26) { AttributeSection( -#line 1928 "VBNET.ATG" +#line 1933 "VBNET.ATG" out section); -#line 1928 "VBNET.ATG" +#line 1933 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 1930 "VBNET.ATG" +#line 1935 "VBNET.ATG" out p); -#line 1930 "VBNET.ATG" +#line 1935 "VBNET.ATG" p.Attributes = attributes; parameter.Add(p); } } void MemberModifier( -#line 2752 "VBNET.ATG" +#line 2757 "VBNET.ATG" Modifiers m) { switch (la.kind) { case 121: { lexer.NextToken(); -#line 2753 "VBNET.ATG" +#line 2758 "VBNET.ATG" m.Add(Modifier.Abstract); break; } case 78: { lexer.NextToken(); -#line 2754 "VBNET.ATG" +#line 2759 "VBNET.ATG" m.Add(Modifier.Default); break; } case 98: { lexer.NextToken(); -#line 2755 "VBNET.ATG" +#line 2760 "VBNET.ATG" m.Add(Modifier.Internal); break; } case 157: { lexer.NextToken(); -#line 2756 "VBNET.ATG" +#line 2761 "VBNET.ATG" m.Add(Modifier.New); break; } case 142: { lexer.NextToken(); -#line 2757 "VBNET.ATG" +#line 2762 "VBNET.ATG" m.Add(Modifier.Override); break; } case 122: { lexer.NextToken(); -#line 2758 "VBNET.ATG" +#line 2763 "VBNET.ATG" m.Add(Modifier.Abstract); break; } case 145: { lexer.NextToken(); -#line 2759 "VBNET.ATG" +#line 2764 "VBNET.ATG" m.Add(Modifier.Private); break; } case 147: { lexer.NextToken(); -#line 2760 "VBNET.ATG" +#line 2765 "VBNET.ATG" m.Add(Modifier.Protected); break; } case 148: { lexer.NextToken(); -#line 2761 "VBNET.ATG" +#line 2766 "VBNET.ATG" m.Add(Modifier.Public); break; } case 130: { lexer.NextToken(); -#line 2762 "VBNET.ATG" +#line 2767 "VBNET.ATG" m.Add(Modifier.Sealed); break; } case 131: { lexer.NextToken(); -#line 2763 "VBNET.ATG" +#line 2768 "VBNET.ATG" m.Add(Modifier.Sealed); break; } case 158: { lexer.NextToken(); -#line 2764 "VBNET.ATG" +#line 2769 "VBNET.ATG" m.Add(Modifier.Static); break; } case 140: { lexer.NextToken(); -#line 2765 "VBNET.ATG" +#line 2770 "VBNET.ATG" m.Add(Modifier.Virtual); break; } case 139: { lexer.NextToken(); -#line 2766 "VBNET.ATG" +#line 2771 "VBNET.ATG" m.Add(Modifier.Overloads); break; } case 150: { lexer.NextToken(); -#line 2767 "VBNET.ATG" +#line 2772 "VBNET.ATG" break; } case 184: { lexer.NextToken(); -#line 2768 "VBNET.ATG" +#line 2773 "VBNET.ATG" break; } case 183: { lexer.NextToken(); -#line 2769 "VBNET.ATG" +#line 2774 "VBNET.ATG" m.Add(Modifier.WithEvents); break; } case 80: { lexer.NextToken(); -#line 2770 "VBNET.ATG" +#line 2775 "VBNET.ATG" m.Add(Modifier.Dim); break; } @@ -1594,10 +1591,10 @@ Modifiers m) { } void ClassMemberDecl( -#line 878 "VBNET.ATG" +#line 879 "VBNET.ATG" Modifiers m, List attributes) { StructureMemberDecl( -#line 879 "VBNET.ATG" +#line 880 "VBNET.ATG" m, attributes); } @@ -2142,25 +2139,25 @@ out getRegion, out setRegion); } void EnumMemberDecl( -#line 860 "VBNET.ATG" +#line 861 "VBNET.ATG" out FieldDeclaration f) { -#line 862 "VBNET.ATG" +#line 863 "VBNET.ATG" Expression expr = null;List attributes = new List(); AttributeSection section = null; VariableDeclaration varDecl = null; while (la.kind == 26) { AttributeSection( -#line 866 "VBNET.ATG" +#line 867 "VBNET.ATG" out section); -#line 866 "VBNET.ATG" +#line 867 "VBNET.ATG" attributes.Add(section); } Identifier(); -#line 869 "VBNET.ATG" +#line 870 "VBNET.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2169,10 +2166,10 @@ out section); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 874 "VBNET.ATG" +#line 875 "VBNET.ATG" out expr); -#line 874 "VBNET.ATG" +#line 875 "VBNET.ATG" varDecl.Initializer = expr; } Expect(1); @@ -2180,7 +2177,7 @@ out expr); void InterfaceMemberDecl() { -#line 779 "VBNET.ATG" +#line 780 "VBNET.ATG" TypeReference type =null; List p = new List(); List templates = new List(); @@ -2192,31 +2189,31 @@ out expr); if (StartOf(13)) { while (la.kind == 26) { AttributeSection( -#line 787 "VBNET.ATG" +#line 788 "VBNET.ATG" out section); -#line 787 "VBNET.ATG" +#line 788 "VBNET.ATG" attributes.Add(section); } while (StartOf(7)) { MemberModifier( -#line 791 "VBNET.ATG" +#line 792 "VBNET.ATG" mod); } if (la.kind == 92) { lexer.NextToken(); -#line 794 "VBNET.ATG" +#line 795 "VBNET.ATG" mod.Check(Modifier.VBInterfaceEvents); Identifier(); -#line 795 "VBNET.ATG" +#line 796 "VBNET.ATG" name = t.val; if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 796 "VBNET.ATG" +#line 797 "VBNET.ATG" p); } Expect(24); @@ -2224,12 +2221,12 @@ p); if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 797 "VBNET.ATG" +#line 798 "VBNET.ATG" out type); } Expect(1); -#line 800 "VBNET.ATG" +#line 801 "VBNET.ATG" EventDeclaration ed = new EventDeclaration(type, mod.Modifier, p, attributes, name, null); compilationUnit.AddChild(ed); ed.EndLocation = t.EndLocation; @@ -2237,27 +2234,27 @@ out type); } else if (la.kind == 167) { lexer.NextToken(); -#line 806 "VBNET.ATG" +#line 807 "VBNET.ATG" mod.Check(Modifier.VBInterfaceMethods); Identifier(); -#line 807 "VBNET.ATG" +#line 808 "VBNET.ATG" name = t.val; TypeParameterList( -#line 808 "VBNET.ATG" +#line 809 "VBNET.ATG" templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 809 "VBNET.ATG" +#line 810 "VBNET.ATG" p); } Expect(24); } Expect(1); -#line 812 "VBNET.ATG" +#line 813 "VBNET.ATG" MethodDeclaration md = new MethodDeclaration(name, mod.Modifier, null, p, attributes); md.TypeReference = new TypeReference("", "System.Void"); md.EndLocation = t.EndLocation; @@ -2267,20 +2264,20 @@ p); } else if (la.kind == 99) { lexer.NextToken(); -#line 820 "VBNET.ATG" +#line 821 "VBNET.ATG" mod.Check(Modifier.VBInterfaceMethods); Identifier(); -#line 821 "VBNET.ATG" +#line 822 "VBNET.ATG" name = t.val; TypeParameterList( -#line 822 "VBNET.ATG" +#line 823 "VBNET.ATG" templates); if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 823 "VBNET.ATG" +#line 824 "VBNET.ATG" p); } Expect(24); @@ -2289,15 +2286,15 @@ p); lexer.NextToken(); while (la.kind == 26) { AttributeSection( -#line 824 "VBNET.ATG" +#line 825 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 824 "VBNET.ATG" +#line 825 "VBNET.ATG" out type); } -#line 826 "VBNET.ATG" +#line 827 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } @@ -2311,17 +2308,17 @@ out type); } else if (la.kind == 146) { lexer.NextToken(); -#line 838 "VBNET.ATG" +#line 839 "VBNET.ATG" mod.Check(Modifier.VBInterfaceProperties); Identifier(); -#line 839 "VBNET.ATG" +#line 840 "VBNET.ATG" name = t.val; if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 840 "VBNET.ATG" +#line 841 "VBNET.ATG" p); } Expect(24); @@ -2329,18 +2326,18 @@ p); if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 841 "VBNET.ATG" +#line 842 "VBNET.ATG" out type); } -#line 843 "VBNET.ATG" +#line 844 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } Expect(1); -#line 849 "VBNET.ATG" +#line 850 "VBNET.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod.Modifier, attributes); pd.Parameters = p; pd.EndLocation = t.EndLocation; @@ -2349,7 +2346,7 @@ out type); } else SynErr(222); } else if (StartOf(14)) { NonModuleDeclaration( -#line 856 "VBNET.ATG" +#line 857 "VBNET.ATG" mod, attributes); } else SynErr(223); } @@ -2426,24 +2423,24 @@ out name); } void Block( -#line 1968 "VBNET.ATG" +#line 1973 "VBNET.ATG" out Statement stmt) { -#line 1971 "VBNET.ATG" +#line 1976 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.Location; compilationUnit.BlockStart(blockStmt); while (StartOf(15) || -#line 1976 "VBNET.ATG" +#line 1981 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 1976 "VBNET.ATG" +#line 1981 "VBNET.ATG" IsEndStmtAhead()) { Expect(87); EndOfStmt(); -#line 1976 "VBNET.ATG" +#line 1981 "VBNET.ATG" compilationUnit.AddChild(new EndStatement()); } else { Statement(); @@ -2451,7 +2448,7 @@ IsEndStmtAhead()) { } } -#line 1982 "VBNET.ATG" +#line 1987 "VBNET.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2697,14 +2694,14 @@ out stmt); } void ArrayNameModifier( -#line 1760 "VBNET.ATG" +#line 1765 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1762 "VBNET.ATG" +#line 1767 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 1764 "VBNET.ATG" +#line 1769 "VBNET.ATG" out arrayModifiers); } @@ -2943,79 +2940,60 @@ out Expression pexpr) { string name = String.Empty; pexpr = null; - if (StartOf(20)) { - switch (la.kind) { - case 3: { + if (StartOf(20) || +#line 1501 "VBNET.ATG" +la.kind == Tokens.Global) { + if (la.kind == 3) { lexer.NextToken(); #line 1480 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); - break; - } - case 4: { + } else if (la.kind == 4) { lexer.NextToken(); #line 1481 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); - break; - } - case 7: { + } else if (la.kind == 7) { lexer.NextToken(); #line 1482 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); - break; - } - case 6: { + } else if (la.kind == 6) { lexer.NextToken(); #line 1483 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); - break; - } - case 5: { + } else if (la.kind == 5) { lexer.NextToken(); #line 1484 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); - break; - } - case 9: { + } else if (la.kind == 9) { lexer.NextToken(); #line 1485 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); - break; - } - case 8: { + } else if (la.kind == 8) { lexer.NextToken(); #line 1486 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); - break; - } - case 173: { + } else if (la.kind == 173) { lexer.NextToken(); #line 1488 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); - break; - } - case 95: { + } else if (la.kind == 95) { lexer.NextToken(); #line 1489 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); - break; - } - case 129: { + } else if (la.kind == 129) { lexer.NextToken(); #line 1490 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); - break; - } - case 23: { + } else if (la.kind == 23) { lexer.NextToken(); Expr( #line 1491 "VBNET.ATG" @@ -3024,16 +3002,12 @@ out expr); #line 1491 "VBNET.ATG" pexpr = new ParenthesizedExpression(expr); - break; - } - case 2: case 50: case 69: case 169: { + } else if (StartOf(10)) { Identifier(); #line 1492 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); - break; - } - case 51: case 53: case 64: case 75: case 76: case 83: case 110: case 116: case 159: case 160: case 165: case 190: case 191: case 192: case 193: { + } else if (StartOf(21)) { #line 1493 "VBNET.ATG" string val = String.Empty; @@ -3048,16 +3022,12 @@ out val); #line 1494 "VBNET.ATG" pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); - break; - } - case 118: { + } else if (la.kind == 118) { lexer.NextToken(); #line 1495 "VBNET.ATG" pexpr = new ThisReferenceExpression(); - break; - } - case 123: case 124: case 194: { + } else if (la.kind == 123 || la.kind == 124) { #line 1496 "VBNET.ATG" Expression retExpr = null; @@ -3071,31 +3041,31 @@ out val); #line 1498 "VBNET.ATG" retExpr = new ClassReferenceExpression(); - } else if (la.kind == 194) { - lexer.NextToken(); - -#line 1499 "VBNET.ATG" - retExpr = new GlobalReferenceExpression(); } else SynErr(230); Expect(10); IdentifierOrKeyword( -#line 1501 "VBNET.ATG" +#line 1500 "VBNET.ATG" out name); -#line 1501 "VBNET.ATG" +#line 1500 "VBNET.ATG" pexpr = new FieldReferenceExpression(retExpr, name); - break; - } - case 126: { + } else if ( +#line 1501 "VBNET.ATG" +la.kind == Tokens.Global) { + TypeName( +#line 1501 "VBNET.ATG" +out type); + +#line 1501 "VBNET.ATG" + pexpr = new TypeReferenceExpression(type); + } else if (la.kind == 126) { ObjectCreateExpression( #line 1502 "VBNET.ATG" out expr); #line 1502 "VBNET.ATG" pexpr = expr; - break; - } - case 74: case 81: { + } else if (la.kind == 74 || la.kind == 81) { if (la.kind == 81) { lexer.NextToken(); } else if (la.kind == 74) { @@ -3113,9 +3083,7 @@ out type); #line 1503 "VBNET.ATG" pexpr = new CastExpression(type, expr); - break; - } - case 195: { + } else if (la.kind == 195) { lexer.NextToken(); Expect(23); Expr( @@ -3129,9 +3097,7 @@ out type); #line 1504 "VBNET.ATG" pexpr = new BinaryOperatorExpression(expr, BinaryOperatorType.AsCast, new TypeReferenceExpression(type)); - break; - } - case 58: case 59: case 60: case 61: case 62: case 63: case 65: case 67: case 68: case 71: case 72: case 73: { + } else if (StartOf(22)) { CastTarget( #line 1505 "VBNET.ATG" out type); @@ -3143,9 +3109,7 @@ out expr); #line 1505 "VBNET.ATG" pexpr = new CastExpression(type, expr, true); - break; - } - case 42: { + } else if (la.kind == 42) { lexer.NextToken(); Expr( #line 1506 "VBNET.ATG" @@ -3153,9 +3117,7 @@ out expr); #line 1506 "VBNET.ATG" pexpr = new AddressOfExpression(expr); - break; - } - case 101: { + } else if (la.kind == 101) { lexer.NextToken(); Expect(23); TypeName( @@ -3165,9 +3127,7 @@ out type); #line 1507 "VBNET.ATG" pexpr = new TypeOfExpression(type); - break; - } - case 175: { + } else { lexer.NextToken(); SimpleExpr( #line 1508 "VBNET.ATG" @@ -3179,8 +3139,6 @@ out type); #line 1508 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); - break; - } } while (la.kind == 10 || la.kind == 23) { if (la.kind == 10) { @@ -3196,7 +3154,7 @@ out name); #line 1512 "VBNET.ATG" ArrayList parameters = new ArrayList(); - if (StartOf(21)) { + if (StartOf(23)) { if (StartOf(18)) { Argument( #line 1514 "VBNET.ATG" @@ -3245,7 +3203,7 @@ out name); #line 1527 "VBNET.ATG" ArrayList parameters = new ArrayList(); - if (StartOf(21)) { + if (StartOf(23)) { #line 1529 "VBNET.ATG" expr = null; @@ -3363,1074 +3321,1074 @@ out AssignmentOperatorType op) { } void IdentifierOrKeyword( -#line 2553 "VBNET.ATG" +#line 2558 "VBNET.ATG" out string name) { -#line 2555 "VBNET.ATG" +#line 2560 "VBNET.ATG" name = String.Empty; switch (la.kind) { case 2: case 50: case 69: case 169: { Identifier(); -#line 2558 "VBNET.ATG" +#line 2563 "VBNET.ATG" name = t.val; break; } case 41: { lexer.NextToken(); -#line 2559 "VBNET.ATG" +#line 2564 "VBNET.ATG" name = t.val; break; } case 42: { lexer.NextToken(); -#line 2560 "VBNET.ATG" +#line 2565 "VBNET.ATG" name = t.val; break; } case 43: { lexer.NextToken(); -#line 2561 "VBNET.ATG" +#line 2566 "VBNET.ATG" name = t.val; break; } case 44: { lexer.NextToken(); -#line 2562 "VBNET.ATG" +#line 2567 "VBNET.ATG" name = t.val; break; } case 45: { lexer.NextToken(); -#line 2563 "VBNET.ATG" +#line 2568 "VBNET.ATG" name = t.val; break; } case 46: { lexer.NextToken(); -#line 2564 "VBNET.ATG" +#line 2569 "VBNET.ATG" name = t.val; break; } case 47: { lexer.NextToken(); -#line 2565 "VBNET.ATG" +#line 2570 "VBNET.ATG" name = t.val; break; } case 48: { lexer.NextToken(); -#line 2566 "VBNET.ATG" +#line 2571 "VBNET.ATG" name = t.val; break; } case 49: { lexer.NextToken(); -#line 2567 "VBNET.ATG" +#line 2572 "VBNET.ATG" name = t.val; break; } case 51: { lexer.NextToken(); -#line 2568 "VBNET.ATG" +#line 2573 "VBNET.ATG" name = t.val; break; } case 52: { lexer.NextToken(); -#line 2569 "VBNET.ATG" +#line 2574 "VBNET.ATG" name = t.val; break; } case 53: { lexer.NextToken(); -#line 2570 "VBNET.ATG" +#line 2575 "VBNET.ATG" name = t.val; break; } case 54: { lexer.NextToken(); -#line 2571 "VBNET.ATG" +#line 2576 "VBNET.ATG" name = t.val; break; } case 55: { lexer.NextToken(); -#line 2572 "VBNET.ATG" +#line 2577 "VBNET.ATG" name = t.val; break; } case 56: { lexer.NextToken(); -#line 2573 "VBNET.ATG" +#line 2578 "VBNET.ATG" name = t.val; break; } case 57: { lexer.NextToken(); -#line 2574 "VBNET.ATG" +#line 2579 "VBNET.ATG" name = t.val; break; } case 58: { lexer.NextToken(); -#line 2575 "VBNET.ATG" +#line 2580 "VBNET.ATG" name = t.val; break; } case 59: { lexer.NextToken(); -#line 2576 "VBNET.ATG" +#line 2581 "VBNET.ATG" name = t.val; break; } case 60: { lexer.NextToken(); -#line 2577 "VBNET.ATG" +#line 2582 "VBNET.ATG" name = t.val; break; } case 61: { lexer.NextToken(); -#line 2578 "VBNET.ATG" +#line 2583 "VBNET.ATG" name = t.val; break; } case 62: { lexer.NextToken(); -#line 2579 "VBNET.ATG" +#line 2584 "VBNET.ATG" name = t.val; break; } case 63: { lexer.NextToken(); -#line 2580 "VBNET.ATG" +#line 2585 "VBNET.ATG" name = t.val; break; } case 64: { lexer.NextToken(); -#line 2581 "VBNET.ATG" +#line 2586 "VBNET.ATG" name = t.val; break; } case 65: { lexer.NextToken(); -#line 2582 "VBNET.ATG" +#line 2587 "VBNET.ATG" name = t.val; break; } case 66: { lexer.NextToken(); -#line 2583 "VBNET.ATG" +#line 2588 "VBNET.ATG" name = t.val; break; } case 67: { lexer.NextToken(); -#line 2584 "VBNET.ATG" +#line 2589 "VBNET.ATG" name = t.val; break; } case 68: { lexer.NextToken(); -#line 2585 "VBNET.ATG" +#line 2590 "VBNET.ATG" name = t.val; break; } case 70: { lexer.NextToken(); -#line 2586 "VBNET.ATG" +#line 2591 "VBNET.ATG" name = t.val; break; } case 71: { lexer.NextToken(); -#line 2587 "VBNET.ATG" +#line 2592 "VBNET.ATG" name = t.val; break; } case 72: { lexer.NextToken(); -#line 2588 "VBNET.ATG" +#line 2593 "VBNET.ATG" name = t.val; break; } case 73: { lexer.NextToken(); -#line 2589 "VBNET.ATG" +#line 2594 "VBNET.ATG" name = t.val; break; } case 74: { lexer.NextToken(); -#line 2590 "VBNET.ATG" +#line 2595 "VBNET.ATG" name = t.val; break; } case 75: { lexer.NextToken(); -#line 2591 "VBNET.ATG" +#line 2596 "VBNET.ATG" name = t.val; break; } case 76: { lexer.NextToken(); -#line 2592 "VBNET.ATG" +#line 2597 "VBNET.ATG" name = t.val; break; } case 77: { lexer.NextToken(); -#line 2593 "VBNET.ATG" +#line 2598 "VBNET.ATG" name = t.val; break; } case 78: { lexer.NextToken(); -#line 2594 "VBNET.ATG" +#line 2599 "VBNET.ATG" name = t.val; break; } case 79: { lexer.NextToken(); -#line 2595 "VBNET.ATG" +#line 2600 "VBNET.ATG" name = t.val; break; } case 80: { lexer.NextToken(); -#line 2596 "VBNET.ATG" +#line 2601 "VBNET.ATG" name = t.val; break; } case 81: { lexer.NextToken(); -#line 2597 "VBNET.ATG" +#line 2602 "VBNET.ATG" name = t.val; break; } case 82: { lexer.NextToken(); -#line 2598 "VBNET.ATG" +#line 2603 "VBNET.ATG" name = t.val; break; } case 83: { lexer.NextToken(); -#line 2599 "VBNET.ATG" +#line 2604 "VBNET.ATG" name = t.val; break; } case 84: { lexer.NextToken(); -#line 2600 "VBNET.ATG" +#line 2605 "VBNET.ATG" name = t.val; break; } case 85: { lexer.NextToken(); -#line 2601 "VBNET.ATG" +#line 2606 "VBNET.ATG" name = t.val; break; } case 86: { lexer.NextToken(); -#line 2602 "VBNET.ATG" +#line 2607 "VBNET.ATG" name = t.val; break; } case 87: { lexer.NextToken(); -#line 2603 "VBNET.ATG" +#line 2608 "VBNET.ATG" name = t.val; break; } case 88: { lexer.NextToken(); -#line 2604 "VBNET.ATG" +#line 2609 "VBNET.ATG" name = t.val; break; } case 89: { lexer.NextToken(); -#line 2605 "VBNET.ATG" +#line 2610 "VBNET.ATG" name = t.val; break; } case 90: { lexer.NextToken(); -#line 2606 "VBNET.ATG" +#line 2611 "VBNET.ATG" name = t.val; break; } case 91: { lexer.NextToken(); -#line 2607 "VBNET.ATG" +#line 2612 "VBNET.ATG" name = t.val; break; } case 92: { lexer.NextToken(); -#line 2608 "VBNET.ATG" +#line 2613 "VBNET.ATG" name = t.val; break; } case 93: { lexer.NextToken(); -#line 2609 "VBNET.ATG" +#line 2614 "VBNET.ATG" name = t.val; break; } case 94: { lexer.NextToken(); -#line 2610 "VBNET.ATG" +#line 2615 "VBNET.ATG" name = t.val; break; } case 95: { lexer.NextToken(); -#line 2611 "VBNET.ATG" +#line 2616 "VBNET.ATG" name = t.val; break; } case 96: { lexer.NextToken(); -#line 2612 "VBNET.ATG" +#line 2617 "VBNET.ATG" name = t.val; break; } case 97: { lexer.NextToken(); -#line 2613 "VBNET.ATG" +#line 2618 "VBNET.ATG" name = t.val; break; } case 98: { lexer.NextToken(); -#line 2614 "VBNET.ATG" +#line 2619 "VBNET.ATG" name = t.val; break; } case 99: { lexer.NextToken(); -#line 2615 "VBNET.ATG" +#line 2620 "VBNET.ATG" name = t.val; break; } case 100: { lexer.NextToken(); -#line 2616 "VBNET.ATG" +#line 2621 "VBNET.ATG" name = t.val; break; } case 101: { lexer.NextToken(); -#line 2617 "VBNET.ATG" +#line 2622 "VBNET.ATG" name = t.val; break; } case 102: { lexer.NextToken(); -#line 2618 "VBNET.ATG" +#line 2623 "VBNET.ATG" name = t.val; break; } case 103: { lexer.NextToken(); -#line 2619 "VBNET.ATG" +#line 2624 "VBNET.ATG" name = t.val; break; } case 104: { lexer.NextToken(); -#line 2620 "VBNET.ATG" +#line 2625 "VBNET.ATG" name = t.val; break; } case 105: { lexer.NextToken(); -#line 2621 "VBNET.ATG" +#line 2626 "VBNET.ATG" name = t.val; break; } case 106: { lexer.NextToken(); -#line 2622 "VBNET.ATG" +#line 2627 "VBNET.ATG" name = t.val; break; } case 107: { lexer.NextToken(); -#line 2623 "VBNET.ATG" +#line 2628 "VBNET.ATG" name = t.val; break; } case 108: { lexer.NextToken(); -#line 2624 "VBNET.ATG" +#line 2629 "VBNET.ATG" name = t.val; break; } case 109: { lexer.NextToken(); -#line 2625 "VBNET.ATG" +#line 2630 "VBNET.ATG" name = t.val; break; } case 110: { lexer.NextToken(); -#line 2626 "VBNET.ATG" +#line 2631 "VBNET.ATG" name = t.val; break; } case 111: { lexer.NextToken(); -#line 2627 "VBNET.ATG" +#line 2632 "VBNET.ATG" name = t.val; break; } case 112: { lexer.NextToken(); -#line 2628 "VBNET.ATG" +#line 2633 "VBNET.ATG" name = t.val; break; } case 113: { lexer.NextToken(); -#line 2629 "VBNET.ATG" +#line 2634 "VBNET.ATG" name = t.val; break; } case 114: { lexer.NextToken(); -#line 2630 "VBNET.ATG" +#line 2635 "VBNET.ATG" name = t.val; break; } case 115: { lexer.NextToken(); -#line 2631 "VBNET.ATG" +#line 2636 "VBNET.ATG" name = t.val; break; } case 116: { lexer.NextToken(); -#line 2632 "VBNET.ATG" +#line 2637 "VBNET.ATG" name = t.val; break; } case 117: { lexer.NextToken(); -#line 2633 "VBNET.ATG" +#line 2638 "VBNET.ATG" name = t.val; break; } case 118: { lexer.NextToken(); -#line 2634 "VBNET.ATG" +#line 2639 "VBNET.ATG" name = t.val; break; } case 119: { lexer.NextToken(); -#line 2635 "VBNET.ATG" +#line 2640 "VBNET.ATG" name = t.val; break; } case 120: { lexer.NextToken(); -#line 2636 "VBNET.ATG" +#line 2641 "VBNET.ATG" name = t.val; break; } case 121: { lexer.NextToken(); -#line 2637 "VBNET.ATG" +#line 2642 "VBNET.ATG" name = t.val; break; } case 122: { lexer.NextToken(); -#line 2638 "VBNET.ATG" +#line 2643 "VBNET.ATG" name = t.val; break; } case 123: { lexer.NextToken(); -#line 2639 "VBNET.ATG" +#line 2644 "VBNET.ATG" name = t.val; break; } case 124: { lexer.NextToken(); -#line 2640 "VBNET.ATG" +#line 2645 "VBNET.ATG" name = t.val; break; } case 125: { lexer.NextToken(); -#line 2641 "VBNET.ATG" +#line 2646 "VBNET.ATG" name = t.val; break; } case 126: { lexer.NextToken(); -#line 2642 "VBNET.ATG" +#line 2647 "VBNET.ATG" name = t.val; break; } case 127: { lexer.NextToken(); -#line 2643 "VBNET.ATG" +#line 2648 "VBNET.ATG" name = t.val; break; } case 128: { lexer.NextToken(); -#line 2644 "VBNET.ATG" +#line 2649 "VBNET.ATG" name = t.val; break; } case 129: { lexer.NextToken(); -#line 2645 "VBNET.ATG" +#line 2650 "VBNET.ATG" name = t.val; break; } case 130: { lexer.NextToken(); -#line 2646 "VBNET.ATG" +#line 2651 "VBNET.ATG" name = t.val; break; } case 131: { lexer.NextToken(); -#line 2647 "VBNET.ATG" +#line 2652 "VBNET.ATG" name = t.val; break; } case 132: { lexer.NextToken(); -#line 2648 "VBNET.ATG" +#line 2653 "VBNET.ATG" name = t.val; break; } case 134: { lexer.NextToken(); -#line 2649 "VBNET.ATG" +#line 2654 "VBNET.ATG" name = t.val; break; } case 135: { lexer.NextToken(); -#line 2650 "VBNET.ATG" +#line 2655 "VBNET.ATG" name = t.val; break; } case 136: { lexer.NextToken(); -#line 2651 "VBNET.ATG" +#line 2656 "VBNET.ATG" name = t.val; break; } case 137: { lexer.NextToken(); -#line 2652 "VBNET.ATG" +#line 2657 "VBNET.ATG" name = t.val; break; } case 138: { lexer.NextToken(); -#line 2653 "VBNET.ATG" +#line 2658 "VBNET.ATG" name = t.val; break; } case 139: { lexer.NextToken(); -#line 2654 "VBNET.ATG" +#line 2659 "VBNET.ATG" name = t.val; break; } case 140: { lexer.NextToken(); -#line 2655 "VBNET.ATG" +#line 2660 "VBNET.ATG" name = t.val; break; } case 142: { lexer.NextToken(); -#line 2656 "VBNET.ATG" +#line 2661 "VBNET.ATG" name = t.val; break; } case 143: { lexer.NextToken(); -#line 2657 "VBNET.ATG" +#line 2662 "VBNET.ATG" name = t.val; break; } case 144: { lexer.NextToken(); -#line 2658 "VBNET.ATG" +#line 2663 "VBNET.ATG" name = t.val; break; } case 145: { lexer.NextToken(); -#line 2659 "VBNET.ATG" +#line 2664 "VBNET.ATG" name = t.val; break; } case 146: { lexer.NextToken(); -#line 2660 "VBNET.ATG" +#line 2665 "VBNET.ATG" name = t.val; break; } case 147: { lexer.NextToken(); -#line 2661 "VBNET.ATG" +#line 2666 "VBNET.ATG" name = t.val; break; } case 148: { lexer.NextToken(); -#line 2662 "VBNET.ATG" +#line 2667 "VBNET.ATG" name = t.val; break; } case 149: { lexer.NextToken(); -#line 2663 "VBNET.ATG" +#line 2668 "VBNET.ATG" name = t.val; break; } case 150: { lexer.NextToken(); -#line 2664 "VBNET.ATG" +#line 2669 "VBNET.ATG" name = t.val; break; } case 151: { lexer.NextToken(); -#line 2665 "VBNET.ATG" +#line 2670 "VBNET.ATG" name = t.val; break; } case 152: { lexer.NextToken(); -#line 2666 "VBNET.ATG" +#line 2671 "VBNET.ATG" name = t.val; break; } case 153: { lexer.NextToken(); -#line 2667 "VBNET.ATG" +#line 2672 "VBNET.ATG" name = t.val; break; } case 154: { lexer.NextToken(); -#line 2668 "VBNET.ATG" +#line 2673 "VBNET.ATG" name = t.val; break; } case 155: { lexer.NextToken(); -#line 2669 "VBNET.ATG" +#line 2674 "VBNET.ATG" name = t.val; break; } case 156: { lexer.NextToken(); -#line 2670 "VBNET.ATG" +#line 2675 "VBNET.ATG" name = t.val; break; } case 157: { lexer.NextToken(); -#line 2671 "VBNET.ATG" +#line 2676 "VBNET.ATG" name = t.val; break; } case 158: { lexer.NextToken(); -#line 2672 "VBNET.ATG" +#line 2677 "VBNET.ATG" name = t.val; break; } case 159: { lexer.NextToken(); -#line 2673 "VBNET.ATG" +#line 2678 "VBNET.ATG" name = t.val; break; } case 160: { lexer.NextToken(); -#line 2674 "VBNET.ATG" +#line 2679 "VBNET.ATG" name = t.val; break; } case 161: { lexer.NextToken(); -#line 2675 "VBNET.ATG" +#line 2680 "VBNET.ATG" name = t.val; break; } case 162: { lexer.NextToken(); -#line 2676 "VBNET.ATG" +#line 2681 "VBNET.ATG" name = t.val; break; } case 163: { lexer.NextToken(); -#line 2677 "VBNET.ATG" +#line 2682 "VBNET.ATG" name = t.val; break; } case 165: { lexer.NextToken(); -#line 2678 "VBNET.ATG" +#line 2683 "VBNET.ATG" name = t.val; break; } case 166: { lexer.NextToken(); -#line 2679 "VBNET.ATG" +#line 2684 "VBNET.ATG" name = t.val; break; } case 167: { lexer.NextToken(); -#line 2680 "VBNET.ATG" +#line 2685 "VBNET.ATG" name = t.val; break; } case 168: { lexer.NextToken(); -#line 2681 "VBNET.ATG" +#line 2686 "VBNET.ATG" name = t.val; break; } case 170: { lexer.NextToken(); -#line 2682 "VBNET.ATG" +#line 2687 "VBNET.ATG" name = t.val; break; } case 171: { lexer.NextToken(); -#line 2683 "VBNET.ATG" +#line 2688 "VBNET.ATG" name = t.val; break; } case 172: { lexer.NextToken(); -#line 2684 "VBNET.ATG" +#line 2689 "VBNET.ATG" name = t.val; break; } case 173: { lexer.NextToken(); -#line 2685 "VBNET.ATG" +#line 2690 "VBNET.ATG" name = t.val; break; } case 174: { lexer.NextToken(); -#line 2686 "VBNET.ATG" +#line 2691 "VBNET.ATG" name = t.val; break; } case 175: { lexer.NextToken(); -#line 2687 "VBNET.ATG" +#line 2692 "VBNET.ATG" name = t.val; break; } case 176: { lexer.NextToken(); -#line 2688 "VBNET.ATG" +#line 2693 "VBNET.ATG" name = t.val; break; } case 177: { lexer.NextToken(); -#line 2689 "VBNET.ATG" +#line 2694 "VBNET.ATG" name = t.val; break; } case 178: { lexer.NextToken(); -#line 2690 "VBNET.ATG" +#line 2695 "VBNET.ATG" name = t.val; break; } case 179: { lexer.NextToken(); -#line 2691 "VBNET.ATG" +#line 2696 "VBNET.ATG" name = t.val; break; } case 180: { lexer.NextToken(); -#line 2692 "VBNET.ATG" +#line 2697 "VBNET.ATG" name = t.val; break; } case 181: { lexer.NextToken(); -#line 2693 "VBNET.ATG" +#line 2698 "VBNET.ATG" name = t.val; break; } case 182: { lexer.NextToken(); -#line 2694 "VBNET.ATG" +#line 2699 "VBNET.ATG" name = t.val; break; } case 183: { lexer.NextToken(); -#line 2695 "VBNET.ATG" +#line 2700 "VBNET.ATG" name = t.val; break; } case 184: { lexer.NextToken(); -#line 2696 "VBNET.ATG" +#line 2701 "VBNET.ATG" name = t.val; break; } case 185: { lexer.NextToken(); -#line 2697 "VBNET.ATG" +#line 2702 "VBNET.ATG" name = t.val; break; } case 186: { lexer.NextToken(); -#line 2698 "VBNET.ATG" +#line 2703 "VBNET.ATG" name = t.val; break; } case 187: { lexer.NextToken(); -#line 2699 "VBNET.ATG" +#line 2704 "VBNET.ATG" name = t.val; break; } case 188: { lexer.NextToken(); -#line 2700 "VBNET.ATG" +#line 2705 "VBNET.ATG" name = t.val; break; } case 189: { lexer.NextToken(); -#line 2701 "VBNET.ATG" +#line 2706 "VBNET.ATG" name = t.val; break; } case 190: { lexer.NextToken(); -#line 2702 "VBNET.ATG" +#line 2707 "VBNET.ATG" name = t.val; break; } case 191: { lexer.NextToken(); -#line 2703 "VBNET.ATG" +#line 2708 "VBNET.ATG" name = t.val; break; } case 192: { lexer.NextToken(); -#line 2704 "VBNET.ATG" +#line 2709 "VBNET.ATG" name = t.val; break; } case 193: { lexer.NextToken(); -#line 2705 "VBNET.ATG" +#line 2710 "VBNET.ATG" name = t.val; break; } case 196: { lexer.NextToken(); -#line 2706 "VBNET.ATG" +#line 2711 "VBNET.ATG" name = t.val; break; } case 197: { lexer.NextToken(); -#line 2707 "VBNET.ATG" +#line 2712 "VBNET.ATG" name = t.val; break; } case 198: { lexer.NextToken(); -#line 2708 "VBNET.ATG" +#line 2713 "VBNET.ATG" name = t.val; break; } case 199: { lexer.NextToken(); -#line 2709 "VBNET.ATG" +#line 2714 "VBNET.ATG" name = t.val; break; } @@ -4716,8 +4674,8 @@ out Expression outExpr) { ShiftExpr( #line 1615 "VBNET.ATG" out outExpr); - while (StartOf(22)) { - if (StartOf(23)) { + while (StartOf(24)) { + if (StartOf(25)) { if (la.kind == 26) { lexer.NextToken(); @@ -4847,7 +4805,7 @@ out Expression outExpr) { UnaryExpr( #line 1668 "VBNET.ATG" out outExpr); - while (StartOf(24)) { + while (StartOf(26)) { if (la.kind == 16) { lexer.NextToken(); @@ -4913,12 +4871,31 @@ typeref.GenericTypes); #line 1755 "VBNET.ATG" typeref = new TypeReference("System.Object"); - } else if (StartOf(25)) { - PrimitiveTypeName( + } else if (la.kind == 194) { + lexer.NextToken(); + Expect(10); + Qualident( #line 1756 "VBNET.ATG" out name); -#line 1756 "VBNET.ATG" +#line 1757 "VBNET.ATG" + typeref = new TypeReference(name); typeref.IsGlobal = true; + if ( +#line 1758 "VBNET.ATG" +la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { + lexer.NextToken(); + Expect(196); + TypeArgumentList( +#line 1759 "VBNET.ATG" +typeref.GenericTypes); + Expect(24); + } + } else if (StartOf(21)) { + PrimitiveTypeName( +#line 1761 "VBNET.ATG" +out name); + +#line 1761 "VBNET.ATG" typeref = new TypeReference(name); } else SynErr(239); } @@ -4951,30 +4928,30 @@ out expr); } void ArrayTypeModifiers( -#line 1769 "VBNET.ATG" +#line 1774 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1771 "VBNET.ATG" +#line 1776 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 1774 "VBNET.ATG" +#line 1779 "VBNET.ATG" IsDims()) { Expect(23); if (la.kind == 12 || la.kind == 24) { RankList( -#line 1776 "VBNET.ATG" +#line 1781 "VBNET.ATG" out i); } -#line 1778 "VBNET.ATG" +#line 1783 "VBNET.ATG" arrayModifiers.Add(i); Expect(24); } -#line 1783 "VBNET.ATG" +#line 1788 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -4982,89 +4959,89 @@ out i); } void TypeArgumentList( -#line 1796 "VBNET.ATG" +#line 1801 "VBNET.ATG" List typeArguments) { -#line 1798 "VBNET.ATG" +#line 1803 "VBNET.ATG" TypeReference typeref; TypeName( -#line 1800 "VBNET.ATG" +#line 1805 "VBNET.ATG" out typeref); -#line 1800 "VBNET.ATG" +#line 1805 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1803 "VBNET.ATG" +#line 1808 "VBNET.ATG" out typeref); -#line 1803 "VBNET.ATG" +#line 1808 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void RankList( -#line 1790 "VBNET.ATG" +#line 1795 "VBNET.ATG" out int i) { -#line 1791 "VBNET.ATG" +#line 1796 "VBNET.ATG" i = 0; while (la.kind == 12) { lexer.NextToken(); -#line 1792 "VBNET.ATG" +#line 1797 "VBNET.ATG" ++i; } } void Attribute( -#line 1828 "VBNET.ATG" +#line 1833 "VBNET.ATG" out ICSharpCode.NRefactory.Parser.AST.Attribute attribute) { -#line 1829 "VBNET.ATG" +#line 1834 "VBNET.ATG" string name; Qualident( -#line 1830 "VBNET.ATG" +#line 1835 "VBNET.ATG" out name); -#line 1831 "VBNET.ATG" +#line 1836 "VBNET.ATG" List positional = new List(); List named = new List(); if (la.kind == 23) { AttributeArguments( -#line 1834 "VBNET.ATG" +#line 1839 "VBNET.ATG" positional, named); } -#line 1836 "VBNET.ATG" +#line 1841 "VBNET.ATG" attribute = new ICSharpCode.NRefactory.Parser.AST.Attribute(name, positional, named); } void AttributeArguments( -#line 1841 "VBNET.ATG" +#line 1846 "VBNET.ATG" List positional, List named) { -#line 1843 "VBNET.ATG" +#line 1848 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(23); if ( -#line 1849 "VBNET.ATG" +#line 1854 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 1851 "VBNET.ATG" +#line 1856 "VBNET.ATG" IsNamedAssign()) { -#line 1851 "VBNET.ATG" +#line 1856 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 1852 "VBNET.ATG" +#line 1857 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -5072,10 +5049,10 @@ out name); Expect(11); } Expr( -#line 1854 "VBNET.ATG" +#line 1859 "VBNET.ATG" out expr); -#line 1856 "VBNET.ATG" +#line 1861 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -5083,13 +5060,13 @@ out expr); while (la.kind == 12) { lexer.NextToken(); if ( -#line 1863 "VBNET.ATG" +#line 1868 "VBNET.ATG" IsNamedAssign()) { -#line 1863 "VBNET.ATG" +#line 1868 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 1864 "VBNET.ATG" +#line 1869 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -5097,14 +5074,14 @@ out name); Expect(11); } else if (StartOf(18)) { -#line 1866 "VBNET.ATG" +#line 1871 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); } else SynErr(240); Expr( -#line 1867 "VBNET.ATG" +#line 1872 "VBNET.ATG" out expr); -#line 1867 "VBNET.ATG" +#line 1872 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -5115,39 +5092,39 @@ out expr); } void FormalParameter( -#line 1936 "VBNET.ATG" +#line 1941 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 1938 "VBNET.ATG" +#line 1943 "VBNET.ATG" TypeReference type = null; ParamModifiers mod = new ParamModifiers(this); Expression expr = null; p = null;ArrayList arrayModifiers = null; - while (StartOf(26)) { + while (StartOf(27)) { ParameterModifier( -#line 1943 "VBNET.ATG" +#line 1948 "VBNET.ATG" mod); } Identifier(); -#line 1944 "VBNET.ATG" +#line 1949 "VBNET.ATG" string parameterName = t.val; if ( -#line 1945 "VBNET.ATG" +#line 1950 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 1945 "VBNET.ATG" +#line 1950 "VBNET.ATG" out arrayModifiers); } if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1946 "VBNET.ATG" +#line 1951 "VBNET.ATG" out type); } -#line 1948 "VBNET.ATG" +#line 1953 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -5163,45 +5140,45 @@ out type); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 1960 "VBNET.ATG" +#line 1965 "VBNET.ATG" out expr); } -#line 1962 "VBNET.ATG" +#line 1967 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); } void ParameterModifier( -#line 2734 "VBNET.ATG" +#line 2739 "VBNET.ATG" ParamModifiers m) { if (la.kind == 54) { lexer.NextToken(); -#line 2735 "VBNET.ATG" +#line 2740 "VBNET.ATG" m.Add(ParamModifier.In); } else if (la.kind == 52) { lexer.NextToken(); -#line 2736 "VBNET.ATG" +#line 2741 "VBNET.ATG" m.Add(ParamModifier.Ref); } else if (la.kind == 136) { lexer.NextToken(); -#line 2737 "VBNET.ATG" +#line 2742 "VBNET.ATG" m.Add(ParamModifier.Optional); } else if (la.kind == 143) { lexer.NextToken(); -#line 2738 "VBNET.ATG" +#line 2743 "VBNET.ATG" m.Add(ParamModifier.Params); } else SynErr(241); } void Statement() { -#line 1990 "VBNET.ATG" +#line 1995 "VBNET.ATG" Statement stmt = null; Point startPos = la.Location; string label = String.Empty; @@ -5209,34 +5186,34 @@ ParamModifiers m) { if (la.kind == 1 || la.kind == 13) { } else if ( -#line 1996 "VBNET.ATG" +#line 2001 "VBNET.ATG" IsLabel()) { LabelName( -#line 1996 "VBNET.ATG" +#line 2001 "VBNET.ATG" out label); -#line 1998 "VBNET.ATG" +#line 2003 "VBNET.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(13); Statement(); - } else if (StartOf(27)) { + } else if (StartOf(28)) { EmbeddedStatement( -#line 2001 "VBNET.ATG" +#line 2006 "VBNET.ATG" out stmt); -#line 2001 "VBNET.ATG" +#line 2006 "VBNET.ATG" compilationUnit.AddChild(stmt); - } else if (StartOf(28)) { + } else if (StartOf(29)) { LocalDeclarationStatement( -#line 2002 "VBNET.ATG" +#line 2007 "VBNET.ATG" out stmt); -#line 2002 "VBNET.ATG" +#line 2007 "VBNET.ATG" compilationUnit.AddChild(stmt); } else SynErr(242); -#line 2005 "VBNET.ATG" +#line 2010 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -5245,30 +5222,30 @@ out stmt); } void LabelName( -#line 2386 "VBNET.ATG" +#line 2391 "VBNET.ATG" out string name) { -#line 2388 "VBNET.ATG" +#line 2393 "VBNET.ATG" name = String.Empty; if (StartOf(10)) { Identifier(); -#line 2390 "VBNET.ATG" +#line 2395 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 2391 "VBNET.ATG" +#line 2396 "VBNET.ATG" name = t.val; } else SynErr(243); } void EmbeddedStatement( -#line 2044 "VBNET.ATG" +#line 2049 "VBNET.ATG" out Statement statement) { -#line 2046 "VBNET.ATG" +#line 2051 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5278,103 +5255,103 @@ out Statement statement) { case 93: { lexer.NextToken(); -#line 2051 "VBNET.ATG" +#line 2056 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 167: { lexer.NextToken(); -#line 2053 "VBNET.ATG" +#line 2058 "VBNET.ATG" exitType = ExitType.Sub; break; } case 99: { lexer.NextToken(); -#line 2055 "VBNET.ATG" +#line 2060 "VBNET.ATG" exitType = ExitType.Function; break; } case 146: { lexer.NextToken(); -#line 2057 "VBNET.ATG" +#line 2062 "VBNET.ATG" exitType = ExitType.Property; break; } case 82: { lexer.NextToken(); -#line 2059 "VBNET.ATG" +#line 2064 "VBNET.ATG" exitType = ExitType.Do; break; } case 97: { lexer.NextToken(); -#line 2061 "VBNET.ATG" +#line 2066 "VBNET.ATG" exitType = ExitType.For; break; } case 174: { lexer.NextToken(); -#line 2063 "VBNET.ATG" +#line 2068 "VBNET.ATG" exitType = ExitType.Try; break; } case 181: { lexer.NextToken(); -#line 2065 "VBNET.ATG" +#line 2070 "VBNET.ATG" exitType = ExitType.While; break; } case 155: { lexer.NextToken(); -#line 2067 "VBNET.ATG" +#line 2072 "VBNET.ATG" exitType = ExitType.Select; break; } default: SynErr(244); break; } -#line 2069 "VBNET.ATG" +#line 2074 "VBNET.ATG" statement = new ExitStatement(exitType); break; } case 174: { TryStatement( -#line 2070 "VBNET.ATG" +#line 2075 "VBNET.ATG" out statement); break; } case 186: { lexer.NextToken(); -#line 2071 "VBNET.ATG" +#line 2076 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 82 || la.kind == 97 || la.kind == 181) { if (la.kind == 82) { lexer.NextToken(); -#line 2071 "VBNET.ATG" +#line 2076 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 97) { lexer.NextToken(); -#line 2071 "VBNET.ATG" +#line 2076 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2071 "VBNET.ATG" +#line 2076 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2071 "VBNET.ATG" +#line 2076 "VBNET.ATG" statement = new ContinueStatement(continueType); break; } @@ -5382,11 +5359,11 @@ out statement); lexer.NextToken(); if (StartOf(18)) { Expr( -#line 2073 "VBNET.ATG" +#line 2078 "VBNET.ATG" out expr); } -#line 2073 "VBNET.ATG" +#line 2078 "VBNET.ATG" statement = new ThrowStatement(expr); break; } @@ -5394,27 +5371,27 @@ out expr); lexer.NextToken(); if (StartOf(18)) { Expr( -#line 2075 "VBNET.ATG" +#line 2080 "VBNET.ATG" out expr); } -#line 2075 "VBNET.ATG" +#line 2080 "VBNET.ATG" statement = new ReturnStatement(expr); break; } case 168: { lexer.NextToken(); Expr( -#line 2077 "VBNET.ATG" +#line 2082 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2077 "VBNET.ATG" +#line 2082 "VBNET.ATG" out embeddedStatement); Expect(87); Expect(168); -#line 2078 "VBNET.ATG" +#line 2083 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); break; } @@ -5422,42 +5399,42 @@ out embeddedStatement); lexer.NextToken(); Identifier(); -#line 2080 "VBNET.ATG" +#line 2085 "VBNET.ATG" name = t.val; if (la.kind == 23) { lexer.NextToken(); if (StartOf(17)) { ArgumentList( -#line 2081 "VBNET.ATG" +#line 2086 "VBNET.ATG" out p); } Expect(24); } -#line 2082 "VBNET.ATG" +#line 2087 "VBNET.ATG" statement = new RaiseEventStatement(name, p); break; } case 182: { WithStatement( -#line 2084 "VBNET.ATG" +#line 2089 "VBNET.ATG" out statement); break; } case 41: { lexer.NextToken(); -#line 2086 "VBNET.ATG" +#line 2091 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2087 "VBNET.ATG" +#line 2092 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2087 "VBNET.ATG" +#line 2092 "VBNET.ATG" out handlerExpr); -#line 2089 "VBNET.ATG" +#line 2094 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); break; @@ -5465,17 +5442,17 @@ out handlerExpr); case 152: { lexer.NextToken(); -#line 2092 "VBNET.ATG" +#line 2097 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2093 "VBNET.ATG" +#line 2098 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2093 "VBNET.ATG" +#line 2098 "VBNET.ATG" out handlerExpr); -#line 2095 "VBNET.ATG" +#line 2100 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); break; @@ -5483,16 +5460,16 @@ out handlerExpr); case 181: { lexer.NextToken(); Expr( -#line 2098 "VBNET.ATG" +#line 2103 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2099 "VBNET.ATG" +#line 2104 "VBNET.ATG" out embeddedStatement); Expect(87); Expect(181); -#line 2101 "VBNET.ATG" +#line 2106 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); break; @@ -5500,23 +5477,23 @@ out embeddedStatement); case 82: { lexer.NextToken(); -#line 2106 "VBNET.ATG" +#line 2111 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2109 "VBNET.ATG" +#line 2114 "VBNET.ATG" out conditionType); Expr( -#line 2109 "VBNET.ATG" +#line 2114 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2110 "VBNET.ATG" +#line 2115 "VBNET.ATG" out embeddedStatement); Expect(117); -#line 2113 "VBNET.ATG" +#line 2118 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5525,19 +5502,19 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2120 "VBNET.ATG" +#line 2125 "VBNET.ATG" out embeddedStatement); Expect(117); if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2121 "VBNET.ATG" +#line 2126 "VBNET.ATG" out conditionType); Expr( -#line 2121 "VBNET.ATG" +#line 2126 "VBNET.ATG" out expr); } -#line 2123 "VBNET.ATG" +#line 2128 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); } else SynErr(245); @@ -5546,7 +5523,7 @@ out expr); case 97: { lexer.NextToken(); -#line 2128 "VBNET.ATG" +#line 2133 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5555,24 +5532,24 @@ out expr); if (la.kind == 84) { lexer.NextToken(); LoopControlVariable( -#line 2135 "VBNET.ATG" +#line 2140 "VBNET.ATG" out typeReference, out typeName); Expect(108); Expr( -#line 2136 "VBNET.ATG" +#line 2141 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2137 "VBNET.ATG" +#line 2142 "VBNET.ATG" out embeddedStatement); Expect(127); if (StartOf(18)) { Expr( -#line 2138 "VBNET.ATG" +#line 2143 "VBNET.ATG" out expr); } -#line 2140 "VBNET.ATG" +#line 2145 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5584,53 +5561,53 @@ out expr); } else if (StartOf(10)) { -#line 2151 "VBNET.ATG" +#line 2156 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; Expression nextExpr = null;ArrayList nextExpressions = null; LoopControlVariable( -#line 2156 "VBNET.ATG" +#line 2161 "VBNET.ATG" out typeReference, out typeName); Expect(11); Expr( -#line 2157 "VBNET.ATG" +#line 2162 "VBNET.ATG" out start); Expect(172); Expr( -#line 2157 "VBNET.ATG" +#line 2162 "VBNET.ATG" out end); if (la.kind == 162) { lexer.NextToken(); Expr( -#line 2157 "VBNET.ATG" +#line 2162 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 2158 "VBNET.ATG" +#line 2163 "VBNET.ATG" out embeddedStatement); Expect(127); if (StartOf(18)) { Expr( -#line 2161 "VBNET.ATG" +#line 2166 "VBNET.ATG" out nextExpr); -#line 2161 "VBNET.ATG" +#line 2166 "VBNET.ATG" nextExpressions = new ArrayList(); nextExpressions.Add(nextExpr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2162 "VBNET.ATG" +#line 2167 "VBNET.ATG" out nextExpr); -#line 2162 "VBNET.ATG" +#line 2167 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 2165 "VBNET.ATG" +#line 2170 "VBNET.ATG" statement = new ForNextStatement(typeReference, typeName, start, end, step, embeddedStatement, nextExpressions); } else SynErr(246); @@ -5639,29 +5616,29 @@ out nextExpr); case 91: { lexer.NextToken(); Expr( -#line 2169 "VBNET.ATG" +#line 2174 "VBNET.ATG" out expr); -#line 2169 "VBNET.ATG" +#line 2174 "VBNET.ATG" statement = new ErrorStatement(expr); break; } case 151: { lexer.NextToken(); -#line 2171 "VBNET.ATG" +#line 2176 "VBNET.ATG" Expression redimclause = null; bool isPreserve = false; if (la.kind == 144) { lexer.NextToken(); -#line 2171 "VBNET.ATG" +#line 2176 "VBNET.ATG" isPreserve = true; } Expr( -#line 2172 "VBNET.ATG" +#line 2177 "VBNET.ATG" out redimclause); -#line 2174 "VBNET.ATG" +#line 2179 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; reDimStatement.ReDimClauses.Add(redimclause as InvocationExpression); @@ -5669,10 +5646,10 @@ out redimclause); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2178 "VBNET.ATG" +#line 2183 "VBNET.ATG" out redimclause); -#line 2178 "VBNET.ATG" +#line 2183 "VBNET.ATG" reDimStatement.ReDimClauses.Add(redimclause as InvocationExpression); } break; @@ -5680,10 +5657,10 @@ out redimclause); case 90: { lexer.NextToken(); Expr( -#line 2181 "VBNET.ATG" +#line 2186 "VBNET.ATG" out expr); -#line 2182 "VBNET.ATG" +#line 2187 "VBNET.ATG" ArrayList arrays = new ArrayList(); if (expr != null) { arrays.Add(expr);} EraseStatement eraseStatement = new EraseStatement(arrays); @@ -5692,53 +5669,53 @@ out expr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2187 "VBNET.ATG" +#line 2192 "VBNET.ATG" out expr); -#line 2187 "VBNET.ATG" +#line 2192 "VBNET.ATG" if (expr != null) { arrays.Add(expr); } } -#line 2188 "VBNET.ATG" +#line 2193 "VBNET.ATG" statement = eraseStatement; break; } case 163: { lexer.NextToken(); -#line 2190 "VBNET.ATG" +#line 2195 "VBNET.ATG" statement = new StopStatement(); break; } case 105: { lexer.NextToken(); Expr( -#line 2192 "VBNET.ATG" +#line 2197 "VBNET.ATG" out expr); if (la.kind == 170) { lexer.NextToken(); } if ( -#line 2194 "VBNET.ATG" +#line 2199 "VBNET.ATG" IsEndStmtAhead()) { Expect(87); -#line 2194 "VBNET.ATG" +#line 2199 "VBNET.ATG" statement = new IfElseStatement(expr, new EndStatement()); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2197 "VBNET.ATG" +#line 2202 "VBNET.ATG" out embeddedStatement); -#line 2199 "VBNET.ATG" +#line 2204 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 86 || -#line 2203 "VBNET.ATG" +#line 2208 "VBNET.ATG" IsElseIf()) { if ( -#line 2203 "VBNET.ATG" +#line 2208 "VBNET.ATG" IsElseIf()) { Expect(85); Expect(105); @@ -5746,20 +5723,20 @@ IsElseIf()) { lexer.NextToken(); } -#line 2206 "VBNET.ATG" +#line 2211 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 2207 "VBNET.ATG" +#line 2212 "VBNET.ATG" out condition); if (la.kind == 170) { lexer.NextToken(); } EndOfStmt(); Block( -#line 2208 "VBNET.ATG" +#line 2213 "VBNET.ATG" out block); -#line 2210 "VBNET.ATG" +#line 2215 "VBNET.ATG" ifStatement.ElseIfSections.Add(new ElseIfSection(condition, block)); } @@ -5767,59 +5744,59 @@ out block); lexer.NextToken(); EndOfStmt(); Block( -#line 2215 "VBNET.ATG" +#line 2220 "VBNET.ATG" out embeddedStatement); -#line 2217 "VBNET.ATG" +#line 2222 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(87); Expect(105); -#line 2221 "VBNET.ATG" +#line 2226 "VBNET.ATG" statement = ifStatement; - } else if (StartOf(27)) { + } else if (StartOf(28)) { EmbeddedStatement( -#line 2224 "VBNET.ATG" +#line 2229 "VBNET.ATG" out embeddedStatement); -#line 2226 "VBNET.ATG" +#line 2231 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2228 "VBNET.ATG" +#line 2233 "VBNET.ATG" out embeddedStatement); -#line 2228 "VBNET.ATG" +#line 2233 "VBNET.ATG" ifStatement.TrueStatement.Add(embeddedStatement); } if (la.kind == 85) { lexer.NextToken(); - if (StartOf(27)) { + if (StartOf(28)) { EmbeddedStatement( -#line 2230 "VBNET.ATG" +#line 2235 "VBNET.ATG" out embeddedStatement); } -#line 2232 "VBNET.ATG" +#line 2237 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2235 "VBNET.ATG" +#line 2240 "VBNET.ATG" out embeddedStatement); -#line 2236 "VBNET.ATG" +#line 2241 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } } -#line 2239 "VBNET.ATG" +#line 2244 "VBNET.ATG" statement = ifStatement; } else SynErr(247); break; @@ -5830,43 +5807,43 @@ out embeddedStatement); lexer.NextToken(); } Expr( -#line 2242 "VBNET.ATG" +#line 2247 "VBNET.ATG" out expr); EndOfStmt(); -#line 2243 "VBNET.ATG" +#line 2248 "VBNET.ATG" ArrayList selectSections = new ArrayList(); Statement block = null; while (la.kind == 56) { -#line 2247 "VBNET.ATG" +#line 2252 "VBNET.ATG" ArrayList caseClauses = null; lexer.NextToken(); CaseClauses( -#line 2248 "VBNET.ATG" +#line 2253 "VBNET.ATG" out caseClauses); if ( -#line 2248 "VBNET.ATG" +#line 2253 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 2250 "VBNET.ATG" +#line 2255 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); Block( -#line 2252 "VBNET.ATG" +#line 2257 "VBNET.ATG" out block); -#line 2254 "VBNET.ATG" +#line 2259 "VBNET.ATG" selectSection.Children = block.Children; selectSections.Add(selectSection); } -#line 2258 "VBNET.ATG" +#line 2263 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(87); Expect(155); @@ -5874,43 +5851,43 @@ out block); } case 134: { -#line 2260 "VBNET.ATG" +#line 2265 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 2261 "VBNET.ATG" +#line 2266 "VBNET.ATG" out onErrorStatement); -#line 2261 "VBNET.ATG" +#line 2266 "VBNET.ATG" statement = onErrorStatement; break; } case 103: { -#line 2262 "VBNET.ATG" +#line 2267 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 2263 "VBNET.ATG" +#line 2268 "VBNET.ATG" out goToStatement); -#line 2263 "VBNET.ATG" +#line 2268 "VBNET.ATG" statement = goToStatement; break; } case 153: { -#line 2264 "VBNET.ATG" +#line 2269 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 2265 "VBNET.ATG" +#line 2270 "VBNET.ATG" out resumeStatement); -#line 2265 "VBNET.ATG" +#line 2270 "VBNET.ATG" statement = resumeStatement; break; } - case 2: case 3: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 14: case 15: case 16: case 23: case 42: case 50: case 51: case 53: case 58: case 59: case 60: case 61: case 62: case 63: case 64: case 65: case 67: case 68: case 69: case 71: case 72: case 73: case 74: case 75: case 76: case 81: case 83: case 95: case 101: case 110: case 116: case 118: case 123: case 124: case 126: case 129: case 159: case 160: case 165: case 169: case 173: case 175: case 190: case 191: case 192: case 193: case 194: case 195: { + case 2: case 3: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 14: case 15: case 16: case 23: case 42: case 50: case 51: case 53: case 58: case 59: case 60: case 61: case 62: case 63: case 64: case 65: case 67: case 68: case 69: case 71: case 72: case 73: case 74: case 75: case 76: case 81: case 83: case 95: case 101: case 110: case 116: case 118: case 123: case 124: case 126: case 129: case 159: case 160: case 165: case 169: case 173: case 175: case 190: case 191: case 192: case 193: case 195: { -#line 2268 "VBNET.ATG" +#line 2273 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -5918,25 +5895,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; UnaryExpr( -#line 2274 "VBNET.ATG" +#line 2279 "VBNET.ATG" out expr); - if (StartOf(29)) { + if (StartOf(30)) { AssignmentOperator( -#line 2276 "VBNET.ATG" +#line 2281 "VBNET.ATG" out op); Expr( -#line 2276 "VBNET.ATG" +#line 2281 "VBNET.ATG" out val); -#line 2276 "VBNET.ATG" +#line 2281 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 1 || la.kind == 13 || la.kind == 85) { -#line 2277 "VBNET.ATG" +#line 2282 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(248); -#line 2280 "VBNET.ATG" +#line 2285 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is FieldReferenceExpression || expr is IdentifierExpression) { @@ -5949,10 +5926,10 @@ out val); case 55: { lexer.NextToken(); UnaryExpr( -#line 2287 "VBNET.ATG" +#line 2292 "VBNET.ATG" out expr); -#line 2287 "VBNET.ATG" +#line 2292 "VBNET.ATG" statement = new StatementExpression(expr); break; } @@ -5960,7 +5937,7 @@ out expr); lexer.NextToken(); Identifier(); -#line 2289 "VBNET.ATG" +#line 2294 "VBNET.ATG" string resourcename = t.val, typeName; Statement resourceAquisition = null, block = null; @@ -5968,45 +5945,45 @@ out expr); if (la.kind == 126) { lexer.NextToken(); Qualident( -#line 2293 "VBNET.ATG" +#line 2298 "VBNET.ATG" out typeName); -#line 2293 "VBNET.ATG" +#line 2298 "VBNET.ATG" ArrayList initializer = null; if (la.kind == 23) { lexer.NextToken(); if (StartOf(17)) { ArgumentList( -#line 2293 "VBNET.ATG" +#line 2298 "VBNET.ATG" out initializer); } Expect(24); } -#line 2295 "VBNET.ATG" +#line 2300 "VBNET.ATG" resourceAquisition = new LocalVariableDeclaration(new VariableDeclaration(resourcename, new ArrayInitializerExpression(initializer), new TypeReference(typeName))); } else if (StartOf(10)) { Qualident( -#line 2298 "VBNET.ATG" +#line 2303 "VBNET.ATG" out typeName); Expect(11); Expr( -#line 2298 "VBNET.ATG" +#line 2303 "VBNET.ATG" out expr); -#line 2300 "VBNET.ATG" +#line 2305 "VBNET.ATG" resourceAquisition = new LocalVariableDeclaration(new VariableDeclaration(resourcename, expr, new TypeReference(typeName))); } else SynErr(249); Block( -#line 2303 "VBNET.ATG" +#line 2308 "VBNET.ATG" out block); Expect(87); Expect(188); -#line 2305 "VBNET.ATG" +#line 2310 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); break; } @@ -6015,10 +5992,10 @@ out block); } void LocalDeclarationStatement( -#line 2013 "VBNET.ATG" +#line 2018 "VBNET.ATG" out Statement statement) { -#line 2015 "VBNET.ATG" +#line 2020 "VBNET.ATG" Modifiers m = new Modifiers(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -6027,22 +6004,22 @@ out Statement statement) { if (la.kind == 70) { lexer.NextToken(); -#line 2021 "VBNET.ATG" +#line 2026 "VBNET.ATG" m.Add(Modifier.Const); } else if (la.kind == 161) { lexer.NextToken(); -#line 2022 "VBNET.ATG" +#line 2027 "VBNET.ATG" m.Add(Modifier.Static); } else { lexer.NextToken(); -#line 2023 "VBNET.ATG" +#line 2028 "VBNET.ATG" dimfound = true; } } -#line 2026 "VBNET.ATG" +#line 2031 "VBNET.ATG" if(dimfound && (m.Modifier & Modifier.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -6055,137 +6032,137 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2037 "VBNET.ATG" +#line 2042 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2038 "VBNET.ATG" +#line 2043 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2040 "VBNET.ATG" +#line 2045 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 2498 "VBNET.ATG" +#line 2503 "VBNET.ATG" out Statement tryStatement) { -#line 2500 "VBNET.ATG" +#line 2505 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;ArrayList catchClauses = null; Expect(174); EndOfStmt(); Block( -#line 2503 "VBNET.ATG" +#line 2508 "VBNET.ATG" out blockStmt); if (la.kind == 57 || la.kind == 87 || la.kind == 96) { CatchClauses( -#line 2504 "VBNET.ATG" +#line 2509 "VBNET.ATG" out catchClauses); } if (la.kind == 96) { lexer.NextToken(); EndOfStmt(); Block( -#line 2505 "VBNET.ATG" +#line 2510 "VBNET.ATG" out finallyStmt); } Expect(87); Expect(174); -#line 2508 "VBNET.ATG" +#line 2513 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 2476 "VBNET.ATG" +#line 2481 "VBNET.ATG" out Statement withStatement) { -#line 2478 "VBNET.ATG" +#line 2483 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(182); -#line 2481 "VBNET.ATG" +#line 2486 "VBNET.ATG" Point start = t.Location; Expr( -#line 2482 "VBNET.ATG" +#line 2487 "VBNET.ATG" out expr); EndOfStmt(); -#line 2484 "VBNET.ATG" +#line 2489 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; withStatements.Push(withStatement); Block( -#line 2488 "VBNET.ATG" +#line 2493 "VBNET.ATG" out blockStmt); -#line 2490 "VBNET.ATG" +#line 2495 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; withStatements.Pop(); Expect(87); Expect(182); -#line 2494 "VBNET.ATG" +#line 2499 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 2469 "VBNET.ATG" +#line 2474 "VBNET.ATG" out ConditionType conditionType) { -#line 2470 "VBNET.ATG" +#line 2475 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 181) { lexer.NextToken(); -#line 2471 "VBNET.ATG" +#line 2476 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 177) { lexer.NextToken(); -#line 2472 "VBNET.ATG" +#line 2477 "VBNET.ATG" conditionType = ConditionType.Until; } else SynErr(251); } void LoopControlVariable( -#line 2310 "VBNET.ATG" +#line 2315 "VBNET.ATG" out TypeReference type, out string name) { -#line 2311 "VBNET.ATG" +#line 2316 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 2315 "VBNET.ATG" +#line 2320 "VBNET.ATG" out name); if ( -#line 2316 "VBNET.ATG" +#line 2321 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2316 "VBNET.ATG" +#line 2321 "VBNET.ATG" out arrayModifiers); } if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 2317 "VBNET.ATG" +#line 2322 "VBNET.ATG" out type); -#line 2317 "VBNET.ATG" +#line 2322 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 2319 "VBNET.ATG" +#line 2324 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -6203,48 +6180,48 @@ out type); } void CaseClauses( -#line 2429 "VBNET.ATG" +#line 2434 "VBNET.ATG" out ArrayList caseClauses) { -#line 2431 "VBNET.ATG" +#line 2436 "VBNET.ATG" caseClauses = new ArrayList(); CaseLabel caseClause = null; CaseClause( -#line 2434 "VBNET.ATG" +#line 2439 "VBNET.ATG" out caseClause); -#line 2434 "VBNET.ATG" +#line 2439 "VBNET.ATG" caseClauses.Add(caseClause); while (la.kind == 12) { lexer.NextToken(); CaseClause( -#line 2435 "VBNET.ATG" +#line 2440 "VBNET.ATG" out caseClause); -#line 2435 "VBNET.ATG" +#line 2440 "VBNET.ATG" caseClauses.Add(caseClause); } } void OnErrorStatement( -#line 2336 "VBNET.ATG" +#line 2341 "VBNET.ATG" out OnErrorStatement stmt) { -#line 2338 "VBNET.ATG" +#line 2343 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(134); Expect(91); if ( -#line 2344 "VBNET.ATG" +#line 2349 "VBNET.ATG" IsNegativeLabelName()) { Expect(103); Expect(15); Expect(5); -#line 2346 "VBNET.ATG" +#line 2351 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -6253,10 +6230,10 @@ IsNegativeLabelName()) { } else if (la.kind == 103) { GotoStatement( -#line 2352 "VBNET.ATG" +#line 2357 "VBNET.ATG" out goToStatement); -#line 2354 "VBNET.ATG" +#line 2359 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -6273,63 +6250,63 @@ out goToStatement); lexer.NextToken(); Expect(127); -#line 2368 "VBNET.ATG" +#line 2373 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); } else SynErr(252); } void GotoStatement( -#line 2374 "VBNET.ATG" +#line 2379 "VBNET.ATG" out ICSharpCode.NRefactory.Parser.AST.GotoStatement goToStatement) { -#line 2376 "VBNET.ATG" +#line 2381 "VBNET.ATG" string label = String.Empty; Expect(103); LabelName( -#line 2379 "VBNET.ATG" +#line 2384 "VBNET.ATG" out label); -#line 2381 "VBNET.ATG" +#line 2386 "VBNET.ATG" goToStatement = new ICSharpCode.NRefactory.Parser.AST.GotoStatement(label); } void ResumeStatement( -#line 2418 "VBNET.ATG" +#line 2423 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 2420 "VBNET.ATG" +#line 2425 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 2423 "VBNET.ATG" +#line 2428 "VBNET.ATG" IsResumeNext()) { Expect(153); Expect(127); -#line 2424 "VBNET.ATG" +#line 2429 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 153) { lexer.NextToken(); - if (StartOf(30)) { + if (StartOf(31)) { LabelName( -#line 2425 "VBNET.ATG" +#line 2430 "VBNET.ATG" out label); } -#line 2425 "VBNET.ATG" +#line 2430 "VBNET.ATG" resumeStatement = new ResumeStatement(label); } else SynErr(253); } void CaseClause( -#line 2439 "VBNET.ATG" +#line 2444 "VBNET.ATG" out CaseLabel caseClause) { -#line 2441 "VBNET.ATG" +#line 2446 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -6338,9 +6315,9 @@ out CaseLabel caseClause) { if (la.kind == 85) { lexer.NextToken(); -#line 2447 "VBNET.ATG" +#line 2452 "VBNET.ATG" caseClause = new CaseLabel(); - } else if (StartOf(31)) { + } else if (StartOf(32)) { if (la.kind == 112) { lexer.NextToken(); } @@ -6348,76 +6325,76 @@ out CaseLabel caseClause) { case 26: { lexer.NextToken(); -#line 2451 "VBNET.ATG" +#line 2456 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 25: { lexer.NextToken(); -#line 2452 "VBNET.ATG" +#line 2457 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 29: { lexer.NextToken(); -#line 2453 "VBNET.ATG" +#line 2458 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 28: { lexer.NextToken(); -#line 2454 "VBNET.ATG" +#line 2459 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 11: { lexer.NextToken(); -#line 2455 "VBNET.ATG" +#line 2460 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 27: { lexer.NextToken(); -#line 2456 "VBNET.ATG" +#line 2461 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } default: SynErr(254); break; } Expr( -#line 2458 "VBNET.ATG" +#line 2463 "VBNET.ATG" out expr); -#line 2460 "VBNET.ATG" +#line 2465 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(18)) { Expr( -#line 2462 "VBNET.ATG" +#line 2467 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); Expr( -#line 2462 "VBNET.ATG" +#line 2467 "VBNET.ATG" out sexpr); } -#line 2464 "VBNET.ATG" +#line 2469 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); } else SynErr(255); } void CatchClauses( -#line 2513 "VBNET.ATG" +#line 2518 "VBNET.ATG" out ArrayList catchClauses) { -#line 2515 "VBNET.ATG" +#line 2520 "VBNET.ATG" catchClauses = new ArrayList(); TypeReference type = null; Statement blockStmt = null; @@ -6429,27 +6406,27 @@ out ArrayList catchClauses) { if (StartOf(10)) { Identifier(); -#line 2523 "VBNET.ATG" +#line 2528 "VBNET.ATG" name = t.val; if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 2523 "VBNET.ATG" +#line 2528 "VBNET.ATG" out type); } } if (la.kind == 180) { lexer.NextToken(); Expr( -#line 2524 "VBNET.ATG" +#line 2529 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 2526 "VBNET.ATG" +#line 2531 "VBNET.ATG" out blockStmt); -#line 2527 "VBNET.ATG" +#line 2532 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } @@ -6776,29 +6753,30 @@ out blockStmt); {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,T,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, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,x,x,x, x,x,x,x, x,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,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,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,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, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, 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,T,T, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,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,T,T, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,x, x,x,x,x, x,x}, {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,T,T,x, x,x,x,x, x,T,T,T, T,x,x,x, x,x,x,x, x,T,x,x, T,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,T, T,x,T,x, x,T,T,T, T,x,T,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,T, T,x,T,x, x,T,x,T, T,x,T,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,T, T,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,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,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,T,x, x,x,x,x, x,x,x,x, x,x,T,T, T,x,x,x, x,x,x,x, x,T,x,x, T,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, T,T,T,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,T, T,x,T,x, x,T,T,T, T,x,T,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,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,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,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,T,T,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,T,x,T, x,x,T,T, T,T,T,T, T,T,x,T, T,T,T,T, T,T,T,T, T,x,x,x, T,T,T,T, x,x,x,T, x,x,T,T, x,T,x,T, x,T,x,x, x,T,x,T, x,T,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,T,x,T, x,T,x,x, T,T,x,T, x,T,T,T, x,x,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,T,T, x,x,x,x, x,x}, + {x,T,T,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,T,x,T, x,x,T,T, T,T,T,T, T,T,x,T, T,T,T,T, T,T,T,T, T,x,x,x, T,T,T,T, x,x,x,T, x,x,T,T, x,T,x,T, x,T,x,x, x,T,x,T, x,T,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,T,x,T, x,T,x,x, T,T,x,T, x,T,T,T, x,x,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, 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, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, T,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,T,T,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,T, T,x,T,x, x,T,T,T, T,x,T,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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,T,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, 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, 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,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x}, - {x,T,T,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,T,x,T, x,x,T,T, T,T,T,T, T,T,x,T, T,T,T,T, T,T,T,T, T,x,x,x, T,T,T,T, x,x,x,x, x,x,T,T, x,T,x,T, x,T,x,x, x,T,x,T, x,T,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,T,x,T, x,T,x,x, T,T,x,T, x,T,T,T, x,x,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,T,T, x,x,x,x, x,x}, + {x,T,T,T, T,T,T,T, T,T,T,x, x,T,T,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,T,x,T, x,x,T,T, T,T,T,T, T,T,x,T, T,T,T,T, T,T,T,T, T,x,x,x, T,T,T,T, x,x,x,x, x,x,T,T, x,T,x,T, x,T,x,x, x,T,x,T, x,T,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,T,x,T, x,T,x,x, T,T,x,T, x,T,T,T, x,x,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x}, {x,T,x,x, x,x,x,x, x,x,x,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,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,T,T, T,T,T,T, T,T,T,x, x,x,T,T, T,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,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,T,x, T,x,T,T, T,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,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, x,x,x,x, x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, T,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,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,T, x,x,x,x, x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,T, x,x,x,x, x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,T, x,x,x,x, x,x}, + {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,T, x,x,x,x, x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, 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,T, T,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, x,x,x,x, x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, x,T,x,T, T,x,x,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, T,x,T,T, T,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,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,T, x,x,x,x, x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,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,T,T,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, 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,T, T,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, x,x,x,x, x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,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,T,T, T,T,T,T, T,T,T,x, x,x,T,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,T,x,T, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,T,T, x,x,x,x, x,x,T,T, x,T,x,T, x,T,x,x, x,T,x,T, x,T,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,x,x,T, x,T,x,x, T,T,x,T, x,T,T,T, x,x,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,T,T, x,x,x,x, x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,T,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,T,x,T, x,x,T,T, T,T,T,T, T,T,x,T, T,T,x,T, T,T,T,T, T,x,x,x, x,T,T,T, x,x,x,x, x,x,T,T, x,T,x,T, x,T,x,x, x,T,x,T, x,T,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,T, T,x,T,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, T,T,T,T, x,x,x,T, T,x,x,T, x,T,x,x, T,T,x,T, x,T,T,T, x,x,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x}, {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,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,T,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, {x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, {x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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}, diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index 5626547b08..1d9ea345c5 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -588,8 +588,9 @@ TypeParameterConstraints /* 6.4.2 */ NonModuleDeclaration attributes> (. - string name = String.Empty; - ArrayList names = null; + string name = null; + TypeReference typeRef = null; + List baseInterfaces = null; .) = (. m.Check(Modifier.Classes); .) /* Spec, 7.5 */ @@ -605,8 +606,8 @@ NonModuleDeclaration attributes> Identifier (. newType.Name = t.val; newType.StartLocation = t.EndLocation; .) TypeParameterList EndOfStmt - [ ClassBaseType (. newType.BaseTypes.Add(name); .) ] - { TypeImplementsClause (. newType.BaseTypes.AddRange(names); .) } + [ ClassBaseType (. newType.BaseTypes.Add(typeRef); .) ] + { TypeImplementsClause (. newType.BaseTypes.AddRange(baseInterfaces); .) } ClassBody (. compilationUnit.BlockEnd(); @@ -634,7 +635,7 @@ NonModuleDeclaration attributes> compilationUnit.AddChild(newType); compilationUnit.BlockStart(newType); newType.StartLocation = t.Location; - newType.Type = Types.Struct; ArrayList baseInterfaces = new ArrayList(); + newType.Type = Types.Struct; .) Identifier (. newType.Name = t.val; newType.StartLocation = t.EndLocation; .) TypeParameterList @@ -656,7 +657,7 @@ NonModuleDeclaration attributes> newType.Type = Types.Enum; .) Identifier (. newType.Name = t.val; newType.StartLocation = t.EndLocation; .) - [ "As" PrimitiveTypeName (. newType.BaseTypes.Add(name); .) ] + [ "As" PrimitiveTypeName (. newType.BaseTypes.Add(new TypeReference(name)); .) ] EOL EnumBody (. @@ -670,11 +671,11 @@ NonModuleDeclaration attributes> TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); compilationUnit.BlockStart(newType); - newType.Type = Types.Interface;ArrayList baseInterfaces; + newType.Type = Types.Interface; .) Identifier (. newType.Name = t.val; newType.StartLocation = t.EndLocation; .) TypeParameterList - EndOfStmt { InterfaceBase (. newType.BaseTypes.AddRange(baseInterfaces.ToArray()); .) } + EndOfStmt { InterfaceBase (. newType.BaseTypes.AddRange(baseInterfaces); .) } InterfaceBody (. newType.EndLocation = t.Location; @@ -879,15 +880,14 @@ ClassMemberDecl attributes> = StructureMemberDecl . -ClassBaseType - (. - TypeReference type; - name = String.Empty; - .) = +ClassBaseType +(. + typeRef = null; +.) = "Inherits" - TypeName (. name = type.Type; .) + TypeName EndOfStmt - . +. /* 7.6.1 */ StructureMemberDecl attributes> @@ -1368,33 +1368,33 @@ HandlesClause . /* 7.8. */ -InterfaceBase +InterfaceBase bases> (. TypeReference type; - bases = new ArrayList(); + bases = new List(); .) = "Inherits" - TypeName (. bases.Add(type.Type); .) + TypeName (. bases.Add(type); .) { "," - TypeName (. bases.Add(type.Type); .) + TypeName (. bases.Add(type); .) } EOL . /* 7.2 */ -TypeImplementsClause +TypeImplementsClause baseInterfaces> (. - baseInterfaces = new ArrayList(); + baseInterfaces = new List(); TypeReference type = null; .) = "Implements" TypeName (. - baseInterfaces.Add(type.Type); + baseInterfaces.Add(type); .) { "," TypeName - (. baseInterfaces.Add(type.Type); .) + (. baseInterfaces.Add(type); .) } EndOfStmt . @@ -1496,9 +1496,9 @@ SimpleExpr | (. Expression retExpr = null; .) ( "MyBase" (. retExpr = new BaseReferenceExpression(); .) | "MyClass" (. retExpr = new ClassReferenceExpression(); .) - | "Global" (. retExpr = new GlobalReferenceExpression(); .) ) "." IdentifierOrKeyword (. pexpr = new FieldReferenceExpression(retExpr, name); .) + | IF (la.kind == Tokens.Global) TypeName (. pexpr = new TypeReferenceExpression(type); .) | ObjectCreateExpression (. pexpr = expr; .) | /* 11.11 */ ( "DirectCast" | "CType" ) "(" Expr "," TypeName ")" (. pexpr = new CastExpression(type, expr); .) | /* 11.11 */ "TryCast" "(" Expr "," TypeName ")" (. pexpr = new BinaryOperatorExpression(expr, BinaryOperatorType.AsCast, new TypeReferenceExpression(type)); .) @@ -1753,6 +1753,11 @@ NonArrayTypeName "(" "Of" TypeArgumentList ")" ] | "Object" (. typeref = new TypeReference("System.Object"); .) + | "Global" "." Qualident + (. typeref = new TypeReference(name); typeref.IsGlobal = true; .) + [IF (la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) + "(" "Of" TypeArgumentList ")" + ] | PrimitiveTypeName (. typeref = new TypeReference(name); .) . diff --git a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/AbstractASTVisitor.cs b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/AbstractASTVisitor.cs index ec289e679c..9cbc6d17be 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/AbstractASTVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/AbstractASTVisitor.cs @@ -973,12 +973,6 @@ namespace ICSharpCode.NRefactory.Parser return data; } - public virtual object Visit(GlobalReferenceExpression globalReferenceExpression, object data) - { - Debug.Assert(globalReferenceExpression != null); - return data; - } - public virtual object Visit(ObjectCreateExpression objectCreateExpression, object data) { Debug.Assert(objectCreateExpression != null); diff --git a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/IASTVisitor.cs b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/IASTVisitor.cs index 22e8c127de..92a37bfbfd 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/IASTVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/IASTVisitor.cs @@ -117,7 +117,6 @@ namespace ICSharpCode.NRefactory.Parser object Visit(IndexerExpression indexerExpression, object data); object Visit(ThisReferenceExpression thisReferenceExpression, object data); object Visit(BaseReferenceExpression baseReferenceExpression, object data); - object Visit(GlobalReferenceExpression globalReferenceExpression, object data); object Visit(ObjectCreateExpression objectCreateExpression, object data); object Visit(ArrayCreateExpression arrayCreateExpression, object data); object Visit(FieldReferenceExpression fieldReferenceExpression, object data); diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/GlobalReferenceExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/GlobalReferenceExpressionTests.cs index 3a49ea3700..fd3496aedc 100644 --- a/src/Libraries/NRefactory/Test/Parser/Expressions/GlobalReferenceExpressionTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/Expressions/GlobalReferenceExpressionTests.cs @@ -16,22 +16,38 @@ namespace ICSharpCode.NRefactory.Tests.AST [TestFixture] public class GlobalReferenceExpressionTests { - #region C# [Test] public void CSharpGlobalReferenceExpressionTest() { - FieldReferenceExpression fre = (FieldReferenceExpression)ParseUtilCSharp.ParseExpression("global::System", typeof(FieldReferenceExpression)); - Assert.IsTrue(fre.TargetObject is GlobalReferenceExpression); + TypeReferenceExpression tre = (TypeReferenceExpression)ParseUtilCSharp.ParseExpression("global::System", typeof(TypeReferenceExpression)); + Assert.IsTrue(tre.TypeReference.IsGlobal); + Assert.AreEqual("System", tre.TypeReference.Type); } - #endregion - #region VB.NET [Test] public void VBNetGlobalReferenceExpressionTest() { - FieldReferenceExpression fre = (FieldReferenceExpression)ParseUtilVBNet.ParseExpression("Global.System", typeof(FieldReferenceExpression)); - Assert.IsTrue(fre.TargetObject is GlobalReferenceExpression); + TypeReferenceExpression tre = (TypeReferenceExpression)ParseUtilVBNet.ParseExpression("Global.System", typeof(TypeReferenceExpression)); + Assert.IsTrue(tre.TypeReference.IsGlobal); + Assert.AreEqual("System", tre.TypeReference.Type); + } + + [Test] + public void CSharpGlobalTypeDeclaration() + { + LocalVariableDeclaration lvd = (LocalVariableDeclaration)ParseUtilCSharp.ParseStatment("global::System.String a;", typeof(LocalVariableDeclaration)); + TypeReference typeRef = lvd.GetTypeForVariable(0); + Assert.IsTrue(typeRef.IsGlobal); + Assert.AreEqual("System.String", typeRef.Type); + } + + [Test] + public void VBNetGlobalTypeDeclaration() + { + LocalVariableDeclaration lvd = (LocalVariableDeclaration)ParseUtilVBNet.ParseStatment("Dim a As Global.System.String", typeof(LocalVariableDeclaration)); + TypeReference typeRef = lvd.GetTypeForVariable(0); + Assert.IsTrue(typeRef.IsGlobal); + Assert.AreEqual("System.String", typeRef.Type); } - #endregion } } diff --git a/src/Libraries/NRefactory/Test/Parser/GlobalScope/TypeDeclarationTests.cs b/src/Libraries/NRefactory/Test/Parser/GlobalScope/TypeDeclarationTests.cs index 94f9d2260e..26e7cd6086 100644 --- a/src/Libraries/NRefactory/Test/Parser/GlobalScope/TypeDeclarationTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/GlobalScope/TypeDeclarationTests.cs @@ -27,7 +27,7 @@ namespace ICSharpCode.NRefactory.Tests.AST Assert.AreEqual(Types.Class, td.Type); Assert.AreEqual("MyClass", td.Name); - Assert.AreEqual("My.Base.Class", td.BaseTypes[0]); + Assert.AreEqual("My.Base.Class", td.BaseTypes[0].Type); Assert.AreEqual(Modifier.None, td.Modifier); } @@ -97,7 +97,7 @@ public class Generic : System.IComparable where S : G where T : MyNa Assert.AreEqual("Generic", td.Name); Assert.AreEqual(Modifier.Public, td.Modifier); Assert.AreEqual(1, td.BaseTypes.Count); - Assert.AreEqual("System.IComparable", td.BaseTypes[0]); + Assert.AreEqual("System.IComparable", td.BaseTypes[0].Type); Assert.AreEqual(2, td.Templates.Count); Assert.AreEqual("T", td.Templates[0].Name); @@ -127,9 +127,9 @@ public abstract class MyClass : MyBase, Interface1, My.Test.Interface2 Assert.AreEqual(Modifier.Public | Modifier.Abstract, td.Modifier); Assert.AreEqual(1, td.Attributes.Count); Assert.AreEqual(3, td.BaseTypes.Count); - Assert.AreEqual("MyBase", td.BaseTypes[0]); - Assert.AreEqual("Interface1", td.BaseTypes[1]); - Assert.AreEqual("My.Test.Interface2", td.BaseTypes[2]); + Assert.AreEqual("MyBase", td.BaseTypes[0].Type); + Assert.AreEqual("Interface1", td.BaseTypes[1].Type); + Assert.AreEqual("My.Test.Interface2", td.BaseTypes[2].Type); } [Test] @@ -183,7 +183,7 @@ public abstract class MyClass : MyBase, Interface1, My.Test.Interface2 Assert.AreEqual("TestEnum", td.Name); Assert.AreEqual(Types.Enum, td.Type); - Assert.AreEqual("Byte", td.BaseTypes[0].ToString()); + Assert.AreEqual("Byte", td.BaseTypes[0].Type); } [Test] @@ -262,7 +262,7 @@ End Class Assert.AreEqual("Generic", td.Name); Assert.AreEqual(Modifier.Public, td.Modifier); Assert.AreEqual(1, td.BaseTypes.Count); - Assert.AreEqual("System.IComparable", td.BaseTypes[0]); + Assert.AreEqual("System.IComparable", td.BaseTypes[0].Type); Assert.AreEqual(2, td.Templates.Count); Assert.AreEqual("T", td.Templates[0].Name); diff --git a/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryASTConvertVisitor.cs b/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryASTConvertVisitor.cs index e54ca3d23f..cb198deb82 100644 --- a/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryASTConvertVisitor.cs +++ b/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryASTConvertVisitor.cs @@ -281,8 +281,8 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver cu.Classes.Add(c); } if (typeDeclaration.BaseTypes != null) { - foreach (string type in typeDeclaration.BaseTypes) { - c.BaseTypes.Add(type); + foreach (AST.TypeReference type in typeDeclaration.BaseTypes) { + c.BaseTypes.Add(type.SystemType); } } currentClass.Push(c); diff --git a/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs b/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs index 31f3bdaaa8..aa750ee9d1 100644 --- a/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs +++ b/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs @@ -285,10 +285,13 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver } else if (expr is TypeReferenceExpression) { type = TypeVisitor.CreateReturnType(((TypeReferenceExpression)expr).TypeReference, this); if (type != null) { + if (type is TypeVisitor.NamespaceReturnType) + return new NamespaceResolveResult(callingClass, callingMember, type.FullyQualifiedName); IClass c = type.GetUnderlyingClass(); if (c != null) return new TypeResolveResult(callingClass, callingMember, type, c); } + return null; } type = expr.AcceptVisitor(typeVisitor, null) as IReturnType; @@ -846,6 +849,7 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver result.Add(GetPrimitiveClass(pair.Value, primitive)); } } + result.Add("Global"); } else { foreach (KeyValuePair pair in TypeReference.GetPrimitiveTypesCSharp()) { result.Add(GetPrimitiveClass(pair.Value, pair.Key)); diff --git a/src/Main/Base/Project/Src/Dom/NRefactoryResolver/TypeVisitor.cs b/src/Main/Base/Project/Src/Dom/NRefactoryResolver/TypeVisitor.cs index 81952bc200..346adab31c 100644 --- a/src/Main/Base/Project/Src/Dom/NRefactoryResolver/TypeVisitor.cs +++ b/src/Main/Base/Project/Src/Dom/NRefactoryResolver/TypeVisitor.cs @@ -299,6 +299,7 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver public override object Visit(TypeReferenceExpression typeReferenceExpression, object data) { + System.Diagnostics.Debugger.Break(); return CreateReturnType(typeReferenceExpression.TypeReference); } @@ -416,11 +417,6 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver return baseClass.DefaultReturnType; } - public override object Visit(GlobalReferenceExpression globalReferenceExpression, object data) - { - return new NamespaceReturnType(""); - } - public override object Visit(ObjectCreateExpression objectCreateExpression, object data) { return CreateReturnType(objectCreateExpression.CreateType); @@ -479,18 +475,20 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver if (reference.IsNull) return null; LanguageProperties languageProperties = projectContent.Language; IReturnType t = null; - if (callingClass != null) { + if (callingClass != null && !reference.IsGlobal) { foreach (ITypeParameter tp in callingClass.TypeParameters) { if (languageProperties.NameComparer.Equals(tp.Name, reference.SystemType)) { t = new GenericReturnType(tp); break; } } - } - if (callingMember is IMethod && (callingMember as IMethod).TypeParameters != null) { - foreach (ITypeParameter tp in (callingMember as IMethod).TypeParameters) { - if (languageProperties.NameComparer.Equals(tp.Name, reference.SystemType)) - return new GenericReturnType(tp); + if (t == null && callingMember is IMethod && (callingMember as IMethod).TypeParameters != null) { + foreach (ITypeParameter tp in (callingMember as IMethod).TypeParameters) { + if (languageProperties.NameComparer.Equals(tp.Name, reference.SystemType)) { + t = new GenericReturnType(tp); + break; + } + } } } if (t == null) { @@ -499,11 +497,30 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver t = ProjectContentRegistry.Mscorlib.GetClass(reference.SystemType).DefaultReturnType; } else { if (useLazyReturnType) { - t = new SearchClassReturnType(projectContent, callingClass, caretLine, caretColumn, reference.SystemType); + if (reference.IsGlobal) + t = new GetClassReturnType(projectContent, reference.SystemType); + else + t = new SearchClassReturnType(projectContent, callingClass, caretLine, caretColumn, reference.SystemType); } else { - IClass c = projectContent.SearchType(reference.SystemType, callingClass, caretLine, caretColumn); - if (c == null) + IClass c; + if (reference.IsGlobal) + c = projectContent.GetClass(reference.SystemType); + else + c = projectContent.SearchType(reference.SystemType, callingClass, caretLine, caretColumn); + if (c == null) { + if (reference.GenericTypes.Count == 0 && !reference.IsArrayType) { + // reference to namespace is possible + if (reference.IsGlobal) { + if (projectContent.NamespaceExists(reference.Type)) + return new NamespaceReturnType(reference.Type); + } else { + string name = projectContent.SearchNamespace(reference.Type, callingClass, (callingClass == null) ? null : callingClass.CompilationUnit, caretLine, caretColumn); + if (name != null) + return new NamespaceReturnType(name); + } + } return null; + } t = c.DefaultReturnType; } }