diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/BuildKeywords.pl b/src/Libraries/NRefactory/Project/Src/Lexer/BuildKeywords.pl index 21c09339f5..a34bdde9a7 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/BuildKeywords.pl +++ b/src/Libraries/NRefactory/Project/Src/Lexer/BuildKeywords.pl @@ -16,7 +16,7 @@ close(DAT); print "done.\n"; #analyse infile -print "starting analysation ... this could take a few minutes.\n"; +print "starting analysis... this could take a few seconds.\n"; foreach (@raw_data) { if ($_=~/^\s*\$(\w+)\s*=\s*(\S+)\s*$/) { @@ -135,7 +135,7 @@ sub write_keywordfile sub write_token { $formattedString = sprintf("%-20s", ucfirst $tokenName); - if (($tokenName eq "GetType") or ($tokenName eq "equals")) { + if (($tokenName eq "GetType") or ($tokenName eq "equals") or ($tokenName eq "Equals")) { print DAT "\t\tnew public const int $formattedString = $tokenValue;\n"; } else { print DAT "\t\tpublic const int $formattedString = $tokenValue;\n"; diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/KeywordList.txt b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/KeywordList.txt index e462dce2be..12e86626cd 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/KeywordList.txt +++ b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/KeywordList.txt @@ -66,16 +66,19 @@ ConcatStringAssign = "&=" # Keywordlist "AddHandler" "AddressOf" +"Aggregate" "Alias" "And" "AndAlso" "Ansi" "As" +"Ascending" "Assembly" "Auto" "Binary" "Boolean" "ByRef" +"By" "Byte" "ByVal" "Call" @@ -109,8 +112,10 @@ ConcatStringAssign = "&=" "Declare" "Default" "Delegate" +"Descending" "Dim" "DirectCast" +"Distinct" "Do" "Double" "Each" @@ -119,6 +124,7 @@ ConcatStringAssign = "&=" "End" "EndIf" "Enum" +"Equals" "Erase" "Error" "Event" @@ -128,12 +134,14 @@ ConcatStringAssign = "&=" "Finally" "For" "Friend" +"From" "Function" "Get" "GetType" "Global" "GoSub" "GoTo" +"Group" "Handles" "If" "Implements" @@ -143,9 +151,11 @@ ConcatStringAssign = "&=" "Inherits" "Integer" "Interface" +"Into" "Is" "IsNot" # Note: IsTrue and IsFalse are 'NOT' keywords they're only valid in Operator declarations (like get/set/value are no C# 'keywords') +"Join" "Let" "Lib" "Like" @@ -174,6 +184,7 @@ ConcatStringAssign = "&=" "Option" "Optional" "Or" +"Order" "OrElse" "Overloads" "Overridable" @@ -200,6 +211,7 @@ ConcatStringAssign = "&=" "Shared" "Short" "Single" +"Skip" "Static" "Step" "Stop" @@ -208,6 +220,7 @@ ConcatStringAssign = "&=" "Structure" "Sub" "SyncLock" +"Take" "Text" "Then" "Throw" @@ -225,6 +238,7 @@ ConcatStringAssign = "&=" "Variant" "Wend" "When" +"Where" "While" "Widening" "With" @@ -237,4 +251,4 @@ Null("Nothing") BlockSucc("Case", "Catch", "Else", "ElseIf", "End", "Finally", "Loop", "Next") # List of keywords that are valid identifiers, must be the same as the "Identifier" production in VBNET.ATG -IdentifierTokens("Text", "Binary", "Compare", "Assembly", "Ansi", "Auto", "Preserve", "Unicode", "Until", "Explicit", "Off") +IdentifierTokens("Text", "Binary", "Compare", "Assembly", "Ansi", "Auto", "Preserve", "Unicode", "Until", "Off", "Explicit", "Infer", "From", "Join", "Equals", "Distinct", "Where", "Take", "Skip", "Order", "By", "Ascending", "Descending", "Group", "Into", "Aggregate") diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Keywords.cs b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Keywords.cs index dbb388ae48..0a9ff48978 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Keywords.cs +++ b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Keywords.cs @@ -8,16 +8,19 @@ namespace ICSharpCode.NRefactory.Parser.VB static readonly string[] keywordList = { "ADDHANDLER", "ADDRESSOF", + "AGGREGATE", "ALIAS", "AND", "ANDALSO", "ANSI", "AS", + "ASCENDING", "ASSEMBLY", "AUTO", "BINARY", "BOOLEAN", "BYREF", + "BY", "BYTE", "BYVAL", "CALL", @@ -51,8 +54,10 @@ namespace ICSharpCode.NRefactory.Parser.VB "DECLARE", "DEFAULT", "DELEGATE", + "DESCENDING", "DIM", "DIRECTCAST", + "DISTINCT", "DO", "DOUBLE", "EACH", @@ -61,6 +66,7 @@ namespace ICSharpCode.NRefactory.Parser.VB "END", "ENDIF", "ENUM", + "EQUALS", "ERASE", "ERROR", "EVENT", @@ -70,12 +76,14 @@ namespace ICSharpCode.NRefactory.Parser.VB "FINALLY", "FOR", "FRIEND", + "FROM", "FUNCTION", "GET", "GETTYPE", "GLOBAL", "GOSUB", "GOTO", + "GROUP", "HANDLES", "IF", "IMPLEMENTS", @@ -85,8 +93,10 @@ namespace ICSharpCode.NRefactory.Parser.VB "INHERITS", "INTEGER", "INTERFACE", + "INTO", "IS", "ISNOT", + "JOIN", "LET", "LIB", "LIKE", @@ -115,6 +125,7 @@ namespace ICSharpCode.NRefactory.Parser.VB "OPTION", "OPTIONAL", "OR", + "ORDER", "ORELSE", "OVERLOADS", "OVERRIDABLE", @@ -140,6 +151,7 @@ namespace ICSharpCode.NRefactory.Parser.VB "SHARED", "SHORT", "SINGLE", + "SKIP", "STATIC", "STEP", "STOP", @@ -148,6 +160,7 @@ namespace ICSharpCode.NRefactory.Parser.VB "STRUCTURE", "SUB", "SYNCLOCK", + "TAKE", "TEXT", "THEN", "THROW", @@ -165,6 +178,7 @@ namespace ICSharpCode.NRefactory.Parser.VB "VARIANT", "WEND", "WHEN", + "WHERE", "WHILE", "WIDENING", "WITH", diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Tokens.cs b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Tokens.cs index 0d9348b058..9807c7b07c 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Tokens.cs +++ b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Tokens.cs @@ -56,171 +56,185 @@ namespace ICSharpCode.NRefactory.Parser.VB // ----- keywords ----- public const int AddHandler = 43; public const int AddressOf = 44; - public const int Alias = 45; - public const int And = 46; - public const int AndAlso = 47; - public const int Ansi = 48; - public const int As = 49; - public const int Assembly = 50; - public const int Auto = 51; - public const int Binary = 52; - public const int Boolean = 53; - public const int ByRef = 54; - public const int Byte = 55; - public const int ByVal = 56; - public const int Call = 57; - public const int Case = 58; - public const int Catch = 59; - public const int CBool = 60; - public const int CByte = 61; - public const int CChar = 62; - public const int CDate = 63; - public const int CDbl = 64; - public const int CDec = 65; - public const int Char = 66; - public const int CInt = 67; - public const int Class = 68; - public const int CLng = 69; - public const int CObj = 70; - public const int Compare = 71; - public const int Const = 72; - public const int Continue = 73; - public const int CSByte = 74; - public const int CShort = 75; - public const int CSng = 76; - public const int CStr = 77; - public const int CType = 78; - public const int CUInt = 79; - public const int CULng = 80; - public const int CUShort = 81; - public const int Custom = 82; - public const int Date = 83; - public const int Decimal = 84; - public const int Declare = 85; - public const int Default = 86; - public const int Delegate = 87; - public const int Dim = 88; - public const int DirectCast = 89; - public const int Do = 90; - public const int Double = 91; - public const int Each = 92; - public const int Else = 93; - public const int ElseIf = 94; - public const int End = 95; - public const int EndIf = 96; - public const int Enum = 97; - public const int Erase = 98; - public const int Error = 99; - public const int Event = 100; - public const int Exit = 101; - public const int Explicit = 102; - public const int False = 103; - public const int Finally = 104; - public const int For = 105; - public const int Friend = 106; - public const int Function = 107; - public const int Get = 108; - new public const int GetType = 109; - public const int Global = 110; - public const int GoSub = 111; - public const int GoTo = 112; - public const int Handles = 113; - public const int If = 114; - public const int Implements = 115; - public const int Imports = 116; - public const int In = 117; - public const int Infer = 118; - public const int Inherits = 119; - public const int Integer = 120; - public const int Interface = 121; - public const int Is = 122; - public const int IsNot = 123; - public const int Let = 124; - public const int Lib = 125; - public const int Like = 126; - public const int Long = 127; - public const int Loop = 128; - public const int Me = 129; - public const int Mod = 130; - public const int Module = 131; - public const int MustInherit = 132; - public const int MustOverride = 133; - public const int MyBase = 134; - public const int MyClass = 135; - public const int Namespace = 136; - public const int Narrowing = 137; - public const int New = 138; - public const int Next = 139; - public const int Not = 140; - public const int Nothing = 141; - public const int NotInheritable = 142; - public const int NotOverridable = 143; - public const int Object = 144; - public const int Of = 145; - public const int Off = 146; - public const int On = 147; - public const int Operator = 148; - public const int Option = 149; - public const int Optional = 150; - public const int Or = 151; - public const int OrElse = 152; - public const int Overloads = 153; - public const int Overridable = 154; - public const int Overrides = 155; - public const int ParamArray = 156; - public const int Partial = 157; - public const int Preserve = 158; - public const int Private = 159; - public const int Property = 160; - public const int Protected = 161; - public const int Public = 162; - public const int RaiseEvent = 163; - public const int ReadOnly = 164; - public const int ReDim = 165; - public const int Rem = 166; - public const int RemoveHandler = 167; - public const int Resume = 168; - public const int Return = 169; - public const int SByte = 170; - public const int Select = 171; - public const int Set = 172; - public const int Shadows = 173; - public const int Shared = 174; - public const int Short = 175; - public const int Single = 176; - public const int Static = 177; - public const int Step = 178; - public const int Stop = 179; - public const int Strict = 180; - public const int String = 181; - public const int Structure = 182; - public const int Sub = 183; - public const int SyncLock = 184; - public const int Text = 185; - public const int Then = 186; - public const int Throw = 187; - public const int To = 188; - public const int True = 189; - public const int Try = 190; - public const int TryCast = 191; - public const int TypeOf = 192; - public const int UInteger = 193; - public const int ULong = 194; - public const int Unicode = 195; - public const int Until = 196; - public const int UShort = 197; - public const int Using = 198; - public const int Variant = 199; - public const int Wend = 200; - public const int When = 201; - public const int While = 202; - public const int Widening = 203; - public const int With = 204; - public const int WithEvents = 205; - public const int WriteOnly = 206; - public const int Xor = 207; + public const int Aggregate = 45; + public const int Alias = 46; + public const int And = 47; + public const int AndAlso = 48; + public const int Ansi = 49; + public const int As = 50; + public const int Ascending = 51; + public const int Assembly = 52; + public const int Auto = 53; + public const int Binary = 54; + public const int Boolean = 55; + public const int ByRef = 56; + public const int By = 57; + public const int Byte = 58; + public const int ByVal = 59; + public const int Call = 60; + public const int Case = 61; + public const int Catch = 62; + public const int CBool = 63; + public const int CByte = 64; + public const int CChar = 65; + public const int CDate = 66; + public const int CDbl = 67; + public const int CDec = 68; + public const int Char = 69; + public const int CInt = 70; + public const int Class = 71; + public const int CLng = 72; + public const int CObj = 73; + public const int Compare = 74; + public const int Const = 75; + public const int Continue = 76; + public const int CSByte = 77; + public const int CShort = 78; + public const int CSng = 79; + public const int CStr = 80; + public const int CType = 81; + public const int CUInt = 82; + public const int CULng = 83; + public const int CUShort = 84; + public const int Custom = 85; + public const int Date = 86; + public const int Decimal = 87; + public const int Declare = 88; + public const int Default = 89; + public const int Delegate = 90; + public const int Descending = 91; + public const int Dim = 92; + public const int DirectCast = 93; + public const int Distinct = 94; + public const int Do = 95; + public const int Double = 96; + public const int Each = 97; + public const int Else = 98; + public const int ElseIf = 99; + public const int End = 100; + public const int EndIf = 101; + public const int Enum = 102; + new public const int Equals = 103; + public const int Erase = 104; + public const int Error = 105; + public const int Event = 106; + public const int Exit = 107; + public const int Explicit = 108; + public const int False = 109; + public const int Finally = 110; + public const int For = 111; + public const int Friend = 112; + public const int From = 113; + public const int Function = 114; + public const int Get = 115; + new public const int GetType = 116; + public const int Global = 117; + public const int GoSub = 118; + public const int GoTo = 119; + public const int Group = 120; + public const int Handles = 121; + public const int If = 122; + public const int Implements = 123; + public const int Imports = 124; + public const int In = 125; + public const int Infer = 126; + public const int Inherits = 127; + public const int Integer = 128; + public const int Interface = 129; + public const int Into = 130; + public const int Is = 131; + public const int IsNot = 132; + public const int Join = 133; + public const int Let = 134; + public const int Lib = 135; + public const int Like = 136; + public const int Long = 137; + public const int Loop = 138; + public const int Me = 139; + public const int Mod = 140; + public const int Module = 141; + public const int MustInherit = 142; + public const int MustOverride = 143; + public const int MyBase = 144; + public const int MyClass = 145; + public const int Namespace = 146; + public const int Narrowing = 147; + public const int New = 148; + public const int Next = 149; + public const int Not = 150; + public const int Nothing = 151; + public const int NotInheritable = 152; + public const int NotOverridable = 153; + public const int Object = 154; + public const int Of = 155; + public const int Off = 156; + public const int On = 157; + public const int Operator = 158; + public const int Option = 159; + public const int Optional = 160; + public const int Or = 161; + public const int Order = 162; + public const int OrElse = 163; + public const int Overloads = 164; + public const int Overridable = 165; + public const int Overrides = 166; + public const int ParamArray = 167; + public const int Partial = 168; + public const int Preserve = 169; + public const int Private = 170; + public const int Property = 171; + public const int Protected = 172; + public const int Public = 173; + public const int RaiseEvent = 174; + public const int ReadOnly = 175; + public const int ReDim = 176; + public const int Rem = 177; + public const int RemoveHandler = 178; + public const int Resume = 179; + public const int Return = 180; + public const int SByte = 181; + public const int Select = 182; + public const int Set = 183; + public const int Shadows = 184; + public const int Shared = 185; + public const int Short = 186; + public const int Single = 187; + public const int Skip = 188; + public const int Static = 189; + public const int Step = 190; + public const int Stop = 191; + public const int Strict = 192; + public const int String = 193; + public const int Structure = 194; + public const int Sub = 195; + public const int SyncLock = 196; + public const int Take = 197; + public const int Text = 198; + public const int Then = 199; + public const int Throw = 200; + public const int To = 201; + public const int True = 202; + public const int Try = 203; + public const int TryCast = 204; + public const int TypeOf = 205; + public const int UInteger = 206; + public const int ULong = 207; + public const int Unicode = 208; + public const int Until = 209; + public const int UShort = 210; + public const int Using = 211; + public const int Variant = 212; + public const int Wend = 213; + public const int When = 214; + public const int Where = 215; + public const int While = 216; + public const int Widening = 217; + public const int With = 218; + public const int WithEvents = 219; + public const int WriteOnly = 220; + public const int Xor = 221; - public const int MaxToken = 208; + public const int MaxToken = 222; static BitArray NewSet(params int[] values) { BitArray bitArray = new BitArray(MaxToken); @@ -231,7 +245,7 @@ namespace ICSharpCode.NRefactory.Parser.VB } public static BitArray Null = NewSet(Nothing); public static BitArray BlockSucc = NewSet(Case, Catch, Else, ElseIf, End, Finally, Loop, Next); - public static BitArray IdentifierTokens = NewSet(Text, Binary, Compare, Assembly, Ansi, Auto, Preserve, Unicode, Until, Explicit, Off); + public static BitArray IdentifierTokens = NewSet(Text, Binary, Compare, Assembly, Ansi, Auto, Preserve, Unicode, Until, Off, Explicit, Infer, From, Join, Equals, Distinct, Where, Take, Skip, Order, By, Ascending, Descending, Group, Into, Aggregate); static string[] tokenList = new string[] { // ----- terminal classes ----- @@ -282,16 +296,19 @@ namespace ICSharpCode.NRefactory.Parser.VB // ----- keywords ----- "AddHandler", "AddressOf", + "Aggregate", "Alias", "And", "AndAlso", "Ansi", "As", + "Ascending", "Assembly", "Auto", "Binary", "Boolean", "ByRef", + "By", "Byte", "ByVal", "Call", @@ -325,8 +342,10 @@ namespace ICSharpCode.NRefactory.Parser.VB "Declare", "Default", "Delegate", + "Descending", "Dim", "DirectCast", + "Distinct", "Do", "Double", "Each", @@ -335,6 +354,7 @@ namespace ICSharpCode.NRefactory.Parser.VB "End", "EndIf", "Enum", + "Equals", "Erase", "Error", "Event", @@ -344,12 +364,14 @@ namespace ICSharpCode.NRefactory.Parser.VB "Finally", "For", "Friend", + "From", "Function", "Get", "GetType", "Global", "GoSub", "GoTo", + "Group", "Handles", "If", "Implements", @@ -359,8 +381,10 @@ namespace ICSharpCode.NRefactory.Parser.VB "Inherits", "Integer", "Interface", + "Into", "Is", "IsNot", + "Join", "Let", "Lib", "Like", @@ -389,6 +413,7 @@ namespace ICSharpCode.NRefactory.Parser.VB "Option", "Optional", "Or", + "Order", "OrElse", "Overloads", "Overridable", @@ -414,6 +439,7 @@ namespace ICSharpCode.NRefactory.Parser.VB "Shared", "Short", "Single", + "Skip", "Static", "Step", "Stop", @@ -422,6 +448,7 @@ namespace ICSharpCode.NRefactory.Parser.VB "Structure", "Sub", "SyncLock", + "Take", "Text", "Then", "Throw", @@ -439,6 +466,7 @@ namespace ICSharpCode.NRefactory.Parser.VB "Variant", "Wend", "When", + "Where", "While", "Widening", "With", diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index a127040266..b7ed340c96 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -19,7 +19,7 @@ namespace ICSharpCode.NRefactory.Parser.VB { partial class Parser : AbstractParser { - const int maxT = 208; + const int maxT = 222; const bool T = true; const bool x = false; @@ -34,27 +34,27 @@ partial class Parser : AbstractParser void VBNET() { -#line 232 "VBNET.ATG" +#line 246 "VBNET.ATG" lexer.NextToken(); // get the first token compilationUnit = new CompilationUnit(); while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } - while (la.kind == 149) { + while (la.kind == 159) { OptionStmt(); while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } } - while (la.kind == 116) { + while (la.kind == 124) { ImportsStmt(); while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } } while ( -#line 239 "VBNET.ATG" +#line 253 "VBNET.ATG" IsGlobalAttrTarget()) { GlobalAttributeSection(); while (la.kind == 1 || la.kind == 11) { @@ -75,64 +75,64 @@ IsGlobalAttrTarget()) { lexer.NextToken(); } else if (la.kind == 11) { lexer.NextToken(); - } else SynErr(209); + } else SynErr(223); } void OptionStmt() { -#line 244 "VBNET.ATG" +#line 258 "VBNET.ATG" INode node = null; bool val = true; - Expect(149); + Expect(159); -#line 245 "VBNET.ATG" +#line 259 "VBNET.ATG" Location startPos = t.Location; - if (la.kind == 102) { + if (la.kind == 108) { lexer.NextToken(); - if (la.kind == 146 || la.kind == 147) { + if (la.kind == 156 || la.kind == 157) { OptionValue( -#line 247 "VBNET.ATG" +#line 261 "VBNET.ATG" ref val); } -#line 248 "VBNET.ATG" +#line 262 "VBNET.ATG" node = new OptionDeclaration(OptionType.Explicit, val); - } else if (la.kind == 180) { + } else if (la.kind == 192) { lexer.NextToken(); - if (la.kind == 146 || la.kind == 147) { + if (la.kind == 156 || la.kind == 157) { OptionValue( -#line 250 "VBNET.ATG" +#line 264 "VBNET.ATG" ref val); } -#line 251 "VBNET.ATG" +#line 265 "VBNET.ATG" node = new OptionDeclaration(OptionType.Strict, val); - } else if (la.kind == 71) { + } else if (la.kind == 74) { lexer.NextToken(); - if (la.kind == 52) { + if (la.kind == 54) { lexer.NextToken(); -#line 253 "VBNET.ATG" +#line 267 "VBNET.ATG" node = new OptionDeclaration(OptionType.CompareBinary, val); - } else if (la.kind == 185) { + } else if (la.kind == 198) { lexer.NextToken(); -#line 254 "VBNET.ATG" +#line 268 "VBNET.ATG" node = new OptionDeclaration(OptionType.CompareText, val); - } else SynErr(210); - } else if (la.kind == 118) { + } else SynErr(224); + } else if (la.kind == 126) { lexer.NextToken(); - if (la.kind == 146 || la.kind == 147) { + if (la.kind == 156 || la.kind == 157) { OptionValue( -#line 257 "VBNET.ATG" +#line 271 "VBNET.ATG" ref val); } -#line 258 "VBNET.ATG" +#line 272 "VBNET.ATG" node = new OptionDeclaration(OptionType.Infer, val); - } else SynErr(211); + } else SynErr(225); EndOfStmt(); -#line 262 "VBNET.ATG" +#line 276 "VBNET.ATG" if (node != null) { node.StartLocation = startPos; node.EndLocation = t.Location; @@ -143,33 +143,33 @@ ref val); void ImportsStmt() { -#line 285 "VBNET.ATG" +#line 299 "VBNET.ATG" List usings = new List(); - Expect(116); + Expect(124); -#line 289 "VBNET.ATG" +#line 303 "VBNET.ATG" Location startPos = t.Location; Using u; ImportClause( -#line 292 "VBNET.ATG" +#line 306 "VBNET.ATG" out u); -#line 292 "VBNET.ATG" +#line 306 "VBNET.ATG" if (u != null) { usings.Add(u); } while (la.kind == 12) { lexer.NextToken(); ImportClause( -#line 294 "VBNET.ATG" +#line 308 "VBNET.ATG" out u); -#line 294 "VBNET.ATG" +#line 308 "VBNET.ATG" if (u != null) { usings.Add(u); } } EndOfStmt(); -#line 298 "VBNET.ATG" +#line 312 "VBNET.ATG" UsingDeclaration usingDeclaration = new UsingDeclaration(usings); usingDeclaration.StartLocation = startPos; usingDeclaration.EndLocation = t.Location; @@ -180,43 +180,43 @@ out u); void GlobalAttributeSection() { Expect(28); -#line 2200 "VBNET.ATG" +#line 2214 "VBNET.ATG" Location startPos = t.Location; - if (la.kind == 50) { + if (la.kind == 52) { lexer.NextToken(); - } else if (la.kind == 131) { + } else if (la.kind == 141) { lexer.NextToken(); - } else SynErr(212); + } else SynErr(226); -#line 2202 "VBNET.ATG" +#line 2216 "VBNET.ATG" string attributeTarget = t.val != null ? t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture) : null; List attributes = new List(); ASTAttribute attribute; Expect(11); Attribute( -#line 2206 "VBNET.ATG" +#line 2220 "VBNET.ATG" out attribute); -#line 2206 "VBNET.ATG" +#line 2220 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2207 "VBNET.ATG" +#line 2221 "VBNET.ATG" NotFinalComma()) { if (la.kind == 12) { lexer.NextToken(); - if (la.kind == 50) { + if (la.kind == 52) { lexer.NextToken(); - } else if (la.kind == 131) { + } else if (la.kind == 141) { lexer.NextToken(); - } else SynErr(213); + } else SynErr(227); Expect(11); } Attribute( -#line 2207 "VBNET.ATG" +#line 2221 "VBNET.ATG" out attribute); -#line 2207 "VBNET.ATG" +#line 2221 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -225,7 +225,7 @@ out attribute); Expect(27); EndOfStmt(); -#line 2212 "VBNET.ATG" +#line 2226 "VBNET.ATG" AttributeSection section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -238,23 +238,23 @@ out attribute); void NamespaceMemberDecl() { -#line 327 "VBNET.ATG" +#line 341 "VBNET.ATG" ModifierList m = new ModifierList(); AttributeSection section; List attributes = new List(); string qualident; - if (la.kind == 136) { + if (la.kind == 146) { lexer.NextToken(); -#line 334 "VBNET.ATG" +#line 348 "VBNET.ATG" Location startPos = t.Location; Qualident( -#line 336 "VBNET.ATG" +#line 350 "VBNET.ATG" out qualident); -#line 338 "VBNET.ATG" +#line 352 "VBNET.ATG" INode node = new NamespaceDeclaration(qualident); node.StartLocation = startPos; compilationUnit.AddChild(node); @@ -263,66 +263,66 @@ out qualident); EndOfStmt(); NamespaceBody(); -#line 346 "VBNET.ATG" +#line 360 "VBNET.ATG" node.EndLocation = t.Location; compilationUnit.BlockEnd(); } else if (StartOf(2)) { while (la.kind == 28) { AttributeSection( -#line 350 "VBNET.ATG" +#line 364 "VBNET.ATG" out section); -#line 350 "VBNET.ATG" +#line 364 "VBNET.ATG" attributes.Add(section); } while (StartOf(3)) { TypeModifier( -#line 351 "VBNET.ATG" +#line 365 "VBNET.ATG" m); } NonModuleDeclaration( -#line 351 "VBNET.ATG" +#line 365 "VBNET.ATG" m, attributes); - } else SynErr(214); + } else SynErr(228); } void OptionValue( -#line 270 "VBNET.ATG" +#line 284 "VBNET.ATG" ref bool val) { - if (la.kind == 147) { + if (la.kind == 157) { lexer.NextToken(); -#line 272 "VBNET.ATG" +#line 286 "VBNET.ATG" val = true; - } else if (la.kind == 146) { + } else if (la.kind == 156) { lexer.NextToken(); -#line 274 "VBNET.ATG" +#line 288 "VBNET.ATG" val = false; - } else SynErr(215); + } else SynErr(229); } void ImportClause( -#line 305 "VBNET.ATG" +#line 319 "VBNET.ATG" out Using u) { -#line 307 "VBNET.ATG" +#line 321 "VBNET.ATG" string qualident = null; TypeReference aliasedType = null; u = null; Qualident( -#line 311 "VBNET.ATG" +#line 325 "VBNET.ATG" out qualident); if (la.kind == 10) { lexer.NextToken(); TypeName( -#line 312 "VBNET.ATG" +#line 326 "VBNET.ATG" out aliasedType); } -#line 314 "VBNET.ATG" +#line 328 "VBNET.ATG" if (qualident != null && qualident.Length > 0) { if (aliasedType != null) { u = new Using(qualident, aliasedType); @@ -334,47 +334,47 @@ out aliasedType); } void Qualident( -#line 2954 "VBNET.ATG" +#line 2968 "VBNET.ATG" out string qualident) { -#line 2956 "VBNET.ATG" +#line 2970 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 2960 "VBNET.ATG" +#line 2974 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 2961 "VBNET.ATG" +#line 2975 "VBNET.ATG" DotAndIdentOrKw()) { Expect(16); IdentifierOrKeyword( -#line 2961 "VBNET.ATG" +#line 2975 "VBNET.ATG" out name); -#line 2961 "VBNET.ATG" +#line 2975 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 2963 "VBNET.ATG" +#line 2977 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 2073 "VBNET.ATG" +#line 2087 "VBNET.ATG" out TypeReference typeref) { -#line 2074 "VBNET.ATG" +#line 2088 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2076 "VBNET.ATG" +#line 2090 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 2080 "VBNET.ATG" +#line 2094 "VBNET.ATG" out rank); -#line 2081 "VBNET.ATG" +#line 2095 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -391,41 +391,41 @@ out rank); EndOfStmt(); } } - Expect(95); - Expect(136); + Expect(100); + Expect(146); EndOfStmt(); } void AttributeSection( -#line 2277 "VBNET.ATG" +#line 2291 "VBNET.ATG" out AttributeSection section) { -#line 2279 "VBNET.ATG" +#line 2293 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(28); -#line 2283 "VBNET.ATG" +#line 2297 "VBNET.ATG" Location startPos = t.Location; if ( -#line 2284 "VBNET.ATG" +#line 2298 "VBNET.ATG" IsLocalAttrTarget()) { - if (la.kind == 100) { + if (la.kind == 106) { lexer.NextToken(); -#line 2285 "VBNET.ATG" +#line 2299 "VBNET.ATG" attributeTarget = "event"; - } else if (la.kind == 169) { + } else if (la.kind == 180) { lexer.NextToken(); -#line 2286 "VBNET.ATG" +#line 2300 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2289 "VBNET.ATG" +#line 2303 "VBNET.ATG" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -438,20 +438,20 @@ IsLocalAttrTarget()) { Expect(11); } Attribute( -#line 2299 "VBNET.ATG" +#line 2313 "VBNET.ATG" out attribute); -#line 2299 "VBNET.ATG" +#line 2313 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2300 "VBNET.ATG" +#line 2314 "VBNET.ATG" NotFinalComma()) { Expect(12); Attribute( -#line 2300 "VBNET.ATG" +#line 2314 "VBNET.ATG" out attribute); -#line 2300 "VBNET.ATG" +#line 2314 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 12) { @@ -459,7 +459,7 @@ out attribute); } Expect(27); -#line 2304 "VBNET.ATG" +#line 2318 "VBNET.ATG" section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -470,92 +470,92 @@ out attribute); } void TypeModifier( -#line 3034 "VBNET.ATG" +#line 3051 "VBNET.ATG" ModifierList m) { switch (la.kind) { - case 162: { + case 173: { lexer.NextToken(); -#line 3035 "VBNET.ATG" +#line 3052 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } - case 161: { + case 172: { lexer.NextToken(); -#line 3036 "VBNET.ATG" +#line 3053 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } - case 106: { + case 112: { lexer.NextToken(); -#line 3037 "VBNET.ATG" +#line 3054 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } - case 159: { + case 170: { lexer.NextToken(); -#line 3038 "VBNET.ATG" +#line 3055 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } - case 174: { + case 185: { lexer.NextToken(); -#line 3039 "VBNET.ATG" +#line 3056 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } - case 173: { + case 184: { lexer.NextToken(); -#line 3040 "VBNET.ATG" +#line 3057 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } - case 132: { + case 142: { lexer.NextToken(); -#line 3041 "VBNET.ATG" +#line 3058 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } - case 142: { + case 152: { lexer.NextToken(); -#line 3042 "VBNET.ATG" +#line 3059 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } - case 157: { + case 168: { lexer.NextToken(); -#line 3043 "VBNET.ATG" +#line 3060 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } - default: SynErr(216); break; + default: SynErr(230); break; } } void NonModuleDeclaration( -#line 410 "VBNET.ATG" +#line 424 "VBNET.ATG" ModifierList m, List attributes) { -#line 412 "VBNET.ATG" +#line 426 "VBNET.ATG" TypeReference typeRef = null; List baseInterfaces = null; switch (la.kind) { - case 68: { + case 71: { -#line 415 "VBNET.ATG" +#line 429 "VBNET.ATG" m.Check(Modifiers.Classes); lexer.NextToken(); -#line 418 "VBNET.ATG" +#line 432 "VBNET.ATG" TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = t.Location; compilationUnit.AddChild(newType); @@ -565,50 +565,50 @@ ModifierList m, List attributes) { Identifier(); -#line 425 "VBNET.ATG" +#line 439 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 426 "VBNET.ATG" +#line 440 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 428 "VBNET.ATG" +#line 442 "VBNET.ATG" newType.BodyStartLocation = t.Location; - if (la.kind == 119) { + if (la.kind == 127) { ClassBaseType( -#line 429 "VBNET.ATG" +#line 443 "VBNET.ATG" out typeRef); -#line 429 "VBNET.ATG" +#line 443 "VBNET.ATG" newType.BaseTypes.Add(typeRef); } - while (la.kind == 115) { + while (la.kind == 123) { TypeImplementsClause( -#line 430 "VBNET.ATG" +#line 444 "VBNET.ATG" out baseInterfaces); -#line 430 "VBNET.ATG" +#line 444 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } ClassBody( -#line 431 "VBNET.ATG" +#line 445 "VBNET.ATG" newType); - Expect(95); - Expect(68); + Expect(100); + Expect(71); -#line 432 "VBNET.ATG" +#line 446 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); -#line 435 "VBNET.ATG" +#line 449 "VBNET.ATG" compilationUnit.BlockEnd(); break; } - case 131: { + case 141: { lexer.NextToken(); -#line 439 "VBNET.ATG" +#line 453 "VBNET.ATG" m.Check(Modifiers.VBModules); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); @@ -618,25 +618,25 @@ newType); Identifier(); -#line 446 "VBNET.ATG" +#line 460 "VBNET.ATG" newType.Name = t.val; EndOfStmt(); -#line 448 "VBNET.ATG" +#line 462 "VBNET.ATG" newType.BodyStartLocation = t.Location; ModuleBody( -#line 449 "VBNET.ATG" +#line 463 "VBNET.ATG" newType); -#line 451 "VBNET.ATG" +#line 465 "VBNET.ATG" compilationUnit.BlockEnd(); break; } - case 182: { + case 194: { lexer.NextToken(); -#line 455 "VBNET.ATG" +#line 469 "VBNET.ATG" m.Check(Modifiers.VBStructures); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); compilationUnit.AddChild(newType); @@ -646,36 +646,36 @@ newType); Identifier(); -#line 462 "VBNET.ATG" +#line 476 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 463 "VBNET.ATG" +#line 477 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 465 "VBNET.ATG" +#line 479 "VBNET.ATG" newType.BodyStartLocation = t.Location; - while (la.kind == 115) { + while (la.kind == 123) { TypeImplementsClause( -#line 466 "VBNET.ATG" +#line 480 "VBNET.ATG" out baseInterfaces); -#line 466 "VBNET.ATG" +#line 480 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } StructureBody( -#line 467 "VBNET.ATG" +#line 481 "VBNET.ATG" newType); -#line 469 "VBNET.ATG" +#line 483 "VBNET.ATG" compilationUnit.BlockEnd(); break; } - case 97: { + case 102: { lexer.NextToken(); -#line 474 "VBNET.ATG" +#line 488 "VBNET.ATG" m.Check(Modifiers.VBEnums); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = m.GetDeclarationLocation(t.Location); @@ -686,34 +686,34 @@ newType); Identifier(); -#line 482 "VBNET.ATG" +#line 496 "VBNET.ATG" newType.Name = t.val; - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); NonArrayTypeName( -#line 483 "VBNET.ATG" +#line 497 "VBNET.ATG" out typeRef, false); -#line 483 "VBNET.ATG" +#line 497 "VBNET.ATG" newType.BaseTypes.Add(typeRef); } EndOfStmt(); -#line 485 "VBNET.ATG" +#line 499 "VBNET.ATG" newType.BodyStartLocation = t.Location; EnumBody( -#line 486 "VBNET.ATG" +#line 500 "VBNET.ATG" newType); -#line 488 "VBNET.ATG" +#line 502 "VBNET.ATG" compilationUnit.BlockEnd(); break; } - case 121: { + case 129: { lexer.NextToken(); -#line 493 "VBNET.ATG" +#line 507 "VBNET.ATG" m.Check(Modifiers.VBInterfacs); TypeDeclaration newType = new TypeDeclaration(m.Modifier, attributes); newType.StartLocation = m.GetDeclarationLocation(t.Location); @@ -723,137 +723,137 @@ newType); Identifier(); -#line 500 "VBNET.ATG" +#line 514 "VBNET.ATG" newType.Name = t.val; TypeParameterList( -#line 501 "VBNET.ATG" +#line 515 "VBNET.ATG" newType.Templates); EndOfStmt(); -#line 503 "VBNET.ATG" +#line 517 "VBNET.ATG" newType.BodyStartLocation = t.Location; - while (la.kind == 119) { + while (la.kind == 127) { InterfaceBase( -#line 504 "VBNET.ATG" +#line 518 "VBNET.ATG" out baseInterfaces); -#line 504 "VBNET.ATG" +#line 518 "VBNET.ATG" newType.BaseTypes.AddRange(baseInterfaces); } InterfaceBody( -#line 505 "VBNET.ATG" +#line 519 "VBNET.ATG" newType); -#line 507 "VBNET.ATG" +#line 521 "VBNET.ATG" compilationUnit.BlockEnd(); break; } - case 87: { + case 90: { lexer.NextToken(); -#line 512 "VBNET.ATG" +#line 526 "VBNET.ATG" m.Check(Modifiers.VBDelegates); DelegateDeclaration delegateDeclr = new DelegateDeclaration(m.Modifier, attributes); delegateDeclr.ReturnType = new TypeReference("", "System.Void"); delegateDeclr.StartLocation = m.GetDeclarationLocation(t.Location); List p = new List(); - if (la.kind == 183) { + if (la.kind == 195) { lexer.NextToken(); Identifier(); -#line 519 "VBNET.ATG" +#line 533 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 520 "VBNET.ATG" +#line 534 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 521 "VBNET.ATG" +#line 535 "VBNET.ATG" p); } Expect(26); -#line 521 "VBNET.ATG" +#line 535 "VBNET.ATG" delegateDeclr.Parameters = p; } - } else if (la.kind == 107) { + } else if (la.kind == 114) { lexer.NextToken(); Identifier(); -#line 523 "VBNET.ATG" +#line 537 "VBNET.ATG" delegateDeclr.Name = t.val; TypeParameterList( -#line 524 "VBNET.ATG" +#line 538 "VBNET.ATG" delegateDeclr.Templates); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 525 "VBNET.ATG" +#line 539 "VBNET.ATG" p); } Expect(26); -#line 525 "VBNET.ATG" +#line 539 "VBNET.ATG" delegateDeclr.Parameters = p; } - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); -#line 526 "VBNET.ATG" +#line 540 "VBNET.ATG" TypeReference type; TypeName( -#line 526 "VBNET.ATG" +#line 540 "VBNET.ATG" out type); -#line 526 "VBNET.ATG" +#line 540 "VBNET.ATG" delegateDeclr.ReturnType = type; } - } else SynErr(217); + } else SynErr(231); -#line 528 "VBNET.ATG" +#line 542 "VBNET.ATG" delegateDeclr.EndLocation = t.EndLocation; EndOfStmt(); -#line 531 "VBNET.ATG" +#line 545 "VBNET.ATG" compilationUnit.AddChild(delegateDeclr); break; } - default: SynErr(218); break; + default: SynErr(232); break; } } void TypeParameterList( -#line 355 "VBNET.ATG" +#line 369 "VBNET.ATG" List templates) { -#line 357 "VBNET.ATG" +#line 371 "VBNET.ATG" TemplateDefinition template; if ( -#line 360 "VBNET.ATG" +#line 374 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); - Expect(145); + Expect(155); TypeParameter( -#line 361 "VBNET.ATG" +#line 375 "VBNET.ATG" out template); -#line 363 "VBNET.ATG" +#line 377 "VBNET.ATG" if (template != null) templates.Add(template); while (la.kind == 12) { lexer.NextToken(); TypeParameter( -#line 366 "VBNET.ATG" +#line 380 "VBNET.ATG" out template); -#line 368 "VBNET.ATG" +#line 382 "VBNET.ATG" if (template != null) templates.Add(template); } @@ -862,213 +862,163 @@ out template); } void TypeParameter( -#line 376 "VBNET.ATG" +#line 390 "VBNET.ATG" out TemplateDefinition template) { Identifier(); -#line 378 "VBNET.ATG" +#line 392 "VBNET.ATG" template = new TemplateDefinition(t.val, null); - if (la.kind == 49) { + if (la.kind == 50) { TypeParameterConstraints( -#line 379 "VBNET.ATG" +#line 393 "VBNET.ATG" template); } } void Identifier() { - switch (la.kind) { - case 2: { - lexer.NextToken(); - break; - } - case 185: { - lexer.NextToken(); - break; - } - case 52: { - lexer.NextToken(); - break; - } - case 71: { - lexer.NextToken(); - break; - } - case 82: { - lexer.NextToken(); - break; - } - case 50: { - lexer.NextToken(); - break; - } - case 48: { - lexer.NextToken(); - break; - } - case 51: { - lexer.NextToken(); - break; - } - case 158: { - lexer.NextToken(); - break; - } - case 195: { - lexer.NextToken(); - break; - } - case 196: { - lexer.NextToken(); - break; - } - case 146: { - lexer.NextToken(); - break; - } - case 102: { + if (StartOf(5)) { + IdentifierForFieldDeclaration(); + } else if (la.kind == 85) { lexer.NextToken(); - break; - } - default: SynErr(219); break; - } + } else SynErr(233); } void TypeParameterConstraints( -#line 383 "VBNET.ATG" +#line 397 "VBNET.ATG" TemplateDefinition template) { -#line 385 "VBNET.ATG" +#line 399 "VBNET.ATG" TypeReference constraint; - Expect(49); + Expect(50); if (la.kind == 23) { lexer.NextToken(); TypeParameterConstraint( -#line 391 "VBNET.ATG" +#line 405 "VBNET.ATG" out constraint); -#line 391 "VBNET.ATG" +#line 405 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } while (la.kind == 12) { lexer.NextToken(); TypeParameterConstraint( -#line 394 "VBNET.ATG" +#line 408 "VBNET.ATG" out constraint); -#line 394 "VBNET.ATG" +#line 408 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } } Expect(24); - } else if (StartOf(5)) { + } else if (StartOf(6)) { TypeParameterConstraint( -#line 397 "VBNET.ATG" +#line 411 "VBNET.ATG" out constraint); -#line 397 "VBNET.ATG" +#line 411 "VBNET.ATG" if (constraint != null) { template.Bases.Add(constraint); } - } else SynErr(220); + } else SynErr(234); } void TypeParameterConstraint( -#line 401 "VBNET.ATG" +#line 415 "VBNET.ATG" out TypeReference constraint) { -#line 402 "VBNET.ATG" +#line 416 "VBNET.ATG" constraint = null; - if (la.kind == 68) { + if (la.kind == 71) { lexer.NextToken(); -#line 403 "VBNET.ATG" +#line 417 "VBNET.ATG" constraint = TypeReference.ClassConstraint; - } else if (la.kind == 182) { + } else if (la.kind == 194) { lexer.NextToken(); -#line 404 "VBNET.ATG" +#line 418 "VBNET.ATG" constraint = TypeReference.StructConstraint; - } else if (la.kind == 138) { + } else if (la.kind == 148) { lexer.NextToken(); -#line 405 "VBNET.ATG" +#line 419 "VBNET.ATG" constraint = TypeReference.NewConstraint; - } else if (StartOf(6)) { + } else if (StartOf(7)) { TypeName( -#line 406 "VBNET.ATG" +#line 420 "VBNET.ATG" out constraint); - } else SynErr(221); + } else SynErr(235); } void ClassBaseType( -#line 752 "VBNET.ATG" +#line 766 "VBNET.ATG" out TypeReference typeRef) { -#line 754 "VBNET.ATG" +#line 768 "VBNET.ATG" typeRef = null; - Expect(119); + Expect(127); TypeName( -#line 757 "VBNET.ATG" +#line 771 "VBNET.ATG" out typeRef); EndOfStmt(); } void TypeImplementsClause( -#line 1552 "VBNET.ATG" +#line 1566 "VBNET.ATG" out List baseInterfaces) { -#line 1554 "VBNET.ATG" +#line 1568 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; - Expect(115); + Expect(123); TypeName( -#line 1557 "VBNET.ATG" +#line 1571 "VBNET.ATG" out type); -#line 1559 "VBNET.ATG" +#line 1573 "VBNET.ATG" baseInterfaces.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1562 "VBNET.ATG" +#line 1576 "VBNET.ATG" out type); -#line 1563 "VBNET.ATG" +#line 1577 "VBNET.ATG" baseInterfaces.Add(type); } EndOfStmt(); } void ClassBody( -#line 545 "VBNET.ATG" +#line 559 "VBNET.ATG" TypeDeclaration newType) { -#line 546 "VBNET.ATG" +#line 560 "VBNET.ATG" AttributeSection section; while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } - while (StartOf(7)) { + while (StartOf(8)) { -#line 549 "VBNET.ATG" +#line 563 "VBNET.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 28) { AttributeSection( -#line 552 "VBNET.ATG" +#line 566 "VBNET.ATG" out section); -#line 552 "VBNET.ATG" +#line 566 "VBNET.ATG" attributes.Add(section); } - while (StartOf(8)) { + while (StartOf(9)) { MemberModifier( -#line 553 "VBNET.ATG" +#line 567 "VBNET.ATG" m); } ClassMemberDecl( -#line 554 "VBNET.ATG" +#line 568 "VBNET.ATG" m, attributes); while (la.kind == 1 || la.kind == 11) { EndOfStmt(); @@ -1077,174 +1027,174 @@ m, attributes); } void ModuleBody( -#line 576 "VBNET.ATG" +#line 590 "VBNET.ATG" TypeDeclaration newType) { -#line 577 "VBNET.ATG" +#line 591 "VBNET.ATG" AttributeSection section; while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } - while (StartOf(7)) { + while (StartOf(8)) { -#line 580 "VBNET.ATG" +#line 594 "VBNET.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 28) { AttributeSection( -#line 583 "VBNET.ATG" +#line 597 "VBNET.ATG" out section); -#line 583 "VBNET.ATG" +#line 597 "VBNET.ATG" attributes.Add(section); } - while (StartOf(8)) { + while (StartOf(9)) { MemberModifier( -#line 584 "VBNET.ATG" +#line 598 "VBNET.ATG" m); } ClassMemberDecl( -#line 585 "VBNET.ATG" +#line 599 "VBNET.ATG" m, attributes); while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } } - Expect(95); - Expect(131); + Expect(100); + Expect(141); -#line 588 "VBNET.ATG" +#line 602 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void StructureBody( -#line 559 "VBNET.ATG" +#line 573 "VBNET.ATG" TypeDeclaration newType) { -#line 560 "VBNET.ATG" +#line 574 "VBNET.ATG" AttributeSection section; while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } - while (StartOf(7)) { + while (StartOf(8)) { -#line 563 "VBNET.ATG" +#line 577 "VBNET.ATG" List attributes = new List(); ModifierList m = new ModifierList(); while (la.kind == 28) { AttributeSection( -#line 566 "VBNET.ATG" +#line 580 "VBNET.ATG" out section); -#line 566 "VBNET.ATG" +#line 580 "VBNET.ATG" attributes.Add(section); } - while (StartOf(8)) { + while (StartOf(9)) { MemberModifier( -#line 567 "VBNET.ATG" +#line 581 "VBNET.ATG" m); } StructureMemberDecl( -#line 568 "VBNET.ATG" +#line 582 "VBNET.ATG" m, attributes); while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } } - Expect(95); - Expect(182); + Expect(100); + Expect(194); -#line 571 "VBNET.ATG" +#line 585 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void NonArrayTypeName( -#line 2099 "VBNET.ATG" +#line 2113 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2101 "VBNET.ATG" +#line 2115 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; - if (StartOf(9)) { - if (la.kind == 110) { + if (StartOf(10)) { + if (la.kind == 117) { lexer.NextToken(); Expect(16); -#line 2106 "VBNET.ATG" +#line 2120 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 2107 "VBNET.ATG" +#line 2121 "VBNET.ATG" out typeref, canBeUnbound); -#line 2108 "VBNET.ATG" +#line 2122 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 16) { lexer.NextToken(); -#line 2109 "VBNET.ATG" +#line 2123 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 2110 "VBNET.ATG" +#line 2124 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 2111 "VBNET.ATG" +#line 2125 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } - } else if (la.kind == 144) { + } else if (la.kind == 154) { lexer.NextToken(); -#line 2114 "VBNET.ATG" +#line 2128 "VBNET.ATG" typeref = new TypeReference("System.Object"); if (la.kind == 21) { lexer.NextToken(); -#line 2118 "VBNET.ATG" +#line 2132 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments); } - } else if (StartOf(10)) { + } else if (StartOf(11)) { PrimitiveTypeName( -#line 2124 "VBNET.ATG" +#line 2138 "VBNET.ATG" out name); -#line 2124 "VBNET.ATG" +#line 2138 "VBNET.ATG" typeref = new TypeReference(name); if (la.kind == 21) { lexer.NextToken(); -#line 2128 "VBNET.ATG" +#line 2142 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments); } - } else SynErr(222); + } else SynErr(236); } void EnumBody( -#line 592 "VBNET.ATG" +#line 606 "VBNET.ATG" TypeDeclaration newType) { -#line 593 "VBNET.ATG" +#line 607 "VBNET.ATG" FieldDeclaration f; while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } - while (StartOf(11)) { + while (StartOf(12)) { EnumMemberDecl( -#line 596 "VBNET.ATG" +#line 610 "VBNET.ATG" out f); -#line 598 "VBNET.ATG" +#line 612 "VBNET.ATG" SetParent(f.Fields, f); compilationUnit.AddChild(f); @@ -1252,238 +1202,238 @@ out f); EndOfStmt(); } } - Expect(95); - Expect(97); + Expect(100); + Expect(102); -#line 603 "VBNET.ATG" +#line 617 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void InterfaceBase( -#line 1537 "VBNET.ATG" +#line 1551 "VBNET.ATG" out List bases) { -#line 1539 "VBNET.ATG" +#line 1553 "VBNET.ATG" TypeReference type; bases = new List(); - Expect(119); + Expect(127); TypeName( -#line 1543 "VBNET.ATG" +#line 1557 "VBNET.ATG" out type); -#line 1543 "VBNET.ATG" +#line 1557 "VBNET.ATG" bases.Add(type); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 1546 "VBNET.ATG" +#line 1560 "VBNET.ATG" out type); -#line 1546 "VBNET.ATG" +#line 1560 "VBNET.ATG" bases.Add(type); } EndOfStmt(); } void InterfaceBody( -#line 607 "VBNET.ATG" +#line 621 "VBNET.ATG" TypeDeclaration newType) { while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } - while (StartOf(12)) { + while (StartOf(13)) { InterfaceMemberDecl(); while (la.kind == 1 || la.kind == 11) { EndOfStmt(); } } - Expect(95); - Expect(121); + Expect(100); + Expect(129); -#line 613 "VBNET.ATG" +#line 627 "VBNET.ATG" newType.EndLocation = t.EndLocation; EndOfStmt(); } void FormalParameterList( -#line 2314 "VBNET.ATG" +#line 2328 "VBNET.ATG" List parameter) { -#line 2315 "VBNET.ATG" +#line 2329 "VBNET.ATG" ParameterDeclarationExpression p; FormalParameter( -#line 2317 "VBNET.ATG" +#line 2331 "VBNET.ATG" out p); -#line 2317 "VBNET.ATG" +#line 2331 "VBNET.ATG" if (p != null) parameter.Add(p); while (la.kind == 12) { lexer.NextToken(); FormalParameter( -#line 2319 "VBNET.ATG" +#line 2333 "VBNET.ATG" out p); -#line 2319 "VBNET.ATG" +#line 2333 "VBNET.ATG" if (p != null) parameter.Add(p); } } void MemberModifier( -#line 3046 "VBNET.ATG" +#line 3063 "VBNET.ATG" ModifierList m) { switch (la.kind) { - case 132: { + case 142: { lexer.NextToken(); -#line 3047 "VBNET.ATG" +#line 3064 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } - case 86: { + case 89: { lexer.NextToken(); -#line 3048 "VBNET.ATG" +#line 3065 "VBNET.ATG" m.Add(Modifiers.Default, t.Location); break; } - case 106: { + case 112: { lexer.NextToken(); -#line 3049 "VBNET.ATG" +#line 3066 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } - case 173: { + case 184: { lexer.NextToken(); -#line 3050 "VBNET.ATG" +#line 3067 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } - case 155: { + case 166: { lexer.NextToken(); -#line 3051 "VBNET.ATG" +#line 3068 "VBNET.ATG" m.Add(Modifiers.Override, t.Location); break; } - case 133: { + case 143: { lexer.NextToken(); -#line 3052 "VBNET.ATG" +#line 3069 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } - case 159: { + case 170: { lexer.NextToken(); -#line 3053 "VBNET.ATG" +#line 3070 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } - case 161: { + case 172: { lexer.NextToken(); -#line 3054 "VBNET.ATG" +#line 3071 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } - case 162: { + case 173: { lexer.NextToken(); -#line 3055 "VBNET.ATG" +#line 3072 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } - case 142: { + case 152: { lexer.NextToken(); -#line 3056 "VBNET.ATG" +#line 3073 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } - case 143: { + case 153: { lexer.NextToken(); -#line 3057 "VBNET.ATG" +#line 3074 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } - case 174: { + case 185: { lexer.NextToken(); -#line 3058 "VBNET.ATG" +#line 3075 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } - case 154: { + case 165: { lexer.NextToken(); -#line 3059 "VBNET.ATG" +#line 3076 "VBNET.ATG" m.Add(Modifiers.Virtual, t.Location); break; } - case 153: { + case 164: { lexer.NextToken(); -#line 3060 "VBNET.ATG" +#line 3077 "VBNET.ATG" m.Add(Modifiers.Overloads, t.Location); break; } - case 164: { + case 175: { lexer.NextToken(); -#line 3061 "VBNET.ATG" +#line 3078 "VBNET.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } - case 206: { + case 220: { lexer.NextToken(); -#line 3062 "VBNET.ATG" +#line 3079 "VBNET.ATG" m.Add(Modifiers.WriteOnly, t.Location); break; } - case 205: { + case 219: { lexer.NextToken(); -#line 3063 "VBNET.ATG" +#line 3080 "VBNET.ATG" m.Add(Modifiers.WithEvents, t.Location); break; } - case 88: { + case 92: { lexer.NextToken(); -#line 3064 "VBNET.ATG" +#line 3081 "VBNET.ATG" m.Add(Modifiers.Dim, t.Location); break; } - case 157: { + case 168: { lexer.NextToken(); -#line 3065 "VBNET.ATG" +#line 3082 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } - default: SynErr(223); break; + default: SynErr(237); break; } } void ClassMemberDecl( -#line 748 "VBNET.ATG" +#line 762 "VBNET.ATG" ModifierList m, List attributes) { StructureMemberDecl( -#line 749 "VBNET.ATG" +#line 763 "VBNET.ATG" m, attributes); } void StructureMemberDecl( -#line 762 "VBNET.ATG" +#line 776 "VBNET.ATG" ModifierList m, List attributes) { -#line 764 "VBNET.ATG" +#line 778 "VBNET.ATG" TypeReference type = null; List p = new List(); Statement stmt = null; @@ -1491,63 +1441,63 @@ ModifierList m, List attributes) { List templates = new List(); switch (la.kind) { - case 68: case 87: case 97: case 121: case 131: case 182: { + case 71: case 90: case 102: case 129: case 141: case 194: { NonModuleDeclaration( -#line 771 "VBNET.ATG" +#line 785 "VBNET.ATG" m, attributes); break; } - case 183: { + case 195: { lexer.NextToken(); -#line 775 "VBNET.ATG" +#line 789 "VBNET.ATG" Location startPos = t.Location; - if (StartOf(13)) { + if (StartOf(14)) { -#line 779 "VBNET.ATG" +#line 793 "VBNET.ATG" string name = String.Empty; MethodDeclaration methodDeclaration; List handlesClause = null; List implementsClause = null; Identifier(); -#line 785 "VBNET.ATG" +#line 799 "VBNET.ATG" name = t.val; m.Check(Modifiers.VBMethods); TypeParameterList( -#line 788 "VBNET.ATG" +#line 802 "VBNET.ATG" templates); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 789 "VBNET.ATG" +#line 803 "VBNET.ATG" p); } Expect(26); } - if (la.kind == 113 || la.kind == 115) { - if (la.kind == 115) { + if (la.kind == 121 || la.kind == 123) { + if (la.kind == 123) { ImplementsClause( -#line 792 "VBNET.ATG" +#line 806 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 794 "VBNET.ATG" +#line 808 "VBNET.ATG" out handlesClause); } } -#line 797 "VBNET.ATG" +#line 811 "VBNET.ATG" Location endLocation = t.EndLocation; if ( -#line 800 "VBNET.ATG" +#line 814 "VBNET.ATG" IsMustOverride(m)) { EndOfStmt(); -#line 803 "VBNET.ATG" +#line 817 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, Parameters = p, Attributes = attributes, StartLocation = m.GetDeclarationLocation(startPos), EndLocation = endLocation, @@ -1561,7 +1511,7 @@ IsMustOverride(m)) { } else if (la.kind == 1) { lexer.NextToken(); -#line 816 "VBNET.ATG" +#line 830 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, Parameters = p, Attributes = attributes, StartLocation = m.GetDeclarationLocation(startPos), EndLocation = endLocation, @@ -1573,67 +1523,67 @@ IsMustOverride(m)) { compilationUnit.AddChild(methodDeclaration); -#line 827 "VBNET.ATG" +#line 841 "VBNET.ATG" if (ParseMethodBodies) { Block( -#line 828 "VBNET.ATG" +#line 842 "VBNET.ATG" out stmt); - Expect(95); - Expect(183); + Expect(100); + Expect(195); -#line 830 "VBNET.ATG" +#line 844 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 836 "VBNET.ATG" +#line 850 "VBNET.ATG" methodDeclaration.Body = (BlockStatement)stmt; -#line 837 "VBNET.ATG" +#line 851 "VBNET.ATG" methodDeclaration.Body.EndLocation = t.EndLocation; EndOfStmt(); - } else SynErr(224); - } else if (la.kind == 138) { + } else SynErr(238); + } else if (la.kind == 148) { lexer.NextToken(); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 841 "VBNET.ATG" +#line 855 "VBNET.ATG" p); } Expect(26); } -#line 842 "VBNET.ATG" +#line 856 "VBNET.ATG" m.Check(Modifiers.Constructors); -#line 843 "VBNET.ATG" +#line 857 "VBNET.ATG" Location constructorEndLocation = t.EndLocation; Expect(1); -#line 846 "VBNET.ATG" +#line 860 "VBNET.ATG" if (ParseMethodBodies) { Block( -#line 847 "VBNET.ATG" +#line 861 "VBNET.ATG" out stmt); - Expect(95); - Expect(183); + Expect(100); + Expect(195); -#line 849 "VBNET.ATG" +#line 863 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Sub); stmt = new BlockStatement(); } -#line 855 "VBNET.ATG" +#line 869 "VBNET.ATG" Location endLocation = t.EndLocation; EndOfStmt(); -#line 858 "VBNET.ATG" +#line 872 "VBNET.ATG" ConstructorDeclaration cd = new ConstructorDeclaration("New", m.Modifier, p, attributes); cd.StartLocation = m.GetDeclarationLocation(startPos); cd.EndLocation = constructorEndLocation; @@ -1641,13 +1591,13 @@ out stmt); cd.Body.EndLocation = endLocation; compilationUnit.AddChild(cd); - } else SynErr(225); + } else SynErr(239); break; } - case 107: { + case 114: { lexer.NextToken(); -#line 870 "VBNET.ATG" +#line 884 "VBNET.ATG" m.Check(Modifiers.VBMethods); string name = String.Empty; Location startPos = t.Location; @@ -1657,54 +1607,54 @@ out stmt); Identifier(); -#line 877 "VBNET.ATG" +#line 891 "VBNET.ATG" name = t.val; TypeParameterList( -#line 878 "VBNET.ATG" +#line 892 "VBNET.ATG" templates); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 879 "VBNET.ATG" +#line 893 "VBNET.ATG" p); } Expect(26); } - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); while (la.kind == 28) { AttributeSection( -#line 880 "VBNET.ATG" +#line 894 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 880 "VBNET.ATG" +#line 894 "VBNET.ATG" out type); } -#line 882 "VBNET.ATG" +#line 896 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } - if (la.kind == 113 || la.kind == 115) { - if (la.kind == 115) { + if (la.kind == 121 || la.kind == 123) { + if (la.kind == 123) { ImplementsClause( -#line 888 "VBNET.ATG" +#line 902 "VBNET.ATG" out implementsClause); } else { HandlesClause( -#line 890 "VBNET.ATG" +#line 904 "VBNET.ATG" out handlesClause); } } if ( -#line 895 "VBNET.ATG" +#line 909 "VBNET.ATG" IsMustOverride(m)) { EndOfStmt(); -#line 898 "VBNET.ATG" +#line 912 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1723,7 +1673,7 @@ IsMustOverride(m)) { } else if (la.kind == 1) { lexer.NextToken(); -#line 916 "VBNET.ATG" +#line 930 "VBNET.ATG" methodDeclaration = new MethodDeclaration { Name = name, Modifier = m.Modifier, TypeReference = type, Parameters = p, Attributes = attributes, @@ -1742,12 +1692,12 @@ IsMustOverride(m)) { if (ParseMethodBodies) { Block( -#line 933 "VBNET.ATG" +#line 947 "VBNET.ATG" out stmt); - Expect(95); - Expect(107); + Expect(100); + Expect(114); -#line 935 "VBNET.ATG" +#line 949 "VBNET.ATG" } else { // don't parse method body lexer.SkipCurrentBlock(Tokens.Function); stmt = new BlockStatement(); @@ -1757,13 +1707,13 @@ out stmt); methodDeclaration.Body.EndLocation = t.EndLocation; EndOfStmt(); - } else SynErr(226); + } else SynErr(240); break; } - case 85: { + case 88: { lexer.NextToken(); -#line 949 "VBNET.ATG" +#line 963 "VBNET.ATG" m.Check(Modifiers.VBExternalMethods); Location startPos = t.Location; CharsetModifier charsetModifer = CharsetModifier.None; @@ -1771,94 +1721,94 @@ out stmt); string alias = null; string name = String.Empty; - if (StartOf(14)) { + if (StartOf(15)) { Charset( -#line 956 "VBNET.ATG" +#line 970 "VBNET.ATG" out charsetModifer); } - if (la.kind == 183) { + if (la.kind == 195) { lexer.NextToken(); Identifier(); -#line 959 "VBNET.ATG" +#line 973 "VBNET.ATG" name = t.val; - Expect(125); + Expect(135); Expect(3); -#line 960 "VBNET.ATG" +#line 974 "VBNET.ATG" library = t.literalValue as string; - if (la.kind == 45) { + if (la.kind == 46) { lexer.NextToken(); Expect(3); -#line 961 "VBNET.ATG" +#line 975 "VBNET.ATG" alias = t.literalValue as string; } if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 962 "VBNET.ATG" +#line 976 "VBNET.ATG" p); } Expect(26); } EndOfStmt(); -#line 965 "VBNET.ATG" +#line 979 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, null, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; compilationUnit.AddChild(declareDeclaration); - } else if (la.kind == 107) { + } else if (la.kind == 114) { lexer.NextToken(); Identifier(); -#line 972 "VBNET.ATG" +#line 986 "VBNET.ATG" name = t.val; - Expect(125); + Expect(135); Expect(3); -#line 973 "VBNET.ATG" +#line 987 "VBNET.ATG" library = t.literalValue as string; - if (la.kind == 45) { + if (la.kind == 46) { lexer.NextToken(); Expect(3); -#line 974 "VBNET.ATG" +#line 988 "VBNET.ATG" alias = t.literalValue as string; } if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 975 "VBNET.ATG" +#line 989 "VBNET.ATG" p); } Expect(26); } - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 976 "VBNET.ATG" +#line 990 "VBNET.ATG" out type); } EndOfStmt(); -#line 979 "VBNET.ATG" +#line 993 "VBNET.ATG" DeclareDeclaration declareDeclaration = new DeclareDeclaration(name, m.Modifier, type, p, attributes, library, alias, charsetModifer); declareDeclaration.StartLocation = m.GetDeclarationLocation(startPos); declareDeclaration.EndLocation = t.EndLocation; compilationUnit.AddChild(declareDeclaration); - } else SynErr(227); + } else SynErr(241); break; } - case 100: { + case 106: { lexer.NextToken(); -#line 989 "VBNET.ATG" +#line 1003 "VBNET.ATG" m.Check(Modifiers.VBEvents); Location startPos = t.Location; EventDeclaration eventDeclaration; @@ -1867,31 +1817,31 @@ out type); Identifier(); -#line 995 "VBNET.ATG" +#line 1009 "VBNET.ATG" name= t.val; - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 997 "VBNET.ATG" +#line 1011 "VBNET.ATG" out type); - } else if (StartOf(15)) { + } else if (StartOf(16)) { if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 999 "VBNET.ATG" +#line 1013 "VBNET.ATG" p); } Expect(26); } - } else SynErr(228); - if (la.kind == 115) { + } else SynErr(242); + if (la.kind == 123) { ImplementsClause( -#line 1001 "VBNET.ATG" +#line 1015 "VBNET.ATG" out implementsClause); } -#line 1003 "VBNET.ATG" +#line 1017 "VBNET.ATG" eventDeclaration = new EventDeclaration { Name = name, TypeReference = type, Modifier = m.Modifier, Parameters = p, Attributes = attributes, InterfaceImplementations = implementsClause, @@ -1903,32 +1853,32 @@ out implementsClause); EndOfStmt(); break; } - case 2: case 48: case 50: case 51: case 52: case 71: case 102: case 118: case 146: case 158: case 185: case 195: case 196: { + case 2: case 45: case 49: case 51: case 52: case 53: case 54: case 57: case 74: case 91: case 94: case 103: case 108: case 113: case 120: case 126: case 130: case 133: case 156: case 162: case 169: case 188: case 197: case 198: case 208: case 209: case 215: { -#line 1013 "VBNET.ATG" +#line 1027 "VBNET.ATG" Location startPos = t.Location; -#line 1015 "VBNET.ATG" +#line 1029 "VBNET.ATG" m.Check(Modifiers.Fields); FieldDeclaration fd = new FieldDeclaration(attributes, null, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(startPos); IdentifierForFieldDeclaration(); -#line 1019 "VBNET.ATG" +#line 1033 "VBNET.ATG" string name = t.val; VariableDeclaratorPartAfterIdentifier( -#line 1020 "VBNET.ATG" +#line 1034 "VBNET.ATG" variableDeclarators, name); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 1021 "VBNET.ATG" +#line 1035 "VBNET.ATG" variableDeclarators); } EndOfStmt(); -#line 1024 "VBNET.ATG" +#line 1038 "VBNET.ATG" fd.EndLocation = t.EndLocation; fd.Fields = variableDeclarators; SetParent(variableDeclarators, fd); @@ -1936,86 +1886,86 @@ variableDeclarators); break; } - case 72: { + case 75: { -#line 1030 "VBNET.ATG" +#line 1044 "VBNET.ATG" m.Check(Modifiers.Fields); lexer.NextToken(); -#line 1031 "VBNET.ATG" +#line 1045 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); -#line 1033 "VBNET.ATG" +#line 1047 "VBNET.ATG" FieldDeclaration fd = new FieldDeclaration(attributes, type, m.Modifier); fd.StartLocation = m.GetDeclarationLocation(t.Location); List constantDeclarators = new List(); ConstantDeclarator( -#line 1037 "VBNET.ATG" +#line 1051 "VBNET.ATG" constantDeclarators); while (la.kind == 12) { lexer.NextToken(); ConstantDeclarator( -#line 1038 "VBNET.ATG" +#line 1052 "VBNET.ATG" constantDeclarators); } -#line 1040 "VBNET.ATG" +#line 1054 "VBNET.ATG" fd.Fields = constantDeclarators; fd.EndLocation = t.Location; EndOfStmt(); -#line 1045 "VBNET.ATG" +#line 1059 "VBNET.ATG" fd.EndLocation = t.EndLocation; compilationUnit.AddChild(fd); break; } - case 160: { + case 171: { lexer.NextToken(); -#line 1051 "VBNET.ATG" +#line 1065 "VBNET.ATG" m.Check(Modifiers.VBProperties); Location startPos = t.Location; List implementsClause = null; Identifier(); -#line 1055 "VBNET.ATG" +#line 1069 "VBNET.ATG" string propertyName = t.val; if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1056 "VBNET.ATG" +#line 1070 "VBNET.ATG" p); } Expect(26); } - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1057 "VBNET.ATG" +#line 1071 "VBNET.ATG" out type); } -#line 1059 "VBNET.ATG" +#line 1073 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } - if (la.kind == 115) { + if (la.kind == 123) { ImplementsClause( -#line 1063 "VBNET.ATG" +#line 1077 "VBNET.ATG" out implementsClause); } EndOfStmt(); if ( -#line 1067 "VBNET.ATG" +#line 1081 "VBNET.ATG" IsMustOverride(m)) { -#line 1069 "VBNET.ATG" +#line 1083 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2024,9 +1974,9 @@ IsMustOverride(m)) { pDecl.Parameters = p; compilationUnit.AddChild(pDecl); - } else if (StartOf(16)) { + } else if (StartOf(17)) { -#line 1079 "VBNET.ATG" +#line 1093 "VBNET.ATG" PropertyDeclaration pDecl = new PropertyDeclaration(propertyName, type, m.Modifier, attributes); pDecl.StartLocation = m.GetDeclarationLocation(startPos); pDecl.EndLocation = t.Location; @@ -2038,29 +1988,29 @@ IsMustOverride(m)) { PropertySetRegion setRegion; AccessorDecls( -#line 1089 "VBNET.ATG" +#line 1103 "VBNET.ATG" out getRegion, out setRegion); - Expect(95); - Expect(160); + Expect(100); + Expect(171); EndOfStmt(); -#line 1093 "VBNET.ATG" +#line 1107 "VBNET.ATG" pDecl.GetRegion = getRegion; pDecl.SetRegion = setRegion; pDecl.BodyEnd = t.EndLocation; compilationUnit.AddChild(pDecl); - } else SynErr(229); + } else SynErr(243); break; } - case 82: { + case 85: { lexer.NextToken(); -#line 1100 "VBNET.ATG" +#line 1114 "VBNET.ATG" Location startPos = t.Location; - Expect(100); + Expect(106); -#line 1102 "VBNET.ATG" +#line 1116 "VBNET.ATG" m.Check(Modifiers.VBCustomEvents); EventAddRemoveRegion eventAccessorDeclaration; EventAddRegion addHandlerAccessorDeclaration = null; @@ -2070,24 +2020,24 @@ out getRegion, out setRegion); Identifier(); -#line 1109 "VBNET.ATG" +#line 1123 "VBNET.ATG" string customEventName = t.val; - Expect(49); + Expect(50); TypeName( -#line 1110 "VBNET.ATG" +#line 1124 "VBNET.ATG" out type); - if (la.kind == 115) { + if (la.kind == 123) { ImplementsClause( -#line 1111 "VBNET.ATG" +#line 1125 "VBNET.ATG" out implementsClause); } EndOfStmt(); - while (StartOf(17)) { + while (StartOf(18)) { EventAccessorDeclaration( -#line 1114 "VBNET.ATG" +#line 1128 "VBNET.ATG" out eventAccessorDeclaration); -#line 1116 "VBNET.ATG" +#line 1130 "VBNET.ATG" if(eventAccessorDeclaration is EventAddRegion) { addHandlerAccessorDeclaration = (EventAddRegion)eventAccessorDeclaration; @@ -2102,11 +2052,11 @@ out eventAccessorDeclaration); } } - Expect(95); Expect(100); + Expect(106); EndOfStmt(); -#line 1132 "VBNET.ATG" +#line 1146 "VBNET.ATG" if(addHandlerAccessorDeclaration == null) { Error("Need to provide AddHandler accessor."); @@ -2135,26 +2085,26 @@ out eventAccessorDeclaration); break; } - case 137: case 148: case 203: { + case 147: case 158: case 217: { -#line 1158 "VBNET.ATG" +#line 1172 "VBNET.ATG" ConversionType opConversionType = ConversionType.None; - if (la.kind == 137 || la.kind == 203) { - if (la.kind == 203) { + if (la.kind == 147 || la.kind == 217) { + if (la.kind == 217) { lexer.NextToken(); -#line 1159 "VBNET.ATG" +#line 1173 "VBNET.ATG" opConversionType = ConversionType.Implicit; } else { lexer.NextToken(); -#line 1160 "VBNET.ATG" +#line 1174 "VBNET.ATG" opConversionType = ConversionType.Explicit; } } - Expect(148); + Expect(158); -#line 1163 "VBNET.ATG" +#line 1177 "VBNET.ATG" m.Check(Modifiers.VBOperators); Location startPos = t.Location; TypeReference returnType = NullTypeReference.Instance; @@ -2166,74 +2116,74 @@ out eventAccessorDeclaration); List returnTypeAttributes = new List(); OverloadableOperator( -#line 1173 "VBNET.ATG" +#line 1187 "VBNET.ATG" out operatorType); Expect(25); - if (la.kind == 56) { + if (la.kind == 59) { lexer.NextToken(); } Identifier(); -#line 1174 "VBNET.ATG" +#line 1188 "VBNET.ATG" operandName = t.val; - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1175 "VBNET.ATG" +#line 1189 "VBNET.ATG" out operandType); } -#line 1176 "VBNET.ATG" +#line 1190 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParameterModifiers.In)); while (la.kind == 12) { lexer.NextToken(); - if (la.kind == 56) { + if (la.kind == 59) { lexer.NextToken(); } Identifier(); -#line 1180 "VBNET.ATG" +#line 1194 "VBNET.ATG" operandName = t.val; - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1181 "VBNET.ATG" +#line 1195 "VBNET.ATG" out operandType); } -#line 1182 "VBNET.ATG" +#line 1196 "VBNET.ATG" parameters.Add(new ParameterDeclarationExpression(operandType, operandName, ParameterModifiers.In)); } Expect(26); -#line 1185 "VBNET.ATG" +#line 1199 "VBNET.ATG" Location endPos = t.EndLocation; - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); while (la.kind == 28) { AttributeSection( -#line 1186 "VBNET.ATG" +#line 1200 "VBNET.ATG" out section); -#line 1186 "VBNET.ATG" +#line 1200 "VBNET.ATG" returnTypeAttributes.Add(section); } TypeName( -#line 1186 "VBNET.ATG" +#line 1200 "VBNET.ATG" out returnType); -#line 1186 "VBNET.ATG" +#line 1200 "VBNET.ATG" endPos = t.EndLocation; } Expect(1); Block( -#line 1188 "VBNET.ATG" +#line 1202 "VBNET.ATG" out stmt); - Expect(95); - Expect(148); + Expect(100); + Expect(158); EndOfStmt(); -#line 1190 "VBNET.ATG" +#line 1204 "VBNET.ATG" OperatorDeclaration operatorDeclaration = new OperatorDeclaration { Modifier = m.Modifier, Attributes = attributes, @@ -2252,30 +2202,30 @@ out stmt); break; } - default: SynErr(230); break; + default: SynErr(244); break; } } void EnumMemberDecl( -#line 730 "VBNET.ATG" +#line 744 "VBNET.ATG" out FieldDeclaration f) { -#line 732 "VBNET.ATG" +#line 746 "VBNET.ATG" Expression expr = null;List attributes = new List(); AttributeSection section = null; VariableDeclaration varDecl = null; while (la.kind == 28) { AttributeSection( -#line 736 "VBNET.ATG" +#line 750 "VBNET.ATG" out section); -#line 736 "VBNET.ATG" +#line 750 "VBNET.ATG" attributes.Add(section); } Identifier(); -#line 739 "VBNET.ATG" +#line 753 "VBNET.ATG" f = new FieldDeclaration(attributes); varDecl = new VariableDeclaration(t.val); f.Fields.Add(varDecl); @@ -2284,10 +2234,10 @@ out section); if (la.kind == 10) { lexer.NextToken(); Expr( -#line 744 "VBNET.ATG" +#line 758 "VBNET.ATG" out expr); -#line 744 "VBNET.ATG" +#line 758 "VBNET.ATG" varDecl.Initializer = expr; } EndOfStmt(); @@ -2295,7 +2245,7 @@ out expr); void InterfaceMemberDecl() { -#line 621 "VBNET.ATG" +#line 635 "VBNET.ATG" TypeReference type =null; List p = new List(); List templates = new List(); @@ -2304,49 +2254,49 @@ out expr); List attributes = new List(); string name; - if (StartOf(18)) { + if (StartOf(19)) { while (la.kind == 28) { AttributeSection( -#line 629 "VBNET.ATG" +#line 643 "VBNET.ATG" out section); -#line 629 "VBNET.ATG" +#line 643 "VBNET.ATG" attributes.Add(section); } - while (StartOf(8)) { + while (StartOf(9)) { MemberModifier( -#line 632 "VBNET.ATG" +#line 646 "VBNET.ATG" mod); } - if (la.kind == 100) { + if (la.kind == 106) { lexer.NextToken(); -#line 636 "VBNET.ATG" +#line 650 "VBNET.ATG" mod.Check(Modifiers.VBInterfaceEvents); Location startLocation = t.Location; Identifier(); -#line 639 "VBNET.ATG" +#line 653 "VBNET.ATG" name = t.val; if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 640 "VBNET.ATG" +#line 654 "VBNET.ATG" p); } Expect(26); } - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 641 "VBNET.ATG" +#line 655 "VBNET.ATG" out type); } EndOfStmt(); -#line 644 "VBNET.ATG" +#line 658 "VBNET.ATG" EventDeclaration ed = new EventDeclaration { Name = name, TypeReference = type, Modifier = mod.Modifier, Parameters = p, Attributes = attributes, @@ -2354,32 +2304,32 @@ out type); }; compilationUnit.AddChild(ed); - } else if (la.kind == 183) { + } else if (la.kind == 195) { lexer.NextToken(); -#line 654 "VBNET.ATG" +#line 668 "VBNET.ATG" Location startLocation = t.Location; mod.Check(Modifiers.VBInterfaceMethods); Identifier(); -#line 657 "VBNET.ATG" +#line 671 "VBNET.ATG" name = t.val; TypeParameterList( -#line 658 "VBNET.ATG" +#line 672 "VBNET.ATG" templates); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 659 "VBNET.ATG" +#line 673 "VBNET.ATG" p); } Expect(26); } EndOfStmt(); -#line 662 "VBNET.ATG" +#line 676 "VBNET.ATG" MethodDeclaration md = new MethodDeclaration { Name = name, Modifier = mod.Modifier, @@ -2392,42 +2342,42 @@ p); }; compilationUnit.AddChild(md); - } else if (la.kind == 107) { + } else if (la.kind == 114) { lexer.NextToken(); -#line 677 "VBNET.ATG" +#line 691 "VBNET.ATG" mod.Check(Modifiers.VBInterfaceMethods); Location startLocation = t.Location; Identifier(); -#line 680 "VBNET.ATG" +#line 694 "VBNET.ATG" name = t.val; TypeParameterList( -#line 681 "VBNET.ATG" +#line 695 "VBNET.ATG" templates); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 682 "VBNET.ATG" +#line 696 "VBNET.ATG" p); } Expect(26); } - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); while (la.kind == 28) { AttributeSection( -#line 683 "VBNET.ATG" +#line 697 "VBNET.ATG" out returnTypeAttributeSection); } TypeName( -#line 683 "VBNET.ATG" +#line 697 "VBNET.ATG" out type); } -#line 685 "VBNET.ATG" +#line 699 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } @@ -2445,151 +2395,151 @@ out type); compilationUnit.AddChild(md); EndOfStmt(); - } else if (la.kind == 160) { + } else if (la.kind == 171) { lexer.NextToken(); -#line 705 "VBNET.ATG" +#line 719 "VBNET.ATG" Location startLocation = t.Location; mod.Check(Modifiers.VBInterfaceProperties); Identifier(); -#line 708 "VBNET.ATG" +#line 722 "VBNET.ATG" name = t.val; if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 709 "VBNET.ATG" +#line 723 "VBNET.ATG" p); } Expect(26); } - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 710 "VBNET.ATG" +#line 724 "VBNET.ATG" out type); } -#line 712 "VBNET.ATG" +#line 726 "VBNET.ATG" if(type == null) { type = new TypeReference("System.Object"); } EndOfStmt(); -#line 718 "VBNET.ATG" +#line 732 "VBNET.ATG" PropertyDeclaration pd = new PropertyDeclaration(name, type, mod.Modifier, attributes); pd.Parameters = p; pd.EndLocation = t.EndLocation; pd.StartLocation = startLocation; compilationUnit.AddChild(pd); - } else SynErr(231); - } else if (StartOf(19)) { + } else SynErr(245); + } else if (StartOf(20)) { NonModuleDeclaration( -#line 726 "VBNET.ATG" +#line 740 "VBNET.ATG" mod, attributes); - } else SynErr(232); + } else SynErr(246); } void Expr( -#line 1596 "VBNET.ATG" +#line 1610 "VBNET.ATG" out Expression expr) { -#line 1597 "VBNET.ATG" +#line 1611 "VBNET.ATG" expr = null; - if (StartOf(20)) { + if (StartOf(21)) { DisjunctionExpr( -#line 1598 "VBNET.ATG" +#line 1612 "VBNET.ATG" out expr); - } else if (la.kind == 107) { + } else if (la.kind == 114) { LambdaExpr( -#line 1599 "VBNET.ATG" +#line 1613 "VBNET.ATG" out expr); - } else SynErr(233); + } else SynErr(247); } void ImplementsClause( -#line 1569 "VBNET.ATG" +#line 1583 "VBNET.ATG" out List baseInterfaces) { -#line 1571 "VBNET.ATG" +#line 1585 "VBNET.ATG" baseInterfaces = new List(); TypeReference type = null; string memberName = null; - Expect(115); + Expect(123); NonArrayTypeName( -#line 1576 "VBNET.ATG" +#line 1590 "VBNET.ATG" out type, false); -#line 1577 "VBNET.ATG" +#line 1591 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1578 "VBNET.ATG" +#line 1592 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); while (la.kind == 12) { lexer.NextToken(); NonArrayTypeName( -#line 1580 "VBNET.ATG" +#line 1594 "VBNET.ATG" out type, false); -#line 1581 "VBNET.ATG" +#line 1595 "VBNET.ATG" if (type != null) memberName = TypeReference.StripLastIdentifierFromType(ref type); -#line 1582 "VBNET.ATG" +#line 1596 "VBNET.ATG" baseInterfaces.Add(new InterfaceImplementation(type, memberName)); } } void HandlesClause( -#line 1527 "VBNET.ATG" +#line 1541 "VBNET.ATG" out List handlesClause) { -#line 1529 "VBNET.ATG" +#line 1543 "VBNET.ATG" handlesClause = new List(); string name; - Expect(113); + Expect(121); EventMemberSpecifier( -#line 1532 "VBNET.ATG" +#line 1546 "VBNET.ATG" out name); -#line 1532 "VBNET.ATG" +#line 1546 "VBNET.ATG" handlesClause.Add(name); while (la.kind == 12) { lexer.NextToken(); EventMemberSpecifier( -#line 1533 "VBNET.ATG" +#line 1547 "VBNET.ATG" out name); -#line 1533 "VBNET.ATG" +#line 1547 "VBNET.ATG" handlesClause.Add(name); } } void Block( -#line 2361 "VBNET.ATG" +#line 2375 "VBNET.ATG" out Statement stmt) { -#line 2364 "VBNET.ATG" +#line 2378 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); /* in snippet parsing mode, t might be null */ if (t != null) blockStmt.StartLocation = t.Location; compilationUnit.BlockStart(blockStmt); - while (StartOf(21) || -#line 2370 "VBNET.ATG" + while (StartOf(22) || +#line 2384 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2370 "VBNET.ATG" +#line 2384 "VBNET.ATG" IsEndStmtAhead()) { - Expect(95); + Expect(100); EndOfStmt(); -#line 2370 "VBNET.ATG" +#line 2384 "VBNET.ATG" compilationUnit.AddChild(new EndStatement()); } else { Statement(); @@ -2597,7 +2547,7 @@ IsEndStmtAhead()) { } } -#line 2375 "VBNET.ATG" +#line 2389 "VBNET.ATG" stmt = blockStmt; if (t != null) blockStmt.EndLocation = t.EndLocation; compilationUnit.BlockEnd(); @@ -2605,28 +2555,28 @@ IsEndStmtAhead()) { } void Charset( -#line 1519 "VBNET.ATG" +#line 1533 "VBNET.ATG" out CharsetModifier charsetModifier) { -#line 1520 "VBNET.ATG" +#line 1534 "VBNET.ATG" charsetModifier = CharsetModifier.None; - if (la.kind == 107 || la.kind == 183) { - } else if (la.kind == 48) { + if (la.kind == 114 || la.kind == 195) { + } else if (la.kind == 49) { lexer.NextToken(); -#line 1521 "VBNET.ATG" +#line 1535 "VBNET.ATG" charsetModifier = CharsetModifier.Ansi; - } else if (la.kind == 51) { + } else if (la.kind == 53) { lexer.NextToken(); -#line 1522 "VBNET.ATG" +#line 1536 "VBNET.ATG" charsetModifier = CharsetModifier.Auto; - } else if (la.kind == 195) { + } else if (la.kind == 208) { lexer.NextToken(); -#line 1523 "VBNET.ATG" +#line 1537 "VBNET.ATG" charsetModifier = CharsetModifier.Unicode; - } else SynErr(234); + } else SynErr(248); } void IdentifierForFieldDeclaration() { @@ -2635,7 +2585,15 @@ out CharsetModifier charsetModifier) { lexer.NextToken(); break; } - case 185: { + case 45: { + lexer.NextToken(); + break; + } + case 49: { + lexer.NextToken(); + break; + } + case 51: { lexer.NextToken(); break; } @@ -2643,55 +2601,103 @@ out CharsetModifier charsetModifier) { lexer.NextToken(); break; } - case 71: { + case 53: { lexer.NextToken(); break; } - case 50: { + case 54: { lexer.NextToken(); break; } - case 48: { + case 57: { lexer.NextToken(); break; } - case 51: { + case 74: { lexer.NextToken(); break; } - case 158: { + case 91: { lexer.NextToken(); break; } - case 195: { + case 94: { lexer.NextToken(); break; } - case 196: { + case 103: { lexer.NextToken(); break; } - case 146: { + case 108: { lexer.NextToken(); break; } - case 102: { + case 113: { + lexer.NextToken(); + break; + } + case 120: { + lexer.NextToken(); + break; + } + case 126: { + lexer.NextToken(); + break; + } + case 130: { + lexer.NextToken(); + break; + } + case 133: { + lexer.NextToken(); + break; + } + case 156: { + lexer.NextToken(); + break; + } + case 162: { + lexer.NextToken(); + break; + } + case 169: { + lexer.NextToken(); + break; + } + case 188: { + lexer.NextToken(); + break; + } + case 197: { + lexer.NextToken(); + break; + } + case 198: { + lexer.NextToken(); + break; + } + case 208: { + lexer.NextToken(); + break; + } + case 209: { lexer.NextToken(); break; } - case 118: { + case 215: { lexer.NextToken(); break; } - default: SynErr(235); break; + default: SynErr(249); break; } } void VariableDeclaratorPartAfterIdentifier( -#line 1394 "VBNET.ATG" +#line 1408 "VBNET.ATG" List fieldDeclaration, string name) { -#line 1396 "VBNET.ATG" +#line 1410 "VBNET.ATG" Expression expr = null; TypeReference type = null; ArrayList rank = null; @@ -2699,42 +2705,42 @@ List fieldDeclaration, string name) { Location startLocation = t.Location; if ( -#line 1402 "VBNET.ATG" +#line 1416 "VBNET.ATG" IsSize() && !IsDims()) { ArrayInitializationModifier( -#line 1402 "VBNET.ATG" +#line 1416 "VBNET.ATG" out dimension); } if ( -#line 1403 "VBNET.ATG" +#line 1417 "VBNET.ATG" IsDims()) { ArrayNameModifier( -#line 1403 "VBNET.ATG" +#line 1417 "VBNET.ATG" out rank); } if ( -#line 1405 "VBNET.ATG" +#line 1419 "VBNET.ATG" IsObjectCreation()) { - Expect(49); + Expect(50); ObjectCreateExpression( -#line 1405 "VBNET.ATG" +#line 1419 "VBNET.ATG" out expr); -#line 1407 "VBNET.ATG" +#line 1421 "VBNET.ATG" if (expr is ObjectCreateExpression) { type = ((ObjectCreateExpression)expr).CreateType; } else { type = ((ArrayCreateExpression)expr).CreateType; } - } else if (StartOf(22)) { - if (la.kind == 49) { + } else if (StartOf(23)) { + if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1414 "VBNET.ATG" +#line 1428 "VBNET.ATG" out type); -#line 1416 "VBNET.ATG" +#line 1430 "VBNET.ATG" if (type != null) { for (int i = fieldDeclaration.Count - 1; i >= 0; i--) { VariableDeclaration vd = fieldDeclaration[i]; @@ -2747,7 +2753,7 @@ out type); } -#line 1428 "VBNET.ATG" +#line 1442 "VBNET.ATG" if (type == null && (dimension != null || rank != null)) { type = new TypeReference(""); } @@ -2775,12 +2781,12 @@ out type); if (la.kind == 10) { lexer.NextToken(); VariableInitializer( -#line 1452 "VBNET.ATG" +#line 1466 "VBNET.ATG" out expr); } - } else SynErr(236); + } else SynErr(250); -#line 1455 "VBNET.ATG" +#line 1469 "VBNET.ATG" VariableDeclaration varDecl = new VariableDeclaration(name, expr, type); varDecl.StartLocation = startLocation; varDecl.EndLocation = t.Location; @@ -2789,22 +2795,22 @@ out expr); } void VariableDeclarator( -#line 1388 "VBNET.ATG" +#line 1402 "VBNET.ATG" List fieldDeclaration) { Identifier(); -#line 1390 "VBNET.ATG" +#line 1404 "VBNET.ATG" string name = t.val; VariableDeclaratorPartAfterIdentifier( -#line 1391 "VBNET.ATG" +#line 1405 "VBNET.ATG" fieldDeclaration, name); } void ConstantDeclarator( -#line 1369 "VBNET.ATG" +#line 1383 "VBNET.ATG" List constantDeclaration) { -#line 1371 "VBNET.ATG" +#line 1385 "VBNET.ATG" Expression expr = null; TypeReference type = null; string name = String.Empty; @@ -2812,20 +2818,20 @@ List constantDeclaration) { Identifier(); -#line 1376 "VBNET.ATG" +#line 1390 "VBNET.ATG" name = t.val; location = t.Location; - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 1377 "VBNET.ATG" +#line 1391 "VBNET.ATG" out type); } Expect(10); Expr( -#line 1378 "VBNET.ATG" +#line 1392 "VBNET.ATG" out expr); -#line 1380 "VBNET.ATG" +#line 1394 "VBNET.ATG" VariableDeclaration f = new VariableDeclaration(name, expr); f.TypeReference = type; f.StartLocation = location; @@ -2834,10 +2840,10 @@ out expr); } void AccessorDecls( -#line 1303 "VBNET.ATG" +#line 1317 "VBNET.ATG" out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { -#line 1305 "VBNET.ATG" +#line 1319 "VBNET.ATG" List attributes = new List(); AttributeSection section; getBlock = null; @@ -2845,60 +2851,60 @@ out PropertyGetRegion getBlock, out PropertySetRegion setBlock) { while (la.kind == 28) { AttributeSection( -#line 1310 "VBNET.ATG" +#line 1324 "VBNET.ATG" out section); -#line 1310 "VBNET.ATG" +#line 1324 "VBNET.ATG" attributes.Add(section); } - if (StartOf(23)) { + if (StartOf(24)) { GetAccessorDecl( -#line 1312 "VBNET.ATG" +#line 1326 "VBNET.ATG" out getBlock, attributes); - if (StartOf(24)) { + if (StartOf(25)) { -#line 1314 "VBNET.ATG" +#line 1328 "VBNET.ATG" attributes = new List(); while (la.kind == 28) { AttributeSection( -#line 1315 "VBNET.ATG" +#line 1329 "VBNET.ATG" out section); -#line 1315 "VBNET.ATG" +#line 1329 "VBNET.ATG" attributes.Add(section); } SetAccessorDecl( -#line 1316 "VBNET.ATG" +#line 1330 "VBNET.ATG" out setBlock, attributes); } - } else if (StartOf(25)) { + } else if (StartOf(26)) { SetAccessorDecl( -#line 1319 "VBNET.ATG" +#line 1333 "VBNET.ATG" out setBlock, attributes); - if (StartOf(26)) { + if (StartOf(27)) { -#line 1321 "VBNET.ATG" +#line 1335 "VBNET.ATG" attributes = new List(); while (la.kind == 28) { AttributeSection( -#line 1322 "VBNET.ATG" +#line 1336 "VBNET.ATG" out section); -#line 1322 "VBNET.ATG" +#line 1336 "VBNET.ATG" attributes.Add(section); } GetAccessorDecl( -#line 1323 "VBNET.ATG" +#line 1337 "VBNET.ATG" out getBlock, attributes); } - } else SynErr(237); + } else SynErr(251); } void EventAccessorDeclaration( -#line 1266 "VBNET.ATG" +#line 1280 "VBNET.ATG" out EventAddRemoveRegion eventAccessorDeclaration) { -#line 1268 "VBNET.ATG" +#line 1282 "VBNET.ATG" Statement stmt = null; List p = new List(); AttributeSection section; @@ -2907,10 +2913,10 @@ out EventAddRemoveRegion eventAccessorDeclaration) { while (la.kind == 28) { AttributeSection( -#line 1274 "VBNET.ATG" +#line 1288 "VBNET.ATG" out section); -#line 1274 "VBNET.ATG" +#line 1288 "VBNET.ATG" attributes.Add(section); } if (la.kind == 43) { @@ -2919,233 +2925,233 @@ out section); lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1276 "VBNET.ATG" +#line 1290 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1277 "VBNET.ATG" +#line 1291 "VBNET.ATG" out stmt); - Expect(95); + Expect(100); Expect(43); EndOfStmt(); -#line 1279 "VBNET.ATG" +#line 1293 "VBNET.ATG" eventAccessorDeclaration = new EventAddRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; - } else if (la.kind == 167) { + } else if (la.kind == 178) { lexer.NextToken(); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1284 "VBNET.ATG" +#line 1298 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1285 "VBNET.ATG" +#line 1299 "VBNET.ATG" out stmt); - Expect(95); - Expect(167); + Expect(100); + Expect(178); EndOfStmt(); -#line 1287 "VBNET.ATG" +#line 1301 "VBNET.ATG" eventAccessorDeclaration = new EventRemoveRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; - } else if (la.kind == 163) { + } else if (la.kind == 174) { lexer.NextToken(); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1292 "VBNET.ATG" +#line 1306 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1293 "VBNET.ATG" +#line 1307 "VBNET.ATG" out stmt); - Expect(95); - Expect(163); + Expect(100); + Expect(174); EndOfStmt(); -#line 1295 "VBNET.ATG" +#line 1309 "VBNET.ATG" eventAccessorDeclaration = new EventRaiseRegion(attributes); eventAccessorDeclaration.Block = (BlockStatement)stmt; eventAccessorDeclaration.Parameters = p; - } else SynErr(238); + } else SynErr(252); } void OverloadableOperator( -#line 1208 "VBNET.ATG" +#line 1222 "VBNET.ATG" out OverloadableOperatorType operatorType) { -#line 1209 "VBNET.ATG" +#line 1223 "VBNET.ATG" operatorType = OverloadableOperatorType.None; switch (la.kind) { case 19: { lexer.NextToken(); -#line 1211 "VBNET.ATG" +#line 1225 "VBNET.ATG" operatorType = OverloadableOperatorType.Add; break; } case 18: { lexer.NextToken(); -#line 1213 "VBNET.ATG" +#line 1227 "VBNET.ATG" operatorType = OverloadableOperatorType.Subtract; break; } case 22: { lexer.NextToken(); -#line 1215 "VBNET.ATG" +#line 1229 "VBNET.ATG" operatorType = OverloadableOperatorType.Multiply; break; } case 14: { lexer.NextToken(); -#line 1217 "VBNET.ATG" +#line 1231 "VBNET.ATG" operatorType = OverloadableOperatorType.Divide; break; } case 15: { lexer.NextToken(); -#line 1219 "VBNET.ATG" +#line 1233 "VBNET.ATG" operatorType = OverloadableOperatorType.DivideInteger; break; } case 13: { lexer.NextToken(); -#line 1221 "VBNET.ATG" +#line 1235 "VBNET.ATG" operatorType = OverloadableOperatorType.Concat; break; } - case 126: { + case 136: { lexer.NextToken(); -#line 1223 "VBNET.ATG" +#line 1237 "VBNET.ATG" operatorType = OverloadableOperatorType.Like; break; } - case 130: { + case 140: { lexer.NextToken(); -#line 1225 "VBNET.ATG" +#line 1239 "VBNET.ATG" operatorType = OverloadableOperatorType.Modulus; break; } - case 46: { + case 47: { lexer.NextToken(); -#line 1227 "VBNET.ATG" +#line 1241 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseAnd; break; } - case 151: { + case 161: { lexer.NextToken(); -#line 1229 "VBNET.ATG" +#line 1243 "VBNET.ATG" operatorType = OverloadableOperatorType.BitwiseOr; break; } - case 207: { + case 221: { lexer.NextToken(); -#line 1231 "VBNET.ATG" +#line 1245 "VBNET.ATG" operatorType = OverloadableOperatorType.ExclusiveOr; break; } case 20: { lexer.NextToken(); -#line 1233 "VBNET.ATG" +#line 1247 "VBNET.ATG" operatorType = OverloadableOperatorType.Power; break; } case 32: { lexer.NextToken(); -#line 1235 "VBNET.ATG" +#line 1249 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftLeft; break; } case 33: { lexer.NextToken(); -#line 1237 "VBNET.ATG" +#line 1251 "VBNET.ATG" operatorType = OverloadableOperatorType.ShiftRight; break; } case 10: { lexer.NextToken(); -#line 1239 "VBNET.ATG" +#line 1253 "VBNET.ATG" operatorType = OverloadableOperatorType.Equality; break; } case 29: { lexer.NextToken(); -#line 1241 "VBNET.ATG" +#line 1255 "VBNET.ATG" operatorType = OverloadableOperatorType.InEquality; break; } case 28: { lexer.NextToken(); -#line 1243 "VBNET.ATG" +#line 1257 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThan; break; } case 31: { lexer.NextToken(); -#line 1245 "VBNET.ATG" +#line 1259 "VBNET.ATG" operatorType = OverloadableOperatorType.LessThanOrEqual; break; } case 27: { lexer.NextToken(); -#line 1247 "VBNET.ATG" +#line 1261 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThan; break; } case 30: { lexer.NextToken(); -#line 1249 "VBNET.ATG" +#line 1263 "VBNET.ATG" operatorType = OverloadableOperatorType.GreaterThanOrEqual; break; } - case 78: { + case 81: { lexer.NextToken(); -#line 1251 "VBNET.ATG" +#line 1265 "VBNET.ATG" operatorType = OverloadableOperatorType.CType; break; } - case 2: case 48: case 50: case 51: case 52: case 71: case 82: case 102: case 146: case 158: case 185: case 195: case 196: { + case 2: case 45: case 49: case 51: case 52: case 53: case 54: case 57: case 74: case 85: case 91: case 94: case 103: case 108: case 113: case 120: case 126: case 130: case 133: case 156: case 162: case 169: case 188: case 197: case 198: case 208: case 209: case 215: { Identifier(); -#line 1255 "VBNET.ATG" +#line 1269 "VBNET.ATG" string opName = t.val; if (string.Equals(opName, "istrue", StringComparison.InvariantCultureIgnoreCase)) { operatorType = OverloadableOperatorType.IsTrue; @@ -3157,146 +3163,146 @@ out OverloadableOperatorType operatorType) { break; } - default: SynErr(239); break; + default: SynErr(253); break; } } void GetAccessorDecl( -#line 1329 "VBNET.ATG" +#line 1343 "VBNET.ATG" out PropertyGetRegion getBlock, List attributes) { -#line 1330 "VBNET.ATG" +#line 1344 "VBNET.ATG" Statement stmt = null; Modifiers m; PropertyAccessorAccessModifier( -#line 1332 "VBNET.ATG" +#line 1346 "VBNET.ATG" out m); - Expect(108); + Expect(115); -#line 1334 "VBNET.ATG" +#line 1348 "VBNET.ATG" Location startLocation = t.Location; Expect(1); Block( -#line 1336 "VBNET.ATG" +#line 1350 "VBNET.ATG" out stmt); -#line 1337 "VBNET.ATG" +#line 1351 "VBNET.ATG" getBlock = new PropertyGetRegion((BlockStatement)stmt, attributes); - Expect(95); - Expect(108); + Expect(100); + Expect(115); -#line 1339 "VBNET.ATG" +#line 1353 "VBNET.ATG" getBlock.Modifier = m; -#line 1340 "VBNET.ATG" +#line 1354 "VBNET.ATG" getBlock.StartLocation = startLocation; getBlock.EndLocation = t.EndLocation; EndOfStmt(); } void SetAccessorDecl( -#line 1345 "VBNET.ATG" +#line 1359 "VBNET.ATG" out PropertySetRegion setBlock, List attributes) { -#line 1347 "VBNET.ATG" +#line 1361 "VBNET.ATG" Statement stmt = null; List p = new List(); Modifiers m; PropertyAccessorAccessModifier( -#line 1352 "VBNET.ATG" +#line 1366 "VBNET.ATG" out m); - Expect(172); + Expect(183); -#line 1354 "VBNET.ATG" +#line 1368 "VBNET.ATG" Location startLocation = t.Location; if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1355 "VBNET.ATG" +#line 1369 "VBNET.ATG" p); } Expect(26); } Expect(1); Block( -#line 1357 "VBNET.ATG" +#line 1371 "VBNET.ATG" out stmt); -#line 1359 "VBNET.ATG" +#line 1373 "VBNET.ATG" setBlock = new PropertySetRegion((BlockStatement)stmt, attributes); setBlock.Modifier = m; setBlock.Parameters = p; - Expect(95); - Expect(172); + Expect(100); + Expect(183); -#line 1364 "VBNET.ATG" +#line 1378 "VBNET.ATG" setBlock.StartLocation = startLocation; setBlock.EndLocation = t.EndLocation; EndOfStmt(); } void PropertyAccessorAccessModifier( -#line 3068 "VBNET.ATG" +#line 3085 "VBNET.ATG" out Modifiers m) { -#line 3069 "VBNET.ATG" +#line 3086 "VBNET.ATG" m = Modifiers.None; - while (StartOf(27)) { - if (la.kind == 162) { + while (StartOf(28)) { + if (la.kind == 173) { lexer.NextToken(); -#line 3071 "VBNET.ATG" +#line 3088 "VBNET.ATG" m |= Modifiers.Public; - } else if (la.kind == 161) { + } else if (la.kind == 172) { lexer.NextToken(); -#line 3072 "VBNET.ATG" +#line 3089 "VBNET.ATG" m |= Modifiers.Protected; - } else if (la.kind == 106) { + } else if (la.kind == 112) { lexer.NextToken(); -#line 3073 "VBNET.ATG" +#line 3090 "VBNET.ATG" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 3074 "VBNET.ATG" +#line 3091 "VBNET.ATG" m |= Modifiers.Private; } } } void ArrayInitializationModifier( -#line 1463 "VBNET.ATG" +#line 1477 "VBNET.ATG" out List arrayModifiers) { -#line 1465 "VBNET.ATG" +#line 1479 "VBNET.ATG" arrayModifiers = null; Expect(25); InitializationRankList( -#line 1467 "VBNET.ATG" +#line 1481 "VBNET.ATG" out arrayModifiers); Expect(26); } void ArrayNameModifier( -#line 2152 "VBNET.ATG" +#line 2166 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2154 "VBNET.ATG" +#line 2168 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 2156 "VBNET.ATG" +#line 2170 "VBNET.ATG" out arrayModifiers); } void ObjectCreateExpression( -#line 1923 "VBNET.ATG" +#line 1937 "VBNET.ATG" out Expression oce) { -#line 1925 "VBNET.ATG" +#line 1939 "VBNET.ATG" TypeReference type = null; Expression initializer = null; List arguments = null; @@ -3304,42 +3310,42 @@ out Expression oce) { oce = null; bool canBeNormal; bool canBeReDim; - Expect(138); - if (StartOf(6)) { + Expect(148); + if (StartOf(7)) { NonArrayTypeName( -#line 1933 "VBNET.ATG" +#line 1947 "VBNET.ATG" out type, false); if (la.kind == 25) { lexer.NextToken(); NormalOrReDimArgumentList( -#line 1934 "VBNET.ATG" +#line 1948 "VBNET.ATG" out arguments, out canBeNormal, out canBeReDim); Expect(26); if (la.kind == 23 || -#line 1935 "VBNET.ATG" +#line 1949 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { if ( -#line 1935 "VBNET.ATG" +#line 1949 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { ArrayTypeModifiers( -#line 1936 "VBNET.ATG" +#line 1950 "VBNET.ATG" out dimensions); CollectionInitializer( -#line 1937 "VBNET.ATG" +#line 1951 "VBNET.ATG" out initializer); } else { CollectionInitializer( -#line 1938 "VBNET.ATG" +#line 1952 "VBNET.ATG" out initializer); } } -#line 1940 "VBNET.ATG" +#line 1954 "VBNET.ATG" if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); } } -#line 1944 "VBNET.ATG" +#line 1958 "VBNET.ATG" if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); SetParent(arguments, oce); @@ -3353,36 +3359,36 @@ out initializer); oce = ace; } - if (la.kind == 204) { + if (la.kind == 218) { -#line 1960 "VBNET.ATG" +#line 1974 "VBNET.ATG" NamedArgumentExpression memberInitializer = null; lexer.NextToken(); -#line 1964 "VBNET.ATG" +#line 1978 "VBNET.ATG" CollectionInitializerExpression memberInitializers = new CollectionInitializerExpression(); memberInitializers.StartLocation = la.Location; Expect(23); MemberInitializer( -#line 1968 "VBNET.ATG" +#line 1982 "VBNET.ATG" out memberInitializer); -#line 1969 "VBNET.ATG" +#line 1983 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); while (la.kind == 12) { lexer.NextToken(); MemberInitializer( -#line 1971 "VBNET.ATG" +#line 1985 "VBNET.ATG" out memberInitializer); -#line 1972 "VBNET.ATG" +#line 1986 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); } Expect(24); -#line 1976 "VBNET.ATG" +#line 1990 "VBNET.ATG" memberInitializers.EndLocation = t.Location; if(oce is ObjectCreateExpression) { @@ -3393,195 +3399,195 @@ out memberInitializer); } void VariableInitializer( -#line 1491 "VBNET.ATG" +#line 1505 "VBNET.ATG" out Expression initializerExpression) { -#line 1493 "VBNET.ATG" +#line 1507 "VBNET.ATG" initializerExpression = null; - if (StartOf(28)) { + if (StartOf(29)) { Expr( -#line 1495 "VBNET.ATG" +#line 1509 "VBNET.ATG" out initializerExpression); } else if (la.kind == 23) { CollectionInitializer( -#line 1496 "VBNET.ATG" +#line 1510 "VBNET.ATG" out initializerExpression); - } else SynErr(240); + } else SynErr(254); } void InitializationRankList( -#line 1471 "VBNET.ATG" +#line 1485 "VBNET.ATG" out List rank) { -#line 1473 "VBNET.ATG" +#line 1487 "VBNET.ATG" rank = new List(); Expression expr = null; Expr( -#line 1476 "VBNET.ATG" +#line 1490 "VBNET.ATG" out expr); - if (la.kind == 188) { + if (la.kind == 201) { lexer.NextToken(); -#line 1477 "VBNET.ATG" +#line 1491 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1478 "VBNET.ATG" +#line 1492 "VBNET.ATG" out expr); } -#line 1480 "VBNET.ATG" +#line 1494 "VBNET.ATG" if (expr != null) { rank.Add(expr); } while (la.kind == 12) { lexer.NextToken(); Expr( -#line 1482 "VBNET.ATG" +#line 1496 "VBNET.ATG" out expr); - if (la.kind == 188) { + if (la.kind == 201) { lexer.NextToken(); -#line 1483 "VBNET.ATG" +#line 1497 "VBNET.ATG" EnsureIsZero(expr); Expr( -#line 1484 "VBNET.ATG" +#line 1498 "VBNET.ATG" out expr); } -#line 1486 "VBNET.ATG" +#line 1500 "VBNET.ATG" if (expr != null) { rank.Add(expr); } } } void CollectionInitializer( -#line 1500 "VBNET.ATG" +#line 1514 "VBNET.ATG" out Expression outExpr) { -#line 1502 "VBNET.ATG" +#line 1516 "VBNET.ATG" Expression expr = null; CollectionInitializerExpression initializer = new CollectionInitializerExpression(); Expect(23); - if (StartOf(29)) { + if (StartOf(30)) { VariableInitializer( -#line 1507 "VBNET.ATG" +#line 1521 "VBNET.ATG" out expr); -#line 1509 "VBNET.ATG" +#line 1523 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } while ( -#line 1512 "VBNET.ATG" +#line 1526 "VBNET.ATG" NotFinalComma()) { Expect(12); VariableInitializer( -#line 1512 "VBNET.ATG" +#line 1526 "VBNET.ATG" out expr); -#line 1513 "VBNET.ATG" +#line 1527 "VBNET.ATG" if (expr != null) { initializer.CreateExpressions.Add(expr); } } } Expect(24); -#line 1516 "VBNET.ATG" +#line 1530 "VBNET.ATG" outExpr = initializer; } void EventMemberSpecifier( -#line 1586 "VBNET.ATG" +#line 1600 "VBNET.ATG" out string name) { -#line 1587 "VBNET.ATG" +#line 1601 "VBNET.ATG" string eventName; - if (StartOf(13)) { + if (StartOf(14)) { Identifier(); - } else if (la.kind == 134) { + } else if (la.kind == 144) { lexer.NextToken(); - } else if (la.kind == 129) { + } else if (la.kind == 139) { lexer.NextToken(); - } else SynErr(241); + } else SynErr(255); -#line 1590 "VBNET.ATG" +#line 1604 "VBNET.ATG" name = t.val; Expect(16); IdentifierOrKeyword( -#line 1592 "VBNET.ATG" +#line 1606 "VBNET.ATG" out eventName); -#line 1593 "VBNET.ATG" +#line 1607 "VBNET.ATG" name = name + "." + eventName; } void IdentifierOrKeyword( -#line 3001 "VBNET.ATG" +#line 3018 "VBNET.ATG" out string name) { -#line 3003 "VBNET.ATG" +#line 3020 "VBNET.ATG" lexer.NextToken(); name = t.val; } void DisjunctionExpr( -#line 1767 "VBNET.ATG" +#line 1781 "VBNET.ATG" out Expression outExpr) { -#line 1769 "VBNET.ATG" +#line 1783 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConjunctionExpr( -#line 1772 "VBNET.ATG" +#line 1786 "VBNET.ATG" out outExpr); - while (la.kind == 151 || la.kind == 152 || la.kind == 207) { - if (la.kind == 151) { + while (la.kind == 161 || la.kind == 163 || la.kind == 221) { + if (la.kind == 161) { lexer.NextToken(); -#line 1775 "VBNET.ATG" +#line 1789 "VBNET.ATG" op = BinaryOperatorType.BitwiseOr; - } else if (la.kind == 152) { + } else if (la.kind == 163) { lexer.NextToken(); -#line 1776 "VBNET.ATG" +#line 1790 "VBNET.ATG" op = BinaryOperatorType.LogicalOr; } else { lexer.NextToken(); -#line 1777 "VBNET.ATG" +#line 1791 "VBNET.ATG" op = BinaryOperatorType.ExclusiveOr; } ConjunctionExpr( -#line 1779 "VBNET.ATG" +#line 1793 "VBNET.ATG" out expr); -#line 1779 "VBNET.ATG" +#line 1793 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void LambdaExpr( -#line 1985 "VBNET.ATG" +#line 1999 "VBNET.ATG" out Expression expr) { -#line 1987 "VBNET.ATG" +#line 2001 "VBNET.ATG" Expression inner = null; LambdaExpression lambda = new LambdaExpression(); lambda.StartLocation = la.Location; - Expect(107); + Expect(114); if (la.kind == 25) { lexer.NextToken(); if (StartOf(4)) { FormalParameterList( -#line 1993 "VBNET.ATG" +#line 2007 "VBNET.ATG" lambda.Parameters); } Expect(26); } Expr( -#line 1994 "VBNET.ATG" +#line 2008 "VBNET.ATG" out inner); -#line 1996 "VBNET.ATG" +#line 2010 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? @@ -3590,405 +3596,405 @@ out inner); } void AssignmentOperator( -#line 1602 "VBNET.ATG" +#line 1616 "VBNET.ATG" out AssignmentOperatorType op) { -#line 1603 "VBNET.ATG" +#line 1617 "VBNET.ATG" op = AssignmentOperatorType.None; switch (la.kind) { case 10: { lexer.NextToken(); -#line 1604 "VBNET.ATG" +#line 1618 "VBNET.ATG" op = AssignmentOperatorType.Assign; break; } case 42: { lexer.NextToken(); -#line 1605 "VBNET.ATG" +#line 1619 "VBNET.ATG" op = AssignmentOperatorType.ConcatString; break; } case 34: { lexer.NextToken(); -#line 1606 "VBNET.ATG" +#line 1620 "VBNET.ATG" op = AssignmentOperatorType.Add; break; } case 36: { lexer.NextToken(); -#line 1607 "VBNET.ATG" +#line 1621 "VBNET.ATG" op = AssignmentOperatorType.Subtract; break; } case 37: { lexer.NextToken(); -#line 1608 "VBNET.ATG" +#line 1622 "VBNET.ATG" op = AssignmentOperatorType.Multiply; break; } case 38: { lexer.NextToken(); -#line 1609 "VBNET.ATG" +#line 1623 "VBNET.ATG" op = AssignmentOperatorType.Divide; break; } case 39: { lexer.NextToken(); -#line 1610 "VBNET.ATG" +#line 1624 "VBNET.ATG" op = AssignmentOperatorType.DivideInteger; break; } case 35: { lexer.NextToken(); -#line 1611 "VBNET.ATG" +#line 1625 "VBNET.ATG" op = AssignmentOperatorType.Power; break; } case 40: { lexer.NextToken(); -#line 1612 "VBNET.ATG" +#line 1626 "VBNET.ATG" op = AssignmentOperatorType.ShiftLeft; break; } case 41: { lexer.NextToken(); -#line 1613 "VBNET.ATG" +#line 1627 "VBNET.ATG" op = AssignmentOperatorType.ShiftRight; break; } - default: SynErr(242); break; + default: SynErr(256); break; } } void SimpleExpr( -#line 1617 "VBNET.ATG" +#line 1631 "VBNET.ATG" out Expression pexpr) { -#line 1618 "VBNET.ATG" +#line 1632 "VBNET.ATG" string name; SimpleNonInvocationExpression( -#line 1620 "VBNET.ATG" +#line 1634 "VBNET.ATG" out pexpr); while (la.kind == 16 || la.kind == 17 || la.kind == 25) { if (la.kind == 16) { lexer.NextToken(); IdentifierOrKeyword( -#line 1622 "VBNET.ATG" +#line 1636 "VBNET.ATG" out name); -#line 1623 "VBNET.ATG" +#line 1637 "VBNET.ATG" pexpr = new MemberReferenceExpression(pexpr, name); if ( -#line 1624 "VBNET.ATG" +#line 1638 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); - Expect(145); + Expect(155); TypeArgumentList( -#line 1625 "VBNET.ATG" +#line 1639 "VBNET.ATG" ((MemberReferenceExpression)pexpr).TypeArguments); Expect(26); } } else if (la.kind == 17) { lexer.NextToken(); IdentifierOrKeyword( -#line 1627 "VBNET.ATG" +#line 1641 "VBNET.ATG" out name); -#line 1627 "VBNET.ATG" +#line 1641 "VBNET.ATG" pexpr = new BinaryOperatorExpression(pexpr, BinaryOperatorType.DictionaryAccess, new PrimitiveExpression(name, name)); } else { InvocationExpression( -#line 1628 "VBNET.ATG" +#line 1642 "VBNET.ATG" ref pexpr); } } } void SimpleNonInvocationExpression( -#line 1632 "VBNET.ATG" +#line 1646 "VBNET.ATG" out Expression pexpr) { -#line 1634 "VBNET.ATG" +#line 1648 "VBNET.ATG" Expression expr; TypeReference type = null; string name = String.Empty; pexpr = null; - if (StartOf(30)) { + if (StartOf(31)) { switch (la.kind) { case 3: { lexer.NextToken(); -#line 1642 "VBNET.ATG" +#line 1656 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 4: { lexer.NextToken(); -#line 1643 "VBNET.ATG" +#line 1657 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 7: { lexer.NextToken(); -#line 1644 "VBNET.ATG" +#line 1658 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 6: { lexer.NextToken(); -#line 1645 "VBNET.ATG" +#line 1659 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 5: { lexer.NextToken(); -#line 1646 "VBNET.ATG" +#line 1660 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 9: { lexer.NextToken(); -#line 1647 "VBNET.ATG" +#line 1661 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } case 8: { lexer.NextToken(); -#line 1648 "VBNET.ATG" +#line 1662 "VBNET.ATG" pexpr = new PrimitiveExpression(t.literalValue, t.val) { LiteralFormat = t.literalFormat }; break; } - case 189: { + case 202: { lexer.NextToken(); -#line 1650 "VBNET.ATG" +#line 1664 "VBNET.ATG" pexpr = new PrimitiveExpression(true, "true"); break; } - case 103: { + case 109: { lexer.NextToken(); -#line 1651 "VBNET.ATG" +#line 1665 "VBNET.ATG" pexpr = new PrimitiveExpression(false, "false"); break; } - case 141: { + case 151: { lexer.NextToken(); -#line 1652 "VBNET.ATG" +#line 1666 "VBNET.ATG" pexpr = new PrimitiveExpression(null, "null"); break; } case 25: { lexer.NextToken(); Expr( -#line 1653 "VBNET.ATG" +#line 1667 "VBNET.ATG" out expr); Expect(26); -#line 1653 "VBNET.ATG" +#line 1667 "VBNET.ATG" pexpr = new ParenthesizedExpression(expr); break; } - case 2: case 48: case 50: case 51: case 52: case 71: case 82: case 102: case 146: case 158: case 185: case 195: case 196: { + case 2: case 45: case 49: case 51: case 52: case 53: case 54: case 57: case 74: case 85: case 91: case 94: case 103: case 108: case 113: case 120: case 126: case 130: case 133: case 156: case 162: case 169: case 188: case 197: case 198: case 208: case 209: case 215: { Identifier(); -#line 1655 "VBNET.ATG" +#line 1669 "VBNET.ATG" pexpr = new IdentifierExpression(t.val); pexpr.StartLocation = t.Location; pexpr.EndLocation = t.EndLocation; if ( -#line 1658 "VBNET.ATG" +#line 1672 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); - Expect(145); + Expect(155); TypeArgumentList( -#line 1659 "VBNET.ATG" +#line 1673 "VBNET.ATG" ((IdentifierExpression)pexpr).TypeArguments); Expect(26); } break; } - case 53: case 55: case 66: case 83: case 84: case 91: case 120: case 127: case 144: case 170: case 175: case 176: case 181: case 193: case 194: case 197: { + case 55: case 58: case 69: case 86: case 87: case 96: case 128: case 137: case 154: case 181: case 186: case 187: case 193: case 206: case 207: case 210: { -#line 1661 "VBNET.ATG" +#line 1675 "VBNET.ATG" string val = String.Empty; - if (StartOf(10)) { + if (StartOf(11)) { PrimitiveTypeName( -#line 1662 "VBNET.ATG" +#line 1676 "VBNET.ATG" out val); - } else if (la.kind == 144) { + } else if (la.kind == 154) { lexer.NextToken(); -#line 1662 "VBNET.ATG" +#line 1676 "VBNET.ATG" val = "Object"; - } else SynErr(243); + } else SynErr(257); Expect(16); -#line 1663 "VBNET.ATG" +#line 1677 "VBNET.ATG" t.val = ""; Identifier(); -#line 1663 "VBNET.ATG" +#line 1677 "VBNET.ATG" pexpr = new MemberReferenceExpression(new TypeReferenceExpression(val), t.val); break; } - case 129: { + case 139: { lexer.NextToken(); -#line 1664 "VBNET.ATG" +#line 1678 "VBNET.ATG" pexpr = new ThisReferenceExpression(); break; } - case 134: case 135: { + case 144: case 145: { -#line 1665 "VBNET.ATG" +#line 1679 "VBNET.ATG" Expression retExpr = null; - if (la.kind == 134) { + if (la.kind == 144) { lexer.NextToken(); -#line 1666 "VBNET.ATG" +#line 1680 "VBNET.ATG" retExpr = new BaseReferenceExpression(); - } else if (la.kind == 135) { + } else if (la.kind == 145) { lexer.NextToken(); -#line 1667 "VBNET.ATG" +#line 1681 "VBNET.ATG" retExpr = new ClassReferenceExpression(); - } else SynErr(244); + } else SynErr(258); Expect(16); IdentifierOrKeyword( -#line 1669 "VBNET.ATG" +#line 1683 "VBNET.ATG" out name); -#line 1669 "VBNET.ATG" +#line 1683 "VBNET.ATG" pexpr = new MemberReferenceExpression(retExpr, name); break; } - case 110: { + case 117: { lexer.NextToken(); Expect(16); Identifier(); -#line 1671 "VBNET.ATG" +#line 1685 "VBNET.ATG" type = new TypeReference(t.val ?? ""); -#line 1673 "VBNET.ATG" +#line 1687 "VBNET.ATG" type.IsGlobal = true; -#line 1674 "VBNET.ATG" +#line 1688 "VBNET.ATG" pexpr = new TypeReferenceExpression(type); break; } - case 138: { + case 148: { ObjectCreateExpression( -#line 1675 "VBNET.ATG" +#line 1689 "VBNET.ATG" out expr); -#line 1675 "VBNET.ATG" +#line 1689 "VBNET.ATG" pexpr = expr; break; } - case 78: case 89: case 191: { + case 81: case 93: case 204: { -#line 1677 "VBNET.ATG" +#line 1691 "VBNET.ATG" CastType castType = CastType.Cast; - if (la.kind == 89) { + if (la.kind == 93) { lexer.NextToken(); - } else if (la.kind == 78) { + } else if (la.kind == 81) { lexer.NextToken(); -#line 1679 "VBNET.ATG" +#line 1693 "VBNET.ATG" castType = CastType.Conversion; - } else if (la.kind == 191) { + } else if (la.kind == 204) { lexer.NextToken(); -#line 1680 "VBNET.ATG" +#line 1694 "VBNET.ATG" castType = CastType.TryCast; - } else SynErr(245); + } else SynErr(259); Expect(25); Expr( -#line 1682 "VBNET.ATG" +#line 1696 "VBNET.ATG" out expr); Expect(12); TypeName( -#line 1682 "VBNET.ATG" +#line 1696 "VBNET.ATG" out type); Expect(26); -#line 1683 "VBNET.ATG" +#line 1697 "VBNET.ATG" pexpr = new CastExpression(type, expr, castType); break; } - case 60: case 61: case 62: case 63: case 64: case 65: case 67: case 69: case 70: case 74: case 75: case 76: case 77: case 79: case 80: case 81: { + case 63: case 64: case 65: case 66: case 67: case 68: case 70: case 72: case 73: case 77: case 78: case 79: case 80: case 82: case 83: case 84: { CastTarget( -#line 1684 "VBNET.ATG" +#line 1698 "VBNET.ATG" out type); Expect(25); Expr( -#line 1684 "VBNET.ATG" +#line 1698 "VBNET.ATG" out expr); Expect(26); -#line 1684 "VBNET.ATG" +#line 1698 "VBNET.ATG" pexpr = new CastExpression(type, expr, CastType.PrimitiveConversion); break; } case 44: { lexer.NextToken(); Expr( -#line 1685 "VBNET.ATG" +#line 1699 "VBNET.ATG" out expr); -#line 1685 "VBNET.ATG" +#line 1699 "VBNET.ATG" pexpr = new AddressOfExpression(expr); break; } - case 109: { + case 116: { lexer.NextToken(); Expect(25); GetTypeTypeName( -#line 1686 "VBNET.ATG" +#line 1700 "VBNET.ATG" out type); Expect(26); -#line 1686 "VBNET.ATG" +#line 1700 "VBNET.ATG" pexpr = new TypeOfExpression(type); break; } - case 192: { + case 205: { lexer.NextToken(); SimpleExpr( -#line 1687 "VBNET.ATG" +#line 1701 "VBNET.ATG" out expr); - Expect(122); + Expect(131); TypeName( -#line 1687 "VBNET.ATG" +#line 1701 "VBNET.ATG" out type); -#line 1687 "VBNET.ATG" +#line 1701 "VBNET.ATG" pexpr = new TypeOfIsExpression(expr, type); break; } - case 114: { + case 122: { ConditionalExpression( -#line 1688 "VBNET.ATG" +#line 1702 "VBNET.ATG" out pexpr); break; } @@ -3996,316 +4002,316 @@ out pexpr); } else if (la.kind == 16) { lexer.NextToken(); IdentifierOrKeyword( -#line 1692 "VBNET.ATG" +#line 1706 "VBNET.ATG" out name); -#line 1692 "VBNET.ATG" +#line 1706 "VBNET.ATG" pexpr = new MemberReferenceExpression(null, name); - } else SynErr(246); + } else SynErr(260); } void TypeArgumentList( -#line 2188 "VBNET.ATG" +#line 2202 "VBNET.ATG" List typeArguments) { -#line 2190 "VBNET.ATG" +#line 2204 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2192 "VBNET.ATG" +#line 2206 "VBNET.ATG" out typeref); -#line 2192 "VBNET.ATG" +#line 2206 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 12) { lexer.NextToken(); TypeName( -#line 2195 "VBNET.ATG" +#line 2209 "VBNET.ATG" out typeref); -#line 2195 "VBNET.ATG" +#line 2209 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void InvocationExpression( -#line 1730 "VBNET.ATG" +#line 1744 "VBNET.ATG" ref Expression pexpr) { -#line 1731 "VBNET.ATG" +#line 1745 "VBNET.ATG" List parameters = null; Expect(25); -#line 1733 "VBNET.ATG" +#line 1747 "VBNET.ATG" Location start = t.Location; ArgumentList( -#line 1734 "VBNET.ATG" +#line 1748 "VBNET.ATG" out parameters); Expect(26); -#line 1737 "VBNET.ATG" +#line 1751 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); SetParent(parameters, pexpr); -#line 1740 "VBNET.ATG" +#line 1754 "VBNET.ATG" pexpr.StartLocation = start; pexpr.EndLocation = t.Location; } void PrimitiveTypeName( -#line 3008 "VBNET.ATG" +#line 3025 "VBNET.ATG" out string type) { -#line 3009 "VBNET.ATG" +#line 3026 "VBNET.ATG" type = String.Empty; switch (la.kind) { - case 53: { + case 55: { lexer.NextToken(); -#line 3010 "VBNET.ATG" +#line 3027 "VBNET.ATG" type = "Boolean"; break; } - case 83: { + case 86: { lexer.NextToken(); -#line 3011 "VBNET.ATG" +#line 3028 "VBNET.ATG" type = "Date"; break; } - case 66: { + case 69: { lexer.NextToken(); -#line 3012 "VBNET.ATG" +#line 3029 "VBNET.ATG" type = "Char"; break; } - case 181: { + case 193: { lexer.NextToken(); -#line 3013 "VBNET.ATG" +#line 3030 "VBNET.ATG" type = "String"; break; } - case 84: { + case 87: { lexer.NextToken(); -#line 3014 "VBNET.ATG" +#line 3031 "VBNET.ATG" type = "Decimal"; break; } - case 55: { + case 58: { lexer.NextToken(); -#line 3015 "VBNET.ATG" +#line 3032 "VBNET.ATG" type = "Byte"; break; } - case 175: { + case 186: { lexer.NextToken(); -#line 3016 "VBNET.ATG" +#line 3033 "VBNET.ATG" type = "Short"; break; } - case 120: { + case 128: { lexer.NextToken(); -#line 3017 "VBNET.ATG" +#line 3034 "VBNET.ATG" type = "Integer"; break; } - case 127: { + case 137: { lexer.NextToken(); -#line 3018 "VBNET.ATG" +#line 3035 "VBNET.ATG" type = "Long"; break; } - case 176: { + case 187: { lexer.NextToken(); -#line 3019 "VBNET.ATG" +#line 3036 "VBNET.ATG" type = "Single"; break; } - case 91: { + case 96: { lexer.NextToken(); -#line 3020 "VBNET.ATG" +#line 3037 "VBNET.ATG" type = "Double"; break; } - case 193: { + case 206: { lexer.NextToken(); -#line 3021 "VBNET.ATG" +#line 3038 "VBNET.ATG" type = "UInteger"; break; } - case 194: { + case 207: { lexer.NextToken(); -#line 3022 "VBNET.ATG" +#line 3039 "VBNET.ATG" type = "ULong"; break; } - case 197: { + case 210: { lexer.NextToken(); -#line 3023 "VBNET.ATG" +#line 3040 "VBNET.ATG" type = "UShort"; break; } - case 170: { + case 181: { lexer.NextToken(); -#line 3024 "VBNET.ATG" +#line 3041 "VBNET.ATG" type = "SByte"; break; } - default: SynErr(247); break; + default: SynErr(261); break; } } void CastTarget( -#line 1745 "VBNET.ATG" +#line 1759 "VBNET.ATG" out TypeReference type) { -#line 1747 "VBNET.ATG" +#line 1761 "VBNET.ATG" type = null; switch (la.kind) { - case 60: { + case 63: { lexer.NextToken(); -#line 1749 "VBNET.ATG" +#line 1763 "VBNET.ATG" type = new TypeReference("System.Boolean"); break; } - case 61: { + case 64: { lexer.NextToken(); -#line 1750 "VBNET.ATG" +#line 1764 "VBNET.ATG" type = new TypeReference("System.Byte"); break; } - case 74: { + case 77: { lexer.NextToken(); -#line 1751 "VBNET.ATG" +#line 1765 "VBNET.ATG" type = new TypeReference("System.SByte"); break; } - case 62: { + case 65: { lexer.NextToken(); -#line 1752 "VBNET.ATG" +#line 1766 "VBNET.ATG" type = new TypeReference("System.Char"); break; } - case 63: { + case 66: { lexer.NextToken(); -#line 1753 "VBNET.ATG" +#line 1767 "VBNET.ATG" type = new TypeReference("System.DateTime"); break; } - case 65: { + case 68: { lexer.NextToken(); -#line 1754 "VBNET.ATG" +#line 1768 "VBNET.ATG" type = new TypeReference("System.Decimal"); break; } - case 64: { + case 67: { lexer.NextToken(); -#line 1755 "VBNET.ATG" +#line 1769 "VBNET.ATG" type = new TypeReference("System.Double"); break; } - case 75: { + case 78: { lexer.NextToken(); -#line 1756 "VBNET.ATG" +#line 1770 "VBNET.ATG" type = new TypeReference("System.Int16"); break; } - case 67: { + case 70: { lexer.NextToken(); -#line 1757 "VBNET.ATG" +#line 1771 "VBNET.ATG" type = new TypeReference("System.Int32"); break; } - case 69: { + case 72: { lexer.NextToken(); -#line 1758 "VBNET.ATG" +#line 1772 "VBNET.ATG" type = new TypeReference("System.Int64"); break; } - case 81: { + case 84: { lexer.NextToken(); -#line 1759 "VBNET.ATG" +#line 1773 "VBNET.ATG" type = new TypeReference("System.UInt16"); break; } - case 79: { + case 82: { lexer.NextToken(); -#line 1760 "VBNET.ATG" +#line 1774 "VBNET.ATG" type = new TypeReference("System.UInt32"); break; } - case 80: { + case 83: { lexer.NextToken(); -#line 1761 "VBNET.ATG" +#line 1775 "VBNET.ATG" type = new TypeReference("System.UInt64"); break; } - case 70: { + case 73: { lexer.NextToken(); -#line 1762 "VBNET.ATG" +#line 1776 "VBNET.ATG" type = new TypeReference("System.Object"); break; } - case 76: { + case 79: { lexer.NextToken(); -#line 1763 "VBNET.ATG" +#line 1777 "VBNET.ATG" type = new TypeReference("System.Single"); break; } - case 77: { + case 80: { lexer.NextToken(); -#line 1764 "VBNET.ATG" +#line 1778 "VBNET.ATG" type = new TypeReference("System.String"); break; } - default: SynErr(248); break; + default: SynErr(262); break; } } void GetTypeTypeName( -#line 2087 "VBNET.ATG" +#line 2101 "VBNET.ATG" out TypeReference typeref) { -#line 2088 "VBNET.ATG" +#line 2102 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2090 "VBNET.ATG" +#line 2104 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 2091 "VBNET.ATG" +#line 2105 "VBNET.ATG" out rank); -#line 2092 "VBNET.ATG" +#line 2106 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4313,10 +4319,10 @@ out rank); } void ConditionalExpression( -#line 1696 "VBNET.ATG" +#line 1710 "VBNET.ATG" out Expression expr) { -#line 1698 "VBNET.ATG" +#line 1712 "VBNET.ATG" ConditionalExpression conditionalExpression = new ConditionalExpression(); BinaryOperatorExpression binaryOperatorExpression = new BinaryOperatorExpression(); conditionalExpression.StartLocation = binaryOperatorExpression.StartLocation = la.Location; @@ -4325,24 +4331,24 @@ out Expression expr) { Expression trueExpr = null; Expression falseExpr = null; - Expect(114); + Expect(122); Expect(25); Expr( -#line 1707 "VBNET.ATG" +#line 1721 "VBNET.ATG" out condition); Expect(12); Expr( -#line 1707 "VBNET.ATG" +#line 1721 "VBNET.ATG" out trueExpr); if (la.kind == 12) { lexer.NextToken(); Expr( -#line 1707 "VBNET.ATG" +#line 1721 "VBNET.ATG" out falseExpr); } Expect(26); -#line 1709 "VBNET.ATG" +#line 1723 "VBNET.ATG" if(falseExpr != null) { conditionalExpression.Condition = condition; @@ -4365,348 +4371,348 @@ out falseExpr); } void ArgumentList( -#line 2019 "VBNET.ATG" +#line 2033 "VBNET.ATG" out List arguments) { -#line 2021 "VBNET.ATG" +#line 2035 "VBNET.ATG" arguments = new List(); Expression expr = null; - if (StartOf(28)) { + if (StartOf(29)) { Argument( -#line 2024 "VBNET.ATG" +#line 2038 "VBNET.ATG" out expr); } while (la.kind == 12) { lexer.NextToken(); -#line 2025 "VBNET.ATG" +#line 2039 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; - if (StartOf(28)) { + if (StartOf(29)) { Argument( -#line 2026 "VBNET.ATG" +#line 2040 "VBNET.ATG" out expr); } -#line 2027 "VBNET.ATG" +#line 2041 "VBNET.ATG" if (expr == null) expr = Expression.Null; } -#line 2029 "VBNET.ATG" +#line 2043 "VBNET.ATG" if (expr != null) arguments.Add(expr); } void ConjunctionExpr( -#line 1783 "VBNET.ATG" +#line 1797 "VBNET.ATG" out Expression outExpr) { -#line 1785 "VBNET.ATG" +#line 1799 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; NotExpr( -#line 1788 "VBNET.ATG" +#line 1802 "VBNET.ATG" out outExpr); - while (la.kind == 46 || la.kind == 47) { - if (la.kind == 46) { + while (la.kind == 47 || la.kind == 48) { + if (la.kind == 47) { lexer.NextToken(); -#line 1791 "VBNET.ATG" +#line 1805 "VBNET.ATG" op = BinaryOperatorType.BitwiseAnd; } else { lexer.NextToken(); -#line 1792 "VBNET.ATG" +#line 1806 "VBNET.ATG" op = BinaryOperatorType.LogicalAnd; } NotExpr( -#line 1794 "VBNET.ATG" +#line 1808 "VBNET.ATG" out expr); -#line 1794 "VBNET.ATG" +#line 1808 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void NotExpr( -#line 1798 "VBNET.ATG" +#line 1812 "VBNET.ATG" out Expression outExpr) { -#line 1799 "VBNET.ATG" +#line 1813 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; - while (la.kind == 140) { + while (la.kind == 150) { lexer.NextToken(); -#line 1800 "VBNET.ATG" +#line 1814 "VBNET.ATG" uop = UnaryOperatorType.Not; } ComparisonExpr( -#line 1801 "VBNET.ATG" +#line 1815 "VBNET.ATG" out outExpr); -#line 1802 "VBNET.ATG" +#line 1816 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void ComparisonExpr( -#line 1807 "VBNET.ATG" +#line 1821 "VBNET.ATG" out Expression outExpr) { -#line 1809 "VBNET.ATG" +#line 1823 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1812 "VBNET.ATG" +#line 1826 "VBNET.ATG" out outExpr); - while (StartOf(31)) { + while (StartOf(32)) { switch (la.kind) { case 28: { lexer.NextToken(); -#line 1815 "VBNET.ATG" +#line 1829 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 27: { lexer.NextToken(); -#line 1816 "VBNET.ATG" +#line 1830 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 31: { lexer.NextToken(); -#line 1817 "VBNET.ATG" +#line 1831 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 30: { lexer.NextToken(); -#line 1818 "VBNET.ATG" +#line 1832 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 29: { lexer.NextToken(); -#line 1819 "VBNET.ATG" +#line 1833 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } case 10: { lexer.NextToken(); -#line 1820 "VBNET.ATG" +#line 1834 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } - case 126: { + case 136: { lexer.NextToken(); -#line 1821 "VBNET.ATG" +#line 1835 "VBNET.ATG" op = BinaryOperatorType.Like; break; } - case 122: { + case 131: { lexer.NextToken(); -#line 1822 "VBNET.ATG" +#line 1836 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; break; } - case 123: { + case 132: { lexer.NextToken(); -#line 1823 "VBNET.ATG" +#line 1837 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; break; } } - if (StartOf(32)) { + if (StartOf(33)) { ShiftExpr( -#line 1826 "VBNET.ATG" +#line 1840 "VBNET.ATG" out expr); -#line 1826 "VBNET.ATG" +#line 1840 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); - } else if (la.kind == 140) { + } else if (la.kind == 150) { lexer.NextToken(); ShiftExpr( -#line 1829 "VBNET.ATG" +#line 1843 "VBNET.ATG" out expr); -#line 1829 "VBNET.ATG" +#line 1843 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new UnaryOperatorExpression(expr, UnaryOperatorType.Not)); - } else SynErr(249); + } else SynErr(263); } } void ShiftExpr( -#line 1834 "VBNET.ATG" +#line 1848 "VBNET.ATG" out Expression outExpr) { -#line 1836 "VBNET.ATG" +#line 1850 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConcatenationExpr( -#line 1839 "VBNET.ATG" +#line 1853 "VBNET.ATG" out outExpr); while (la.kind == 32 || la.kind == 33) { if (la.kind == 32) { lexer.NextToken(); -#line 1842 "VBNET.ATG" +#line 1856 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1843 "VBNET.ATG" +#line 1857 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } ConcatenationExpr( -#line 1845 "VBNET.ATG" +#line 1859 "VBNET.ATG" out expr); -#line 1845 "VBNET.ATG" +#line 1859 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ConcatenationExpr( -#line 1849 "VBNET.ATG" +#line 1863 "VBNET.ATG" out Expression outExpr) { -#line 1850 "VBNET.ATG" +#line 1864 "VBNET.ATG" Expression expr; AdditiveExpr( -#line 1852 "VBNET.ATG" +#line 1866 "VBNET.ATG" out outExpr); while (la.kind == 13) { lexer.NextToken(); AdditiveExpr( -#line 1852 "VBNET.ATG" +#line 1866 "VBNET.ATG" out expr); -#line 1852 "VBNET.ATG" +#line 1866 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Concat, expr); } } void AdditiveExpr( -#line 1855 "VBNET.ATG" +#line 1869 "VBNET.ATG" out Expression outExpr) { -#line 1857 "VBNET.ATG" +#line 1871 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ModuloExpr( -#line 1860 "VBNET.ATG" +#line 1874 "VBNET.ATG" out outExpr); while (la.kind == 18 || la.kind == 19) { if (la.kind == 19) { lexer.NextToken(); -#line 1863 "VBNET.ATG" +#line 1877 "VBNET.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 1864 "VBNET.ATG" +#line 1878 "VBNET.ATG" op = BinaryOperatorType.Subtract; } ModuloExpr( -#line 1866 "VBNET.ATG" +#line 1880 "VBNET.ATG" out expr); -#line 1866 "VBNET.ATG" +#line 1880 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ModuloExpr( -#line 1870 "VBNET.ATG" +#line 1884 "VBNET.ATG" out Expression outExpr) { -#line 1871 "VBNET.ATG" +#line 1885 "VBNET.ATG" Expression expr; IntegerDivisionExpr( -#line 1873 "VBNET.ATG" +#line 1887 "VBNET.ATG" out outExpr); - while (la.kind == 130) { + while (la.kind == 140) { lexer.NextToken(); IntegerDivisionExpr( -#line 1873 "VBNET.ATG" +#line 1887 "VBNET.ATG" out expr); -#line 1873 "VBNET.ATG" +#line 1887 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr); } } void IntegerDivisionExpr( -#line 1876 "VBNET.ATG" +#line 1890 "VBNET.ATG" out Expression outExpr) { -#line 1877 "VBNET.ATG" +#line 1891 "VBNET.ATG" Expression expr; MultiplicativeExpr( -#line 1879 "VBNET.ATG" +#line 1893 "VBNET.ATG" out outExpr); while (la.kind == 15) { lexer.NextToken(); MultiplicativeExpr( -#line 1879 "VBNET.ATG" +#line 1893 "VBNET.ATG" out expr); -#line 1879 "VBNET.ATG" +#line 1893 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.DivideInteger, expr); } } void MultiplicativeExpr( -#line 1882 "VBNET.ATG" +#line 1896 "VBNET.ATG" out Expression outExpr) { -#line 1884 "VBNET.ATG" +#line 1898 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 1887 "VBNET.ATG" +#line 1901 "VBNET.ATG" out outExpr); while (la.kind == 14 || la.kind == 22) { if (la.kind == 22) { lexer.NextToken(); -#line 1890 "VBNET.ATG" +#line 1904 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else { lexer.NextToken(); -#line 1891 "VBNET.ATG" +#line 1905 "VBNET.ATG" op = BinaryOperatorType.Divide; } UnaryExpr( -#line 1893 "VBNET.ATG" +#line 1907 "VBNET.ATG" out expr); -#line 1893 "VBNET.ATG" +#line 1907 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void UnaryExpr( -#line 1897 "VBNET.ATG" +#line 1911 "VBNET.ATG" out Expression uExpr) { -#line 1899 "VBNET.ATG" +#line 1913 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -4715,25 +4721,25 @@ out Expression uExpr) { if (la.kind == 19) { lexer.NextToken(); -#line 1903 "VBNET.ATG" +#line 1917 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 18) { lexer.NextToken(); -#line 1904 "VBNET.ATG" +#line 1918 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 1905 "VBNET.ATG" +#line 1919 "VBNET.ATG" uop = UnaryOperatorType.Dereference; isUOp = true; } } ExponentiationExpr( -#line 1907 "VBNET.ATG" +#line 1921 "VBNET.ATG" out expr); -#line 1909 "VBNET.ATG" +#line 1923 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -4743,107 +4749,107 @@ out expr); } void ExponentiationExpr( -#line 1917 "VBNET.ATG" +#line 1931 "VBNET.ATG" out Expression outExpr) { -#line 1918 "VBNET.ATG" +#line 1932 "VBNET.ATG" Expression expr; SimpleExpr( -#line 1920 "VBNET.ATG" +#line 1934 "VBNET.ATG" out outExpr); while (la.kind == 20) { lexer.NextToken(); SimpleExpr( -#line 1920 "VBNET.ATG" +#line 1934 "VBNET.ATG" out expr); -#line 1920 "VBNET.ATG" +#line 1934 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Power, expr); } } void NormalOrReDimArgumentList( -#line 2033 "VBNET.ATG" +#line 2047 "VBNET.ATG" out List arguments, out bool canBeNormal, out bool canBeRedim) { -#line 2035 "VBNET.ATG" +#line 2049 "VBNET.ATG" arguments = new List(); canBeNormal = true; canBeRedim = !IsNamedAssign(); Expression expr = null; - if (StartOf(28)) { + if (StartOf(29)) { Argument( -#line 2040 "VBNET.ATG" +#line 2054 "VBNET.ATG" out expr); - if (la.kind == 188) { + if (la.kind == 201) { lexer.NextToken(); -#line 2041 "VBNET.ATG" +#line 2055 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2042 "VBNET.ATG" +#line 2056 "VBNET.ATG" out expr); } } while (la.kind == 12) { lexer.NextToken(); -#line 2045 "VBNET.ATG" +#line 2059 "VBNET.ATG" if (expr == null) canBeRedim = false; -#line 2046 "VBNET.ATG" +#line 2060 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; -#line 2047 "VBNET.ATG" +#line 2061 "VBNET.ATG" canBeRedim &= !IsNamedAssign(); - if (StartOf(28)) { + if (StartOf(29)) { Argument( -#line 2048 "VBNET.ATG" +#line 2062 "VBNET.ATG" out expr); - if (la.kind == 188) { + if (la.kind == 201) { lexer.NextToken(); -#line 2049 "VBNET.ATG" +#line 2063 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2050 "VBNET.ATG" +#line 2064 "VBNET.ATG" out expr); } } -#line 2052 "VBNET.ATG" +#line 2066 "VBNET.ATG" if (expr == null) { canBeRedim = false; expr = Expression.Null; } } -#line 2054 "VBNET.ATG" +#line 2068 "VBNET.ATG" if (expr != null) arguments.Add(expr); else canBeRedim = false; } void ArrayTypeModifiers( -#line 2161 "VBNET.ATG" +#line 2175 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2163 "VBNET.ATG" +#line 2177 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2166 "VBNET.ATG" +#line 2180 "VBNET.ATG" IsDims()) { Expect(25); if (la.kind == 12 || la.kind == 26) { RankList( -#line 2168 "VBNET.ATG" +#line 2182 "VBNET.ATG" out i); } -#line 2170 "VBNET.ATG" +#line 2184 "VBNET.ATG" arrayModifiers.Add(i); Expect(26); } -#line 2175 "VBNET.ATG" +#line 2189 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -4851,10 +4857,10 @@ out i); } void MemberInitializer( -#line 2003 "VBNET.ATG" +#line 2017 "VBNET.ATG" out NamedArgumentExpression memberInitializer) { -#line 2005 "VBNET.ATG" +#line 2019 "VBNET.ATG" memberInitializer = new NamedArgumentExpression(); memberInitializer.StartLocation = la.Location; Expression initExpr = null; @@ -4862,14 +4868,14 @@ out NamedArgumentExpression memberInitializer) { Expect(16); IdentifierOrKeyword( -#line 2010 "VBNET.ATG" +#line 2024 "VBNET.ATG" out name); Expect(10); Expr( -#line 2010 "VBNET.ATG" +#line 2024 "VBNET.ATG" out initExpr); -#line 2012 "VBNET.ATG" +#line 2026 "VBNET.ATG" memberInitializer.Name = name; memberInitializer.Expression = initExpr; memberInitializer.EndLocation = t.EndLocation; @@ -4877,112 +4883,112 @@ out initExpr); } void Argument( -#line 2058 "VBNET.ATG" +#line 2072 "VBNET.ATG" out Expression argumentexpr) { -#line 2060 "VBNET.ATG" +#line 2074 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 2064 "VBNET.ATG" +#line 2078 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 2064 "VBNET.ATG" +#line 2078 "VBNET.ATG" name = t.val; Expect(11); Expect(10); Expr( -#line 2064 "VBNET.ATG" +#line 2078 "VBNET.ATG" out expr); -#line 2066 "VBNET.ATG" +#line 2080 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); - } else if (StartOf(28)) { + } else if (StartOf(29)) { Expr( -#line 2069 "VBNET.ATG" +#line 2083 "VBNET.ATG" out argumentexpr); - } else SynErr(250); + } else SynErr(264); } void QualIdentAndTypeArguments( -#line 2135 "VBNET.ATG" +#line 2149 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2136 "VBNET.ATG" +#line 2150 "VBNET.ATG" string name; typeref = null; Qualident( -#line 2138 "VBNET.ATG" +#line 2152 "VBNET.ATG" out name); -#line 2139 "VBNET.ATG" +#line 2153 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 2140 "VBNET.ATG" +#line 2154 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); - Expect(145); + Expect(155); if ( -#line 2142 "VBNET.ATG" +#line 2156 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2143 "VBNET.ATG" +#line 2157 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 12) { lexer.NextToken(); -#line 2144 "VBNET.ATG" +#line 2158 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } - } else if (StartOf(6)) { + } else if (StartOf(7)) { TypeArgumentList( -#line 2145 "VBNET.ATG" +#line 2159 "VBNET.ATG" typeref.GenericTypes); - } else SynErr(251); + } else SynErr(265); Expect(26); } } void RankList( -#line 2182 "VBNET.ATG" +#line 2196 "VBNET.ATG" out int i) { -#line 2183 "VBNET.ATG" +#line 2197 "VBNET.ATG" i = 0; while (la.kind == 12) { lexer.NextToken(); -#line 2184 "VBNET.ATG" +#line 2198 "VBNET.ATG" ++i; } } void Attribute( -#line 2223 "VBNET.ATG" +#line 2237 "VBNET.ATG" out ASTAttribute attribute) { -#line 2224 "VBNET.ATG" +#line 2238 "VBNET.ATG" string name; List positional = new List(); List named = new List(); - if (la.kind == 110) { + if (la.kind == 117) { lexer.NextToken(); Expect(16); } Qualident( -#line 2229 "VBNET.ATG" +#line 2243 "VBNET.ATG" out name); if (la.kind == 25) { AttributeArguments( -#line 2230 "VBNET.ATG" +#line 2244 "VBNET.ATG" positional, named); } -#line 2232 "VBNET.ATG" +#line 2246 "VBNET.ATG" attribute = new ASTAttribute(name, positional, named); SetParent(positional, attribute); SetParent(named, attribute); @@ -4990,26 +4996,26 @@ positional, named); } void AttributeArguments( -#line 2239 "VBNET.ATG" +#line 2253 "VBNET.ATG" List positional, List named) { -#line 2241 "VBNET.ATG" +#line 2255 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(25); if ( -#line 2247 "VBNET.ATG" +#line 2261 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2249 "VBNET.ATG" +#line 2263 "VBNET.ATG" IsNamedAssign()) { -#line 2249 "VBNET.ATG" +#line 2263 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2250 "VBNET.ATG" +#line 2264 "VBNET.ATG" out name); if (la.kind == 11) { lexer.NextToken(); @@ -5017,10 +5023,10 @@ out name); Expect(10); } Expr( -#line 2252 "VBNET.ATG" +#line 2266 "VBNET.ATG" out expr); -#line 2254 "VBNET.ATG" +#line 2268 "VBNET.ATG" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } @@ -5029,28 +5035,28 @@ out expr); while (la.kind == 12) { lexer.NextToken(); if ( -#line 2262 "VBNET.ATG" +#line 2276 "VBNET.ATG" IsNamedAssign()) { -#line 2262 "VBNET.ATG" +#line 2276 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2263 "VBNET.ATG" +#line 2277 "VBNET.ATG" out name); if (la.kind == 11) { lexer.NextToken(); } Expect(10); - } else if (StartOf(28)) { + } else if (StartOf(29)) { -#line 2265 "VBNET.ATG" +#line 2279 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); - } else SynErr(252); + } else SynErr(266); Expr( -#line 2266 "VBNET.ATG" +#line 2280 "VBNET.ATG" out expr); -#line 2266 "VBNET.ATG" +#line 2280 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -5061,10 +5067,10 @@ out expr); } void FormalParameter( -#line 2323 "VBNET.ATG" +#line 2337 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2325 "VBNET.ATG" +#line 2339 "VBNET.ATG" AttributeSection section; List attributes = new List(); TypeReference type = null; @@ -5075,36 +5081,36 @@ out ParameterDeclarationExpression p) { while (la.kind == 28) { AttributeSection( -#line 2334 "VBNET.ATG" +#line 2348 "VBNET.ATG" out section); -#line 2334 "VBNET.ATG" +#line 2348 "VBNET.ATG" attributes.Add(section); } - while (StartOf(33)) { + while (StartOf(34)) { ParameterModifier( -#line 2335 "VBNET.ATG" +#line 2349 "VBNET.ATG" mod); } Identifier(); -#line 2336 "VBNET.ATG" +#line 2350 "VBNET.ATG" string parameterName = t.val; if ( -#line 2337 "VBNET.ATG" +#line 2351 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2337 "VBNET.ATG" +#line 2351 "VBNET.ATG" out arrayModifiers); } - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 2338 "VBNET.ATG" +#line 2352 "VBNET.ATG" out type); } -#line 2340 "VBNET.ATG" +#line 2354 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -5120,11 +5126,11 @@ out type); if (la.kind == 10) { lexer.NextToken(); Expr( -#line 2352 "VBNET.ATG" +#line 2366 "VBNET.ATG" out expr); } -#line 2354 "VBNET.ATG" +#line 2368 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); p.Attributes = attributes; @@ -5132,34 +5138,34 @@ out expr); } void ParameterModifier( -#line 3027 "VBNET.ATG" +#line 3044 "VBNET.ATG" ParamModifierList m) { - if (la.kind == 56) { + if (la.kind == 59) { lexer.NextToken(); -#line 3028 "VBNET.ATG" +#line 3045 "VBNET.ATG" m.Add(ParameterModifiers.In); - } else if (la.kind == 54) { + } else if (la.kind == 56) { lexer.NextToken(); -#line 3029 "VBNET.ATG" +#line 3046 "VBNET.ATG" m.Add(ParameterModifiers.Ref); - } else if (la.kind == 150) { + } else if (la.kind == 160) { lexer.NextToken(); -#line 3030 "VBNET.ATG" +#line 3047 "VBNET.ATG" m.Add(ParameterModifiers.Optional); - } else if (la.kind == 156) { + } else if (la.kind == 167) { lexer.NextToken(); -#line 3031 "VBNET.ATG" +#line 3048 "VBNET.ATG" m.Add(ParameterModifiers.Params); - } else SynErr(253); + } else SynErr(267); } void Statement() { -#line 2383 "VBNET.ATG" +#line 2397 "VBNET.ATG" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -5167,34 +5173,34 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 11) { } else if ( -#line 2389 "VBNET.ATG" +#line 2403 "VBNET.ATG" IsLabel()) { LabelName( -#line 2389 "VBNET.ATG" +#line 2403 "VBNET.ATG" out label); -#line 2391 "VBNET.ATG" +#line 2405 "VBNET.ATG" compilationUnit.AddChild(new LabelStatement(t.val)); Expect(11); Statement(); - } else if (StartOf(34)) { + } else if (StartOf(35)) { EmbeddedStatement( -#line 2394 "VBNET.ATG" +#line 2408 "VBNET.ATG" out stmt); -#line 2394 "VBNET.ATG" +#line 2408 "VBNET.ATG" compilationUnit.AddChild(stmt); - } else if (StartOf(35)) { + } else if (StartOf(36)) { LocalDeclarationStatement( -#line 2395 "VBNET.ATG" +#line 2409 "VBNET.ATG" out stmt); -#line 2395 "VBNET.ATG" +#line 2409 "VBNET.ATG" compilationUnit.AddChild(stmt); - } else SynErr(254); + } else SynErr(268); -#line 2398 "VBNET.ATG" +#line 2412 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -5203,258 +5209,258 @@ out stmt); } void LabelName( -#line 2805 "VBNET.ATG" +#line 2819 "VBNET.ATG" out string name) { -#line 2807 "VBNET.ATG" +#line 2821 "VBNET.ATG" name = String.Empty; - if (StartOf(13)) { + if (StartOf(14)) { Identifier(); -#line 2809 "VBNET.ATG" +#line 2823 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 2810 "VBNET.ATG" +#line 2824 "VBNET.ATG" name = t.val; - } else SynErr(255); + } else SynErr(269); } void EmbeddedStatement( -#line 2438 "VBNET.ATG" +#line 2452 "VBNET.ATG" out Statement statement) { -#line 2440 "VBNET.ATG" +#line 2454 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; string name = String.Empty; List p = null; - if (la.kind == 101) { + if (la.kind == 107) { lexer.NextToken(); -#line 2446 "VBNET.ATG" +#line 2460 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { - case 183: { + case 195: { lexer.NextToken(); -#line 2448 "VBNET.ATG" +#line 2462 "VBNET.ATG" exitType = ExitType.Sub; break; } - case 107: { + case 114: { lexer.NextToken(); -#line 2450 "VBNET.ATG" +#line 2464 "VBNET.ATG" exitType = ExitType.Function; break; } - case 160: { + case 171: { lexer.NextToken(); -#line 2452 "VBNET.ATG" +#line 2466 "VBNET.ATG" exitType = ExitType.Property; break; } - case 90: { + case 95: { lexer.NextToken(); -#line 2454 "VBNET.ATG" +#line 2468 "VBNET.ATG" exitType = ExitType.Do; break; } - case 105: { + case 111: { lexer.NextToken(); -#line 2456 "VBNET.ATG" +#line 2470 "VBNET.ATG" exitType = ExitType.For; break; } - case 190: { + case 203: { lexer.NextToken(); -#line 2458 "VBNET.ATG" +#line 2472 "VBNET.ATG" exitType = ExitType.Try; break; } - case 202: { + case 216: { lexer.NextToken(); -#line 2460 "VBNET.ATG" +#line 2474 "VBNET.ATG" exitType = ExitType.While; break; } - case 171: { + case 182: { lexer.NextToken(); -#line 2462 "VBNET.ATG" +#line 2476 "VBNET.ATG" exitType = ExitType.Select; break; } - default: SynErr(256); break; + default: SynErr(270); break; } -#line 2464 "VBNET.ATG" +#line 2478 "VBNET.ATG" statement = new ExitStatement(exitType); - } else if (la.kind == 190) { + } else if (la.kind == 203) { TryStatement( -#line 2465 "VBNET.ATG" +#line 2479 "VBNET.ATG" out statement); - } else if (la.kind == 73) { + } else if (la.kind == 76) { lexer.NextToken(); -#line 2466 "VBNET.ATG" +#line 2480 "VBNET.ATG" ContinueType continueType = ContinueType.None; - if (la.kind == 90 || la.kind == 105 || la.kind == 202) { - if (la.kind == 90) { + if (la.kind == 95 || la.kind == 111 || la.kind == 216) { + if (la.kind == 95) { lexer.NextToken(); -#line 2466 "VBNET.ATG" +#line 2480 "VBNET.ATG" continueType = ContinueType.Do; - } else if (la.kind == 105) { + } else if (la.kind == 111) { lexer.NextToken(); -#line 2466 "VBNET.ATG" +#line 2480 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2466 "VBNET.ATG" +#line 2480 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2466 "VBNET.ATG" +#line 2480 "VBNET.ATG" statement = new ContinueStatement(continueType); - } else if (la.kind == 187) { + } else if (la.kind == 200) { lexer.NextToken(); - if (StartOf(28)) { + if (StartOf(29)) { Expr( -#line 2468 "VBNET.ATG" +#line 2482 "VBNET.ATG" out expr); } -#line 2468 "VBNET.ATG" +#line 2482 "VBNET.ATG" statement = new ThrowStatement(expr); - } else if (la.kind == 169) { + } else if (la.kind == 180) { lexer.NextToken(); - if (StartOf(28)) { + if (StartOf(29)) { Expr( -#line 2470 "VBNET.ATG" +#line 2484 "VBNET.ATG" out expr); } -#line 2470 "VBNET.ATG" +#line 2484 "VBNET.ATG" statement = new ReturnStatement(expr); - } else if (la.kind == 184) { + } else if (la.kind == 196) { lexer.NextToken(); Expr( -#line 2472 "VBNET.ATG" +#line 2486 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2472 "VBNET.ATG" +#line 2486 "VBNET.ATG" out embeddedStatement); - Expect(95); - Expect(184); + Expect(100); + Expect(196); -#line 2473 "VBNET.ATG" +#line 2487 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); - } else if (la.kind == 163) { + } else if (la.kind == 174) { lexer.NextToken(); Identifier(); -#line 2475 "VBNET.ATG" +#line 2489 "VBNET.ATG" name = t.val; if (la.kind == 25) { lexer.NextToken(); - if (StartOf(36)) { + if (StartOf(37)) { ArgumentList( -#line 2476 "VBNET.ATG" +#line 2490 "VBNET.ATG" out p); } Expect(26); } -#line 2478 "VBNET.ATG" +#line 2492 "VBNET.ATG" statement = new RaiseEventStatement(name, p); SetParent(p, statement); - } else if (la.kind == 204) { + } else if (la.kind == 218) { WithStatement( -#line 2482 "VBNET.ATG" +#line 2496 "VBNET.ATG" out statement); } else if (la.kind == 43) { lexer.NextToken(); -#line 2484 "VBNET.ATG" +#line 2498 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2485 "VBNET.ATG" +#line 2499 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2485 "VBNET.ATG" +#line 2499 "VBNET.ATG" out handlerExpr); -#line 2487 "VBNET.ATG" +#line 2501 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); - } else if (la.kind == 167) { + } else if (la.kind == 178) { lexer.NextToken(); -#line 2490 "VBNET.ATG" +#line 2504 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2491 "VBNET.ATG" +#line 2505 "VBNET.ATG" out expr); Expect(12); Expr( -#line 2491 "VBNET.ATG" +#line 2505 "VBNET.ATG" out handlerExpr); -#line 2493 "VBNET.ATG" +#line 2507 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); - } else if (la.kind == 202) { + } else if (la.kind == 216) { lexer.NextToken(); Expr( -#line 2496 "VBNET.ATG" +#line 2510 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2497 "VBNET.ATG" +#line 2511 "VBNET.ATG" out embeddedStatement); - Expect(95); - Expect(202); + Expect(100); + Expect(216); -#line 2499 "VBNET.ATG" +#line 2513 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); - } else if (la.kind == 90) { + } else if (la.kind == 95) { lexer.NextToken(); -#line 2504 "VBNET.ATG" +#line 2518 "VBNET.ATG" ConditionType conditionType = ConditionType.None; - if (la.kind == 196 || la.kind == 202) { + if (la.kind == 209 || la.kind == 216) { WhileOrUntil( -#line 2507 "VBNET.ATG" +#line 2521 "VBNET.ATG" out conditionType); Expr( -#line 2507 "VBNET.ATG" +#line 2521 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2508 "VBNET.ATG" +#line 2522 "VBNET.ATG" out embeddedStatement); - Expect(128); + Expect(138); -#line 2511 "VBNET.ATG" +#line 2525 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5463,52 +5469,52 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 11) { EndOfStmt(); Block( -#line 2518 "VBNET.ATG" +#line 2532 "VBNET.ATG" out embeddedStatement); - Expect(128); - if (la.kind == 196 || la.kind == 202) { + Expect(138); + if (la.kind == 209 || la.kind == 216) { WhileOrUntil( -#line 2519 "VBNET.ATG" +#line 2533 "VBNET.ATG" out conditionType); Expr( -#line 2519 "VBNET.ATG" +#line 2533 "VBNET.ATG" out expr); } -#line 2521 "VBNET.ATG" +#line 2535 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); - } else SynErr(257); - } else if (la.kind == 105) { + } else SynErr(271); + } else if (la.kind == 111) { lexer.NextToken(); -#line 2526 "VBNET.ATG" +#line 2540 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; Location startLocation = t.Location; - if (la.kind == 92) { + if (la.kind == 97) { lexer.NextToken(); LoopControlVariable( -#line 2533 "VBNET.ATG" +#line 2547 "VBNET.ATG" out typeReference, out typeName); - Expect(117); + Expect(125); Expr( -#line 2534 "VBNET.ATG" +#line 2548 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 2535 "VBNET.ATG" +#line 2549 "VBNET.ATG" out embeddedStatement); - Expect(139); - if (StartOf(28)) { + Expect(149); + if (StartOf(29)) { Expr( -#line 2536 "VBNET.ATG" +#line 2550 "VBNET.ATG" out expr); } -#line 2538 "VBNET.ATG" +#line 2552 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5518,85 +5524,85 @@ out expr); statement.EndLocation = t.EndLocation; - } else if (StartOf(13)) { + } else if (StartOf(14)) { -#line 2549 "VBNET.ATG" +#line 2563 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; Expression nextExpr = null;List nextExpressions = null; LoopControlVariable( -#line 2554 "VBNET.ATG" +#line 2568 "VBNET.ATG" out typeReference, out typeName); Expect(10); Expr( -#line 2555 "VBNET.ATG" +#line 2569 "VBNET.ATG" out start); - Expect(188); + Expect(201); Expr( -#line 2555 "VBNET.ATG" +#line 2569 "VBNET.ATG" out end); - if (la.kind == 178) { + if (la.kind == 190) { lexer.NextToken(); Expr( -#line 2555 "VBNET.ATG" +#line 2569 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 2556 "VBNET.ATG" +#line 2570 "VBNET.ATG" out embeddedStatement); - Expect(139); - if (StartOf(28)) { + Expect(149); + if (StartOf(29)) { Expr( -#line 2559 "VBNET.ATG" +#line 2573 "VBNET.ATG" out nextExpr); -#line 2561 "VBNET.ATG" +#line 2575 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2564 "VBNET.ATG" +#line 2578 "VBNET.ATG" out nextExpr); -#line 2564 "VBNET.ATG" +#line 2578 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 2567 "VBNET.ATG" +#line 2581 "VBNET.ATG" statement = new ForNextStatement(typeReference, typeName, start, end, step, embeddedStatement, nextExpressions); SetParent(nextExpressions, statement); - } else SynErr(258); - } else if (la.kind == 99) { + } else SynErr(272); + } else if (la.kind == 105) { lexer.NextToken(); Expr( -#line 2572 "VBNET.ATG" +#line 2586 "VBNET.ATG" out expr); -#line 2572 "VBNET.ATG" +#line 2586 "VBNET.ATG" statement = new ErrorStatement(expr); - } else if (la.kind == 165) { + } else if (la.kind == 176) { lexer.NextToken(); -#line 2574 "VBNET.ATG" +#line 2588 "VBNET.ATG" bool isPreserve = false; - if (la.kind == 158) { + if (la.kind == 169) { lexer.NextToken(); -#line 2574 "VBNET.ATG" +#line 2588 "VBNET.ATG" isPreserve = true; } ReDimClause( -#line 2575 "VBNET.ATG" +#line 2589 "VBNET.ATG" out expr); -#line 2577 "VBNET.ATG" +#line 2591 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); @@ -5604,95 +5610,95 @@ out expr); while (la.kind == 12) { lexer.NextToken(); ReDimClause( -#line 2581 "VBNET.ATG" +#line 2595 "VBNET.ATG" out expr); -#line 2582 "VBNET.ATG" +#line 2596 "VBNET.ATG" SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); } - } else if (la.kind == 98) { + } else if (la.kind == 104) { lexer.NextToken(); Expr( -#line 2586 "VBNET.ATG" +#line 2600 "VBNET.ATG" out expr); -#line 2588 "VBNET.ATG" +#line 2602 "VBNET.ATG" EraseStatement eraseStatement = new EraseStatement(); if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr);} while (la.kind == 12) { lexer.NextToken(); Expr( -#line 2591 "VBNET.ATG" +#line 2605 "VBNET.ATG" out expr); -#line 2591 "VBNET.ATG" +#line 2605 "VBNET.ATG" if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr); } } -#line 2592 "VBNET.ATG" +#line 2606 "VBNET.ATG" statement = eraseStatement; - } else if (la.kind == 179) { + } else if (la.kind == 191) { lexer.NextToken(); -#line 2594 "VBNET.ATG" +#line 2608 "VBNET.ATG" statement = new StopStatement(); } else if ( -#line 2596 "VBNET.ATG" +#line 2610 "VBNET.ATG" la.kind == Tokens.If) { - Expect(114); + Expect(122); -#line 2597 "VBNET.ATG" +#line 2611 "VBNET.ATG" Location ifStartLocation = t.Location; Expr( -#line 2597 "VBNET.ATG" +#line 2611 "VBNET.ATG" out expr); - if (la.kind == 186) { + if (la.kind == 199) { lexer.NextToken(); } if (la.kind == 1 || la.kind == 11) { EndOfStmt(); Block( -#line 2600 "VBNET.ATG" +#line 2614 "VBNET.ATG" out embeddedStatement); -#line 2602 "VBNET.ATG" +#line 2616 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; Location elseIfStart; - while (la.kind == 94 || -#line 2608 "VBNET.ATG" + while (la.kind == 99 || +#line 2622 "VBNET.ATG" IsElseIf()) { if ( -#line 2608 "VBNET.ATG" +#line 2622 "VBNET.ATG" IsElseIf()) { - Expect(93); + Expect(98); -#line 2608 "VBNET.ATG" +#line 2622 "VBNET.ATG" elseIfStart = t.Location; - Expect(114); + Expect(122); } else { lexer.NextToken(); -#line 2609 "VBNET.ATG" +#line 2623 "VBNET.ATG" elseIfStart = t.Location; } -#line 2611 "VBNET.ATG" +#line 2625 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 2612 "VBNET.ATG" +#line 2626 "VBNET.ATG" out condition); - if (la.kind == 186) { + if (la.kind == 199) { lexer.NextToken(); } EndOfStmt(); Block( -#line 2613 "VBNET.ATG" +#line 2627 "VBNET.ATG" out block); -#line 2615 "VBNET.ATG" +#line 2629 "VBNET.ATG" ElseIfSection elseIfSection = new ElseIfSection(condition, block); elseIfSection.StartLocation = elseIfStart; elseIfSection.EndLocation = t.Location; @@ -5700,133 +5706,133 @@ out block); ifStatement.ElseIfSections.Add(elseIfSection); } - if (la.kind == 93) { + if (la.kind == 98) { lexer.NextToken(); EndOfStmt(); Block( -#line 2624 "VBNET.ATG" +#line 2638 "VBNET.ATG" out embeddedStatement); -#line 2626 "VBNET.ATG" +#line 2640 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } - Expect(95); - Expect(114); + Expect(100); + Expect(122); -#line 2630 "VBNET.ATG" +#line 2644 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; - } else if (StartOf(37)) { + } else if (StartOf(38)) { -#line 2635 "VBNET.ATG" +#line 2649 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr); ifStatement.StartLocation = ifStartLocation; SingleLineStatementList( -#line 2638 "VBNET.ATG" +#line 2652 "VBNET.ATG" ifStatement.TrueStatement); -#line 2640 "VBNET.ATG" +#line 2654 "VBNET.ATG" SetParent(ifStatement.TrueStatement, ifStatement); - if (la.kind == 93) { + if (la.kind == 98) { lexer.NextToken(); - if (StartOf(37)) { + if (StartOf(38)) { SingleLineStatementList( -#line 2644 "VBNET.ATG" +#line 2658 "VBNET.ATG" ifStatement.FalseStatement); } } -#line 2646 "VBNET.ATG" +#line 2660 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; - } else SynErr(259); - } else if (la.kind == 171) { + } else SynErr(273); + } else if (la.kind == 182) { lexer.NextToken(); - if (la.kind == 58) { + if (la.kind == 61) { lexer.NextToken(); } Expr( -#line 2649 "VBNET.ATG" +#line 2663 "VBNET.ATG" out expr); EndOfStmt(); -#line 2650 "VBNET.ATG" +#line 2664 "VBNET.ATG" List selectSections = new List(); Statement block = null; - while (la.kind == 58) { + while (la.kind == 61) { -#line 2654 "VBNET.ATG" +#line 2668 "VBNET.ATG" List caseClauses = null; Location caseLocation = la.Location; lexer.NextToken(); CaseClauses( -#line 2655 "VBNET.ATG" +#line 2669 "VBNET.ATG" out caseClauses); if ( -#line 2655 "VBNET.ATG" +#line 2669 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 2657 "VBNET.ATG" +#line 2671 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); SetParent(caseClauses, selectSection); selectSection.StartLocation = caseLocation; Block( -#line 2661 "VBNET.ATG" +#line 2675 "VBNET.ATG" out block); -#line 2663 "VBNET.ATG" +#line 2677 "VBNET.ATG" selectSection.Children = block.Children; selectSection.EndLocation = t.EndLocation; selectSections.Add(selectSection); } -#line 2669 "VBNET.ATG" +#line 2683 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); SetParent(selectSections, statement); - Expect(95); - Expect(171); - } else if (la.kind == 147) { + Expect(100); + Expect(182); + } else if (la.kind == 157) { -#line 2673 "VBNET.ATG" +#line 2687 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 2674 "VBNET.ATG" +#line 2688 "VBNET.ATG" out onErrorStatement); -#line 2674 "VBNET.ATG" +#line 2688 "VBNET.ATG" statement = onErrorStatement; - } else if (la.kind == 112) { + } else if (la.kind == 119) { -#line 2675 "VBNET.ATG" +#line 2689 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 2676 "VBNET.ATG" +#line 2690 "VBNET.ATG" out goToStatement); -#line 2676 "VBNET.ATG" +#line 2690 "VBNET.ATG" statement = goToStatement; - } else if (la.kind == 168) { + } else if (la.kind == 179) { -#line 2677 "VBNET.ATG" +#line 2691 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 2678 "VBNET.ATG" +#line 2692 "VBNET.ATG" out resumeStatement); -#line 2678 "VBNET.ATG" +#line 2692 "VBNET.ATG" statement = resumeStatement; - } else if (StartOf(38)) { + } else if (StartOf(39)) { -#line 2681 "VBNET.ATG" +#line 2695 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -5834,25 +5840,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 2687 "VBNET.ATG" +#line 2701 "VBNET.ATG" out expr); - if (StartOf(39)) { + if (StartOf(40)) { AssignmentOperator( -#line 2689 "VBNET.ATG" +#line 2703 "VBNET.ATG" out op); Expr( -#line 2689 "VBNET.ATG" +#line 2703 "VBNET.ATG" out val); -#line 2689 "VBNET.ATG" +#line 2703 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); - } else if (la.kind == 1 || la.kind == 11 || la.kind == 93) { + } else if (la.kind == 1 || la.kind == 11 || la.kind == 98) { -#line 2690 "VBNET.ATG" +#line 2704 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); - } else SynErr(260); + } else SynErr(274); -#line 2693 "VBNET.ATG" +#line 2707 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is MemberReferenceExpression || expr is IdentifierExpression) { @@ -5860,87 +5866,87 @@ out val); } statement = new ExpressionStatement(expr); - } else if (la.kind == 57) { + } else if (la.kind == 60) { lexer.NextToken(); SimpleExpr( -#line 2700 "VBNET.ATG" +#line 2714 "VBNET.ATG" out expr); -#line 2700 "VBNET.ATG" +#line 2714 "VBNET.ATG" statement = new ExpressionStatement(expr); - } else if (la.kind == 198) { + } else if (la.kind == 211) { lexer.NextToken(); -#line 2702 "VBNET.ATG" +#line 2716 "VBNET.ATG" Statement block; if ( -#line 2703 "VBNET.ATG" +#line 2717 "VBNET.ATG" Peek(1).kind == Tokens.As) { -#line 2704 "VBNET.ATG" +#line 2718 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 2705 "VBNET.ATG" +#line 2719 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2707 "VBNET.ATG" +#line 2721 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 2709 "VBNET.ATG" +#line 2723 "VBNET.ATG" out block); -#line 2711 "VBNET.ATG" +#line 2725 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); SetParent(resourceAquisition.Variables, resourceAquisition); - } else if (StartOf(28)) { + } else if (StartOf(29)) { Expr( -#line 2714 "VBNET.ATG" +#line 2728 "VBNET.ATG" out expr); Block( -#line 2715 "VBNET.ATG" +#line 2729 "VBNET.ATG" out block); -#line 2716 "VBNET.ATG" +#line 2730 "VBNET.ATG" statement = new UsingStatement(new ExpressionStatement(expr), block); - } else SynErr(261); - Expect(95); - Expect(198); - } else SynErr(262); + } else SynErr(275); + Expect(100); + Expect(211); + } else SynErr(276); } void LocalDeclarationStatement( -#line 2406 "VBNET.ATG" +#line 2420 "VBNET.ATG" out Statement statement) { -#line 2408 "VBNET.ATG" +#line 2422 "VBNET.ATG" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; - while (la.kind == 72 || la.kind == 88 || la.kind == 177) { - if (la.kind == 72) { + while (la.kind == 75 || la.kind == 92 || la.kind == 189) { + if (la.kind == 75) { lexer.NextToken(); -#line 2414 "VBNET.ATG" +#line 2428 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); - } else if (la.kind == 177) { + } else if (la.kind == 189) { lexer.NextToken(); -#line 2415 "VBNET.ATG" +#line 2429 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 2416 "VBNET.ATG" +#line 2430 "VBNET.ATG" dimfound = true; } } -#line 2419 "VBNET.ATG" +#line 2433 "VBNET.ATG" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -5953,136 +5959,136 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2430 "VBNET.ATG" +#line 2444 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 12) { lexer.NextToken(); VariableDeclarator( -#line 2431 "VBNET.ATG" +#line 2445 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2433 "VBNET.ATG" +#line 2447 "VBNET.ATG" SetParent(localVariableDeclaration.Variables, localVariableDeclaration); statement = localVariableDeclaration; } void TryStatement( -#line 2920 "VBNET.ATG" +#line 2934 "VBNET.ATG" out Statement tryStatement) { -#line 2922 "VBNET.ATG" +#line 2936 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; - Expect(190); + Expect(203); EndOfStmt(); Block( -#line 2925 "VBNET.ATG" +#line 2939 "VBNET.ATG" out blockStmt); - if (la.kind == 59 || la.kind == 95 || la.kind == 104) { + if (la.kind == 62 || la.kind == 100 || la.kind == 110) { CatchClauses( -#line 2926 "VBNET.ATG" +#line 2940 "VBNET.ATG" out catchClauses); } - if (la.kind == 104) { + if (la.kind == 110) { lexer.NextToken(); EndOfStmt(); Block( -#line 2927 "VBNET.ATG" +#line 2941 "VBNET.ATG" out finallyStmt); } - Expect(95); - Expect(190); + Expect(100); + Expect(203); -#line 2930 "VBNET.ATG" +#line 2944 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 2900 "VBNET.ATG" +#line 2914 "VBNET.ATG" out Statement withStatement) { -#line 2902 "VBNET.ATG" +#line 2916 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; - Expect(204); + Expect(218); -#line 2905 "VBNET.ATG" +#line 2919 "VBNET.ATG" Location start = t.Location; Expr( -#line 2906 "VBNET.ATG" +#line 2920 "VBNET.ATG" out expr); EndOfStmt(); -#line 2908 "VBNET.ATG" +#line 2922 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 2911 "VBNET.ATG" +#line 2925 "VBNET.ATG" out blockStmt); -#line 2913 "VBNET.ATG" +#line 2927 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; - Expect(95); - Expect(204); + Expect(100); + Expect(218); -#line 2916 "VBNET.ATG" +#line 2930 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 2893 "VBNET.ATG" +#line 2907 "VBNET.ATG" out ConditionType conditionType) { -#line 2894 "VBNET.ATG" +#line 2908 "VBNET.ATG" conditionType = ConditionType.None; - if (la.kind == 202) { + if (la.kind == 216) { lexer.NextToken(); -#line 2895 "VBNET.ATG" +#line 2909 "VBNET.ATG" conditionType = ConditionType.While; - } else if (la.kind == 196) { + } else if (la.kind == 209) { lexer.NextToken(); -#line 2896 "VBNET.ATG" +#line 2910 "VBNET.ATG" conditionType = ConditionType.Until; - } else SynErr(263); + } else SynErr(277); } void LoopControlVariable( -#line 2735 "VBNET.ATG" +#line 2749 "VBNET.ATG" out TypeReference type, out string name) { -#line 2736 "VBNET.ATG" +#line 2750 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 2740 "VBNET.ATG" +#line 2754 "VBNET.ATG" out name); if ( -#line 2741 "VBNET.ATG" +#line 2755 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2741 "VBNET.ATG" +#line 2755 "VBNET.ATG" out arrayModifiers); } - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 2742 "VBNET.ATG" +#line 2756 "VBNET.ATG" out type); -#line 2742 "VBNET.ATG" +#line 2756 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 2744 "VBNET.ATG" +#line 2758 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -6094,111 +6100,111 @@ out type); } void ReDimClause( -#line 2814 "VBNET.ATG" +#line 2828 "VBNET.ATG" out Expression expr) { SimpleNonInvocationExpression( -#line 2816 "VBNET.ATG" +#line 2830 "VBNET.ATG" out expr); ReDimClauseInternal( -#line 2817 "VBNET.ATG" +#line 2831 "VBNET.ATG" ref expr); } void SingleLineStatementList( -#line 2721 "VBNET.ATG" +#line 2735 "VBNET.ATG" List list) { -#line 2722 "VBNET.ATG" +#line 2736 "VBNET.ATG" Statement embeddedStatement = null; - if (la.kind == 95) { + if (la.kind == 100) { lexer.NextToken(); -#line 2724 "VBNET.ATG" +#line 2738 "VBNET.ATG" embeddedStatement = new EndStatement(); - } else if (StartOf(34)) { + } else if (StartOf(35)) { EmbeddedStatement( -#line 2725 "VBNET.ATG" +#line 2739 "VBNET.ATG" out embeddedStatement); - } else SynErr(264); + } else SynErr(278); -#line 2726 "VBNET.ATG" +#line 2740 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); while (la.kind == 11) { lexer.NextToken(); while (la.kind == 11) { lexer.NextToken(); } - if (la.kind == 95) { + if (la.kind == 100) { lexer.NextToken(); -#line 2728 "VBNET.ATG" +#line 2742 "VBNET.ATG" embeddedStatement = new EndStatement(); - } else if (StartOf(34)) { + } else if (StartOf(35)) { EmbeddedStatement( -#line 2729 "VBNET.ATG" +#line 2743 "VBNET.ATG" out embeddedStatement); - } else SynErr(265); + } else SynErr(279); -#line 2730 "VBNET.ATG" +#line 2744 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); } } void CaseClauses( -#line 2853 "VBNET.ATG" +#line 2867 "VBNET.ATG" out List caseClauses) { -#line 2855 "VBNET.ATG" +#line 2869 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 2858 "VBNET.ATG" +#line 2872 "VBNET.ATG" out caseClause); -#line 2858 "VBNET.ATG" +#line 2872 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 12) { lexer.NextToken(); CaseClause( -#line 2859 "VBNET.ATG" +#line 2873 "VBNET.ATG" out caseClause); -#line 2859 "VBNET.ATG" +#line 2873 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 2755 "VBNET.ATG" +#line 2769 "VBNET.ATG" out OnErrorStatement stmt) { -#line 2757 "VBNET.ATG" +#line 2771 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; - Expect(147); - Expect(99); + Expect(157); + Expect(105); if ( -#line 2763 "VBNET.ATG" +#line 2777 "VBNET.ATG" IsNegativeLabelName()) { - Expect(112); + Expect(119); Expect(18); Expect(5); -#line 2765 "VBNET.ATG" +#line 2779 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); } stmt = new OnErrorStatement(new GotoStatement((intLabel * -1).ToString())); - } else if (la.kind == 112) { + } else if (la.kind == 119) { GotoStatement( -#line 2771 "VBNET.ATG" +#line 2785 "VBNET.ATG" out goToStatement); -#line 2773 "VBNET.ATG" +#line 2787 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -6211,92 +6217,92 @@ out goToStatement); } stmt = new OnErrorStatement(goToStatement); - } else if (la.kind == 168) { + } else if (la.kind == 179) { lexer.NextToken(); - Expect(139); + Expect(149); -#line 2787 "VBNET.ATG" +#line 2801 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); - } else SynErr(266); + } else SynErr(280); } void GotoStatement( -#line 2793 "VBNET.ATG" +#line 2807 "VBNET.ATG" out GotoStatement goToStatement) { -#line 2795 "VBNET.ATG" +#line 2809 "VBNET.ATG" string label = String.Empty; - Expect(112); + Expect(119); LabelName( -#line 2798 "VBNET.ATG" +#line 2812 "VBNET.ATG" out label); -#line 2800 "VBNET.ATG" +#line 2814 "VBNET.ATG" goToStatement = new GotoStatement(label); } void ResumeStatement( -#line 2842 "VBNET.ATG" +#line 2856 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 2844 "VBNET.ATG" +#line 2858 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 2847 "VBNET.ATG" +#line 2861 "VBNET.ATG" IsResumeNext()) { - Expect(168); - Expect(139); + Expect(179); + Expect(149); -#line 2848 "VBNET.ATG" +#line 2862 "VBNET.ATG" resumeStatement = new ResumeStatement(true); - } else if (la.kind == 168) { + } else if (la.kind == 179) { lexer.NextToken(); - if (StartOf(40)) { + if (StartOf(41)) { LabelName( -#line 2849 "VBNET.ATG" +#line 2863 "VBNET.ATG" out label); } -#line 2849 "VBNET.ATG" +#line 2863 "VBNET.ATG" resumeStatement = new ResumeStatement(label); - } else SynErr(267); + } else SynErr(281); } void ReDimClauseInternal( -#line 2820 "VBNET.ATG" +#line 2834 "VBNET.ATG" ref Expression expr) { -#line 2821 "VBNET.ATG" +#line 2835 "VBNET.ATG" List arguments; bool canBeNormal; bool canBeRedim; string name; while (la.kind == 16 || -#line 2824 "VBNET.ATG" +#line 2838 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { if (la.kind == 16) { lexer.NextToken(); IdentifierOrKeyword( -#line 2823 "VBNET.ATG" +#line 2837 "VBNET.ATG" out name); -#line 2823 "VBNET.ATG" +#line 2837 "VBNET.ATG" expr = new MemberReferenceExpression(expr, name); } else { InvocationExpression( -#line 2825 "VBNET.ATG" +#line 2839 "VBNET.ATG" ref expr); } } Expect(25); NormalOrReDimArgumentList( -#line 2828 "VBNET.ATG" +#line 2842 "VBNET.ATG" out arguments, out canBeNormal, out canBeRedim); Expect(26); -#line 2830 "VBNET.ATG" +#line 2844 "VBNET.ATG" expr = new InvocationExpression(expr, arguments); SetParent(arguments, expr); if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { @@ -6309,130 +6315,130 @@ out arguments, out canBeNormal, out canBeRedim); } void CaseClause( -#line 2863 "VBNET.ATG" +#line 2877 "VBNET.ATG" out CaseLabel caseClause) { -#line 2865 "VBNET.ATG" +#line 2879 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; caseClause = null; - if (la.kind == 93) { + if (la.kind == 98) { lexer.NextToken(); -#line 2871 "VBNET.ATG" +#line 2885 "VBNET.ATG" caseClause = new CaseLabel(); - } else if (StartOf(41)) { - if (la.kind == 122) { + } else if (StartOf(42)) { + if (la.kind == 131) { lexer.NextToken(); } switch (la.kind) { case 28: { lexer.NextToken(); -#line 2875 "VBNET.ATG" +#line 2889 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 27: { lexer.NextToken(); -#line 2876 "VBNET.ATG" +#line 2890 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 31: { lexer.NextToken(); -#line 2877 "VBNET.ATG" +#line 2891 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 30: { lexer.NextToken(); -#line 2878 "VBNET.ATG" +#line 2892 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 10: { lexer.NextToken(); -#line 2879 "VBNET.ATG" +#line 2893 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 29: { lexer.NextToken(); -#line 2880 "VBNET.ATG" +#line 2894 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } - default: SynErr(268); break; + default: SynErr(282); break; } Expr( -#line 2882 "VBNET.ATG" +#line 2896 "VBNET.ATG" out expr); -#line 2884 "VBNET.ATG" +#line 2898 "VBNET.ATG" caseClause = new CaseLabel(op, expr); - } else if (StartOf(28)) { + } else if (StartOf(29)) { Expr( -#line 2886 "VBNET.ATG" +#line 2900 "VBNET.ATG" out expr); - if (la.kind == 188) { + if (la.kind == 201) { lexer.NextToken(); Expr( -#line 2886 "VBNET.ATG" +#line 2900 "VBNET.ATG" out sexpr); } -#line 2888 "VBNET.ATG" +#line 2902 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); - } else SynErr(269); + } else SynErr(283); } void CatchClauses( -#line 2935 "VBNET.ATG" +#line 2949 "VBNET.ATG" out List catchClauses) { -#line 2937 "VBNET.ATG" +#line 2951 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; Expression expr = null; string name = String.Empty; - while (la.kind == 59) { + while (la.kind == 62) { lexer.NextToken(); - if (StartOf(13)) { + if (StartOf(14)) { Identifier(); -#line 2945 "VBNET.ATG" +#line 2959 "VBNET.ATG" name = t.val; - if (la.kind == 49) { + if (la.kind == 50) { lexer.NextToken(); TypeName( -#line 2945 "VBNET.ATG" +#line 2959 "VBNET.ATG" out type); } } - if (la.kind == 201) { + if (la.kind == 214) { lexer.NextToken(); Expr( -#line 2946 "VBNET.ATG" +#line 2960 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 2948 "VBNET.ATG" +#line 2962 "VBNET.ATG" out blockStmt); -#line 2949 "VBNET.ATG" +#line 2963 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } @@ -6494,231 +6500,245 @@ out blockStmt); case 42: s = "\"&=\" expected"; break; case 43: s = "\"AddHandler\" expected"; break; case 44: s = "\"AddressOf\" expected"; break; - case 45: s = "\"Alias\" expected"; break; - case 46: s = "\"And\" expected"; break; - case 47: s = "\"AndAlso\" expected"; break; - case 48: s = "\"Ansi\" expected"; break; - case 49: s = "\"As\" expected"; break; - case 50: s = "\"Assembly\" expected"; break; - case 51: s = "\"Auto\" expected"; break; - case 52: s = "\"Binary\" expected"; break; - case 53: s = "\"Boolean\" expected"; break; - case 54: s = "\"ByRef\" expected"; break; - case 55: s = "\"Byte\" expected"; break; - case 56: s = "\"ByVal\" expected"; break; - case 57: s = "\"Call\" expected"; break; - case 58: s = "\"Case\" expected"; break; - case 59: s = "\"Catch\" expected"; break; - case 60: s = "\"CBool\" expected"; break; - case 61: s = "\"CByte\" expected"; break; - case 62: s = "\"CChar\" expected"; break; - case 63: s = "\"CDate\" expected"; break; - case 64: s = "\"CDbl\" expected"; break; - case 65: s = "\"CDec\" expected"; break; - case 66: s = "\"Char\" expected"; break; - case 67: s = "\"CInt\" expected"; break; - case 68: s = "\"Class\" expected"; break; - case 69: s = "\"CLng\" expected"; break; - case 70: s = "\"CObj\" expected"; break; - case 71: s = "\"Compare\" expected"; break; - case 72: s = "\"Const\" expected"; break; - case 73: s = "\"Continue\" expected"; break; - case 74: s = "\"CSByte\" expected"; break; - case 75: s = "\"CShort\" expected"; break; - case 76: s = "\"CSng\" expected"; break; - case 77: s = "\"CStr\" expected"; break; - case 78: s = "\"CType\" expected"; break; - case 79: s = "\"CUInt\" expected"; break; - case 80: s = "\"CULng\" expected"; break; - case 81: s = "\"CUShort\" expected"; break; - case 82: s = "\"Custom\" expected"; break; - case 83: s = "\"Date\" expected"; break; - case 84: s = "\"Decimal\" expected"; break; - case 85: s = "\"Declare\" expected"; break; - case 86: s = "\"Default\" expected"; break; - case 87: s = "\"Delegate\" expected"; break; - case 88: s = "\"Dim\" expected"; break; - case 89: s = "\"DirectCast\" expected"; break; - case 90: s = "\"Do\" expected"; break; - case 91: s = "\"Double\" expected"; break; - case 92: s = "\"Each\" expected"; break; - case 93: s = "\"Else\" expected"; break; - case 94: s = "\"ElseIf\" expected"; break; - case 95: s = "\"End\" expected"; break; - case 96: s = "\"EndIf\" expected"; break; - case 97: s = "\"Enum\" expected"; break; - case 98: s = "\"Erase\" expected"; break; - case 99: s = "\"Error\" expected"; break; - case 100: s = "\"Event\" expected"; break; - case 101: s = "\"Exit\" expected"; break; - case 102: s = "\"Explicit\" expected"; break; - case 103: s = "\"False\" expected"; break; - case 104: s = "\"Finally\" expected"; break; - case 105: s = "\"For\" expected"; break; - case 106: s = "\"Friend\" expected"; break; - case 107: s = "\"Function\" expected"; break; - case 108: s = "\"Get\" expected"; break; - case 109: s = "\"GetType\" expected"; break; - case 110: s = "\"Global\" expected"; break; - case 111: s = "\"GoSub\" expected"; break; - case 112: s = "\"GoTo\" expected"; break; - case 113: s = "\"Handles\" expected"; break; - case 114: s = "\"If\" expected"; break; - case 115: s = "\"Implements\" expected"; break; - case 116: s = "\"Imports\" expected"; break; - case 117: s = "\"In\" expected"; break; - case 118: s = "\"Infer\" expected"; break; - case 119: s = "\"Inherits\" expected"; break; - case 120: s = "\"Integer\" expected"; break; - case 121: s = "\"Interface\" expected"; break; - case 122: s = "\"Is\" expected"; break; - case 123: s = "\"IsNot\" expected"; break; - case 124: s = "\"Let\" expected"; break; - case 125: s = "\"Lib\" expected"; break; - case 126: s = "\"Like\" expected"; break; - case 127: s = "\"Long\" expected"; break; - case 128: s = "\"Loop\" expected"; break; - case 129: s = "\"Me\" expected"; break; - case 130: s = "\"Mod\" expected"; break; - case 131: s = "\"Module\" expected"; break; - case 132: s = "\"MustInherit\" expected"; break; - case 133: s = "\"MustOverride\" expected"; break; - case 134: s = "\"MyBase\" expected"; break; - case 135: s = "\"MyClass\" expected"; break; - case 136: s = "\"Namespace\" expected"; break; - case 137: s = "\"Narrowing\" expected"; break; - case 138: s = "\"New\" expected"; break; - case 139: s = "\"Next\" expected"; break; - case 140: s = "\"Not\" expected"; break; - case 141: s = "\"Nothing\" expected"; break; - case 142: s = "\"NotInheritable\" expected"; break; - case 143: s = "\"NotOverridable\" expected"; break; - case 144: s = "\"Object\" expected"; break; - case 145: s = "\"Of\" expected"; break; - case 146: s = "\"Off\" expected"; break; - case 147: s = "\"On\" expected"; break; - case 148: s = "\"Operator\" expected"; break; - case 149: s = "\"Option\" expected"; break; - case 150: s = "\"Optional\" expected"; break; - case 151: s = "\"Or\" expected"; break; - case 152: s = "\"OrElse\" expected"; break; - case 153: s = "\"Overloads\" expected"; break; - case 154: s = "\"Overridable\" expected"; break; - case 155: s = "\"Overrides\" expected"; break; - case 156: s = "\"ParamArray\" expected"; break; - case 157: s = "\"Partial\" expected"; break; - case 158: s = "\"Preserve\" expected"; break; - case 159: s = "\"Private\" expected"; break; - case 160: s = "\"Property\" expected"; break; - case 161: s = "\"Protected\" expected"; break; - case 162: s = "\"Public\" expected"; break; - case 163: s = "\"RaiseEvent\" expected"; break; - case 164: s = "\"ReadOnly\" expected"; break; - case 165: s = "\"ReDim\" expected"; break; - case 166: s = "\"Rem\" expected"; break; - case 167: s = "\"RemoveHandler\" expected"; break; - case 168: s = "\"Resume\" expected"; break; - case 169: s = "\"Return\" expected"; break; - case 170: s = "\"SByte\" expected"; break; - case 171: s = "\"Select\" expected"; break; - case 172: s = "\"Set\" expected"; break; - case 173: s = "\"Shadows\" expected"; break; - case 174: s = "\"Shared\" expected"; break; - case 175: s = "\"Short\" expected"; break; - case 176: s = "\"Single\" expected"; break; - case 177: s = "\"Static\" expected"; break; - case 178: s = "\"Step\" expected"; break; - case 179: s = "\"Stop\" expected"; break; - case 180: s = "\"Strict\" expected"; break; - case 181: s = "\"String\" expected"; break; - case 182: s = "\"Structure\" expected"; break; - case 183: s = "\"Sub\" expected"; break; - case 184: s = "\"SyncLock\" expected"; break; - case 185: s = "\"Text\" expected"; break; - case 186: s = "\"Then\" expected"; break; - case 187: s = "\"Throw\" expected"; break; - case 188: s = "\"To\" expected"; break; - case 189: s = "\"True\" expected"; break; - case 190: s = "\"Try\" expected"; break; - case 191: s = "\"TryCast\" expected"; break; - case 192: s = "\"TypeOf\" expected"; break; - case 193: s = "\"UInteger\" expected"; break; - case 194: s = "\"ULong\" expected"; break; - case 195: s = "\"Unicode\" expected"; break; - case 196: s = "\"Until\" expected"; break; - case 197: s = "\"UShort\" expected"; break; - case 198: s = "\"Using\" expected"; break; - case 199: s = "\"Variant\" expected"; break; - case 200: s = "\"Wend\" expected"; break; - case 201: s = "\"When\" expected"; break; - case 202: s = "\"While\" expected"; break; - case 203: s = "\"Widening\" expected"; break; - case 204: s = "\"With\" expected"; break; - case 205: s = "\"WithEvents\" expected"; break; - case 206: s = "\"WriteOnly\" expected"; break; - case 207: s = "\"Xor\" expected"; break; - case 208: s = "??? expected"; break; - case 209: s = "invalid EndOfStmt"; break; - case 210: s = "invalid OptionStmt"; break; - case 211: s = "invalid OptionStmt"; break; - case 212: s = "invalid GlobalAttributeSection"; break; - case 213: s = "invalid GlobalAttributeSection"; break; - case 214: s = "invalid NamespaceMemberDecl"; break; - case 215: s = "invalid OptionValue"; break; - case 216: s = "invalid TypeModifier"; break; - case 217: s = "invalid NonModuleDeclaration"; break; - case 218: s = "invalid NonModuleDeclaration"; break; - case 219: s = "invalid Identifier"; break; - case 220: s = "invalid TypeParameterConstraints"; break; - case 221: s = "invalid TypeParameterConstraint"; break; - case 222: s = "invalid NonArrayTypeName"; break; - case 223: s = "invalid MemberModifier"; break; - case 224: s = "invalid StructureMemberDecl"; break; - case 225: s = "invalid StructureMemberDecl"; break; - case 226: s = "invalid StructureMemberDecl"; break; - case 227: s = "invalid StructureMemberDecl"; break; - case 228: s = "invalid StructureMemberDecl"; break; - case 229: s = "invalid StructureMemberDecl"; break; - case 230: s = "invalid StructureMemberDecl"; break; - case 231: s = "invalid InterfaceMemberDecl"; break; - case 232: s = "invalid InterfaceMemberDecl"; break; - case 233: s = "invalid Expr"; break; - case 234: s = "invalid Charset"; break; - case 235: s = "invalid IdentifierForFieldDeclaration"; break; - case 236: s = "invalid VariableDeclaratorPartAfterIdentifier"; break; - case 237: s = "invalid AccessorDecls"; break; - case 238: s = "invalid EventAccessorDeclaration"; break; - case 239: s = "invalid OverloadableOperator"; break; - case 240: s = "invalid VariableInitializer"; break; - case 241: s = "invalid EventMemberSpecifier"; break; - case 242: s = "invalid AssignmentOperator"; break; - case 243: s = "invalid SimpleNonInvocationExpression"; break; - case 244: s = "invalid SimpleNonInvocationExpression"; break; - case 245: s = "invalid SimpleNonInvocationExpression"; break; - case 246: s = "invalid SimpleNonInvocationExpression"; break; - case 247: s = "invalid PrimitiveTypeName"; break; - case 248: s = "invalid CastTarget"; break; - case 249: s = "invalid ComparisonExpr"; break; - case 250: s = "invalid Argument"; break; - case 251: s = "invalid QualIdentAndTypeArguments"; break; - case 252: s = "invalid AttributeArguments"; break; - case 253: s = "invalid ParameterModifier"; break; - case 254: s = "invalid Statement"; break; - case 255: s = "invalid LabelName"; break; - case 256: s = "invalid EmbeddedStatement"; break; - case 257: s = "invalid EmbeddedStatement"; break; - case 258: s = "invalid EmbeddedStatement"; break; - case 259: s = "invalid EmbeddedStatement"; break; - case 260: s = "invalid EmbeddedStatement"; break; - case 261: s = "invalid EmbeddedStatement"; break; - case 262: s = "invalid EmbeddedStatement"; break; - case 263: s = "invalid WhileOrUntil"; break; - case 264: s = "invalid SingleLineStatementList"; break; - case 265: s = "invalid SingleLineStatementList"; break; - case 266: s = "invalid OnErrorStatement"; break; - case 267: s = "invalid ResumeStatement"; break; - case 268: s = "invalid CaseClause"; break; - case 269: s = "invalid CaseClause"; break; + case 45: s = "\"Aggregate\" expected"; break; + case 46: s = "\"Alias\" expected"; break; + case 47: s = "\"And\" expected"; break; + case 48: s = "\"AndAlso\" expected"; break; + case 49: s = "\"Ansi\" expected"; break; + case 50: s = "\"As\" expected"; break; + case 51: s = "\"Ascending\" expected"; break; + case 52: s = "\"Assembly\" expected"; break; + case 53: s = "\"Auto\" expected"; break; + case 54: s = "\"Binary\" expected"; break; + case 55: s = "\"Boolean\" expected"; break; + case 56: s = "\"ByRef\" expected"; break; + case 57: s = "\"By\" expected"; break; + case 58: s = "\"Byte\" expected"; break; + case 59: s = "\"ByVal\" expected"; break; + case 60: s = "\"Call\" expected"; break; + case 61: s = "\"Case\" expected"; break; + case 62: s = "\"Catch\" expected"; break; + case 63: s = "\"CBool\" expected"; break; + case 64: s = "\"CByte\" expected"; break; + case 65: s = "\"CChar\" expected"; break; + case 66: s = "\"CDate\" expected"; break; + case 67: s = "\"CDbl\" expected"; break; + case 68: s = "\"CDec\" expected"; break; + case 69: s = "\"Char\" expected"; break; + case 70: s = "\"CInt\" expected"; break; + case 71: s = "\"Class\" expected"; break; + case 72: s = "\"CLng\" expected"; break; + case 73: s = "\"CObj\" expected"; break; + case 74: s = "\"Compare\" expected"; break; + case 75: s = "\"Const\" expected"; break; + case 76: s = "\"Continue\" expected"; break; + case 77: s = "\"CSByte\" expected"; break; + case 78: s = "\"CShort\" expected"; break; + case 79: s = "\"CSng\" expected"; break; + case 80: s = "\"CStr\" expected"; break; + case 81: s = "\"CType\" expected"; break; + case 82: s = "\"CUInt\" expected"; break; + case 83: s = "\"CULng\" expected"; break; + case 84: s = "\"CUShort\" expected"; break; + case 85: s = "\"Custom\" expected"; break; + case 86: s = "\"Date\" expected"; break; + case 87: s = "\"Decimal\" expected"; break; + case 88: s = "\"Declare\" expected"; break; + case 89: s = "\"Default\" expected"; break; + case 90: s = "\"Delegate\" expected"; break; + case 91: s = "\"Descending\" expected"; break; + case 92: s = "\"Dim\" expected"; break; + case 93: s = "\"DirectCast\" expected"; break; + case 94: s = "\"Distinct\" expected"; break; + case 95: s = "\"Do\" expected"; break; + case 96: s = "\"Double\" expected"; break; + case 97: s = "\"Each\" expected"; break; + case 98: s = "\"Else\" expected"; break; + case 99: s = "\"ElseIf\" expected"; break; + case 100: s = "\"End\" expected"; break; + case 101: s = "\"EndIf\" expected"; break; + case 102: s = "\"Enum\" expected"; break; + case 103: s = "\"Equals\" expected"; break; + case 104: s = "\"Erase\" expected"; break; + case 105: s = "\"Error\" expected"; break; + case 106: s = "\"Event\" expected"; break; + case 107: s = "\"Exit\" expected"; break; + case 108: s = "\"Explicit\" expected"; break; + case 109: s = "\"False\" expected"; break; + case 110: s = "\"Finally\" expected"; break; + case 111: s = "\"For\" expected"; break; + case 112: s = "\"Friend\" expected"; break; + case 113: s = "\"From\" expected"; break; + case 114: s = "\"Function\" expected"; break; + case 115: s = "\"Get\" expected"; break; + case 116: s = "\"GetType\" expected"; break; + case 117: s = "\"Global\" expected"; break; + case 118: s = "\"GoSub\" expected"; break; + case 119: s = "\"GoTo\" expected"; break; + case 120: s = "\"Group\" expected"; break; + case 121: s = "\"Handles\" expected"; break; + case 122: s = "\"If\" expected"; break; + case 123: s = "\"Implements\" expected"; break; + case 124: s = "\"Imports\" expected"; break; + case 125: s = "\"In\" expected"; break; + case 126: s = "\"Infer\" expected"; break; + case 127: s = "\"Inherits\" expected"; break; + case 128: s = "\"Integer\" expected"; break; + case 129: s = "\"Interface\" expected"; break; + case 130: s = "\"Into\" expected"; break; + case 131: s = "\"Is\" expected"; break; + case 132: s = "\"IsNot\" expected"; break; + case 133: s = "\"Join\" expected"; break; + case 134: s = "\"Let\" expected"; break; + case 135: s = "\"Lib\" expected"; break; + case 136: s = "\"Like\" expected"; break; + case 137: s = "\"Long\" expected"; break; + case 138: s = "\"Loop\" expected"; break; + case 139: s = "\"Me\" expected"; break; + case 140: s = "\"Mod\" expected"; break; + case 141: s = "\"Module\" expected"; break; + case 142: s = "\"MustInherit\" expected"; break; + case 143: s = "\"MustOverride\" expected"; break; + case 144: s = "\"MyBase\" expected"; break; + case 145: s = "\"MyClass\" expected"; break; + case 146: s = "\"Namespace\" expected"; break; + case 147: s = "\"Narrowing\" expected"; break; + case 148: s = "\"New\" expected"; break; + case 149: s = "\"Next\" expected"; break; + case 150: s = "\"Not\" expected"; break; + case 151: s = "\"Nothing\" expected"; break; + case 152: s = "\"NotInheritable\" expected"; break; + case 153: s = "\"NotOverridable\" expected"; break; + case 154: s = "\"Object\" expected"; break; + case 155: s = "\"Of\" expected"; break; + case 156: s = "\"Off\" expected"; break; + case 157: s = "\"On\" expected"; break; + case 158: s = "\"Operator\" expected"; break; + case 159: s = "\"Option\" expected"; break; + case 160: s = "\"Optional\" expected"; break; + case 161: s = "\"Or\" expected"; break; + case 162: s = "\"Order\" expected"; break; + case 163: s = "\"OrElse\" expected"; break; + case 164: s = "\"Overloads\" expected"; break; + case 165: s = "\"Overridable\" expected"; break; + case 166: s = "\"Overrides\" expected"; break; + case 167: s = "\"ParamArray\" expected"; break; + case 168: s = "\"Partial\" expected"; break; + case 169: s = "\"Preserve\" expected"; break; + case 170: s = "\"Private\" expected"; break; + case 171: s = "\"Property\" expected"; break; + case 172: s = "\"Protected\" expected"; break; + case 173: s = "\"Public\" expected"; break; + case 174: s = "\"RaiseEvent\" expected"; break; + case 175: s = "\"ReadOnly\" expected"; break; + case 176: s = "\"ReDim\" expected"; break; + case 177: s = "\"Rem\" expected"; break; + case 178: s = "\"RemoveHandler\" expected"; break; + case 179: s = "\"Resume\" expected"; break; + case 180: s = "\"Return\" expected"; break; + case 181: s = "\"SByte\" expected"; break; + case 182: s = "\"Select\" expected"; break; + case 183: s = "\"Set\" expected"; break; + case 184: s = "\"Shadows\" expected"; break; + case 185: s = "\"Shared\" expected"; break; + case 186: s = "\"Short\" expected"; break; + case 187: s = "\"Single\" expected"; break; + case 188: s = "\"Skip\" expected"; break; + case 189: s = "\"Static\" expected"; break; + case 190: s = "\"Step\" expected"; break; + case 191: s = "\"Stop\" expected"; break; + case 192: s = "\"Strict\" expected"; break; + case 193: s = "\"String\" expected"; break; + case 194: s = "\"Structure\" expected"; break; + case 195: s = "\"Sub\" expected"; break; + case 196: s = "\"SyncLock\" expected"; break; + case 197: s = "\"Take\" expected"; break; + case 198: s = "\"Text\" expected"; break; + case 199: s = "\"Then\" expected"; break; + case 200: s = "\"Throw\" expected"; break; + case 201: s = "\"To\" expected"; break; + case 202: s = "\"True\" expected"; break; + case 203: s = "\"Try\" expected"; break; + case 204: s = "\"TryCast\" expected"; break; + case 205: s = "\"TypeOf\" expected"; break; + case 206: s = "\"UInteger\" expected"; break; + case 207: s = "\"ULong\" expected"; break; + case 208: s = "\"Unicode\" expected"; break; + case 209: s = "\"Until\" expected"; break; + case 210: s = "\"UShort\" expected"; break; + case 211: s = "\"Using\" expected"; break; + case 212: s = "\"Variant\" expected"; break; + case 213: s = "\"Wend\" expected"; break; + case 214: s = "\"When\" expected"; break; + case 215: s = "\"Where\" expected"; break; + case 216: s = "\"While\" expected"; break; + case 217: s = "\"Widening\" expected"; break; + case 218: s = "\"With\" expected"; break; + case 219: s = "\"WithEvents\" expected"; break; + case 220: s = "\"WriteOnly\" expected"; break; + case 221: s = "\"Xor\" expected"; break; + case 222: s = "??? expected"; break; + case 223: s = "invalid EndOfStmt"; break; + case 224: s = "invalid OptionStmt"; break; + case 225: s = "invalid OptionStmt"; break; + case 226: s = "invalid GlobalAttributeSection"; break; + case 227: s = "invalid GlobalAttributeSection"; break; + case 228: s = "invalid NamespaceMemberDecl"; break; + case 229: s = "invalid OptionValue"; break; + case 230: s = "invalid TypeModifier"; break; + case 231: s = "invalid NonModuleDeclaration"; break; + case 232: s = "invalid NonModuleDeclaration"; break; + case 233: s = "invalid Identifier"; break; + case 234: s = "invalid TypeParameterConstraints"; break; + case 235: s = "invalid TypeParameterConstraint"; break; + case 236: s = "invalid NonArrayTypeName"; break; + case 237: s = "invalid MemberModifier"; break; + case 238: s = "invalid StructureMemberDecl"; break; + case 239: s = "invalid StructureMemberDecl"; break; + case 240: s = "invalid StructureMemberDecl"; break; + case 241: s = "invalid StructureMemberDecl"; break; + case 242: s = "invalid StructureMemberDecl"; break; + case 243: s = "invalid StructureMemberDecl"; break; + case 244: s = "invalid StructureMemberDecl"; break; + case 245: s = "invalid InterfaceMemberDecl"; break; + case 246: s = "invalid InterfaceMemberDecl"; break; + case 247: s = "invalid Expr"; break; + case 248: s = "invalid Charset"; break; + case 249: s = "invalid IdentifierForFieldDeclaration"; break; + case 250: s = "invalid VariableDeclaratorPartAfterIdentifier"; break; + case 251: s = "invalid AccessorDecls"; break; + case 252: s = "invalid EventAccessorDeclaration"; break; + case 253: s = "invalid OverloadableOperator"; break; + case 254: s = "invalid VariableInitializer"; break; + case 255: s = "invalid EventMemberSpecifier"; break; + case 256: s = "invalid AssignmentOperator"; break; + case 257: s = "invalid SimpleNonInvocationExpression"; break; + case 258: s = "invalid SimpleNonInvocationExpression"; break; + case 259: s = "invalid SimpleNonInvocationExpression"; break; + case 260: s = "invalid SimpleNonInvocationExpression"; break; + case 261: s = "invalid PrimitiveTypeName"; break; + case 262: s = "invalid CastTarget"; break; + case 263: s = "invalid ComparisonExpr"; break; + case 264: s = "invalid Argument"; break; + case 265: s = "invalid QualIdentAndTypeArguments"; break; + case 266: s = "invalid AttributeArguments"; break; + case 267: s = "invalid ParameterModifier"; break; + case 268: s = "invalid Statement"; break; + case 269: s = "invalid LabelName"; break; + case 270: s = "invalid EmbeddedStatement"; break; + case 271: s = "invalid EmbeddedStatement"; break; + case 272: s = "invalid EmbeddedStatement"; break; + case 273: s = "invalid EmbeddedStatement"; break; + case 274: s = "invalid EmbeddedStatement"; break; + case 275: s = "invalid EmbeddedStatement"; break; + case 276: s = "invalid EmbeddedStatement"; break; + case 277: s = "invalid WhileOrUntil"; break; + case 278: s = "invalid SingleLineStatementList"; break; + case 279: s = "invalid SingleLineStatementList"; break; + case 280: s = "invalid OnErrorStatement"; break; + case 281: s = "invalid ResumeStatement"; break; + case 282: s = "invalid CaseClause"; break; + case 283: s = "invalid CaseClause"; break; default: s = "error " + errorNumber; break; } @@ -6731,48 +6751,49 @@ out blockStmt); } static bool[,] set = { - {T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,T, T,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, x,T,T,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, x,T,T,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, x,T,T,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,T, T,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,T,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,x,x, x,T,T,x, x,T,x,x, x,x,x,x, x,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,T,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,x,x,x, x,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,T, T,x,x,x, x,x,x,x, x,x,T,x, x,T,T,T, T,x,x,x, x,x,x,x, x,T,x,x, T,x,T,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,T, T,T,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,x,x,x, x,T,T,T, x,T,T,T, T,T,T,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,T,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,T, x,T,T,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,T,T,T, x,T,x,T, x,T,T,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x}, - {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,x,x,x, x,x,x,x, x,T,x,x, T,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,T, T,T,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,T,T,T, x,T,x,T, T,T,T,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x}, - {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,T,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,T,T,T, x,T,x,T, T,T,T,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,T,T, T,T,x,T, x,x,x,x, T,T,T,T, T,T,T,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,T,T,x, x,x,T,x, x,x,x,x, T,x,x,x, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, T,T,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,T,T,T, T,T,T,T, T,T,x,T, x,x,x,x, T,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, T,x,T,T, T,T,x,T, x,T,x,x, T,T,T,T, T,T,T,T, x,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,T,T,T, x,x,x,x, x,x,T,T, x,T,T,T, x,T,x,x, x,T,T,x, T,x,T,x, x,x,x,x, T,x,x,x, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, x,T,x,x, T,x,T,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, x,T,x,T, T,T,T,T, x,x,x,T, T,T,x,T, x,T,x,x, T,T,x,T, x,T,T,T, T,T,T,T, T,T,T,x, x,x,T,x, T,x,x,x, x,x}, - {x,T,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, T,T,T,T, T,T,x,T, x,T,x,x, T,T,T,T, T,T,T,T, x,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,T,T,T, x,x,x,T, x,x,T,T, x,T,T,T, x,T,x,x, x,T,T,x, T,x,T,x, x,x,x,x, T,x,x,x, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, x,T,x,x, T,x,T,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, x,T,x,T, T,T,T,T, x,x,x,T, T,T,x,T, x,T,x,x, T,T,x,T, x,T,T,T, T,T,T,T, T,T,T,x, x,x,T,x, T,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,T,T, T,T,x,T, x,x,x,x, T,T,T,T, T,T,T,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,T, x,T,T,x, x,x,T,x, x,x,x,x, T,x,x,x, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, T,T,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,T,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,T,T, T,T,x,T, x,x,x,x, T,T,T,T, T,T,T,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,T, x,T,T,x, x,x,T,x, x,x,x,x, T,x,x,x, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, T,T,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,T,T, T,T,x,T, x,x,x,x, T,T,T,T, T,T,T,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,T,T,x, x,x,T,x, x,x,x,x, T,x,x,x, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, x,T,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,T,T, T,T,x,T, x,x,x,x, T,T,T,T, T,T,T,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,T,T,x, x,x,T,x, x,x,x,x, T,x,x,x, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, x,T,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, T,x,T,T, T,T,x,T, x,T,x,x, T,T,T,T, T,T,T,T, x,T,T,T, x,T,T,T, T,T,T,T, T,T,T,T, T,x,x,x, x,T,T,T, x,x,x,x, x,x,T,T, x,T,T,T, x,T,x,x, x,T,T,x, T,x,T,x, x,x,x,x, T,x,x,x, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, x,T,x,x, T,x,T,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, x,T,x,T, T,T,T,T, x,x,x,T, T,x,x,T, x,T,x,x, T,T,x,T, x,T,T,T, T,T,T,T, T,T,T,x, x,x,T,x, T,x,x,x, x,x}, - {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,x,x, T,x,x,x, T,x,T,T, x,x,T,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,T,T, T,T,x,T, x,x,x,x, T,T,T,T, T,T,T,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,T, x,T,T,x, x,x,T,x, x,x,x,x, T,x,x,x, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, T,T,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, T,x,T,T, T,T,x,T, x,T,x,x, T,T,T,T, T,T,T,T, x,T,T,T, x,T,T,T, T,T,T,T, T,T,T,T, T,x,x,x, x,T,T,T, x,x,x,T, x,x,T,T, x,T,T,T, x,T,x,x, x,T,T,x, T,x,T,x, x,x,x,x, T,x,x,x, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, x,T,x,x, T,x,T,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, x,T,x,T, T,T,T,T, x,x,x,T, T,x,x,T, x,T,x,x, T,T,x,T, x,T,T,T, T,T,T,T, T,T,T,x, x,x,T,x, T,x,x,x, x,x}, - {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,T,T, T,T,x,T, x,x,x,x, T,T,T,T, T,T,T,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,T,T, T,x,x,x, x,T,x,T, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,T,T,x, x,x,T,x, x,x,x,x, T,x,x,x, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, x,T,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,T, T,x,x,x, x,T,x,x, x,T,x,x, x,T,x,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x}, - {x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x} + {T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,T,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,x, T,T,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, T,x,T,x, x,x,x,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,T, x,T,T,x, x,x,x,x, x,x,x,x, x,T,x,T, x,x,T,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,x,T, x,x,T,x, T,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,T,x,x, T,x,x,x, x,x,T,x, T,x,T,x, x,T,x,x, x,T,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, T,x,x,x, x,T,T,x, x,T,T,x, x,x,x,x, x,x,T,T, T,T,T,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,T, x,T,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,x,T, x,x,T,x, T,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,T,x,x, T,x,x,x, x,x,T,x, T,x,T,x, x,T,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, T,x,x,x, x,T,x,x, x,T,T,x, x,x,x,x, x,x,T,T, T,T,T,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,T, x,x,x,x, x,x,x,x, x,T,x,x, T,T,T,T, T,x,T,x, x,x,x,x, x,x,T,T, x,x,T,x, T,x,x,x, T,T,T,x, x,x,x,x, T,x,x,x, x,x,T,x, x,T,T,x, x,T,x,x, x,x,x,x, x,T,T,T, x,x,x,T, x,x,x,x, T,T,x,x, T,x,T,x, x,x,T,x, T,T,T,x, T,T,T,T, T,T,x,T, x,x,x,x, x,x,x,x, T,T,x,x, T,x,x,x, x,x,T,T, x,T,T,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,T, x,T,x,T, T,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, T,T,T,x, T,x,T,x, T,T,x,T, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x}, + {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,T,x,x, T,x,x,x, x,x,T,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,T,x, T,x,x,x, x,x,x,x, x,x,T,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,T,T, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, T,T,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x}, + {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,T,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,T,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, T,T,T,x, T,x,T,T, T,T,x,T, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,T,x,T, T,T,T,T, x,T,T,x, x,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, x,T,T,T, T,T,T,T, T,T,T,T, x,x,x,T, x,T,T,x, T,x,x,x, x,x,x,T, x,x,x,x, T,T,x,x, x,T,x,x, T,T,x,x, T,x,T,x, x,x,T,x, T,x,T,x, x,T,x,x, x,T,x,T, x,x,x,x, T,T,x,x, T,x,T,T, x,x,T,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, T,x,x,x, x,T,x,x, x,T,T,x, x,x,T,x, T,T,T,T, T,T,T,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,T,T,T, T,T,T,T, T,T,x,T, x,x,x,x, T,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,x,x, x,T,x,T, T,T,T,T, x,T,T,x, T,x,x,T, T,T,T,T, T,T,T,x, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, x,x,x,T, T,T,T,T, T,x,x,x, x,x,x,T, T,T,x,T, T,T,x,T, x,T,x,x, T,T,x,T, T,x,T,x, x,x,T,x, T,x,T,x, x,T,x,x, x,T,x,T, x,x,x,x, T,T,x,x, T,x,x,T, x,x,T,x, T,T,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, T,x,T,T, T,T,T,x, x,x,T,T, T,T,x,T, x,T,x,x, T,T,T,x, T,x,T,T, T,T,T,T, T,T,T,T, x,x,x,T, T,x,T,x, x,x,x,x}, + {x,T,T,T, T,T,T,T, T,T,T,T, T,x,x,x, T,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,x,x, x,T,T,T, T,T,T,T, x,T,T,x, T,x,x,T, T,T,T,T, T,T,T,x, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, x,x,x,T, T,T,T,T, T,x,x,x, T,x,x,T, T,T,x,T, T,T,x,T, x,T,x,x, T,T,x,T, T,x,T,x, x,x,T,x, T,x,T,x, x,T,x,x, x,T,x,T, x,x,x,x, T,T,x,x, T,x,x,T, x,x,T,x, T,T,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, T,x,T,T, T,T,T,x, x,x,T,T, T,T,x,T, x,T,x,x, T,T,T,x, T,x,T,T, T,T,T,T, T,T,T,T, x,x,x,T, T,x,T,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,T,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,T,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,T,x,T, T,T,T,T, x,T,T,x, x,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, x,T,T,T, T,T,T,T, T,T,T,T, x,x,x,T, x,T,T,x, T,x,x,x, x,x,x,T, x,x,x,x, T,T,x,x, x,T,T,x, T,T,x,x, T,x,T,x, x,x,T,x, T,x,T,x, x,T,x,x, x,T,x,T, x,x,x,x, T,T,x,x, T,x,T,T, x,x,T,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, T,x,x,x, x,T,x,x, x,T,T,x, x,x,T,x, T,T,T,T, T,T,T,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,T,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,T,x,T, T,T,T,T, x,T,T,x, x,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, x,T,T,T, T,T,T,T, T,T,T,T, x,x,x,T, x,T,T,x, T,x,x,x, x,x,x,T, x,x,x,x, T,T,x,x, x,T,T,x, T,T,x,x, T,x,T,x, x,x,T,x, T,x,T,x, x,T,x,x, x,T,x,T, x,x,x,x, T,T,x,x, T,x,T,T, x,x,T,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, T,x,x,x, x,T,x,x, x,T,T,x, x,x,T,x, T,T,T,T, T,T,T,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,T,x,T, T,T,T,T, x,T,T,x, x,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, x,T,T,T, T,T,T,T, T,T,T,T, x,x,x,T, x,T,T,x, T,x,x,x, x,x,x,T, x,x,x,x, T,T,x,x, x,T,x,x, T,T,x,x, T,x,T,x, x,x,T,x, T,x,T,x, x,T,x,x, x,T,x,T, x,x,x,x, T,T,x,x, T,x,x,T, x,x,T,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, T,x,x,x, x,T,x,x, x,T,T,x, x,x,T,x, T,T,T,T, T,T,T,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,T,x,T, T,T,T,T, x,T,T,x, x,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, x,T,T,T, T,T,T,T, T,T,T,T, x,x,x,T, x,T,T,x, T,x,x,x, x,x,x,T, x,x,x,x, T,T,x,x, x,T,x,x, T,T,x,x, T,x,T,x, x,x,T,x, T,x,T,x, x,T,x,x, x,T,x,T, x,x,x,x, T,T,x,x, T,x,x,T, x,x,T,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, T,x,x,x, x,T,x,x, x,T,T,x, x,x,T,x, T,T,T,T, T,T,T,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,x,x, x,T,x,T, T,T,T,T, x,T,T,x, T,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, T,T,T,T, T,T,T,T, T,T,T,T, x,x,x,T, x,T,T,T, T,x,x,x, x,x,x,T, T,T,x,T, T,T,x,T, x,T,x,x, T,T,x,T, T,x,T,x, x,x,T,x, T,x,T,x, x,T,x,x, x,T,x,T, x,x,x,x, T,T,x,x, T,x,x,T, x,x,T,x, T,T,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, T,x,T,T, T,T,T,x, x,x,T,T, T,x,x,T, x,T,x,x, T,T,T,x, T,x,T,T, T,T,T,T, T,T,T,T, x,x,x,T, T,x,T,x, x,x,x,x}, + {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, T,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,T,T, T,T,T,T, T,T,x,x, T,x,x,x, T,x,T,T, x,x,T,x, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,T,x,T, T,T,T,T, x,T,T,x, x,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, x,T,T,T, T,T,T,T, T,T,T,T, x,x,x,T, x,T,T,x, T,x,x,x, x,x,x,T, x,x,x,x, T,T,x,x, x,T,T,x, T,T,x,x, T,x,T,x, x,x,T,x, T,x,T,x, x,T,x,x, x,T,x,T, x,x,x,x, T,T,x,x, T,x,T,T, x,x,T,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, T,x,x,x, x,T,x,x, x,T,T,x, x,x,T,x, T,T,T,T, T,T,T,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,x,x, x,T,x,T, T,T,T,T, x,T,T,x, T,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, T,T,T,T, T,T,T,T, T,T,T,T, x,x,x,T, x,T,T,T, T,x,x,x, T,x,x,T, T,T,x,T, T,T,x,T, x,T,x,x, T,T,x,T, T,x,T,x, x,x,T,x, T,x,T,x, x,T,x,x, x,T,x,T, x,x,x,x, T,T,x,x, T,x,x,T, x,x,T,x, T,T,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,T,x, T,x,T,T, T,T,T,x, x,x,T,T, T,x,x,T, x,T,x,x, T,T,T,x, T,x,T,T, T,T,T,T, T,T,T,T, x,x,x,T, T,x,T,x, x,x,x,x}, + {x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,T,x,T, T,T,T,T, x,T,T,x, x,x,x,T, T,T,T,T, T,T,T,x, T,T,T,x, x,T,T,T, T,T,T,T, T,T,T,T, x,x,x,T, x,T,T,x, T,x,x,x, x,x,x,T, x,x,x,x, T,T,x,x, x,T,x,x, T,T,x,x, T,x,T,x, x,x,T,x, T,x,T,x, x,T,x,x, x,T,x,T, x,x,x,x, T,T,x,x, T,x,x,T, x,x,T,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, T,x,x,x, x,T,x,x, x,T,T,x, x,x,T,x, T,T,T,T, T,T,T,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,T,x,T, T,T,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,T, x,x,T,x, x,x,x,x, x,x,x,T, x,x,x,x, T,x,x,x, x,T,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,T,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,T,T,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,x,T, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x} }; } // end Parser diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index eea65c436c..b9e3522a46 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -60,16 +60,19 @@ TOKENS /* ----- keywords ----- */ "AddHandler" "AddressOf" + "Aggregate" "Alias" "And" "AndAlso" "Ansi" "As" + "Ascending" "Assembly" "Auto" "Binary" "Boolean" "ByRef" + "By" "Byte" "ByVal" "Call" @@ -103,8 +106,10 @@ TOKENS "Declare" "Default" "Delegate" + "Descending" "Dim" "DirectCast" + "Distinct" "Do" "Double" "Each" @@ -113,6 +118,7 @@ TOKENS "End" "EndIf" "Enum" + "Equals" "Erase" "Error" "Event" @@ -122,12 +128,14 @@ TOKENS "Finally" "For" "Friend" + "From" "Function" "Get" "GetType" "Global" "GoSub" "GoTo" + "Group" "Handles" "If" "Implements" @@ -137,8 +145,10 @@ TOKENS "Inherits" "Integer" "Interface" + "Into" "Is" "IsNot" + "Join" "Let" "Lib" "Like" @@ -167,6 +177,7 @@ TOKENS "Option" "Optional" "Or" + "Order" "OrElse" "Overloads" "Overridable" @@ -192,6 +203,7 @@ TOKENS "Shared" "Short" "Single" + "Skip" "Static" "Step" "Stop" @@ -200,6 +212,7 @@ TOKENS "Structure" "Sub" "SyncLock" + "Take" "Text" "Then" "Throw" @@ -217,6 +230,7 @@ TOKENS "Variant" "Wend" "When" + "Where" "While" "Widening" "With" @@ -2965,35 +2979,38 @@ Qualident /* This production handles pseudo keywords that are needed in the grammar */ Identifier = - ident - | "Text" - | "Binary" - | "Compare" + IdentifierForFieldDeclaration | "Custom" - | "Assembly" - | "Ansi" - | "Auto" - | "Preserve" - | "Unicode" - | "Until" - | "Off" - | "Explicit" . IdentifierForFieldDeclaration = ident - | "Text" - | "Binary" - | "Compare" - | "Assembly" + | "Aggregate" | "Ansi" + | "Ascending" + | "Assembly" | "Auto" + | "Binary" + | "By" + | "Compare" + | "Descending" + | "Distinct" + | "Equals" + | "Explicit" + | "From" + | "Group" + | "Infer" + | "Into" + | "Join" + | "Off" + | "Order" | "Preserve" + | "Skip" + | "Take" + | "Text" | "Unicode" | "Until" - | "Off" - | "Explicit" - | "Infer" + | "Where" . /* 2.2 */ diff --git a/src/Libraries/NRefactory/Test/Lexer/VBNet/LexerTests.cs b/src/Libraries/NRefactory/Test/Lexer/VBNet/LexerTests.cs index dee861f1c4..a3fe633f57 100644 --- a/src/Libraries/NRefactory/Test/Lexer/VBNet/LexerTests.cs +++ b/src/Libraries/NRefactory/Test/Lexer/VBNet/LexerTests.cs @@ -260,6 +260,12 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB Assert.AreEqual(Tokens.AddressOf, lexer.NextToken().kind); } [Test()] + public void TestAggregate() + { + ILexer lexer = GenerateLexer(new StringReader("Aggregate")); + Assert.AreEqual(Tokens.Aggregate, lexer.NextToken().kind); + } + [Test()] public void TestAlias() { ILexer lexer = GenerateLexer(new StringReader("Alias")); @@ -290,6 +296,12 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB Assert.AreEqual(Tokens.As, lexer.NextToken().kind); } [Test()] + public void TestAscending() + { + ILexer lexer = GenerateLexer(new StringReader("Ascending")); + Assert.AreEqual(Tokens.Ascending, lexer.NextToken().kind); + } + [Test()] public void TestAssembly() { ILexer lexer = GenerateLexer(new StringReader("Assembly")); @@ -320,6 +332,12 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB Assert.AreEqual(Tokens.ByRef, lexer.NextToken().kind); } [Test()] + public void TestBy() + { + ILexer lexer = GenerateLexer(new StringReader("By")); + Assert.AreEqual(Tokens.By, lexer.NextToken().kind); + } + [Test()] public void TestByte() { ILexer lexer = GenerateLexer(new StringReader("Byte")); @@ -518,6 +536,12 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB Assert.AreEqual(Tokens.Delegate, lexer.NextToken().kind); } [Test()] + public void TestDescending() + { + ILexer lexer = GenerateLexer(new StringReader("Descending")); + Assert.AreEqual(Tokens.Descending, lexer.NextToken().kind); + } + [Test()] public void TestDim() { ILexer lexer = GenerateLexer(new StringReader("Dim")); @@ -530,6 +554,12 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB Assert.AreEqual(Tokens.DirectCast, lexer.NextToken().kind); } [Test()] + public void TestDistinct() + { + ILexer lexer = GenerateLexer(new StringReader("Distinct")); + Assert.AreEqual(Tokens.Distinct, lexer.NextToken().kind); + } + [Test()] public void TestDo() { ILexer lexer = GenerateLexer(new StringReader("Do")); @@ -578,6 +608,12 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB Assert.AreEqual(Tokens.Enum, lexer.NextToken().kind); } [Test()] + public void TestEquals() + { + ILexer lexer = GenerateLexer(new StringReader("Equals")); + Assert.AreEqual(Tokens.Equals, lexer.NextToken().kind); + } + [Test()] public void TestErase() { ILexer lexer = GenerateLexer(new StringReader("Erase")); @@ -632,6 +668,12 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB Assert.AreEqual(Tokens.Friend, lexer.NextToken().kind); } [Test()] + public void TestFrom() + { + ILexer lexer = GenerateLexer(new StringReader("From")); + Assert.AreEqual(Tokens.From, lexer.NextToken().kind); + } + [Test()] public void TestFunction() { ILexer lexer = GenerateLexer(new StringReader("Function")); @@ -668,6 +710,12 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB Assert.AreEqual(Tokens.GoTo, lexer.NextToken().kind); } [Test()] + public void TestGroup() + { + ILexer lexer = GenerateLexer(new StringReader("Group")); + Assert.AreEqual(Tokens.Group, lexer.NextToken().kind); + } + [Test()] public void TestHandles() { ILexer lexer = GenerateLexer(new StringReader("Handles")); @@ -722,6 +770,12 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB Assert.AreEqual(Tokens.Interface, lexer.NextToken().kind); } [Test()] + public void TestInto() + { + ILexer lexer = GenerateLexer(new StringReader("Into")); + Assert.AreEqual(Tokens.Into, lexer.NextToken().kind); + } + [Test()] public void TestIs() { ILexer lexer = GenerateLexer(new StringReader("Is")); @@ -734,6 +788,12 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB Assert.AreEqual(Tokens.IsNot, lexer.NextToken().kind); } [Test()] + public void TestJoin() + { + ILexer lexer = GenerateLexer(new StringReader("Join")); + Assert.AreEqual(Tokens.Join, lexer.NextToken().kind); + } + [Test()] public void TestLet() { ILexer lexer = GenerateLexer(new StringReader("Let")); @@ -902,6 +962,12 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB Assert.AreEqual(Tokens.Or, lexer.NextToken().kind); } [Test()] + public void TestOrder() + { + ILexer lexer = GenerateLexer(new StringReader("Order")); + Assert.AreEqual(Tokens.Order, lexer.NextToken().kind); + } + [Test()] public void TestOrElse() { ILexer lexer = GenerateLexer(new StringReader("OrElse")); @@ -985,7 +1051,6 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB ILexer lexer = GenerateLexer(new StringReader("ReDim")); Assert.AreEqual(Tokens.ReDim, lexer.NextToken().kind); } - [Test()] public void TestRemoveHandler() { @@ -1047,6 +1112,12 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB Assert.AreEqual(Tokens.Single, lexer.NextToken().kind); } [Test()] + public void TestSkip() + { + ILexer lexer = GenerateLexer(new StringReader("Skip")); + Assert.AreEqual(Tokens.Skip, lexer.NextToken().kind); + } + [Test()] public void TestStatic() { ILexer lexer = GenerateLexer(new StringReader("Static")); @@ -1095,6 +1166,12 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB Assert.AreEqual(Tokens.SyncLock, lexer.NextToken().kind); } [Test()] + public void TestTake() + { + ILexer lexer = GenerateLexer(new StringReader("Take")); + Assert.AreEqual(Tokens.Take, lexer.NextToken().kind); + } + [Test()] public void TestText() { ILexer lexer = GenerateLexer(new StringReader("Text")); @@ -1197,6 +1274,12 @@ namespace ICSharpCode.NRefactory.Tests.Lexer.VB Assert.AreEqual(Tokens.When, lexer.NextToken().kind); } [Test()] + public void TestWhere() + { + ILexer lexer = GenerateLexer(new StringReader("Where")); + Assert.AreEqual(Tokens.Where, lexer.NextToken().kind); + } + [Test()] public void TestWhile() { ILexer lexer = GenerateLexer(new StringReader("While"));