diff --git a/data/ConversionStyleSheets/ShowChangeLog.xsl b/data/ConversionStyleSheets/ShowChangeLog.xsl index 0ff1a14596..9430966531 100644 --- a/data/ConversionStyleSheets/ShowChangeLog.xsl +++ b/data/ConversionStyleSheets/ShowChangeLog.xsl @@ -5,7 +5,7 @@ - + diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/BrowserScheme.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/BrowserScheme.cs index eef3e6e171..9c39546ad3 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/BrowserScheme.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/BrowserScheme.cs @@ -1,9 +1,9 @@ -/* - * Created by SharpDevelop. - * User: Daniel Grunwald - * Date: 06.08.2005 - * Time: 16:13 - */ +// +// 2002-2005 AlphaSierraPapa +// GNU General Public License +// +// $Revision$ +// using System; using System.Windows.Forms; diff --git a/src/AddIns/Misc/HtmlHelp2/Project/src/MsHelpProvider.cs b/src/AddIns/Misc/HtmlHelp2/Project/src/MsHelpProvider.cs index 7c40f9465f..7a4908c3dc 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/src/MsHelpProvider.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/src/MsHelpProvider.cs @@ -1,9 +1,9 @@ -/* - * Created by SharpDevelop. - * User: Daniel Grunwald - * Date: 13.08.2005 - * Time: 15:36 - */ +// +// 2002-2005 AlphaSierraPapa +// GNU General Public License +// +// $Revision$ +// using System; using ICSharpCode.Core; diff --git a/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs index dbd647e05b..ba64bf91c5 100644 --- a/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/MbUnitPad/Project/Configuration/AssemblyInfo.cs @@ -1,4 +1,11 @@ -using System.Reflection; +// +// 2002-2005 AlphaSierraPapa +// GNU General Public License +// +// $Revision$ +// + +using System.Reflection; using System.Runtime.CompilerServices; // Information about this assembly is defined by the following @@ -24,4 +31,3 @@ using System.Runtime.CompilerServices; // numbers with the '*' character (the default): [assembly: AssemblyVersion("2.0.0.1")] - diff --git a/src/AddIns/Misc/StartPage/Project/Src/ICSharpCodePage.cs b/src/AddIns/Misc/StartPage/Project/Src/ICSharpCodePage.cs index 52516d21aa..b616a3c9bb 100644 --- a/src/AddIns/Misc/StartPage/Project/Src/ICSharpCodePage.cs +++ b/src/AddIns/Misc/StartPage/Project/Src/ICSharpCodePage.cs @@ -597,8 +597,9 @@ namespace ICSharpCode.StartPage transform.Load(Path.Combine(PropertyService.DataDirectory, "ConversionStyleSheets/ShowChangeLog.xsl")); StringWriter writer = new StringWriter(); XmlTextWriter xmlWriter = new XmlTextWriter(writer); + xmlWriter.Formatting = Formatting.None; transform.Transform(Path.Combine(FileUtility.SharpDevelopRootPath, "doc/ChangeLog.xml"), xmlWriter); - changeLogHtml = writer.ToString(); + changeLogHtml = writer.ToString().Replace("\n", "\n
"); } builder.Append(changeLogHtml); } catch (Exception e) { diff --git a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/TypeLevel/EventDeclaration.cs b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/TypeLevel/EventDeclaration.cs index 285d09bec9..cf55f32f5c 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/AST/General/TypeLevel/EventDeclaration.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/AST/General/TypeLevel/EventDeclaration.cs @@ -17,11 +17,12 @@ namespace ICSharpCode.NRefactory.Parser.AST public class EventDeclaration : ParametrizedNode { TypeReference typeReference = TypeReference.Null; - List variableDeclarators = new List(1); + List variableDeclarators = new List(1); // ArrayList implementsClause = new ArrayList(); // VB only ArrayList implementsClause = new ArrayList(); // VB only - EventAddRegion addRegion = EventAddRegion.Null; // only for C# - EventRemoveRegion removeRegion = EventRemoveRegion.Null; // only for C# + EventAddRegion addRegion = EventAddRegion.Null; + EventRemoveRegion removeRegion = EventRemoveRegion.Null; + EventRaiseRegion raiseRegion = EventRaiseRegion.Null; Point bodyStart = new Point(-1, -1); Point bodyEnd = new Point(-1, -1); @@ -58,18 +59,31 @@ namespace ICSharpCode.NRefactory.Parser.AST removeRegion = value == null ? EventRemoveRegion.Null : value; } } + public EventRaiseRegion RaiseRegion { + get { + return raiseRegion; + } + set { + raiseRegion = value == null ? EventRaiseRegion.Null : value; + } + } public bool HasAddRegion { get { return !addRegion.IsNull; } } - public bool HasRemoveRegion { get { return !removeRegion.IsNull; } } + public bool HasRaiseRegion { + get { + return !raiseRegion.IsNull; + } + } + public Point BodyStart { get { return bodyStart; diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs index 54e0f06bd3..efb00b65ab 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/Parser.cs @@ -3990,9 +3990,6 @@ out stmt); #line 1773 "cs.ATG" initializer.Add(stmt); } - -#line 1773 "cs.ATG" - initializer.Add(stmt); } else SynErr(169); } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG index 32ffb80817..2c2cb32755 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/CSharp/cs.ATG @@ -1770,7 +1770,7 @@ ForInitializer .) = IF (IsLocalVarDecl()) LocalVariableDecl (. initializer.Add(stmt);.) - | StatementExpr (.initializer.Add(stmt);.) { "," StatementExpr (. initializer.Add(stmt);.) } (. initializer.Add(stmt);.) + | StatementExpr (.initializer.Add(stmt);.) { "," StatementExpr (. initializer.Add(stmt);.) } . ForIterator diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index df04881bad..cc9f9b6ad3 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -350,7 +350,7 @@ out u); void GlobalAttributeSection() { -#line 2018 "VBNET.ATG" +#line 2021 "VBNET.ATG" Point startPos = t.Location; Expect(26); if (la.kind == 48) { @@ -359,20 +359,20 @@ out u); lexer.NextToken(); } else SynErr(208); -#line 2020 "VBNET.ATG" +#line 2023 "VBNET.ATG" string attributeTarget = t.val.ToLower(); List attributes = new List(); ASTAttribute attribute; Expect(13); Attribute( -#line 2024 "VBNET.ATG" +#line 2027 "VBNET.ATG" out attribute); -#line 2024 "VBNET.ATG" +#line 2027 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2025 "VBNET.ATG" +#line 2028 "VBNET.ATG" NotFinalComma()) { if (la.kind == 12) { lexer.NextToken(); @@ -384,10 +384,10 @@ NotFinalComma()) { Expect(13); } Attribute( -#line 2025 "VBNET.ATG" +#line 2028 "VBNET.ATG" out attribute); -#line 2025 "VBNET.ATG" +#line 2028 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -396,7 +396,7 @@ out attribute); Expect(25); EndOfStmt(); -#line 2030 "VBNET.ATG" +#line 2033 "VBNET.ATG" AttributeSection section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -513,47 +513,47 @@ out aliasedType); } void Qualident( -#line 2742 "VBNET.ATG" +#line 2745 "VBNET.ATG" out string qualident) { -#line 2744 "VBNET.ATG" +#line 2747 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 2748 "VBNET.ATG" +#line 2751 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 2749 "VBNET.ATG" +#line 2752 "VBNET.ATG" DotAndIdentOrKw()) { Expect(10); IdentifierOrKeyword( -#line 2749 "VBNET.ATG" +#line 2752 "VBNET.ATG" out name); -#line 2749 "VBNET.ATG" +#line 2752 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 2751 "VBNET.ATG" +#line 2754 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 1938 "VBNET.ATG" +#line 1941 "VBNET.ATG" out TypeReference typeref) { -#line 1939 "VBNET.ATG" +#line 1942 "VBNET.ATG" ArrayList rank = null; typeref = null; NonArrayTypeName( -#line 1941 "VBNET.ATG" +#line 1944 "VBNET.ATG" out typeref); ArrayTypeModifiers( -#line 1942 "VBNET.ATG" +#line 1945 "VBNET.ATG" out rank); -#line 1944 "VBNET.ATG" +#line 1947 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -570,35 +570,35 @@ out rank); } void AttributeSection( -#line 2088 "VBNET.ATG" +#line 2091 "VBNET.ATG" out AttributeSection section) { -#line 2090 "VBNET.ATG" +#line 2093 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(26); -#line 2094 "VBNET.ATG" +#line 2097 "VBNET.ATG" Point startPos = t.Location; if ( -#line 2095 "VBNET.ATG" +#line 2098 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 92) { lexer.NextToken(); -#line 2096 "VBNET.ATG" +#line 2099 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 154) { lexer.NextToken(); -#line 2097 "VBNET.ATG" +#line 2100 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2100 "VBNET.ATG" +#line 2103 "VBNET.ATG" string val = t.val.ToLower(); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -611,20 +611,20 @@ IsLocalAttrTarget()) { Expect(13); } Attribute( -#line 2110 "VBNET.ATG" +#line 2113 "VBNET.ATG" out attribute); -#line 2110 "VBNET.ATG" +#line 2113 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2111 "VBNET.ATG" +#line 2114 "VBNET.ATG" NotFinalComma()) { Expect(12); Attribute( -#line 2111 "VBNET.ATG" +#line 2114 "VBNET.ATG" out attribute); -#line 2111 "VBNET.ATG" +#line 2114 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -632,7 +632,7 @@ out attribute); } Expect(25); -#line 2115 "VBNET.ATG" +#line 2118 "VBNET.ATG" section = new AttributeSection(attributeTarget, attributes); section.StartLocation = startPos; section.EndLocation = t.EndLocation; @@ -640,62 +640,62 @@ out attribute); } void TypeModifier( -#line 2797 "VBNET.ATG" +#line 2800 "VBNET.ATG" Modifiers m) { switch (la.kind) { case 148: { lexer.NextToken(); -#line 2798 "VBNET.ATG" +#line 2801 "VBNET.ATG" m.Add(Modifier.Public, t.Location); break; } case 147: { lexer.NextToken(); -#line 2799 "VBNET.ATG" +#line 2802 "VBNET.ATG" m.Add(Modifier.Protected, t.Location); break; } case 98: { lexer.NextToken(); -#line 2800 "VBNET.ATG" +#line 2803 "VBNET.ATG" m.Add(Modifier.Internal, t.Location); break; } case 145: { lexer.NextToken(); -#line 2801 "VBNET.ATG" +#line 2804 "VBNET.ATG" m.Add(Modifier.Private, t.Location); break; } case 158: { lexer.NextToken(); -#line 2802 "VBNET.ATG" +#line 2805 "VBNET.ATG" m.Add(Modifier.Static, t.Location); break; } case 157: { lexer.NextToken(); -#line 2803 "VBNET.ATG" +#line 2806 "VBNET.ATG" m.Add(Modifier.New, t.Location); break; } case 121: { lexer.NextToken(); -#line 2804 "VBNET.ATG" +#line 2807 "VBNET.ATG" m.Add(Modifier.Abstract, t.Location); break; } case 130: { lexer.NextToken(); -#line 2805 "VBNET.ATG" +#line 2808 "VBNET.ATG" m.Add(Modifier.Sealed, t.Location); break; } @@ -1087,28 +1087,28 @@ out typeRef); } void TypeImplementsClause( -#line 1587 "VBNET.ATG" +#line 1590 "VBNET.ATG" out List baseInterfaces) { -#line 1589 "VBNET.ATG" +#line 1592 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; Expect(106); TypeName( -#line 1592 "VBNET.ATG" +#line 1595 "VBNET.ATG" out type); -#line 1594 "VBNET.ATG" +#line 1597 "VBNET.ATG" baseInterfaces.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1597 "VBNET.ATG" +#line 1600 "VBNET.ATG" out type); -#line 1598 "VBNET.ATG" +#line 1601 "VBNET.ATG" baseInterfaces.Add(type); } EndOfStmt(); @@ -1226,114 +1226,114 @@ m, attributes); } void PrimitiveTypeName( -#line 2771 "VBNET.ATG" +#line 2774 "VBNET.ATG" out string type) { -#line 2772 "VBNET.ATG" +#line 2775 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 51: { lexer.NextToken(); -#line 2773 "VBNET.ATG" +#line 2776 "VBNET.ATG" type = "Boolean"; break; } case 75: { lexer.NextToken(); -#line 2774 "VBNET.ATG" +#line 2777 "VBNET.ATG" type = "Date"; break; } case 64: { lexer.NextToken(); -#line 2775 "VBNET.ATG" +#line 2778 "VBNET.ATG" type = "Char"; break; } case 165: { lexer.NextToken(); -#line 2776 "VBNET.ATG" +#line 2779 "VBNET.ATG" type = "String"; break; } case 76: { lexer.NextToken(); -#line 2777 "VBNET.ATG" +#line 2780 "VBNET.ATG" type = "Decimal"; break; } case 53: { lexer.NextToken(); -#line 2778 "VBNET.ATG" +#line 2781 "VBNET.ATG" type = "Byte"; break; } case 159: { lexer.NextToken(); -#line 2779 "VBNET.ATG" +#line 2782 "VBNET.ATG" type = "Short"; break; } case 110: { lexer.NextToken(); -#line 2780 "VBNET.ATG" +#line 2783 "VBNET.ATG" type = "Integer"; break; } case 116: { lexer.NextToken(); -#line 2781 "VBNET.ATG" +#line 2784 "VBNET.ATG" type = "Long"; break; } case 160: { lexer.NextToken(); -#line 2782 "VBNET.ATG" +#line 2785 "VBNET.ATG" type = "Single"; break; } case 83: { lexer.NextToken(); -#line 2783 "VBNET.ATG" +#line 2786 "VBNET.ATG" type = "Double"; break; } case 191: { lexer.NextToken(); -#line 2784 "VBNET.ATG" +#line 2787 "VBNET.ATG" type = "UInteger"; break; } case 192: { lexer.NextToken(); -#line 2785 "VBNET.ATG" +#line 2788 "VBNET.ATG" type = "ULong"; break; } case 193: { lexer.NextToken(); -#line 2786 "VBNET.ATG" +#line 2789 "VBNET.ATG" type = "UShort"; break; } case 190: { lexer.NextToken(); -#line 2787 "VBNET.ATG" +#line 2790 "VBNET.ATG" type = "SByte"; break; } @@ -1364,27 +1364,27 @@ out f); } void InterfaceBase( -#line 1572 "VBNET.ATG" +#line 1575 "VBNET.ATG" out List bases) { -#line 1574 "VBNET.ATG" +#line 1577 "VBNET.ATG" TypeReference type; bases = new List(); Expect(109); TypeName( -#line 1578 "VBNET.ATG" +#line 1581 "VBNET.ATG" out type); -#line 1578 "VBNET.ATG" +#line 1581 "VBNET.ATG" bases.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1581 "VBNET.ATG" +#line 1584 "VBNET.ATG" out type); -#line 1581 "VBNET.ATG" +#line 1584 "VBNET.ATG" bases.Add(type); } Expect(1); @@ -1405,27 +1405,27 @@ TypeDeclaration newType) { } void FormalParameterList( -#line 2122 "VBNET.ATG" +#line 2125 "VBNET.ATG" List parameter) { -#line 2124 "VBNET.ATG" +#line 2127 "VBNET.ATG" ParameterDeclarationExpression p; AttributeSection section; List attributes = new List(); while (la.kind == 26) { AttributeSection( -#line 2128 "VBNET.ATG" +#line 2131 "VBNET.ATG" out section); -#line 2128 "VBNET.ATG" +#line 2131 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 2130 "VBNET.ATG" +#line 2133 "VBNET.ATG" out p); -#line 2132 "VBNET.ATG" +#line 2135 "VBNET.ATG" bool paramsFound = false; p.Attributes = attributes; parameter.Add(p); @@ -1433,166 +1433,166 @@ out p); while (la.kind == 12) { lexer.NextToken(); -#line 2137 "VBNET.ATG" +#line 2140 "VBNET.ATG" if (paramsFound) Error("params array must be at end of parameter list"); while (la.kind == 26) { AttributeSection( -#line 2138 "VBNET.ATG" +#line 2141 "VBNET.ATG" out section); -#line 2138 "VBNET.ATG" +#line 2141 "VBNET.ATG" attributes.Add(section); } FormalParameter( -#line 2140 "VBNET.ATG" +#line 2143 "VBNET.ATG" out p); -#line 2140 "VBNET.ATG" +#line 2143 "VBNET.ATG" p.Attributes = attributes; parameter.Add(p); } } void MemberModifier( -#line 2808 "VBNET.ATG" +#line 2811 "VBNET.ATG" Modifiers m) { switch (la.kind) { case 121: { lexer.NextToken(); -#line 2809 "VBNET.ATG" +#line 2812 "VBNET.ATG" m.Add(Modifier.Abstract, t.Location); break; } case 78: { lexer.NextToken(); -#line 2810 "VBNET.ATG" +#line 2813 "VBNET.ATG" m.Add(Modifier.Default, t.Location); break; } case 98: { lexer.NextToken(); -#line 2811 "VBNET.ATG" +#line 2814 "VBNET.ATG" m.Add(Modifier.Internal, t.Location); break; } case 157: { lexer.NextToken(); -#line 2812 "VBNET.ATG" +#line 2815 "VBNET.ATG" m.Add(Modifier.New, t.Location); break; } case 142: { lexer.NextToken(); -#line 2813 "VBNET.ATG" +#line 2816 "VBNET.ATG" m.Add(Modifier.Override, t.Location); break; } case 122: { lexer.NextToken(); -#line 2814 "VBNET.ATG" +#line 2817 "VBNET.ATG" m.Add(Modifier.Abstract, t.Location); break; } case 145: { lexer.NextToken(); -#line 2815 "VBNET.ATG" +#line 2818 "VBNET.ATG" m.Add(Modifier.Private, t.Location); break; } case 147: { lexer.NextToken(); -#line 2816 "VBNET.ATG" +#line 2819 "VBNET.ATG" m.Add(Modifier.Protected, t.Location); break; } case 148: { lexer.NextToken(); -#line 2817 "VBNET.ATG" +#line 2820 "VBNET.ATG" m.Add(Modifier.Public, t.Location); break; } case 130: { lexer.NextToken(); -#line 2818 "VBNET.ATG" +#line 2821 "VBNET.ATG" m.Add(Modifier.Sealed, t.Location); break; } case 131: { lexer.NextToken(); -#line 2819 "VBNET.ATG" +#line 2822 "VBNET.ATG" m.Add(Modifier.Sealed, t.Location); break; } case 158: { lexer.NextToken(); -#line 2820 "VBNET.ATG" +#line 2823 "VBNET.ATG" m.Add(Modifier.Static, t.Location); break; } case 140: { lexer.NextToken(); -#line 2821 "VBNET.ATG" +#line 2824 "VBNET.ATG" m.Add(Modifier.Virtual, t.Location); break; } case 139: { lexer.NextToken(); -#line 2822 "VBNET.ATG" +#line 2825 "VBNET.ATG" m.Add(Modifier.Overloads, t.Location); break; } case 150: { lexer.NextToken(); -#line 2823 "VBNET.ATG" +#line 2826 "VBNET.ATG" break; } case 184: { lexer.NextToken(); -#line 2824 "VBNET.ATG" +#line 2827 "VBNET.ATG" break; } case 183: { lexer.NextToken(); -#line 2825 "VBNET.ATG" +#line 2828 "VBNET.ATG" m.Add(Modifier.WithEvents, t.Location); break; } case 80: { lexer.NextToken(); -#line 2826 "VBNET.ATG" +#line 2829 "VBNET.ATG" m.Add(Modifier.Dim, t.Location); break; } case 202: { lexer.NextToken(); -#line 2827 "VBNET.ATG" +#line 2830 "VBNET.ATG" m.Add(Modifier.Widening, t.Location); break; } case 201: { lexer.NextToken(); -#line 2828 "VBNET.ATG" +#line 2831 "VBNET.ATG" m.Add(Modifier.Narrowing, t.Location); break; } @@ -2154,9 +2154,9 @@ out getRegion, out setRegion); #line 1201 "VBNET.ATG" m.Check(Modifier.VBCustomEvents); EventAddRemoveRegion eventAccessorDeclaration; - EventAddRemoveRegion addHandlerAccessorDeclaration = null; - EventAddRemoveRegion removeHandlerAccessorDeclaration = null; - EventAddRemoveRegion raiseEventAccessorDeclaration = null; + EventAddRegion addHandlerAccessorDeclaration = null; + EventRemoveRegion removeHandlerAccessorDeclaration = null; + EventRaiseRegion raiseEventAccessorDeclaration = null; ArrayList implementsClause = null; Identifier(); @@ -2181,15 +2181,15 @@ out eventAccessorDeclaration); #line 1215 "VBNET.ATG" if(eventAccessorDeclaration is EventAddRegion) { - addHandlerAccessorDeclaration = eventAccessorDeclaration; + addHandlerAccessorDeclaration = (EventAddRegion)eventAccessorDeclaration; } else if(eventAccessorDeclaration is EventRemoveRegion) { - removeHandlerAccessorDeclaration = eventAccessorDeclaration; + removeHandlerAccessorDeclaration = (EventRemoveRegion)eventAccessorDeclaration; } else if(eventAccessorDeclaration is EventRaiseRegion) { - raiseEventAccessorDeclaration = eventAccessorDeclaration; + raiseEventAccessorDeclaration = (EventRaiseRegion)eventAccessorDeclaration; } } @@ -2203,12 +2203,12 @@ out eventAccessorDeclaration); Error("Need to provide AddHandler accessor."); } - if(addHandlerAccessorDeclaration == null) + if(removeHandlerAccessorDeclaration == null) { Error("Need to provide RemoveHandler accessor."); } - if(addHandlerAccessorDeclaration == null) + if(raiseEventAccessorDeclaration == null) { Error("Need to provide RaiseEvent accessor."); } @@ -2216,6 +2216,9 @@ out eventAccessorDeclaration); EventDeclaration decl = new EventDeclaration(type, customEventName, m.Modifier, attributes); decl.StartLocation = m.GetDeclarationLocation(startPos); decl.EndLocation = t.EndLocation; + decl.AddRegion = addHandlerAccessorDeclaration; + decl.RemoveRegion = removeHandlerAccessorDeclaration; + decl.RaiseRegion = raiseEventAccessorDeclaration; compilationUnit.AddChild(decl); break; @@ -2223,7 +2226,7 @@ out eventAccessorDeclaration); case 187: { lexer.NextToken(); -#line 1254 "VBNET.ATG" +#line 1257 "VBNET.ATG" m.Check(Modifier.VBOperators); Point startPos = t.Location; TypeReference returnType = NullTypeReference.Instance; @@ -2235,7 +2238,7 @@ out eventAccessorDeclaration); List returnTypeAttributes = new List(); OverloadableOperator( -#line 1264 "VBNET.ATG" +#line 1267 "VBNET.ATG" out operatorType); Expect(23); if (la.kind == 54) { @@ -2243,16 +2246,16 @@ out operatorType); } Identifier(); -#line 1265 "VBNET.ATG" +#line 1268 "VBNET.ATG" operandName = t.val; if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1266 "VBNET.ATG" +#line 1269 "VBNET.ATG" out operandType); } -#line 1267 "VBNET.ATG" +#line 1270 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParamModifier.In)); while (la.kind == 12) { lexer.NextToken(); @@ -2261,48 +2264,48 @@ out operandType); } Identifier(); -#line 1271 "VBNET.ATG" +#line 1274 "VBNET.ATG" operandName = t.val; if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1272 "VBNET.ATG" +#line 1275 "VBNET.ATG" out operandType); } -#line 1273 "VBNET.ATG" +#line 1276 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParamModifier.In)); } Expect(24); -#line 1276 "VBNET.ATG" +#line 1279 "VBNET.ATG" Point endPos = t.EndLocation; if (la.kind == 47) { lexer.NextToken(); while (la.kind == 26) { AttributeSection( -#line 1277 "VBNET.ATG" +#line 1280 "VBNET.ATG" out section); -#line 1277 "VBNET.ATG" +#line 1280 "VBNET.ATG" returnTypeAttributes.Add(section); } TypeName( -#line 1277 "VBNET.ATG" +#line 1280 "VBNET.ATG" out returnType); -#line 1277 "VBNET.ATG" +#line 1280 "VBNET.ATG" endPos = t.EndLocation; Expect(1); } Block( -#line 1278 "VBNET.ATG" +#line 1281 "VBNET.ATG" out stmt); Expect(87); Expect(187); Expect(1); -#line 1280 "VBNET.ATG" +#line 1283 "VBNET.ATG" OperatorDeclaration operatorDeclaration = new OperatorDeclaration(m.Modifier, attributes, parameters, @@ -2538,18 +2541,18 @@ mod, attributes); } void Expr( -#line 1626 "VBNET.ATG" +#line 1629 "VBNET.ATG" out Expression expr) { ConditionalOrExpr( -#line 1628 "VBNET.ATG" +#line 1631 "VBNET.ATG" out expr); } void ImplementsClause( -#line 1604 "VBNET.ATG" +#line 1607 "VBNET.ATG" out ArrayList baseInterfaces) { -#line 1606 "VBNET.ATG" +#line 1609 "VBNET.ATG" baseInterfaces = new ArrayList(); string typename = String.Empty; string first; @@ -2557,76 +2560,76 @@ out ArrayList baseInterfaces) { Expect(106); Identifier(); -#line 1610 "VBNET.ATG" +#line 1613 "VBNET.ATG" first = t.val; Expect(10); Qualident( -#line 1610 "VBNET.ATG" +#line 1613 "VBNET.ATG" out typename); -#line 1610 "VBNET.ATG" +#line 1613 "VBNET.ATG" baseInterfaces.Add(first + "." + typename); while (la.kind == 12) { lexer.NextToken(); Identifier(); -#line 1611 "VBNET.ATG" +#line 1614 "VBNET.ATG" first = t.val; Expect(10); Qualident( -#line 1611 "VBNET.ATG" +#line 1614 "VBNET.ATG" out typename); -#line 1611 "VBNET.ATG" +#line 1614 "VBNET.ATG" baseInterfaces.Add(first + "." + typename); } } void HandlesClause( -#line 1562 "VBNET.ATG" +#line 1565 "VBNET.ATG" out ArrayList handlesClause) { -#line 1564 "VBNET.ATG" +#line 1567 "VBNET.ATG" handlesClause = new ArrayList(); string name; Expect(104); EventMemberSpecifier( -#line 1567 "VBNET.ATG" +#line 1570 "VBNET.ATG" out name); -#line 1567 "VBNET.ATG" +#line 1570 "VBNET.ATG" handlesClause.Add(name); while (la.kind == 12) { lexer.NextToken(); EventMemberSpecifier( -#line 1568 "VBNET.ATG" +#line 1571 "VBNET.ATG" out name); -#line 1568 "VBNET.ATG" +#line 1571 "VBNET.ATG" handlesClause.Add(name); } } void Block( -#line 2178 "VBNET.ATG" +#line 2181 "VBNET.ATG" out Statement stmt) { -#line 2181 "VBNET.ATG" +#line 2184 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); blockStmt.StartLocation = t.Location; compilationUnit.BlockStart(blockStmt); while (StartOf(16) || -#line 2186 "VBNET.ATG" +#line 2189 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2186 "VBNET.ATG" +#line 2189 "VBNET.ATG" IsEndStmtAhead()) { Expect(87); EndOfStmt(); -#line 2186 "VBNET.ATG" +#line 2189 "VBNET.ATG" compilationUnit.AddChild(new EndStatement()); } else { Statement(); @@ -2634,7 +2637,7 @@ IsEndStmtAhead()) { } } -#line 2192 "VBNET.ATG" +#line 2195 "VBNET.ATG" stmt = blockStmt; blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2642,65 +2645,65 @@ IsEndStmtAhead()) { } void Charset( -#line 1554 "VBNET.ATG" +#line 1557 "VBNET.ATG" out CharsetModifier charsetModifier) { -#line 1555 "VBNET.ATG" +#line 1558 "VBNET.ATG" charsetModifier = CharsetModifier.None; if (la.kind == 99 || la.kind == 167) { } else if (la.kind == 46) { lexer.NextToken(); -#line 1556 "VBNET.ATG" +#line 1559 "VBNET.ATG" charsetModifier = CharsetModifier.ANSI; } else if (la.kind == 49) { lexer.NextToken(); -#line 1557 "VBNET.ATG" +#line 1560 "VBNET.ATG" charsetModifier = CharsetModifier.Auto; } else if (la.kind == 176) { lexer.NextToken(); -#line 1558 "VBNET.ATG" +#line 1561 "VBNET.ATG" charsetModifier = CharsetModifier.Unicode; } else SynErr(229); } void VariableDeclarator( -#line 1472 "VBNET.ATG" +#line 1475 "VBNET.ATG" List fieldDeclaration) { -#line 1474 "VBNET.ATG" +#line 1477 "VBNET.ATG" Expression expr = null; TypeReference type = null;ArrayList rank = null;ArrayList dimension = null; Identifier(); -#line 1477 "VBNET.ATG" +#line 1480 "VBNET.ATG" string name = t.val; if ( -#line 1478 "VBNET.ATG" +#line 1481 "VBNET.ATG" IsDims()) { ArrayNameModifier( -#line 1478 "VBNET.ATG" +#line 1481 "VBNET.ATG" out rank); } if ( -#line 1479 "VBNET.ATG" +#line 1482 "VBNET.ATG" IsSize()) { ArrayInitializationModifier( -#line 1479 "VBNET.ATG" +#line 1482 "VBNET.ATG" out dimension); } if ( -#line 1481 "VBNET.ATG" +#line 1484 "VBNET.ATG" IsObjectCreation()) { Expect(47); ObjectCreateExpression( -#line 1481 "VBNET.ATG" +#line 1484 "VBNET.ATG" out expr); -#line 1483 "VBNET.ATG" +#line 1486 "VBNET.ATG" if (expr is ObjectCreateExpression) { type = ((ObjectCreateExpression)expr).CreateType; } else { @@ -2711,11 +2714,11 @@ out expr); if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1490 "VBNET.ATG" +#line 1493 "VBNET.ATG" out type); } -#line 1492 "VBNET.ATG" +#line 1495 "VBNET.ATG" if (type != null && rank != null) { if(type.RankSpecifier != null) { Error("array rank only allowed one time"); @@ -2727,40 +2730,40 @@ out type); if (la.kind == 11) { lexer.NextToken(); VariableInitializer( -#line 1500 "VBNET.ATG" +#line 1503 "VBNET.ATG" out expr); } } else SynErr(230); -#line 1502 "VBNET.ATG" +#line 1505 "VBNET.ATG" fieldDeclaration.Add(new VariableDeclaration(name, expr, type)); } void ConstantDeclarator( -#line 1455 "VBNET.ATG" +#line 1458 "VBNET.ATG" List constantDeclaration) { -#line 1457 "VBNET.ATG" +#line 1460 "VBNET.ATG" Expression expr = null; TypeReference type = null; string name = String.Empty; Identifier(); -#line 1461 "VBNET.ATG" +#line 1464 "VBNET.ATG" name = t.val; if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 1462 "VBNET.ATG" +#line 1465 "VBNET.ATG" out type); } Expect(11); Expr( -#line 1463 "VBNET.ATG" +#line 1466 "VBNET.ATG" out expr); -#line 1465 "VBNET.ATG" +#line 1468 "VBNET.ATG" VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; constantDeclaration.Add(f); @@ -2768,10 +2771,10 @@ out expr); } void AccessorDecls( -#line 1397 "VBNET.ATG" +#line 1400 "VBNET.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1399 "VBNET.ATG" +#line 1402 "VBNET.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -2779,60 +2782,60 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 26) { AttributeSection( -#line 1404 "VBNET.ATG" +#line 1407 "VBNET.ATG" out section); -#line 1404 "VBNET.ATG" +#line 1407 "VBNET.ATG" attributes.Add(section); } if (la.kind == 100) { GetAccessorDecl( -#line 1406 "VBNET.ATG" +#line 1409 "VBNET.ATG" out getBlock, attributes); if (la.kind == 26 || la.kind == 156) { -#line 1408 "VBNET.ATG" +#line 1411 "VBNET.ATG" attributes = new List(); while (la.kind == 26) { AttributeSection( -#line 1409 "VBNET.ATG" +#line 1412 "VBNET.ATG" out section); -#line 1409 "VBNET.ATG" +#line 1412 "VBNET.ATG" attributes.Add(section); } SetAccessorDecl( -#line 1410 "VBNET.ATG" +#line 1413 "VBNET.ATG" out setBlock, attributes); } } else if (la.kind == 156) { SetAccessorDecl( -#line 1413 "VBNET.ATG" +#line 1416 "VBNET.ATG" out setBlock, attributes); if (la.kind == 26 || la.kind == 100) { -#line 1415 "VBNET.ATG" +#line 1418 "VBNET.ATG" attributes = new List(); while (la.kind == 26) { AttributeSection( -#line 1416 "VBNET.ATG" +#line 1419 "VBNET.ATG" out section); -#line 1416 "VBNET.ATG" +#line 1419 "VBNET.ATG" attributes.Add(section); } GetAccessorDecl( -#line 1417 "VBNET.ATG" +#line 1420 "VBNET.ATG" out getBlock, attributes); } } else SynErr(231); } void EventAccessorDeclaration( -#line 1360 "VBNET.ATG" +#line 1363 "VBNET.ATG" out EventAddRemoveRegion eventAccessorDeclaration) { -#line 1362 "VBNET.ATG" +#line 1365 "VBNET.ATG" Statement stmt = null; List p = new List(); AttributeSection section; @@ -2841,10 +2844,10 @@ out EventAddRemoveRegion eventAccessorDeclaration) { while (la.kind == 26) { AttributeSection( -#line 1368 "VBNET.ATG" +#line 1371 "VBNET.ATG" out section); -#line 1368 "VBNET.ATG" +#line 1371 "VBNET.ATG" attributes.Add(section); } if (la.kind == 41) { @@ -2853,20 +2856,20 @@ out section); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1370 "VBNET.ATG" +#line 1373 "VBNET.ATG" p); } Expect(24); } Expect(1); Block( -#line 1371 "VBNET.ATG" +#line 1374 "VBNET.ATG" out stmt); Expect(87); Expect(41); Expect(1); -#line 1373 "VBNET.ATG" +#line 1376 "VBNET.ATG" eventAccessorDeclaration = new EventAddRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -2877,20 +2880,20 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1378 "VBNET.ATG" +#line 1381 "VBNET.ATG" p); } Expect(24); } Expect(1); Block( -#line 1379 "VBNET.ATG" +#line 1382 "VBNET.ATG" out stmt); Expect(87); Expect(152); Expect(1); -#line 1381 "VBNET.ATG" +#line 1384 "VBNET.ATG" eventAccessorDeclaration = new EventRemoveRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -2901,20 +2904,20 @@ out stmt); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1386 "VBNET.ATG" +#line 1389 "VBNET.ATG" p); } Expect(24); } Expect(1); Block( -#line 1387 "VBNET.ATG" +#line 1390 "VBNET.ATG" out stmt); Expect(87); Expect(149); Expect(1); -#line 1389 "VBNET.ATG" +#line 1392 "VBNET.ATG" eventAccessorDeclaration = new EventRaiseRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; @@ -2923,163 +2926,163 @@ out stmt); } void OverloadableOperator( -#line 1297 "VBNET.ATG" +#line 1300 "VBNET.ATG" out OverloadableOperatorType operatorType) { -#line 1298 "VBNET.ATG" +#line 1301 "VBNET.ATG" operatorType = OverloadableOperatorType.None; switch (la.kind) { case 14: { lexer.NextToken(); -#line 1300 "VBNET.ATG" +#line 1303 "VBNET.ATG" operatorType = OverloadableOperatorType.Add; break; } case 15: { lexer.NextToken(); -#line 1302 "VBNET.ATG" +#line 1305 "VBNET.ATG" operatorType = OverloadableOperatorType.Subtract; break; } case 16: { lexer.NextToken(); -#line 1304 "VBNET.ATG" +#line 1307 "VBNET.ATG" operatorType = OverloadableOperatorType.Multiply; break; } case 17: { lexer.NextToken(); -#line 1306 "VBNET.ATG" +#line 1309 "VBNET.ATG" operatorType = OverloadableOperatorType.Divide; break; } case 18: { lexer.NextToken(); -#line 1308 "VBNET.ATG" +#line 1311 "VBNET.ATG" operatorType = OverloadableOperatorType.DivideInteger; break; } case 19: { lexer.NextToken(); -#line 1310 "VBNET.ATG" +#line 1313 "VBNET.ATG" operatorType = OverloadableOperatorType.Concat; break; } case 115: { lexer.NextToken(); -#line 1312 "VBNET.ATG" +#line 1315 "VBNET.ATG" operatorType = OverloadableOperatorType.Like; break; } case 119: { lexer.NextToken(); -#line 1314 "VBNET.ATG" +#line 1317 "VBNET.ATG" operatorType = OverloadableOperatorType.Modulus; break; } case 44: { lexer.NextToken(); -#line 1316 "VBNET.ATG" +#line 1319 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseAnd; break; } case 137: { lexer.NextToken(); -#line 1318 "VBNET.ATG" +#line 1321 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseOr; break; } case 185: { lexer.NextToken(); -#line 1320 "VBNET.ATG" +#line 1323 "VBNET.ATG" operatorType = OverloadableOperatorType.ExclusiveOr; break; } case 20: { lexer.NextToken(); -#line 1322 "VBNET.ATG" +#line 1325 "VBNET.ATG" operatorType = OverloadableOperatorType.Power; break; } case 30: { lexer.NextToken(); -#line 1324 "VBNET.ATG" +#line 1327 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftLeft; break; } case 31: { lexer.NextToken(); -#line 1326 "VBNET.ATG" +#line 1329 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftRight; break; } case 11: { lexer.NextToken(); -#line 1328 "VBNET.ATG" +#line 1331 "VBNET.ATG" operatorType = OverloadableOperatorType.Equality; break; } case 27: { lexer.NextToken(); -#line 1330 "VBNET.ATG" +#line 1333 "VBNET.ATG" operatorType = OverloadableOperatorType.InEquality; break; } case 26: { lexer.NextToken(); -#line 1332 "VBNET.ATG" +#line 1335 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThan; break; } case 29: { lexer.NextToken(); -#line 1334 "VBNET.ATG" +#line 1337 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThanOrEqual; break; } case 25: { lexer.NextToken(); -#line 1336 "VBNET.ATG" +#line 1339 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThan; break; } case 28: { lexer.NextToken(); -#line 1338 "VBNET.ATG" +#line 1341 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThanOrEqual; break; } case 74: { lexer.NextToken(); -#line 1340 "VBNET.ATG" +#line 1343 "VBNET.ATG" operatorType = OverloadableOperatorType.CType; break; } case 2: case 50: case 69: case 169: { Identifier(); -#line 1344 "VBNET.ATG" +#line 1347 "VBNET.ATG" string opName = t.val; switch(opName.ToLower()) { @@ -3101,98 +3104,98 @@ out OverloadableOperatorType operatorType) { } void GetAccessorDecl( -#line 1423 "VBNET.ATG" +#line 1426 "VBNET.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1424 "VBNET.ATG" +#line 1427 "VBNET.ATG" Statement stmt = null; Expect(100); -#line 1426 "VBNET.ATG" +#line 1429 "VBNET.ATG" Point startLocation = t.Location; Expect(1); Block( -#line 1428 "VBNET.ATG" +#line 1431 "VBNET.ATG" out stmt); -#line 1429 "VBNET.ATG" +#line 1432 "VBNET.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); Expect(87); Expect(100); -#line 1431 "VBNET.ATG" +#line 1434 "VBNET.ATG" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; Expect(1); } void SetAccessorDecl( -#line 1436 "VBNET.ATG" +#line 1439 "VBNET.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1438 "VBNET.ATG" +#line 1441 "VBNET.ATG" Statement stmt = null; List p = new List(); Expect(156); -#line 1441 "VBNET.ATG" +#line 1444 "VBNET.ATG" Point startLocation = t.Location; if (la.kind == 23) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1442 "VBNET.ATG" +#line 1445 "VBNET.ATG" p); } Expect(24); } Expect(1); Block( -#line 1444 "VBNET.ATG" +#line 1447 "VBNET.ATG" out stmt); -#line 1446 "VBNET.ATG" +#line 1449 "VBNET.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); setBlock.Parameters = p; Expect(87); Expect(156); -#line 1450 "VBNET.ATG" +#line 1453 "VBNET.ATG" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; Expect(1); } void ArrayNameModifier( -#line 1970 "VBNET.ATG" +#line 1973 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1972 "VBNET.ATG" +#line 1975 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 1974 "VBNET.ATG" +#line 1977 "VBNET.ATG" out arrayModifiers); } void ArrayInitializationModifier( -#line 1506 "VBNET.ATG" +#line 1509 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1508 "VBNET.ATG" +#line 1511 "VBNET.ATG" arrayModifiers = null; Expect(23); InitializationRankList( -#line 1510 "VBNET.ATG" +#line 1513 "VBNET.ATG" out arrayModifiers); Expect(24); } void ObjectCreateExpression( -#line 1886 "VBNET.ATG" +#line 1889 "VBNET.ATG" out Expression oce) { -#line 1888 "VBNET.ATG" +#line 1891 "VBNET.ATG" TypeReference type = null; Expression initializer = null; ArrayList arguments = null; @@ -3200,24 +3203,24 @@ out Expression oce) { Expect(126); NonArrayTypeName( -#line 1893 "VBNET.ATG" +#line 1896 "VBNET.ATG" out type); if (la.kind == 23) { lexer.NextToken(); if (StartOf(18)) { ArgumentList( -#line 1894 "VBNET.ATG" +#line 1897 "VBNET.ATG" out arguments); } Expect(24); } if (la.kind == 21) { ArrayInitializer( -#line 1895 "VBNET.ATG" +#line 1898 "VBNET.ATG" out initializer); } -#line 1897 "VBNET.ATG" +#line 1900 "VBNET.ATG" if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); } else { @@ -3229,98 +3232,98 @@ out initializer); } void VariableInitializer( -#line 1526 "VBNET.ATG" +#line 1529 "VBNET.ATG" out Expression initializerExpression) { -#line 1528 "VBNET.ATG" +#line 1531 "VBNET.ATG" initializerExpression = null; if (StartOf(19)) { Expr( -#line 1530 "VBNET.ATG" +#line 1533 "VBNET.ATG" out initializerExpression); } else if (la.kind == 21) { ArrayInitializer( -#line 1531 "VBNET.ATG" +#line 1534 "VBNET.ATG" out initializerExpression); } else SynErr(234); } void InitializationRankList( -#line 1514 "VBNET.ATG" +#line 1517 "VBNET.ATG" out ArrayList rank) { -#line 1516 "VBNET.ATG" +#line 1519 "VBNET.ATG" rank = null; Expression expr = null; Expr( -#line 1519 "VBNET.ATG" +#line 1522 "VBNET.ATG" out expr); -#line 1519 "VBNET.ATG" +#line 1522 "VBNET.ATG" rank = new ArrayList(); if (expr != null) { rank.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Expr( -#line 1521 "VBNET.ATG" +#line 1524 "VBNET.ATG" out expr); -#line 1521 "VBNET.ATG" +#line 1524 "VBNET.ATG" if (expr != null) { rank.Add(expr); } } } void ArrayInitializer( -#line 1535 "VBNET.ATG" +#line 1538 "VBNET.ATG" out Expression outExpr) { -#line 1537 "VBNET.ATG" +#line 1540 "VBNET.ATG" Expression expr = null; ArrayInitializerExpression initializer = new ArrayInitializerExpression(); Expect(21); if (StartOf(20)) { VariableInitializer( -#line 1542 "VBNET.ATG" +#line 1545 "VBNET.ATG" out expr); -#line 1544 "VBNET.ATG" +#line 1547 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1547 "VBNET.ATG" +#line 1550 "VBNET.ATG" NotFinalComma()) { Expect(12); VariableInitializer( -#line 1547 "VBNET.ATG" +#line 1550 "VBNET.ATG" out expr); -#line 1548 "VBNET.ATG" +#line 1551 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(22); -#line 1551 "VBNET.ATG" +#line 1554 "VBNET.ATG" outExpr = initializer; } void EventMemberSpecifier( -#line 1614 "VBNET.ATG" +#line 1617 "VBNET.ATG" out string name) { -#line 1615 "VBNET.ATG" +#line 1618 "VBNET.ATG" string type; name = String.Empty; if (StartOf(10)) { Identifier(); -#line 1616 "VBNET.ATG" +#line 1619 "VBNET.ATG" type = t.val; Expect(10); Identifier(); -#line 1618 "VBNET.ATG" +#line 1621 "VBNET.ATG" name = type + "." + t.val; } else if (la.kind == 123) { lexer.NextToken(); @@ -3328,42 +3331,42 @@ out string name) { if (StartOf(10)) { Identifier(); -#line 1621 "VBNET.ATG" +#line 1624 "VBNET.ATG" name = "MyBase." + t.val; } else if (la.kind == 91) { lexer.NextToken(); -#line 1622 "VBNET.ATG" +#line 1625 "VBNET.ATG" name = "MyBase.Error"; } else SynErr(235); } else SynErr(236); } void ConditionalOrExpr( -#line 1765 "VBNET.ATG" +#line 1768 "VBNET.ATG" out Expression outExpr) { -#line 1766 "VBNET.ATG" +#line 1769 "VBNET.ATG" Expression expr; ConditionalAndExpr( -#line 1767 "VBNET.ATG" +#line 1770 "VBNET.ATG" out outExpr); while (la.kind == 138) { lexer.NextToken(); ConditionalAndExpr( -#line 1767 "VBNET.ATG" +#line 1770 "VBNET.ATG" out expr); -#line 1767 "VBNET.ATG" +#line 1770 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalOr, expr); } } void UnaryExpr( -#line 1635 "VBNET.ATG" +#line 1638 "VBNET.ATG" out Expression uExpr) { -#line 1637 "VBNET.ATG" +#line 1640 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -3372,25 +3375,25 @@ out Expression uExpr) { if (la.kind == 14) { lexer.NextToken(); -#line 1641 "VBNET.ATG" +#line 1644 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 15) { lexer.NextToken(); -#line 1642 "VBNET.ATG" +#line 1645 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 1644 "VBNET.ATG" +#line 1647 "VBNET.ATG" uop = UnaryOperatorType.Star; isUOp = true; } } SimpleExpr( -#line 1646 "VBNET.ATG" +#line 1649 "VBNET.ATG" out expr); -#line 1648 "VBNET.ATG" +#line 1651 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -3400,139 +3403,139 @@ out expr); } void SimpleExpr( -#line 1671 "VBNET.ATG" +#line 1674 "VBNET.ATG" out Expression pexpr) { -#line 1673 "VBNET.ATG" +#line 1676 "VBNET.ATG" Expression expr; TypeReference type = null; string name = String.Empty; pexpr = null; if (StartOf(21) || -#line 1702 "VBNET.ATG" +#line 1705 "VBNET.ATG" la.kind == Tokens.Global) { if (la.kind == 3) { lexer.NextToken(); -#line 1681 "VBNET.ATG" +#line 1684 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 4) { lexer.NextToken(); -#line 1682 "VBNET.ATG" +#line 1685 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 7) { lexer.NextToken(); -#line 1683 "VBNET.ATG" +#line 1686 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 6) { lexer.NextToken(); -#line 1684 "VBNET.ATG" +#line 1687 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 5) { lexer.NextToken(); -#line 1685 "VBNET.ATG" +#line 1688 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 9) { lexer.NextToken(); -#line 1686 "VBNET.ATG" +#line 1689 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 8) { lexer.NextToken(); -#line 1687 "VBNET.ATG" +#line 1690 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val); } else if (la.kind == 173) { lexer.NextToken(); -#line 1689 "VBNET.ATG" +#line 1692 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); } else if (la.kind == 95) { lexer.NextToken(); -#line 1690 "VBNET.ATG" +#line 1693 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); } else if (la.kind == 129) { lexer.NextToken(); -#line 1691 "VBNET.ATG" +#line 1694 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); } else if (la.kind == 23) { lexer.NextToken(); Expr( -#line 1692 "VBNET.ATG" +#line 1695 "VBNET.ATG" out expr); Expect(24); -#line 1692 "VBNET.ATG" +#line 1695 "VBNET.ATG" pexpr = new ParenthesizedExpression(expr); } else if (StartOf(10)) { Identifier(); -#line 1693 "VBNET.ATG" +#line 1696 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); } else if (StartOf(22)) { -#line 1694 "VBNET.ATG" +#line 1697 "VBNET.ATG" string val = String.Empty; PrimitiveTypeName( -#line 1694 "VBNET.ATG" +#line 1697 "VBNET.ATG" out val); Expect(10); -#line 1695 "VBNET.ATG" +#line 1698 "VBNET.ATG" t.val = ""; Identifier(); -#line 1695 "VBNET.ATG" +#line 1698 "VBNET.ATG" pexpr = new FieldReferenceExpression(new TypeReferenceExpression(val), t.val); } else if (la.kind == 118) { lexer.NextToken(); -#line 1696 "VBNET.ATG" +#line 1699 "VBNET.ATG" pexpr = new ThisReferenceExpression(); } else if (la.kind == 123 || la.kind == 124) { -#line 1697 "VBNET.ATG" +#line 1700 "VBNET.ATG" Expression retExpr = null; if (la.kind == 123) { lexer.NextToken(); -#line 1698 "VBNET.ATG" +#line 1701 "VBNET.ATG" retExpr = new BaseReferenceExpression(); } else if (la.kind == 124) { lexer.NextToken(); -#line 1699 "VBNET.ATG" +#line 1702 "VBNET.ATG" retExpr = new ClassReferenceExpression(); } else SynErr(237); Expect(10); IdentifierOrKeyword( -#line 1701 "VBNET.ATG" +#line 1704 "VBNET.ATG" out name); -#line 1701 "VBNET.ATG" +#line 1704 "VBNET.ATG" pexpr = new FieldReferenceExpression(retExpr, name); } else if ( -#line 1702 "VBNET.ATG" +#line 1705 "VBNET.ATG" la.kind == Tokens.Global) { TypeName( -#line 1702 "VBNET.ATG" +#line 1705 "VBNET.ATG" out type); -#line 1702 "VBNET.ATG" +#line 1705 "VBNET.ATG" pexpr = new TypeReferenceExpression(type); } else if (la.kind == 126) { ObjectCreateExpression( -#line 1703 "VBNET.ATG" +#line 1706 "VBNET.ATG" out expr); -#line 1703 "VBNET.ATG" +#line 1706 "VBNET.ATG" pexpr = expr; } else if (la.kind == 74 || la.kind == 81) { if (la.kind == 81) { @@ -3542,166 +3545,166 @@ out expr); } else SynErr(238); Expect(23); Expr( -#line 1704 "VBNET.ATG" +#line 1707 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1704 "VBNET.ATG" +#line 1707 "VBNET.ATG" out type); Expect(24); -#line 1704 "VBNET.ATG" +#line 1707 "VBNET.ATG" pexpr = new CastExpression(type, expr); } else if (la.kind == 199) { lexer.NextToken(); Expect(23); Expr( -#line 1705 "VBNET.ATG" +#line 1708 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1705 "VBNET.ATG" +#line 1708 "VBNET.ATG" out type); Expect(24); -#line 1705 "VBNET.ATG" +#line 1708 "VBNET.ATG" pexpr = new BinaryOperatorExpression(expr, BinaryOperatorType.AsCast, new TypeReferenceExpression(type)); } else if (StartOf(23)) { CastTarget( -#line 1706 "VBNET.ATG" +#line 1709 "VBNET.ATG" out type); Expect(23); Expr( -#line 1706 "VBNET.ATG" +#line 1709 "VBNET.ATG" out expr); Expect(24); -#line 1706 "VBNET.ATG" +#line 1709 "VBNET.ATG" pexpr = new CastExpression(type, expr, true); } else if (la.kind == 42) { lexer.NextToken(); Expr( -#line 1707 "VBNET.ATG" +#line 1710 "VBNET.ATG" out expr); -#line 1707 "VBNET.ATG" +#line 1710 "VBNET.ATG" pexpr = new AddressOfExpression(expr); } else if (la.kind == 101) { lexer.NextToken(); Expect(23); TypeName( -#line 1708 "VBNET.ATG" +#line 1711 "VBNET.ATG" out type); Expect(24); -#line 1708 "VBNET.ATG" +#line 1711 "VBNET.ATG" pexpr = new TypeOfExpression(type); } else { lexer.NextToken(); SimpleExpr( -#line 1709 "VBNET.ATG" +#line 1712 "VBNET.ATG" out expr); Expect(112); TypeName( -#line 1709 "VBNET.ATG" +#line 1712 "VBNET.ATG" out type); -#line 1709 "VBNET.ATG" +#line 1712 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); } while (la.kind == 10 || la.kind == 23) { if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1712 "VBNET.ATG" +#line 1715 "VBNET.ATG" out name); -#line 1712 "VBNET.ATG" +#line 1715 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); } else { lexer.NextToken(); -#line 1713 "VBNET.ATG" +#line 1716 "VBNET.ATG" ArrayList parameters = new ArrayList(); if (StartOf(24)) { if (StartOf(19)) { Argument( -#line 1715 "VBNET.ATG" +#line 1718 "VBNET.ATG" out expr); -#line 1715 "VBNET.ATG" +#line 1718 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } } while (la.kind == 12) { lexer.NextToken(); if (StartOf(19)) { Argument( -#line 1718 "VBNET.ATG" +#line 1721 "VBNET.ATG" out expr); -#line 1718 "VBNET.ATG" +#line 1721 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } } } } Expect(24); -#line 1721 "VBNET.ATG" +#line 1724 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); } } } else if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1725 "VBNET.ATG" +#line 1728 "VBNET.ATG" out name); -#line 1725 "VBNET.ATG" +#line 1728 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); while (la.kind == 10 || la.kind == 23) { if (la.kind == 10) { lexer.NextToken(); IdentifierOrKeyword( -#line 1727 "VBNET.ATG" +#line 1730 "VBNET.ATG" out name); -#line 1727 "VBNET.ATG" +#line 1730 "VBNET.ATG" pexpr = new FieldReferenceExpression(pexpr, name); } else { lexer.NextToken(); -#line 1728 "VBNET.ATG" +#line 1731 "VBNET.ATG" ArrayList parameters = new ArrayList(); if (StartOf(24)) { -#line 1730 "VBNET.ATG" +#line 1733 "VBNET.ATG" expr = null; if (StartOf(19)) { Argument( -#line 1730 "VBNET.ATG" +#line 1733 "VBNET.ATG" out expr); } -#line 1730 "VBNET.ATG" +#line 1733 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } while (la.kind == 12) { lexer.NextToken(); -#line 1732 "VBNET.ATG" +#line 1735 "VBNET.ATG" expr = null; if (StartOf(19)) { Argument( -#line 1733 "VBNET.ATG" +#line 1736 "VBNET.ATG" out expr); } -#line 1733 "VBNET.ATG" +#line 1736 "VBNET.ATG" if (expr != null) { parameters.Add(expr); } } } Expect(24); -#line 1736 "VBNET.ATG" +#line 1739 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); } } @@ -3709,79 +3712,79 @@ out expr); } void AssignmentOperator( -#line 1656 "VBNET.ATG" +#line 1659 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1657 "VBNET.ATG" +#line 1660 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 11: { lexer.NextToken(); -#line 1658 "VBNET.ATG" +#line 1661 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 40: { lexer.NextToken(); -#line 1659 "VBNET.ATG" +#line 1662 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 32: { lexer.NextToken(); -#line 1660 "VBNET.ATG" +#line 1663 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 34: { lexer.NextToken(); -#line 1661 "VBNET.ATG" +#line 1664 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 35: { lexer.NextToken(); -#line 1662 "VBNET.ATG" +#line 1665 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 36: { lexer.NextToken(); -#line 1663 "VBNET.ATG" +#line 1666 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 37: { lexer.NextToken(); -#line 1664 "VBNET.ATG" +#line 1667 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 33: { lexer.NextToken(); -#line 1665 "VBNET.ATG" +#line 1668 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 38: { lexer.NextToken(); -#line 1666 "VBNET.ATG" +#line 1669 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 39: { lexer.NextToken(); -#line 1667 "VBNET.ATG" +#line 1670 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } @@ -3790,130 +3793,130 @@ out AssignmentOperatorType op) { } void IdentifierOrKeyword( -#line 2764 "VBNET.ATG" +#line 2767 "VBNET.ATG" out string name) { -#line 2766 "VBNET.ATG" +#line 2769 "VBNET.ATG" lexer.NextToken(); name = t.val; } void CastTarget( -#line 1743 "VBNET.ATG" +#line 1746 "VBNET.ATG" out TypeReference type) { -#line 1745 "VBNET.ATG" +#line 1748 "VBNET.ATG" type = null; switch (la.kind) { case 58: { lexer.NextToken(); -#line 1747 "VBNET.ATG" +#line 1750 "VBNET.ATG" type = new TypeReference("System.Boolean"); break; } case 59: { lexer.NextToken(); -#line 1748 "VBNET.ATG" +#line 1751 "VBNET.ATG" type = new TypeReference("System.Byte"); break; } case 194: { lexer.NextToken(); -#line 1749 "VBNET.ATG" +#line 1752 "VBNET.ATG" type = new TypeReference("System.SByte"); break; } case 60: { lexer.NextToken(); -#line 1750 "VBNET.ATG" +#line 1753 "VBNET.ATG" type = new TypeReference("System.Char"); break; } case 61: { lexer.NextToken(); -#line 1751 "VBNET.ATG" +#line 1754 "VBNET.ATG" type = new TypeReference("System.DateTime"); break; } case 63: { lexer.NextToken(); -#line 1752 "VBNET.ATG" +#line 1755 "VBNET.ATG" type = new TypeReference("System.Decimal"); break; } case 62: { lexer.NextToken(); -#line 1753 "VBNET.ATG" +#line 1756 "VBNET.ATG" type = new TypeReference("System.Double"); break; } case 71: { lexer.NextToken(); -#line 1754 "VBNET.ATG" +#line 1757 "VBNET.ATG" type = new TypeReference("System.Int16"); break; } case 65: { lexer.NextToken(); -#line 1755 "VBNET.ATG" +#line 1758 "VBNET.ATG" type = new TypeReference("System.Int32"); break; } case 67: { lexer.NextToken(); -#line 1756 "VBNET.ATG" +#line 1759 "VBNET.ATG" type = new TypeReference("System.Int64"); break; } case 195: { lexer.NextToken(); -#line 1757 "VBNET.ATG" +#line 1760 "VBNET.ATG" type = new TypeReference("System.UInt16"); break; } case 196: { lexer.NextToken(); -#line 1758 "VBNET.ATG" +#line 1761 "VBNET.ATG" type = new TypeReference("System.UInt32"); break; } case 197: { lexer.NextToken(); -#line 1759 "VBNET.ATG" +#line 1762 "VBNET.ATG" type = new TypeReference("System.UInt64"); break; } case 68: { lexer.NextToken(); -#line 1760 "VBNET.ATG" +#line 1763 "VBNET.ATG" type = new TypeReference("System.Object"); break; } case 72: { lexer.NextToken(); -#line 1761 "VBNET.ATG" +#line 1764 "VBNET.ATG" type = new TypeReference("System.Single"); break; } case 73: { lexer.NextToken(); -#line 1762 "VBNET.ATG" +#line 1765 "VBNET.ATG" type = new TypeReference("System.String"); break; } @@ -3922,465 +3925,465 @@ out TypeReference type) { } void Argument( -#line 1923 "VBNET.ATG" +#line 1926 "VBNET.ATG" out Expression argumentexpr) { -#line 1925 "VBNET.ATG" +#line 1928 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 1929 "VBNET.ATG" +#line 1932 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 1929 "VBNET.ATG" +#line 1932 "VBNET.ATG" name = t.val; Expect(13); Expect(11); Expr( -#line 1929 "VBNET.ATG" +#line 1932 "VBNET.ATG" out expr); -#line 1931 "VBNET.ATG" +#line 1934 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); } else if (StartOf(19)) { Expr( -#line 1934 "VBNET.ATG" +#line 1937 "VBNET.ATG" out argumentexpr); } else SynErr(242); } void ConditionalAndExpr( -#line 1770 "VBNET.ATG" +#line 1773 "VBNET.ATG" out Expression outExpr) { -#line 1771 "VBNET.ATG" +#line 1774 "VBNET.ATG" Expression expr; InclusiveOrExpr( -#line 1772 "VBNET.ATG" +#line 1775 "VBNET.ATG" out outExpr); while (la.kind == 45) { lexer.NextToken(); InclusiveOrExpr( -#line 1772 "VBNET.ATG" +#line 1775 "VBNET.ATG" out expr); -#line 1772 "VBNET.ATG" +#line 1775 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.LogicalAnd, expr); } } void InclusiveOrExpr( -#line 1775 "VBNET.ATG" +#line 1778 "VBNET.ATG" out Expression outExpr) { -#line 1776 "VBNET.ATG" +#line 1779 "VBNET.ATG" Expression expr; ExclusiveOrExpr( -#line 1777 "VBNET.ATG" +#line 1780 "VBNET.ATG" out outExpr); while (la.kind == 185) { lexer.NextToken(); ExclusiveOrExpr( -#line 1777 "VBNET.ATG" +#line 1780 "VBNET.ATG" out expr); -#line 1777 "VBNET.ATG" +#line 1780 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.ExclusiveOr, expr); } } void ExclusiveOrExpr( -#line 1780 "VBNET.ATG" +#line 1783 "VBNET.ATG" out Expression outExpr) { -#line 1781 "VBNET.ATG" +#line 1784 "VBNET.ATG" Expression expr; AndExpr( -#line 1782 "VBNET.ATG" +#line 1785 "VBNET.ATG" out outExpr); while (la.kind == 137) { lexer.NextToken(); AndExpr( -#line 1782 "VBNET.ATG" +#line 1785 "VBNET.ATG" out expr); -#line 1782 "VBNET.ATG" +#line 1785 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseOr, expr); } } void AndExpr( -#line 1785 "VBNET.ATG" +#line 1788 "VBNET.ATG" out Expression outExpr) { -#line 1786 "VBNET.ATG" +#line 1789 "VBNET.ATG" Expression expr; NotExpr( -#line 1787 "VBNET.ATG" +#line 1790 "VBNET.ATG" out outExpr); while (la.kind == 44) { lexer.NextToken(); NotExpr( -#line 1787 "VBNET.ATG" +#line 1790 "VBNET.ATG" out expr); -#line 1787 "VBNET.ATG" +#line 1790 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.BitwiseAnd, expr); } } void NotExpr( -#line 1790 "VBNET.ATG" +#line 1793 "VBNET.ATG" out Expression outExpr) { -#line 1791 "VBNET.ATG" +#line 1794 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 128) { lexer.NextToken(); -#line 1792 "VBNET.ATG" +#line 1795 "VBNET.ATG" uop = UnaryOperatorType.Not; } EqualityExpr( -#line 1793 "VBNET.ATG" +#line 1796 "VBNET.ATG" out outExpr); -#line 1794 "VBNET.ATG" +#line 1797 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void EqualityExpr( -#line 1799 "VBNET.ATG" +#line 1802 "VBNET.ATG" out Expression outExpr) { -#line 1801 "VBNET.ATG" +#line 1804 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; RelationalExpr( -#line 1804 "VBNET.ATG" +#line 1807 "VBNET.ATG" out outExpr); while (la.kind == 11 || la.kind == 27 || la.kind == 115) { if (la.kind == 27) { lexer.NextToken(); -#line 1807 "VBNET.ATG" +#line 1810 "VBNET.ATG" op = BinaryOperatorType.InEquality; } else if (la.kind == 11) { lexer.NextToken(); -#line 1808 "VBNET.ATG" +#line 1811 "VBNET.ATG" op = BinaryOperatorType.Equality; } else { lexer.NextToken(); -#line 1809 "VBNET.ATG" +#line 1812 "VBNET.ATG" op = BinaryOperatorType.Like; } RelationalExpr( -#line 1811 "VBNET.ATG" +#line 1814 "VBNET.ATG" out expr); -#line 1811 "VBNET.ATG" +#line 1814 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void RelationalExpr( -#line 1815 "VBNET.ATG" +#line 1818 "VBNET.ATG" out Expression outExpr) { -#line 1817 "VBNET.ATG" +#line 1820 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1820 "VBNET.ATG" +#line 1823 "VBNET.ATG" out outExpr); while (StartOf(25)) { if (StartOf(26)) { if (la.kind == 26) { lexer.NextToken(); -#line 1823 "VBNET.ATG" +#line 1826 "VBNET.ATG" op = BinaryOperatorType.LessThan; } else if (la.kind == 25) { lexer.NextToken(); -#line 1824 "VBNET.ATG" +#line 1827 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; } else if (la.kind == 29) { lexer.NextToken(); -#line 1825 "VBNET.ATG" +#line 1828 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; } else if (la.kind == 28) { lexer.NextToken(); -#line 1826 "VBNET.ATG" +#line 1829 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; } else SynErr(243); ShiftExpr( -#line 1828 "VBNET.ATG" +#line 1831 "VBNET.ATG" out expr); -#line 1828 "VBNET.ATG" +#line 1831 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else { if (la.kind == 112) { lexer.NextToken(); -#line 1831 "VBNET.ATG" +#line 1834 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; } else if (la.kind == 189) { lexer.NextToken(); -#line 1832 "VBNET.ATG" +#line 1835 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; } else SynErr(244); Expr( -#line 1833 "VBNET.ATG" +#line 1836 "VBNET.ATG" out expr); -#line 1833 "VBNET.ATG" +#line 1836 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } } void ShiftExpr( -#line 1837 "VBNET.ATG" +#line 1840 "VBNET.ATG" out Expression outExpr) { -#line 1839 "VBNET.ATG" +#line 1842 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; AdditiveExpr( -#line 1842 "VBNET.ATG" +#line 1845 "VBNET.ATG" out outExpr); while (la.kind == 30 || la.kind == 31) { if (la.kind == 30) { lexer.NextToken(); -#line 1845 "VBNET.ATG" +#line 1848 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1846 "VBNET.ATG" +#line 1849 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } AdditiveExpr( -#line 1848 "VBNET.ATG" +#line 1851 "VBNET.ATG" out expr); -#line 1848 "VBNET.ATG" +#line 1851 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void AdditiveExpr( -#line 1852 "VBNET.ATG" +#line 1855 "VBNET.ATG" out Expression outExpr) { -#line 1854 "VBNET.ATG" +#line 1857 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; MultiplicativeExpr( -#line 1857 "VBNET.ATG" +#line 1860 "VBNET.ATG" out outExpr); while (la.kind == 14 || la.kind == 15 || la.kind == 19) { if (la.kind == 14) { lexer.NextToken(); -#line 1860 "VBNET.ATG" +#line 1863 "VBNET.ATG" op = BinaryOperatorType.Add; } else if (la.kind == 15) { lexer.NextToken(); -#line 1861 "VBNET.ATG" +#line 1864 "VBNET.ATG" op = BinaryOperatorType.Subtract; } else { lexer.NextToken(); -#line 1862 "VBNET.ATG" +#line 1865 "VBNET.ATG" op = BinaryOperatorType.Concat; } MultiplicativeExpr( -#line 1864 "VBNET.ATG" +#line 1867 "VBNET.ATG" out expr); -#line 1864 "VBNET.ATG" +#line 1867 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void MultiplicativeExpr( -#line 1868 "VBNET.ATG" +#line 1871 "VBNET.ATG" out Expression outExpr) { -#line 1870 "VBNET.ATG" +#line 1873 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 1873 "VBNET.ATG" +#line 1876 "VBNET.ATG" out outExpr); while (StartOf(27)) { if (la.kind == 16) { lexer.NextToken(); -#line 1876 "VBNET.ATG" +#line 1879 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else if (la.kind == 17) { lexer.NextToken(); -#line 1877 "VBNET.ATG" +#line 1880 "VBNET.ATG" op = BinaryOperatorType.Divide; } else if (la.kind == 18) { lexer.NextToken(); -#line 1878 "VBNET.ATG" +#line 1881 "VBNET.ATG" op = BinaryOperatorType.DivideInteger; } else if (la.kind == 119) { lexer.NextToken(); -#line 1879 "VBNET.ATG" +#line 1882 "VBNET.ATG" op = BinaryOperatorType.Modulus; } else { lexer.NextToken(); -#line 1880 "VBNET.ATG" +#line 1883 "VBNET.ATG" op = BinaryOperatorType.Power; } UnaryExpr( -#line 1882 "VBNET.ATG" +#line 1885 "VBNET.ATG" out expr); -#line 1882 "VBNET.ATG" +#line 1885 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void NonArrayTypeName( -#line 1951 "VBNET.ATG" +#line 1954 "VBNET.ATG" out TypeReference typeref) { -#line 1953 "VBNET.ATG" +#line 1956 "VBNET.ATG" string name; typeref = null; if (StartOf(10)) { Qualident( -#line 1956 "VBNET.ATG" +#line 1959 "VBNET.ATG" out name); -#line 1956 "VBNET.ATG" +#line 1959 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 1957 "VBNET.ATG" +#line 1960 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(200); TypeArgumentList( -#line 1958 "VBNET.ATG" +#line 1961 "VBNET.ATG" typeref.GenericTypes); Expect(24); } } else if (la.kind == 132) { lexer.NextToken(); -#line 1960 "VBNET.ATG" +#line 1963 "VBNET.ATG" typeref = new TypeReference("System.Object"); } else if (la.kind == 198) { lexer.NextToken(); Expect(10); Qualident( -#line 1961 "VBNET.ATG" +#line 1964 "VBNET.ATG" out name); -#line 1962 "VBNET.ATG" +#line 1965 "VBNET.ATG" typeref = new TypeReference(name); typeref.IsGlobal = true; if ( -#line 1963 "VBNET.ATG" +#line 1966 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(200); TypeArgumentList( -#line 1964 "VBNET.ATG" +#line 1967 "VBNET.ATG" typeref.GenericTypes); Expect(24); } } else if (StartOf(22)) { PrimitiveTypeName( -#line 1966 "VBNET.ATG" +#line 1969 "VBNET.ATG" out name); -#line 1966 "VBNET.ATG" +#line 1969 "VBNET.ATG" typeref = new TypeReference(name); } else SynErr(245); } void ArgumentList( -#line 1908 "VBNET.ATG" +#line 1911 "VBNET.ATG" out ArrayList arguments) { -#line 1910 "VBNET.ATG" +#line 1913 "VBNET.ATG" arguments = new ArrayList(); Expression expr = null; if (StartOf(19)) { Argument( -#line 1914 "VBNET.ATG" +#line 1917 "VBNET.ATG" out expr); -#line 1914 "VBNET.ATG" +#line 1917 "VBNET.ATG" if (expr != null) { arguments.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Argument( -#line 1917 "VBNET.ATG" +#line 1920 "VBNET.ATG" out expr); -#line 1917 "VBNET.ATG" +#line 1920 "VBNET.ATG" if (expr != null) { arguments.Add(expr); } } } } void ArrayTypeModifiers( -#line 1979 "VBNET.ATG" +#line 1982 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 1981 "VBNET.ATG" +#line 1984 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 1984 "VBNET.ATG" +#line 1987 "VBNET.ATG" IsDims()) { Expect(23); if (la.kind == 12 || la.kind == 24) { RankList( -#line 1986 "VBNET.ATG" +#line 1989 "VBNET.ATG" out i); } -#line 1988 "VBNET.ATG" +#line 1991 "VBNET.ATG" arrayModifiers.Add(i); Expect(24); } -#line 1993 "VBNET.ATG" +#line 1996 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -4388,89 +4391,89 @@ out i); } void TypeArgumentList( -#line 2006 "VBNET.ATG" +#line 2009 "VBNET.ATG" List typeArguments) { -#line 2008 "VBNET.ATG" +#line 2011 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2010 "VBNET.ATG" +#line 2013 "VBNET.ATG" out typeref); -#line 2010 "VBNET.ATG" +#line 2013 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 2013 "VBNET.ATG" +#line 2016 "VBNET.ATG" out typeref); -#line 2013 "VBNET.ATG" +#line 2016 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void RankList( -#line 2000 "VBNET.ATG" +#line 2003 "VBNET.ATG" out int i) { -#line 2001 "VBNET.ATG" +#line 2004 "VBNET.ATG" i = 0; while (la.kind == 12) { lexer.NextToken(); -#line 2002 "VBNET.ATG" +#line 2005 "VBNET.ATG" ++i; } } void Attribute( -#line 2038 "VBNET.ATG" +#line 2041 "VBNET.ATG" out ICSharpCode.NRefactory.Parser.AST.Attribute attribute) { -#line 2039 "VBNET.ATG" +#line 2042 "VBNET.ATG" string name; Qualident( -#line 2040 "VBNET.ATG" +#line 2043 "VBNET.ATG" out name); -#line 2041 "VBNET.ATG" +#line 2044 "VBNET.ATG" List positional = new List(); List named = new List(); if (la.kind == 23) { AttributeArguments( -#line 2044 "VBNET.ATG" +#line 2047 "VBNET.ATG" positional, named); } -#line 2046 "VBNET.ATG" +#line 2049 "VBNET.ATG" attribute = new ICSharpCode.NRefactory.Parser.AST.Attribute(name, positional, named); } void AttributeArguments( -#line 2051 "VBNET.ATG" +#line 2054 "VBNET.ATG" List positional, List named) { -#line 2053 "VBNET.ATG" +#line 2056 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(23); if ( -#line 2059 "VBNET.ATG" +#line 2062 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2061 "VBNET.ATG" +#line 2064 "VBNET.ATG" IsNamedAssign()) { -#line 2061 "VBNET.ATG" +#line 2064 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2062 "VBNET.ATG" +#line 2065 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -4478,10 +4481,10 @@ out name); Expect(11); } Expr( -#line 2064 "VBNET.ATG" +#line 2067 "VBNET.ATG" out expr); -#line 2066 "VBNET.ATG" +#line 2069 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -4489,13 +4492,13 @@ out expr); while (la.kind == 12) { lexer.NextToken(); if ( -#line 2073 "VBNET.ATG" +#line 2076 "VBNET.ATG" IsNamedAssign()) { -#line 2073 "VBNET.ATG" +#line 2076 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2074 "VBNET.ATG" +#line 2077 "VBNET.ATG" out name); if (la.kind == 13) { lexer.NextToken(); @@ -4503,14 +4506,14 @@ out name); Expect(11); } else if (StartOf(19)) { -#line 2076 "VBNET.ATG" +#line 2079 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); } else SynErr(246); Expr( -#line 2077 "VBNET.ATG" +#line 2080 "VBNET.ATG" out expr); -#line 2077 "VBNET.ATG" +#line 2080 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -4521,10 +4524,10 @@ out expr); } void FormalParameter( -#line 2146 "VBNET.ATG" +#line 2149 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2148 "VBNET.ATG" +#line 2151 "VBNET.ATG" TypeReference type = null; ParamModifiers mod = new ParamModifiers(this); Expression expr = null; @@ -4532,28 +4535,28 @@ out ParameterDeclarationExpression p) { while (StartOf(28)) { ParameterModifier( -#line 2153 "VBNET.ATG" +#line 2156 "VBNET.ATG" mod); } Identifier(); -#line 2154 "VBNET.ATG" +#line 2157 "VBNET.ATG" string parameterName = t.val; if ( -#line 2155 "VBNET.ATG" +#line 2158 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2155 "VBNET.ATG" +#line 2158 "VBNET.ATG" out arrayModifiers); } if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 2156 "VBNET.ATG" +#line 2159 "VBNET.ATG" out type); } -#line 2158 "VBNET.ATG" +#line 2161 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -4569,45 +4572,45 @@ out type); if (la.kind == 11) { lexer.NextToken(); Expr( -#line 2170 "VBNET.ATG" +#line 2173 "VBNET.ATG" out expr); } -#line 2172 "VBNET.ATG" +#line 2175 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); } void ParameterModifier( -#line 2790 "VBNET.ATG" +#line 2793 "VBNET.ATG" ParamModifiers m) { if (la.kind == 54) { lexer.NextToken(); -#line 2791 "VBNET.ATG" +#line 2794 "VBNET.ATG" m.Add(ParamModifier.In); } else if (la.kind == 52) { lexer.NextToken(); -#line 2792 "VBNET.ATG" +#line 2795 "VBNET.ATG" m.Add(ParamModifier.Ref); } else if (la.kind == 136) { lexer.NextToken(); -#line 2793 "VBNET.ATG" +#line 2796 "VBNET.ATG" m.Add(ParamModifier.Optional); } else if (la.kind == 143) { lexer.NextToken(); -#line 2794 "VBNET.ATG" +#line 2797 "VBNET.ATG" m.Add(ParamModifier.Params); } else SynErr(247); } void Statement() { -#line 2200 "VBNET.ATG" +#line 2203 "VBNET.ATG" Statement stmt = null; Point startPos = la.Location; string label = String.Empty; @@ -4615,34 +4618,34 @@ ParamModifiers m) { if (la.kind == 1 || la.kind == 13) { } else if ( -#line 2206 "VBNET.ATG" +#line 2209 "VBNET.ATG" IsLabel()) { LabelName( -#line 2206 "VBNET.ATG" +#line 2209 "VBNET.ATG" out label); -#line 2208 "VBNET.ATG" +#line 2211 "VBNET.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(13); Statement(); } else if (StartOf(29)) { EmbeddedStatement( -#line 2211 "VBNET.ATG" +#line 2214 "VBNET.ATG" out stmt); -#line 2211 "VBNET.ATG" +#line 2214 "VBNET.ATG" compilationUnit.AddChild(stmt); } else if (StartOf(30)) { LocalDeclarationStatement( -#line 2212 "VBNET.ATG" +#line 2215 "VBNET.ATG" out stmt); -#line 2212 "VBNET.ATG" +#line 2215 "VBNET.ATG" compilationUnit.AddChild(stmt); } else SynErr(248); -#line 2215 "VBNET.ATG" +#line 2218 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -4651,30 +4654,30 @@ out stmt); } void LabelName( -#line 2596 "VBNET.ATG" +#line 2599 "VBNET.ATG" out string name) { -#line 2598 "VBNET.ATG" +#line 2601 "VBNET.ATG" name = String.Empty; if (StartOf(10)) { Identifier(); -#line 2600 "VBNET.ATG" +#line 2603 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 2601 "VBNET.ATG" +#line 2604 "VBNET.ATG" name = t.val; } else SynErr(249); } void EmbeddedStatement( -#line 2254 "VBNET.ATG" +#line 2257 "VBNET.ATG" out Statement statement) { -#line 2256 "VBNET.ATG" +#line 2259 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -4684,103 +4687,103 @@ out Statement statement) { case 93: { lexer.NextToken(); -#line 2261 "VBNET.ATG" +#line 2264 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 167: { lexer.NextToken(); -#line 2263 "VBNET.ATG" +#line 2266 "VBNET.ATG" exitType = ExitType.Sub; break; } case 99: { lexer.NextToken(); -#line 2265 "VBNET.ATG" +#line 2268 "VBNET.ATG" exitType = ExitType.Function; break; } case 146: { lexer.NextToken(); -#line 2267 "VBNET.ATG" +#line 2270 "VBNET.ATG" exitType = ExitType.Property; break; } case 82: { lexer.NextToken(); -#line 2269 "VBNET.ATG" +#line 2272 "VBNET.ATG" exitType = ExitType.Do; break; } case 97: { lexer.NextToken(); -#line 2271 "VBNET.ATG" +#line 2274 "VBNET.ATG" exitType = ExitType.For; break; } case 174: { lexer.NextToken(); -#line 2273 "VBNET.ATG" +#line 2276 "VBNET.ATG" exitType = ExitType.Try; break; } case 181: { lexer.NextToken(); -#line 2275 "VBNET.ATG" +#line 2278 "VBNET.ATG" exitType = ExitType.While; break; } case 155: { lexer.NextToken(); -#line 2277 "VBNET.ATG" +#line 2280 "VBNET.ATG" exitType = ExitType.Select; break; } default: SynErr(250); break; } -#line 2279 "VBNET.ATG" +#line 2282 "VBNET.ATG" statement = new ExitStatement(exitType); break; } case 174: { TryStatement( -#line 2280 "VBNET.ATG" +#line 2283 "VBNET.ATG" out statement); break; } case 186: { lexer.NextToken(); -#line 2281 "VBNET.ATG" +#line 2284 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 82 || la.kind == 97 || la.kind == 181) { if (la.kind == 82) { lexer.NextToken(); -#line 2281 "VBNET.ATG" +#line 2284 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 97) { lexer.NextToken(); -#line 2281 "VBNET.ATG" +#line 2284 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2281 "VBNET.ATG" +#line 2284 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2281 "VBNET.ATG" +#line 2284 "VBNET.ATG" statement = new ContinueStatement(continueType); break; } @@ -4788,11 +4791,11 @@ out statement); lexer.NextToken(); if (StartOf(19)) { Expr( -#line 2283 "VBNET.ATG" +#line 2286 "VBNET.ATG" out expr); } -#line 2283 "VBNET.ATG" +#line 2286 "VBNET.ATG" statement = new ThrowStatement(expr); break; } @@ -4800,27 +4803,27 @@ out expr); lexer.NextToken(); if (StartOf(19)) { Expr( -#line 2285 "VBNET.ATG" +#line 2288 "VBNET.ATG" out expr); } -#line 2285 "VBNET.ATG" +#line 2288 "VBNET.ATG" statement = new ReturnStatement(expr); break; } case 168: { lexer.NextToken(); Expr( -#line 2287 "VBNET.ATG" +#line 2290 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2287 "VBNET.ATG" +#line 2290 "VBNET.ATG" out embeddedStatement); Expect(87); Expect(168); -#line 2288 "VBNET.ATG" +#line 2291 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); break; } @@ -4828,42 +4831,42 @@ out embeddedStatement); lexer.NextToken(); Identifier(); -#line 2290 "VBNET.ATG" +#line 2293 "VBNET.ATG" name = t.val; if (la.kind == 23) { lexer.NextToken(); if (StartOf(18)) { ArgumentList( -#line 2291 "VBNET.ATG" +#line 2294 "VBNET.ATG" out p); } Expect(24); } -#line 2292 "VBNET.ATG" +#line 2295 "VBNET.ATG" statement = new RaiseEventStatement(name, p); break; } case 182: { WithStatement( -#line 2294 "VBNET.ATG" +#line 2297 "VBNET.ATG" out statement); break; } case 41: { lexer.NextToken(); -#line 2296 "VBNET.ATG" +#line 2299 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2297 "VBNET.ATG" +#line 2300 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2297 "VBNET.ATG" +#line 2300 "VBNET.ATG" out handlerExpr); -#line 2299 "VBNET.ATG" +#line 2302 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); break; @@ -4871,17 +4874,17 @@ out handlerExpr); case 152: { lexer.NextToken(); -#line 2302 "VBNET.ATG" +#line 2305 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2303 "VBNET.ATG" +#line 2306 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2303 "VBNET.ATG" +#line 2306 "VBNET.ATG" out handlerExpr); -#line 2305 "VBNET.ATG" +#line 2308 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); break; @@ -4889,16 +4892,16 @@ out handlerExpr); case 181: { lexer.NextToken(); Expr( -#line 2308 "VBNET.ATG" +#line 2311 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2309 "VBNET.ATG" +#line 2312 "VBNET.ATG" out embeddedStatement); Expect(87); Expect(181); -#line 2311 "VBNET.ATG" +#line 2314 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); break; @@ -4906,23 +4909,23 @@ out embeddedStatement); case 82: { lexer.NextToken(); -#line 2316 "VBNET.ATG" +#line 2319 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2319 "VBNET.ATG" +#line 2322 "VBNET.ATG" out conditionType); Expr( -#line 2319 "VBNET.ATG" +#line 2322 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2320 "VBNET.ATG" +#line 2323 "VBNET.ATG" out embeddedStatement); Expect(117); -#line 2323 "VBNET.ATG" +#line 2326 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -4931,19 +4934,19 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2330 "VBNET.ATG" +#line 2333 "VBNET.ATG" out embeddedStatement); Expect(117); if (la.kind == 177 || la.kind == 181) { WhileOrUntil( -#line 2331 "VBNET.ATG" +#line 2334 "VBNET.ATG" out conditionType); Expr( -#line 2331 "VBNET.ATG" +#line 2334 "VBNET.ATG" out expr); } -#line 2333 "VBNET.ATG" +#line 2336 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); } else SynErr(251); @@ -4952,7 +4955,7 @@ out expr); case 97: { lexer.NextToken(); -#line 2338 "VBNET.ATG" +#line 2341 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -4961,24 +4964,24 @@ out expr); if (la.kind == 84) { lexer.NextToken(); LoopControlVariable( -#line 2345 "VBNET.ATG" +#line 2348 "VBNET.ATG" out typeReference, out typeName); Expect(108); Expr( -#line 2346 "VBNET.ATG" +#line 2349 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2347 "VBNET.ATG" +#line 2350 "VBNET.ATG" out embeddedStatement); Expect(127); if (StartOf(19)) { Expr( -#line 2348 "VBNET.ATG" +#line 2351 "VBNET.ATG" out expr); } -#line 2350 "VBNET.ATG" +#line 2353 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -4990,53 +4993,53 @@ out expr); } else if (StartOf(10)) { -#line 2361 "VBNET.ATG" +#line 2364 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; Expression nextExpr = null;ArrayList nextExpressions = null; LoopControlVariable( -#line 2366 "VBNET.ATG" +#line 2369 "VBNET.ATG" out typeReference, out typeName); Expect(11); Expr( -#line 2367 "VBNET.ATG" +#line 2370 "VBNET.ATG" out start); Expect(172); Expr( -#line 2367 "VBNET.ATG" +#line 2370 "VBNET.ATG" out end); if (la.kind == 162) { lexer.NextToken(); Expr( -#line 2367 "VBNET.ATG" +#line 2370 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 2368 "VBNET.ATG" +#line 2371 "VBNET.ATG" out embeddedStatement); Expect(127); if (StartOf(19)) { Expr( -#line 2371 "VBNET.ATG" +#line 2374 "VBNET.ATG" out nextExpr); -#line 2371 "VBNET.ATG" +#line 2374 "VBNET.ATG" nextExpressions = new ArrayList(); nextExpressions.Add(nextExpr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2372 "VBNET.ATG" +#line 2375 "VBNET.ATG" out nextExpr); -#line 2372 "VBNET.ATG" +#line 2375 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 2375 "VBNET.ATG" +#line 2378 "VBNET.ATG" statement = new ForNextStatement(typeReference, typeName, start, end, step, embeddedStatement, nextExpressions); } else SynErr(252); @@ -5045,29 +5048,29 @@ out nextExpr); case 91: { lexer.NextToken(); Expr( -#line 2379 "VBNET.ATG" +#line 2382 "VBNET.ATG" out expr); -#line 2379 "VBNET.ATG" +#line 2382 "VBNET.ATG" statement = new ErrorStatement(expr); break; } case 151: { lexer.NextToken(); -#line 2381 "VBNET.ATG" +#line 2384 "VBNET.ATG" Expression redimclause = null; bool isPreserve = false; if (la.kind == 144) { lexer.NextToken(); -#line 2381 "VBNET.ATG" +#line 2384 "VBNET.ATG" isPreserve = true; } Expr( -#line 2382 "VBNET.ATG" +#line 2385 "VBNET.ATG" out redimclause); -#line 2384 "VBNET.ATG" +#line 2387 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; reDimStatement.ReDimClauses.Add(redimclause as InvocationExpression); @@ -5075,10 +5078,10 @@ out redimclause); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2388 "VBNET.ATG" +#line 2391 "VBNET.ATG" out redimclause); -#line 2388 "VBNET.ATG" +#line 2391 "VBNET.ATG" reDimStatement.ReDimClauses.Add(redimclause as InvocationExpression); } break; @@ -5086,10 +5089,10 @@ out redimclause); case 90: { lexer.NextToken(); Expr( -#line 2391 "VBNET.ATG" +#line 2394 "VBNET.ATG" out expr); -#line 2392 "VBNET.ATG" +#line 2395 "VBNET.ATG" ArrayList arrays = new ArrayList(); if (expr != null) { arrays.Add(expr);} EraseStatement eraseStatement = new EraseStatement(arrays); @@ -5098,53 +5101,53 @@ out expr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2397 "VBNET.ATG" +#line 2400 "VBNET.ATG" out expr); -#line 2397 "VBNET.ATG" +#line 2400 "VBNET.ATG" if (expr != null) { arrays.Add(expr); } } -#line 2398 "VBNET.ATG" +#line 2401 "VBNET.ATG" statement = eraseStatement; break; } case 163: { lexer.NextToken(); -#line 2400 "VBNET.ATG" +#line 2403 "VBNET.ATG" statement = new StopStatement(); break; } case 105: { lexer.NextToken(); Expr( -#line 2402 "VBNET.ATG" +#line 2405 "VBNET.ATG" out expr); if (la.kind == 170) { lexer.NextToken(); } if ( -#line 2404 "VBNET.ATG" +#line 2407 "VBNET.ATG" IsEndStmtAhead()) { Expect(87); -#line 2404 "VBNET.ATG" +#line 2407 "VBNET.ATG" statement = new IfElseStatement(expr, new EndStatement()); } else if (la.kind == 1 || la.kind == 13) { EndOfStmt(); Block( -#line 2407 "VBNET.ATG" +#line 2410 "VBNET.ATG" out embeddedStatement); -#line 2409 "VBNET.ATG" +#line 2412 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 86 || -#line 2413 "VBNET.ATG" +#line 2416 "VBNET.ATG" IsElseIf()) { if ( -#line 2413 "VBNET.ATG" +#line 2416 "VBNET.ATG" IsElseIf()) { Expect(85); Expect(105); @@ -5152,20 +5155,20 @@ IsElseIf()) { lexer.NextToken(); } -#line 2416 "VBNET.ATG" +#line 2419 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 2417 "VBNET.ATG" +#line 2420 "VBNET.ATG" out condition); if (la.kind == 170) { lexer.NextToken(); } EndOfStmt(); Block( -#line 2418 "VBNET.ATG" +#line 2421 "VBNET.ATG" out block); -#line 2420 "VBNET.ATG" +#line 2423 "VBNET.ATG" ifStatement.ElseIfSections.Add(new ElseIfSection(condition, block)); } @@ -5173,59 +5176,59 @@ out block); lexer.NextToken(); EndOfStmt(); Block( -#line 2425 "VBNET.ATG" +#line 2428 "VBNET.ATG" out embeddedStatement); -#line 2427 "VBNET.ATG" +#line 2430 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(87); Expect(105); -#line 2431 "VBNET.ATG" +#line 2434 "VBNET.ATG" statement = ifStatement; } else if (StartOf(29)) { EmbeddedStatement( -#line 2434 "VBNET.ATG" +#line 2437 "VBNET.ATG" out embeddedStatement); -#line 2436 "VBNET.ATG" +#line 2439 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2438 "VBNET.ATG" +#line 2441 "VBNET.ATG" out embeddedStatement); -#line 2438 "VBNET.ATG" +#line 2441 "VBNET.ATG" ifStatement.TrueStatement.Add(embeddedStatement); } if (la.kind == 85) { lexer.NextToken(); if (StartOf(29)) { EmbeddedStatement( -#line 2440 "VBNET.ATG" +#line 2443 "VBNET.ATG" out embeddedStatement); } -#line 2442 "VBNET.ATG" +#line 2445 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); while (la.kind == 13) { lexer.NextToken(); EmbeddedStatement( -#line 2445 "VBNET.ATG" +#line 2448 "VBNET.ATG" out embeddedStatement); -#line 2446 "VBNET.ATG" +#line 2449 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } } -#line 2449 "VBNET.ATG" +#line 2452 "VBNET.ATG" statement = ifStatement; } else SynErr(253); break; @@ -5236,43 +5239,43 @@ out embeddedStatement); lexer.NextToken(); } Expr( -#line 2452 "VBNET.ATG" +#line 2455 "VBNET.ATG" out expr); EndOfStmt(); -#line 2453 "VBNET.ATG" +#line 2456 "VBNET.ATG" ArrayList selectSections = new ArrayList(); Statement block = null; while (la.kind == 56) { -#line 2457 "VBNET.ATG" +#line 2460 "VBNET.ATG" ArrayList caseClauses = null; lexer.NextToken(); CaseClauses( -#line 2458 "VBNET.ATG" +#line 2461 "VBNET.ATG" out caseClauses); if ( -#line 2458 "VBNET.ATG" +#line 2461 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 2460 "VBNET.ATG" +#line 2463 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); Block( -#line 2462 "VBNET.ATG" +#line 2465 "VBNET.ATG" out block); -#line 2464 "VBNET.ATG" +#line 2467 "VBNET.ATG" selectSection.Children = block.Children; selectSections.Add(selectSection); } -#line 2468 "VBNET.ATG" +#line 2471 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(87); Expect(155); @@ -5280,43 +5283,43 @@ out block); } case 134: { -#line 2470 "VBNET.ATG" +#line 2473 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 2471 "VBNET.ATG" +#line 2474 "VBNET.ATG" out onErrorStatement); -#line 2471 "VBNET.ATG" +#line 2474 "VBNET.ATG" statement = onErrorStatement; break; } case 103: { -#line 2472 "VBNET.ATG" +#line 2475 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 2473 "VBNET.ATG" +#line 2476 "VBNET.ATG" out goToStatement); -#line 2473 "VBNET.ATG" +#line 2476 "VBNET.ATG" statement = goToStatement; break; } case 153: { -#line 2474 "VBNET.ATG" +#line 2477 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 2475 "VBNET.ATG" +#line 2478 "VBNET.ATG" out resumeStatement); -#line 2475 "VBNET.ATG" +#line 2478 "VBNET.ATG" statement = resumeStatement; break; } case 2: case 3: case 4: case 5: case 6: case 7: case 8: case 9: case 10: case 14: case 15: case 16: case 23: case 42: case 50: case 51: case 53: case 58: case 59: case 60: case 61: case 62: case 63: case 64: case 65: case 67: case 68: case 69: case 71: case 72: case 73: case 74: case 75: case 76: case 81: case 83: case 95: case 101: case 110: case 116: case 118: case 123: case 124: case 126: case 129: case 159: case 160: case 165: case 169: case 173: case 175: case 190: case 191: case 192: case 193: case 194: case 195: case 196: case 197: case 199: { -#line 2478 "VBNET.ATG" +#line 2481 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -5324,25 +5327,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; UnaryExpr( -#line 2484 "VBNET.ATG" +#line 2487 "VBNET.ATG" out expr); if (StartOf(31)) { AssignmentOperator( -#line 2486 "VBNET.ATG" +#line 2489 "VBNET.ATG" out op); Expr( -#line 2486 "VBNET.ATG" +#line 2489 "VBNET.ATG" out val); -#line 2486 "VBNET.ATG" +#line 2489 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); } else if (la.kind == 1 || la.kind == 13 || la.kind == 85) { -#line 2487 "VBNET.ATG" +#line 2490 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); } else SynErr(254); -#line 2490 "VBNET.ATG" +#line 2493 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is FieldReferenceExpression || expr is IdentifierExpression) { @@ -5355,10 +5358,10 @@ out val); case 55: { lexer.NextToken(); UnaryExpr( -#line 2497 "VBNET.ATG" +#line 2500 "VBNET.ATG" out expr); -#line 2497 "VBNET.ATG" +#line 2500 "VBNET.ATG" statement = new StatementExpression(expr); break; } @@ -5366,7 +5369,7 @@ out expr); lexer.NextToken(); Identifier(); -#line 2499 "VBNET.ATG" +#line 2502 "VBNET.ATG" string resourcename = t.val, typeName; Statement resourceAquisition = null, block = null; @@ -5374,45 +5377,45 @@ out expr); if (la.kind == 126) { lexer.NextToken(); Qualident( -#line 2503 "VBNET.ATG" +#line 2506 "VBNET.ATG" out typeName); -#line 2503 "VBNET.ATG" +#line 2506 "VBNET.ATG" ArrayList initializer = null; if (la.kind == 23) { lexer.NextToken(); if (StartOf(18)) { ArgumentList( -#line 2503 "VBNET.ATG" +#line 2506 "VBNET.ATG" out initializer); } Expect(24); } -#line 2505 "VBNET.ATG" +#line 2508 "VBNET.ATG" resourceAquisition = new LocalVariableDeclaration(new VariableDeclaration(resourcename, new ArrayInitializerExpression(initializer), new TypeReference(typeName))); } else if (StartOf(10)) { Qualident( -#line 2508 "VBNET.ATG" +#line 2511 "VBNET.ATG" out typeName); Expect(11); Expr( -#line 2508 "VBNET.ATG" +#line 2511 "VBNET.ATG" out expr); -#line 2510 "VBNET.ATG" +#line 2513 "VBNET.ATG" resourceAquisition = new LocalVariableDeclaration(new VariableDeclaration(resourcename, expr, new TypeReference(typeName))); } else SynErr(255); Block( -#line 2513 "VBNET.ATG" +#line 2516 "VBNET.ATG" out block); Expect(87); Expect(188); -#line 2515 "VBNET.ATG" +#line 2518 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); break; } @@ -5421,10 +5424,10 @@ out block); } void LocalDeclarationStatement( -#line 2223 "VBNET.ATG" +#line 2226 "VBNET.ATG" out Statement statement) { -#line 2225 "VBNET.ATG" +#line 2228 "VBNET.ATG" Modifiers m = new Modifiers(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -5433,22 +5436,22 @@ out Statement statement) { if (la.kind == 70) { lexer.NextToken(); -#line 2231 "VBNET.ATG" +#line 2234 "VBNET.ATG" m.Add(Modifier.Const, t.Location); } else if (la.kind == 161) { lexer.NextToken(); -#line 2232 "VBNET.ATG" +#line 2235 "VBNET.ATG" m.Add(Modifier.Static, t.Location); } else { lexer.NextToken(); -#line 2233 "VBNET.ATG" +#line 2236 "VBNET.ATG" dimfound = true; } } -#line 2236 "VBNET.ATG" +#line 2239 "VBNET.ATG" if(dimfound && (m.Modifier & Modifier.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -5461,137 +5464,137 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2247 "VBNET.ATG" +#line 2250 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2248 "VBNET.ATG" +#line 2251 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2250 "VBNET.ATG" +#line 2253 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 2708 "VBNET.ATG" +#line 2711 "VBNET.ATG" out Statement tryStatement) { -#line 2710 "VBNET.ATG" +#line 2713 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;ArrayList catchClauses = null; Expect(174); EndOfStmt(); Block( -#line 2713 "VBNET.ATG" +#line 2716 "VBNET.ATG" out blockStmt); if (la.kind == 57 || la.kind == 87 || la.kind == 96) { CatchClauses( -#line 2714 "VBNET.ATG" +#line 2717 "VBNET.ATG" out catchClauses); } if (la.kind == 96) { lexer.NextToken(); EndOfStmt(); Block( -#line 2715 "VBNET.ATG" +#line 2718 "VBNET.ATG" out finallyStmt); } Expect(87); Expect(174); -#line 2718 "VBNET.ATG" +#line 2721 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 2686 "VBNET.ATG" +#line 2689 "VBNET.ATG" out Statement withStatement) { -#line 2688 "VBNET.ATG" +#line 2691 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(182); -#line 2691 "VBNET.ATG" +#line 2694 "VBNET.ATG" Point start = t.Location; Expr( -#line 2692 "VBNET.ATG" +#line 2695 "VBNET.ATG" out expr); EndOfStmt(); -#line 2694 "VBNET.ATG" +#line 2697 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; withStatements.Push(withStatement); Block( -#line 2698 "VBNET.ATG" +#line 2701 "VBNET.ATG" out blockStmt); -#line 2700 "VBNET.ATG" +#line 2703 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; withStatements.Pop(); Expect(87); Expect(182); -#line 2704 "VBNET.ATG" +#line 2707 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 2679 "VBNET.ATG" +#line 2682 "VBNET.ATG" out ConditionType conditionType) { -#line 2680 "VBNET.ATG" +#line 2683 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 181) { lexer.NextToken(); -#line 2681 "VBNET.ATG" +#line 2684 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 177) { lexer.NextToken(); -#line 2682 "VBNET.ATG" +#line 2685 "VBNET.ATG" conditionType = ConditionType.Until; } else SynErr(257); } void LoopControlVariable( -#line 2520 "VBNET.ATG" +#line 2523 "VBNET.ATG" out TypeReference type, out string name) { -#line 2521 "VBNET.ATG" +#line 2524 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 2525 "VBNET.ATG" +#line 2528 "VBNET.ATG" out name); if ( -#line 2526 "VBNET.ATG" +#line 2529 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2526 "VBNET.ATG" +#line 2529 "VBNET.ATG" out arrayModifiers); } if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 2527 "VBNET.ATG" +#line 2530 "VBNET.ATG" out type); -#line 2527 "VBNET.ATG" +#line 2530 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 2529 "VBNET.ATG" +#line 2532 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -5609,48 +5612,48 @@ out type); } void CaseClauses( -#line 2639 "VBNET.ATG" +#line 2642 "VBNET.ATG" out ArrayList caseClauses) { -#line 2641 "VBNET.ATG" +#line 2644 "VBNET.ATG" caseClauses = new ArrayList(); CaseLabel caseClause = null; CaseClause( -#line 2644 "VBNET.ATG" +#line 2647 "VBNET.ATG" out caseClause); -#line 2644 "VBNET.ATG" +#line 2647 "VBNET.ATG" caseClauses.Add(caseClause); while (la.kind == 12) { lexer.NextToken(); CaseClause( -#line 2645 "VBNET.ATG" +#line 2648 "VBNET.ATG" out caseClause); -#line 2645 "VBNET.ATG" +#line 2648 "VBNET.ATG" caseClauses.Add(caseClause); } } void OnErrorStatement( -#line 2546 "VBNET.ATG" +#line 2549 "VBNET.ATG" out OnErrorStatement stmt) { -#line 2548 "VBNET.ATG" +#line 2551 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(134); Expect(91); if ( -#line 2554 "VBNET.ATG" +#line 2557 "VBNET.ATG" IsNegativeLabelName()) { Expect(103); Expect(15); Expect(5); -#line 2556 "VBNET.ATG" +#line 2559 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -5659,10 +5662,10 @@ IsNegativeLabelName()) { } else if (la.kind == 103) { GotoStatement( -#line 2562 "VBNET.ATG" +#line 2565 "VBNET.ATG" out goToStatement); -#line 2564 "VBNET.ATG" +#line 2567 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -5679,63 +5682,63 @@ out goToStatement); lexer.NextToken(); Expect(127); -#line 2578 "VBNET.ATG" +#line 2581 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); } else SynErr(258); } void GotoStatement( -#line 2584 "VBNET.ATG" +#line 2587 "VBNET.ATG" out ICSharpCode.NRefactory.Parser.AST.GotoStatement goToStatement) { -#line 2586 "VBNET.ATG" +#line 2589 "VBNET.ATG" string label = String.Empty; Expect(103); LabelName( -#line 2589 "VBNET.ATG" +#line 2592 "VBNET.ATG" out label); -#line 2591 "VBNET.ATG" +#line 2594 "VBNET.ATG" goToStatement = new ICSharpCode.NRefactory.Parser.AST.GotoStatement(label); } void ResumeStatement( -#line 2628 "VBNET.ATG" +#line 2631 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 2630 "VBNET.ATG" +#line 2633 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 2633 "VBNET.ATG" +#line 2636 "VBNET.ATG" IsResumeNext()) { Expect(153); Expect(127); -#line 2634 "VBNET.ATG" +#line 2637 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 153) { lexer.NextToken(); if (StartOf(32)) { LabelName( -#line 2635 "VBNET.ATG" +#line 2638 "VBNET.ATG" out label); } -#line 2635 "VBNET.ATG" +#line 2638 "VBNET.ATG" resumeStatement = new ResumeStatement(label); } else SynErr(259); } void CaseClause( -#line 2649 "VBNET.ATG" +#line 2652 "VBNET.ATG" out CaseLabel caseClause) { -#line 2651 "VBNET.ATG" +#line 2654 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -5744,7 +5747,7 @@ out CaseLabel caseClause) { if (la.kind == 85) { lexer.NextToken(); -#line 2657 "VBNET.ATG" +#line 2660 "VBNET.ATG" caseClause = new CaseLabel(); } else if (StartOf(33)) { if (la.kind == 112) { @@ -5754,76 +5757,76 @@ out CaseLabel caseClause) { case 26: { lexer.NextToken(); -#line 2661 "VBNET.ATG" +#line 2664 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 25: { lexer.NextToken(); -#line 2662 "VBNET.ATG" +#line 2665 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 29: { lexer.NextToken(); -#line 2663 "VBNET.ATG" +#line 2666 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 28: { lexer.NextToken(); -#line 2664 "VBNET.ATG" +#line 2667 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 11: { lexer.NextToken(); -#line 2665 "VBNET.ATG" +#line 2668 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 27: { lexer.NextToken(); -#line 2666 "VBNET.ATG" +#line 2669 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } default: SynErr(260); break; } Expr( -#line 2668 "VBNET.ATG" +#line 2671 "VBNET.ATG" out expr); -#line 2670 "VBNET.ATG" +#line 2673 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(19)) { Expr( -#line 2672 "VBNET.ATG" +#line 2675 "VBNET.ATG" out expr); if (la.kind == 172) { lexer.NextToken(); Expr( -#line 2672 "VBNET.ATG" +#line 2675 "VBNET.ATG" out sexpr); } -#line 2674 "VBNET.ATG" +#line 2677 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); } else SynErr(261); } void CatchClauses( -#line 2723 "VBNET.ATG" +#line 2726 "VBNET.ATG" out ArrayList catchClauses) { -#line 2725 "VBNET.ATG" +#line 2728 "VBNET.ATG" catchClauses = new ArrayList(); TypeReference type = null; Statement blockStmt = null; @@ -5835,27 +5838,27 @@ out ArrayList catchClauses) { if (StartOf(10)) { Identifier(); -#line 2733 "VBNET.ATG" +#line 2736 "VBNET.ATG" name = t.val; if (la.kind == 47) { lexer.NextToken(); TypeName( -#line 2733 "VBNET.ATG" +#line 2736 "VBNET.ATG" out type); } } if (la.kind == 180) { lexer.NextToken(); Expr( -#line 2734 "VBNET.ATG" +#line 2737 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 2736 "VBNET.ATG" +#line 2739 "VBNET.ATG" out blockStmt); -#line 2737 "VBNET.ATG" +#line 2740 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index 37a3129058..ddbbb95eeb 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -1200,9 +1200,9 @@ StructureMemberDecl attributes> (. m.Check(Modifier.VBCustomEvents); EventAddRemoveRegion eventAccessorDeclaration; - EventAddRemoveRegion addHandlerAccessorDeclaration = null; - EventAddRemoveRegion removeHandlerAccessorDeclaration = null; - EventAddRemoveRegion raiseEventAccessorDeclaration = null; + EventAddRegion addHandlerAccessorDeclaration = null; + EventRemoveRegion removeHandlerAccessorDeclaration = null; + EventRaiseRegion raiseEventAccessorDeclaration = null; ArrayList implementsClause = null; .) Identifier (. string customEventName = t.val; .) @@ -1214,15 +1214,15 @@ StructureMemberDecl attributes> (. if(eventAccessorDeclaration is EventAddRegion) { - addHandlerAccessorDeclaration = eventAccessorDeclaration; + addHandlerAccessorDeclaration = (EventAddRegion)eventAccessorDeclaration; } else if(eventAccessorDeclaration is EventRemoveRegion) { - removeHandlerAccessorDeclaration = eventAccessorDeclaration; + removeHandlerAccessorDeclaration = (EventRemoveRegion)eventAccessorDeclaration; } else if(eventAccessorDeclaration is EventRaiseRegion) { - raiseEventAccessorDeclaration = eventAccessorDeclaration; + raiseEventAccessorDeclaration = (EventRaiseRegion)eventAccessorDeclaration; } .) } @@ -1233,12 +1233,12 @@ StructureMemberDecl attributes> Error("Need to provide AddHandler accessor."); } - if(addHandlerAccessorDeclaration == null) + if(removeHandlerAccessorDeclaration == null) { Error("Need to provide RemoveHandler accessor."); } - if(addHandlerAccessorDeclaration == null) + if(raiseEventAccessorDeclaration == null) { Error("Need to provide RaiseEvent accessor."); } @@ -1246,6 +1246,9 @@ StructureMemberDecl attributes> EventDeclaration decl = new EventDeclaration(type, customEventName, m.Modifier, attributes); decl.StartLocation = m.GetDeclarationLocation(startPos); decl.EndLocation = t.EndLocation; + decl.AddRegion = addHandlerAccessorDeclaration; + decl.RemoveRegion = removeHandlerAccessorDeclaration; + decl.RaiseRegion = raiseEventAccessorDeclaration; compilationUnit.AddChild(decl); .) | diff --git a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/CSharpToVBNetConvertVisitor.cs b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/CSharpToVBNetConvertVisitor.cs index 03cc9c2b92..76329b5f58 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/Visitors/CSharpToVBNetConvertVisitor.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/Visitors/CSharpToVBNetConvertVisitor.cs @@ -33,6 +33,22 @@ namespace ICSharpCode.NRefactory.Parser // The following conversions should be implemented in the future: // if (Event != null) Event(this, bla); -> RaiseEvent Event(this, bla) + + bool renameConflictingFieldNames = true; + + /// + /// Gets/Sets if fields that conflict with a property name should be renamed automatically by + /// prefixing them with "m_". Default is true. + /// + public bool RenameConflictingFieldNames { + get { + return renameConflictingFieldNames; + } + set { + renameConflictingFieldNames = value; + } + } + public override object Visit(BinaryOperatorExpression binaryOperatorExpression, object data) { if (binaryOperatorExpression.Op == BinaryOperatorType.Equality || binaryOperatorExpression.Op == BinaryOperatorType.InEquality) { @@ -83,7 +99,9 @@ namespace ICSharpCode.NRefactory.Parser } } } - new PrefixFieldsVisitor(conflicts, "m_").Run(td); + if (renameConflictingFieldNames) { + new PrefixFieldsVisitor(conflicts, "m_").Run(td); + } object result = base.Visit(td, data); ConvertForStatements(); return result; @@ -167,19 +185,21 @@ namespace ICSharpCode.NRefactory.Parser return; Expression end; if (iterator.Op == AssignmentOperatorType.Subtract) { - if (condition.Op == BinaryOperatorType.GreaterThanOrEqual) + if (condition.Op == BinaryOperatorType.GreaterThanOrEqual) { end = condition.Right; - else if (condition.Op == BinaryOperatorType.GreaterThan) - end = new BinaryOperatorExpression(condition.Right, BinaryOperatorType.Add, new PrimitiveExpression(1, "1")); - else + } else if (condition.Op == BinaryOperatorType.GreaterThan) { + end = AddInteger(condition.Right, 1); + } else { return; + } } else { - if (condition.Op == BinaryOperatorType.LessThanOrEqual) + if (condition.Op == BinaryOperatorType.LessThanOrEqual) { end = condition.Right; - else if (condition.Op == BinaryOperatorType.LessThan) - end = new BinaryOperatorExpression(condition.Right, BinaryOperatorType.Subtract, new PrimitiveExpression(1, "1")); - else + } else if (condition.Op == BinaryOperatorType.LessThan) { + end = AddInteger(condition.Right, -1); + } else { return; + } } Expression start; @@ -208,9 +228,29 @@ namespace ICSharpCode.NRefactory.Parser ForNextStatement forNextStatement = new ForNextStatement(typeReference, iteratorIdentifier.Identifier, start, end, - (step == 1) ? null : new PrimitiveExpression(step, step.ToString(System.Globalization.CultureInfo.InvariantCulture)), + (step == 1) ? null : new PrimitiveExpression(step, step.ToString(System.Globalization.NumberFormatInfo.InvariantInfo)), forStatement.EmbeddedStatement, null); forStatement.Parent.Children[forStatement.Parent.Children.IndexOf(forStatement)] = forNextStatement; } + + /// + /// Returns the existing expression plus the specified integer value. + /// WARNING: This method modifies and possibly returns + /// again, but it might also create a new expression around . + /// + public static Expression AddInteger(Expression expr, int value) + { + PrimitiveExpression pe = expr as PrimitiveExpression; + if (pe != null && pe.Value is int) { + int newVal = (int)pe.Value + value; + return new PrimitiveExpression(newVal, newVal.ToString(System.Globalization.NumberFormatInfo.InvariantInfo)); + } + BinaryOperatorExpression boe = expr as BinaryOperatorExpression; + if (boe != null) { + boe.Right = AddInteger(boe.Right, value); + return boe; + } + return new BinaryOperatorExpression(expr, BinaryOperatorType.Add, new PrimitiveExpression(value, value.ToString(System.Globalization.NumberFormatInfo.InvariantInfo))); + } } } diff --git a/src/Main/Base/Project/Src/Dom/HelpProvider.cs b/src/Main/Base/Project/Src/Dom/HelpProvider.cs index ebdc6f6a6b..c906cd5543 100644 --- a/src/Main/Base/Project/Src/Dom/HelpProvider.cs +++ b/src/Main/Base/Project/Src/Dom/HelpProvider.cs @@ -1,9 +1,9 @@ -/* - * Created by SharpDevelop. - * User: Daniel Grunwald - * Date: 13.08.2005 - * Time: 15:14 - */ +// +// 2002-2005 AlphaSierraPapa +// GNU General Public License +// +// $Revision$ +// using System; using System.Collections; diff --git a/src/Main/Base/Project/Src/Dom/XmlDoc.cs b/src/Main/Base/Project/Src/Dom/XmlDoc.cs index 982941f6b0..b060a9c338 100644 --- a/src/Main/Base/Project/Src/Dom/XmlDoc.cs +++ b/src/Main/Base/Project/Src/Dom/XmlDoc.cs @@ -153,7 +153,6 @@ namespace ICSharpCode.SharpDevelop.Dom public void Dispose() { - LoggingService.Debug("Disposing XmlDoc object"); if (loader != null) { loader.Close(); fs.Close();
AuthorAuthor Date Change