From 288234d0c4d2d7eca39f39d0b8189c45c0f9e95a Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Fri, 18 Nov 2005 20:54:11 +0000 Subject: [PATCH] Fixed some bugs in NRefactory. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@765 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/ConvertVisitor.cs | 2 +- .../Misc/MbUnitPad/Project/Src/MbUnitPad.cs | 11 - .../Project/Src/Lexer/VBNet/KeywordList.txt | 3 + .../Project/Src/Lexer/VBNet/Tokens.cs | 1 + .../Src/Output/CSharp/CSharpOutputVisitor.cs | 15 +- .../Src/Output/VBNet/VBNetOutputFormatter.cs | 3 +- .../Src/Output/VBNet/VBNetOutputVisitor.cs | 111 +- .../Project/Src/Parser/AST/General/Enums.cs | 38 +- .../General/TypeLevel/PropertyDeclaration.cs | 5 + .../Project/Src/Parser/CSharp/Parser.cs | 2 +- .../Project/Src/Parser/CSharp/cs.ATG | 2 +- .../Project/Src/Parser/VBNet/Parser.cs | 1882 +++++++++-------- .../Project/Src/Parser/VBNet/VBNET.ATG | 55 +- .../Test/Output/CSharp/CSharpOutputTest.cs | 27 + .../Test/Output/VBNet/VBNetOutputTest.cs | 34 + .../Expressions/IdentifierExpressionTests.cs | 9 +- src/SharpDevelop.WithBooInterpreter.sln | 259 --- 17 files changed, 1162 insertions(+), 1297 deletions(-) delete mode 100644 src/SharpDevelop.WithBooInterpreter.sln diff --git a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitor.cs b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitor.cs index 9d59697431..8542f90201 100644 --- a/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitor.cs +++ b/src/AddIns/BackendBindings/Boo/NRefactoryToBooConverter/Project/ConvertVisitor.cs @@ -121,7 +121,7 @@ namespace NRefactoryToBooConverter } if ((m & Modifier.Override) != 0) r |= B.TypeMemberModifiers.Override; - if ((m & Modifier.Readonly) != 0 && !(node is PropertyDeclaration)) { + if ((m & Modifier.ReadOnly) != 0 && !(node is PropertyDeclaration)) { r |= B.TypeMemberModifiers.Final; } if ((m & Modifier.Const) != 0) { diff --git a/src/AddIns/Misc/MbUnitPad/Project/Src/MbUnitPad.cs b/src/AddIns/Misc/MbUnitPad/Project/Src/MbUnitPad.cs index 587737f591..c27b7ebb04 100644 --- a/src/AddIns/Misc/MbUnitPad/Project/Src/MbUnitPad.cs +++ b/src/AddIns/Misc/MbUnitPad/Project/Src/MbUnitPad.cs @@ -60,7 +60,6 @@ namespace ICSharpCode.MbUnitPad ProjectService.SolutionLoaded += OnSolutionLoaded; ProjectService.SolutionClosed += OnSolutionClosed; - ProjectService.EndBuild += OnEndBuild; } /// @@ -70,7 +69,6 @@ namespace ICSharpCode.MbUnitPad { ProjectService.SolutionLoaded -= OnSolutionLoaded; ProjectService.SolutionClosed -= OnSolutionClosed; - ProjectService.EndBuild -= OnEndBuild; ctl.Dispose(); } @@ -210,14 +208,5 @@ namespace ICSharpCode.MbUnitPad WorkbenchSingleton.Workbench.GetPad(typeof(ErrorList)).BringPadToFront(); } } - - void OnEndBuild(object sender, EventArgs e) - { - LoggingService.Info("OnEndBuild"); - if (treeView.IsPopulated) { - LoggingService.Debug("treeView.IsPopulated == true"); - WorkbenchSingleton.SafeThreadAsyncCall(this, "ReloadAssemblyList"); - } - } } } diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/KeywordList.txt b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/KeywordList.txt index 8df3372f06..475bc54ed6 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/KeywordList.txt +++ b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/KeywordList.txt @@ -233,3 +233,6 @@ ConcatStringAssign = "&=" #Sets Null("Nothing") BlockSucc("Case", "Catch", "Else", "ElseIf", "End", "Finally", "Loop", "Next") + +# List of unreserved keywords, must be the same as the "Identifier" production in VBNET.ATG +Unreserved("Text", "Binary", "Compare", "Assembly", "Ansi", "Auto", "Preserve", "Unicode", "Until") diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Tokens.cs b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Tokens.cs index 71ded5c13c..6814361c1f 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Tokens.cs +++ b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Tokens.cs @@ -228,6 +228,7 @@ namespace ICSharpCode.NRefactory.Parser.VB } public static BitArray Null = NewSet(Nothing); public static BitArray BlockSucc = NewSet(Case, Catch, Else, ElseIf, End, Finally, Loop, Next); + public static BitArray Unreserved = NewSet(Text, Binary, Compare, Assembly, Ansi, Auto, Preserve, Unicode, Until); static string[] tokenList = new string[] { // ----- terminal classes ----- diff --git a/src/Libraries/NRefactory/Project/Src/Output/CSharp/CSharpOutputVisitor.cs b/src/Libraries/NRefactory/Project/Src/Output/CSharp/CSharpOutputVisitor.cs index 38227e8234..622b4d2022 100644 --- a/src/Libraries/NRefactory/Project/Src/Output/CSharp/CSharpOutputVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Output/CSharp/CSharpOutputVisitor.cs @@ -352,9 +352,6 @@ namespace ICSharpCode.NRefactory.PrettyPrinter outputFormatter.Indent(); OutputModifier(typeDeclaration.Modifier); switch (typeDeclaration.Type) { - case ClassType.Class: - outputFormatter.PrintToken(Tokens.Class); - break; case ClassType.Enum: outputFormatter.PrintToken(Tokens.Enum); break; @@ -364,6 +361,9 @@ namespace ICSharpCode.NRefactory.PrettyPrinter case ClassType.Struct: outputFormatter.PrintToken(Tokens.Struct); break; + default: + outputFormatter.PrintToken(Tokens.Class); + break; } outputFormatter.Space(); outputFormatter.PrintIdentifier(typeDeclaration.Name); @@ -387,9 +387,6 @@ namespace ICSharpCode.NRefactory.PrettyPrinter } switch (typeDeclaration.Type) { - case ClassType.Class: - outputFormatter.BeginBrace(this.prettyPrintOptions.ClassBraceStyle); - break; case ClassType.Enum: outputFormatter.BeginBrace(this.prettyPrintOptions.EnumBraceStyle); break; @@ -399,6 +396,9 @@ namespace ICSharpCode.NRefactory.PrettyPrinter case ClassType.Struct: outputFormatter.BeginBrace(this.prettyPrintOptions.StructBraceStyle); break; + default: + outputFormatter.BeginBrace(this.prettyPrintOptions.ClassBraceStyle); + break; } TypeDeclaration oldType = currentType; @@ -511,6 +511,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter { VisitAttributes(propertyDeclaration.Attributes, data); outputFormatter.Indent(); + propertyDeclaration.Modifier &= ~Modifier.ReadOnly; OutputModifier(propertyDeclaration.Modifier); nodeTracker.TrackedVisit(propertyDeclaration.TypeReference, data); outputFormatter.Space(); @@ -2383,7 +2384,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter if ((modifier & Modifier.Const) != 0) { tokenList.Add(Tokens.Const); } - if ((modifier & Modifier.Readonly) != 0) { + if ((modifier & Modifier.ReadOnly) != 0) { tokenList.Add(Tokens.Readonly); } if ((modifier & Modifier.Volatile) != 0) { diff --git a/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputFormatter.cs b/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputFormatter.cs index 556235da16..18bfa2d522 100644 --- a/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputFormatter.cs +++ b/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputFormatter.cs @@ -32,7 +32,8 @@ namespace ICSharpCode.NRefactory.PrettyPrinter public override void PrintIdentifier(string identifier) { - if (Keywords.GetToken(identifier) < 0) { + int token = Keywords.GetToken(identifier); + if (token < 0 || Tokens.Unreserved[token]) { PrintText(identifier); } else { PrintText("["); diff --git a/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputVisitor.cs b/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputVisitor.cs index 500e8ca6dd..4995f8a18e 100644 --- a/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Output/VBNet/VBNetOutputVisitor.cs @@ -511,12 +511,14 @@ namespace ICSharpCode.NRefactory.PrettyPrinter outputFormatter.Indent(); OutputModifier(propertyDeclaration.Modifier); - if (propertyDeclaration.IsReadOnly) { - outputFormatter.PrintToken(Tokens.ReadOnly); - outputFormatter.Space(); - } else if (propertyDeclaration.IsWriteOnly) { - outputFormatter.PrintToken(Tokens.WriteOnly); - outputFormatter.Space(); + if ((propertyDeclaration.Modifier & (Modifier.ReadOnly | Modifier.WriteOnly)) == Modifier.None) { + if (propertyDeclaration.IsReadOnly) { + outputFormatter.PrintToken(Tokens.ReadOnly); + outputFormatter.Space(); + } else if (propertyDeclaration.IsWriteOnly) { + outputFormatter.PrintToken(Tokens.WriteOnly); + outputFormatter.Space(); + } } outputFormatter.PrintToken(Tokens.Property); @@ -532,19 +534,23 @@ namespace ICSharpCode.NRefactory.PrettyPrinter nodeTracker.TrackedVisit(propertyDeclaration.TypeReference, data); outputFormatter.NewLine(); - ++outputFormatter.IndentationLevel; - exitTokenStack.Push(Tokens.Property); - nodeTracker.TrackedVisit(propertyDeclaration.GetRegion, data); - nodeTracker.TrackedVisit(propertyDeclaration.SetRegion, data); - exitTokenStack.Pop(); - --outputFormatter.IndentationLevel; - outputFormatter.Indent(); - outputFormatter.PrintToken(Tokens.End); - outputFormatter.Space(); - outputFormatter.PrintToken(Tokens.Property); - outputFormatter.Space(); - outputFormatter.NewLine(); + if (!IsAbstract(propertyDeclaration)) { + ++outputFormatter.IndentationLevel; + exitTokenStack.Push(Tokens.Property); + nodeTracker.TrackedVisit(propertyDeclaration.GetRegion, data); + nodeTracker.TrackedVisit(propertyDeclaration.SetRegion, data); + exitTokenStack.Pop(); + --outputFormatter.IndentationLevel; + + outputFormatter.Indent(); + outputFormatter.PrintToken(Tokens.End); + outputFormatter.Space(); + outputFormatter.PrintToken(Tokens.Property); + outputFormatter.Space(); + outputFormatter.NewLine(); + } + return null; } @@ -768,25 +774,33 @@ namespace ICSharpCode.NRefactory.PrettyPrinter } outputFormatter.NewLine(); - ++outputFormatter.IndentationLevel; - exitTokenStack.Push(isSub ? Tokens.Sub : Tokens.Function); - nodeTracker.TrackedVisit(methodDeclaration.Body, data); - exitTokenStack.Pop(); - --outputFormatter.IndentationLevel; - - outputFormatter.Indent(); - outputFormatter.PrintToken(Tokens.End); - outputFormatter.Space(); - if (isSub) { - outputFormatter.PrintToken(Tokens.Sub); - } else { - outputFormatter.PrintToken(Tokens.Function); + if (!IsAbstract(methodDeclaration)) { + ++outputFormatter.IndentationLevel; + exitTokenStack.Push(isSub ? Tokens.Sub : Tokens.Function); + nodeTracker.TrackedVisit(methodDeclaration.Body, data); + exitTokenStack.Pop(); + --outputFormatter.IndentationLevel; + + outputFormatter.Indent(); + outputFormatter.PrintToken(Tokens.End); + outputFormatter.Space(); + if (isSub) { + outputFormatter.PrintToken(Tokens.Sub); + } else { + outputFormatter.PrintToken(Tokens.Function); + } + outputFormatter.NewLine(); } - outputFormatter.NewLine(); - return null; } + bool IsAbstract(AttributedNode node) + { + if ((node.Modifier & Modifier.Abstract) == Modifier.Abstract) + return true; + return currentType != null && currentType.Type == ClassType.Interface; + } + public object Visit(ConstructorDeclaration constructorDeclaration, object data) { VisitAttributes(constructorDeclaration.Attributes, data); @@ -802,6 +816,9 @@ namespace ICSharpCode.NRefactory.PrettyPrinter ++outputFormatter.IndentationLevel; exitTokenStack.Push(Tokens.Sub); + + nodeTracker.TrackedVisit(constructorDeclaration.ConstructorInitializer, data); + nodeTracker.TrackedVisit(constructorDeclaration.Body, data); exitTokenStack.Pop(); --outputFormatter.IndentationLevel; @@ -818,7 +835,19 @@ namespace ICSharpCode.NRefactory.PrettyPrinter public object Visit(ConstructorInitializer constructorInitializer, object data) { - errors.Error(-1, -1, String.Format("ConstructorInitializer not supported.")); + outputFormatter.Indent(); + if (constructorInitializer.ConstructorInitializerType == ConstructorInitializerType.This) { + outputFormatter.PrintToken(Tokens.Me); + } else { + outputFormatter.PrintToken(Tokens.MyBase); + } + outputFormatter.PrintToken(Tokens.Dot); + outputFormatter.PrintToken(Tokens.New); + outputFormatter.PrintToken(Tokens.OpenParenthesis); + AppendCommaSeparatedList(constructorInitializer.Arguments); + outputFormatter.PrintToken(Tokens.CloseParenthesis); + + outputFormatter.NewLine(); return null; } @@ -1716,7 +1745,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter string ConvertCharLiteral(char ch) { if (Char.IsControl(ch)) { - return "Microsoft.VisualBasic.Chr(" + ((int)ch) + ")"; + return "Chr(" + ((int)ch) + ")"; } else { if (ch == '"') { return "\"\"\"\"C"; @@ -1730,7 +1759,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter StringBuilder sb = new StringBuilder(); foreach (char ch in str) { if (char.IsControl(ch)) { - sb.Append("\" & Microsoft.VisualBasic.Chr(" + ((int)ch) + ") & \""); + sb.Append("\" & Chr(" + ((int)ch) + ") & \""); } else if (ch == '"') { sb.Append("\"\""); } else { @@ -2272,7 +2301,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter public object Visit(DirectionExpression directionExpression, object data) { - // TODO: is this correct for VB ? (ref/out parameters in method invocation) + // VB does not need to specify the direction in method calls nodeTracker.TrackedVisit(directionExpression.Expression, data); return null; } @@ -2281,7 +2310,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter public object Visit(ConditionalExpression conditionalExpression, object data) { // No representation in VB.NET, but VB conversion is possible. - outputFormatter.PrintText("Microsoft.VisualBasic.IIf"); + outputFormatter.PrintText("IIf"); outputFormatter.PrintToken(Tokens.OpenParenthesis); nodeTracker.TrackedVisit(conditionalExpression.Condition, data); outputFormatter.PrintToken(Tokens.Comma); @@ -2372,10 +2401,14 @@ namespace ICSharpCode.NRefactory.PrettyPrinter outputFormatter.Space(); } - if ((modifier & Modifier.Readonly) == Modifier.Readonly) { + if ((modifier & Modifier.ReadOnly) == Modifier.ReadOnly) { outputFormatter.PrintToken(Tokens.ReadOnly); outputFormatter.Space(); } + if ((modifier & Modifier.WriteOnly) == Modifier.WriteOnly) { + outputFormatter.PrintToken(Tokens.WriteOnly); + outputFormatter.Space(); + } if ((modifier & Modifier.Const) == Modifier.Const) { outputFormatter.PrintToken(Tokens.Const); outputFormatter.Space(); diff --git a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/Enums.cs b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/Enums.cs index 7140e545fe..a118388261 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/Enums.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/Enums.cs @@ -16,7 +16,8 @@ namespace ICSharpCode.NRefactory.Parser.AST // Access Private = 0x0001, - Internal = 0x0002, // == Friend + /// C# 'internal', VB 'Friend' + Internal = 0x0002, Protected = 0x0004, Public = 0x0008, Dim = 0x0010, // VB.NET SPECIFIC @@ -25,11 +26,14 @@ namespace ICSharpCode.NRefactory.Parser.AST Abstract = 0x0010, // == MustOverride/MustInherit Virtual = 0x0020, Sealed = 0x0040, + /// C# 'static', VB 'Shared' Static = 0x0080, Override = 0x0100, - Readonly = 0x0200, + /// For fields: readonly (c# and vb), for properties: get-only (vb) + ReadOnly = 0x0200, Const = 0x0400, - New = 0x0800, // == Shadows + /// C# 'new', VB 'Shadows' + New = 0x0800, Partial = 0x1000, // Special @@ -40,9 +44,10 @@ namespace ICSharpCode.NRefactory.Parser.AST WithEvents = 0x20000, // VB specific Default = 0x40000, // VB specific Narrowing = 0x80000, // VB specific - Widening = 0x100000, // VB specific - Synthetic = 0x200000, - + Widening = 0x100000, // VB specific + Synthetic = 0x200000, + /// Only for VB properties. + WriteOnly = 0x400000, // VB specific Classes = New | Public | Protected | Internal | Private | Abstract | Sealed | Partial | Static, VBModules = Private | Public | Protected | Internal, @@ -53,7 +58,7 @@ namespace ICSharpCode.NRefactory.Parser.AST VBMethods = Private | Public | Protected | Internal | New | Static | Virtual | Sealed | Abstract | Override | Overloads, VBExternalMethods = Private | Public | Protected | Internal | New | Overloads, VBEvents = Private | Public | Protected | Internal | New | Overloads, - VBProperties = VBMethods | Default, + VBProperties = VBMethods | Default | ReadOnly | WriteOnly, VBCustomEvents = Private | Public | Protected | Internal | New | Overloads, VBOperators = Public | Static | Overloads | New | Widening | Narrowing, @@ -61,10 +66,10 @@ namespace ICSharpCode.NRefactory.Parser.AST // this is not documented in the spec VBInterfaceEvents = New, VBInterfaceMethods = New | Overloads, - VBInterfaceProperties = New | Overloads | /* ReadOnly | WriteOnly | */ Default, + VBInterfaceProperties = New | Overloads | ReadOnly | WriteOnly | Default, VBInterfaceEnums = New, - Fields = New | Public | Protected | Internal | Private | Static | Readonly | Volatile, + Fields = New | Public | Protected | Internal | Private | Static | ReadOnly | Volatile, PropertysEventsMethods = New | Public | Protected | Internal | Private | Static | Virtual | Sealed | Override | Abstract | Extern, Indexers = New | Public | Protected | Internal | Private | Virtual | Sealed | Override | Abstract | Extern, Operators = Public | Static | Extern, @@ -100,21 +105,6 @@ namespace ICSharpCode.NRefactory.Parser.AST Ref } - public enum Members // TODO: Rename to MemberType - { - Constant, - Field, - Method, - Property, - Event, - Indexer, - Operator, - Constructor, - StaticConstructor, - Destructor, - NestedType - } - [Flags] public enum ParamModifier // TODO: Rename to ParamModifiers { diff --git a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/TypeLevel/PropertyDeclaration.cs b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/TypeLevel/PropertyDeclaration.cs index 748b748149..d7aaa24c91 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/TypeLevel/PropertyDeclaration.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/TypeLevel/PropertyDeclaration.cs @@ -113,6 +113,11 @@ namespace ICSharpCode.NRefactory.Parser.AST { Debug.Assert(typeReference != null); this.typeReference = typeReference; + if ((modifier & Modifier.ReadOnly) == Modifier.ReadOnly) { + this.GetRegion = new PropertyGetRegion(null, null); + } else if ((modifier & Modifier.WriteOnly) == Modifier.WriteOnly) { + this.SetRegion = new PropertySetRegion(null, null); + } } public override object AcceptVisitor(IASTVisitor visitor, object data) diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs index d013881eb1..766f1ca800 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs @@ -1865,7 +1865,7 @@ Modifiers m) { lexer.NextToken(); #line 1166 "cs.ATG" - m.Add(Modifier.Readonly, t.Location); + m.Add(Modifier.ReadOnly, t.Location); break; } case 102: { diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG index d16a01e77b..a70405c46e 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG @@ -1163,7 +1163,7 @@ MemberModifier | "private" (. m.Add(Modifier.Private, t.Location); .) | "protected" (. m.Add(Modifier.Protected, t.Location); .) | "public" (. m.Add(Modifier.Public, t.Location); .) - | "readonly" (. m.Add(Modifier.Readonly, t.Location); .) + | "readonly" (. m.Add(Modifier.ReadOnly, t.Location); .) | "sealed" (. m.Add(Modifier.Sealed, t.Location); .) | "static" (. m.Add(Modifier.Static, t.Location); .) | "unsafe" (. m.Add(Modifier.Unsafe, t.Location); .) diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index 3a5f1d7b3b..687ddb6e23 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -399,7 +399,7 @@ out u); void GlobalAttributeSection() { -#line 2143 "VBNET.ATG" +#line 2136 "VBNET.ATG" Point startPos = t.Location; Expect(27); if (la.kind == 49) { @@ -408,20 +408,20 @@ out u); lexer.NextToken(); } else SynErr(208); -#line 2145 "VBNET.ATG" +#line 2138 "VBNET.ATG" string attributeTarget = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); List attributes = new List(); ASTAttribute attribute; Expect(13); Attribute( -#line 2149 "VBNET.ATG" +#line 2142 "VBNET.ATG" out attribute); -#line 2149 "VBNET.ATG" +#line 2142 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2150 "VBNET.ATG" +#line 2143 "VBNET.ATG" NotFinalComma()) { if (la.kind == 12) { lexer.NextToken(); @@ -433,10 +433,10 @@ NotFinalComma()) { Expect(13); } Attribute( -#line 2150 "VBNET.ATG" +#line 2143 "VBNET.ATG" out attribute); -#line 2150 "VBNET.ATG" +#line 2143 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -445,7 +445,7 @@ out attribute); Expect(26); EndOfStmt(); -#line 2155 "VBNET.ATG" +#line 2148 "VBNET.ATG" AttributeSection section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -562,47 +562,47 @@ out aliasedType); } void Qualident( -#line 2868 "VBNET.ATG" +#line 2861 "VBNET.ATG" out string qualident) { -#line 2870 "VBNET.ATG" +#line 2863 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 2874 "VBNET.ATG" +#line 2867 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 2875 "VBNET.ATG" +#line 2868 "VBNET.ATG" DotAndIdentOrKw()) { Expect(10); IdentifierOrKeyword( -#line 2875 "VBNET.ATG" +#line 2868 "VBNET.ATG" out name); -#line 2875 "VBNET.ATG" +#line 2868 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 2877 "VBNET.ATG" +#line 2870 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 2036 "VBNET.ATG" +#line 2029 "VBNET.ATG" out TypeReference typeref) { -#line 2037 "VBNET.ATG" +#line 2030 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2039 "VBNET.ATG" +#line 2032 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 2040 "VBNET.ATG" +#line 2033 "VBNET.ATG" out rank); -#line 2041 "VBNET.ATG" +#line 2034 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -619,35 +619,35 @@ out rank); } void AttributeSection( -#line 2212 "VBNET.ATG" +#line 2205 "VBNET.ATG" out AttributeSection section) { -#line 2214 "VBNET.ATG" +#line 2207 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(27); -#line 2218 "VBNET.ATG" +#line 2211 "VBNET.ATG" Point startPos = t.Location; if ( -#line 2219 "VBNET.ATG" +#line 2212 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 93) { lexer.NextToken(); -#line 2220 "VBNET.ATG" +#line 2213 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 154) { lexer.NextToken(); -#line 2221 "VBNET.ATG" +#line 2214 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2224 "VBNET.ATG" +#line 2217 "VBNET.ATG" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -660,20 +660,20 @@ IsLocalAttrTarget()) { Expect(13); } Attribute( -#line 2234 "VBNET.ATG" +#line 2227 "VBNET.ATG" out attribute); -#line 2234 "VBNET.ATG" +#line 2227 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2235 "VBNET.ATG" +#line 2228 "VBNET.ATG" NotFinalComma()) { Expect(12); Attribute( -#line 2235 "VBNET.ATG" +#line 2228 "VBNET.ATG" out attribute); -#line 2235 "VBNET.ATG" +#line 2228 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -681,7 +681,7 @@ out attribute); } Expect(26); -#line 2239 "VBNET.ATG" +#line 2232 "VBNET.ATG" section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -689,69 +689,69 @@ out attribute); } void TypeModifier( -#line 2923 "VBNET.ATG" +#line 2922 "VBNET.ATG" Modifiers m) { switch (la.kind) { case 148: { lexer.NextToken(); -#line 2924 "VBNET.ATG" +#line 2923 "VBNET.ATG" m.Add(Modifier.Public, t.Location); break; } case 147: { lexer.NextToken(); -#line 2925 "VBNET.ATG" +#line 2924 "VBNET.ATG" m.Add(Modifier.Protected, t.Location); break; } case 99: { lexer.NextToken(); -#line 2926 "VBNET.ATG" +#line 2925 "VBNET.ATG" m.Add(Modifier.Internal, t.Location); break; } case 145: { lexer.NextToken(); -#line 2927 "VBNET.ATG" +#line 2926 "VBNET.ATG" m.Add(Modifier.Private, t.Location); break; } case 158: { lexer.NextToken(); -#line 2928 "VBNET.ATG" +#line 2927 "VBNET.ATG" m.Add(Modifier.Static, t.Location); break; } case 157: { lexer.NextToken(); -#line 2929 "VBNET.ATG" +#line 2928 "VBNET.ATG" m.Add(Modifier.New, t.Location); break; } case 122: { lexer.NextToken(); -#line 2930 "VBNET.ATG" +#line 2929 "VBNET.ATG" m.Add(Modifier.Abstract, t.Location); break; } case 131: { lexer.NextToken(); -#line 2931 "VBNET.ATG" +#line 2930 "VBNET.ATG" m.Add(Modifier.Sealed, t.Location); break; } case 203: { lexer.NextToken(); -#line 2932 "VBNET.ATG" +#line 2931 "VBNET.ATG" m.Add(Modifier.Partial, t.Location); break; } @@ -1075,15 +1075,49 @@ template); } void Identifier() { - if (la.kind == 2) { + switch (la.kind) { + case 2: { lexer.NextToken(); - } else if (la.kind == 169) { + break; + } + case 169: { + lexer.NextToken(); + break; + } + case 51: { lexer.NextToken(); - } else if (la.kind == 51) { + break; + } + case 70: { lexer.NextToken(); - } else if (la.kind == 70) { + break; + } + case 49: { + lexer.NextToken(); + break; + } + case 47: { + lexer.NextToken(); + break; + } + case 50: { + lexer.NextToken(); + break; + } + case 144: { + lexer.NextToken(); + break; + } + case 176: { + lexer.NextToken(); + break; + } + case 177: { lexer.NextToken(); - } else SynErr(216); + break; + } + default: SynErr(216); break; + } } void TypeParameterConstraints( @@ -1123,42 +1157,42 @@ out constraint); } void ClassBaseType( -#line 935 "VBNET.ATG" +#line 932 "VBNET.ATG" out TypeReference typeRef) { -#line 937 "VBNET.ATG" +#line 934 "VBNET.ATG" typeRef = null; Expect(110); TypeName( -#line 940 "VBNET.ATG" +#line 937 "VBNET.ATG" out typeRef); EndOfStmt(); } void TypeImplementsClause( -#line 1651 "VBNET.ATG" +#line 1648 "VBNET.ATG" out List baseInterfaces) { -#line 1653 "VBNET.ATG" +#line 1650 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; Expect(107); TypeName( -#line 1656 "VBNET.ATG" +#line 1653 "VBNET.ATG" out type); -#line 1658 "VBNET.ATG" +#line 1655 "VBNET.ATG" baseInterfaces.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1661 "VBNET.ATG" +#line 1658 "VBNET.ATG" out type); -#line 1662 "VBNET.ATG" +#line 1659 "VBNET.ATG" baseInterfaces.Add(type); } EndOfStmt(); @@ -1276,114 +1310,114 @@ m, attributes); } void PrimitiveTypeName( -#line 2897 "VBNET.ATG" +#line 2896 "VBNET.ATG" out string type) { -#line 2898 "VBNET.ATG" +#line 2897 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 52: { lexer.NextToken(); -#line 2899 "VBNET.ATG" +#line 2898 "VBNET.ATG" type = "Boolean"; break; } case 76: { lexer.NextToken(); -#line 2900 "VBNET.ATG" +#line 2899 "VBNET.ATG" type = "Date"; break; } case 65: { lexer.NextToken(); -#line 2901 "VBNET.ATG" +#line 2900 "VBNET.ATG" type = "Char"; break; } case 165: { lexer.NextToken(); -#line 2902 "VBNET.ATG" +#line 2901 "VBNET.ATG" type = "String"; break; } case 77: { lexer.NextToken(); -#line 2903 "VBNET.ATG" +#line 2902 "VBNET.ATG" type = "Decimal"; break; } case 54: { lexer.NextToken(); -#line 2904 "VBNET.ATG" +#line 2903 "VBNET.ATG" type = "Byte"; break; } case 159: { lexer.NextToken(); -#line 2905 "VBNET.ATG" +#line 2904 "VBNET.ATG" type = "Short"; break; } case 111: { lexer.NextToken(); -#line 2906 "VBNET.ATG" +#line 2905 "VBNET.ATG" type = "Integer"; break; } case 117: { lexer.NextToken(); -#line 2907 "VBNET.ATG" +#line 2906 "VBNET.ATG" type = "Long"; break; } case 160: { lexer.NextToken(); -#line 2908 "VBNET.ATG" +#line 2907 "VBNET.ATG" type = "Single"; break; } case 84: { lexer.NextToken(); -#line 2909 "VBNET.ATG" +#line 2908 "VBNET.ATG" type = "Double"; break; } case 191: { lexer.NextToken(); -#line 2910 "VBNET.ATG" +#line 2909 "VBNET.ATG" type = "UInteger"; break; } case 192: { lexer.NextToken(); -#line 2911 "VBNET.ATG" +#line 2910 "VBNET.ATG" type = "ULong"; break; } case 193: { lexer.NextToken(); -#line 2912 "VBNET.ATG" +#line 2911 "VBNET.ATG" type = "UShort"; break; } case 190: { lexer.NextToken(); -#line 2913 "VBNET.ATG" +#line 2912 "VBNET.ATG" type = "SByte"; break; } @@ -1414,27 +1448,27 @@ out f); } void InterfaceBase( -#line 1636 "VBNET.ATG" +#line 1633 "VBNET.ATG" out List bases) { -#line 1638 "VBNET.ATG" +#line 1635 "VBNET.ATG" TypeReference type; bases = new List(); Expect(110); TypeName( -#line 1642 "VBNET.ATG" +#line 1639 "VBNET.ATG" out type); -#line 1642 "VBNET.ATG" +#line 1639 "VBNET.ATG" bases.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1645 "VBNET.ATG" +#line 1642 "VBNET.ATG" out type); -#line 1645 "VBNET.ATG" +#line 1642 "VBNET.ATG" bases.Add(type); } Expect(1); @@ -1455,27 +1489,27 @@ TypeDeclaration newType) { } void FormalParameterList( -#line 2246 "VBNET.ATG" +#line 2239 "VBNET.ATG" List parameter) { -#line 2248 "VBNET.ATG" +#line 2241 "VBNET.ATG" ParameterDeclarationExpression p; AttributeSection section; List attributes = new List(); while (la.kind == 27) { AttributeSection( -#line 2252 "VBNET.ATG" +#line 2245 "VBNET.ATG" out section); -#line 2252 "VBNET.ATG" +#line 2245 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 2254 "VBNET.ATG" +#line 2247 "VBNET.ATG" out p); -#line 2256 "VBNET.ATG" +#line 2249 "VBNET.ATG" bool paramsFound = false; p.Attributes = attributes; parameter.Add(p); @@ -1483,166 +1517,166 @@ out p); while (la.kind == 12) { lexer.NextToken(); -#line 2261 "VBNET.ATG" +#line 2254 "VBNET.ATG" if (paramsFound) Error("params array must be at end of parameter list"); while (la.kind == 27) { AttributeSection( -#line 2262 "VBNET.ATG" +#line 2255 "VBNET.ATG" out section); -#line 2262 "VBNET.ATG" +#line 2255 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 2264 "VBNET.ATG" +#line 2257 "VBNET.ATG" out p); -#line 2264 "VBNET.ATG" +#line 2257 "VBNET.ATG" p.Attributes = attributes; parameter.Add(p); } } void MemberModifier( -#line 2935 "VBNET.ATG" +#line 2934 "VBNET.ATG" Modifiers m) { switch (la.kind) { case 122: { lexer.NextToken(); -#line 2936 "VBNET.ATG" +#line 2935 "VBNET.ATG" m.Add(Modifier.Abstract, t.Location); break; } case 79: { lexer.NextToken(); -#line 2937 "VBNET.ATG" +#line 2936 "VBNET.ATG" m.Add(Modifier.Default, t.Location); break; } case 99: { lexer.NextToken(); -#line 2938 "VBNET.ATG" +#line 2937 "VBNET.ATG" m.Add(Modifier.Internal, t.Location); break; } case 157: { lexer.NextToken(); -#line 2939 "VBNET.ATG" +#line 2938 "VBNET.ATG" m.Add(Modifier.New, t.Location); break; } case 142: { lexer.NextToken(); -#line 2940 "VBNET.ATG" +#line 2939 "VBNET.ATG" m.Add(Modifier.Override, t.Location); break; } case 123: { lexer.NextToken(); -#line 2941 "VBNET.ATG" +#line 2940 "VBNET.ATG" m.Add(Modifier.Abstract, t.Location); break; } case 145: { lexer.NextToken(); -#line 2942 "VBNET.ATG" +#line 2941 "VBNET.ATG" m.Add(Modifier.Private, t.Location); break; } case 147: { lexer.NextToken(); -#line 2943 "VBNET.ATG" +#line 2942 "VBNET.ATG" m.Add(Modifier.Protected, t.Location); break; } case 148: { lexer.NextToken(); -#line 2944 "VBNET.ATG" +#line 2943 "VBNET.ATG" m.Add(Modifier.Public, t.Location); break; } case 131: { lexer.NextToken(); -#line 2945 "VBNET.ATG" +#line 2944 "VBNET.ATG" m.Add(Modifier.Sealed, t.Location); break; } case 132: { lexer.NextToken(); -#line 2946 "VBNET.ATG" +#line 2945 "VBNET.ATG" m.Add(Modifier.Sealed, t.Location); break; } case 158: { lexer.NextToken(); -#line 2947 "VBNET.ATG" +#line 2946 "VBNET.ATG" m.Add(Modifier.Static, t.Location); break; } case 141: { lexer.NextToken(); -#line 2948 "VBNET.ATG" +#line 2947 "VBNET.ATG" m.Add(Modifier.Virtual, t.Location); break; } case 140: { lexer.NextToken(); -#line 2949 "VBNET.ATG" +#line 2948 "VBNET.ATG" m.Add(Modifier.Overloads, t.Location); break; } case 150: { lexer.NextToken(); -#line 2950 "VBNET.ATG" - +#line 2949 "VBNET.ATG" + m.Add(Modifier.ReadOnly, t.Location); break; } case 184: { lexer.NextToken(); -#line 2951 "VBNET.ATG" - +#line 2950 "VBNET.ATG" + m.Add(Modifier.WriteOnly, t.Location); break; } case 183: { lexer.NextToken(); -#line 2952 "VBNET.ATG" +#line 2951 "VBNET.ATG" m.Add(Modifier.WithEvents, t.Location); break; } case 81: { lexer.NextToken(); -#line 2953 "VBNET.ATG" +#line 2952 "VBNET.ATG" m.Add(Modifier.Dim, t.Location); break; } case 202: { lexer.NextToken(); -#line 2954 "VBNET.ATG" +#line 2953 "VBNET.ATG" m.Add(Modifier.Widening, t.Location); break; } case 201: { lexer.NextToken(); -#line 2955 "VBNET.ATG" +#line 2954 "VBNET.ATG" m.Add(Modifier.Narrowing, t.Location); break; } @@ -1651,18 +1685,18 @@ Modifiers m) { } void ClassMemberDecl( -#line 931 "VBNET.ATG" +#line 928 "VBNET.ATG" Modifiers m, List attributes) { StructureMemberDecl( -#line 932 "VBNET.ATG" +#line 929 "VBNET.ATG" m, attributes); } void StructureMemberDecl( -#line 945 "VBNET.ATG" +#line 942 "VBNET.ATG" Modifiers m, List attributes) { -#line 947 "VBNET.ATG" +#line 944 "VBNET.ATG" TypeReference type = null; List p = new List(); Statement stmt = null; @@ -1672,37 +1706,37 @@ Modifiers m, List attributes) { switch (la.kind) { case 67: case 80: case 90: case 112: case 121: case 166: { NonModuleDeclaration( -#line 953 "VBNET.ATG" +#line 950 "VBNET.ATG" m, attributes); break; } case 167: { lexer.NextToken(); -#line 957 "VBNET.ATG" +#line 954 "VBNET.ATG" Point startPos = t.Location; if (StartOf(10)) { -#line 961 "VBNET.ATG" +#line 958 "VBNET.ATG" string name = String.Empty; MethodDeclaration methodDeclaration; ArrayList handlesClause = null; List implementsClause = null; Identifier(); -#line 967 "VBNET.ATG" +#line 964 "VBNET.ATG" name = t.val; m.Check(Modifier.VBMethods); TypeParameterList( -#line 970 "VBNET.ATG" +#line 967 "VBNET.ATG" templates); if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 971 "VBNET.ATG" +#line 968 "VBNET.ATG" p); } Expect(25); @@ -1710,23 +1744,23 @@ p); if (la.kind == 105 || la.kind == 107) { if (la.kind == 107) { ImplementsClause( -#line 974 "VBNET.ATG" +#line 971 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 976 "VBNET.ATG" +#line 973 "VBNET.ATG" out handlesClause); } } -#line 979 "VBNET.ATG" +#line 976 "VBNET.ATG" Point endLocation = t.EndLocation; Expect(1); if ( -#line 983 "VBNET.ATG" +#line 980 "VBNET.ATG" IsMustOverride(m)) { -#line 985 "VBNET.ATG" +#line 982 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, null, p, attributes); methodDeclaration.StartLocation = m.GetDeclarationLocation(startPos); methodDeclaration.EndLocation = endLocation; @@ -1740,7 +1774,7 @@ IsMustOverride(m)) { } else if (StartOf(11)) { -#line 998 "VBNET.ATG" +#line 995 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, null, p, attributes); methodDeclaration.StartLocation = m.GetDeclarationLocation(startPos); methodDeclaration.EndLocation = endLocation; @@ -1754,17 +1788,17 @@ IsMustOverride(m)) { compilationUnit.BlockStart(methodDeclaration); Block( -#line 1010 "VBNET.ATG" +#line 1007 "VBNET.ATG" out stmt); -#line 1012 "VBNET.ATG" +#line 1009 "VBNET.ATG" compilationUnit.BlockEnd(); methodDeclaration.Body = (BlockStatement)stmt; Expect(88); Expect(167); -#line 1015 "VBNET.ATG" +#line 1012 "VBNET.ATG" methodDeclaration.Body.EndLocation = t.EndLocation; Expect(1); } else SynErr(220); @@ -1774,29 +1808,29 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1018 "VBNET.ATG" +#line 1015 "VBNET.ATG" p); } Expect(25); } -#line 1019 "VBNET.ATG" +#line 1016 "VBNET.ATG" m.Check(Modifier.Constructors); -#line 1020 "VBNET.ATG" +#line 1017 "VBNET.ATG" Point constructorEndLocation = t.EndLocation; Expect(1); Block( -#line 1022 "VBNET.ATG" +#line 1019 "VBNET.ATG" out stmt); Expect(88); Expect(167); -#line 1023 "VBNET.ATG" +#line 1020 "VBNET.ATG" Point endLocation = t.EndLocation; Expect(1); -#line 1025 "VBNET.ATG" +#line 1022 "VBNET.ATG" ConstructorDeclaration cd = new ConstructorDeclaration("New", m.Modifier, p, attributes); cd.StartLocation = m.GetDeclarationLocation(startPos); cd.EndLocation = constructorEndLocation; @@ -1810,7 +1844,7 @@ out stmt); case 100: { lexer.NextToken(); -#line 1037 "VBNET.ATG" +#line 1034 "VBNET.ATG" m.Check(Modifier.VBMethods); string name = String.Empty; Point startPos = t.Location; @@ -1820,16 +1854,16 @@ out stmt); Identifier(); -#line 1044 "VBNET.ATG" +#line 1041 "VBNET.ATG" name = t.val; TypeParameterList( -#line 1045 "VBNET.ATG" +#line 1042 "VBNET.ATG" templates); if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1046 "VBNET.ATG" +#line 1043 "VBNET.ATG" p); } Expect(25); @@ -1838,15 +1872,15 @@ p); lexer.NextToken(); while (la.kind == 27) { AttributeSection( -#line 1047 "VBNET.ATG" +#line 1044 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 1047 "VBNET.ATG" +#line 1044 "VBNET.ATG" out type); } -#line 1049 "VBNET.ATG" +#line 1046 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } @@ -1854,20 +1888,20 @@ out type); if (la.kind == 105 || la.kind == 107) { if (la.kind == 107) { ImplementsClause( -#line 1055 "VBNET.ATG" +#line 1052 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 1057 "VBNET.ATG" +#line 1054 "VBNET.ATG" out handlesClause); } } Expect(1); if ( -#line 1063 "VBNET.ATG" +#line 1060 "VBNET.ATG" IsMustOverride(m)) { -#line 1065 "VBNET.ATG" +#line 1062 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, type, p, attributes); methodDeclaration.StartLocation = m.GetDeclarationLocation(startPos); methodDeclaration.EndLocation = t.EndLocation; @@ -1880,7 +1914,7 @@ IsMustOverride(m)) { } else if (StartOf(11)) { -#line 1077 "VBNET.ATG" +#line 1074 "VBNET.ATG" methodDeclaration = new MethodDeclaration(name, m.Modifier, type, p, attributes); methodDeclaration.StartLocation = m.GetDeclarationLocation(startPos); methodDeclaration.EndLocation = t.EndLocation; @@ -1894,17 +1928,17 @@ IsMustOverride(m)) { compilationUnit.BlockStart(methodDeclaration); Block( -#line 1089 "VBNET.ATG" +#line 1086 "VBNET.ATG" out stmt); -#line 1091 "VBNET.ATG" +#line 1088 "VBNET.ATG" compilationUnit.BlockEnd(); methodDeclaration.Body = (BlockStatement)stmt; Expect(88); Expect(100); -#line 1096 "VBNET.ATG" +#line 1093 "VBNET.ATG" methodDeclaration.Body.StartLocation = methodDeclaration.EndLocation; methodDeclaration.Body.EndLocation = t.EndLocation; @@ -1915,7 +1949,7 @@ out stmt); case 78: { lexer.NextToken(); -#line 1105 "VBNET.ATG" +#line 1102 "VBNET.ATG" m.Check(Modifier.VBExternalMethods); Point startPos = t.Location; CharsetModifier charsetModifer = CharsetModifier.None; @@ -1925,39 +1959,39 @@ out stmt); if (StartOf(12)) { Charset( -#line 1112 "VBNET.ATG" +#line 1109 "VBNET.ATG" out charsetModifer); } if (la.kind == 167) { lexer.NextToken(); Identifier(); -#line 1115 "VBNET.ATG" +#line 1112 "VBNET.ATG" name = t.val; Expect(115); Expect(3); -#line 1116 "VBNET.ATG" +#line 1113 "VBNET.ATG" library = t.val.ToString(); if (la.kind == 44) { lexer.NextToken(); Expect(3); -#line 1117 "VBNET.ATG" +#line 1114 "VBNET.ATG" alias = t.val.ToString(); } if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1118 "VBNET.ATG" +#line 1115 "VBNET.ATG" p); } Expect(25); } Expect(1); -#line 1121 "VBNET.ATG" +#line 1118 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, null, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -1967,25 +2001,25 @@ p); lexer.NextToken(); Identifier(); -#line 1128 "VBNET.ATG" +#line 1125 "VBNET.ATG" name = t.val; Expect(115); Expect(3); -#line 1129 "VBNET.ATG" +#line 1126 "VBNET.ATG" library = t.val; if (la.kind == 44) { lexer.NextToken(); Expect(3); -#line 1130 "VBNET.ATG" +#line 1127 "VBNET.ATG" alias = t.val; } if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1131 "VBNET.ATG" +#line 1128 "VBNET.ATG" p); } Expect(25); @@ -1993,12 +2027,12 @@ p); if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1132 "VBNET.ATG" +#line 1129 "VBNET.ATG" out type); } Expect(1); -#line 1135 "VBNET.ATG" +#line 1132 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, type, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; @@ -2010,7 +2044,7 @@ out type); case 93: { lexer.NextToken(); -#line 1145 "VBNET.ATG" +#line 1142 "VBNET.ATG" m.Check(Modifier.VBEvents); Point startPos = t.Location; EventDeclaration eventDeclaration; @@ -2019,19 +2053,19 @@ out type); Identifier(); -#line 1151 "VBNET.ATG" +#line 1148 "VBNET.ATG" name= t.val; if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1153 "VBNET.ATG" +#line 1150 "VBNET.ATG" out type); } else if (la.kind == 1 || la.kind == 24 || la.kind == 107) { if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1155 "VBNET.ATG" +#line 1152 "VBNET.ATG" p); } Expect(25); @@ -2039,11 +2073,11 @@ p); } else SynErr(224); if (la.kind == 107) { ImplementsClause( -#line 1157 "VBNET.ATG" +#line 1154 "VBNET.ATG" out implementsClause); } -#line 1159 "VBNET.ATG" +#line 1156 "VBNET.ATG" eventDeclaration = new EventDeclaration(type, m.Modifier, p, attributes, name, implementsClause); eventDeclaration.StartLocation = m.GetDeclarationLocation(startPos); eventDeclaration.EndLocation = t.EndLocation; @@ -2052,28 +2086,28 @@ out implementsClause); Expect(1); break; } - case 2: case 51: case 70: case 169: { + case 2: case 47: case 49: case 50: case 51: case 70: case 144: case 169: case 176: case 177: { -#line 1166 "VBNET.ATG" +#line 1163 "VBNET.ATG" Point startPos = t.Location; -#line 1168 "VBNET.ATG" +#line 1165 "VBNET.ATG" m.Check(Modifier.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(startPos); VariableDeclarator( -#line 1172 "VBNET.ATG" +#line 1169 "VBNET.ATG" variableDeclarators); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 1173 "VBNET.ATG" +#line 1170 "VBNET.ATG" variableDeclarators); } Expect(1); -#line 1176 "VBNET.ATG" +#line 1173 "VBNET.ATG" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; compilationUnit.AddChild(fd); @@ -2082,35 +2116,35 @@ variableDeclarators); } case 71: { -#line 1181 "VBNET.ATG" +#line 1178 "VBNET.ATG" m.Check(Modifier.Fields); lexer.NextToken(); -#line 1182 "VBNET.ATG" +#line 1179 "VBNET.ATG" m.Add(Modifier.Const, t.Location); -#line 1184 "VBNET.ATG" +#line 1181 "VBNET.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(t.Location); List constantDeclarators = new List(); ConstantDeclarator( -#line 1188 "VBNET.ATG" +#line 1185 "VBNET.ATG" constantDeclarators); while (la.kind == 12) { lexer.NextToken(); ConstantDeclarator( -#line 1189 "VBNET.ATG" +#line 1186 "VBNET.ATG" constantDeclarators); } -#line 1191 "VBNET.ATG" +#line 1188 "VBNET.ATG" fd.Fields = constantDeclarators; fd.EndLocation = t.Location; Expect(1); -#line 1196 "VBNET.ATG" +#line 1193 "VBNET.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); @@ -2119,20 +2153,20 @@ constantDeclarators); case 146: { lexer.NextToken(); -#line 1202 "VBNET.ATG" +#line 1199 "VBNET.ATG" m.Check(Modifier.VBProperties); Point startPos = t.Location; List implementsClause = null; Identifier(); -#line 1206 "VBNET.ATG" +#line 1203 "VBNET.ATG" string propertyName = t.val; if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1207 "VBNET.ATG" +#line 1204 "VBNET.ATG" p); } Expect(25); @@ -2140,26 +2174,26 @@ p); if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1208 "VBNET.ATG" +#line 1205 "VBNET.ATG" out type); } -#line 1210 "VBNET.ATG" +#line 1207 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } if (la.kind == 107) { ImplementsClause( -#line 1214 "VBNET.ATG" +#line 1211 "VBNET.ATG" out implementsClause); } Expect(1); if ( -#line 1218 "VBNET.ATG" +#line 1215 "VBNET.ATG" IsMustOverride(m)) { -#line 1220 "VBNET.ATG" +#line 1217 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2170,7 +2204,7 @@ IsMustOverride(m)) { } else if (la.kind == 27 || la.kind == 101 || la.kind == 156) { -#line 1230 "VBNET.ATG" +#line 1227 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2182,13 +2216,13 @@ IsMustOverride(m)) { PropertySetRegion setRegion; AccessorDecls( -#line 1240 "VBNET.ATG" +#line 1237 "VBNET.ATG" out getRegion, out setRegion); Expect(88); Expect(146); Expect(1); -#line 1244 "VBNET.ATG" +#line 1241 "VBNET.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.EndLocation; @@ -2200,11 +2234,11 @@ out getRegion, out setRegion); case 204: { lexer.NextToken(); -#line 1251 "VBNET.ATG" +#line 1248 "VBNET.ATG" Point startPos = t.Location; Expect(93); -#line 1253 "VBNET.ATG" +#line 1250 "VBNET.ATG" m.Check(Modifier.VBCustomEvents); EventAddRemoveRegion eventAccessorDeclaration; EventAddRegion addHandlerAccessorDeclaration = null; @@ -2214,24 +2248,24 @@ out getRegion, out setRegion); Identifier(); -#line 1260 "VBNET.ATG" +#line 1257 "VBNET.ATG" string customEventName = t.val; Expect(48); TypeName( -#line 1261 "VBNET.ATG" +#line 1258 "VBNET.ATG" out type); if (la.kind == 107) { ImplementsClause( -#line 1262 "VBNET.ATG" +#line 1259 "VBNET.ATG" out implementsClause); } Expect(1); while (StartOf(13)) { EventAccessorDeclaration( -#line 1265 "VBNET.ATG" +#line 1262 "VBNET.ATG" out eventAccessorDeclaration); -#line 1267 "VBNET.ATG" +#line 1264 "VBNET.ATG" if(eventAccessorDeclaration is EventAddRegion) { addHandlerAccessorDeclaration = (EventAddRegion)eventAccessorDeclaration; @@ -2250,7 +2284,7 @@ out eventAccessorDeclaration); Expect(93); Expect(1); -#line 1283 "VBNET.ATG" +#line 1280 "VBNET.ATG" if(addHandlerAccessorDeclaration == null) { Error("Need to provide AddHandler accessor."); @@ -2279,7 +2313,7 @@ out eventAccessorDeclaration); case 187: { lexer.NextToken(); -#line 1309 "VBNET.ATG" +#line 1306 "VBNET.ATG" m.Check(Modifier.VBOperators); Point startPos = t.Location; TypeReference returnType = NullTypeReference.Instance; @@ -2291,7 +2325,7 @@ out eventAccessorDeclaration); List returnTypeAttributes = new List(); OverloadableOperator( -#line 1319 "VBNET.ATG" +#line 1316 "VBNET.ATG" out operatorType); Expect(24); if (la.kind == 55) { @@ -2299,16 +2333,16 @@ out operatorType); } Identifier(); -#line 1320 "VBNET.ATG" +#line 1317 "VBNET.ATG" operandName = t.val; if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1321 "VBNET.ATG" +#line 1318 "VBNET.ATG" out operandType); } -#line 1322 "VBNET.ATG" +#line 1319 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParamModifier.In)); while (la.kind == 12) { lexer.NextToken(); @@ -2317,48 +2351,48 @@ out operandType); } Identifier(); -#line 1326 "VBNET.ATG" +#line 1323 "VBNET.ATG" operandName = t.val; if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1327 "VBNET.ATG" +#line 1324 "VBNET.ATG" out operandType); } -#line 1328 "VBNET.ATG" +#line 1325 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParamModifier.In)); } Expect(25); -#line 1331 "VBNET.ATG" +#line 1328 "VBNET.ATG" Point endPos = t.EndLocation; if (la.kind == 48) { lexer.NextToken(); while (la.kind == 27) { AttributeSection( -#line 1332 "VBNET.ATG" +#line 1329 "VBNET.ATG" out section); -#line 1332 "VBNET.ATG" +#line 1329 "VBNET.ATG" returnTypeAttributes.Add(section); } TypeName( -#line 1332 "VBNET.ATG" +#line 1329 "VBNET.ATG" out returnType); -#line 1332 "VBNET.ATG" +#line 1329 "VBNET.ATG" endPos = t.EndLocation; Expect(1); } Block( -#line 1333 "VBNET.ATG" +#line 1330 "VBNET.ATG" out stmt); Expect(88); Expect(187); Expect(1); -#line 1335 "VBNET.ATG" +#line 1332 "VBNET.ATG" OperatorDeclaration operatorDeclaration = new OperatorDeclaration(m.Modifier, attributes, parameters, @@ -2381,25 +2415,25 @@ out stmt); } void EnumMemberDecl( -#line 913 "VBNET.ATG" +#line 910 "VBNET.ATG" out FieldDeclaration f) { -#line 915 "VBNET.ATG" +#line 912 "VBNET.ATG" Expression expr = null;List attributes = new List(); AttributeSection section = null; VariableDeclaration varDecl = null; while (la.kind == 27) { AttributeSection( -#line 919 "VBNET.ATG" +#line 916 "VBNET.ATG" out section); -#line 919 "VBNET.ATG" +#line 916 "VBNET.ATG" attributes.Add(section); } Identifier(); -#line 922 "VBNET.ATG" +#line 919 "VBNET.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2408,10 +2442,10 @@ out section); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 927 "VBNET.ATG" +#line 924 "VBNET.ATG" out expr); -#line 927 "VBNET.ATG" +#line 924 "VBNET.ATG" varDecl.Initializer = expr; } Expect(1); @@ -2419,7 +2453,7 @@ out expr); void InterfaceMemberDecl() { -#line 832 "VBNET.ATG" +#line 830 "VBNET.ATG" TypeReference type =null; List p = new List(); List templates = new List(); @@ -2431,31 +2465,31 @@ out expr); if (StartOf(14)) { while (la.kind == 27) { AttributeSection( -#line 840 "VBNET.ATG" +#line 838 "VBNET.ATG" out section); -#line 840 "VBNET.ATG" +#line 838 "VBNET.ATG" attributes.Add(section); } while (StartOf(7)) { MemberModifier( -#line 844 "VBNET.ATG" +#line 841 "VBNET.ATG" mod); } if (la.kind == 93) { lexer.NextToken(); -#line 847 "VBNET.ATG" +#line 844 "VBNET.ATG" mod.Check(Modifier.VBInterfaceEvents); Identifier(); -#line 848 "VBNET.ATG" +#line 845 "VBNET.ATG" name = t.val; if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 849 "VBNET.ATG" +#line 846 "VBNET.ATG" p); } Expect(25); @@ -2463,12 +2497,12 @@ p); if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 850 "VBNET.ATG" +#line 847 "VBNET.ATG" out type); } Expect(1); -#line 853 "VBNET.ATG" +#line 850 "VBNET.ATG" EventDeclaration ed = new EventDeclaration(type, mod.Modifier, p, attributes, name, null); compilationUnit.AddChild(ed); ed.EndLocation = t.EndLocation; @@ -2476,27 +2510,27 @@ out type); } else if (la.kind == 167) { lexer.NextToken(); -#line 859 "VBNET.ATG" +#line 856 "VBNET.ATG" mod.Check(Modifier.VBInterfaceMethods); Identifier(); -#line 860 "VBNET.ATG" +#line 857 "VBNET.ATG" name = t.val; TypeParameterList( -#line 861 "VBNET.ATG" +#line 858 "VBNET.ATG" templates); if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 862 "VBNET.ATG" +#line 859 "VBNET.ATG" p); } Expect(25); } Expect(1); -#line 865 "VBNET.ATG" +#line 862 "VBNET.ATG" MethodDeclaration md = new MethodDeclaration(name, mod.Modifier, null, p, attributes); md.TypeReference = new TypeReference("", "System.Void"); md.EndLocation = t.EndLocation; @@ -2506,20 +2540,20 @@ p); } else if (la.kind == 100) { lexer.NextToken(); -#line 873 "VBNET.ATG" +#line 870 "VBNET.ATG" mod.Check(Modifier.VBInterfaceMethods); Identifier(); -#line 874 "VBNET.ATG" +#line 871 "VBNET.ATG" name = t.val; TypeParameterList( -#line 875 "VBNET.ATG" +#line 872 "VBNET.ATG" templates); if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 876 "VBNET.ATG" +#line 873 "VBNET.ATG" p); } Expect(25); @@ -2528,15 +2562,15 @@ p); lexer.NextToken(); while (la.kind == 27) { AttributeSection( -#line 877 "VBNET.ATG" +#line 874 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 877 "VBNET.ATG" +#line 874 "VBNET.ATG" out type); } -#line 879 "VBNET.ATG" +#line 876 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } @@ -2550,17 +2584,17 @@ out type); } else if (la.kind == 146) { lexer.NextToken(); -#line 891 "VBNET.ATG" +#line 888 "VBNET.ATG" mod.Check(Modifier.VBInterfaceProperties); Identifier(); -#line 892 "VBNET.ATG" +#line 889 "VBNET.ATG" name = t.val; if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 893 "VBNET.ATG" +#line 890 "VBNET.ATG" p); } Expect(25); @@ -2568,18 +2602,18 @@ p); if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 894 "VBNET.ATG" +#line 891 "VBNET.ATG" out type); } -#line 896 "VBNET.ATG" +#line 893 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } Expect(1); -#line 902 "VBNET.ATG" +#line 899 "VBNET.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod.Modifier, attributes); pd.Parameters = p; pd.EndLocation = t.EndLocation; @@ -2588,97 +2622,97 @@ out type); } else SynErr(227); } else if (StartOf(15)) { NonModuleDeclaration( -#line 909 "VBNET.ATG" +#line 906 "VBNET.ATG" mod, attributes); } else SynErr(228); } void Expr( -#line 1697 "VBNET.ATG" +#line 1694 "VBNET.ATG" out Expression expr) { ConditionalOrExpr( -#line 1699 "VBNET.ATG" +#line 1696 "VBNET.ATG" out expr); } void ImplementsClause( -#line 1668 "VBNET.ATG" +#line 1665 "VBNET.ATG" out List baseInterfaces) { -#line 1670 "VBNET.ATG" +#line 1667 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; string memberName = null; Expect(107); NonArrayTypeName( -#line 1675 "VBNET.ATG" +#line 1672 "VBNET.ATG" out type, false); -#line 1676 "VBNET.ATG" +#line 1673 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1677 "VBNET.ATG" +#line 1674 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); while (la.kind == 12) { lexer.NextToken(); NonArrayTypeName( -#line 1679 "VBNET.ATG" +#line 1676 "VBNET.ATG" out type, false); -#line 1680 "VBNET.ATG" +#line 1677 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1681 "VBNET.ATG" +#line 1678 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); } } void HandlesClause( -#line 1626 "VBNET.ATG" +#line 1623 "VBNET.ATG" out ArrayList handlesClause) { -#line 1628 "VBNET.ATG" +#line 1625 "VBNET.ATG" handlesClause = new ArrayList(); string name; Expect(105); EventMemberSpecifier( -#line 1631 "VBNET.ATG" +#line 1628 "VBNET.ATG" out name); -#line 1631 "VBNET.ATG" +#line 1628 "VBNET.ATG" handlesClause.Add(name); while (la.kind == 12) { lexer.NextToken(); EventMemberSpecifier( -#line 1632 "VBNET.ATG" +#line 1629 "VBNET.ATG" out name); -#line 1632 "VBNET.ATG" +#line 1629 "VBNET.ATG" handlesClause.Add(name); } } void Block( -#line 2302 "VBNET.ATG" +#line 2295 "VBNET.ATG" out Statement stmt) { -#line 2305 "VBNET.ATG" +#line 2298 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.Location; compilationUnit.BlockStart(blockStmt); while (StartOf(16) || -#line 2310 "VBNET.ATG" +#line 2303 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2310 "VBNET.ATG" +#line 2303 "VBNET.ATG" IsEndStmtAhead()) { Expect(88); EndOfStmt(); -#line 2310 "VBNET.ATG" +#line 2303 "VBNET.ATG" compilationUnit.AddChild(new EndStatement()); } else { Statement(); @@ -2686,7 +2720,7 @@ IsEndStmtAhead()) { } } -#line 2316 "VBNET.ATG" +#line 2309 "VBNET.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2694,65 +2728,65 @@ IsEndStmtAhead()) { } void Charset( -#line 1618 "VBNET.ATG" +#line 1615 "VBNET.ATG" out CharsetModifier charsetModifier) { -#line 1619 "VBNET.ATG" +#line 1616 "VBNET.ATG" charsetModifier = CharsetModifier.None; if (la.kind == 100 || la.kind == 167) { } else if (la.kind == 47) { lexer.NextToken(); -#line 1620 "VBNET.ATG" +#line 1617 "VBNET.ATG" charsetModifier = CharsetModifier.ANSI; } else if (la.kind == 50) { lexer.NextToken(); -#line 1621 "VBNET.ATG" +#line 1618 "VBNET.ATG" charsetModifier = CharsetModifier.Auto; } else if (la.kind == 176) { lexer.NextToken(); -#line 1622 "VBNET.ATG" +#line 1619 "VBNET.ATG" charsetModifier = CharsetModifier.Unicode; } else SynErr(229); } void VariableDeclarator( -#line 1522 "VBNET.ATG" +#line 1519 "VBNET.ATG" List fieldDeclaration) { -#line 1524 "VBNET.ATG" +#line 1521 "VBNET.ATG" Expression expr = null; TypeReference type = null;ArrayList rank = null;List dimension = null; Identifier(); -#line 1527 "VBNET.ATG" +#line 1524 "VBNET.ATG" string name = t.val; if ( -#line 1528 "VBNET.ATG" +#line 1525 "VBNET.ATG" IsSize()) { ArrayInitializationModifier( -#line 1528 "VBNET.ATG" +#line 1525 "VBNET.ATG" out dimension); } if ( -#line 1529 "VBNET.ATG" +#line 1526 "VBNET.ATG" IsDims()) { ArrayNameModifier( -#line 1529 "VBNET.ATG" +#line 1526 "VBNET.ATG" out rank); } if ( -#line 1531 "VBNET.ATG" +#line 1528 "VBNET.ATG" IsObjectCreation()) { Expect(48); ObjectCreateExpression( -#line 1531 "VBNET.ATG" +#line 1528 "VBNET.ATG" out expr); -#line 1533 "VBNET.ATG" +#line 1530 "VBNET.ATG" if (expr is ObjectCreateExpression) { type = ((ObjectCreateExpression)expr).CreateType; } else { @@ -2763,11 +2797,11 @@ out expr); if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1540 "VBNET.ATG" +#line 1537 "VBNET.ATG" out type); } -#line 1542 "VBNET.ATG" +#line 1539 "VBNET.ATG" if (type != null && dimension != null) { if(type.RankSpecifier != null) { Error("array rank only allowed one time"); @@ -2793,40 +2827,40 @@ out type); if (la.kind == 11) { lexer.NextToken(); VariableInitializer( -#line 1564 "VBNET.ATG" +#line 1561 "VBNET.ATG" out expr); } } else SynErr(230); -#line 1566 "VBNET.ATG" +#line 1563 "VBNET.ATG" fieldDeclaration.Add(new VariableDeclaration(name, expr, type)); } void ConstantDeclarator( -#line 1505 "VBNET.ATG" +#line 1502 "VBNET.ATG" List constantDeclaration) { -#line 1507 "VBNET.ATG" +#line 1504 "VBNET.ATG" Expression expr = null; TypeReference type = null; string name = String.Empty; Identifier(); -#line 1511 "VBNET.ATG" +#line 1508 "VBNET.ATG" name = t.val; if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 1512 "VBNET.ATG" +#line 1509 "VBNET.ATG" out type); } Expect(11); Expr( -#line 1513 "VBNET.ATG" +#line 1510 "VBNET.ATG" out expr); -#line 1515 "VBNET.ATG" +#line 1512 "VBNET.ATG" VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; constantDeclaration.Add(f); @@ -2834,10 +2868,10 @@ out expr); } void AccessorDecls( -#line 1447 "VBNET.ATG" +#line 1444 "VBNET.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1449 "VBNET.ATG" +#line 1446 "VBNET.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -2845,60 +2879,60 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 27) { AttributeSection( -#line 1454 "VBNET.ATG" +#line 1451 "VBNET.ATG" out section); -#line 1454 "VBNET.ATG" +#line 1451 "VBNET.ATG" attributes.Add(section); } if (la.kind == 101) { GetAccessorDecl( -#line 1456 "VBNET.ATG" +#line 1453 "VBNET.ATG" out getBlock, attributes); if (la.kind == 27 || la.kind == 156) { -#line 1458 "VBNET.ATG" +#line 1455 "VBNET.ATG" attributes = new List(); while (la.kind == 27) { AttributeSection( -#line 1459 "VBNET.ATG" +#line 1456 "VBNET.ATG" out section); -#line 1459 "VBNET.ATG" +#line 1456 "VBNET.ATG" attributes.Add(section); } SetAccessorDecl( -#line 1460 "VBNET.ATG" +#line 1457 "VBNET.ATG" out setBlock, attributes); } } else if (la.kind == 156) { SetAccessorDecl( -#line 1463 "VBNET.ATG" +#line 1460 "VBNET.ATG" out setBlock, attributes); if (la.kind == 27 || la.kind == 101) { -#line 1465 "VBNET.ATG" +#line 1462 "VBNET.ATG" attributes = new List(); while (la.kind == 27) { AttributeSection( -#line 1466 "VBNET.ATG" +#line 1463 "VBNET.ATG" out section); -#line 1466 "VBNET.ATG" +#line 1463 "VBNET.ATG" attributes.Add(section); } GetAccessorDecl( -#line 1467 "VBNET.ATG" +#line 1464 "VBNET.ATG" out getBlock, attributes); } } else SynErr(231); } void EventAccessorDeclaration( -#line 1410 "VBNET.ATG" +#line 1407 "VBNET.ATG" out EventAddRemoveRegion eventAccessorDeclaration) { -#line 1412 "VBNET.ATG" +#line 1409 "VBNET.ATG" Statement stmt = null; List p = new List(); AttributeSection section; @@ -2907,10 +2941,10 @@ out EventAddRemoveRegion eventAccessorDeclaration) { while (la.kind == 27) { AttributeSection( -#line 1418 "VBNET.ATG" +#line 1415 "VBNET.ATG" out section); -#line 1418 "VBNET.ATG" +#line 1415 "VBNET.ATG" attributes.Add(section); } if (la.kind == 42) { @@ -2919,20 +2953,20 @@ out section); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1420 "VBNET.ATG" +#line 1417 "VBNET.ATG" p); } Expect(25); } Expect(1); Block( -#line 1421 "VBNET.ATG" +#line 1418 "VBNET.ATG" out stmt); Expect(88); Expect(42); Expect(1); -#line 1423 "VBNET.ATG" +#line 1420 "VBNET.ATG" eventAccessorDeclaration = new EventAddRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -2943,20 +2977,20 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1428 "VBNET.ATG" +#line 1425 "VBNET.ATG" p); } Expect(25); } Expect(1); Block( -#line 1429 "VBNET.ATG" +#line 1426 "VBNET.ATG" out stmt); Expect(88); Expect(152); Expect(1); -#line 1431 "VBNET.ATG" +#line 1428 "VBNET.ATG" eventAccessorDeclaration = new EventRemoveRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -2967,20 +3001,20 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1436 "VBNET.ATG" +#line 1433 "VBNET.ATG" p); } Expect(25); } Expect(1); Block( -#line 1437 "VBNET.ATG" +#line 1434 "VBNET.ATG" out stmt); Expect(88); Expect(149); Expect(1); -#line 1439 "VBNET.ATG" +#line 1436 "VBNET.ATG" eventAccessorDeclaration = new EventRaiseRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -2989,163 +3023,163 @@ out stmt); } void OverloadableOperator( -#line 1352 "VBNET.ATG" +#line 1349 "VBNET.ATG" out OverloadableOperatorType operatorType) { -#line 1353 "VBNET.ATG" +#line 1350 "VBNET.ATG" operatorType = OverloadableOperatorType.None; switch (la.kind) { case 14: { lexer.NextToken(); -#line 1355 "VBNET.ATG" +#line 1352 "VBNET.ATG" operatorType = OverloadableOperatorType.Add; break; } case 15: { lexer.NextToken(); -#line 1357 "VBNET.ATG" +#line 1354 "VBNET.ATG" operatorType = OverloadableOperatorType.Subtract; break; } case 16: { lexer.NextToken(); -#line 1359 "VBNET.ATG" +#line 1356 "VBNET.ATG" operatorType = OverloadableOperatorType.Multiply; break; } case 17: { lexer.NextToken(); -#line 1361 "VBNET.ATG" +#line 1358 "VBNET.ATG" operatorType = OverloadableOperatorType.Divide; break; } case 18: { lexer.NextToken(); -#line 1363 "VBNET.ATG" +#line 1360 "VBNET.ATG" operatorType = OverloadableOperatorType.DivideInteger; break; } case 19: { lexer.NextToken(); -#line 1365 "VBNET.ATG" +#line 1362 "VBNET.ATG" operatorType = OverloadableOperatorType.Concat; break; } case 116: { lexer.NextToken(); -#line 1367 "VBNET.ATG" +#line 1364 "VBNET.ATG" operatorType = OverloadableOperatorType.Like; break; } case 120: { lexer.NextToken(); -#line 1369 "VBNET.ATG" +#line 1366 "VBNET.ATG" operatorType = OverloadableOperatorType.Modulus; break; } case 45: { lexer.NextToken(); -#line 1371 "VBNET.ATG" +#line 1368 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseAnd; break; } case 138: { lexer.NextToken(); -#line 1373 "VBNET.ATG" +#line 1370 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseOr; break; } case 185: { lexer.NextToken(); -#line 1375 "VBNET.ATG" +#line 1372 "VBNET.ATG" operatorType = OverloadableOperatorType.ExclusiveOr; break; } case 20: { lexer.NextToken(); -#line 1377 "VBNET.ATG" +#line 1374 "VBNET.ATG" operatorType = OverloadableOperatorType.Power; break; } case 31: { lexer.NextToken(); -#line 1379 "VBNET.ATG" +#line 1376 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftLeft; break; } case 32: { lexer.NextToken(); -#line 1381 "VBNET.ATG" +#line 1378 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftRight; break; } case 11: { lexer.NextToken(); -#line 1383 "VBNET.ATG" +#line 1380 "VBNET.ATG" operatorType = OverloadableOperatorType.Equality; break; } case 28: { lexer.NextToken(); -#line 1385 "VBNET.ATG" +#line 1382 "VBNET.ATG" operatorType = OverloadableOperatorType.InEquality; break; } case 27: { lexer.NextToken(); -#line 1387 "VBNET.ATG" +#line 1384 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThan; break; } case 30: { lexer.NextToken(); -#line 1389 "VBNET.ATG" +#line 1386 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThanOrEqual; break; } case 26: { lexer.NextToken(); -#line 1391 "VBNET.ATG" +#line 1388 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThan; break; } case 29: { lexer.NextToken(); -#line 1393 "VBNET.ATG" +#line 1390 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThanOrEqual; break; } case 75: { lexer.NextToken(); -#line 1395 "VBNET.ATG" +#line 1392 "VBNET.ATG" operatorType = OverloadableOperatorType.CType; break; } - case 2: case 51: case 70: case 169: { + case 2: case 47: case 49: case 50: case 51: case 70: case 144: case 169: case 176: case 177: { Identifier(); -#line 1399 "VBNET.ATG" +#line 1396 "VBNET.ATG" string opName = t.val; if (string.Equals(opName, "istrue", StringComparison.InvariantCultureIgnoreCase)) { operatorType = OverloadableOperatorType.IsTrue; @@ -3162,98 +3196,98 @@ out OverloadableOperatorType operatorType) { } void GetAccessorDecl( -#line 1473 "VBNET.ATG" +#line 1470 "VBNET.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1474 "VBNET.ATG" +#line 1471 "VBNET.ATG" Statement stmt = null; Expect(101); -#line 1476 "VBNET.ATG" +#line 1473 "VBNET.ATG" Point startLocation = t.Location; Expect(1); Block( -#line 1478 "VBNET.ATG" +#line 1475 "VBNET.ATG" out stmt); -#line 1479 "VBNET.ATG" +#line 1476 "VBNET.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); Expect(88); Expect(101); -#line 1481 "VBNET.ATG" +#line 1478 "VBNET.ATG" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; Expect(1); } void SetAccessorDecl( -#line 1486 "VBNET.ATG" +#line 1483 "VBNET.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1488 "VBNET.ATG" +#line 1485 "VBNET.ATG" Statement stmt = null; List p = new List(); Expect(156); -#line 1491 "VBNET.ATG" +#line 1488 "VBNET.ATG" Point startLocation = t.Location; if (la.kind == 24) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1492 "VBNET.ATG" +#line 1489 "VBNET.ATG" p); } Expect(25); } Expect(1); Block( -#line 1494 "VBNET.ATG" +#line 1491 "VBNET.ATG" out stmt); -#line 1496 "VBNET.ATG" +#line 1493 "VBNET.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); setBlock.Parameters = p; Expect(88); Expect(156); -#line 1500 "VBNET.ATG" +#line 1497 "VBNET.ATG" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; Expect(1); } void ArrayInitializationModifier( -#line 1570 "VBNET.ATG" +#line 1567 "VBNET.ATG" out List arrayModifiers) { -#line 1572 "VBNET.ATG" +#line 1569 "VBNET.ATG" arrayModifiers = null; Expect(24); InitializationRankList( -#line 1574 "VBNET.ATG" +#line 1571 "VBNET.ATG" out arrayModifiers); Expect(25); } void ArrayNameModifier( -#line 2095 "VBNET.ATG" +#line 2088 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2097 "VBNET.ATG" +#line 2090 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 2099 "VBNET.ATG" +#line 2092 "VBNET.ATG" out arrayModifiers); } void ObjectCreateExpression( -#line 1977 "VBNET.ATG" +#line 1970 "VBNET.ATG" out Expression oce) { -#line 1979 "VBNET.ATG" +#line 1972 "VBNET.ATG" TypeReference type = null; Expression initializer = null; List arguments = null; @@ -3262,37 +3296,37 @@ out Expression oce) { Expect(127); NonArrayTypeName( -#line 1985 "VBNET.ATG" +#line 1978 "VBNET.ATG" out type, false); if (la.kind == 24) { lexer.NextToken(); if (StartOf(18)) { ArgumentList( -#line 1986 "VBNET.ATG" +#line 1979 "VBNET.ATG" out arguments); } Expect(25); } if (la.kind == 22 || -#line 1987 "VBNET.ATG" +#line 1980 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { if ( -#line 1987 "VBNET.ATG" +#line 1980 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { ArrayTypeModifiers( -#line 1988 "VBNET.ATG" +#line 1981 "VBNET.ATG" out dimensions); ArrayInitializer( -#line 1989 "VBNET.ATG" +#line 1982 "VBNET.ATG" out initializer); } else { ArrayInitializer( -#line 1990 "VBNET.ATG" +#line 1983 "VBNET.ATG" out initializer); } } -#line 1992 "VBNET.ATG" +#line 1985 "VBNET.ATG" if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); } else { @@ -3307,98 +3341,98 @@ out initializer); } void VariableInitializer( -#line 1590 "VBNET.ATG" +#line 1587 "VBNET.ATG" out Expression initializerExpression) { -#line 1592 "VBNET.ATG" +#line 1589 "VBNET.ATG" initializerExpression = null; if (StartOf(19)) { Expr( -#line 1594 "VBNET.ATG" +#line 1591 "VBNET.ATG" out initializerExpression); } else if (la.kind == 22) { ArrayInitializer( -#line 1595 "VBNET.ATG" +#line 1592 "VBNET.ATG" out initializerExpression); } else SynErr(234); } void InitializationRankList( -#line 1578 "VBNET.ATG" +#line 1575 "VBNET.ATG" out List rank) { -#line 1580 "VBNET.ATG" +#line 1577 "VBNET.ATG" rank = null; Expression expr = null; Expr( -#line 1583 "VBNET.ATG" +#line 1580 "VBNET.ATG" out expr); -#line 1583 "VBNET.ATG" +#line 1580 "VBNET.ATG" rank = new List(); if (expr != null) { rank.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Expr( -#line 1585 "VBNET.ATG" +#line 1582 "VBNET.ATG" out expr); -#line 1585 "VBNET.ATG" +#line 1582 "VBNET.ATG" if (expr != null) { rank.Add(expr); } } } void ArrayInitializer( -#line 1599 "VBNET.ATG" +#line 1596 "VBNET.ATG" out Expression outExpr) { -#line 1601 "VBNET.ATG" +#line 1598 "VBNET.ATG" Expression expr = null; ArrayInitializerExpression initializer = new ArrayInitializerExpression(); Expect(22); if (StartOf(20)) { VariableInitializer( -#line 1606 "VBNET.ATG" +#line 1603 "VBNET.ATG" out expr); -#line 1608 "VBNET.ATG" +#line 1605 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1611 "VBNET.ATG" +#line 1608 "VBNET.ATG" NotFinalComma()) { Expect(12); VariableInitializer( -#line 1611 "VBNET.ATG" +#line 1608 "VBNET.ATG" out expr); -#line 1612 "VBNET.ATG" +#line 1609 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(23); -#line 1615 "VBNET.ATG" +#line 1612 "VBNET.ATG" outExpr = initializer; } void EventMemberSpecifier( -#line 1685 "VBNET.ATG" +#line 1682 "VBNET.ATG" out string name) { -#line 1686 "VBNET.ATG" +#line 1683 "VBNET.ATG" string type; name = String.Empty; if (StartOf(10)) { Identifier(); -#line 1687 "VBNET.ATG" +#line 1684 "VBNET.ATG" type = t.val; Expect(10); Identifier(); -#line 1689 "VBNET.ATG" +#line 1686 "VBNET.ATG" name = type + "." + t.val; } else if (la.kind == 124) { lexer.NextToken(); @@ -3406,22 +3440,22 @@ out string name) { if (StartOf(10)) { Identifier(); -#line 1692 "VBNET.ATG" +#line 1689 "VBNET.ATG" name = "MyBase." + t.val; } else if (la.kind == 92) { lexer.NextToken(); -#line 1693 "VBNET.ATG" +#line 1690 "VBNET.ATG" name = "MyBase.Error"; } else SynErr(235); } else SynErr(236); } void NonArrayTypeName( -#line 2059 "VBNET.ATG" +#line 2052 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2061 "VBNET.ATG" +#line 2054 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; @@ -3431,67 +3465,67 @@ out TypeReference typeref, bool canBeUnbound) { lexer.NextToken(); Expect(10); -#line 2066 "VBNET.ATG" +#line 2059 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 2067 "VBNET.ATG" +#line 2060 "VBNET.ATG" out typeref, canBeUnbound); -#line 2068 "VBNET.ATG" +#line 2061 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 10) { lexer.NextToken(); -#line 2069 "VBNET.ATG" +#line 2062 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 2070 "VBNET.ATG" +#line 2063 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 2071 "VBNET.ATG" +#line 2064 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 133) { lexer.NextToken(); -#line 2074 "VBNET.ATG" +#line 2067 "VBNET.ATG" typeref = new TypeReference("System.Object"); } else if (StartOf(22)) { PrimitiveTypeName( -#line 2075 "VBNET.ATG" +#line 2068 "VBNET.ATG" out name); -#line 2075 "VBNET.ATG" +#line 2068 "VBNET.ATG" typeref = new TypeReference(name); } else SynErr(237); } void ConditionalOrExpr( -#line 1856 "VBNET.ATG" +#line 1849 "VBNET.ATG" out Expression outExpr) { -#line 1857 "VBNET.ATG" +#line 1850 "VBNET.ATG" Expression expr; ConditionalAndExpr( -#line 1858 "VBNET.ATG" +#line 1851 "VBNET.ATG" out outExpr); while (la.kind == 139) { lexer.NextToken(); ConditionalAndExpr( -#line 1858 "VBNET.ATG" +#line 1851 "VBNET.ATG" out expr); -#line 1858 "VBNET.ATG" +#line 1851 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalOr, expr); } } void UnaryExpr( -#line 1706 "VBNET.ATG" +#line 1699 "VBNET.ATG" out Expression uExpr) { -#line 1708 "VBNET.ATG" +#line 1701 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -3500,25 +3534,25 @@ out Expression uExpr) { if (la.kind == 14) { lexer.NextToken(); -#line 1712 "VBNET.ATG" +#line 1705 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 15) { lexer.NextToken(); -#line 1713 "VBNET.ATG" +#line 1706 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 1715 "VBNET.ATG" +#line 1708 "VBNET.ATG" uop = UnaryOperatorType.Star; isUOp = true; } } SimpleExpr( -#line 1717 "VBNET.ATG" +#line 1710 "VBNET.ATG" out expr); -#line 1719 "VBNET.ATG" +#line 1712 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -3528,10 +3562,10 @@ out expr); } void SimpleExpr( -#line 1742 "VBNET.ATG" +#line 1735 "VBNET.ATG" out Expression pexpr) { -#line 1744 "VBNET.ATG" +#line 1737 "VBNET.ATG" Expression expr; TypeReference type = null; string name = String.Empty; @@ -3542,136 +3576,136 @@ out Expression pexpr) { case 3: { lexer.NextToken(); -#line 1752 "VBNET.ATG" +#line 1745 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 4: { lexer.NextToken(); -#line 1753 "VBNET.ATG" +#line 1746 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 7: { lexer.NextToken(); -#line 1754 "VBNET.ATG" +#line 1747 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 6: { lexer.NextToken(); -#line 1755 "VBNET.ATG" +#line 1748 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 5: { lexer.NextToken(); -#line 1756 "VBNET.ATG" +#line 1749 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 9: { lexer.NextToken(); -#line 1757 "VBNET.ATG" +#line 1750 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 8: { lexer.NextToken(); -#line 1758 "VBNET.ATG" +#line 1751 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); break; } case 173: { lexer.NextToken(); -#line 1760 "VBNET.ATG" +#line 1753 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); break; } case 96: { lexer.NextToken(); -#line 1761 "VBNET.ATG" +#line 1754 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); break; } case 130: { lexer.NextToken(); -#line 1762 "VBNET.ATG" +#line 1755 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); break; } case 24: { lexer.NextToken(); Expr( -#line 1763 "VBNET.ATG" +#line 1756 "VBNET.ATG" out expr); Expect(25); -#line 1763 "VBNET.ATG" +#line 1756 "VBNET.ATG" pexpr = new ParenthesizedExpression(expr); break; } - case 2: case 51: case 70: case 169: { + case 2: case 47: case 49: case 50: case 51: case 70: case 144: case 169: case 176: case 177: { Identifier(); -#line 1764 "VBNET.ATG" +#line 1757 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); break; } case 52: case 54: case 65: case 76: case 77: case 84: case 111: case 117: case 159: case 160: case 165: case 190: case 191: case 192: case 193: { -#line 1765 "VBNET.ATG" +#line 1758 "VBNET.ATG" string val = String.Empty; PrimitiveTypeName( -#line 1766 "VBNET.ATG" +#line 1759 "VBNET.ATG" out val); Expect(10); -#line 1767 "VBNET.ATG" +#line 1760 "VBNET.ATG" t.val = ""; Identifier(); -#line 1767 "VBNET.ATG" +#line 1760 "VBNET.ATG" pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); break; } case 119: { lexer.NextToken(); -#line 1768 "VBNET.ATG" +#line 1761 "VBNET.ATG" pexpr = new ThisReferenceExpression(); break; } case 124: case 125: { -#line 1769 "VBNET.ATG" +#line 1762 "VBNET.ATG" Expression retExpr = null; if (la.kind == 124) { lexer.NextToken(); -#line 1770 "VBNET.ATG" +#line 1763 "VBNET.ATG" retExpr = new BaseReferenceExpression(); } else if (la.kind == 125) { lexer.NextToken(); -#line 1771 "VBNET.ATG" +#line 1764 "VBNET.ATG" retExpr = new ClassReferenceExpression(); } else SynErr(238); Expect(10); IdentifierOrKeyword( -#line 1773 "VBNET.ATG" +#line 1766 "VBNET.ATG" out name); -#line 1773 "VBNET.ATG" +#line 1766 "VBNET.ATG" pexpr = new FieldReferenceExpression(retExpr, name); break; } @@ -3680,77 +3714,77 @@ out name); Expect(10); Identifier(); -#line 1775 "VBNET.ATG" +#line 1768 "VBNET.ATG" type = new TypeReference(t.val ?? ""); -#line 1777 "VBNET.ATG" +#line 1770 "VBNET.ATG" type.IsGlobal = true; -#line 1778 "VBNET.ATG" +#line 1771 "VBNET.ATG" pexpr = new TypeReferenceExpression(type); break; } case 127: { ObjectCreateExpression( -#line 1779 "VBNET.ATG" +#line 1772 "VBNET.ATG" out expr); -#line 1779 "VBNET.ATG" +#line 1772 "VBNET.ATG" pexpr = expr; break; } case 75: case 82: case 199: { -#line 1781 "VBNET.ATG" +#line 1774 "VBNET.ATG" CastType castType = CastType.Cast; if (la.kind == 82) { lexer.NextToken(); } else if (la.kind == 75) { lexer.NextToken(); -#line 1783 "VBNET.ATG" +#line 1776 "VBNET.ATG" castType = CastType.Conversion; } else if (la.kind == 199) { lexer.NextToken(); -#line 1784 "VBNET.ATG" +#line 1777 "VBNET.ATG" castType = CastType.TryCast; } else SynErr(239); Expect(24); Expr( -#line 1786 "VBNET.ATG" +#line 1779 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1786 "VBNET.ATG" +#line 1779 "VBNET.ATG" out type); Expect(25); -#line 1787 "VBNET.ATG" +#line 1780 "VBNET.ATG" pexpr = new CastExpression(type, expr, castType); break; } case 59: case 60: case 61: case 62: case 63: case 64: case 66: case 68: case 69: case 72: case 73: case 74: case 194: case 195: case 196: case 197: { CastTarget( -#line 1788 "VBNET.ATG" +#line 1781 "VBNET.ATG" out type); Expect(24); Expr( -#line 1788 "VBNET.ATG" +#line 1781 "VBNET.ATG" out expr); Expect(25); -#line 1788 "VBNET.ATG" +#line 1781 "VBNET.ATG" pexpr = new CastExpression(type, expr, CastType.PrimitiveConversion); break; } case 43: { lexer.NextToken(); Expr( -#line 1789 "VBNET.ATG" +#line 1782 "VBNET.ATG" out expr); -#line 1789 "VBNET.ATG" +#line 1782 "VBNET.ATG" pexpr = new AddressOfExpression(expr); break; } @@ -3758,124 +3792,124 @@ out expr); lexer.NextToken(); Expect(24); GetTypeTypeName( -#line 1790 "VBNET.ATG" +#line 1783 "VBNET.ATG" out type); Expect(25); -#line 1790 "VBNET.ATG" +#line 1783 "VBNET.ATG" pexpr = new TypeOfExpression(type); break; } case 175: { lexer.NextToken(); SimpleExpr( -#line 1791 "VBNET.ATG" +#line 1784 "VBNET.ATG" out expr); Expect(113); TypeName( -#line 1791 "VBNET.ATG" +#line 1784 "VBNET.ATG" out type); -#line 1791 "VBNET.ATG" +#line 1784 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); break; } } while (la.kind == 10 || la.kind == 24) { InvocationOrMemberReferenceExpression( -#line 1793 "VBNET.ATG" +#line 1786 "VBNET.ATG" ref pexpr); } } else if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1796 "VBNET.ATG" +#line 1789 "VBNET.ATG" out name); -#line 1796 "VBNET.ATG" +#line 1789 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); while (la.kind == 10 || la.kind == 24) { InvocationOrMemberReferenceExpression( -#line 1797 "VBNET.ATG" +#line 1790 "VBNET.ATG" ref pexpr); } } else SynErr(240); } void AssignmentOperator( -#line 1727 "VBNET.ATG" +#line 1720 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1728 "VBNET.ATG" +#line 1721 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 11: { lexer.NextToken(); -#line 1729 "VBNET.ATG" +#line 1722 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 41: { lexer.NextToken(); -#line 1730 "VBNET.ATG" +#line 1723 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 33: { lexer.NextToken(); -#line 1731 "VBNET.ATG" +#line 1724 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 35: { lexer.NextToken(); -#line 1732 "VBNET.ATG" +#line 1725 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 36: { lexer.NextToken(); -#line 1733 "VBNET.ATG" +#line 1726 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 37: { lexer.NextToken(); -#line 1734 "VBNET.ATG" +#line 1727 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 38: { lexer.NextToken(); -#line 1735 "VBNET.ATG" +#line 1728 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 34: { lexer.NextToken(); -#line 1736 "VBNET.ATG" +#line 1729 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 39: { lexer.NextToken(); -#line 1737 "VBNET.ATG" +#line 1730 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 40: { lexer.NextToken(); -#line 1738 "VBNET.ATG" +#line 1731 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } @@ -3884,130 +3918,130 @@ out AssignmentOperatorType op) { } void IdentifierOrKeyword( -#line 2890 "VBNET.ATG" +#line 2889 "VBNET.ATG" out string name) { -#line 2892 "VBNET.ATG" +#line 2891 "VBNET.ATG" lexer.NextToken(); name = t.val; } void CastTarget( -#line 1834 "VBNET.ATG" +#line 1827 "VBNET.ATG" out TypeReference type) { -#line 1836 "VBNET.ATG" +#line 1829 "VBNET.ATG" type = null; switch (la.kind) { case 59: { lexer.NextToken(); -#line 1838 "VBNET.ATG" +#line 1831 "VBNET.ATG" type = new TypeReference("System.Boolean"); break; } case 60: { lexer.NextToken(); -#line 1839 "VBNET.ATG" +#line 1832 "VBNET.ATG" type = new TypeReference("System.Byte"); break; } case 194: { lexer.NextToken(); -#line 1840 "VBNET.ATG" +#line 1833 "VBNET.ATG" type = new TypeReference("System.SByte"); break; } case 61: { lexer.NextToken(); -#line 1841 "VBNET.ATG" +#line 1834 "VBNET.ATG" type = new TypeReference("System.Char"); break; } case 62: { lexer.NextToken(); -#line 1842 "VBNET.ATG" +#line 1835 "VBNET.ATG" type = new TypeReference("System.DateTime"); break; } case 64: { lexer.NextToken(); -#line 1843 "VBNET.ATG" +#line 1836 "VBNET.ATG" type = new TypeReference("System.Decimal"); break; } case 63: { lexer.NextToken(); -#line 1844 "VBNET.ATG" +#line 1837 "VBNET.ATG" type = new TypeReference("System.Double"); break; } case 72: { lexer.NextToken(); -#line 1845 "VBNET.ATG" +#line 1838 "VBNET.ATG" type = new TypeReference("System.Int16"); break; } case 66: { lexer.NextToken(); -#line 1846 "VBNET.ATG" +#line 1839 "VBNET.ATG" type = new TypeReference("System.Int32"); break; } case 68: { lexer.NextToken(); -#line 1847 "VBNET.ATG" +#line 1840 "VBNET.ATG" type = new TypeReference("System.Int64"); break; } case 195: { lexer.NextToken(); -#line 1848 "VBNET.ATG" +#line 1841 "VBNET.ATG" type = new TypeReference("System.UInt16"); break; } case 196: { lexer.NextToken(); -#line 1849 "VBNET.ATG" +#line 1842 "VBNET.ATG" type = new TypeReference("System.UInt32"); break; } case 197: { lexer.NextToken(); -#line 1850 "VBNET.ATG" +#line 1843 "VBNET.ATG" type = new TypeReference("System.UInt64"); break; } case 69: { lexer.NextToken(); -#line 1851 "VBNET.ATG" +#line 1844 "VBNET.ATG" type = new TypeReference("System.Object"); break; } case 73: { lexer.NextToken(); -#line 1852 "VBNET.ATG" +#line 1845 "VBNET.ATG" type = new TypeReference("System.Single"); break; } case 74: { lexer.NextToken(); -#line 1853 "VBNET.ATG" +#line 1846 "VBNET.ATG" type = new TypeReference("System.String"); break; } @@ -4016,19 +4050,19 @@ out TypeReference type) { } void GetTypeTypeName( -#line 2047 "VBNET.ATG" +#line 2040 "VBNET.ATG" out TypeReference typeref) { -#line 2048 "VBNET.ATG" +#line 2041 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2050 "VBNET.ATG" +#line 2043 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 2051 "VBNET.ATG" +#line 2044 "VBNET.ATG" out rank); -#line 2052 "VBNET.ATG" +#line 2045 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4036,446 +4070,446 @@ out rank); } void InvocationOrMemberReferenceExpression( -#line 1801 "VBNET.ATG" +#line 1794 "VBNET.ATG" ref Expression pexpr) { -#line 1802 "VBNET.ATG" +#line 1795 "VBNET.ATG" string name; if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1804 "VBNET.ATG" +#line 1797 "VBNET.ATG" out name); -#line 1804 "VBNET.ATG" +#line 1797 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); } else if (la.kind == 24) { InvocationExpression( -#line 1805 "VBNET.ATG" +#line 1798 "VBNET.ATG" ref pexpr); } else SynErr(243); } void InvocationExpression( -#line 1808 "VBNET.ATG" +#line 1801 "VBNET.ATG" ref Expression pexpr) { -#line 1809 "VBNET.ATG" +#line 1802 "VBNET.ATG" List typeParameters = new List(); List parameters = null; TypeReference type; Expect(24); -#line 1813 "VBNET.ATG" +#line 1806 "VBNET.ATG" Point start = t.Location; if (la.kind == 200) { lexer.NextToken(); TypeName( -#line 1815 "VBNET.ATG" +#line 1808 "VBNET.ATG" out type); -#line 1815 "VBNET.ATG" +#line 1808 "VBNET.ATG" if (type != null) typeParameters.Add(type); Expect(25); if (la.kind == 10) { lexer.NextToken(); Identifier(); -#line 1819 "VBNET.ATG" +#line 1812 "VBNET.ATG" pexpr = new FieldReferenceExpression(GetTypeReferenceExpression(pexpr, typeParameters), t.val); } else if (la.kind == 24) { lexer.NextToken(); ArgumentList( -#line 1821 "VBNET.ATG" +#line 1814 "VBNET.ATG" out parameters); Expect(25); -#line 1823 "VBNET.ATG" +#line 1816 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters, typeParameters); } else SynErr(244); } else if (StartOf(18)) { ArgumentList( -#line 1825 "VBNET.ATG" +#line 1818 "VBNET.ATG" out parameters); Expect(25); -#line 1827 "VBNET.ATG" +#line 1820 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters, typeParameters); } else SynErr(245); -#line 1829 "VBNET.ATG" +#line 1822 "VBNET.ATG" pexpr.StartLocation = start; pexpr.EndLocation = t.Location; } void ArgumentList( -#line 2006 "VBNET.ATG" +#line 1999 "VBNET.ATG" out List arguments) { -#line 2008 "VBNET.ATG" +#line 2001 "VBNET.ATG" arguments = new List(); Expression expr = null; if (StartOf(19)) { Argument( -#line 2012 "VBNET.ATG" +#line 2005 "VBNET.ATG" out expr); -#line 2012 "VBNET.ATG" +#line 2005 "VBNET.ATG" if (expr != null) { arguments.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Argument( -#line 2015 "VBNET.ATG" +#line 2008 "VBNET.ATG" out expr); -#line 2015 "VBNET.ATG" +#line 2008 "VBNET.ATG" if (expr != null) { arguments.Add(expr); } } } } void ConditionalAndExpr( -#line 1861 "VBNET.ATG" +#line 1854 "VBNET.ATG" out Expression outExpr) { -#line 1862 "VBNET.ATG" +#line 1855 "VBNET.ATG" Expression expr; InclusiveOrExpr( -#line 1863 "VBNET.ATG" +#line 1856 "VBNET.ATG" out outExpr); while (la.kind == 46) { lexer.NextToken(); InclusiveOrExpr( -#line 1863 "VBNET.ATG" +#line 1856 "VBNET.ATG" out expr); -#line 1863 "VBNET.ATG" +#line 1856 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalAnd, expr); } } void InclusiveOrExpr( -#line 1866 "VBNET.ATG" +#line 1859 "VBNET.ATG" out Expression outExpr) { -#line 1867 "VBNET.ATG" +#line 1860 "VBNET.ATG" Expression expr; ExclusiveOrExpr( -#line 1868 "VBNET.ATG" +#line 1861 "VBNET.ATG" out outExpr); while (la.kind == 185) { lexer.NextToken(); ExclusiveOrExpr( -#line 1868 "VBNET.ATG" +#line 1861 "VBNET.ATG" out expr); -#line 1868 "VBNET.ATG" +#line 1861 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.ExclusiveOr, expr); } } void ExclusiveOrExpr( -#line 1871 "VBNET.ATG" +#line 1864 "VBNET.ATG" out Expression outExpr) { -#line 1872 "VBNET.ATG" +#line 1865 "VBNET.ATG" Expression expr; AndExpr( -#line 1873 "VBNET.ATG" +#line 1866 "VBNET.ATG" out outExpr); while (la.kind == 138) { lexer.NextToken(); AndExpr( -#line 1873 "VBNET.ATG" +#line 1866 "VBNET.ATG" out expr); -#line 1873 "VBNET.ATG" +#line 1866 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseOr, expr); } } void AndExpr( -#line 1876 "VBNET.ATG" +#line 1869 "VBNET.ATG" out Expression outExpr) { -#line 1877 "VBNET.ATG" +#line 1870 "VBNET.ATG" Expression expr; NotExpr( -#line 1878 "VBNET.ATG" +#line 1871 "VBNET.ATG" out outExpr); while (la.kind == 45) { lexer.NextToken(); NotExpr( -#line 1878 "VBNET.ATG" +#line 1871 "VBNET.ATG" out expr); -#line 1878 "VBNET.ATG" +#line 1871 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseAnd, expr); } } void NotExpr( -#line 1881 "VBNET.ATG" +#line 1874 "VBNET.ATG" out Expression outExpr) { -#line 1882 "VBNET.ATG" +#line 1875 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 129) { lexer.NextToken(); -#line 1883 "VBNET.ATG" +#line 1876 "VBNET.ATG" uop = UnaryOperatorType.Not; } EqualityExpr( -#line 1884 "VBNET.ATG" +#line 1877 "VBNET.ATG" out outExpr); -#line 1885 "VBNET.ATG" +#line 1878 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void EqualityExpr( -#line 1890 "VBNET.ATG" +#line 1883 "VBNET.ATG" out Expression outExpr) { -#line 1892 "VBNET.ATG" +#line 1885 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; RelationalExpr( -#line 1895 "VBNET.ATG" +#line 1888 "VBNET.ATG" out outExpr); while (la.kind == 11 || la.kind == 28 || la.kind == 116) { if (la.kind == 28) { lexer.NextToken(); -#line 1898 "VBNET.ATG" +#line 1891 "VBNET.ATG" op = BinaryOperatorType.InEquality; } else if (la.kind == 11) { lexer.NextToken(); -#line 1899 "VBNET.ATG" +#line 1892 "VBNET.ATG" op = BinaryOperatorType.Equality; } else { lexer.NextToken(); -#line 1900 "VBNET.ATG" +#line 1893 "VBNET.ATG" op = BinaryOperatorType.Like; } RelationalExpr( -#line 1902 "VBNET.ATG" +#line 1895 "VBNET.ATG" out expr); -#line 1902 "VBNET.ATG" +#line 1895 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void RelationalExpr( -#line 1906 "VBNET.ATG" +#line 1899 "VBNET.ATG" out Expression outExpr) { -#line 1908 "VBNET.ATG" +#line 1901 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1911 "VBNET.ATG" +#line 1904 "VBNET.ATG" out outExpr); while (StartOf(24)) { if (StartOf(25)) { if (la.kind == 27) { lexer.NextToken(); -#line 1914 "VBNET.ATG" +#line 1907 "VBNET.ATG" op = BinaryOperatorType.LessThan; } else if (la.kind == 26) { lexer.NextToken(); -#line 1915 "VBNET.ATG" +#line 1908 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; } else if (la.kind == 30) { lexer.NextToken(); -#line 1916 "VBNET.ATG" +#line 1909 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; } else if (la.kind == 29) { lexer.NextToken(); -#line 1917 "VBNET.ATG" +#line 1910 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; } else SynErr(246); ShiftExpr( -#line 1919 "VBNET.ATG" +#line 1912 "VBNET.ATG" out expr); -#line 1919 "VBNET.ATG" +#line 1912 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else { if (la.kind == 113) { lexer.NextToken(); -#line 1922 "VBNET.ATG" +#line 1915 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; } else if (la.kind == 189) { lexer.NextToken(); -#line 1923 "VBNET.ATG" +#line 1916 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; } else SynErr(247); Expr( -#line 1924 "VBNET.ATG" +#line 1917 "VBNET.ATG" out expr); -#line 1924 "VBNET.ATG" +#line 1917 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } } void ShiftExpr( -#line 1928 "VBNET.ATG" +#line 1921 "VBNET.ATG" out Expression outExpr) { -#line 1930 "VBNET.ATG" +#line 1923 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; AdditiveExpr( -#line 1933 "VBNET.ATG" +#line 1926 "VBNET.ATG" out outExpr); while (la.kind == 31 || la.kind == 32) { if (la.kind == 31) { lexer.NextToken(); -#line 1936 "VBNET.ATG" +#line 1929 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1937 "VBNET.ATG" +#line 1930 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } AdditiveExpr( -#line 1939 "VBNET.ATG" +#line 1932 "VBNET.ATG" out expr); -#line 1939 "VBNET.ATG" +#line 1932 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AdditiveExpr( -#line 1943 "VBNET.ATG" +#line 1936 "VBNET.ATG" out Expression outExpr) { -#line 1945 "VBNET.ATG" +#line 1938 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; MultiplicativeExpr( -#line 1948 "VBNET.ATG" +#line 1941 "VBNET.ATG" out outExpr); while (la.kind == 14 || la.kind == 15 || la.kind == 19) { if (la.kind == 14) { lexer.NextToken(); -#line 1951 "VBNET.ATG" +#line 1944 "VBNET.ATG" op = BinaryOperatorType.Add; } else if (la.kind == 15) { lexer.NextToken(); -#line 1952 "VBNET.ATG" +#line 1945 "VBNET.ATG" op = BinaryOperatorType.Subtract; } else { lexer.NextToken(); -#line 1953 "VBNET.ATG" +#line 1946 "VBNET.ATG" op = BinaryOperatorType.Concat; } MultiplicativeExpr( -#line 1955 "VBNET.ATG" +#line 1948 "VBNET.ATG" out expr); -#line 1955 "VBNET.ATG" +#line 1948 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void MultiplicativeExpr( -#line 1959 "VBNET.ATG" +#line 1952 "VBNET.ATG" out Expression outExpr) { -#line 1961 "VBNET.ATG" +#line 1954 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 1964 "VBNET.ATG" +#line 1957 "VBNET.ATG" out outExpr); while (StartOf(26)) { if (la.kind == 16) { lexer.NextToken(); -#line 1967 "VBNET.ATG" +#line 1960 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else if (la.kind == 17) { lexer.NextToken(); -#line 1968 "VBNET.ATG" +#line 1961 "VBNET.ATG" op = BinaryOperatorType.Divide; } else if (la.kind == 18) { lexer.NextToken(); -#line 1969 "VBNET.ATG" +#line 1962 "VBNET.ATG" op = BinaryOperatorType.DivideInteger; } else if (la.kind == 120) { lexer.NextToken(); -#line 1970 "VBNET.ATG" +#line 1963 "VBNET.ATG" op = BinaryOperatorType.Modulus; } else { lexer.NextToken(); -#line 1971 "VBNET.ATG" +#line 1964 "VBNET.ATG" op = BinaryOperatorType.Power; } UnaryExpr( -#line 1973 "VBNET.ATG" +#line 1966 "VBNET.ATG" out expr); -#line 1973 "VBNET.ATG" +#line 1966 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ArrayTypeModifiers( -#line 2104 "VBNET.ATG" +#line 2097 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2106 "VBNET.ATG" +#line 2099 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2109 "VBNET.ATG" +#line 2102 "VBNET.ATG" IsDims()) { Expect(24); if (la.kind == 12 || la.kind == 25) { RankList( -#line 2111 "VBNET.ATG" +#line 2104 "VBNET.ATG" out i); } -#line 2113 "VBNET.ATG" +#line 2106 "VBNET.ATG" arrayModifiers.Add(i); Expect(25); } -#line 2118 "VBNET.ATG" +#line 2111 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -4483,69 +4517,69 @@ out i); } void Argument( -#line 2021 "VBNET.ATG" +#line 2014 "VBNET.ATG" out Expression argumentexpr) { -#line 2023 "VBNET.ATG" +#line 2016 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 2027 "VBNET.ATG" +#line 2020 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 2027 "VBNET.ATG" +#line 2020 "VBNET.ATG" name = t.val; Expect(13); Expect(11); Expr( -#line 2027 "VBNET.ATG" +#line 2020 "VBNET.ATG" out expr); -#line 2029 "VBNET.ATG" +#line 2022 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); } else if (StartOf(19)) { Expr( -#line 2032 "VBNET.ATG" +#line 2025 "VBNET.ATG" out argumentexpr); } else SynErr(248); } void QualIdentAndTypeArguments( -#line 2078 "VBNET.ATG" +#line 2071 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2079 "VBNET.ATG" +#line 2072 "VBNET.ATG" string name; typeref = null; Qualident( -#line 2081 "VBNET.ATG" +#line 2074 "VBNET.ATG" out name); -#line 2082 "VBNET.ATG" +#line 2075 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 2083 "VBNET.ATG" +#line 2076 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(200); if ( -#line 2085 "VBNET.ATG" +#line 2078 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2086 "VBNET.ATG" +#line 2079 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 12) { lexer.NextToken(); -#line 2087 "VBNET.ATG" +#line 2080 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } } else if (StartOf(5)) { TypeArgumentList( -#line 2088 "VBNET.ATG" +#line 2081 "VBNET.ATG" typeref.GenericTypes); } else SynErr(249); Expect(25); @@ -4553,48 +4587,48 @@ typeref.GenericTypes); } void TypeArgumentList( -#line 2131 "VBNET.ATG" +#line 2124 "VBNET.ATG" List typeArguments) { -#line 2133 "VBNET.ATG" +#line 2126 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2135 "VBNET.ATG" +#line 2128 "VBNET.ATG" out typeref); -#line 2135 "VBNET.ATG" +#line 2128 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 2138 "VBNET.ATG" +#line 2131 "VBNET.ATG" out typeref); -#line 2138 "VBNET.ATG" +#line 2131 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void RankList( -#line 2125 "VBNET.ATG" +#line 2118 "VBNET.ATG" out int i) { -#line 2126 "VBNET.ATG" +#line 2119 "VBNET.ATG" i = 0; while (la.kind == 12) { lexer.NextToken(); -#line 2127 "VBNET.ATG" +#line 2120 "VBNET.ATG" ++i; } } void Attribute( -#line 2163 "VBNET.ATG" +#line 2156 "VBNET.ATG" out ICSharpCode.NRefactory.Parser.AST.Attribute attribute) { -#line 2164 "VBNET.ATG" +#line 2157 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -4604,39 +4638,39 @@ out ICSharpCode.NRefactory.Parser.AST.Attribute attribute) { Expect(10); } Qualident( -#line 2169 "VBNET.ATG" +#line 2162 "VBNET.ATG" out name); if (la.kind == 24) { AttributeArguments( -#line 2170 "VBNET.ATG" +#line 2163 "VBNET.ATG" positional, named); } -#line 2171 "VBNET.ATG" +#line 2164 "VBNET.ATG" attribute = new ICSharpCode.NRefactory.Parser.AST.Attribute(name, positional, named); } void AttributeArguments( -#line 2175 "VBNET.ATG" +#line 2168 "VBNET.ATG" List positional, List named) { -#line 2177 "VBNET.ATG" +#line 2170 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(24); if ( -#line 2183 "VBNET.ATG" +#line 2176 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2185 "VBNET.ATG" +#line 2178 "VBNET.ATG" IsNamedAssign()) { -#line 2185 "VBNET.ATG" +#line 2178 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2186 "VBNET.ATG" +#line 2179 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -4644,10 +4678,10 @@ out name); Expect(11); } Expr( -#line 2188 "VBNET.ATG" +#line 2181 "VBNET.ATG" out expr); -#line 2190 "VBNET.ATG" +#line 2183 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -4655,13 +4689,13 @@ out expr); while (la.kind == 12) { lexer.NextToken(); if ( -#line 2197 "VBNET.ATG" +#line 2190 "VBNET.ATG" IsNamedAssign()) { -#line 2197 "VBNET.ATG" +#line 2190 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2198 "VBNET.ATG" +#line 2191 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -4669,14 +4703,14 @@ out name); Expect(11); } else if (StartOf(19)) { -#line 2200 "VBNET.ATG" +#line 2193 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); } else SynErr(250); Expr( -#line 2201 "VBNET.ATG" +#line 2194 "VBNET.ATG" out expr); -#line 2201 "VBNET.ATG" +#line 2194 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -4687,10 +4721,10 @@ out expr); } void FormalParameter( -#line 2270 "VBNET.ATG" +#line 2263 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2272 "VBNET.ATG" +#line 2265 "VBNET.ATG" TypeReference type = null; ParamModifiers mod = new ParamModifiers(this); Expression expr = null; @@ -4698,28 +4732,28 @@ out ParameterDeclarationExpression p) { while (StartOf(27)) { ParameterModifier( -#line 2277 "VBNET.ATG" +#line 2270 "VBNET.ATG" mod); } Identifier(); -#line 2278 "VBNET.ATG" +#line 2271 "VBNET.ATG" string parameterName = t.val; if ( -#line 2279 "VBNET.ATG" +#line 2272 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2279 "VBNET.ATG" +#line 2272 "VBNET.ATG" out arrayModifiers); } if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 2280 "VBNET.ATG" +#line 2273 "VBNET.ATG" out type); } -#line 2282 "VBNET.ATG" +#line 2275 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -4735,45 +4769,45 @@ out type); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 2294 "VBNET.ATG" +#line 2287 "VBNET.ATG" out expr); } -#line 2296 "VBNET.ATG" +#line 2289 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); } void ParameterModifier( -#line 2916 "VBNET.ATG" +#line 2915 "VBNET.ATG" ParamModifiers m) { if (la.kind == 55) { lexer.NextToken(); -#line 2917 "VBNET.ATG" +#line 2916 "VBNET.ATG" m.Add(ParamModifier.In); } else if (la.kind == 53) { lexer.NextToken(); -#line 2918 "VBNET.ATG" +#line 2917 "VBNET.ATG" m.Add(ParamModifier.Ref); } else if (la.kind == 137) { lexer.NextToken(); -#line 2919 "VBNET.ATG" +#line 2918 "VBNET.ATG" m.Add(ParamModifier.Optional); } else if (la.kind == 143) { lexer.NextToken(); -#line 2920 "VBNET.ATG" +#line 2919 "VBNET.ATG" m.Add(ParamModifier.Params); } else SynErr(251); } void Statement() { -#line 2324 "VBNET.ATG" +#line 2317 "VBNET.ATG" Statement stmt = null; Point startPos = la.Location; string label = String.Empty; @@ -4781,34 +4815,34 @@ ParamModifiers m) { if (la.kind == 1 || la.kind == 13) { } else if ( -#line 2330 "VBNET.ATG" +#line 2323 "VBNET.ATG" IsLabel()) { LabelName( -#line 2330 "VBNET.ATG" +#line 2323 "VBNET.ATG" out label); -#line 2332 "VBNET.ATG" +#line 2325 "VBNET.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(13); Statement(); } else if (StartOf(28)) { EmbeddedStatement( -#line 2335 "VBNET.ATG" +#line 2328 "VBNET.ATG" out stmt); -#line 2335 "VBNET.ATG" +#line 2328 "VBNET.ATG" compilationUnit.AddChild(stmt); } else if (StartOf(29)) { LocalDeclarationStatement( -#line 2336 "VBNET.ATG" +#line 2329 "VBNET.ATG" out stmt); -#line 2336 "VBNET.ATG" +#line 2329 "VBNET.ATG" compilationUnit.AddChild(stmt); } else SynErr(252); -#line 2339 "VBNET.ATG" +#line 2332 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -4817,30 +4851,30 @@ out stmt); } void LabelName( -#line 2722 "VBNET.ATG" +#line 2715 "VBNET.ATG" out string name) { -#line 2724 "VBNET.ATG" +#line 2717 "VBNET.ATG" name = String.Empty; if (StartOf(10)) { Identifier(); -#line 2726 "VBNET.ATG" +#line 2719 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 2727 "VBNET.ATG" +#line 2720 "VBNET.ATG" name = t.val; } else SynErr(253); } void EmbeddedStatement( -#line 2378 "VBNET.ATG" +#line 2371 "VBNET.ATG" out Statement statement) { -#line 2380 "VBNET.ATG" +#line 2373 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -4851,103 +4885,103 @@ out Statement statement) { case 94: { lexer.NextToken(); -#line 2386 "VBNET.ATG" +#line 2379 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 167: { lexer.NextToken(); -#line 2388 "VBNET.ATG" +#line 2381 "VBNET.ATG" exitType = ExitType.Sub; break; } case 100: { lexer.NextToken(); -#line 2390 "VBNET.ATG" +#line 2383 "VBNET.ATG" exitType = ExitType.Function; break; } case 146: { lexer.NextToken(); -#line 2392 "VBNET.ATG" +#line 2385 "VBNET.ATG" exitType = ExitType.Property; break; } case 83: { lexer.NextToken(); -#line 2394 "VBNET.ATG" +#line 2387 "VBNET.ATG" exitType = ExitType.Do; break; } case 98: { lexer.NextToken(); -#line 2396 "VBNET.ATG" +#line 2389 "VBNET.ATG" exitType = ExitType.For; break; } case 174: { lexer.NextToken(); -#line 2398 "VBNET.ATG" +#line 2391 "VBNET.ATG" exitType = ExitType.Try; break; } case 181: { lexer.NextToken(); -#line 2400 "VBNET.ATG" +#line 2393 "VBNET.ATG" exitType = ExitType.While; break; } case 155: { lexer.NextToken(); -#line 2402 "VBNET.ATG" +#line 2395 "VBNET.ATG" exitType = ExitType.Select; break; } default: SynErr(254); break; } -#line 2404 "VBNET.ATG" +#line 2397 "VBNET.ATG" statement = new ExitStatement(exitType); break; } case 174: { TryStatement( -#line 2405 "VBNET.ATG" +#line 2398 "VBNET.ATG" out statement); break; } case 186: { lexer.NextToken(); -#line 2406 "VBNET.ATG" +#line 2399 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 83 || la.kind == 98 || la.kind == 181) { if (la.kind == 83) { lexer.NextToken(); -#line 2406 "VBNET.ATG" +#line 2399 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 98) { lexer.NextToken(); -#line 2406 "VBNET.ATG" +#line 2399 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2406 "VBNET.ATG" +#line 2399 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2406 "VBNET.ATG" +#line 2399 "VBNET.ATG" statement = new ContinueStatement(continueType); break; } @@ -4955,11 +4989,11 @@ out statement); lexer.NextToken(); if (StartOf(19)) { Expr( -#line 2408 "VBNET.ATG" +#line 2401 "VBNET.ATG" out expr); } -#line 2408 "VBNET.ATG" +#line 2401 "VBNET.ATG" statement = new ThrowStatement(expr); break; } @@ -4967,27 +5001,27 @@ out expr); lexer.NextToken(); if (StartOf(19)) { Expr( -#line 2410 "VBNET.ATG" +#line 2403 "VBNET.ATG" out expr); } -#line 2410 "VBNET.ATG" +#line 2403 "VBNET.ATG" statement = new ReturnStatement(expr); break; } case 168: { lexer.NextToken(); Expr( -#line 2412 "VBNET.ATG" +#line 2405 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2412 "VBNET.ATG" +#line 2405 "VBNET.ATG" out embeddedStatement); Expect(88); Expect(168); -#line 2413 "VBNET.ATG" +#line 2406 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); break; } @@ -4995,42 +5029,42 @@ out embeddedStatement); lexer.NextToken(); Identifier(); -#line 2415 "VBNET.ATG" +#line 2408 "VBNET.ATG" name = t.val; if (la.kind == 24) { lexer.NextToken(); if (StartOf(18)) { ArgumentList( -#line 2416 "VBNET.ATG" +#line 2409 "VBNET.ATG" out p); } Expect(25); } -#line 2417 "VBNET.ATG" +#line 2410 "VBNET.ATG" statement = new RaiseEventStatement(name, p); break; } case 182: { WithStatement( -#line 2419 "VBNET.ATG" +#line 2412 "VBNET.ATG" out statement); break; } case 42: { lexer.NextToken(); -#line 2421 "VBNET.ATG" +#line 2414 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2422 "VBNET.ATG" +#line 2415 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2422 "VBNET.ATG" +#line 2415 "VBNET.ATG" out handlerExpr); -#line 2424 "VBNET.ATG" +#line 2417 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); break; @@ -5038,17 +5072,17 @@ out handlerExpr); case 152: { lexer.NextToken(); -#line 2427 "VBNET.ATG" +#line 2420 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2428 "VBNET.ATG" +#line 2421 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2428 "VBNET.ATG" +#line 2421 "VBNET.ATG" out handlerExpr); -#line 2430 "VBNET.ATG" +#line 2423 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); break; @@ -5056,16 +5090,16 @@ out handlerExpr); case 181: { lexer.NextToken(); Expr( -#line 2433 "VBNET.ATG" +#line 2426 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2434 "VBNET.ATG" +#line 2427 "VBNET.ATG" out embeddedStatement); Expect(88); Expect(181); -#line 2436 "VBNET.ATG" +#line 2429 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); break; @@ -5073,23 +5107,23 @@ out embeddedStatement); case 83: { lexer.NextToken(); -#line 2441 "VBNET.ATG" +#line 2434 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2444 "VBNET.ATG" +#line 2437 "VBNET.ATG" out conditionType); Expr( -#line 2444 "VBNET.ATG" +#line 2437 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2445 "VBNET.ATG" +#line 2438 "VBNET.ATG" out embeddedStatement); Expect(118); -#line 2448 "VBNET.ATG" +#line 2441 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5098,19 +5132,19 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2455 "VBNET.ATG" +#line 2448 "VBNET.ATG" out embeddedStatement); Expect(118); if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2456 "VBNET.ATG" +#line 2449 "VBNET.ATG" out conditionType); Expr( -#line 2456 "VBNET.ATG" +#line 2449 "VBNET.ATG" out expr); } -#line 2458 "VBNET.ATG" +#line 2451 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); } else SynErr(255); @@ -5119,7 +5153,7 @@ out expr); case 98: { lexer.NextToken(); -#line 2463 "VBNET.ATG" +#line 2456 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5128,24 +5162,24 @@ out expr); if (la.kind == 85) { lexer.NextToken(); LoopControlVariable( -#line 2470 "VBNET.ATG" +#line 2463 "VBNET.ATG" out typeReference, out typeName); Expect(109); Expr( -#line 2471 "VBNET.ATG" +#line 2464 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2472 "VBNET.ATG" +#line 2465 "VBNET.ATG" out embeddedStatement); Expect(128); if (StartOf(19)) { Expr( -#line 2473 "VBNET.ATG" +#line 2466 "VBNET.ATG" out expr); } -#line 2475 "VBNET.ATG" +#line 2468 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5157,53 +5191,53 @@ out expr); } else if (StartOf(10)) { -#line 2486 "VBNET.ATG" +#line 2479 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; Expression nextExpr = null;ArrayList nextExpressions = null; LoopControlVariable( -#line 2491 "VBNET.ATG" +#line 2484 "VBNET.ATG" out typeReference, out typeName); Expect(11); Expr( -#line 2492 "VBNET.ATG" +#line 2485 "VBNET.ATG" out start); Expect(172); Expr( -#line 2492 "VBNET.ATG" +#line 2485 "VBNET.ATG" out end); if (la.kind == 162) { lexer.NextToken(); Expr( -#line 2492 "VBNET.ATG" +#line 2485 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 2493 "VBNET.ATG" +#line 2486 "VBNET.ATG" out embeddedStatement); Expect(128); if (StartOf(19)) { Expr( -#line 2496 "VBNET.ATG" +#line 2489 "VBNET.ATG" out nextExpr); -#line 2496 "VBNET.ATG" +#line 2489 "VBNET.ATG" nextExpressions = new ArrayList(); nextExpressions.Add(nextExpr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2497 "VBNET.ATG" +#line 2490 "VBNET.ATG" out nextExpr); -#line 2497 "VBNET.ATG" +#line 2490 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 2500 "VBNET.ATG" +#line 2493 "VBNET.ATG" statement = new ForNextStatement(typeReference, typeName, start, end, step, embeddedStatement, nextExpressions); } else SynErr(256); @@ -5212,29 +5246,29 @@ out nextExpr); case 92: { lexer.NextToken(); Expr( -#line 2504 "VBNET.ATG" +#line 2497 "VBNET.ATG" out expr); -#line 2504 "VBNET.ATG" +#line 2497 "VBNET.ATG" statement = new ErrorStatement(expr); break; } case 151: { lexer.NextToken(); -#line 2506 "VBNET.ATG" +#line 2499 "VBNET.ATG" Expression redimclause = null; bool isPreserve = false; if (la.kind == 144) { lexer.NextToken(); -#line 2506 "VBNET.ATG" +#line 2499 "VBNET.ATG" isPreserve = true; } Expr( -#line 2507 "VBNET.ATG" +#line 2500 "VBNET.ATG" out redimclause); -#line 2509 "VBNET.ATG" +#line 2502 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; reDimStatement.ReDimClauses.Add(redimclause as InvocationExpression); @@ -5242,10 +5276,10 @@ out redimclause); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2513 "VBNET.ATG" +#line 2506 "VBNET.ATG" out redimclause); -#line 2513 "VBNET.ATG" +#line 2506 "VBNET.ATG" reDimStatement.ReDimClauses.Add(redimclause as InvocationExpression); } break; @@ -5253,10 +5287,10 @@ out redimclause); case 91: { lexer.NextToken(); Expr( -#line 2516 "VBNET.ATG" +#line 2509 "VBNET.ATG" out expr); -#line 2517 "VBNET.ATG" +#line 2510 "VBNET.ATG" ArrayList arrays = new ArrayList(); if (expr != null) { arrays.Add(expr);} EraseStatement eraseStatement = new EraseStatement(arrays); @@ -5265,53 +5299,53 @@ out expr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2522 "VBNET.ATG" +#line 2515 "VBNET.ATG" out expr); -#line 2522 "VBNET.ATG" +#line 2515 "VBNET.ATG" if (expr != null) { arrays.Add(expr); } } -#line 2523 "VBNET.ATG" +#line 2516 "VBNET.ATG" statement = eraseStatement; break; } case 163: { lexer.NextToken(); -#line 2525 "VBNET.ATG" +#line 2518 "VBNET.ATG" statement = new StopStatement(); break; } case 106: { lexer.NextToken(); Expr( -#line 2527 "VBNET.ATG" +#line 2520 "VBNET.ATG" out expr); if (la.kind == 170) { lexer.NextToken(); } if ( -#line 2529 "VBNET.ATG" +#line 2522 "VBNET.ATG" IsEndStmtAhead()) { Expect(88); -#line 2529 "VBNET.ATG" +#line 2522 "VBNET.ATG" statement = new IfElseStatement(expr, new EndStatement()); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2532 "VBNET.ATG" +#line 2525 "VBNET.ATG" out embeddedStatement); -#line 2534 "VBNET.ATG" +#line 2527 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 87 || -#line 2538 "VBNET.ATG" +#line 2531 "VBNET.ATG" IsElseIf()) { if ( -#line 2538 "VBNET.ATG" +#line 2531 "VBNET.ATG" IsElseIf()) { Expect(86); Expect(106); @@ -5319,20 +5353,20 @@ IsElseIf()) { lexer.NextToken(); } -#line 2541 "VBNET.ATG" +#line 2534 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 2542 "VBNET.ATG" +#line 2535 "VBNET.ATG" out condition); if (la.kind == 170) { lexer.NextToken(); } EndOfStmt(); Block( -#line 2543 "VBNET.ATG" +#line 2536 "VBNET.ATG" out block); -#line 2545 "VBNET.ATG" +#line 2538 "VBNET.ATG" ifStatement.ElseIfSections.Add(new ElseIfSection(condition, block)); } @@ -5340,59 +5374,59 @@ out block); lexer.NextToken(); EndOfStmt(); Block( -#line 2550 "VBNET.ATG" +#line 2543 "VBNET.ATG" out embeddedStatement); -#line 2552 "VBNET.ATG" +#line 2545 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(88); Expect(106); -#line 2556 "VBNET.ATG" +#line 2549 "VBNET.ATG" statement = ifStatement; } else if (StartOf(28)) { EmbeddedStatement( -#line 2559 "VBNET.ATG" +#line 2552 "VBNET.ATG" out embeddedStatement); -#line 2561 "VBNET.ATG" +#line 2554 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2563 "VBNET.ATG" +#line 2556 "VBNET.ATG" out embeddedStatement); -#line 2563 "VBNET.ATG" +#line 2556 "VBNET.ATG" ifStatement.TrueStatement.Add(embeddedStatement); } if (la.kind == 86) { lexer.NextToken(); if (StartOf(28)) { EmbeddedStatement( -#line 2565 "VBNET.ATG" +#line 2558 "VBNET.ATG" out embeddedStatement); } -#line 2567 "VBNET.ATG" +#line 2560 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2570 "VBNET.ATG" +#line 2563 "VBNET.ATG" out embeddedStatement); -#line 2571 "VBNET.ATG" +#line 2564 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } } -#line 2574 "VBNET.ATG" +#line 2567 "VBNET.ATG" statement = ifStatement; } else SynErr(257); break; @@ -5403,43 +5437,43 @@ out embeddedStatement); lexer.NextToken(); } Expr( -#line 2577 "VBNET.ATG" +#line 2570 "VBNET.ATG" out expr); EndOfStmt(); -#line 2578 "VBNET.ATG" +#line 2571 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 57) { -#line 2582 "VBNET.ATG" +#line 2575 "VBNET.ATG" List caseClauses = null; lexer.NextToken(); CaseClauses( -#line 2583 "VBNET.ATG" +#line 2576 "VBNET.ATG" out caseClauses); if ( -#line 2583 "VBNET.ATG" +#line 2576 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 2585 "VBNET.ATG" +#line 2578 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); Block( -#line 2587 "VBNET.ATG" +#line 2580 "VBNET.ATG" out block); -#line 2589 "VBNET.ATG" +#line 2582 "VBNET.ATG" selectSection.Children = block.Children; selectSections.Add(selectSection); } -#line 2593 "VBNET.ATG" +#line 2586 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(88); Expect(155); @@ -5447,43 +5481,43 @@ out block); } case 135: { -#line 2595 "VBNET.ATG" +#line 2588 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 2596 "VBNET.ATG" +#line 2589 "VBNET.ATG" out onErrorStatement); -#line 2596 "VBNET.ATG" +#line 2589 "VBNET.ATG" statement = onErrorStatement; break; } case 104: { -#line 2597 "VBNET.ATG" +#line 2590 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 2598 "VBNET.ATG" +#line 2591 "VBNET.ATG" out goToStatement); -#line 2598 "VBNET.ATG" +#line 2591 "VBNET.ATG" statement = goToStatement; break; } case 153: { -#line 2599 "VBNET.ATG" +#line 2592 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 2600 "VBNET.ATG" +#line 2593 "VBNET.ATG" out resumeStatement); -#line 2600 "VBNET.ATG" +#line 2593 "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 24: case 43: case 51: case 52: case 54: case 59: case 60: case 61: case 62: case 63: case 64: case 65: case 66: case 68: case 69: case 70: case 72: case 73: case 74: case 75: case 76: case 77: case 82: case 84: case 96: case 102: case 111: case 117: case 119: case 124: case 125: case 127: case 130: 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 196: case 197: case 198: case 199: { + 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 24: case 43: case 47: case 49: case 50: case 51: case 52: case 54: case 59: case 60: case 61: case 62: case 63: case 64: case 65: case 66: case 68: case 69: case 70: case 72: case 73: case 74: case 75: case 76: case 77: case 82: case 84: case 96: case 102: case 111: case 117: case 119: case 124: case 125: case 127: case 130: case 144: case 159: case 160: case 165: case 169: case 173: case 175: case 176: case 177: case 190: case 191: case 192: case 193: case 194: case 195: case 196: case 197: case 198: case 199: { -#line 2603 "VBNET.ATG" +#line 2596 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -5491,25 +5525,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; UnaryExpr( -#line 2609 "VBNET.ATG" +#line 2602 "VBNET.ATG" out expr); if (StartOf(30)) { AssignmentOperator( -#line 2611 "VBNET.ATG" +#line 2604 "VBNET.ATG" out op); Expr( -#line 2611 "VBNET.ATG" +#line 2604 "VBNET.ATG" out val); -#line 2611 "VBNET.ATG" +#line 2604 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 1 || la.kind == 13 || la.kind == 86) { -#line 2612 "VBNET.ATG" +#line 2605 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(258); -#line 2615 "VBNET.ATG" +#line 2608 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is FieldReferenceExpression || expr is IdentifierExpression) { @@ -5522,10 +5556,10 @@ out val); case 56: { lexer.NextToken(); UnaryExpr( -#line 2622 "VBNET.ATG" +#line 2615 "VBNET.ATG" out expr); -#line 2622 "VBNET.ATG" +#line 2615 "VBNET.ATG" statement = new StatementExpression(expr); break; } @@ -5533,7 +5567,7 @@ out expr); lexer.NextToken(); Identifier(); -#line 2624 "VBNET.ATG" +#line 2617 "VBNET.ATG" string resourcename = t.val, typeName; Statement resourceAquisition = null, block = null; @@ -5541,45 +5575,45 @@ out expr); if (la.kind == 127) { lexer.NextToken(); Qualident( -#line 2627 "VBNET.ATG" +#line 2620 "VBNET.ATG" out typeName); -#line 2628 "VBNET.ATG" +#line 2621 "VBNET.ATG" List initializer = null; if (la.kind == 24) { lexer.NextToken(); if (StartOf(18)) { ArgumentList( -#line 2629 "VBNET.ATG" +#line 2622 "VBNET.ATG" out initializer); } Expect(25); } -#line 2631 "VBNET.ATG" +#line 2624 "VBNET.ATG" resourceAquisition = new LocalVariableDeclaration(new VariableDeclaration(resourcename, new ArrayInitializerExpression(initializer), new TypeReference(typeName))); } else if (StartOf(10)) { Qualident( -#line 2634 "VBNET.ATG" +#line 2627 "VBNET.ATG" out typeName); Expect(11); Expr( -#line 2634 "VBNET.ATG" +#line 2627 "VBNET.ATG" out expr); -#line 2636 "VBNET.ATG" +#line 2629 "VBNET.ATG" resourceAquisition = new LocalVariableDeclaration(new VariableDeclaration(resourcename, expr, new TypeReference(typeName))); } else SynErr(259); Block( -#line 2639 "VBNET.ATG" +#line 2632 "VBNET.ATG" out block); Expect(88); Expect(188); -#line 2641 "VBNET.ATG" +#line 2634 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); break; } @@ -5588,10 +5622,10 @@ out block); } void LocalDeclarationStatement( -#line 2347 "VBNET.ATG" +#line 2340 "VBNET.ATG" out Statement statement) { -#line 2349 "VBNET.ATG" +#line 2342 "VBNET.ATG" Modifiers m = new Modifiers(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -5600,22 +5634,22 @@ out Statement statement) { if (la.kind == 71) { lexer.NextToken(); -#line 2355 "VBNET.ATG" +#line 2348 "VBNET.ATG" m.Add(Modifier.Const, t.Location); } else if (la.kind == 161) { lexer.NextToken(); -#line 2356 "VBNET.ATG" +#line 2349 "VBNET.ATG" m.Add(Modifier.Static, t.Location); } else { lexer.NextToken(); -#line 2357 "VBNET.ATG" +#line 2350 "VBNET.ATG" dimfound = true; } } -#line 2360 "VBNET.ATG" +#line 2353 "VBNET.ATG" if(dimfound && (m.Modifier & Modifier.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -5628,137 +5662,137 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2371 "VBNET.ATG" +#line 2364 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2372 "VBNET.ATG" +#line 2365 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2374 "VBNET.ATG" +#line 2367 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 2834 "VBNET.ATG" +#line 2827 "VBNET.ATG" out Statement tryStatement) { -#line 2836 "VBNET.ATG" +#line 2829 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(174); EndOfStmt(); Block( -#line 2839 "VBNET.ATG" +#line 2832 "VBNET.ATG" out blockStmt); if (la.kind == 58 || la.kind == 88 || la.kind == 97) { CatchClauses( -#line 2840 "VBNET.ATG" +#line 2833 "VBNET.ATG" out catchClauses); } if (la.kind == 97) { lexer.NextToken(); EndOfStmt(); Block( -#line 2841 "VBNET.ATG" +#line 2834 "VBNET.ATG" out finallyStmt); } Expect(88); Expect(174); -#line 2844 "VBNET.ATG" +#line 2837 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 2812 "VBNET.ATG" +#line 2805 "VBNET.ATG" out Statement withStatement) { -#line 2814 "VBNET.ATG" +#line 2807 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(182); -#line 2817 "VBNET.ATG" +#line 2810 "VBNET.ATG" Point start = t.Location; Expr( -#line 2818 "VBNET.ATG" +#line 2811 "VBNET.ATG" out expr); EndOfStmt(); -#line 2820 "VBNET.ATG" +#line 2813 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; withStatements.Push(withStatement); Block( -#line 2824 "VBNET.ATG" +#line 2817 "VBNET.ATG" out blockStmt); -#line 2826 "VBNET.ATG" +#line 2819 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; withStatements.Pop(); Expect(88); Expect(182); -#line 2830 "VBNET.ATG" +#line 2823 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 2805 "VBNET.ATG" +#line 2798 "VBNET.ATG" out ConditionType conditionType) { -#line 2806 "VBNET.ATG" +#line 2799 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 181) { lexer.NextToken(); -#line 2807 "VBNET.ATG" +#line 2800 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 177) { lexer.NextToken(); -#line 2808 "VBNET.ATG" +#line 2801 "VBNET.ATG" conditionType = ConditionType.Until; } else SynErr(261); } void LoopControlVariable( -#line 2646 "VBNET.ATG" +#line 2639 "VBNET.ATG" out TypeReference type, out string name) { -#line 2647 "VBNET.ATG" +#line 2640 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 2651 "VBNET.ATG" +#line 2644 "VBNET.ATG" out name); if ( -#line 2652 "VBNET.ATG" +#line 2645 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2652 "VBNET.ATG" +#line 2645 "VBNET.ATG" out arrayModifiers); } if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 2653 "VBNET.ATG" +#line 2646 "VBNET.ATG" out type); -#line 2653 "VBNET.ATG" +#line 2646 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 2655 "VBNET.ATG" +#line 2648 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -5776,48 +5810,48 @@ out type); } void CaseClauses( -#line 2765 "VBNET.ATG" +#line 2758 "VBNET.ATG" out List caseClauses) { -#line 2767 "VBNET.ATG" +#line 2760 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 2770 "VBNET.ATG" +#line 2763 "VBNET.ATG" out caseClause); -#line 2770 "VBNET.ATG" +#line 2763 "VBNET.ATG" caseClauses.Add(caseClause); while (la.kind == 12) { lexer.NextToken(); CaseClause( -#line 2771 "VBNET.ATG" +#line 2764 "VBNET.ATG" out caseClause); -#line 2771 "VBNET.ATG" +#line 2764 "VBNET.ATG" caseClauses.Add(caseClause); } } void OnErrorStatement( -#line 2672 "VBNET.ATG" +#line 2665 "VBNET.ATG" out OnErrorStatement stmt) { -#line 2674 "VBNET.ATG" +#line 2667 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(135); Expect(92); if ( -#line 2680 "VBNET.ATG" +#line 2673 "VBNET.ATG" IsNegativeLabelName()) { Expect(104); Expect(15); Expect(5); -#line 2682 "VBNET.ATG" +#line 2675 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -5826,10 +5860,10 @@ IsNegativeLabelName()) { } else if (la.kind == 104) { GotoStatement( -#line 2688 "VBNET.ATG" +#line 2681 "VBNET.ATG" out goToStatement); -#line 2690 "VBNET.ATG" +#line 2683 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -5846,63 +5880,63 @@ out goToStatement); lexer.NextToken(); Expect(128); -#line 2704 "VBNET.ATG" +#line 2697 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); } else SynErr(262); } void GotoStatement( -#line 2710 "VBNET.ATG" +#line 2703 "VBNET.ATG" out ICSharpCode.NRefactory.Parser.AST.GotoStatement goToStatement) { -#line 2712 "VBNET.ATG" +#line 2705 "VBNET.ATG" string label = String.Empty; Expect(104); LabelName( -#line 2715 "VBNET.ATG" +#line 2708 "VBNET.ATG" out label); -#line 2717 "VBNET.ATG" +#line 2710 "VBNET.ATG" goToStatement = new ICSharpCode.NRefactory.Parser.AST.GotoStatement(label); } void ResumeStatement( -#line 2754 "VBNET.ATG" +#line 2747 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 2756 "VBNET.ATG" +#line 2749 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 2759 "VBNET.ATG" +#line 2752 "VBNET.ATG" IsResumeNext()) { Expect(153); Expect(128); -#line 2760 "VBNET.ATG" +#line 2753 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 153) { lexer.NextToken(); if (StartOf(31)) { LabelName( -#line 2761 "VBNET.ATG" +#line 2754 "VBNET.ATG" out label); } -#line 2761 "VBNET.ATG" +#line 2754 "VBNET.ATG" resumeStatement = new ResumeStatement(label); } else SynErr(263); } void CaseClause( -#line 2775 "VBNET.ATG" +#line 2768 "VBNET.ATG" out CaseLabel caseClause) { -#line 2777 "VBNET.ATG" +#line 2770 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -5911,7 +5945,7 @@ out CaseLabel caseClause) { if (la.kind == 86) { lexer.NextToken(); -#line 2783 "VBNET.ATG" +#line 2776 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(32)) { if (la.kind == 113) { @@ -5921,76 +5955,76 @@ out CaseLabel caseClause) { case 27: { lexer.NextToken(); -#line 2787 "VBNET.ATG" +#line 2780 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 26: { lexer.NextToken(); -#line 2788 "VBNET.ATG" +#line 2781 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 30: { lexer.NextToken(); -#line 2789 "VBNET.ATG" +#line 2782 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 29: { lexer.NextToken(); -#line 2790 "VBNET.ATG" +#line 2783 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 11: { lexer.NextToken(); -#line 2791 "VBNET.ATG" +#line 2784 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 28: { lexer.NextToken(); -#line 2792 "VBNET.ATG" +#line 2785 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } default: SynErr(264); break; } Expr( -#line 2794 "VBNET.ATG" +#line 2787 "VBNET.ATG" out expr); -#line 2796 "VBNET.ATG" +#line 2789 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(19)) { Expr( -#line 2798 "VBNET.ATG" +#line 2791 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); Expr( -#line 2798 "VBNET.ATG" +#line 2791 "VBNET.ATG" out sexpr); } -#line 2800 "VBNET.ATG" +#line 2793 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); } else SynErr(265); } void CatchClauses( -#line 2849 "VBNET.ATG" +#line 2842 "VBNET.ATG" out List catchClauses) { -#line 2851 "VBNET.ATG" +#line 2844 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -6002,27 +6036,27 @@ out List catchClauses) { if (StartOf(10)) { Identifier(); -#line 2859 "VBNET.ATG" +#line 2852 "VBNET.ATG" name = t.val; if (la.kind == 48) { lexer.NextToken(); TypeName( -#line 2859 "VBNET.ATG" +#line 2852 "VBNET.ATG" out type); } } if (la.kind == 180) { lexer.NextToken(); Expr( -#line 2860 "VBNET.ATG" +#line 2853 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 2862 "VBNET.ATG" +#line 2855 "VBNET.ATG" out blockStmt); -#line 2863 "VBNET.ATG" +#line 2856 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } @@ -6358,34 +6392,34 @@ 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,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,T,x, x,x,x,T, 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,x, x,x,x,T, x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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,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,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,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,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,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,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,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, 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,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,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,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,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,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,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,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,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,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,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,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,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,T,T,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, T,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, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, x,x,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,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,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,T,x, T,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, T,T,x,x, x,x,x,T, T,x,x,T, 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, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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,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,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,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,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,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,T, x,T,T,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, 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,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,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,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,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,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,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x}, - {x,T,T,T, T,T,T,T, T,T,T,x, x,T,T,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,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,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, 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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,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, 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,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,T,T,T, T,T,T,T, T,T,T,x, x,T,T,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,T,T, x,x,x,T, x,T,T,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, T,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, T,T,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,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,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,x,x,x, x,x,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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,x,x, x,x,x}, {x,x,x,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,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,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,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,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,T,T,T, T,T,T,T, T,T,T,x, x,T,T,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,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,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, T,T,T,T, 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,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,T, x,T,T,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, T,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, T,T,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,T,T, T,T,T,T, x,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,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,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,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,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, T,T,T,T, 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,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,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, T,T,T,T, 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,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,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, 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,x,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,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,T,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,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,T,T,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, T,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, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, 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,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,T,T,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, T,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, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, 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,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,T, x,T,T,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, T,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, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,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, 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,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,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,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,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,T,T, T,T,T,T, 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,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,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, T,T,T,T, x,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,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,T,T,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, T,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, T,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,T, x,x,x,x, x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,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,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, 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,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,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,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,T,T, T,T,T,T, T,T,T,x, x,x,T,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,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,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, 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,x,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,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,T,T, T,T,T,T, T,T,T,x, x,x,T,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,T,T, x,x,x,T, x,T,T,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, T,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, T,T,x,x, x,T,T,x, x,x,T,x, T,x,T,T, T,T,T,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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,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, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,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,x,x, x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,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,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,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,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,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,T, x,T,T,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, 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,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,T, 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, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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} }; diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index ba2794016c..996658cbab 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -823,10 +823,8 @@ InterfaceBody = EOL . -/* - The information provided in the spec about - interface declarations is wrong -*/ +/* The information provided in the spec about */ +/* interface declarations is wrong */ InterfaceMemberDecl (. TypeReference type =null; @@ -838,9 +836,8 @@ InterfaceMemberDecl string name; .) = { AttributeSection (. attributes.Add(section); .) } - /* this is different to c#: not only the Shadows modifier is allowed, - also member modifiers like overloads etc. - */ + /* this is different to c#: not only the Shadows modifier is allowed, */ + /* also member modifiers like overloads etc. */ { MemberModifier } ( "Event" @@ -1697,10 +1694,6 @@ EventMemberSpecifier Expr = ConditionalOrExpr -/* { - (. AssignmentOperatorType op; Expression val; .) - AssignmentOperator Expr (. expr = new AssignmentExpression(expr, op, val); .) - }*/ . UnaryExpr @@ -2883,6 +2876,12 @@ Identifier = | "Text" | "Binary" | "Compare" + | "Assembly" + | "Ansi" + | "Auto" + | "Preserve" + | "Unicode" + | "Until" . /* 2.2 */ @@ -2933,26 +2932,26 @@ TypeModifier . MemberModifier = - "MustInherit" (.m.Add(Modifier.Abstract, t.Location);.) - |"Default" (.m.Add(Modifier.Default, t.Location);.) - |"Friend" (.m.Add(Modifier.Internal, t.Location);.) - |"Shadows" (.m.Add(Modifier.New, t.Location);.) - |"Overrides" (.m.Add(Modifier.Override, t.Location);.) - |"MustOverride" (.m.Add(Modifier.Abstract, t.Location);.) - |"Private" (.m.Add(Modifier.Private, t.Location);.) - |"Protected" (.m.Add(Modifier.Protected, t.Location);.) - |"Public" (.m.Add(Modifier.Public, t.Location);.) - |"NotInheritable" (.m.Add(Modifier.Sealed, t.Location);.) - |"NotOverridable" (.m.Add(Modifier.Sealed, t.Location);.) - |"Shared" (.m.Add(Modifier.Static, t.Location);.) - |"Overridable" (.m.Add(Modifier.Virtual, t.Location);.) - |"Overloads" (.m.Add(Modifier.Overloads, t.Location);.) - | "ReadOnly" (. /* m.Add(Modifier.ReadOnly); */ .) - | "WriteOnly" (. /* m.Add(Modifier.WriteOnly); */ .) + "MustInherit" (.m.Add(Modifier.Abstract, t.Location);.) + | "Default" (.m.Add(Modifier.Default, t.Location);.) + | "Friend" (.m.Add(Modifier.Internal, t.Location);.) + | "Shadows" (.m.Add(Modifier.New, t.Location);.) + | "Overrides" (.m.Add(Modifier.Override, t.Location);.) + | "MustOverride" (.m.Add(Modifier.Abstract, t.Location);.) + | "Private" (.m.Add(Modifier.Private, t.Location);.) + | "Protected" (.m.Add(Modifier.Protected, t.Location);.) + | "Public" (.m.Add(Modifier.Public, t.Location);.) + | "NotInheritable" (.m.Add(Modifier.Sealed, t.Location);.) + | "NotOverridable" (.m.Add(Modifier.Sealed, t.Location);.) + | "Shared" (.m.Add(Modifier.Static, t.Location);.) + | "Overridable" (.m.Add(Modifier.Virtual, t.Location);.) + | "Overloads" (.m.Add(Modifier.Overloads, t.Location);.) + | "ReadOnly" (.m.Add(Modifier.ReadOnly, t.Location);.) + | "WriteOnly" (.m.Add(Modifier.WriteOnly, t.Location);.) | "WithEvents" (.m.Add(Modifier.WithEvents, t.Location);.) | "Dim" (.m.Add(Modifier.Dim, t.Location);.) | "Widening" (.m.Add(Modifier.Widening, t.Location);.) | "Narrowing" (.m.Add(Modifier.Narrowing, t.Location);.) - . +. END VBNET. diff --git a/src/Libraries/NRefactory/Test/Output/CSharp/CSharpOutputTest.cs b/src/Libraries/NRefactory/Test/Output/CSharp/CSharpOutputTest.cs index 7d8c6d4f6b..8f8fe78694 100644 --- a/src/Libraries/NRefactory/Test/Output/CSharp/CSharpOutputTest.cs +++ b/src/Libraries/NRefactory/Test/Output/CSharp/CSharpOutputTest.cs @@ -204,5 +204,32 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter { TestStatement("using (A a = new A()) { a.Work(); }"); } + + [Test] + public void AbstractProperty() + { + TestTypeMember("public abstract bool ExpectsValue { get; set; }"); + TestTypeMember("public abstract bool ExpectsValue { get; }"); + TestTypeMember("public abstract bool ExpectsValue { set; }"); + } + + [Test] + public void AbstractMethod() + { + TestTypeMember("public abstract void Run();"); + TestTypeMember("public abstract bool Run();"); + } + + [Test] + public void Interface() + { + TestProgram("interface ITest {" + + " bool GetterAndSetter { get; set; }" + + " bool GetterOnly { get; }" + + " bool SetterOnly { set; }" + + " void InterfaceMethod();" + + " string InterfaceMethod2();\n" + + "}"); + } } } diff --git a/src/Libraries/NRefactory/Test/Output/VBNet/VBNetOutputTest.cs b/src/Libraries/NRefactory/Test/Output/VBNet/VBNetOutputTest.cs index 37a2a289cf..73c9a55dd9 100644 --- a/src/Libraries/NRefactory/Test/Output/VBNet/VBNetOutputTest.cs +++ b/src/Libraries/NRefactory/Test/Output/VBNet/VBNetOutputTest.cs @@ -102,6 +102,13 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter TestExpression("a = b"); } + [Test] + public void SpecialIdentifiers() + { + // Assembly, Ansi and Until are contextual keywords + TestExpression("Assembly = Ansi * [For] + Until"); + } + [Test] public void Integer() { @@ -173,5 +180,32 @@ namespace ICSharpCode.NRefactory.Tests.PrettyPrinter { TestExpression("CStr(a)"); } + + [Test] + public void AbstractProperty() + { + TestTypeMember("Public MustOverride Property ExpectsValue() As Boolean"); + TestTypeMember("Public MustOverride ReadOnly Property ExpectsValue() As Boolean"); + TestTypeMember("Public MustOverride WriteOnly Property ExpectsValue() As Boolean"); + } + + [Test] + public void AbstractMethod() + { + TestTypeMember("Public MustOverride Sub Run()"); + TestTypeMember("Public MustOverride Function Run() As Boolean"); + } + + [Test] + public void Interface() + { + TestProgram("Interface ITest\n" + + "Property GetterAndSetter() As Boolean\n" + + "ReadOnly Property GetterOnly() As Boolean\n" + + "WriteOnly Property SetterOnly() As Boolean\n" + + "Sub InterfaceMethod()\n" + + "Function InterfaceMethod2() As String\n" + + "End Interface"); + } } } diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/IdentifierExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/IdentifierExpressionTests.cs index 0607f2410a..1a78ce9f1f 100644 --- a/src/Libraries/NRefactory/Test/Parser/Expressions/IdentifierExpressionTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/Expressions/IdentifierExpressionTests.cs @@ -1,4 +1,4 @@ -// +// // 2002-2005 AlphaSierraPapa // GNU General Public License // @@ -46,6 +46,13 @@ namespace ICSharpCode.NRefactory.Tests.AST IdentifierExpression ie = ParseUtilVBNet.ParseExpression("[Public]"); Assert.AreEqual("Public", ie.Identifier); } + + [Test] + public void VBNetAssemblyIdentifierExpressionTest() + { + IdentifierExpression ie = ParseUtilVBNet.ParseExpression("Assembly"); + Assert.AreEqual("Assembly", ie.Identifier); + } #endregion } diff --git a/src/SharpDevelop.WithBooInterpreter.sln b/src/SharpDevelop.WithBooInterpreter.sln deleted file mode 100644 index 9c93f38bca..0000000000 --- a/src/SharpDevelop.WithBooInterpreter.sln +++ /dev/null @@ -1,259 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# SharpDevelop 2.0.0.639 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XmlEditor", "AddIns\DisplayBindings\XmlEditor\Project\XmlEditor.csproj", "{6B717BD1-CD5E-498C-A42E-9E6A4584DC48}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormDesigner", "AddIns\DisplayBindings\FormDesigner\Project\FormDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{A33008B1-5DAC-44D5-9060-242E3B6E38F2}") = "Boo.InterpreterAddIn", "AddIns\BackendBindings\Boo\Boo.InterpreterAddIn\Project\Boo.InterpreterAddIn.booproj", "{928E34B2-5E46-4A4D-8E4D-2CA2CCDB905A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILAsmBinding", "AddIns\BackendBindings\ILAsmBinding\Project\ILAsmBinding.csproj", "{6e59af58-f635-459a-9a35-c9ac41c00339}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNetBinding", "AddIns\BackendBindings\VBNetBinding\Project\VBNetBinding.csproj", "{BF38FB72-B380-4196-AF8C-95749D726C61}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSharpBinding", "AddIns\BackendBindings\CSharpBinding\Project\CSharpBinding.csproj", "{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NAntAddIn", "AddIns\Misc\NAntAddIn\Project\NAntAddIn.csproj", "{1DB3CAD2-38E8-4C5E-8E1B-0E37B1A5C006}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MbUnitPad", "AddIns\Misc\MbUnitPad\Project\MbUnitPad.csproj", "{B1CE28A0-04E8-490D-8256-E0C4D52C93C8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlHelp2", "AddIns\Misc\HtmlHelp2\Project\HtmlHelp2.csproj", "{918487B7-2153-4618-BBB3-344DBDDF2A2A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debugger", "Debugger", "{6604365C-C702-4C10-9BA8-637F1E3D4D0D}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.AddIn", "AddIns\Misc\Debugger\Debugger.AddIn\Project\Debugger.AddIn.csproj", "{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Debugger.Core", "AddIns\Misc\Debugger\Debugger.Core\Project\Debugger.Core.csproj", "{1D18D788-F7EE-4585-A23B-34DC8EC63CB8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TreeListView", "AddIns\Misc\Debugger\TreeListView\Project\TreeListView.csproj", "{B08385CD-F0CC-488C-B4F4-EEB34B6D2688}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FiletypeRegisterer", "AddIns\Misc\FiletypeRegisterer\Project\FiletypeRegisterer.csproj", "{D022A6CE-7438-41E8-AC64-F2DE18EC54C6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighlightingEditor", "AddIns\Misc\HighlightingEditor\Project\HighlightingEditor.csproj", "{8A462940-E5E9-4E85-982D-D4C006EE31D4}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegExpTk", "AddIns\Misc\RegExpTk\Project\RegExpTk.csproj", "{64A3E5E6-90BF-47F6-94DF-68C94B62C817}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\StartPage\Project\StartPage.csproj", "{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Libraries\NUnit.Framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Build.Tasks", "Libraries\ICSharpCode.Build.Tasks\Project\ICSharpCode.Build.Tasks.csproj", "{4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}" - ProjectSection(SolutionItems) = postProject - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}" -EndProject -Project("{00000000-0000-0000-0000-000000000000}") = "Tools", "Tools\Tools.build", "{2ba4dbc4-a228-45bf-9584-e017d596b45f}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1152B71B-3C05-4598-B20D-823B5D40559E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1152B71B-3C05-4598-B20D-823B5D40559E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1152B71B-3C05-4598-B20D-823B5D40559E}.Release|Any CPU.Build.0 = Release|Any CPU - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.Build.0 = Release|Any CPU - {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.Build.0 = Release|Any CPU - {98B10E98-003C-45A0-9587-119142E39986}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98B10E98-003C-45A0-9587-119142E39986}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98B10E98-003C-45A0-9587-119142E39986}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98B10E98-003C-45A0-9587-119142E39986}.Release|Any CPU.Build.0 = Release|Any CPU - {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.Build.0 = Release|Any CPU - {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.Build.0 = Release|Any CPU - {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}.Release|Any CPU.Build.0 = Release|Any CPU - {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B8F0F98-8BE1-402B-AA8B-C8D548577B38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4B8F0F98-8BE1-402B-AA8B-C8D548577B38}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51}.Release|Any CPU.Build.0 = Release|Any CPU - {64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Debug|Any CPU.Build.0 = Debug|Any CPU - {64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Release|Any CPU.ActiveCfg = Release|Any CPU - {64A3E5E6-90BF-47F6-94DF-68C94B62C817}.Release|Any CPU.Build.0 = Release|Any CPU - {8A462940-E5E9-4E85-982D-D4C006EE31D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A462940-E5E9-4E85-982D-D4C006EE31D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A462940-E5E9-4E85-982D-D4C006EE31D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A462940-E5E9-4E85-982D-D4C006EE31D4}.Release|Any CPU.Build.0 = Release|Any CPU - {D022A6CE-7438-41E8-AC64-F2DE18EC54C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D022A6CE-7438-41E8-AC64-F2DE18EC54C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D022A6CE-7438-41E8-AC64-F2DE18EC54C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D022A6CE-7438-41E8-AC64-F2DE18EC54C6}.Release|Any CPU.Build.0 = Release|Any CPU - {A82F44D7-F336-4AD6-B2EE-D2C082D094EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A82F44D7-F336-4AD6-B2EE-D2C082D094EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBC6C247-747B-4908-B09A-4D2E0F640B6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CBC6C247-747B-4908-B09A-4D2E0F640B6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CBC6C247-747B-4908-B09A-4D2E0F640B6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CBC6C247-747B-4908-B09A-4D2E0F640B6B}.Release|Any CPU.Build.0 = Release|Any CPU - {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Release|Any CPU.Build.0 = Release|Any CPU - {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A}.Release|Any CPU.Build.0 = Release|Any CPU - {BF38FB72-B380-4196-AF8C-95749D726C61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF38FB72-B380-4196-AF8C-95749D726C61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF38FB72-B380-4196-AF8C-95749D726C61}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF38FB72-B380-4196-AF8C-95749D726C61}.Release|Any CPU.Build.0 = Release|Any CPU - {2BA4DBC4-A228-45BF-9584-E017D596B45F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2BA4DBC4-A228-45BF-9584-E017D596B45F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2BA4DBC4-A228-45BF-9584-E017D596B45F}.Release|Any CPU.Build.0 = Release|Any CPU - {2BA4DBC4-A228-45BF-9584-E017D596B45F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.Build.0 = Release|Any CPU - {83DD7E12-A705-4DBA-9D71-09C8973D9382}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Release|Any CPU.Build.0 = Release|Any CPU - {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B717BD1-CD5E-498C-A42E-9E6A4584DC48}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B717BD1-CD5E-498C-A42E-9E6A4584DC48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B717BD1-CD5E-498C-A42E-9E6A4584DC48}.Release|Any CPU.Build.0 = Release|Any CPU - {6B717BD1-CD5E-498C-A42E-9E6A4584DC48}.Release|Any CPU.ActiveCfg = Release|Any CPU - {928E34B2-5E46-4A4D-8E4D-2CA2CCDB905A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {928E34B2-5E46-4A4D-8E4D-2CA2CCDB905A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {928E34B2-5E46-4A4D-8E4D-2CA2CCDB905A}.Release|Any CPU.Build.0 = Release|Any CPU - {928E34B2-5E46-4A4D-8E4D-2CA2CCDB905A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4AC2D5F1-F671-480C-A075-6BF62B3721B2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4AC2D5F1-F671-480C-A075-6BF62B3721B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4AC2D5F1-F671-480C-A075-6BF62B3721B2}.Release|Any CPU.Build.0 = Release|Any CPU - {4AC2D5F1-F671-480C-A075-6BF62B3721B2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E59AF58-F635-459A-9A35-C9AC41C00339}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E59AF58-F635-459A-9A35-C9AC41C00339}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E59AF58-F635-459A-9A35-C9AC41C00339}.Release|Any CPU.Build.0 = Release|Any CPU - {6E59AF58-F635-459A-9A35-C9AC41C00339}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1DB3CAD2-38E8-4C5E-8E1B-0E37B1A5C006}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1DB3CAD2-38E8-4C5E-8E1B-0E37B1A5C006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1DB3CAD2-38E8-4C5E-8E1B-0E37B1A5C006}.Release|Any CPU.Build.0 = Release|Any CPU - {1DB3CAD2-38E8-4C5E-8E1B-0E37B1A5C006}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1CE28A0-04E8-490D-8256-E0C4D52C93C8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1CE28A0-04E8-490D-8256-E0C4D52C93C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1CE28A0-04E8-490D-8256-E0C4D52C93C8}.Release|Any CPU.Build.0 = Release|Any CPU - {B1CE28A0-04E8-490D-8256-E0C4D52C93C8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {918487B7-2153-4618-BBB3-344DBDDF2A2A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {918487B7-2153-4618-BBB3-344DBDDF2A2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {918487B7-2153-4618-BBB3-344DBDDF2A2A}.Release|Any CPU.Build.0 = Release|Any CPU - {918487B7-2153-4618-BBB3-344DBDDF2A2A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Any CPU.Build.0 = Release|Any CPU - {17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Release|Any CPU.Build.0 = Release|Any CPU - {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Release|Any CPU.Build.0 = Release|Any CPU - {1D18D788-F7EE-4585-A23B-34DC8EC63CB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B08385CD-F0CC-488C-B4F4-EEB34B6D2688}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B08385CD-F0CC-488C-B4F4-EEB34B6D2688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B08385CD-F0CC-488C-B4F4-EEB34B6D2688}.Release|Any CPU.Build.0 = Release|Any CPU - {B08385CD-F0CC-488C-B4F4-EEB34B6D2688}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4B8F0F98-8BE1-402B-AA8B-C8D548577B38}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4B8F0F98-8BE1-402B-AA8B-C8D548577B38}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5} - {CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} - {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} - {6B717BD1-CD5E-498C-A42E-9E6A4584DC48} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79} - {1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} - {BF38FB72-B380-4196-AF8C-95749D726C61} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} - {6e59af58-f635-459a-9a35-c9ac41c00339} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} - {4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} - {928E34B2-5E46-4A4D-8E4D-2CA2CCDB905A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} - {4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {8A462940-E5E9-4E85-982D-D4C006EE31D4} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {D022A6CE-7438-41E8-AC64-F2DE18EC54C6} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {6604365C-C702-4C10-9BA8-637F1E3D4D0D} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {918487B7-2153-4618-BBB3-344DBDDF2A2A} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {B1CE28A0-04E8-490D-8256-E0C4D52C93C8} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {1DB3CAD2-38E8-4C5E-8E1B-0E37B1A5C006} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} - {B08385CD-F0CC-488C-B4F4-EEB34B6D2688} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} - {1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} - {EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D} - {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {4139CCF6-FB49-4A9D-B2CF-331E9EA3198D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C} - {1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - {2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486} - EndGlobalSection -EndGlobal