From 071185b7d67550aee507a9b5f01807f663992b04 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Fri, 2 Jul 2010 12:56:16 +0000 Subject: [PATCH] - added helper methods to AbstractLexer - corrected implementation of ReadXmlCommentOrCData - implemented parsing of XML comments - fixed parsing XmlMemberAccessExpression in With-Statements git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/vbnet@6017 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Src/Lexer/AbstractLexer.cs | 22 +- .../Project/Src/Lexer/VBNet/Lexer.cs | 34 +- .../VBNet/Experimental/ExpressionFinder.atg | 11 +- .../VBNet/Experimental/ExpressionFinder.cs | 2 + .../Src/Parser/VBNet/Experimental/Parser.cs | 744 +++--- .../Project/Src/Parser/VBNet/Parser.cs | 2106 +++++++++-------- .../Project/Src/Parser/VBNet/VBNET.ATG | 85 +- .../NRefactory/Test/NRefactoryTests.csproj | 1 + .../Expressions/XmlLiteralExpressionTests.cs | 40 + .../XmlMemberAccessExpressionTests.cs | 51 + 10 files changed, 1730 insertions(+), 1366 deletions(-) create mode 100644 src/Libraries/NRefactory/Test/Parser/Expressions/XmlLiteralExpressionTests.cs diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/AbstractLexer.cs b/src/Libraries/NRefactory/Project/Src/Lexer/AbstractLexer.cs index 3b2d995c59..f4cf5a2b9e 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/AbstractLexer.cs +++ b/src/Libraries/NRefactory/Project/Src/Lexer/AbstractLexer.cs @@ -85,7 +85,7 @@ namespace ICSharpCode.NRefactory.Parser if ((val == '\r' && reader.Peek() != '\n') || val == '\n') { ++line; col = 1; - LineBreak (); + LineBreak(); } else if (val >= 0) { col++; } @@ -102,6 +102,26 @@ namespace ICSharpCode.NRefactory.Parser return reader.Peek(step); } + protected void ReaderSkip(int steps) + { + for (int i = 0; i < steps; i++) { + ReaderRead(); + } + } + + protected string ReaderPeekString(int length) + { + StringBuilder builder = new StringBuilder(); + + for (int i = 0; i < length; i++) { + int peek = ReaderPeek(i); + if (peek != -1) + builder.Append((char)peek); + } + + return builder.ToString(); + } + public void SetInitialLocation(Location location) { if (lastToken != null || curToken != null || peekToken != null) diff --git a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Lexer.cs b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Lexer.cs index eee9491d28..87f4e39fda 100644 --- a/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Lexer.cs +++ b/src/Libraries/NRefactory/Project/Src/Lexer/VBNet/Lexer.cs @@ -101,9 +101,7 @@ namespace ICSharpCode.NRefactory.Parser.VB for (int i = 0; i < step + 2; i++) ReaderRead(); - Token token = ReadXmlCommentOrCData(Col - 1, Line); - ReaderRead(); - return token; + return ReadXmlCommentOrCData(Col - 1, Line); } break; @@ -139,7 +137,6 @@ namespace ICSharpCode.NRefactory.Parser.VB ReaderRead(); Token token = ReadXmlCommentOrCData(x, y); info.wasComment = token.Kind == Tokens.XmlComment; - ReaderRead(); return token; } info.level++; @@ -364,7 +361,6 @@ namespace ICSharpCode.NRefactory.Parser.VB ReaderRead(); Token t = ReadXmlCommentOrCData(x, y); info.wasComment = t.Kind == Tokens.XmlComment; - ReaderRead(); return t; } if (ReaderPeek() == '?') { @@ -411,32 +407,24 @@ namespace ICSharpCode.NRefactory.Parser.VB sb.Length = 0; int nextChar = -1; - for (int i = 0; i < 7; i++) { - nextChar = ReaderPeek(); - if (nextChar > -1 && nextChar != '>') { - ReaderRead(); - sb.Append((char)nextChar); - } - } - - if (sb.ToString().StartsWith("--")) { - sb.Length = 0; + if (string.CompareOrdinal(ReaderPeekString("--".Length), "--") == 0) { + ReaderSkip("--".Length); while ((nextChar = ReaderRead()) != -1) { sb.Append((char)nextChar); - if (ReaderPeek() == '>' && sb.ToString().EndsWith("--")) { - string text = sb.Remove(sb.Length - 2, 2).ToString(); - return new Token(Tokens.XmlComment, x, y, text); + if (string.CompareOrdinal(ReaderPeekString("-->".Length), "-->") == 0) { + ReaderSkip("-->".Length); + return new Token(Tokens.XmlComment, new Location(x, y), new Location(Col, Line), sb.ToString(), null, LiteralFormat.None); } } } - if (sb.ToString().StartsWith("[CDATA[")) { - sb.Length = 0; + if (string.CompareOrdinal(ReaderPeekString("[CDATA[".Length), "[CDATA[") == 0) { + ReaderSkip("[CDATA[".Length); while ((nextChar = ReaderRead()) != -1) { sb.Append((char)nextChar); - if (ReaderPeek() == '>' && sb.ToString().EndsWith("]]")) { - string text = sb.Remove(sb.Length - 2, 2).ToString(); - return new Token(Tokens.XmlCData, x, y, text); + if (string.CompareOrdinal(ReaderPeekString("]]>".Length), "]]>") == 0) { + ReaderSkip("]]>".Length); + return new Token(Tokens.XmlCData, new Location(x, y), new Location(Col, Line), sb.ToString(), null, LiteralFormat.None); } } } diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.atg b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.atg index a596495960..8cf0399483 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.atg +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.atg @@ -437,16 +437,17 @@ UnaryOperator = SimpleExpressionWithSuffix = { UnaryOperator } ( - SimpleExpression { ExpressionSuffix } - | "TypeOf" SimpleExpressionWithSuffix "Is" TypeName - | NewExpression - ). + SimpleExpression { ExpressionSuffix } + | "TypeOf" SimpleExpressionWithSuffix "Is" TypeName + | NewExpression + ) +. SimpleExpression = ( Literal | ( "(" Expression ")" ) | IdentifierForExpressionStart - | ( "." | "!" ) IdentifierOrKeyword + | ( "." | "!" | ".@" | "..." ) (. nextTokenIsStartOfImportsOrAccessExpression = true; .) [ XmlOpenTag ] IdentifierOrKeyword [ XmlCloseTag ] | "GetType" "(" TypeName ")" | "GetXmlNamespace" "(" (. readXmlIdentifier = true; .) Identifier ")" | XmlLiteral diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.cs index 782e11f751..c88e626712 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.cs @@ -88,6 +88,8 @@ namespace ICSharpCode.NRefactory.Parser.VBNet.Experimental currentState = startOfExpression; break; } + + Advance(); } public string Output { diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/Parser.cs index 33b47efd11..9bb4ded3b7 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/Parser.cs @@ -65,7 +65,7 @@ partial class ExpressionFinder { if (la == null) { currentState = 1; break; } if (la.kind == 173) { stateStack.Push(1); - goto case 438; + goto case 439; } else { goto case 2; } @@ -74,7 +74,7 @@ partial class ExpressionFinder { if (la == null) { currentState = 2; break; } if (la.kind == 137) { stateStack.Push(2); - goto case 435; + goto case 436; } else { goto case 3; } @@ -102,7 +102,7 @@ partial class ExpressionFinder { case 5: { if (la == null) { currentState = 5; break; } if (la.kind == 160) { - goto case 431; + goto case 432; } else { if (set[1, la.kind]) { goto case 7; @@ -132,7 +132,7 @@ partial class ExpressionFinder { break; } else { if (la.kind == 84 || la.kind == 155 || la.kind == 209) { - currentState = 336; + currentState = 337; break; } else { if (la.kind == 103) { @@ -170,7 +170,7 @@ partial class ExpressionFinder { case 13: { if (la == null) { currentState = 13; break; } if (la.kind == 37) { - currentState = 334; + currentState = 335; break; } else { goto case 14; @@ -205,7 +205,7 @@ partial class ExpressionFinder { case 18: { if (la == null) { currentState = 18; break; } if (set[3, la.kind]) { - goto case 333; + goto case 334; } else { Error(la); goto case 19; @@ -256,7 +256,7 @@ partial class ExpressionFinder { case 25: { if (la == null) { currentState = 25; break; } if (la.kind == 169) { - goto case 330; + goto case 331; } else { if (set[4, la.kind]) { goto case 27; @@ -292,7 +292,7 @@ partial class ExpressionFinder { case 30: { if (la == null) { currentState = 30; break; } if (set[6, la.kind]) { - goto case 326; + goto case 327; } else { if (la.kind == 22) { goto case 31; @@ -628,8 +628,8 @@ partial class ExpressionFinder { if (set[15, la.kind]) { goto case 16; } else { - if (la.kind == 26 || la.kind == 29) { - currentState = 50; + if (set[13, la.kind]) { + currentState = 326; break; } else { if (la.kind == 129) { @@ -2636,201 +2636,205 @@ partial class ExpressionFinder { break; } case 326: { - stateStack.Push(327); - goto case 35; + nextTokenIsStartOfImportsOrAccessExpression = true; + goto case 63; } case 327: { - if (la == null) { currentState = 327; break; } + stateStack.Push(328); + goto case 35; + } + case 328: { + if (la == null) { currentState = 328; break; } if (la.kind == 22) { - currentState = 328; + currentState = 329; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 328: { + case 329: { nextTokenIsPotentialStartOfXmlMode = true; - goto case 329; + goto case 330; } - case 329: { - if (la == null) { currentState = 329; break; } + case 330: { + if (la == null) { currentState = 330; break; } if (set[6, la.kind]) { - goto case 326; - } else { goto case 327; + } else { + goto case 328; } } - case 330: { - if (la == null) { currentState = 330; break; } - currentState = 331; - break; - } case 331: { if (la == null) { currentState = 331; break; } + currentState = 332; + break; + } + case 332: { + if (la == null) { currentState = 332; break; } if (set[3, la.kind]) { - stateStack.Push(332); + stateStack.Push(333); goto case 18; } else { - goto case 332; + goto case 333; } } - case 332: { - if (la == null) { currentState = 332; break; } + case 333: { + if (la == null) { currentState = 333; break; } if (la.kind == 22) { - goto case 330; + goto case 331; } else { goto case 26; } } - case 333: { - if (la == null) { currentState = 333; break; } + case 334: { + if (la == null) { currentState = 334; break; } currentState = 19; break; } - case 334: { - if (la == null) { currentState = 334; break; } + case 335: { + if (la == null) { currentState = 335; break; } if (set[22, la.kind]) { - stateStack.Push(335); + stateStack.Push(336); goto case 293; } else { - goto case 335; + goto case 336; } } - case 335: { - if (la == null) { currentState = 335; break; } + case 336: { + if (la == null) { currentState = 336; break; } Expect(38, la); // ")" currentState = 14; break; } - case 336: { + case 337: { PushContext(Context.IdentifierExpected, t); - goto case 337; + goto case 338; } - case 337: { - if (la == null) { currentState = 337; break; } - currentState = 338; + case 338: { + if (la == null) { currentState = 338; break; } + currentState = 339; break; } - case 338: { + case 339: { PopContext(); - goto case 339; + goto case 340; } - case 339: { - if (la == null) { currentState = 339; break; } + case 340: { + if (la == null) { currentState = 340; break; } if (la.kind == 37) { - currentState = 419; + currentState = 420; break; } else { - goto case 340; + goto case 341; } } - case 340: { - if (la == null) { currentState = 340; break; } + case 341: { + if (la == null) { currentState = 341; break; } if (set[43, la.kind]) { - currentState = 340; + currentState = 341; break; } else { if (la.kind == 1 || la.kind == 21) { - currentState = 341; + currentState = 342; break; } else { - goto case 341; + goto case 342; } } } - case 341: { - if (la == null) { currentState = 341; break; } + case 342: { + if (la == null) { currentState = 342; break; } if (la.kind == 140) { - goto case 417; + goto case 418; } else { - goto case 342; + goto case 343; } } - case 342: { - if (la == null) { currentState = 342; break; } + case 343: { + if (la == null) { currentState = 343; break; } if (la.kind == 136) { - goto case 415; + goto case 416; } else { - goto case 343; + goto case 344; } } - case 343: { + case 344: { PushContext(Context.Type, t); - goto case 344; + goto case 345; } - case 344: { - if (la == null) { currentState = 344; break; } + case 345: { + if (la == null) { currentState = 345; break; } if (set[44, la.kind]) { - stateStack.Push(344); + stateStack.Push(345); PushContext(Context.Member, t); - goto case 348; + goto case 349; } else { Expect(113, la); // "End" - currentState = 345; + currentState = 346; break; } } - case 345: { - if (la == null) { currentState = 345; break; } + case 346: { + if (la == null) { currentState = 346; break; } if (la.kind == 84 || la.kind == 155 || la.kind == 209) { - currentState = 346; + currentState = 347; break; } else { Error(la); - goto case 346; + goto case 347; } } - case 346: { - stateStack.Push(347); + case 347: { + stateStack.Push(348); goto case 15; } - case 347: { + case 348: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 348: { - if (la == null) { currentState = 348; break; } + case 349: { + if (la == null) { currentState = 349; break; } if (la.kind == 40) { - stateStack.Push(348); + stateStack.Push(349); goto case 299; } else { - goto case 349; + goto case 350; } } - case 349: { - if (la == null) { currentState = 349; break; } + case 350: { + if (la == null) { currentState = 350; break; } if (set[45, la.kind]) { - currentState = 349; + currentState = 350; break; } else { if (set[46, la.kind]) { - stateStack.Push(350); - goto case 407; + stateStack.Push(351); + goto case 408; } else { if (la.kind == 127 || la.kind == 210) { - stateStack.Push(350); - goto case 395; + stateStack.Push(351); + goto case 396; } else { if (la.kind == 101) { - stateStack.Push(350); - goto case 386; + stateStack.Push(351); + goto case 387; } else { if (la.kind == 119) { - stateStack.Push(350); - goto case 375; + stateStack.Push(351); + goto case 376; } else { if (la.kind == 98) { - stateStack.Push(350); - goto case 363; + stateStack.Push(351); + goto case 364; } else { if (la.kind == 172) { - stateStack.Push(350); - goto case 351; + stateStack.Push(351); + goto case 352; } else { Error(la); - goto case 350; + goto case 351; } } } @@ -2839,354 +2843,354 @@ partial class ExpressionFinder { } } } - case 350: { + case 351: { PopContext(); currentState = stateStack.Pop(); goto switchlbl; } - case 351: { - if (la == null) { currentState = 351; break; } + case 352: { + if (la == null) { currentState = 352; break; } Expect(172, la); // "Operator" - currentState = 352; + currentState = 353; break; } - case 352: { + case 353: { PushContext(Context.IdentifierExpected, t); - goto case 353; + goto case 354; } - case 353: { - if (la == null) { currentState = 353; break; } - currentState = 354; + case 354: { + if (la == null) { currentState = 354; break; } + currentState = 355; break; } - case 354: { + case 355: { PopContext(); - goto case 355; + goto case 356; } - case 355: { - if (la == null) { currentState = 355; break; } + case 356: { + if (la == null) { currentState = 356; break; } Expect(37, la); // "(" - currentState = 356; + currentState = 357; break; } - case 356: { - stateStack.Push(357); + case 357: { + stateStack.Push(358); goto case 293; } - case 357: { - if (la == null) { currentState = 357; break; } + case 358: { + if (la == null) { currentState = 358; break; } Expect(38, la); // ")" - currentState = 358; + currentState = 359; break; } - case 358: { - if (la == null) { currentState = 358; break; } + case 359: { + if (la == null) { currentState = 359; break; } if (la.kind == 63) { - currentState = 362; + currentState = 363; break; } else { - goto case 359; + goto case 360; } } - case 359: { - stateStack.Push(360); + case 360: { + stateStack.Push(361); goto case 153; } - case 360: { - if (la == null) { currentState = 360; break; } + case 361: { + if (la == null) { currentState = 361; break; } Expect(113, la); // "End" - currentState = 361; + currentState = 362; break; } - case 361: { - if (la == null) { currentState = 361; break; } + case 362: { + if (la == null) { currentState = 362; break; } Expect(172, la); // "Operator" currentState = 15; break; } - case 362: { - if (la == null) { currentState = 362; break; } + case 363: { + if (la == null) { currentState = 363; break; } if (la.kind == 40) { - stateStack.Push(362); + stateStack.Push(363); goto case 299; } else { - stateStack.Push(359); + stateStack.Push(360); goto case 18; } } - case 363: { - if (la == null) { currentState = 363; break; } + case 364: { + if (la == null) { currentState = 364; break; } Expect(98, la); // "Custom" - currentState = 364; + currentState = 365; break; } - case 364: { - stateStack.Push(365); - goto case 375; - } case 365: { - if (la == null) { currentState = 365; break; } + stateStack.Push(366); + goto case 376; + } + case 366: { + if (la == null) { currentState = 366; break; } if (set[47, la.kind]) { - goto case 367; + goto case 368; } else { Expect(113, la); // "End" - currentState = 366; + currentState = 367; break; } } - case 366: { - if (la == null) { currentState = 366; break; } + case 367: { + if (la == null) { currentState = 367; break; } Expect(119, la); // "Event" currentState = 15; break; } - case 367: { - if (la == null) { currentState = 367; break; } + case 368: { + if (la == null) { currentState = 368; break; } if (la.kind == 40) { - stateStack.Push(367); + stateStack.Push(368); goto case 299; } else { if (la.kind == 56 || la.kind == 189 || la.kind == 193) { - currentState = 368; + currentState = 369; break; } else { Error(la); - goto case 368; + goto case 369; } } } - case 368: { - if (la == null) { currentState = 368; break; } + case 369: { + if (la == null) { currentState = 369; break; } Expect(37, la); // "(" - currentState = 369; + currentState = 370; break; } - case 369: { - stateStack.Push(370); + case 370: { + stateStack.Push(371); goto case 293; } - case 370: { - if (la == null) { currentState = 370; break; } + case 371: { + if (la == null) { currentState = 371; break; } Expect(38, la); // ")" - currentState = 371; + currentState = 372; break; } - case 371: { - stateStack.Push(372); + case 372: { + stateStack.Push(373); goto case 153; } - case 372: { - if (la == null) { currentState = 372; break; } + case 373: { + if (la == null) { currentState = 373; break; } Expect(113, la); // "End" - currentState = 373; + currentState = 374; break; } - case 373: { - if (la == null) { currentState = 373; break; } + case 374: { + if (la == null) { currentState = 374; break; } if (la.kind == 56 || la.kind == 189 || la.kind == 193) { - currentState = 374; + currentState = 375; break; } else { Error(la); - goto case 374; + goto case 375; } } - case 374: { - stateStack.Push(365); + case 375: { + stateStack.Push(366); goto case 15; } - case 375: { - if (la == null) { currentState = 375; break; } + case 376: { + if (la == null) { currentState = 376; break; } Expect(119, la); // "Event" - currentState = 376; + currentState = 377; break; } - case 376: { + case 377: { PushContext(Context.IdentifierExpected, t); - stateStack.Push(377); + stateStack.Push(378); goto case 98; } - case 377: { + case 378: { PopContext(); - goto case 378; + goto case 379; } - case 378: { - if (la == null) { currentState = 378; break; } + case 379: { + if (la == null) { currentState = 379; break; } if (la.kind == 63) { - currentState = 385; + currentState = 386; break; } else { if (set[48, la.kind]) { if (la.kind == 37) { - currentState = 383; + currentState = 384; break; } else { - goto case 379; + goto case 380; } } else { Error(la); - goto case 379; + goto case 380; } } } - case 379: { - if (la == null) { currentState = 379; break; } + case 380: { + if (la == null) { currentState = 380; break; } if (la.kind == 136) { - goto case 380; + goto case 381; } else { goto case 15; } } - case 380: { - if (la == null) { currentState = 380; break; } - currentState = 381; + case 381: { + if (la == null) { currentState = 381; break; } + currentState = 382; break; } - case 381: { - stateStack.Push(382); + case 382: { + stateStack.Push(383); goto case 18; } - case 382: { - if (la == null) { currentState = 382; break; } + case 383: { + if (la == null) { currentState = 383; break; } if (la.kind == 22) { - goto case 380; + goto case 381; } else { goto case 15; } } - case 383: { - if (la == null) { currentState = 383; break; } + case 384: { + if (la == null) { currentState = 384; break; } if (set[22, la.kind]) { - stateStack.Push(384); + stateStack.Push(385); goto case 293; } else { - goto case 384; + goto case 385; } } - case 384: { - if (la == null) { currentState = 384; break; } + case 385: { + if (la == null) { currentState = 385; break; } Expect(38, la); // ")" - currentState = 379; + currentState = 380; break; } - case 385: { - stateStack.Push(379); + case 386: { + stateStack.Push(380); goto case 18; } - case 386: { - if (la == null) { currentState = 386; break; } + case 387: { + if (la == null) { currentState = 387; break; } Expect(101, la); // "Declare" - currentState = 387; + currentState = 388; break; } - case 387: { - if (la == null) { currentState = 387; break; } + case 388: { + if (la == null) { currentState = 388; break; } if (la.kind == 62 || la.kind == 66 || la.kind == 223) { - currentState = 388; + currentState = 389; break; } else { - goto case 388; + goto case 389; } } - case 388: { - if (la == null) { currentState = 388; break; } + case 389: { + if (la == null) { currentState = 389; break; } if (la.kind == 127 || la.kind == 210) { - currentState = 389; + currentState = 390; break; } else { Error(la); - goto case 389; + goto case 390; } } - case 389: { + case 390: { PushContext(Context.IdentifierExpected, t); - stateStack.Push(390); + stateStack.Push(391); goto case 98; } - case 390: { - PopContext(); - goto case 391; - } case 391: { - if (la == null) { currentState = 391; break; } - Expect(149, la); // "Lib" - currentState = 392; - break; + PopContext(); + goto case 392; } case 392: { if (la == null) { currentState = 392; break; } - Expect(3, la); // LiteralString + Expect(149, la); // "Lib" currentState = 393; break; } case 393: { if (la == null) { currentState = 393; break; } + Expect(3, la); // LiteralString + currentState = 394; + break; + } + case 394: { + if (la == null) { currentState = 394; break; } if (la.kind == 59) { - currentState = 394; + currentState = 395; break; } else { goto case 13; } } - case 394: { - if (la == null) { currentState = 394; break; } + case 395: { + if (la == null) { currentState = 395; break; } Expect(3, la); // LiteralString currentState = 13; break; } - case 395: { - if (la == null) { currentState = 395; break; } + case 396: { + if (la == null) { currentState = 396; break; } if (la.kind == 127 || la.kind == 210) { - currentState = 396; + currentState = 397; break; } else { Error(la); - goto case 396; + goto case 397; } } - case 396: { + case 397: { PushContext(Context.IdentifierExpected, t); - goto case 397; + goto case 398; } - case 397: { - if (la == null) { currentState = 397; break; } - currentState = 398; + case 398: { + if (la == null) { currentState = 398; break; } + currentState = 399; break; } - case 398: { + case 399: { PopContext(); - goto case 399; + goto case 400; } - case 399: { - if (la == null) { currentState = 399; break; } + case 400: { + if (la == null) { currentState = 400; break; } if (la.kind == 37) { - currentState = 405; + currentState = 406; break; } else { - goto case 400; + goto case 401; } } - case 400: { - if (la == null) { currentState = 400; break; } + case 401: { + if (la == null) { currentState = 401; break; } if (la.kind == 63) { - currentState = 404; + currentState = 405; break; } else { - goto case 401; + goto case 402; } } - case 401: { - stateStack.Push(402); + case 402: { + stateStack.Push(403); goto case 153; } - case 402: { - if (la == null) { currentState = 402; break; } + case 403: { + if (la == null) { currentState = 403; break; } Expect(113, la); // "End" - currentState = 403; + currentState = 404; break; } - case 403: { - if (la == null) { currentState = 403; break; } + case 404: { + if (la == null) { currentState = 404; break; } if (la.kind == 127 || la.kind == 210) { currentState = 15; break; @@ -3195,181 +3199,181 @@ partial class ExpressionFinder { goto case 15; } } - case 404: { - stateStack.Push(401); + case 405: { + stateStack.Push(402); goto case 18; } - case 405: { - if (la == null) { currentState = 405; break; } + case 406: { + if (la == null) { currentState = 406; break; } if (set[22, la.kind]) { - stateStack.Push(406); + stateStack.Push(407); goto case 293; } else { - goto case 406; + goto case 407; } } - case 406: { - if (la == null) { currentState = 406; break; } + case 407: { + if (la == null) { currentState = 407; break; } Expect(38, la); // ")" - currentState = 400; + currentState = 401; break; } - case 407: { - if (la == null) { currentState = 407; break; } + case 408: { + if (la == null) { currentState = 408; break; } if (la.kind == 88) { - currentState = 408; + currentState = 409; break; } else { - goto case 408; + goto case 409; } } - case 408: { + case 409: { PushContext(Context.IdentifierExpected, t); - stateStack.Push(409); - goto case 414; + stateStack.Push(410); + goto case 415; } - case 409: { + case 410: { PopContext(); - goto case 410; + goto case 411; } - case 410: { - if (la == null) { currentState = 410; break; } + case 411: { + if (la == null) { currentState = 411; break; } if (la.kind == 63) { - currentState = 413; + currentState = 414; break; } else { - goto case 411; + goto case 412; } } - case 411: { - if (la == null) { currentState = 411; break; } + case 412: { + if (la == null) { currentState = 412; break; } if (la.kind == 20) { - currentState = 412; + currentState = 413; break; } else { goto case 15; } } - case 412: { + case 413: { stateStack.Push(15); goto case 35; } - case 413: { - stateStack.Push(411); + case 414: { + stateStack.Push(412); goto case 18; } - case 414: { - if (la == null) { currentState = 414; break; } + case 415: { + if (la == null) { currentState = 415; break; } if (set[49, la.kind]) { goto case 16; } else { goto case 6; } } - case 415: { - if (la == null) { currentState = 415; break; } - currentState = 416; - break; - } case 416: { if (la == null) { currentState = 416; break; } + currentState = 417; + break; + } + case 417: { + if (la == null) { currentState = 417; break; } if (set[26, la.kind]) { - goto case 415; + goto case 416; } else { - stateStack.Push(343); + stateStack.Push(344); goto case 15; } } - case 417: { - if (la == null) { currentState = 417; break; } - currentState = 418; - break; - } case 418: { if (la == null) { currentState = 418; break; } + currentState = 419; + break; + } + case 419: { + if (la == null) { currentState = 419; break; } if (set[26, la.kind]) { - goto case 417; + goto case 418; } else { - stateStack.Push(342); + stateStack.Push(343); goto case 15; } } - case 419: { - if (la == null) { currentState = 419; break; } + case 420: { + if (la == null) { currentState = 420; break; } Expect(169, la); // "Of" - currentState = 420; + currentState = 421; break; } - case 420: { - if (la == null) { currentState = 420; break; } + case 421: { + if (la == null) { currentState = 421; break; } if (la.kind == 138 || la.kind == 178) { - currentState = 421; + currentState = 422; break; } else { - goto case 421; + goto case 422; } } - case 421: { - stateStack.Push(422); - goto case 430; - } case 422: { - if (la == null) { currentState = 422; break; } + stateStack.Push(423); + goto case 431; + } + case 423: { + if (la == null) { currentState = 423; break; } if (la.kind == 63) { - currentState = 424; + currentState = 425; break; } else { - goto case 423; + goto case 424; } } - case 423: { - if (la == null) { currentState = 423; break; } + case 424: { + if (la == null) { currentState = 424; break; } if (la.kind == 22) { - currentState = 420; + currentState = 421; break; } else { Expect(38, la); // ")" - currentState = 340; + currentState = 341; break; } } - case 424: { - stateStack.Push(423); - goto case 425; - } case 425: { - if (la == null) { currentState = 425; break; } + stateStack.Push(424); + goto case 426; + } + case 426: { + if (la == null) { currentState = 426; break; } if (set[50, la.kind]) { - goto case 429; + goto case 430; } else { if (la.kind == 35) { - goto case 426; + goto case 427; } else { goto case 6; } } } - case 426: { - if (la == null) { currentState = 426; break; } - currentState = 427; - break; - } case 427: { - stateStack.Push(428); - goto case 429; + if (la == null) { currentState = 427; break; } + currentState = 428; + break; } case 428: { - if (la == null) { currentState = 428; break; } + stateStack.Push(429); + goto case 430; + } + case 429: { + if (la == null) { currentState = 429; break; } if (la.kind == 22) { - goto case 426; + goto case 427; } else { goto case 49; } } - case 429: { - if (la == null) { currentState = 429; break; } + case 430: { + if (la == null) { currentState = 430; break; } if (set[3, la.kind]) { - goto case 333; + goto case 334; } else { if (la.kind == 84 || la.kind == 162 || la.kind == 209) { goto case 16; @@ -3378,74 +3382,74 @@ partial class ExpressionFinder { } } } - case 430: { - if (la == null) { currentState = 430; break; } + case 431: { + if (la == null) { currentState = 431; break; } if (set[51, la.kind]) { goto case 16; } else { goto case 6; } } - case 431: { - if (la == null) { currentState = 431; break; } - currentState = 432; - break; - } case 432: { if (la == null) { currentState = 432; break; } + currentState = 433; + break; + } + case 433: { + if (la == null) { currentState = 433; break; } if (set[26, la.kind]) { - goto case 431; + goto case 432; } else { - stateStack.Push(433); + stateStack.Push(434); goto case 15; } } - case 433: { - if (la == null) { currentState = 433; break; } + case 434: { + if (la == null) { currentState = 434; break; } if (set[52, la.kind]) { - stateStack.Push(433); + stateStack.Push(434); goto case 5; } else { Expect(113, la); // "End" - currentState = 434; + currentState = 435; break; } } - case 434: { - if (la == null) { currentState = 434; break; } + case 435: { + if (la == null) { currentState = 435; break; } Expect(160, la); // "Namespace" currentState = 15; break; } - case 435: { - if (la == null) { currentState = 435; break; } + case 436: { + if (la == null) { currentState = 436; break; } Expect(137, la); // "Imports" - currentState = 436; + currentState = 437; break; } - case 436: { + case 437: { nextTokenIsStartOfImportsOrAccessExpression = true; - goto case 437; + goto case 438; } - case 437: { - if (la == null) { currentState = 437; break; } + case 438: { + if (la == null) { currentState = 438; break; } if (set[26, la.kind]) { - currentState = 437; + currentState = 438; break; } else { goto case 15; } } - case 438: { - if (la == null) { currentState = 438; break; } + case 439: { + if (la == null) { currentState = 439; break; } Expect(173, la); // "Option" - currentState = 439; + currentState = 440; break; } - case 439: { - if (la == null) { currentState = 439; break; } + case 440: { + if (la == null) { currentState = 440; break; } if (set[26, la.kind]) { - currentState = 439; + currentState = 440; break; } else { goto case 15; @@ -3468,12 +3472,12 @@ partial class ExpressionFinder { {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, 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,T, T,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, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,T,x,T, T,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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,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,T,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,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,x,T,x, x,x,T,x, x,T,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,x,x,x, T,T,T,T, T,T,x,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,x,x, x,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,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,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, T,T,x,x, x,T,x,T, T,x,x,T, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x}, - {x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,x,T,x, x,x,T,x, x,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,x,x,x, T,T,T,T, T,T,x,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,x,x, x,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,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,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, T,T,x,x, x,T,x,T, T,x,x,T, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x}, - {x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,T,x, x,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,x,x,x, T,T,T,T, T,T,x,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,x,x, x,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,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,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, T,T,x,x, x,T,x,T, T,x,x,T, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,x,T,x, x,x,T,T, T,T,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,x,x,x, T,T,T,T, T,T,x,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,x,x, x,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,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,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, T,T,x,x, x,T,x,T, T,x,x,T, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,x,T,x, x,x,T,T, T,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,x,x,x, T,T,T,T, T,T,x,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,x,x, x,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,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,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, T,T,x,x, x,T,x,T, T,x,x,T, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,T,T, T,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,x,x,x, T,T,T,T, T,T,x,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,x,x, x,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,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,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, T,T,x,x, x,T,x,T, T,x,x,T, 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, x,x,x,x, T,x,x,T, T,T,x,x, x,x,T,T, T,x,T,x, x,x,x,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, x,x,x,x, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,T,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, x,x,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, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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,T,x,T, x,x,x,x, x,x,T,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,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,x,x,x, T,T,T,T, T,T,x,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,x,x, x,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,x,x, x,T,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,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, T,T,x,x, x,T,x,T, x,x,x,T, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,T,T, T,T,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,x,x,x, T,T,T,T, T,T,x,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,x,x, x,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,x,x, x,T,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,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, T,T,x,x, x,T,x,T, x,x,x,T, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x}, {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,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,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,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, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, @@ -3484,19 +3488,19 @@ partial class ExpressionFinder { {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,T,x,T, x,T,T,x, x,x,T,T, T,T,x,T, T,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, 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,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,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, 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,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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,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,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, 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,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,T,x, x,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,x,x,x, T,T,T,T, T,T,x,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, T,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,x,x, x,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,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,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, T,T,x,x, x,T,x,T, T,x,x,T, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,T,T, T,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,x,x,x, T,T,T,T, T,T,x,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, T,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,x,x, x,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,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,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, T,T,x,x, x,T,x,T, T,x,x,T, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x}, {x,T,T,T, T,T,T,T, T,T,T,T, 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,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,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, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x}, {x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,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,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,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,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,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,T,x,x, x,x,T,x, x,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,T,x,x, T,T,T,T, T,T,x,T, x,T,T,T, T,T,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,T,T,T, T,x,x,x, x,T,x,x, T,T,T,x, T,T,T,x, T,x,T,T, x,T,x,x, T,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,x,x, x,x,T,T, x,x,x,x, T,x,T,x, x,x,x,x, T,x,x,x, x,T,x,T, x,T,T,T, x,T,x,x, x,x,x,T, T,x,T,x, x,x,T,T, T,T,x,T, x,T,T,T, T,x,x,T, T,x,T,x, x,x,T,T, x,T,x,x, x,T,x,x}, - {x,T,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,T,x,x, x,x,T,x, x,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,T,x,x, T,T,T,T, T,T,x,T, x,T,T,T, T,T,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,T,T,T, T,x,x,x, x,x,x,x, T,T,T,x, T,T,T,x, T,x,T,T, x,T,x,x, T,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,x,x, x,x,T,T, x,x,x,x, T,x,T,x, x,x,x,x, T,x,x,x, x,T,x,T, x,T,T,T, x,T,x,x, x,x,x,T, T,x,T,x, x,x,T,T, T,T,x,T, x,T,T,T, T,x,x,T, T,x,T,x, x,x,T,T, x,T,x,x, x,T,x,x}, - {x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,T,x, x,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,T,x,x, T,T,T,T, T,T,x,T, x,T,T,T, T,T,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,T,T,T, T,x,x,x, x,x,x,x, T,T,T,x, T,T,T,x, T,x,T,T, x,T,x,x, T,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,x,x, x,x,T,T, x,x,x,x, T,x,T,x, x,x,x,x, T,x,x,x, x,T,x,T, x,T,T,T, x,T,x,x, x,x,x,T, T,x,T,x, x,x,T,T, T,T,x,T, x,T,T,T, T,x,x,T, T,x,T,x, x,x,T,T, x,T,x,x, x,T,x,x}, + {x,T,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,T,x,x, x,x,T,T, T,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,T,x,x, T,T,T,T, T,T,x,T, x,T,T,T, T,T,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,T,T,T, T,x,x,x, x,T,x,x, T,T,T,x, T,T,T,x, T,x,T,T, x,T,x,x, T,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,x,x, x,x,T,T, x,x,x,x, T,x,T,x, x,x,x,x, T,x,x,x, x,T,x,T, x,T,T,T, x,T,x,x, x,x,x,T, T,x,T,x, x,x,T,T, T,T,x,T, x,T,T,T, T,x,x,T, T,x,T,x, x,x,T,T, x,T,x,x, x,T,x,x}, + {x,T,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,T,x,x, x,x,T,T, T,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,T,x,x, T,T,T,T, T,T,x,T, x,T,T,T, T,T,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,T,T,T, T,x,x,x, x,x,x,x, T,T,T,x, T,T,T,x, T,x,T,T, x,T,x,x, T,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,x,x, x,x,T,T, x,x,x,x, T,x,T,x, x,x,x,x, T,x,x,x, x,T,x,T, x,T,T,T, x,T,x,x, x,x,x,T, T,x,T,x, x,x,T,T, T,T,x,T, x,T,T,T, T,x,x,T, T,x,T,x, x,x,T,T, x,T,x,x, x,T,x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,T,T, T,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,T,x,x, T,T,T,T, T,T,x,T, x,T,T,T, T,T,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,T,T,T, T,x,x,x, x,x,x,x, T,T,T,x, T,T,T,x, T,x,T,T, x,T,x,x, T,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,x,x, x,x,T,T, x,x,x,x, T,x,T,x, x,x,x,x, T,x,x,x, x,T,x,T, x,T,T,T, x,T,x,x, x,x,x,T, T,x,T,x, x,x,T,T, T,T,x,T, x,T,T,T, T,x,x,T, T,x,T,x, x,x,T,T, x,T,x,x, x,T,x,x}, {x,x,T,T, T,T,T,T, T,T,T,T, T,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,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,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,T,x,T, x,x,x,x, x,x,T,x, x,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,T,x,x, T,T,T,T, T,T,x,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,x,x, x,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,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,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, T,T,x,x, x,T,x,T, T,x,x,T, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, x,x,x,x, x,x,T,T, T,T,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,T,T,x, x,x,T,x, T,T,T,T, x,x,T,x, x,T,x,x, T,T,T,T, T,T,x,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,x,x, x,T,x,T, x,x,x,T, x,x,x,T, x,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,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,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, T,T,x,x, x,T,x,T, T,x,x,T, 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, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,T,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,T, 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,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,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,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, 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,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,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,T, 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, T,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,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,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, T,x,x,x, x,x,T,x, x,T,T,T, x,x,x,x, x,T,x,T, T,T,T,T, 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,x,T,x, x,x,x,x, T,T,T,T, T,T,x,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,x,x, x,T,x,T, x,x,x,T, x,x,x,T, T,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,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,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, T,T,x,x, x,T,x,T, T,x,x,T, T,x,x,x, x,x,T,x, x,x,x,x, x,T,x,x}, + {x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,T, T,x,x,x, x,x,T,T, T,T,T,T, x,x,x,x, x,T,x,T, T,T,T,T, 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,x,T,x, x,x,x,x, T,T,T,T, T,T,x,T, x,T,T,T, x,x,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,x,T,T, x,x,x,x, x,x,x,x, T,x,x,x, x,T,T,x, x,x,T,T, x,T,x,x, x,T,x,T, x,x,x,T, x,x,x,T, T,x,T,T, x,x,x,x, x,T,x,x, x,x,T,T, x,x,T,x, T,T,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,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,T,x, T,T,x,x, x,T,x,T, T,x,x,T, 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, 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,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, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,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,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,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, x,x,x,x, x,x,x,x, x,x,x,x}, diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs index 71e915f7b5..28012b3030 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Parser.cs @@ -181,7 +181,7 @@ out u); void GlobalAttributeSection() { Expect(40); -#line 2692 "VBNET.ATG" +#line 2739 "VBNET.ATG" Location startPos = t.Location; if (la.kind == 65) { lexer.NextToken(); @@ -189,20 +189,20 @@ out u); lexer.NextToken(); } else SynErr(242); -#line 2694 "VBNET.ATG" +#line 2741 "VBNET.ATG" string attributeTarget = t.val != null ? t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture) : null; List attributes = new List(); ASTAttribute attribute; Expect(21); Attribute( -#line 2698 "VBNET.ATG" +#line 2745 "VBNET.ATG" out attribute); -#line 2698 "VBNET.ATG" +#line 2745 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2699 "VBNET.ATG" +#line 2746 "VBNET.ATG" NotFinalComma()) { if (la.kind == 22) { lexer.NextToken(); @@ -214,10 +214,10 @@ NotFinalComma()) { Expect(21); } Attribute( -#line 2699 "VBNET.ATG" +#line 2746 "VBNET.ATG" out attribute); -#line 2699 "VBNET.ATG" +#line 2746 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 22) { @@ -226,7 +226,7 @@ out attribute); Expect(39); EndOfStmt(); -#line 2704 "VBNET.ATG" +#line 2751 "VBNET.ATG" AttributeSection section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -352,47 +352,47 @@ out aliasedType); } void Qualident( -#line 3448 "VBNET.ATG" +#line 3495 "VBNET.ATG" out string qualident) { -#line 3450 "VBNET.ATG" +#line 3497 "VBNET.ATG" string name; qualidentBuilder.Length = 0; Identifier(); -#line 3454 "VBNET.ATG" +#line 3501 "VBNET.ATG" qualidentBuilder.Append(t.val); while ( -#line 3455 "VBNET.ATG" +#line 3502 "VBNET.ATG" DotAndIdentOrKw()) { Expect(26); IdentifierOrKeyword( -#line 3455 "VBNET.ATG" +#line 3502 "VBNET.ATG" out name); -#line 3455 "VBNET.ATG" +#line 3502 "VBNET.ATG" qualidentBuilder.Append('.'); qualidentBuilder.Append(name); } -#line 3457 "VBNET.ATG" +#line 3504 "VBNET.ATG" qualident = qualidentBuilder.ToString(); } void TypeName( -#line 2565 "VBNET.ATG" +#line 2612 "VBNET.ATG" out TypeReference typeref) { -#line 2566 "VBNET.ATG" +#line 2613 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2568 "VBNET.ATG" +#line 2615 "VBNET.ATG" out typeref, false); ArrayTypeModifiers( -#line 2572 "VBNET.ATG" +#line 2619 "VBNET.ATG" out rank); -#line 2573 "VBNET.ATG" +#line 2620 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -423,35 +423,35 @@ out rank); } void AttributeSection( -#line 2767 "VBNET.ATG" +#line 2814 "VBNET.ATG" out AttributeSection section) { -#line 2769 "VBNET.ATG" +#line 2816 "VBNET.ATG" string attributeTarget = "";List attributes = new List(); ASTAttribute attribute; Expect(40); -#line 2773 "VBNET.ATG" +#line 2820 "VBNET.ATG" Location startPos = t.Location; if ( -#line 2774 "VBNET.ATG" +#line 2821 "VBNET.ATG" IsLocalAttrTarget()) { if (la.kind == 119) { lexer.NextToken(); -#line 2775 "VBNET.ATG" +#line 2822 "VBNET.ATG" attributeTarget = "event"; } else if (la.kind == 195) { lexer.NextToken(); -#line 2776 "VBNET.ATG" +#line 2823 "VBNET.ATG" attributeTarget = "return"; } else { Identifier(); -#line 2779 "VBNET.ATG" +#line 2826 "VBNET.ATG" string val = t.val.ToLower(System.Globalization.CultureInfo.InvariantCulture); if (val != "field" || val != "method" || val != "module" || val != "param" || @@ -464,20 +464,20 @@ IsLocalAttrTarget()) { Expect(21); } Attribute( -#line 2789 "VBNET.ATG" +#line 2836 "VBNET.ATG" out attribute); -#line 2789 "VBNET.ATG" +#line 2836 "VBNET.ATG" attributes.Add(attribute); while ( -#line 2790 "VBNET.ATG" +#line 2837 "VBNET.ATG" NotFinalComma()) { Expect(22); Attribute( -#line 2790 "VBNET.ATG" +#line 2837 "VBNET.ATG" out attribute); -#line 2790 "VBNET.ATG" +#line 2837 "VBNET.ATG" attributes.Add(attribute); } if (la.kind == 22) { @@ -485,7 +485,7 @@ out attribute); } Expect(39); -#line 2794 "VBNET.ATG" +#line 2841 "VBNET.ATG" section = new AttributeSection { AttributeTarget = attributeTarget, Attributes = attributes, @@ -496,69 +496,69 @@ out attribute); } void TypeModifier( -#line 3533 "VBNET.ATG" +#line 3580 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 188: { lexer.NextToken(); -#line 3534 "VBNET.ATG" +#line 3581 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 187: { lexer.NextToken(); -#line 3535 "VBNET.ATG" +#line 3582 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 125: { lexer.NextToken(); -#line 3536 "VBNET.ATG" +#line 3583 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 185: { lexer.NextToken(); -#line 3537 "VBNET.ATG" +#line 3584 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 200: { lexer.NextToken(); -#line 3538 "VBNET.ATG" +#line 3585 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 199: { lexer.NextToken(); -#line 3539 "VBNET.ATG" +#line 3586 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 156: { lexer.NextToken(); -#line 3540 "VBNET.ATG" +#line 3587 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 166: { lexer.NextToken(); -#line 3541 "VBNET.ATG" +#line 3588 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 183: { lexer.NextToken(); -#line 3542 "VBNET.ATG" +#line 3589 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -1131,10 +1131,10 @@ m, attributes); } void NonArrayTypeName( -#line 2591 "VBNET.ATG" +#line 2638 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2593 "VBNET.ATG" +#line 2640 "VBNET.ATG" string name; typeref = null; bool isGlobal = false; @@ -1144,36 +1144,36 @@ out TypeReference typeref, bool canBeUnbound) { lexer.NextToken(); Expect(26); -#line 2598 "VBNET.ATG" +#line 2645 "VBNET.ATG" isGlobal = true; } QualIdentAndTypeArguments( -#line 2599 "VBNET.ATG" +#line 2646 "VBNET.ATG" out typeref, canBeUnbound); -#line 2600 "VBNET.ATG" +#line 2647 "VBNET.ATG" typeref.IsGlobal = isGlobal; while (la.kind == 26) { lexer.NextToken(); -#line 2601 "VBNET.ATG" +#line 2648 "VBNET.ATG" TypeReference nestedTypeRef; QualIdentAndTypeArguments( -#line 2602 "VBNET.ATG" +#line 2649 "VBNET.ATG" out nestedTypeRef, canBeUnbound); -#line 2603 "VBNET.ATG" +#line 2650 "VBNET.ATG" typeref = new InnerClassTypeReference(typeref, nestedTypeRef.Type, nestedTypeRef.GenericTypes); } } else if (la.kind == 168) { lexer.NextToken(); -#line 2606 "VBNET.ATG" +#line 2653 "VBNET.ATG" typeref = new TypeReference("System.Object", true); if (la.kind == 33) { lexer.NextToken(); -#line 2610 "VBNET.ATG" +#line 2657 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1181,15 +1181,15 @@ out nestedTypeRef, canBeUnbound); } } else if (StartOf(12)) { PrimitiveTypeName( -#line 2616 "VBNET.ATG" +#line 2663 "VBNET.ATG" out name); -#line 2616 "VBNET.ATG" +#line 2663 "VBNET.ATG" typeref = new TypeReference(name, true); if (la.kind == 33) { lexer.NextToken(); -#line 2620 "VBNET.ATG" +#line 2667 "VBNET.ATG" List typeArguments = new List(1); if (typeref != null) typeArguments.Add(typeref); typeref = new TypeReference("System.Nullable", typeArguments) { IsKeyword = true }; @@ -1275,162 +1275,162 @@ TypeDeclaration newType) { } void FormalParameterList( -#line 2804 "VBNET.ATG" +#line 2851 "VBNET.ATG" List parameter) { -#line 2805 "VBNET.ATG" +#line 2852 "VBNET.ATG" ParameterDeclarationExpression p; FormalParameter( -#line 2807 "VBNET.ATG" +#line 2854 "VBNET.ATG" out p); -#line 2807 "VBNET.ATG" +#line 2854 "VBNET.ATG" if (p != null) parameter.Add(p); while (la.kind == 22) { lexer.NextToken(); FormalParameter( -#line 2809 "VBNET.ATG" +#line 2856 "VBNET.ATG" out p); -#line 2809 "VBNET.ATG" +#line 2856 "VBNET.ATG" if (p != null) parameter.Add(p); } } void MemberModifier( -#line 3545 "VBNET.ATG" +#line 3592 "VBNET.ATG" ModifierList m) { switch (la.kind) { case 156: { lexer.NextToken(); -#line 3546 "VBNET.ATG" +#line 3593 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 102: { lexer.NextToken(); -#line 3547 "VBNET.ATG" +#line 3594 "VBNET.ATG" m.Add(Modifiers.Default, t.Location); break; } case 125: { lexer.NextToken(); -#line 3548 "VBNET.ATG" +#line 3595 "VBNET.ATG" m.Add(Modifiers.Internal, t.Location); break; } case 199: { lexer.NextToken(); -#line 3549 "VBNET.ATG" +#line 3596 "VBNET.ATG" m.Add(Modifiers.New, t.Location); break; } case 181: { lexer.NextToken(); -#line 3550 "VBNET.ATG" +#line 3597 "VBNET.ATG" m.Add(Modifiers.Override, t.Location); break; } case 157: { lexer.NextToken(); -#line 3551 "VBNET.ATG" +#line 3598 "VBNET.ATG" m.Add(Modifiers.Abstract, t.Location); break; } case 185: { lexer.NextToken(); -#line 3552 "VBNET.ATG" +#line 3599 "VBNET.ATG" m.Add(Modifiers.Private, t.Location); break; } case 187: { lexer.NextToken(); -#line 3553 "VBNET.ATG" +#line 3600 "VBNET.ATG" m.Add(Modifiers.Protected, t.Location); break; } case 188: { lexer.NextToken(); -#line 3554 "VBNET.ATG" +#line 3601 "VBNET.ATG" m.Add(Modifiers.Public, t.Location); break; } case 166: { lexer.NextToken(); -#line 3555 "VBNET.ATG" +#line 3602 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 167: { lexer.NextToken(); -#line 3556 "VBNET.ATG" +#line 3603 "VBNET.ATG" m.Add(Modifiers.Sealed, t.Location); break; } case 200: { lexer.NextToken(); -#line 3557 "VBNET.ATG" +#line 3604 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); break; } case 180: { lexer.NextToken(); -#line 3558 "VBNET.ATG" +#line 3605 "VBNET.ATG" m.Add(Modifiers.Virtual, t.Location); break; } case 179: { lexer.NextToken(); -#line 3559 "VBNET.ATG" +#line 3606 "VBNET.ATG" m.Add(Modifiers.Overloads, t.Location); break; } case 190: { lexer.NextToken(); -#line 3560 "VBNET.ATG" +#line 3607 "VBNET.ATG" m.Add(Modifiers.ReadOnly, t.Location); break; } case 235: { lexer.NextToken(); -#line 3561 "VBNET.ATG" +#line 3608 "VBNET.ATG" m.Add(Modifiers.WriteOnly, t.Location); break; } case 234: { lexer.NextToken(); -#line 3562 "VBNET.ATG" +#line 3609 "VBNET.ATG" m.Add(Modifiers.WithEvents, t.Location); break; } case 105: { lexer.NextToken(); -#line 3563 "VBNET.ATG" +#line 3610 "VBNET.ATG" m.Add(Modifiers.Dim, t.Location); break; } case 183: { lexer.NextToken(); -#line 3564 "VBNET.ATG" +#line 3611 "VBNET.ATG" m.Add(Modifiers.Partial, t.Location); break; } @@ -2582,25 +2582,25 @@ out name); } void Block( -#line 2849 "VBNET.ATG" +#line 2896 "VBNET.ATG" out Statement stmt) { -#line 2852 "VBNET.ATG" +#line 2899 "VBNET.ATG" BlockStatement blockStmt = new BlockStatement(); /* in snippet parsing mode, t might be null */ if (t != null) blockStmt.StartLocation = t.EndLocation; BlockStart(blockStmt); while (StartOf(23) || -#line 2858 "VBNET.ATG" +#line 2905 "VBNET.ATG" IsEndStmtAhead()) { if ( -#line 2858 "VBNET.ATG" +#line 2905 "VBNET.ATG" IsEndStmtAhead()) { Expect(113); EndOfStmt(); -#line 2858 "VBNET.ATG" +#line 2905 "VBNET.ATG" AddChild(new EndStatement()); } else { Statement(); @@ -2608,7 +2608,7 @@ IsEndStmtAhead()) { } } -#line 2863 "VBNET.ATG" +#line 2910 "VBNET.ATG" stmt = blockStmt; if (t != null) blockStmt.EndLocation = t.EndLocation; BlockEnd(); @@ -2908,10 +2908,10 @@ out expr); } void ObjectCreateExpression( -#line 2017 "VBNET.ATG" +#line 2064 "VBNET.ATG" out Expression oce) { -#line 2019 "VBNET.ATG" +#line 2066 "VBNET.ATG" TypeReference type = null; CollectionInitializerExpression initializer = null; List arguments = null; @@ -2922,39 +2922,39 @@ out Expression oce) { Expect(162); if (StartOf(8)) { NonArrayTypeName( -#line 2027 "VBNET.ATG" +#line 2074 "VBNET.ATG" out type, false); if (la.kind == 37) { lexer.NextToken(); NormalOrReDimArgumentList( -#line 2028 "VBNET.ATG" +#line 2075 "VBNET.ATG" out arguments, out canBeNormal, out canBeReDim); Expect(38); if (la.kind == 35 || -#line 2029 "VBNET.ATG" +#line 2076 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { if ( -#line 2029 "VBNET.ATG" +#line 2076 "VBNET.ATG" la.kind == Tokens.OpenParenthesis) { ArrayTypeModifiers( -#line 2030 "VBNET.ATG" +#line 2077 "VBNET.ATG" out dimensions); CollectionInitializer( -#line 2031 "VBNET.ATG" +#line 2078 "VBNET.ATG" out initializer); } else { CollectionInitializer( -#line 2032 "VBNET.ATG" +#line 2079 "VBNET.ATG" out initializer); } } -#line 2034 "VBNET.ATG" +#line 2081 "VBNET.ATG" if (canBeReDim && !canBeNormal && initializer == null) initializer = new CollectionInitializerExpression(); } } -#line 2038 "VBNET.ATG" +#line 2085 "VBNET.ATG" if (initializer == null) { oce = new ObjectCreateExpression(type, arguments); } else { @@ -2969,34 +2969,34 @@ out initializer); if (la.kind == 126 || la.kind == 233) { if (la.kind == 233) { -#line 2053 "VBNET.ATG" +#line 2100 "VBNET.ATG" MemberInitializerExpression memberInitializer = null; lexer.NextToken(); -#line 2057 "VBNET.ATG" +#line 2104 "VBNET.ATG" CollectionInitializerExpression memberInitializers = new CollectionInitializerExpression(); memberInitializers.StartLocation = la.Location; Expect(35); MemberInitializer( -#line 2061 "VBNET.ATG" +#line 2108 "VBNET.ATG" out memberInitializer); -#line 2062 "VBNET.ATG" +#line 2109 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); while (la.kind == 22) { lexer.NextToken(); MemberInitializer( -#line 2064 "VBNET.ATG" +#line 2111 "VBNET.ATG" out memberInitializer); -#line 2065 "VBNET.ATG" +#line 2112 "VBNET.ATG" memberInitializers.CreateExpressions.Add(memberInitializer); } Expect(36); -#line 2069 "VBNET.ATG" +#line 2116 "VBNET.ATG" memberInitializers.EndLocation = t.Location; if(oce is ObjectCreateExpression) { @@ -3006,10 +3006,10 @@ out memberInitializer); } else { lexer.NextToken(); CollectionInitializer( -#line 2079 "VBNET.ATG" +#line 2126 "VBNET.ATG" out initializer); -#line 2081 "VBNET.ATG" +#line 2128 "VBNET.ATG" if(oce is ObjectCreateExpression) ((ObjectCreateExpression)oce).ObjectInitializer = initializer; @@ -3420,31 +3420,31 @@ out stmt); } void PropertyAccessorAccessModifier( -#line 3567 "VBNET.ATG" +#line 3614 "VBNET.ATG" out Modifiers m) { -#line 3568 "VBNET.ATG" +#line 3615 "VBNET.ATG" m = Modifiers.None; while (StartOf(29)) { if (la.kind == 188) { lexer.NextToken(); -#line 3570 "VBNET.ATG" +#line 3617 "VBNET.ATG" m |= Modifiers.Public; } else if (la.kind == 187) { lexer.NextToken(); -#line 3571 "VBNET.ATG" +#line 3618 "VBNET.ATG" m |= Modifiers.Protected; } else if (la.kind == 125) { lexer.NextToken(); -#line 3572 "VBNET.ATG" +#line 3619 "VBNET.ATG" m |= Modifiers.Internal; } else { lexer.NextToken(); -#line 3573 "VBNET.ATG" +#line 3620 "VBNET.ATG" m |= Modifiers.Private; } } @@ -3465,14 +3465,14 @@ out arrayModifiers); } void ArrayNameModifier( -#line 2644 "VBNET.ATG" +#line 2691 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2646 "VBNET.ATG" +#line 2693 "VBNET.ATG" arrayModifiers = null; ArrayTypeModifiers( -#line 2648 "VBNET.ATG" +#line 2695 "VBNET.ATG" out arrayModifiers); } @@ -3580,132 +3580,134 @@ out eventName); } void IdentifierOrKeyword( -#line 3500 "VBNET.ATG" +#line 3547 "VBNET.ATG" out string name) { lexer.NextToken(); -#line 3502 "VBNET.ATG" +#line 3549 "VBNET.ATG" name = t.val; } void QueryExpr( -#line 2168 "VBNET.ATG" +#line 2215 "VBNET.ATG" out Expression expr) { -#line 2170 "VBNET.ATG" +#line 2217 "VBNET.ATG" QueryExpressionVB qexpr = new QueryExpressionVB(); qexpr.StartLocation = la.Location; expr = qexpr; FromOrAggregateQueryOperator( -#line 2174 "VBNET.ATG" +#line 2221 "VBNET.ATG" qexpr.Clauses); while (StartOf(31)) { QueryOperator( -#line 2175 "VBNET.ATG" +#line 2222 "VBNET.ATG" qexpr.Clauses); } -#line 2177 "VBNET.ATG" +#line 2224 "VBNET.ATG" qexpr.EndLocation = t.EndLocation; } void LambdaExpr( -#line 2088 "VBNET.ATG" +#line 2135 "VBNET.ATG" out Expression expr) { -#line 2090 "VBNET.ATG" +#line 2137 "VBNET.ATG" LambdaExpression lambda = null; if (la.kind == 210) { SubLambdaExpression( -#line 2092 "VBNET.ATG" +#line 2139 "VBNET.ATG" out lambda); } else if (la.kind == 127) { FunctionLambdaExpression( -#line 2093 "VBNET.ATG" +#line 2140 "VBNET.ATG" out lambda); } else SynErr(273); -#line 2094 "VBNET.ATG" +#line 2141 "VBNET.ATG" expr = lambda; } void DisjunctionExpr( -#line 1861 "VBNET.ATG" +#line 1908 "VBNET.ATG" out Expression outExpr) { -#line 1863 "VBNET.ATG" +#line 1910 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConjunctionExpr( -#line 1866 "VBNET.ATG" +#line 1913 "VBNET.ATG" out outExpr); while (la.kind == 175 || la.kind == 177 || la.kind == 236) { if (la.kind == 175) { lexer.NextToken(); -#line 1869 "VBNET.ATG" +#line 1916 "VBNET.ATG" op = BinaryOperatorType.BitwiseOr; } else if (la.kind == 177) { lexer.NextToken(); -#line 1870 "VBNET.ATG" +#line 1917 "VBNET.ATG" op = BinaryOperatorType.LogicalOr; } else { lexer.NextToken(); -#line 1871 "VBNET.ATG" +#line 1918 "VBNET.ATG" op = BinaryOperatorType.ExclusiveOr; } ConjunctionExpr( -#line 1873 "VBNET.ATG" +#line 1920 "VBNET.ATG" out expr); -#line 1873 "VBNET.ATG" +#line 1920 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void XmlLiteralExpression( -#line 1770 "VBNET.ATG" +#line 1772 "VBNET.ATG" out Expression pexpr) { -#line 1772 "VBNET.ATG" +#line 1774 "VBNET.ATG" XmlLiteralExpression expr = new XmlLiteralExpression(); List exprs = expr.Expressions; XmlExpression currentExpression = null; + pexpr = expr; - if (la.kind == 16) { - lexer.NextToken(); - -#line 1778 "VBNET.ATG" - currentExpression = new XmlContentExpression(t.val, XmlContentType.Text); - } else if (la.kind == 18) { - lexer.NextToken(); - -#line 1779 "VBNET.ATG" - currentExpression = new XmlContentExpression(t.val, XmlContentType.CData); - } else if (la.kind == 17) { - lexer.NextToken(); - -#line 1780 "VBNET.ATG" - currentExpression = new XmlContentExpression(t.val, XmlContentType.Comment); - } else if (la.kind == 19) { - lexer.NextToken(); - + if (StartOf(32)) { + XmlContentExpression( +#line 1781 "VBNET.ATG" +exprs); + while (StartOf(32)) { + XmlContentExpression( +#line 1781 "VBNET.ATG" +exprs); + } + if (la.kind == 10) { + XmlElement( +#line 1781 "VBNET.ATG" +out currentExpression); + while (StartOf(32)) { + XmlContentExpression( #line 1781 "VBNET.ATG" - currentExpression = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); +exprs); + } + } + } else if (la.kind == 10) { + XmlElement( +#line 1783 "VBNET.ATG" +out currentExpression); + while (StartOf(32)) { + XmlContentExpression( +#line 1783 "VBNET.ATG" +exprs); + } } else SynErr(274); - -#line 1784 "VBNET.ATG" - currentExpression.StartLocation = t.Location; - currentExpression.EndLocation = t.EndLocation; - exprs.Add(currentExpression); - pexpr = expr; - } void AssignmentOperator( @@ -3798,7 +3800,7 @@ out Expression pexpr) { SimpleNonInvocationExpression( #line 1675 "VBNET.ATG" out pexpr); - while (StartOf(32)) { + while (StartOf(33)) { if (la.kind == 26) { lexer.NextToken(); if (la.kind == 10) { @@ -3810,7 +3812,7 @@ out name); #line 1679 "VBNET.ATG" pexpr = new XmlMemberAccessExpression(pexpr, XmlAxisType.Element, name, true); - } else if (StartOf(33)) { + } else if (StartOf(34)) { IdentifierOrKeyword( #line 1680 "VBNET.ATG" out name); @@ -3882,7 +3884,7 @@ out Expression pexpr) { string name = String.Empty; pexpr = null; - if (StartOf(34)) { + if (StartOf(35)) { switch (la.kind) { case 3: { lexer.NextToken(); @@ -4155,359 +4157,361 @@ out pexpr); break; } } - } else if (la.kind == 26) { - lexer.NextToken(); - if (la.kind == 10) { + } else if (la.kind == 26 || la.kind == 27 || la.kind == 28) { + if (la.kind == 26) { lexer.NextToken(); - IdentifierOrKeyword( -#line 1757 "VBNET.ATG" -out name); - Expect(11); - + if (la.kind == 10) { + lexer.NextToken(); + IdentifierOrKeyword( #line 1758 "VBNET.ATG" - pexpr = new XmlMemberAccessExpression(null, XmlAxisType.Element, name, true); - } else if (StartOf(33)) { - IdentifierOrKeyword( -#line 1759 "VBNET.ATG" out name); + Expect(11); +#line 1759 "VBNET.ATG" + pexpr = new XmlMemberAccessExpression(null, XmlAxisType.Element, name, true); + } else if (StartOf(34)) { + IdentifierOrKeyword( #line 1760 "VBNET.ATG" - pexpr = new MemberReferenceExpression(null, name); - } else SynErr(281); - } else if (la.kind == 27 || la.kind == 28) { - -#line 1762 "VBNET.ATG" - XmlAxisType axisType = XmlAxisType.Element; bool isXmlIdentifier = false; - if (la.kind == 27) { - lexer.NextToken(); +out name); -#line 1763 "VBNET.ATG" - axisType = XmlAxisType.Descendents; +#line 1761 "VBNET.ATG" + pexpr = new MemberReferenceExpression(null, name); + } else SynErr(281); } else { - lexer.NextToken(); #line 1763 "VBNET.ATG" - axisType = XmlAxisType.Attribute; - } - if (la.kind == 10) { - lexer.NextToken(); + XmlAxisType axisType = XmlAxisType.Element; bool isXmlIdentifier = false; + if (la.kind == 27) { + lexer.NextToken(); #line 1764 "VBNET.ATG" - isXmlIdentifier = true; - } - IdentifierOrKeyword( + axisType = XmlAxisType.Descendents; + } else if (la.kind == 28) { + lexer.NextToken(); + #line 1764 "VBNET.ATG" -out name); - if (la.kind == 11) { - lexer.NextToken(); - } + axisType = XmlAxisType.Attribute; + } else SynErr(282); + if (la.kind == 10) { + lexer.NextToken(); #line 1765 "VBNET.ATG" - pexpr = new XmlMemberAccessExpression(null, axisType, name, isXmlIdentifier); - } else SynErr(282); + isXmlIdentifier = true; + } + IdentifierOrKeyword( +#line 1765 "VBNET.ATG" +out name); + if (la.kind == 11) { + lexer.NextToken(); + } + +#line 1766 "VBNET.ATG" + pexpr = new XmlMemberAccessExpression(null, axisType, name, isXmlIdentifier); + } + } else SynErr(283); } void TypeArgumentList( -#line 2680 "VBNET.ATG" +#line 2727 "VBNET.ATG" List typeArguments) { -#line 2682 "VBNET.ATG" +#line 2729 "VBNET.ATG" TypeReference typeref; TypeName( -#line 2684 "VBNET.ATG" +#line 2731 "VBNET.ATG" out typeref); -#line 2684 "VBNET.ATG" +#line 2731 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); while (la.kind == 22) { lexer.NextToken(); TypeName( -#line 2687 "VBNET.ATG" +#line 2734 "VBNET.ATG" out typeref); -#line 2687 "VBNET.ATG" +#line 2734 "VBNET.ATG" if (typeref != null) typeArguments.Add(typeref); } } void InvocationExpression( -#line 1825 "VBNET.ATG" +#line 1872 "VBNET.ATG" ref Expression pexpr) { -#line 1826 "VBNET.ATG" +#line 1873 "VBNET.ATG" List parameters = null; Expect(37); -#line 1828 "VBNET.ATG" +#line 1875 "VBNET.ATG" Location start = t.Location; ArgumentList( -#line 1829 "VBNET.ATG" +#line 1876 "VBNET.ATG" out parameters); Expect(38); -#line 1832 "VBNET.ATG" +#line 1879 "VBNET.ATG" pexpr = new InvocationExpression(pexpr, parameters); -#line 1834 "VBNET.ATG" +#line 1881 "VBNET.ATG" pexpr.StartLocation = start; pexpr.EndLocation = t.Location; } void PrimitiveTypeName( -#line 3507 "VBNET.ATG" +#line 3554 "VBNET.ATG" out string type) { -#line 3508 "VBNET.ATG" +#line 3555 "VBNET.ATG" type = String.Empty; switch (la.kind) { case 68: { lexer.NextToken(); -#line 3509 "VBNET.ATG" +#line 3556 "VBNET.ATG" type = "System.Boolean"; break; } case 99: { lexer.NextToken(); -#line 3510 "VBNET.ATG" +#line 3557 "VBNET.ATG" type = "System.DateTime"; break; } case 82: { lexer.NextToken(); -#line 3511 "VBNET.ATG" +#line 3558 "VBNET.ATG" type = "System.Char"; break; } case 208: { lexer.NextToken(); -#line 3512 "VBNET.ATG" +#line 3559 "VBNET.ATG" type = "System.String"; break; } case 100: { lexer.NextToken(); -#line 3513 "VBNET.ATG" +#line 3560 "VBNET.ATG" type = "System.Decimal"; break; } case 71: { lexer.NextToken(); -#line 3514 "VBNET.ATG" +#line 3561 "VBNET.ATG" type = "System.Byte"; break; } case 201: { lexer.NextToken(); -#line 3515 "VBNET.ATG" +#line 3562 "VBNET.ATG" type = "System.Int16"; break; } case 141: { lexer.NextToken(); -#line 3516 "VBNET.ATG" +#line 3563 "VBNET.ATG" type = "System.Int32"; break; } case 151: { lexer.NextToken(); -#line 3517 "VBNET.ATG" +#line 3564 "VBNET.ATG" type = "System.Int64"; break; } case 202: { lexer.NextToken(); -#line 3518 "VBNET.ATG" +#line 3565 "VBNET.ATG" type = "System.Single"; break; } case 109: { lexer.NextToken(); -#line 3519 "VBNET.ATG" +#line 3566 "VBNET.ATG" type = "System.Double"; break; } case 221: { lexer.NextToken(); -#line 3520 "VBNET.ATG" +#line 3567 "VBNET.ATG" type = "System.UInt32"; break; } case 222: { lexer.NextToken(); -#line 3521 "VBNET.ATG" +#line 3568 "VBNET.ATG" type = "System.UInt64"; break; } case 225: { lexer.NextToken(); -#line 3522 "VBNET.ATG" +#line 3569 "VBNET.ATG" type = "System.UInt16"; break; } case 196: { lexer.NextToken(); -#line 3523 "VBNET.ATG" +#line 3570 "VBNET.ATG" type = "System.SByte"; break; } - default: SynErr(283); break; + default: SynErr(284); break; } } void CastTarget( -#line 1839 "VBNET.ATG" +#line 1886 "VBNET.ATG" out TypeReference type) { -#line 1841 "VBNET.ATG" +#line 1888 "VBNET.ATG" type = null; switch (la.kind) { case 76: { lexer.NextToken(); -#line 1843 "VBNET.ATG" +#line 1890 "VBNET.ATG" type = new TypeReference("System.Boolean", true); break; } case 77: { lexer.NextToken(); -#line 1844 "VBNET.ATG" +#line 1891 "VBNET.ATG" type = new TypeReference("System.Byte", true); break; } case 90: { lexer.NextToken(); -#line 1845 "VBNET.ATG" +#line 1892 "VBNET.ATG" type = new TypeReference("System.SByte", true); break; } case 78: { lexer.NextToken(); -#line 1846 "VBNET.ATG" +#line 1893 "VBNET.ATG" type = new TypeReference("System.Char", true); break; } case 79: { lexer.NextToken(); -#line 1847 "VBNET.ATG" +#line 1894 "VBNET.ATG" type = new TypeReference("System.DateTime", true); break; } case 81: { lexer.NextToken(); -#line 1848 "VBNET.ATG" +#line 1895 "VBNET.ATG" type = new TypeReference("System.Decimal", true); break; } case 80: { lexer.NextToken(); -#line 1849 "VBNET.ATG" +#line 1896 "VBNET.ATG" type = new TypeReference("System.Double", true); break; } case 91: { lexer.NextToken(); -#line 1850 "VBNET.ATG" +#line 1897 "VBNET.ATG" type = new TypeReference("System.Int16", true); break; } case 83: { lexer.NextToken(); -#line 1851 "VBNET.ATG" +#line 1898 "VBNET.ATG" type = new TypeReference("System.Int32", true); break; } case 85: { lexer.NextToken(); -#line 1852 "VBNET.ATG" +#line 1899 "VBNET.ATG" type = new TypeReference("System.Int64", true); break; } case 97: { lexer.NextToken(); -#line 1853 "VBNET.ATG" +#line 1900 "VBNET.ATG" type = new TypeReference("System.UInt16", true); break; } case 95: { lexer.NextToken(); -#line 1854 "VBNET.ATG" +#line 1901 "VBNET.ATG" type = new TypeReference("System.UInt32", true); break; } case 96: { lexer.NextToken(); -#line 1855 "VBNET.ATG" +#line 1902 "VBNET.ATG" type = new TypeReference("System.UInt64", true); break; } case 86: { lexer.NextToken(); -#line 1856 "VBNET.ATG" +#line 1903 "VBNET.ATG" type = new TypeReference("System.Object", true); break; } case 92: { lexer.NextToken(); -#line 1857 "VBNET.ATG" +#line 1904 "VBNET.ATG" type = new TypeReference("System.Single", true); break; } case 93: { lexer.NextToken(); -#line 1858 "VBNET.ATG" +#line 1905 "VBNET.ATG" type = new TypeReference("System.String", true); break; } - default: SynErr(284); break; + default: SynErr(285); break; } } void GetTypeTypeName( -#line 2579 "VBNET.ATG" +#line 2626 "VBNET.ATG" out TypeReference typeref) { -#line 2580 "VBNET.ATG" +#line 2627 "VBNET.ATG" ArrayList rank = null; NonArrayTypeName( -#line 2582 "VBNET.ATG" +#line 2629 "VBNET.ATG" out typeref, true); ArrayTypeModifiers( -#line 2583 "VBNET.ATG" +#line 2630 "VBNET.ATG" out rank); -#line 2584 "VBNET.ATG" +#line 2631 "VBNET.ATG" if (rank != null && typeref != null) { typeref.RankSpecifier = (int[])rank.ToArray(typeof(int)); } @@ -4515,10 +4519,10 @@ out rank); } void ConditionalExpression( -#line 1791 "VBNET.ATG" +#line 1838 "VBNET.ATG" out Expression expr) { -#line 1793 "VBNET.ATG" +#line 1840 "VBNET.ATG" ConditionalExpression conditionalExpression = new ConditionalExpression(); BinaryOperatorExpression binaryOperatorExpression = new BinaryOperatorExpression(); conditionalExpression.StartLocation = binaryOperatorExpression.StartLocation = la.Location; @@ -4530,21 +4534,21 @@ out Expression expr) { Expect(135); Expect(37); Expr( -#line 1802 "VBNET.ATG" +#line 1849 "VBNET.ATG" out condition); Expect(22); Expr( -#line 1802 "VBNET.ATG" +#line 1849 "VBNET.ATG" out trueExpr); if (la.kind == 22) { lexer.NextToken(); Expr( -#line 1802 "VBNET.ATG" +#line 1849 "VBNET.ATG" out falseExpr); } Expect(38); -#line 1804 "VBNET.ATG" +#line 1851 "VBNET.ATG" if(falseExpr != null) { conditionalExpression.Condition = condition; @@ -4566,349 +4570,544 @@ out falseExpr); } - void ArgumentList( -#line 2511 "VBNET.ATG" -out List arguments) { + void XmlContentExpression( +#line 1787 "VBNET.ATG" +List exprs) { -#line 2513 "VBNET.ATG" - arguments = new List(); - Expression expr = null; - - if (StartOf(30)) { - Argument( -#line 2516 "VBNET.ATG" -out expr); - } - while (la.kind == 22) { +#line 1788 "VBNET.ATG" + XmlContentExpression expr = null; + if (la.kind == 16) { lexer.NextToken(); -#line 2517 "VBNET.ATG" - arguments.Add(expr ?? Expression.Null); expr = null; - if (StartOf(30)) { - Argument( -#line 2518 "VBNET.ATG" -out expr); - } +#line 1790 "VBNET.ATG" + expr = new XmlContentExpression(t.val, XmlContentType.Text); + } else if (la.kind == 18) { + lexer.NextToken(); -#line 2519 "VBNET.ATG" - if (expr == null) expr = Expression.Null; - } +#line 1791 "VBNET.ATG" + expr = new XmlContentExpression(t.val, XmlContentType.CData); + } else if (la.kind == 17) { + lexer.NextToken(); -#line 2521 "VBNET.ATG" - if (expr != null) arguments.Add(expr); - } +#line 1792 "VBNET.ATG" + expr = new XmlContentExpression(t.val, XmlContentType.Comment); + } else if (la.kind == 19) { + lexer.NextToken(); - void ConjunctionExpr( -#line 1877 "VBNET.ATG" -out Expression outExpr) { +#line 1793 "VBNET.ATG" + expr = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); + } else SynErr(286); -#line 1879 "VBNET.ATG" - Expression expr; - BinaryOperatorType op = BinaryOperatorType.None; +#line 1796 "VBNET.ATG" + expr.StartLocation = t.Location; + expr.EndLocation = t.EndLocation; + exprs.Add(expr); - NotExpr( -#line 1882 "VBNET.ATG" -out outExpr); - while (la.kind == 60 || la.kind == 61) { - if (la.kind == 60) { - lexer.NextToken(); + } -#line 1885 "VBNET.ATG" - op = BinaryOperatorType.BitwiseAnd; - } else { - lexer.NextToken(); + void XmlElement( +#line 1816 "VBNET.ATG" +out XmlExpression expr) { -#line 1886 "VBNET.ATG" - op = BinaryOperatorType.LogicalAnd; - } - NotExpr( -#line 1888 "VBNET.ATG" -out expr); +#line 1817 "VBNET.ATG" + XmlElementExpression el = new XmlElementExpression(); + Expect(10); + if (la.kind == 12) { + lexer.NextToken(); -#line 1888 "VBNET.ATG" - outExpr = new BinaryOperatorExpression(outExpr, op, expr); - } - } +#line 1821 "VBNET.ATG" + Expression innerExpression; + Expr( +#line 1821 "VBNET.ATG" +out innerExpression); + Expect(13); + +#line 1822 "VBNET.ATG" + el.NameExpression = new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }; + } else if (StartOf(4)) { + Identifier(); + +#line 1823 "VBNET.ATG" + el.XmlName = t.val; + } else SynErr(287); + while (StartOf(36)) { + XmlAttribute( +#line 1823 "VBNET.ATG" +el.Attributes); + } + if (la.kind == 14) { + lexer.NextToken(); + } else if (la.kind == 11) { + lexer.NextToken(); + while (StartOf(37)) { + +#line 1824 "VBNET.ATG" + XmlExpression child; + XmlNestedContent( +#line 1824 "VBNET.ATG" +out child); + +#line 1824 "VBNET.ATG" + el.Children.Add(child); + } + Expect(15); + while (StartOf(38)) { + lexer.NextToken(); + } + Expect(11); + } else SynErr(288); + +#line 1826 "VBNET.ATG" + expr = el; + } + + void XmlNestedContent( +#line 1802 "VBNET.ATG" +out XmlExpression expr) { + +#line 1803 "VBNET.ATG" + XmlExpression tmpExpr = null; + switch (la.kind) { + case 16: { + lexer.NextToken(); + +#line 1806 "VBNET.ATG" + tmpExpr = new XmlContentExpression(t.val, XmlContentType.Text); + break; + } + case 18: { + lexer.NextToken(); + +#line 1807 "VBNET.ATG" + tmpExpr = new XmlContentExpression(t.val, XmlContentType.CData); + break; + } + case 17: { + lexer.NextToken(); + +#line 1808 "VBNET.ATG" + tmpExpr = new XmlContentExpression(t.val, XmlContentType.Comment); + break; + } + case 19: { + lexer.NextToken(); + +#line 1809 "VBNET.ATG" + tmpExpr = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); + break; + } + case 12: { + lexer.NextToken(); + +#line 1810 "VBNET.ATG" + Expression innerExpression; + Expr( +#line 1810 "VBNET.ATG" +out innerExpression); + Expect(13); + +#line 1810 "VBNET.ATG" + tmpExpr = new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }; + break; + } + case 10: { + XmlElement( +#line 1811 "VBNET.ATG" +out tmpExpr); + break; + } + default: SynErr(289); break; + } + +#line 1813 "VBNET.ATG" + expr = tmpExpr; + } + + void XmlAttribute( +#line 1829 "VBNET.ATG" +List attrs) { + if (StartOf(4)) { + Identifier(); + +#line 1830 "VBNET.ATG" + string name = t.val; + Expect(20); + +#line 1831 "VBNET.ATG" + string literalValue = null; Expression expressionValue = null; + if (la.kind == 3) { + lexer.NextToken(); + +#line 1832 "VBNET.ATG" + literalValue = t.literalValue.ToString(); + } else if (la.kind == 12) { + lexer.NextToken(); + Expr( +#line 1832 "VBNET.ATG" +out expressionValue); + Expect(13); + } else SynErr(290); + +#line 1833 "VBNET.ATG" + attrs.Add(new XmlAttribute() { Name = name, ExpressionValue = expressionValue, LiteralValue = literalValue }); + } else if (la.kind == 12) { + lexer.NextToken(); + +#line 1834 "VBNET.ATG" + Expression innerExpression; + Expr( +#line 1834 "VBNET.ATG" +out innerExpression); + Expect(13); + +#line 1835 "VBNET.ATG" + attrs.Add(new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }); + } else SynErr(291); + } + + void ArgumentList( +#line 2558 "VBNET.ATG" +out List arguments) { + +#line 2560 "VBNET.ATG" + arguments = new List(); + Expression expr = null; + + if (StartOf(30)) { + Argument( +#line 2563 "VBNET.ATG" +out expr); + } + while (la.kind == 22) { + lexer.NextToken(); + +#line 2564 "VBNET.ATG" + arguments.Add(expr ?? Expression.Null); expr = null; + if (StartOf(30)) { + Argument( +#line 2565 "VBNET.ATG" +out expr); + } + +#line 2566 "VBNET.ATG" + if (expr == null) expr = Expression.Null; + } + +#line 2568 "VBNET.ATG" + if (expr != null) arguments.Add(expr); + } + + void ConjunctionExpr( +#line 1924 "VBNET.ATG" +out Expression outExpr) { + +#line 1926 "VBNET.ATG" + Expression expr; + BinaryOperatorType op = BinaryOperatorType.None; + + NotExpr( +#line 1929 "VBNET.ATG" +out outExpr); + while (la.kind == 60 || la.kind == 61) { + if (la.kind == 60) { + lexer.NextToken(); + +#line 1932 "VBNET.ATG" + op = BinaryOperatorType.BitwiseAnd; + } else { + lexer.NextToken(); + +#line 1933 "VBNET.ATG" + op = BinaryOperatorType.LogicalAnd; + } + NotExpr( +#line 1935 "VBNET.ATG" +out expr); + +#line 1935 "VBNET.ATG" + outExpr = new BinaryOperatorExpression(outExpr, op, expr); + } + } void NotExpr( -#line 1892 "VBNET.ATG" +#line 1939 "VBNET.ATG" out Expression outExpr) { -#line 1893 "VBNET.ATG" +#line 1940 "VBNET.ATG" UnaryOperatorType uop = UnaryOperatorType.None; while (la.kind == 164) { lexer.NextToken(); -#line 1894 "VBNET.ATG" +#line 1941 "VBNET.ATG" uop = UnaryOperatorType.Not; } ComparisonExpr( -#line 1895 "VBNET.ATG" +#line 1942 "VBNET.ATG" out outExpr); -#line 1896 "VBNET.ATG" +#line 1943 "VBNET.ATG" if (uop != UnaryOperatorType.None) outExpr = new UnaryOperatorExpression(outExpr, uop); } void ComparisonExpr( -#line 1901 "VBNET.ATG" +#line 1948 "VBNET.ATG" out Expression outExpr) { -#line 1903 "VBNET.ATG" +#line 1950 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ShiftExpr( -#line 1906 "VBNET.ATG" +#line 1953 "VBNET.ATG" out outExpr); - while (StartOf(35)) { + while (StartOf(39)) { switch (la.kind) { case 40: { lexer.NextToken(); -#line 1909 "VBNET.ATG" +#line 1956 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 39: { lexer.NextToken(); -#line 1910 "VBNET.ATG" +#line 1957 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 43: { lexer.NextToken(); -#line 1911 "VBNET.ATG" +#line 1958 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 42: { lexer.NextToken(); -#line 1912 "VBNET.ATG" +#line 1959 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 41: { lexer.NextToken(); -#line 1913 "VBNET.ATG" +#line 1960 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } case 20: { lexer.NextToken(); -#line 1914 "VBNET.ATG" +#line 1961 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 150: { lexer.NextToken(); -#line 1915 "VBNET.ATG" +#line 1962 "VBNET.ATG" op = BinaryOperatorType.Like; break; } case 144: { lexer.NextToken(); -#line 1916 "VBNET.ATG" +#line 1963 "VBNET.ATG" op = BinaryOperatorType.ReferenceEquality; break; } case 145: { lexer.NextToken(); -#line 1917 "VBNET.ATG" +#line 1964 "VBNET.ATG" op = BinaryOperatorType.ReferenceInequality; break; } } - if (StartOf(36)) { + if (StartOf(40)) { ShiftExpr( -#line 1920 "VBNET.ATG" +#line 1967 "VBNET.ATG" out expr); -#line 1920 "VBNET.ATG" +#line 1967 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } else if (la.kind == 164) { lexer.NextToken(); ShiftExpr( -#line 1923 "VBNET.ATG" +#line 1970 "VBNET.ATG" out expr); -#line 1923 "VBNET.ATG" +#line 1970 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, new UnaryOperatorExpression(expr, UnaryOperatorType.Not)); - } else SynErr(285); + } else SynErr(292); } } void ShiftExpr( -#line 1928 "VBNET.ATG" +#line 1975 "VBNET.ATG" out Expression outExpr) { -#line 1930 "VBNET.ATG" +#line 1977 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ConcatenationExpr( -#line 1933 "VBNET.ATG" +#line 1980 "VBNET.ATG" out outExpr); while (la.kind == 44 || la.kind == 45) { if (la.kind == 44) { lexer.NextToken(); -#line 1936 "VBNET.ATG" +#line 1983 "VBNET.ATG" op = BinaryOperatorType.ShiftLeft; } else { lexer.NextToken(); -#line 1937 "VBNET.ATG" +#line 1984 "VBNET.ATG" op = BinaryOperatorType.ShiftRight; } ConcatenationExpr( -#line 1939 "VBNET.ATG" +#line 1986 "VBNET.ATG" out expr); -#line 1939 "VBNET.ATG" +#line 1986 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ConcatenationExpr( -#line 1943 "VBNET.ATG" +#line 1990 "VBNET.ATG" out Expression outExpr) { -#line 1944 "VBNET.ATG" +#line 1991 "VBNET.ATG" Expression expr; AdditiveExpr( -#line 1946 "VBNET.ATG" +#line 1993 "VBNET.ATG" out outExpr); while (la.kind == 23) { lexer.NextToken(); AdditiveExpr( -#line 1946 "VBNET.ATG" +#line 1993 "VBNET.ATG" out expr); -#line 1946 "VBNET.ATG" +#line 1993 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Concat, expr); } } void AdditiveExpr( -#line 1949 "VBNET.ATG" +#line 1996 "VBNET.ATG" out Expression outExpr) { -#line 1951 "VBNET.ATG" +#line 1998 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; ModuloExpr( -#line 1954 "VBNET.ATG" +#line 2001 "VBNET.ATG" out outExpr); while (la.kind == 30 || la.kind == 31) { if (la.kind == 31) { lexer.NextToken(); -#line 1957 "VBNET.ATG" +#line 2004 "VBNET.ATG" op = BinaryOperatorType.Add; } else { lexer.NextToken(); -#line 1958 "VBNET.ATG" +#line 2005 "VBNET.ATG" op = BinaryOperatorType.Subtract; } ModuloExpr( -#line 1960 "VBNET.ATG" +#line 2007 "VBNET.ATG" out expr); -#line 1960 "VBNET.ATG" +#line 2007 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void ModuloExpr( -#line 1964 "VBNET.ATG" +#line 2011 "VBNET.ATG" out Expression outExpr) { -#line 1965 "VBNET.ATG" +#line 2012 "VBNET.ATG" Expression expr; IntegerDivisionExpr( -#line 1967 "VBNET.ATG" +#line 2014 "VBNET.ATG" out outExpr); while (la.kind == 154) { lexer.NextToken(); IntegerDivisionExpr( -#line 1967 "VBNET.ATG" +#line 2014 "VBNET.ATG" out expr); -#line 1967 "VBNET.ATG" +#line 2014 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Modulus, expr); } } void IntegerDivisionExpr( -#line 1970 "VBNET.ATG" +#line 2017 "VBNET.ATG" out Expression outExpr) { -#line 1971 "VBNET.ATG" +#line 2018 "VBNET.ATG" Expression expr; MultiplicativeExpr( -#line 1973 "VBNET.ATG" +#line 2020 "VBNET.ATG" out outExpr); while (la.kind == 25) { lexer.NextToken(); MultiplicativeExpr( -#line 1973 "VBNET.ATG" +#line 2020 "VBNET.ATG" out expr); -#line 1973 "VBNET.ATG" +#line 2020 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.DivideInteger, expr); } } void MultiplicativeExpr( -#line 1976 "VBNET.ATG" +#line 2023 "VBNET.ATG" out Expression outExpr) { -#line 1978 "VBNET.ATG" +#line 2025 "VBNET.ATG" Expression expr; BinaryOperatorType op = BinaryOperatorType.None; UnaryExpr( -#line 1981 "VBNET.ATG" +#line 2028 "VBNET.ATG" out outExpr); while (la.kind == 24 || la.kind == 34) { if (la.kind == 34) { lexer.NextToken(); -#line 1984 "VBNET.ATG" +#line 2031 "VBNET.ATG" op = BinaryOperatorType.Multiply; } else { lexer.NextToken(); -#line 1985 "VBNET.ATG" +#line 2032 "VBNET.ATG" op = BinaryOperatorType.Divide; } UnaryExpr( -#line 1987 "VBNET.ATG" +#line 2034 "VBNET.ATG" out expr); -#line 1987 "VBNET.ATG" +#line 2034 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, op, expr); } } void UnaryExpr( -#line 1991 "VBNET.ATG" +#line 2038 "VBNET.ATG" out Expression uExpr) { -#line 1993 "VBNET.ATG" +#line 2040 "VBNET.ATG" Expression expr; UnaryOperatorType uop = UnaryOperatorType.None; bool isUOp = false; @@ -4917,25 +5116,25 @@ out Expression uExpr) { if (la.kind == 31) { lexer.NextToken(); -#line 1997 "VBNET.ATG" +#line 2044 "VBNET.ATG" uop = UnaryOperatorType.Plus; isUOp = true; } else if (la.kind == 30) { lexer.NextToken(); -#line 1998 "VBNET.ATG" +#line 2045 "VBNET.ATG" uop = UnaryOperatorType.Minus; isUOp = true; } else { lexer.NextToken(); -#line 1999 "VBNET.ATG" +#line 2046 "VBNET.ATG" uop = UnaryOperatorType.Dereference; isUOp = true; } } ExponentiationExpr( -#line 2001 "VBNET.ATG" +#line 2048 "VBNET.ATG" out expr); -#line 2003 "VBNET.ATG" +#line 2050 "VBNET.ATG" if (isUOp) { uExpr = new UnaryOperatorExpression(expr, uop); } else { @@ -4945,107 +5144,107 @@ out expr); } void ExponentiationExpr( -#line 2011 "VBNET.ATG" +#line 2058 "VBNET.ATG" out Expression outExpr) { -#line 2012 "VBNET.ATG" +#line 2059 "VBNET.ATG" Expression expr; SimpleExpr( -#line 2014 "VBNET.ATG" +#line 2061 "VBNET.ATG" out outExpr); while (la.kind == 32) { lexer.NextToken(); SimpleExpr( -#line 2014 "VBNET.ATG" +#line 2061 "VBNET.ATG" out expr); -#line 2014 "VBNET.ATG" +#line 2061 "VBNET.ATG" outExpr = new BinaryOperatorExpression(outExpr, BinaryOperatorType.Power, expr); } } void NormalOrReDimArgumentList( -#line 2525 "VBNET.ATG" +#line 2572 "VBNET.ATG" out List arguments, out bool canBeNormal, out bool canBeRedim) { -#line 2527 "VBNET.ATG" +#line 2574 "VBNET.ATG" arguments = new List(); canBeNormal = true; canBeRedim = !IsNamedAssign(); Expression expr = null; if (StartOf(30)) { Argument( -#line 2532 "VBNET.ATG" +#line 2579 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2533 "VBNET.ATG" +#line 2580 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2534 "VBNET.ATG" +#line 2581 "VBNET.ATG" out expr); } } while (la.kind == 22) { lexer.NextToken(); -#line 2537 "VBNET.ATG" +#line 2584 "VBNET.ATG" if (expr == null) canBeRedim = false; -#line 2538 "VBNET.ATG" +#line 2585 "VBNET.ATG" arguments.Add(expr ?? Expression.Null); expr = null; -#line 2539 "VBNET.ATG" +#line 2586 "VBNET.ATG" canBeRedim &= !IsNamedAssign(); if (StartOf(30)) { Argument( -#line 2540 "VBNET.ATG" +#line 2587 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); -#line 2541 "VBNET.ATG" +#line 2588 "VBNET.ATG" EnsureIsZero(expr); canBeNormal = false; Expr( -#line 2542 "VBNET.ATG" +#line 2589 "VBNET.ATG" out expr); } } -#line 2544 "VBNET.ATG" +#line 2591 "VBNET.ATG" if (expr == null) { canBeRedim = false; expr = Expression.Null; } } -#line 2546 "VBNET.ATG" +#line 2593 "VBNET.ATG" if (expr != null) arguments.Add(expr); else canBeRedim = false; } void ArrayTypeModifiers( -#line 2653 "VBNET.ATG" +#line 2700 "VBNET.ATG" out ArrayList arrayModifiers) { -#line 2655 "VBNET.ATG" +#line 2702 "VBNET.ATG" arrayModifiers = new ArrayList(); int i = 0; while ( -#line 2658 "VBNET.ATG" +#line 2705 "VBNET.ATG" IsDims()) { Expect(37); if (la.kind == 22 || la.kind == 38) { RankList( -#line 2660 "VBNET.ATG" +#line 2707 "VBNET.ATG" out i); } -#line 2662 "VBNET.ATG" +#line 2709 "VBNET.ATG" arrayModifiers.Add(i); Expect(38); } -#line 2667 "VBNET.ATG" +#line 2714 "VBNET.ATG" if(arrayModifiers.Count == 0) { arrayModifiers = null; } @@ -5053,10 +5252,10 @@ out i); } void MemberInitializer( -#line 2492 "VBNET.ATG" +#line 2539 "VBNET.ATG" out MemberInitializerExpression memberInitializer) { -#line 2494 "VBNET.ATG" +#line 2541 "VBNET.ATG" memberInitializer = new MemberInitializerExpression(); memberInitializer.StartLocation = la.Location; Expression initExpr = null; @@ -5066,19 +5265,19 @@ out MemberInitializerExpression memberInitializer) { if (la.kind == 147) { lexer.NextToken(); -#line 2500 "VBNET.ATG" +#line 2547 "VBNET.ATG" isKey = true; } Expect(26); IdentifierOrKeyword( -#line 2501 "VBNET.ATG" +#line 2548 "VBNET.ATG" out name); Expect(20); Expr( -#line 2501 "VBNET.ATG" +#line 2548 "VBNET.ATG" out initExpr); -#line 2503 "VBNET.ATG" +#line 2550 "VBNET.ATG" memberInitializer.Name = name; memberInitializer.Expression = initExpr; memberInitializer.IsKey = isKey; @@ -5087,10 +5286,10 @@ out initExpr); } void SubLambdaExpression( -#line 2097 "VBNET.ATG" +#line 2144 "VBNET.ATG" out LambdaExpression lambda) { -#line 2099 "VBNET.ATG" +#line 2146 "VBNET.ATG" lambda = new LambdaExpression(); lambda.ReturnType = new TypeReference("System.Void", true); Expression inner = null; @@ -5102,27 +5301,27 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2106 "VBNET.ATG" +#line 2153 "VBNET.ATG" lambda.Parameters); } Expect(38); } - if (StartOf(37)) { + if (StartOf(41)) { if (StartOf(30)) { Expr( -#line 2109 "VBNET.ATG" +#line 2156 "VBNET.ATG" out inner); -#line 2111 "VBNET.ATG" +#line 2158 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2115 "VBNET.ATG" +#line 2162 "VBNET.ATG" out statement); -#line 2117 "VBNET.ATG" +#line 2164 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5130,23 +5329,23 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2123 "VBNET.ATG" +#line 2170 "VBNET.ATG" out statement); Expect(113); Expect(210); -#line 2126 "VBNET.ATG" +#line 2173 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; - } else SynErr(286); + } else SynErr(293); } void FunctionLambdaExpression( -#line 2132 "VBNET.ATG" +#line 2179 "VBNET.ATG" out LambdaExpression lambda) { -#line 2134 "VBNET.ATG" +#line 2181 "VBNET.ATG" lambda = new LambdaExpression(); TypeReference typeRef = null; Expression inner = null; @@ -5158,7 +5357,7 @@ out LambdaExpression lambda) { lexer.NextToken(); if (StartOf(6)) { FormalParameterList( -#line 2141 "VBNET.ATG" +#line 2188 "VBNET.ATG" lambda.Parameters); } Expect(38); @@ -5166,28 +5365,28 @@ lambda.Parameters); if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2142 "VBNET.ATG" +#line 2189 "VBNET.ATG" out typeRef); -#line 2142 "VBNET.ATG" +#line 2189 "VBNET.ATG" lambda.ReturnType = typeRef; } - if (StartOf(37)) { + if (StartOf(41)) { if (StartOf(30)) { Expr( -#line 2145 "VBNET.ATG" +#line 2192 "VBNET.ATG" out inner); -#line 2147 "VBNET.ATG" +#line 2194 "VBNET.ATG" lambda.ExpressionBody = inner; lambda.EndLocation = t.EndLocation; // la.Location? } else { EmbeddedStatement( -#line 2151 "VBNET.ATG" +#line 2198 "VBNET.ATG" out statement); -#line 2153 "VBNET.ATG" +#line 2200 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; @@ -5195,23 +5394,23 @@ out statement); } else if (la.kind == 1) { lexer.NextToken(); Block( -#line 2159 "VBNET.ATG" +#line 2206 "VBNET.ATG" out statement); Expect(113); Expect(127); -#line 2162 "VBNET.ATG" +#line 2209 "VBNET.ATG" lambda.StatementBody = statement; lambda.EndLocation = t.EndLocation; - } else SynErr(287); + } else SynErr(294); } void EmbeddedStatement( -#line 2924 "VBNET.ATG" +#line 2971 "VBNET.ATG" out Statement statement) { -#line 2926 "VBNET.ATG" +#line 2973 "VBNET.ATG" Statement embeddedStatement = null; statement = null; Expression expr = null; @@ -5221,224 +5420,224 @@ out Statement statement) { if (la.kind == 120) { lexer.NextToken(); -#line 2932 "VBNET.ATG" +#line 2979 "VBNET.ATG" ExitType exitType = ExitType.None; switch (la.kind) { case 210: { lexer.NextToken(); -#line 2934 "VBNET.ATG" +#line 2981 "VBNET.ATG" exitType = ExitType.Sub; break; } case 127: { lexer.NextToken(); -#line 2936 "VBNET.ATG" +#line 2983 "VBNET.ATG" exitType = ExitType.Function; break; } case 186: { lexer.NextToken(); -#line 2938 "VBNET.ATG" +#line 2985 "VBNET.ATG" exitType = ExitType.Property; break; } case 108: { lexer.NextToken(); -#line 2940 "VBNET.ATG" +#line 2987 "VBNET.ATG" exitType = ExitType.Do; break; } case 124: { lexer.NextToken(); -#line 2942 "VBNET.ATG" +#line 2989 "VBNET.ATG" exitType = ExitType.For; break; } case 218: { lexer.NextToken(); -#line 2944 "VBNET.ATG" +#line 2991 "VBNET.ATG" exitType = ExitType.Try; break; } case 231: { lexer.NextToken(); -#line 2946 "VBNET.ATG" +#line 2993 "VBNET.ATG" exitType = ExitType.While; break; } case 197: { lexer.NextToken(); -#line 2948 "VBNET.ATG" +#line 2995 "VBNET.ATG" exitType = ExitType.Select; break; } - default: SynErr(288); break; + default: SynErr(295); break; } -#line 2950 "VBNET.ATG" +#line 2997 "VBNET.ATG" statement = new ExitStatement(exitType); } else if (la.kind == 218) { TryStatement( -#line 2951 "VBNET.ATG" +#line 2998 "VBNET.ATG" out statement); } else if (la.kind == 89) { lexer.NextToken(); -#line 2952 "VBNET.ATG" +#line 2999 "VBNET.ATG" ContinueType continueType = ContinueType.None; if (la.kind == 108 || la.kind == 124 || la.kind == 231) { if (la.kind == 108) { lexer.NextToken(); -#line 2952 "VBNET.ATG" +#line 2999 "VBNET.ATG" continueType = ContinueType.Do; } else if (la.kind == 124) { lexer.NextToken(); -#line 2952 "VBNET.ATG" +#line 2999 "VBNET.ATG" continueType = ContinueType.For; } else { lexer.NextToken(); -#line 2952 "VBNET.ATG" +#line 2999 "VBNET.ATG" continueType = ContinueType.While; } } -#line 2952 "VBNET.ATG" +#line 2999 "VBNET.ATG" statement = new ContinueStatement(continueType); } else if (la.kind == 215) { lexer.NextToken(); if (StartOf(30)) { Expr( -#line 2954 "VBNET.ATG" +#line 3001 "VBNET.ATG" out expr); } -#line 2954 "VBNET.ATG" +#line 3001 "VBNET.ATG" statement = new ThrowStatement(expr); } else if (la.kind == 195) { lexer.NextToken(); if (StartOf(30)) { Expr( -#line 2956 "VBNET.ATG" +#line 3003 "VBNET.ATG" out expr); } -#line 2956 "VBNET.ATG" +#line 3003 "VBNET.ATG" statement = new ReturnStatement(expr); } else if (la.kind == 211) { lexer.NextToken(); Expr( -#line 2958 "VBNET.ATG" +#line 3005 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2958 "VBNET.ATG" +#line 3005 "VBNET.ATG" out embeddedStatement); Expect(113); Expect(211); -#line 2959 "VBNET.ATG" +#line 3006 "VBNET.ATG" statement = new LockStatement(expr, embeddedStatement); } else if (la.kind == 189) { lexer.NextToken(); Identifier(); -#line 2961 "VBNET.ATG" +#line 3008 "VBNET.ATG" name = t.val; if (la.kind == 37) { lexer.NextToken(); - if (StartOf(38)) { + if (StartOf(42)) { ArgumentList( -#line 2962 "VBNET.ATG" +#line 3009 "VBNET.ATG" out p); } Expect(38); } -#line 2964 "VBNET.ATG" +#line 3011 "VBNET.ATG" statement = new RaiseEventStatement(name, p); } else if (la.kind == 233) { WithStatement( -#line 2967 "VBNET.ATG" +#line 3014 "VBNET.ATG" out statement); } else if (la.kind == 56) { lexer.NextToken(); -#line 2969 "VBNET.ATG" +#line 3016 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2970 "VBNET.ATG" +#line 3017 "VBNET.ATG" out expr); Expect(22); Expr( -#line 2970 "VBNET.ATG" +#line 3017 "VBNET.ATG" out handlerExpr); -#line 2972 "VBNET.ATG" +#line 3019 "VBNET.ATG" statement = new AddHandlerStatement(expr, handlerExpr); } else if (la.kind == 193) { lexer.NextToken(); -#line 2975 "VBNET.ATG" +#line 3022 "VBNET.ATG" Expression handlerExpr = null; Expr( -#line 2976 "VBNET.ATG" +#line 3023 "VBNET.ATG" out expr); Expect(22); Expr( -#line 2976 "VBNET.ATG" +#line 3023 "VBNET.ATG" out handlerExpr); -#line 2978 "VBNET.ATG" +#line 3025 "VBNET.ATG" statement = new RemoveHandlerStatement(expr, handlerExpr); } else if (la.kind == 231) { lexer.NextToken(); Expr( -#line 2981 "VBNET.ATG" +#line 3028 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2982 "VBNET.ATG" +#line 3029 "VBNET.ATG" out embeddedStatement); Expect(113); Expect(231); -#line 2984 "VBNET.ATG" +#line 3031 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, ConditionType.While, ConditionPosition.Start); } else if (la.kind == 108) { lexer.NextToken(); -#line 2989 "VBNET.ATG" +#line 3036 "VBNET.ATG" ConditionType conditionType = ConditionType.None; if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 2992 "VBNET.ATG" +#line 3039 "VBNET.ATG" out conditionType); Expr( -#line 2992 "VBNET.ATG" +#line 3039 "VBNET.ATG" out expr); EndOfStmt(); Block( -#line 2993 "VBNET.ATG" +#line 3040 "VBNET.ATG" out embeddedStatement); Expect(152); -#line 2996 "VBNET.ATG" +#line 3043 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType == ConditionType.While ? ConditionType.DoWhile : conditionType, @@ -5447,26 +5646,26 @@ out embeddedStatement); } else if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 3003 "VBNET.ATG" +#line 3050 "VBNET.ATG" out embeddedStatement); Expect(152); if (la.kind == 224 || la.kind == 231) { WhileOrUntil( -#line 3004 "VBNET.ATG" +#line 3051 "VBNET.ATG" out conditionType); Expr( -#line 3004 "VBNET.ATG" +#line 3051 "VBNET.ATG" out expr); } -#line 3006 "VBNET.ATG" +#line 3053 "VBNET.ATG" statement = new DoLoopStatement(expr, embeddedStatement, conditionType, ConditionPosition.End); - } else SynErr(289); + } else SynErr(296); } else if (la.kind == 124) { lexer.NextToken(); -#line 3011 "VBNET.ATG" +#line 3058 "VBNET.ATG" Expression group = null; TypeReference typeReference; string typeName; @@ -5475,24 +5674,24 @@ out expr); if (la.kind == 110) { lexer.NextToken(); LoopControlVariable( -#line 3018 "VBNET.ATG" +#line 3065 "VBNET.ATG" out typeReference, out typeName); Expect(138); Expr( -#line 3019 "VBNET.ATG" +#line 3066 "VBNET.ATG" out group); EndOfStmt(); Block( -#line 3020 "VBNET.ATG" +#line 3067 "VBNET.ATG" out embeddedStatement); Expect(163); if (StartOf(30)) { Expr( -#line 3021 "VBNET.ATG" +#line 3068 "VBNET.ATG" out expr); } -#line 3023 "VBNET.ATG" +#line 3070 "VBNET.ATG" statement = new ForeachStatement(typeReference, typeName, group, @@ -5502,9 +5701,9 @@ out expr); statement.EndLocation = t.EndLocation; - } else if (StartOf(39)) { + } else if (StartOf(43)) { -#line 3034 "VBNET.ATG" +#line 3081 "VBNET.ATG" Expression start = null; Expression end = null; Expression step = null; @@ -5513,59 +5712,59 @@ out expr); List nextExpressions = null; if ( -#line 3041 "VBNET.ATG" +#line 3088 "VBNET.ATG" IsLoopVariableDeclaration()) { LoopControlVariable( -#line 3042 "VBNET.ATG" +#line 3089 "VBNET.ATG" out typeReference, out typeName); } else { -#line 3044 "VBNET.ATG" +#line 3091 "VBNET.ATG" typeReference = null; typeName = null; SimpleExpr( -#line 3045 "VBNET.ATG" +#line 3092 "VBNET.ATG" out variableExpr); } Expect(20); Expr( -#line 3047 "VBNET.ATG" +#line 3094 "VBNET.ATG" out start); Expect(216); Expr( -#line 3047 "VBNET.ATG" +#line 3094 "VBNET.ATG" out end); if (la.kind == 205) { lexer.NextToken(); Expr( -#line 3047 "VBNET.ATG" +#line 3094 "VBNET.ATG" out step); } EndOfStmt(); Block( -#line 3048 "VBNET.ATG" +#line 3095 "VBNET.ATG" out embeddedStatement); Expect(163); if (StartOf(30)) { Expr( -#line 3051 "VBNET.ATG" +#line 3098 "VBNET.ATG" out nextExpr); -#line 3053 "VBNET.ATG" +#line 3100 "VBNET.ATG" nextExpressions = new List(); nextExpressions.Add(nextExpr); while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3056 "VBNET.ATG" +#line 3103 "VBNET.ATG" out nextExpr); -#line 3056 "VBNET.ATG" +#line 3103 "VBNET.ATG" nextExpressions.Add(nextExpr); } } -#line 3059 "VBNET.ATG" +#line 3106 "VBNET.ATG" statement = new ForNextStatement { TypeReference = typeReference, VariableName = typeName, @@ -5577,31 +5776,31 @@ out nextExpr); NextExpressions = nextExpressions }; - } else SynErr(290); + } else SynErr(297); } else if (la.kind == 118) { lexer.NextToken(); Expr( -#line 3072 "VBNET.ATG" +#line 3119 "VBNET.ATG" out expr); -#line 3072 "VBNET.ATG" +#line 3119 "VBNET.ATG" statement = new ErrorStatement(expr); } else if (la.kind == 191) { lexer.NextToken(); -#line 3074 "VBNET.ATG" +#line 3121 "VBNET.ATG" bool isPreserve = false; if (la.kind == 184) { lexer.NextToken(); -#line 3074 "VBNET.ATG" +#line 3121 "VBNET.ATG" isPreserve = true; } ReDimClause( -#line 3075 "VBNET.ATG" +#line 3122 "VBNET.ATG" out expr); -#line 3077 "VBNET.ATG" +#line 3124 "VBNET.ATG" ReDimStatement reDimStatement = new ReDimStatement(isPreserve); statement = reDimStatement; SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); @@ -5609,48 +5808,48 @@ out expr); while (la.kind == 22) { lexer.NextToken(); ReDimClause( -#line 3081 "VBNET.ATG" +#line 3128 "VBNET.ATG" out expr); -#line 3082 "VBNET.ATG" +#line 3129 "VBNET.ATG" SafeAdd(reDimStatement, reDimStatement.ReDimClauses, expr as InvocationExpression); } } else if (la.kind == 117) { lexer.NextToken(); Expr( -#line 3086 "VBNET.ATG" +#line 3133 "VBNET.ATG" out expr); -#line 3088 "VBNET.ATG" +#line 3135 "VBNET.ATG" EraseStatement eraseStatement = new EraseStatement(); if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr);} while (la.kind == 22) { lexer.NextToken(); Expr( -#line 3091 "VBNET.ATG" +#line 3138 "VBNET.ATG" out expr); -#line 3091 "VBNET.ATG" +#line 3138 "VBNET.ATG" if (expr != null) { SafeAdd(eraseStatement, eraseStatement.Expressions, expr); } } -#line 3092 "VBNET.ATG" +#line 3139 "VBNET.ATG" statement = eraseStatement; } else if (la.kind == 206) { lexer.NextToken(); -#line 3094 "VBNET.ATG" +#line 3141 "VBNET.ATG" statement = new StopStatement(); } else if ( -#line 3096 "VBNET.ATG" +#line 3143 "VBNET.ATG" la.kind == Tokens.If) { Expect(135); -#line 3097 "VBNET.ATG" +#line 3144 "VBNET.ATG" Location ifStartLocation = t.Location; Expr( -#line 3097 "VBNET.ATG" +#line 3144 "VBNET.ATG" out expr); if (la.kind == 214) { lexer.NextToken(); @@ -5658,46 +5857,46 @@ out expr); if (la.kind == 1 || la.kind == 21) { EndOfStmt(); Block( -#line 3100 "VBNET.ATG" +#line 3147 "VBNET.ATG" out embeddedStatement); -#line 3102 "VBNET.ATG" +#line 3149 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr, embeddedStatement); ifStatement.StartLocation = ifStartLocation; Location elseIfStart; while (la.kind == 112 || -#line 3108 "VBNET.ATG" +#line 3155 "VBNET.ATG" IsElseIf()) { if ( -#line 3108 "VBNET.ATG" +#line 3155 "VBNET.ATG" IsElseIf()) { Expect(111); -#line 3108 "VBNET.ATG" +#line 3155 "VBNET.ATG" elseIfStart = t.Location; Expect(135); } else { lexer.NextToken(); -#line 3109 "VBNET.ATG" +#line 3156 "VBNET.ATG" elseIfStart = t.Location; } -#line 3111 "VBNET.ATG" +#line 3158 "VBNET.ATG" Expression condition = null; Statement block = null; Expr( -#line 3112 "VBNET.ATG" +#line 3159 "VBNET.ATG" out condition); if (la.kind == 214) { lexer.NextToken(); } EndOfStmt(); Block( -#line 3113 "VBNET.ATG" +#line 3160 "VBNET.ATG" out block); -#line 3115 "VBNET.ATG" +#line 3162 "VBNET.ATG" ElseIfSection elseIfSection = new ElseIfSection(condition, block); elseIfSection.StartLocation = elseIfStart; elseIfSection.EndLocation = t.Location; @@ -5711,123 +5910,123 @@ out block); EndOfStmt(); } Block( -#line 3124 "VBNET.ATG" +#line 3171 "VBNET.ATG" out embeddedStatement); -#line 3126 "VBNET.ATG" +#line 3173 "VBNET.ATG" ifStatement.FalseStatement.Add(embeddedStatement); } Expect(113); Expect(135); -#line 3130 "VBNET.ATG" +#line 3177 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; - } else if (StartOf(40)) { + } else if (StartOf(44)) { -#line 3135 "VBNET.ATG" +#line 3182 "VBNET.ATG" IfElseStatement ifStatement = new IfElseStatement(expr); ifStatement.StartLocation = ifStartLocation; SingleLineStatementList( -#line 3138 "VBNET.ATG" +#line 3185 "VBNET.ATG" ifStatement.TrueStatement); if (la.kind == 111) { lexer.NextToken(); - if (StartOf(40)) { + if (StartOf(44)) { SingleLineStatementList( -#line 3141 "VBNET.ATG" +#line 3188 "VBNET.ATG" ifStatement.FalseStatement); } } -#line 3143 "VBNET.ATG" +#line 3190 "VBNET.ATG" ifStatement.EndLocation = t.Location; statement = ifStatement; - } else SynErr(291); + } else SynErr(298); } else if (la.kind == 197) { lexer.NextToken(); if (la.kind == 74) { lexer.NextToken(); } Expr( -#line 3146 "VBNET.ATG" +#line 3193 "VBNET.ATG" out expr); EndOfStmt(); -#line 3147 "VBNET.ATG" +#line 3194 "VBNET.ATG" List selectSections = new List(); Statement block = null; while (la.kind == 74) { -#line 3151 "VBNET.ATG" +#line 3198 "VBNET.ATG" List caseClauses = null; Location caseLocation = la.Location; lexer.NextToken(); CaseClauses( -#line 3152 "VBNET.ATG" +#line 3199 "VBNET.ATG" out caseClauses); if ( -#line 3152 "VBNET.ATG" +#line 3199 "VBNET.ATG" IsNotStatementSeparator()) { lexer.NextToken(); } EndOfStmt(); -#line 3154 "VBNET.ATG" +#line 3201 "VBNET.ATG" SwitchSection selectSection = new SwitchSection(caseClauses); selectSection.StartLocation = caseLocation; Block( -#line 3157 "VBNET.ATG" +#line 3204 "VBNET.ATG" out block); -#line 3159 "VBNET.ATG" +#line 3206 "VBNET.ATG" selectSection.Children = block.Children; selectSection.EndLocation = t.EndLocation; selectSections.Add(selectSection); } -#line 3165 "VBNET.ATG" +#line 3212 "VBNET.ATG" statement = new SwitchStatement(expr, selectSections); Expect(113); Expect(197); } else if (la.kind == 171) { -#line 3168 "VBNET.ATG" +#line 3215 "VBNET.ATG" OnErrorStatement onErrorStatement = null; OnErrorStatement( -#line 3169 "VBNET.ATG" +#line 3216 "VBNET.ATG" out onErrorStatement); -#line 3169 "VBNET.ATG" +#line 3216 "VBNET.ATG" statement = onErrorStatement; } else if (la.kind == 132) { -#line 3170 "VBNET.ATG" +#line 3217 "VBNET.ATG" GotoStatement goToStatement = null; GotoStatement( -#line 3171 "VBNET.ATG" +#line 3218 "VBNET.ATG" out goToStatement); -#line 3171 "VBNET.ATG" +#line 3218 "VBNET.ATG" statement = goToStatement; } else if (la.kind == 194) { -#line 3172 "VBNET.ATG" +#line 3219 "VBNET.ATG" ResumeStatement resumeStatement = null; ResumeStatement( -#line 3173 "VBNET.ATG" +#line 3220 "VBNET.ATG" out resumeStatement); -#line 3173 "VBNET.ATG" +#line 3220 "VBNET.ATG" statement = resumeStatement; - } else if (StartOf(39)) { + } else if (StartOf(43)) { -#line 3176 "VBNET.ATG" +#line 3223 "VBNET.ATG" Expression val = null; AssignmentOperatorType op; @@ -5835,25 +6034,25 @@ out resumeStatement); la.kind == Tokens.Not || la.kind == Tokens.Times; SimpleExpr( -#line 3182 "VBNET.ATG" +#line 3229 "VBNET.ATG" out expr); - if (StartOf(41)) { + if (StartOf(45)) { AssignmentOperator( -#line 3184 "VBNET.ATG" +#line 3231 "VBNET.ATG" out op); Expr( -#line 3184 "VBNET.ATG" +#line 3231 "VBNET.ATG" out val); -#line 3184 "VBNET.ATG" +#line 3231 "VBNET.ATG" expr = new AssignmentExpression(expr, op, val); - } else if (StartOf(42)) { + } else if (StartOf(46)) { -#line 3185 "VBNET.ATG" +#line 3232 "VBNET.ATG" if (mustBeAssignment) Error("error in assignment."); - } else SynErr(292); + } else SynErr(299); -#line 3188 "VBNET.ATG" +#line 3235 "VBNET.ATG" // a field reference expression that stands alone is a // invocation expression without parantheses and arguments if(expr is MemberReferenceExpression || expr is IdentifierExpression) { @@ -5864,88 +6063,88 @@ out val); } else if (la.kind == 73) { lexer.NextToken(); SimpleExpr( -#line 3195 "VBNET.ATG" +#line 3242 "VBNET.ATG" out expr); -#line 3195 "VBNET.ATG" +#line 3242 "VBNET.ATG" statement = new ExpressionStatement(expr); } else if (la.kind == 226) { lexer.NextToken(); -#line 3197 "VBNET.ATG" +#line 3244 "VBNET.ATG" Statement block; if ( -#line 3198 "VBNET.ATG" +#line 3245 "VBNET.ATG" Peek(1).kind == Tokens.As) { -#line 3199 "VBNET.ATG" +#line 3246 "VBNET.ATG" LocalVariableDeclaration resourceAquisition = new LocalVariableDeclaration(Modifiers.None); VariableDeclarator( -#line 3200 "VBNET.ATG" +#line 3247 "VBNET.ATG" resourceAquisition.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 3202 "VBNET.ATG" +#line 3249 "VBNET.ATG" resourceAquisition.Variables); } Block( -#line 3204 "VBNET.ATG" +#line 3251 "VBNET.ATG" out block); -#line 3206 "VBNET.ATG" +#line 3253 "VBNET.ATG" statement = new UsingStatement(resourceAquisition, block); } else if (StartOf(30)) { Expr( -#line 3208 "VBNET.ATG" +#line 3255 "VBNET.ATG" out expr); Block( -#line 3209 "VBNET.ATG" +#line 3256 "VBNET.ATG" out block); -#line 3210 "VBNET.ATG" +#line 3257 "VBNET.ATG" statement = new UsingStatement(new ExpressionStatement(expr), block); - } else SynErr(293); + } else SynErr(300); Expect(113); Expect(226); - } else if (StartOf(43)) { + } else if (StartOf(47)) { LocalDeclarationStatement( -#line 3213 "VBNET.ATG" +#line 3260 "VBNET.ATG" out statement); - } else SynErr(294); + } else SynErr(301); } void FromOrAggregateQueryOperator( -#line 2181 "VBNET.ATG" +#line 2228 "VBNET.ATG" List middleClauses) { -#line 2183 "VBNET.ATG" +#line 2230 "VBNET.ATG" QueryExpressionFromClause fromClause = null; QueryExpressionAggregateClause aggregateClause = null; if (la.kind == 126) { FromQueryOperator( -#line 2186 "VBNET.ATG" +#line 2233 "VBNET.ATG" out fromClause); -#line 2187 "VBNET.ATG" +#line 2234 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2188 "VBNET.ATG" +#line 2235 "VBNET.ATG" out aggregateClause); -#line 2189 "VBNET.ATG" +#line 2236 "VBNET.ATG" middleClauses.Add(aggregateClause); - } else SynErr(295); + } else SynErr(302); } void QueryOperator( -#line 2192 "VBNET.ATG" +#line 2239 "VBNET.ATG" List middleClauses) { -#line 2194 "VBNET.ATG" +#line 2241 "VBNET.ATG" QueryExpressionJoinVBClause joinClause = null; QueryExpressionGroupVBClause groupByClause = null; QueryExpressionPartitionVBClause partitionClause = null; @@ -5955,94 +6154,94 @@ List middleClauses) { if (la.kind == 126) { FromQueryOperator( -#line 2201 "VBNET.ATG" +#line 2248 "VBNET.ATG" out fromClause); -#line 2202 "VBNET.ATG" +#line 2249 "VBNET.ATG" middleClauses.Add(fromClause); } else if (la.kind == 58) { AggregateQueryOperator( -#line 2203 "VBNET.ATG" +#line 2250 "VBNET.ATG" out aggregateClause); -#line 2204 "VBNET.ATG" +#line 2251 "VBNET.ATG" middleClauses.Add(aggregateClause); } else if (la.kind == 197) { SelectQueryOperator( -#line 2205 "VBNET.ATG" +#line 2252 "VBNET.ATG" middleClauses); } else if (la.kind == 107) { DistinctQueryOperator( -#line 2206 "VBNET.ATG" +#line 2253 "VBNET.ATG" middleClauses); } else if (la.kind == 230) { WhereQueryOperator( -#line 2207 "VBNET.ATG" +#line 2254 "VBNET.ATG" middleClauses); } else if (la.kind == 176) { OrderByQueryOperator( -#line 2208 "VBNET.ATG" +#line 2255 "VBNET.ATG" middleClauses); } else if (la.kind == 203 || la.kind == 212) { PartitionQueryOperator( -#line 2209 "VBNET.ATG" +#line 2256 "VBNET.ATG" out partitionClause); -#line 2210 "VBNET.ATG" +#line 2257 "VBNET.ATG" middleClauses.Add(partitionClause); } else if (la.kind == 148) { LetQueryOperator( -#line 2211 "VBNET.ATG" +#line 2258 "VBNET.ATG" middleClauses); } else if (la.kind == 146) { JoinQueryOperator( -#line 2212 "VBNET.ATG" +#line 2259 "VBNET.ATG" out joinClause); -#line 2213 "VBNET.ATG" +#line 2260 "VBNET.ATG" middleClauses.Add(joinClause); } else if ( -#line 2214 "VBNET.ATG" +#line 2261 "VBNET.ATG" la.kind == Tokens.Group && Peek(1).kind == Tokens.Join) { GroupJoinQueryOperator( -#line 2214 "VBNET.ATG" +#line 2261 "VBNET.ATG" out groupJoinClause); -#line 2215 "VBNET.ATG" +#line 2262 "VBNET.ATG" middleClauses.Add(groupJoinClause); } else if (la.kind == 133) { GroupByQueryOperator( -#line 2216 "VBNET.ATG" +#line 2263 "VBNET.ATG" out groupByClause); -#line 2217 "VBNET.ATG" +#line 2264 "VBNET.ATG" middleClauses.Add(groupByClause); - } else SynErr(296); + } else SynErr(303); } void FromQueryOperator( -#line 2292 "VBNET.ATG" +#line 2339 "VBNET.ATG" out QueryExpressionFromClause fromClause) { -#line 2294 "VBNET.ATG" +#line 2341 "VBNET.ATG" fromClause = new QueryExpressionFromClause(); fromClause.StartLocation = la.Location; Expect(126); CollectionRangeVariableDeclarationList( -#line 2297 "VBNET.ATG" +#line 2344 "VBNET.ATG" fromClause.Sources); -#line 2299 "VBNET.ATG" +#line 2346 "VBNET.ATG" fromClause.EndLocation = t.EndLocation; } void AggregateQueryOperator( -#line 2361 "VBNET.ATG" +#line 2408 "VBNET.ATG" out QueryExpressionAggregateClause aggregateClause) { -#line 2363 "VBNET.ATG" +#line 2410 "VBNET.ATG" aggregateClause = new QueryExpressionAggregateClause(); aggregateClause.IntoVariables = new List(); aggregateClause.StartLocation = la.Location; @@ -6050,77 +6249,77 @@ out QueryExpressionAggregateClause aggregateClause) { Expect(58); CollectionRangeVariableDeclaration( -#line 2368 "VBNET.ATG" +#line 2415 "VBNET.ATG" out source); -#line 2370 "VBNET.ATG" +#line 2417 "VBNET.ATG" aggregateClause.Source = source; while (StartOf(31)) { QueryOperator( -#line 2373 "VBNET.ATG" +#line 2420 "VBNET.ATG" aggregateClause.MiddleClauses); } Expect(143); ExpressionRangeVariableDeclarationList( -#line 2375 "VBNET.ATG" +#line 2422 "VBNET.ATG" aggregateClause.IntoVariables); -#line 2377 "VBNET.ATG" +#line 2424 "VBNET.ATG" aggregateClause.EndLocation = t.EndLocation; } void SelectQueryOperator( -#line 2303 "VBNET.ATG" +#line 2350 "VBNET.ATG" List middleClauses) { -#line 2305 "VBNET.ATG" +#line 2352 "VBNET.ATG" QueryExpressionSelectVBClause selectClause = new QueryExpressionSelectVBClause(); selectClause.StartLocation = la.Location; Expect(197); ExpressionRangeVariableDeclarationList( -#line 2308 "VBNET.ATG" +#line 2355 "VBNET.ATG" selectClause.Variables); -#line 2310 "VBNET.ATG" +#line 2357 "VBNET.ATG" selectClause.EndLocation = t.Location; middleClauses.Add(selectClause); } void DistinctQueryOperator( -#line 2315 "VBNET.ATG" +#line 2362 "VBNET.ATG" List middleClauses) { -#line 2317 "VBNET.ATG" +#line 2364 "VBNET.ATG" QueryExpressionDistinctClause distinctClause = new QueryExpressionDistinctClause(); distinctClause.StartLocation = la.Location; Expect(107); -#line 2322 "VBNET.ATG" +#line 2369 "VBNET.ATG" distinctClause.EndLocation = t.EndLocation; middleClauses.Add(distinctClause); } void WhereQueryOperator( -#line 2327 "VBNET.ATG" +#line 2374 "VBNET.ATG" List middleClauses) { -#line 2329 "VBNET.ATG" +#line 2376 "VBNET.ATG" QueryExpressionWhereClause whereClause = new QueryExpressionWhereClause(); whereClause.StartLocation = la.Location; Expression operand = null; Expect(230); Expr( -#line 2333 "VBNET.ATG" +#line 2380 "VBNET.ATG" out operand); -#line 2335 "VBNET.ATG" +#line 2382 "VBNET.ATG" whereClause.Condition = operand; whereClause.EndLocation = t.EndLocation; @@ -6129,10 +6328,10 @@ out operand); } void OrderByQueryOperator( -#line 2220 "VBNET.ATG" +#line 2267 "VBNET.ATG" List middleClauses) { -#line 2222 "VBNET.ATG" +#line 2269 "VBNET.ATG" QueryExpressionOrderClause orderClause = new QueryExpressionOrderClause(); orderClause.StartLocation = la.Location; List orderings = null; @@ -6140,10 +6339,10 @@ List middleClauses) { Expect(176); Expect(70); OrderExpressionList( -#line 2226 "VBNET.ATG" +#line 2273 "VBNET.ATG" out orderings); -#line 2228 "VBNET.ATG" +#line 2275 "VBNET.ATG" orderClause.Orderings = orderings; orderClause.EndLocation = t.EndLocation; middleClauses.Add(orderClause); @@ -6151,10 +6350,10 @@ out orderings); } void PartitionQueryOperator( -#line 2342 "VBNET.ATG" +#line 2389 "VBNET.ATG" out QueryExpressionPartitionVBClause partitionClause) { -#line 2344 "VBNET.ATG" +#line 2391 "VBNET.ATG" partitionClause = new QueryExpressionPartitionVBClause(); partitionClause.StartLocation = la.Location; Expression expr = null; @@ -6162,60 +6361,60 @@ out QueryExpressionPartitionVBClause partitionClause) { if (la.kind == 212) { lexer.NextToken(); -#line 2349 "VBNET.ATG" +#line 2396 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Take; if (la.kind == 231) { lexer.NextToken(); -#line 2350 "VBNET.ATG" +#line 2397 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.TakeWhile; } } else if (la.kind == 203) { lexer.NextToken(); -#line 2351 "VBNET.ATG" +#line 2398 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.Skip; if (la.kind == 231) { lexer.NextToken(); -#line 2352 "VBNET.ATG" +#line 2399 "VBNET.ATG" partitionClause.PartitionType = QueryExpressionPartitionType.SkipWhile; } - } else SynErr(297); + } else SynErr(304); Expr( -#line 2354 "VBNET.ATG" +#line 2401 "VBNET.ATG" out expr); -#line 2356 "VBNET.ATG" +#line 2403 "VBNET.ATG" partitionClause.Expression = expr; partitionClause.EndLocation = t.EndLocation; } void LetQueryOperator( -#line 2381 "VBNET.ATG" +#line 2428 "VBNET.ATG" List middleClauses) { -#line 2383 "VBNET.ATG" +#line 2430 "VBNET.ATG" QueryExpressionLetVBClause letClause = new QueryExpressionLetVBClause(); letClause.StartLocation = la.Location; Expect(148); ExpressionRangeVariableDeclarationList( -#line 2386 "VBNET.ATG" +#line 2433 "VBNET.ATG" letClause.Variables); -#line 2388 "VBNET.ATG" +#line 2435 "VBNET.ATG" letClause.EndLocation = t.EndLocation; middleClauses.Add(letClause); } void JoinQueryOperator( -#line 2425 "VBNET.ATG" +#line 2472 "VBNET.ATG" out QueryExpressionJoinVBClause joinClause) { -#line 2427 "VBNET.ATG" +#line 2474 "VBNET.ATG" joinClause = new QueryExpressionJoinVBClause(); joinClause.StartLocation = la.Location; CollectionRangeVariable joinVariable = null; @@ -6225,203 +6424,203 @@ out QueryExpressionJoinVBClause joinClause) { Expect(146); CollectionRangeVariableDeclaration( -#line 2434 "VBNET.ATG" +#line 2481 "VBNET.ATG" out joinVariable); -#line 2435 "VBNET.ATG" +#line 2482 "VBNET.ATG" joinClause.JoinVariable = joinVariable; if (la.kind == 146) { JoinQueryOperator( -#line 2437 "VBNET.ATG" +#line 2484 "VBNET.ATG" out subJoin); -#line 2438 "VBNET.ATG" +#line 2485 "VBNET.ATG" joinClause.SubJoin = subJoin; } Expect(171); JoinCondition( -#line 2441 "VBNET.ATG" +#line 2488 "VBNET.ATG" out condition); -#line 2442 "VBNET.ATG" +#line 2489 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); while (la.kind == 60) { lexer.NextToken(); JoinCondition( -#line 2444 "VBNET.ATG" +#line 2491 "VBNET.ATG" out condition); -#line 2445 "VBNET.ATG" +#line 2492 "VBNET.ATG" SafeAdd(joinClause, joinClause.Conditions, condition); } -#line 2448 "VBNET.ATG" +#line 2495 "VBNET.ATG" joinClause.EndLocation = t.EndLocation; } void GroupJoinQueryOperator( -#line 2278 "VBNET.ATG" +#line 2325 "VBNET.ATG" out QueryExpressionGroupJoinVBClause groupJoinClause) { -#line 2280 "VBNET.ATG" +#line 2327 "VBNET.ATG" groupJoinClause = new QueryExpressionGroupJoinVBClause(); groupJoinClause.StartLocation = la.Location; QueryExpressionJoinVBClause joinClause = null; Expect(133); JoinQueryOperator( -#line 2284 "VBNET.ATG" +#line 2331 "VBNET.ATG" out joinClause); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2285 "VBNET.ATG" +#line 2332 "VBNET.ATG" groupJoinClause.IntoVariables); -#line 2287 "VBNET.ATG" +#line 2334 "VBNET.ATG" groupJoinClause.JoinClause = joinClause; groupJoinClause.EndLocation = t.EndLocation; } void GroupByQueryOperator( -#line 2265 "VBNET.ATG" +#line 2312 "VBNET.ATG" out QueryExpressionGroupVBClause groupByClause) { -#line 2267 "VBNET.ATG" +#line 2314 "VBNET.ATG" groupByClause = new QueryExpressionGroupVBClause(); groupByClause.StartLocation = la.Location; Expect(133); ExpressionRangeVariableDeclarationList( -#line 2270 "VBNET.ATG" +#line 2317 "VBNET.ATG" groupByClause.GroupVariables); Expect(70); ExpressionRangeVariableDeclarationList( -#line 2271 "VBNET.ATG" +#line 2318 "VBNET.ATG" groupByClause.ByVariables); Expect(143); ExpressionRangeVariableDeclarationList( -#line 2272 "VBNET.ATG" +#line 2319 "VBNET.ATG" groupByClause.IntoVariables); -#line 2274 "VBNET.ATG" +#line 2321 "VBNET.ATG" groupByClause.EndLocation = t.EndLocation; } void OrderExpressionList( -#line 2234 "VBNET.ATG" +#line 2281 "VBNET.ATG" out List orderings) { -#line 2236 "VBNET.ATG" +#line 2283 "VBNET.ATG" orderings = new List(); QueryExpressionOrdering ordering = null; OrderExpression( -#line 2239 "VBNET.ATG" +#line 2286 "VBNET.ATG" out ordering); -#line 2240 "VBNET.ATG" +#line 2287 "VBNET.ATG" orderings.Add(ordering); while (la.kind == 22) { lexer.NextToken(); OrderExpression( -#line 2242 "VBNET.ATG" +#line 2289 "VBNET.ATG" out ordering); -#line 2243 "VBNET.ATG" +#line 2290 "VBNET.ATG" orderings.Add(ordering); } } void OrderExpression( -#line 2247 "VBNET.ATG" +#line 2294 "VBNET.ATG" out QueryExpressionOrdering ordering) { -#line 2249 "VBNET.ATG" +#line 2296 "VBNET.ATG" ordering = new QueryExpressionOrdering(); ordering.StartLocation = la.Location; ordering.Direction = QueryExpressionOrderingDirection.None; Expression orderExpr = null; Expr( -#line 2254 "VBNET.ATG" +#line 2301 "VBNET.ATG" out orderExpr); -#line 2256 "VBNET.ATG" +#line 2303 "VBNET.ATG" ordering.Criteria = orderExpr; if (la.kind == 64 || la.kind == 104) { if (la.kind == 64) { lexer.NextToken(); -#line 2259 "VBNET.ATG" +#line 2306 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Ascending; } else { lexer.NextToken(); -#line 2260 "VBNET.ATG" +#line 2307 "VBNET.ATG" ordering.Direction = QueryExpressionOrderingDirection.Descending; } } -#line 2262 "VBNET.ATG" +#line 2309 "VBNET.ATG" ordering.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclarationList( -#line 2393 "VBNET.ATG" +#line 2440 "VBNET.ATG" List variables) { -#line 2395 "VBNET.ATG" +#line 2442 "VBNET.ATG" ExpressionRangeVariable variable = null; ExpressionRangeVariableDeclaration( -#line 2397 "VBNET.ATG" +#line 2444 "VBNET.ATG" out variable); -#line 2398 "VBNET.ATG" +#line 2445 "VBNET.ATG" variables.Add(variable); while (la.kind == 22) { lexer.NextToken(); ExpressionRangeVariableDeclaration( -#line 2399 "VBNET.ATG" +#line 2446 "VBNET.ATG" out variable); -#line 2399 "VBNET.ATG" +#line 2446 "VBNET.ATG" variables.Add(variable); } } void CollectionRangeVariableDeclarationList( -#line 2452 "VBNET.ATG" +#line 2499 "VBNET.ATG" List rangeVariables) { -#line 2453 "VBNET.ATG" +#line 2500 "VBNET.ATG" CollectionRangeVariable variableDeclaration; CollectionRangeVariableDeclaration( -#line 2455 "VBNET.ATG" +#line 2502 "VBNET.ATG" out variableDeclaration); -#line 2456 "VBNET.ATG" +#line 2503 "VBNET.ATG" rangeVariables.Add(variableDeclaration); while (la.kind == 22) { lexer.NextToken(); CollectionRangeVariableDeclaration( -#line 2457 "VBNET.ATG" +#line 2504 "VBNET.ATG" out variableDeclaration); -#line 2457 "VBNET.ATG" +#line 2504 "VBNET.ATG" rangeVariables.Add(variableDeclaration); } } void CollectionRangeVariableDeclaration( -#line 2460 "VBNET.ATG" +#line 2507 "VBNET.ATG" out CollectionRangeVariable rangeVariable) { -#line 2462 "VBNET.ATG" +#line 2509 "VBNET.ATG" rangeVariable = new CollectionRangeVariable(); rangeVariable.StartLocation = la.Location; TypeReference typeName = null; @@ -6429,71 +6628,71 @@ out CollectionRangeVariable rangeVariable) { Identifier(); -#line 2467 "VBNET.ATG" +#line 2514 "VBNET.ATG" rangeVariable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2468 "VBNET.ATG" +#line 2515 "VBNET.ATG" out typeName); -#line 2468 "VBNET.ATG" +#line 2515 "VBNET.ATG" rangeVariable.Type = typeName; } Expect(138); Expr( -#line 2469 "VBNET.ATG" +#line 2516 "VBNET.ATG" out inExpr); -#line 2471 "VBNET.ATG" +#line 2518 "VBNET.ATG" rangeVariable.Expression = inExpr; rangeVariable.EndLocation = t.EndLocation; } void ExpressionRangeVariableDeclaration( -#line 2402 "VBNET.ATG" +#line 2449 "VBNET.ATG" out ExpressionRangeVariable variable) { -#line 2404 "VBNET.ATG" +#line 2451 "VBNET.ATG" variable = new ExpressionRangeVariable(); variable.StartLocation = la.Location; Expression rhs = null; TypeReference typeName = null; if ( -#line 2410 "VBNET.ATG" +#line 2457 "VBNET.ATG" IsIdentifiedExpressionRange()) { Identifier(); -#line 2411 "VBNET.ATG" +#line 2458 "VBNET.ATG" variable.Identifier = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2413 "VBNET.ATG" +#line 2460 "VBNET.ATG" out typeName); -#line 2414 "VBNET.ATG" +#line 2461 "VBNET.ATG" variable.Type = typeName; } Expect(20); } Expr( -#line 2418 "VBNET.ATG" +#line 2465 "VBNET.ATG" out rhs); -#line 2420 "VBNET.ATG" +#line 2467 "VBNET.ATG" variable.Expression = rhs; variable.EndLocation = t.EndLocation; } void JoinCondition( -#line 2476 "VBNET.ATG" +#line 2523 "VBNET.ATG" out QueryExpressionJoinConditionVB condition) { -#line 2478 "VBNET.ATG" +#line 2525 "VBNET.ATG" condition = new QueryExpressionJoinConditionVB(); condition.StartLocation = la.Location; @@ -6501,14 +6700,14 @@ out QueryExpressionJoinConditionVB condition) { Expression rhs = null; Expr( -#line 2484 "VBNET.ATG" +#line 2531 "VBNET.ATG" out lhs); Expect(116); Expr( -#line 2484 "VBNET.ATG" +#line 2531 "VBNET.ATG" out rhs); -#line 2486 "VBNET.ATG" +#line 2533 "VBNET.ATG" condition.LeftSide = lhs; condition.RightSide = rhs; condition.EndLocation = t.EndLocation; @@ -6516,93 +6715,93 @@ out rhs); } void Argument( -#line 2550 "VBNET.ATG" +#line 2597 "VBNET.ATG" out Expression argumentexpr) { -#line 2552 "VBNET.ATG" +#line 2599 "VBNET.ATG" Expression expr; argumentexpr = null; string name; if ( -#line 2556 "VBNET.ATG" +#line 2603 "VBNET.ATG" IsNamedAssign()) { Identifier(); -#line 2556 "VBNET.ATG" +#line 2603 "VBNET.ATG" name = t.val; Expect(55); Expr( -#line 2556 "VBNET.ATG" +#line 2603 "VBNET.ATG" out expr); -#line 2558 "VBNET.ATG" +#line 2605 "VBNET.ATG" argumentexpr = new NamedArgumentExpression(name, expr); } else if (StartOf(30)) { Expr( -#line 2561 "VBNET.ATG" +#line 2608 "VBNET.ATG" out argumentexpr); - } else SynErr(298); + } else SynErr(305); } void QualIdentAndTypeArguments( -#line 2627 "VBNET.ATG" +#line 2674 "VBNET.ATG" out TypeReference typeref, bool canBeUnbound) { -#line 2628 "VBNET.ATG" +#line 2675 "VBNET.ATG" string name; typeref = null; Qualident( -#line 2630 "VBNET.ATG" +#line 2677 "VBNET.ATG" out name); -#line 2631 "VBNET.ATG" +#line 2678 "VBNET.ATG" typeref = new TypeReference(name); if ( -#line 2632 "VBNET.ATG" +#line 2679 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { lexer.NextToken(); Expect(169); if ( -#line 2634 "VBNET.ATG" +#line 2681 "VBNET.ATG" canBeUnbound && (la.kind == Tokens.CloseParenthesis || la.kind == Tokens.Comma)) { -#line 2635 "VBNET.ATG" +#line 2682 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); while (la.kind == 22) { lexer.NextToken(); -#line 2636 "VBNET.ATG" +#line 2683 "VBNET.ATG" typeref.GenericTypes.Add(NullTypeReference.Instance); } } else if (StartOf(8)) { TypeArgumentList( -#line 2637 "VBNET.ATG" +#line 2684 "VBNET.ATG" typeref.GenericTypes); - } else SynErr(299); + } else SynErr(306); Expect(38); } } void RankList( -#line 2674 "VBNET.ATG" +#line 2721 "VBNET.ATG" out int i) { -#line 2675 "VBNET.ATG" +#line 2722 "VBNET.ATG" i = 0; while (la.kind == 22) { lexer.NextToken(); -#line 2676 "VBNET.ATG" +#line 2723 "VBNET.ATG" ++i; } } void Attribute( -#line 2715 "VBNET.ATG" +#line 2762 "VBNET.ATG" out ASTAttribute attribute) { -#line 2716 "VBNET.ATG" +#line 2763 "VBNET.ATG" string name; List positional = new List(); List named = new List(); @@ -6612,52 +6811,52 @@ out ASTAttribute attribute) { Expect(26); } Qualident( -#line 2721 "VBNET.ATG" +#line 2768 "VBNET.ATG" out name); if (la.kind == 37) { AttributeArguments( -#line 2722 "VBNET.ATG" +#line 2769 "VBNET.ATG" positional, named); } -#line 2724 "VBNET.ATG" +#line 2771 "VBNET.ATG" attribute = new ASTAttribute(name, positional, named); } void AttributeArguments( -#line 2729 "VBNET.ATG" +#line 2776 "VBNET.ATG" List positional, List named) { -#line 2731 "VBNET.ATG" +#line 2778 "VBNET.ATG" bool nameFound = false; string name = ""; Expression expr; Expect(37); if ( -#line 2737 "VBNET.ATG" +#line 2784 "VBNET.ATG" IsNotClosingParenthesis()) { if ( -#line 2739 "VBNET.ATG" +#line 2786 "VBNET.ATG" IsNamedAssign()) { -#line 2739 "VBNET.ATG" +#line 2786 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2740 "VBNET.ATG" +#line 2787 "VBNET.ATG" out name); if (la.kind == 55) { lexer.NextToken(); } else if (la.kind == 20) { lexer.NextToken(); - } else SynErr(300); + } else SynErr(307); } Expr( -#line 2742 "VBNET.ATG" +#line 2789 "VBNET.ATG" out expr); -#line 2744 "VBNET.ATG" +#line 2791 "VBNET.ATG" if (expr != null) { if (string.IsNullOrEmpty(name)) { positional.Add(expr); } else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } @@ -6666,29 +6865,29 @@ out expr); while (la.kind == 22) { lexer.NextToken(); if ( -#line 2752 "VBNET.ATG" +#line 2799 "VBNET.ATG" IsNamedAssign()) { -#line 2752 "VBNET.ATG" +#line 2799 "VBNET.ATG" nameFound = true; IdentifierOrKeyword( -#line 2753 "VBNET.ATG" +#line 2800 "VBNET.ATG" out name); if (la.kind == 55) { lexer.NextToken(); } else if (la.kind == 20) { lexer.NextToken(); - } else SynErr(301); + } else SynErr(308); } else if (StartOf(30)) { -#line 2755 "VBNET.ATG" +#line 2802 "VBNET.ATG" if (nameFound) Error("no positional argument after named argument"); - } else SynErr(302); + } else SynErr(309); Expr( -#line 2756 "VBNET.ATG" +#line 2803 "VBNET.ATG" out expr); -#line 2756 "VBNET.ATG" +#line 2803 "VBNET.ATG" if (expr != null) { if(name == "") positional.Add(expr); else { named.Add(new NamedArgumentExpression(name, expr)); name = ""; } } @@ -6699,10 +6898,10 @@ out expr); } void FormalParameter( -#line 2813 "VBNET.ATG" +#line 2860 "VBNET.ATG" out ParameterDeclarationExpression p) { -#line 2815 "VBNET.ATG" +#line 2862 "VBNET.ATG" AttributeSection section; List attributes = new List(); TypeReference type = null; @@ -6713,36 +6912,36 @@ out ParameterDeclarationExpression p) { while (la.kind == 40) { AttributeSection( -#line 2824 "VBNET.ATG" +#line 2871 "VBNET.ATG" out section); -#line 2824 "VBNET.ATG" +#line 2871 "VBNET.ATG" attributes.Add(section); } - while (StartOf(44)) { + while (StartOf(48)) { ParameterModifier( -#line 2825 "VBNET.ATG" +#line 2872 "VBNET.ATG" mod); } Identifier(); -#line 2826 "VBNET.ATG" +#line 2873 "VBNET.ATG" string parameterName = t.val; if ( -#line 2827 "VBNET.ATG" +#line 2874 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 2827 "VBNET.ATG" +#line 2874 "VBNET.ATG" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 2828 "VBNET.ATG" +#line 2875 "VBNET.ATG" out type); } -#line 2830 "VBNET.ATG" +#line 2877 "VBNET.ATG" if(type != null) { if (arrayModifiers != null) { if (type.RankSpecifier != null) { @@ -6756,11 +6955,11 @@ out type); if (la.kind == 20) { lexer.NextToken(); Expr( -#line 2840 "VBNET.ATG" +#line 2887 "VBNET.ATG" out expr); } -#line 2842 "VBNET.ATG" +#line 2889 "VBNET.ATG" mod.Check(); p = new ParameterDeclarationExpression(type, parameterName, mod.Modifier, expr); p.Attributes = attributes; @@ -6768,34 +6967,34 @@ out expr); } void ParameterModifier( -#line 3526 "VBNET.ATG" +#line 3573 "VBNET.ATG" ParamModifierList m) { if (la.kind == 72) { lexer.NextToken(); -#line 3527 "VBNET.ATG" +#line 3574 "VBNET.ATG" m.Add(ParameterModifiers.In); } else if (la.kind == 69) { lexer.NextToken(); -#line 3528 "VBNET.ATG" +#line 3575 "VBNET.ATG" m.Add(ParameterModifiers.Ref); } else if (la.kind == 174) { lexer.NextToken(); -#line 3529 "VBNET.ATG" +#line 3576 "VBNET.ATG" m.Add(ParameterModifiers.Optional); } else if (la.kind == 182) { lexer.NextToken(); -#line 3530 "VBNET.ATG" +#line 3577 "VBNET.ATG" m.Add(ParameterModifiers.Params); - } else SynErr(303); + } else SynErr(310); } void Statement() { -#line 2871 "VBNET.ATG" +#line 2918 "VBNET.ATG" Statement stmt = null; Location startPos = la.Location; string label = String.Empty; @@ -6803,27 +7002,27 @@ ParamModifierList m) { if (la.kind == 1 || la.kind == 21) { } else if ( -#line 2877 "VBNET.ATG" +#line 2924 "VBNET.ATG" IsLabel()) { LabelName( -#line 2877 "VBNET.ATG" +#line 2924 "VBNET.ATG" out label); -#line 2879 "VBNET.ATG" +#line 2926 "VBNET.ATG" AddChild(new LabelStatement(t.val)); Expect(21); Statement(); - } else if (StartOf(45)) { + } else if (StartOf(49)) { EmbeddedStatement( -#line 2882 "VBNET.ATG" +#line 2929 "VBNET.ATG" out stmt); -#line 2882 "VBNET.ATG" +#line 2929 "VBNET.ATG" AddChild(stmt); - } else SynErr(304); + } else SynErr(311); -#line 2885 "VBNET.ATG" +#line 2932 "VBNET.ATG" if (stmt != null) { stmt.StartLocation = startPos; stmt.EndLocation = t.Location; @@ -6832,30 +7031,30 @@ out stmt); } void LabelName( -#line 3300 "VBNET.ATG" +#line 3347 "VBNET.ATG" out string name) { -#line 3302 "VBNET.ATG" +#line 3349 "VBNET.ATG" name = String.Empty; if (StartOf(4)) { Identifier(); -#line 3304 "VBNET.ATG" +#line 3351 "VBNET.ATG" name = t.val; } else if (la.kind == 5) { lexer.NextToken(); -#line 3305 "VBNET.ATG" +#line 3352 "VBNET.ATG" name = t.val; - } else SynErr(305); + } else SynErr(312); } void LocalDeclarationStatement( -#line 2893 "VBNET.ATG" +#line 2940 "VBNET.ATG" out Statement statement) { -#line 2895 "VBNET.ATG" +#line 2942 "VBNET.ATG" ModifierList m = new ModifierList(); LocalVariableDeclaration localVariableDeclaration; bool dimfound = false; @@ -6864,22 +7063,22 @@ out Statement statement) { if (la.kind == 88) { lexer.NextToken(); -#line 2901 "VBNET.ATG" +#line 2948 "VBNET.ATG" m.Add(Modifiers.Const, t.Location); } else if (la.kind == 204) { lexer.NextToken(); -#line 2902 "VBNET.ATG" +#line 2949 "VBNET.ATG" m.Add(Modifiers.Static, t.Location); } else { lexer.NextToken(); -#line 2903 "VBNET.ATG" +#line 2950 "VBNET.ATG" dimfound = true; } } -#line 2906 "VBNET.ATG" +#line 2953 "VBNET.ATG" if(dimfound && (m.Modifier & Modifiers.Const) != 0) { Error("Dim is not allowed on constants."); } @@ -6892,135 +7091,135 @@ out Statement statement) { localVariableDeclaration.StartLocation = t.Location; VariableDeclarator( -#line 2917 "VBNET.ATG" +#line 2964 "VBNET.ATG" localVariableDeclaration.Variables); while (la.kind == 22) { lexer.NextToken(); VariableDeclarator( -#line 2918 "VBNET.ATG" +#line 2965 "VBNET.ATG" localVariableDeclaration.Variables); } -#line 2920 "VBNET.ATG" +#line 2967 "VBNET.ATG" statement = localVariableDeclaration; } void TryStatement( -#line 3414 "VBNET.ATG" +#line 3461 "VBNET.ATG" out Statement tryStatement) { -#line 3416 "VBNET.ATG" +#line 3463 "VBNET.ATG" Statement blockStmt = null, finallyStmt = null;List catchClauses = null; Expect(218); EndOfStmt(); Block( -#line 3419 "VBNET.ATG" +#line 3466 "VBNET.ATG" out blockStmt); if (la.kind == 75 || la.kind == 113 || la.kind == 123) { CatchClauses( -#line 3420 "VBNET.ATG" +#line 3467 "VBNET.ATG" out catchClauses); } if (la.kind == 123) { lexer.NextToken(); EndOfStmt(); Block( -#line 3421 "VBNET.ATG" +#line 3468 "VBNET.ATG" out finallyStmt); } Expect(113); Expect(218); -#line 3424 "VBNET.ATG" +#line 3471 "VBNET.ATG" tryStatement = new TryCatchStatement(blockStmt, catchClauses, finallyStmt); } void WithStatement( -#line 3394 "VBNET.ATG" +#line 3441 "VBNET.ATG" out Statement withStatement) { -#line 3396 "VBNET.ATG" +#line 3443 "VBNET.ATG" Statement blockStmt = null; Expression expr = null; Expect(233); -#line 3399 "VBNET.ATG" +#line 3446 "VBNET.ATG" Location start = t.Location; Expr( -#line 3400 "VBNET.ATG" +#line 3447 "VBNET.ATG" out expr); EndOfStmt(); -#line 3402 "VBNET.ATG" +#line 3449 "VBNET.ATG" withStatement = new WithStatement(expr); withStatement.StartLocation = start; Block( -#line 3405 "VBNET.ATG" +#line 3452 "VBNET.ATG" out blockStmt); -#line 3407 "VBNET.ATG" +#line 3454 "VBNET.ATG" ((WithStatement)withStatement).Body = (BlockStatement)blockStmt; Expect(113); Expect(233); -#line 3410 "VBNET.ATG" +#line 3457 "VBNET.ATG" withStatement.EndLocation = t.Location; } void WhileOrUntil( -#line 3387 "VBNET.ATG" +#line 3434 "VBNET.ATG" out ConditionType conditionType) { -#line 3388 "VBNET.ATG" +#line 3435 "VBNET.ATG" conditionType = ConditionType.None; if (la.kind == 231) { lexer.NextToken(); -#line 3389 "VBNET.ATG" +#line 3436 "VBNET.ATG" conditionType = ConditionType.While; } else if (la.kind == 224) { lexer.NextToken(); -#line 3390 "VBNET.ATG" +#line 3437 "VBNET.ATG" conditionType = ConditionType.Until; - } else SynErr(306); + } else SynErr(313); } void LoopControlVariable( -#line 3230 "VBNET.ATG" +#line 3277 "VBNET.ATG" out TypeReference type, out string name) { -#line 3231 "VBNET.ATG" +#line 3278 "VBNET.ATG" ArrayList arrayModifiers = null; type = null; Qualident( -#line 3235 "VBNET.ATG" +#line 3282 "VBNET.ATG" out name); if ( -#line 3236 "VBNET.ATG" +#line 3283 "VBNET.ATG" IsDims()) { ArrayTypeModifiers( -#line 3236 "VBNET.ATG" +#line 3283 "VBNET.ATG" out arrayModifiers); } if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3237 "VBNET.ATG" +#line 3284 "VBNET.ATG" out type); -#line 3237 "VBNET.ATG" +#line 3284 "VBNET.ATG" if (name.IndexOf('.') > 0) { Error("No type def for 'for each' member indexer allowed."); } } -#line 3239 "VBNET.ATG" +#line 3286 "VBNET.ATG" if (type != null) { if(type.RankSpecifier != null && arrayModifiers != null) { Error("array rank only allowed one time"); @@ -7032,34 +7231,34 @@ out type); } void ReDimClause( -#line 3309 "VBNET.ATG" +#line 3356 "VBNET.ATG" out Expression expr) { SimpleNonInvocationExpression( -#line 3311 "VBNET.ATG" +#line 3358 "VBNET.ATG" out expr); ReDimClauseInternal( -#line 3312 "VBNET.ATG" +#line 3359 "VBNET.ATG" ref expr); } void SingleLineStatementList( -#line 3216 "VBNET.ATG" +#line 3263 "VBNET.ATG" List list) { -#line 3217 "VBNET.ATG" +#line 3264 "VBNET.ATG" Statement embeddedStatement = null; if (la.kind == 113) { lexer.NextToken(); -#line 3219 "VBNET.ATG" +#line 3266 "VBNET.ATG" embeddedStatement = new EndStatement(); - } else if (StartOf(45)) { + } else if (StartOf(49)) { EmbeddedStatement( -#line 3220 "VBNET.ATG" +#line 3267 "VBNET.ATG" out embeddedStatement); - } else SynErr(307); + } else SynErr(314); -#line 3221 "VBNET.ATG" +#line 3268 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); while (la.kind == 21) { lexer.NextToken(); @@ -7069,62 +7268,62 @@ out embeddedStatement); if (la.kind == 113) { lexer.NextToken(); -#line 3223 "VBNET.ATG" +#line 3270 "VBNET.ATG" embeddedStatement = new EndStatement(); - } else if (StartOf(45)) { + } else if (StartOf(49)) { EmbeddedStatement( -#line 3224 "VBNET.ATG" +#line 3271 "VBNET.ATG" out embeddedStatement); - } else SynErr(308); + } else SynErr(315); -#line 3225 "VBNET.ATG" +#line 3272 "VBNET.ATG" if (embeddedStatement != null) list.Add(embeddedStatement); } } void CaseClauses( -#line 3347 "VBNET.ATG" +#line 3394 "VBNET.ATG" out List caseClauses) { -#line 3349 "VBNET.ATG" +#line 3396 "VBNET.ATG" caseClauses = new List(); CaseLabel caseClause = null; CaseClause( -#line 3352 "VBNET.ATG" +#line 3399 "VBNET.ATG" out caseClause); -#line 3352 "VBNET.ATG" +#line 3399 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } while (la.kind == 22) { lexer.NextToken(); CaseClause( -#line 3353 "VBNET.ATG" +#line 3400 "VBNET.ATG" out caseClause); -#line 3353 "VBNET.ATG" +#line 3400 "VBNET.ATG" if (caseClause != null) { caseClauses.Add(caseClause); } } } void OnErrorStatement( -#line 3250 "VBNET.ATG" +#line 3297 "VBNET.ATG" out OnErrorStatement stmt) { -#line 3252 "VBNET.ATG" +#line 3299 "VBNET.ATG" stmt = null; GotoStatement goToStatement = null; Expect(171); Expect(118); if ( -#line 3258 "VBNET.ATG" +#line 3305 "VBNET.ATG" IsNegativeLabelName()) { Expect(132); Expect(30); Expect(5); -#line 3260 "VBNET.ATG" +#line 3307 "VBNET.ATG" long intLabel = Int64.Parse(t.val); if(intLabel != 1) { Error("invalid label in on error statement."); @@ -7133,10 +7332,10 @@ IsNegativeLabelName()) { } else if (la.kind == 132) { GotoStatement( -#line 3266 "VBNET.ATG" +#line 3313 "VBNET.ATG" out goToStatement); -#line 3268 "VBNET.ATG" +#line 3315 "VBNET.ATG" string val = goToStatement.Label; // if value is numeric, make sure that is 0 @@ -7153,88 +7352,88 @@ out goToStatement); lexer.NextToken(); Expect(163); -#line 3282 "VBNET.ATG" +#line 3329 "VBNET.ATG" stmt = new OnErrorStatement(new ResumeStatement(true)); - } else SynErr(309); + } else SynErr(316); } void GotoStatement( -#line 3288 "VBNET.ATG" +#line 3335 "VBNET.ATG" out GotoStatement goToStatement) { -#line 3290 "VBNET.ATG" +#line 3337 "VBNET.ATG" string label = String.Empty; Expect(132); LabelName( -#line 3293 "VBNET.ATG" +#line 3340 "VBNET.ATG" out label); -#line 3295 "VBNET.ATG" +#line 3342 "VBNET.ATG" goToStatement = new GotoStatement(label); } void ResumeStatement( -#line 3336 "VBNET.ATG" +#line 3383 "VBNET.ATG" out ResumeStatement resumeStatement) { -#line 3338 "VBNET.ATG" +#line 3385 "VBNET.ATG" resumeStatement = null; string label = String.Empty; if ( -#line 3341 "VBNET.ATG" +#line 3388 "VBNET.ATG" IsResumeNext()) { Expect(194); Expect(163); -#line 3342 "VBNET.ATG" +#line 3389 "VBNET.ATG" resumeStatement = new ResumeStatement(true); } else if (la.kind == 194) { lexer.NextToken(); - if (StartOf(46)) { + if (StartOf(50)) { LabelName( -#line 3343 "VBNET.ATG" +#line 3390 "VBNET.ATG" out label); } -#line 3343 "VBNET.ATG" +#line 3390 "VBNET.ATG" resumeStatement = new ResumeStatement(label); - } else SynErr(310); + } else SynErr(317); } void ReDimClauseInternal( -#line 3315 "VBNET.ATG" +#line 3362 "VBNET.ATG" ref Expression expr) { -#line 3316 "VBNET.ATG" +#line 3363 "VBNET.ATG" List arguments; bool canBeNormal; bool canBeRedim; string name; while (la.kind == 26 || -#line 3319 "VBNET.ATG" +#line 3366 "VBNET.ATG" la.kind == Tokens.OpenParenthesis && Peek(1).kind == Tokens.Of) { if (la.kind == 26) { lexer.NextToken(); IdentifierOrKeyword( -#line 3318 "VBNET.ATG" +#line 3365 "VBNET.ATG" out name); -#line 3318 "VBNET.ATG" +#line 3365 "VBNET.ATG" expr = new MemberReferenceExpression(expr, name); } else { InvocationExpression( -#line 3320 "VBNET.ATG" +#line 3367 "VBNET.ATG" ref expr); } } Expect(37); NormalOrReDimArgumentList( -#line 3323 "VBNET.ATG" +#line 3370 "VBNET.ATG" out arguments, out canBeNormal, out canBeRedim); Expect(38); -#line 3325 "VBNET.ATG" +#line 3372 "VBNET.ATG" expr = new InvocationExpression(expr, arguments); if (canBeRedim == false || canBeNormal && (la.kind == Tokens.Dot || la.kind == Tokens.OpenParenthesis)) { if (this.Errors.Count == 0) { @@ -7246,10 +7445,10 @@ out arguments, out canBeNormal, out canBeRedim); } void CaseClause( -#line 3357 "VBNET.ATG" +#line 3404 "VBNET.ATG" out CaseLabel caseClause) { -#line 3359 "VBNET.ATG" +#line 3406 "VBNET.ATG" Expression expr = null; Expression sexpr = null; BinaryOperatorType op = BinaryOperatorType.None; @@ -7258,9 +7457,9 @@ out CaseLabel caseClause) { if (la.kind == 111) { lexer.NextToken(); -#line 3365 "VBNET.ATG" +#line 3412 "VBNET.ATG" caseClause = new CaseLabel(); - } else if (StartOf(47)) { + } else if (StartOf(51)) { if (la.kind == 144) { lexer.NextToken(); } @@ -7268,76 +7467,76 @@ out CaseLabel caseClause) { case 40: { lexer.NextToken(); -#line 3369 "VBNET.ATG" +#line 3416 "VBNET.ATG" op = BinaryOperatorType.LessThan; break; } case 39: { lexer.NextToken(); -#line 3370 "VBNET.ATG" +#line 3417 "VBNET.ATG" op = BinaryOperatorType.GreaterThan; break; } case 43: { lexer.NextToken(); -#line 3371 "VBNET.ATG" +#line 3418 "VBNET.ATG" op = BinaryOperatorType.LessThanOrEqual; break; } case 42: { lexer.NextToken(); -#line 3372 "VBNET.ATG" +#line 3419 "VBNET.ATG" op = BinaryOperatorType.GreaterThanOrEqual; break; } case 20: { lexer.NextToken(); -#line 3373 "VBNET.ATG" +#line 3420 "VBNET.ATG" op = BinaryOperatorType.Equality; break; } case 41: { lexer.NextToken(); -#line 3374 "VBNET.ATG" +#line 3421 "VBNET.ATG" op = BinaryOperatorType.InEquality; break; } - default: SynErr(311); break; + default: SynErr(318); break; } Expr( -#line 3376 "VBNET.ATG" +#line 3423 "VBNET.ATG" out expr); -#line 3378 "VBNET.ATG" +#line 3425 "VBNET.ATG" caseClause = new CaseLabel(op, expr); } else if (StartOf(30)) { Expr( -#line 3380 "VBNET.ATG" +#line 3427 "VBNET.ATG" out expr); if (la.kind == 216) { lexer.NextToken(); Expr( -#line 3380 "VBNET.ATG" +#line 3427 "VBNET.ATG" out sexpr); } -#line 3382 "VBNET.ATG" +#line 3429 "VBNET.ATG" caseClause = new CaseLabel(expr, sexpr); - } else SynErr(312); + } else SynErr(319); } void CatchClauses( -#line 3429 "VBNET.ATG" +#line 3476 "VBNET.ATG" out List catchClauses) { -#line 3431 "VBNET.ATG" +#line 3478 "VBNET.ATG" catchClauses = new List(); TypeReference type = null; Statement blockStmt = null; @@ -7349,27 +7548,27 @@ out List catchClauses) { if (StartOf(4)) { Identifier(); -#line 3439 "VBNET.ATG" +#line 3486 "VBNET.ATG" name = t.val; if (la.kind == 63) { lexer.NextToken(); TypeName( -#line 3439 "VBNET.ATG" +#line 3486 "VBNET.ATG" out type); } } if (la.kind == 229) { lexer.NextToken(); Expr( -#line 3440 "VBNET.ATG" +#line 3487 "VBNET.ATG" out expr); } EndOfStmt(); Block( -#line 3442 "VBNET.ATG" +#line 3489 "VBNET.ATG" out blockStmt); -#line 3443 "VBNET.ATG" +#line 3490 "VBNET.ATG" catchClauses.Add(new CatchClause(type, name, blockStmt, expr)); } } @@ -7669,36 +7868,43 @@ out blockStmt); case 280: s = "invalid SimpleNonInvocationExpression"; break; case 281: s = "invalid SimpleNonInvocationExpression"; break; case 282: s = "invalid SimpleNonInvocationExpression"; break; - case 283: s = "invalid PrimitiveTypeName"; break; - case 284: s = "invalid CastTarget"; break; - case 285: s = "invalid ComparisonExpr"; break; - case 286: s = "invalid SubLambdaExpression"; break; - case 287: s = "invalid FunctionLambdaExpression"; break; - case 288: s = "invalid EmbeddedStatement"; break; - case 289: s = "invalid EmbeddedStatement"; break; - case 290: s = "invalid EmbeddedStatement"; break; - case 291: s = "invalid EmbeddedStatement"; break; - case 292: s = "invalid EmbeddedStatement"; break; - case 293: s = "invalid EmbeddedStatement"; break; - case 294: s = "invalid EmbeddedStatement"; break; - case 295: s = "invalid FromOrAggregateQueryOperator"; break; - case 296: s = "invalid QueryOperator"; break; - case 297: s = "invalid PartitionQueryOperator"; break; - case 298: s = "invalid Argument"; break; - case 299: s = "invalid QualIdentAndTypeArguments"; break; - case 300: s = "invalid AttributeArguments"; break; - case 301: s = "invalid AttributeArguments"; break; - case 302: s = "invalid AttributeArguments"; break; - case 303: s = "invalid ParameterModifier"; break; - case 304: s = "invalid Statement"; break; - case 305: s = "invalid LabelName"; break; - case 306: s = "invalid WhileOrUntil"; break; - case 307: s = "invalid SingleLineStatementList"; break; - case 308: s = "invalid SingleLineStatementList"; break; - case 309: s = "invalid OnErrorStatement"; break; - case 310: s = "invalid ResumeStatement"; break; - case 311: s = "invalid CaseClause"; break; - case 312: s = "invalid CaseClause"; break; + case 283: s = "invalid SimpleNonInvocationExpression"; break; + case 284: s = "invalid PrimitiveTypeName"; break; + case 285: s = "invalid CastTarget"; break; + case 286: s = "invalid XmlContentExpression"; break; + case 287: s = "invalid XmlElement"; break; + case 288: s = "invalid XmlElement"; break; + case 289: s = "invalid XmlNestedContent"; break; + case 290: s = "invalid XmlAttribute"; break; + case 291: s = "invalid XmlAttribute"; break; + case 292: s = "invalid ComparisonExpr"; break; + case 293: s = "invalid SubLambdaExpression"; break; + case 294: s = "invalid FunctionLambdaExpression"; break; + case 295: s = "invalid EmbeddedStatement"; break; + case 296: s = "invalid EmbeddedStatement"; break; + case 297: s = "invalid EmbeddedStatement"; break; + case 298: s = "invalid EmbeddedStatement"; break; + case 299: s = "invalid EmbeddedStatement"; break; + case 300: s = "invalid EmbeddedStatement"; break; + case 301: s = "invalid EmbeddedStatement"; break; + case 302: s = "invalid FromOrAggregateQueryOperator"; break; + case 303: s = "invalid QueryOperator"; break; + case 304: s = "invalid PartitionQueryOperator"; break; + case 305: s = "invalid Argument"; break; + case 306: s = "invalid QualIdentAndTypeArguments"; break; + case 307: s = "invalid AttributeArguments"; break; + case 308: s = "invalid AttributeArguments"; break; + case 309: s = "invalid AttributeArguments"; break; + case 310: s = "invalid ParameterModifier"; break; + case 311: s = "invalid Statement"; break; + case 312: s = "invalid LabelName"; break; + case 313: s = "invalid WhileOrUntil"; break; + case 314: s = "invalid SingleLineStatementList"; break; + case 315: s = "invalid SingleLineStatementList"; break; + case 316: s = "invalid OnErrorStatement"; break; + case 317: s = "invalid ResumeStatement"; break; + case 318: s = "invalid CaseClause"; break; + case 319: s = "invalid CaseClause"; break; default: s = "error " + errorNumber; break; } @@ -7733,27 +7939,31 @@ out blockStmt); {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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,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,x, T,T,x,x, x,x,x,x, x,x,T,T, x,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,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,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,T,x,x, x,x,x,x, x,x,x,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, x,x,x,x, x,x,x,x, x,x,T,T, 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, 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,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,T,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, 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,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,T,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,T,T, T,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, 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,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,T,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,T,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,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,T,T, T,T,T,x, T,T,T,x, T,T,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,T, x,T,x,x, T,T,T,x, T,T,T,x, T,x,T,x, x,T,T,x, T,T,x,T, T,x,x,T, x,T,x,T, T,T,T,T, T,x,T,T, x,T,T,x, x,x,T,T, x,x,T,x, x,T,x,x, T,x,T,T, x,x,x,T, T,T,T,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,T,T,x, T,x,x,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x, x,x,T,T, x,T,x,x, T,x,x,x}, + {x,T,T,T, T,T,T,T, T,T,x,x, x,T,x,x, x,x,x,x, T,T,T,T, T,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,T,T, T,T,T,x, T,T,T,x, T,T,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,T, x,T,x,x, T,T,T,x, T,T,T,x, T,x,T,x, x,T,T,x, T,T,x,T, T,x,x,T, x,T,x,T, T,T,T,T, T,x,T,T, x,T,T,x, x,x,T,T, x,x,T,x, x,T,x,x, T,x,T,T, x,x,x,T, T,T,T,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,T,T,x, T,x,x,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x, x,x,T,T, x,T,x,x, T,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,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, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,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,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,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, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,T,x,T, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,T,T,T, x,x,x,x, x,x,T,T, 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, 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,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,T,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,T,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,T,T, T,T,T,T, T,T,T,x, x,x,x,x, T,T,T,T, x,x,x,x, x,x,T,T, 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, 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,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,T,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,T,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,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,x, x,x,x,x, x,T,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, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,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,x, x,x,x,x, x,x,x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, {x,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,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, 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,T, x,T,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, 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,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,T,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,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,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,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,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, 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,T,x, T,x,x,x, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x}, + {x,T,T,T, T,T,T,T, T,T,T,x, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, T,T,T,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, T,T,x,x, x,x,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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, x,x,x,x, x,x,x,x, x,x,T,T, 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, 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,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,T,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,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,T,T,T, x,x,x,x, x,x,T,T, 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,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,T, x,T,T,x, T,T,x,T, x,x,x,T, x,T,x,T, x,x,T,T, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, T,T,x,x, T,x,T,T, x,x,x,x, T,x,T,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,T,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,T,T, T,T,T,T, T,T,x,x, x,x,x,x, T,T,T,T, x,x,T,x, x,x,T,T, T,x,T,T, x,x,T,T, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,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,T,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,T,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,T,T, T,T,T,T, T,T,T,x, x,x,x,x, T,T,T,T, x,x,x,x, x,x,T,T, 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,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,T, x,T,T,x, T,T,x,T, x,x,x,T, x,T,x,T, x,x,T,T, x,x,x,T, x,T,x,x, x,x,T,T, x,x,T,x, T,T,x,x, T,x,T,T, x,x,x,x, T,x,T,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,T,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,T,T, T,T,T,T, T,T,T,x, x,x,x,x, T,T,T,T, x,x,T,x, x,x,T,T, T,x,T,T, x,x,T,T, x,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,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,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,T,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,T,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,T,T, T,T,T,T, T,T,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,T, x,T,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, 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,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,T,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,T,T, T,T,T,T, T,T,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,T, x,T,x,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,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,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,T,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, T,x,x,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,x,x}, - {x,T,T,T, T,T,T,T, T,T,x,x, x,x,x,x, x,x,x,x, T,T,T,T, T,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,T,T, T,T,T,x, T,T,T,x, T,T,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,T, x,T,x,x, T,T,T,x, T,T,T,x, T,x,T,x, x,T,T,x, T,T,x,T, T,x,x,T, x,T,x,T, T,T,T,T, T,x,T,T, x,T,T,x, x,x,T,T, x,x,T,x, x,T,x,x, T,x,T,T, x,x,x,T, T,T,T,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,T,T,x, T,x,x,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x, x,x,T,T, x,T,x,x, T,x,x,x}, + {x,T,T,T, T,T,T,T, T,T,x,x, x,T,x,x, x,x,x,x, T,T,T,T, T,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,T,T, T,T,T,x, T,T,T,x, T,T,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,T, x,T,x,x, T,T,T,x, T,T,T,x, T,x,T,x, x,T,T,x, T,T,x,T, T,x,x,T, x,T,x,T, T,T,T,T, T,x,T,T, x,T,T,x, x,x,T,T, x,x,T,x, x,T,x,x, T,x,T,T, x,x,x,T, T,T,T,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,T,T,x, T,x,x,T, T,T,T,T, T,T,T,T, T,T,T,T, T,T,T,x, x,x,T,T, x,T,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,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,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,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, 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,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,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, 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,x,T,T, T,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, 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,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,T,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}, diff --git a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG index 6876e7fb77..34f2a2a955 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/VBNET.ATG @@ -1752,17 +1752,19 @@ SimpleNonInvocationExpression | /* 11.22 */ ConditionalExpression ) | - /* this form only occurs in WithStatements */ - "." ( - XmlOpenTag IdentifierOrKeyword XmlCloseTag - (. pexpr = new XmlMemberAccessExpression(null, XmlAxisType.Element, name, true); .) - | IdentifierOrKeyword - (. pexpr = new MemberReferenceExpression(null, name); .) - ) | - (. XmlAxisType axisType = XmlAxisType.Element; bool isXmlIdentifier = false; .) - ( "..." (. axisType = XmlAxisType.Descendents; .) | ".@" (. axisType = XmlAxisType.Attribute; .) ) ( - [ XmlOpenTag (. isXmlIdentifier = true; .) ] IdentifierOrKeyword [ XmlCloseTag ] - (. pexpr = new XmlMemberAccessExpression(null, axisType, name, isXmlIdentifier); .) + ( + /* this form only occurs in WithStatements */ + "." ( + XmlOpenTag IdentifierOrKeyword XmlCloseTag + (. pexpr = new XmlMemberAccessExpression(null, XmlAxisType.Element, name, true); .) + | IdentifierOrKeyword + (. pexpr = new MemberReferenceExpression(null, name); .) + ) | + (. XmlAxisType axisType = XmlAxisType.Element; bool isXmlIdentifier = false; .) + ( "..." (. axisType = XmlAxisType.Descendents; .) | ".@" (. axisType = XmlAxisType.Attribute; .) ) ( + [ XmlOpenTag (. isXmlIdentifier = true; .) ] IdentifierOrKeyword [ XmlCloseTag ] + (. pexpr = new XmlMemberAccessExpression(null, axisType, name, isXmlIdentifier); .) + ) ) ) . @@ -1772,22 +1774,67 @@ XmlLiteralExpression XmlLiteralExpression expr = new XmlLiteralExpression(); List exprs = expr.Expressions; XmlExpression currentExpression = null; + pexpr = expr; .) = ( - XmlContent (. currentExpression = new XmlContentExpression(t.val, XmlContentType.Text); .) - | XmlCData (. currentExpression = new XmlContentExpression(t.val, XmlContentType.CData); .) - | XmlComment (. currentExpression = new XmlContentExpression(t.val, XmlContentType.Comment); .) - | XmlProcessingInstruction (. currentExpression = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); .) + XmlContentExpression { XmlContentExpression } [ XmlElement { XmlContentExpression } ] + | + XmlElement { XmlContentExpression } + ) +. + +XmlContentExpression exprs> = +(. XmlContentExpression expr = null; .) + ( + XmlContent (. expr = new XmlContentExpression(t.val, XmlContentType.Text); .) + | XmlCData (. expr = new XmlContentExpression(t.val, XmlContentType.CData); .) + | XmlComment (. expr = new XmlContentExpression(t.val, XmlContentType.Comment); .) + | XmlProcessingInstruction (. expr = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); .) ) (. - currentExpression.StartLocation = t.Location; - currentExpression.EndLocation = t.EndLocation; - exprs.Add(currentExpression); - pexpr = expr; + expr.StartLocation = t.Location; + expr.EndLocation = t.EndLocation; + exprs.Add(expr); .) . +XmlNestedContent + (. XmlExpression tmpExpr = null; .) += + ( + XmlContent (. tmpExpr = new XmlContentExpression(t.val, XmlContentType.Text); .) + | XmlCData (. tmpExpr = new XmlContentExpression(t.val, XmlContentType.CData); .) + | XmlComment (. tmpExpr = new XmlContentExpression(t.val, XmlContentType.Comment); .) + | XmlProcessingInstruction (. tmpExpr = new XmlContentExpression(t.val, XmlContentType.ProcessingInstruction); .) + | XmlStartInlineVB (. Expression innerExpression; .) Expr XmlEndInlineVB (. tmpExpr = new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }; .) + | XmlElement + ) + (. expr = tmpExpr; .) +. + +XmlElement + (. XmlElementExpression el = new XmlElementExpression(); .) += + ( + XmlOpenTag + ( XmlStartInlineVB (. Expression innerExpression; .) Expr XmlEndInlineVB + (. el.NameExpression = new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }; .) + | Identifier (. el.XmlName = t.val; .) ) { XmlAttribute } + ( XmlCloseTagEmptyElement | XmlCloseTag { (. XmlExpression child; .) XmlNestedContent (. el.Children.Add(child); .) } XmlOpenEndTag { ANY } XmlCloseTag ) + ) + (. expr = el; .) +. + +XmlAttribute attrs> = + Identifier (. string name = t.val; .) "=" + (. string literalValue = null; Expression expressionValue = null; .) + ( LiteralString (. literalValue = t.literalValue.ToString(); .) | XmlStartInlineVB Expr XmlEndInlineVB ) + (. attrs.Add(new XmlAttribute() { Name = name, ExpressionValue = expressionValue, LiteralValue = literalValue }); .) + | XmlStartInlineVB (. Expression innerExpression; .) Expr XmlEndInlineVB + (. attrs.Add(new XmlEmbeddedExpression() { InlineVBExpression = innerExpression }); .) +. + ConditionalExpression (. ConditionalExpression conditionalExpression = new ConditionalExpression(); diff --git a/src/Libraries/NRefactory/Test/NRefactoryTests.csproj b/src/Libraries/NRefactory/Test/NRefactoryTests.csproj index 5e86026745..c54a27d8ad 100644 --- a/src/Libraries/NRefactory/Test/NRefactoryTests.csproj +++ b/src/Libraries/NRefactory/Test/NRefactoryTests.csproj @@ -66,6 +66,7 @@ + diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/XmlLiteralExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/XmlLiteralExpressionTests.cs new file mode 100644 index 0000000000..dc45ad8fad --- /dev/null +++ b/src/Libraries/NRefactory/Test/Parser/Expressions/XmlLiteralExpressionTests.cs @@ -0,0 +1,40 @@ +// +// +// +// +// $Revision$ +// + +using System; +using System.IO; +using NUnit.Framework; +using ICSharpCode.NRefactory.Parser; +using ICSharpCode.NRefactory.Ast; + +namespace ICSharpCode.NRefactory.Tests.Ast +{ + [TestFixture] + public class XmlLiteralExpressionTests + { + #region C# + + // no C# representation + + #endregion + + #region VB.NET + [Test] + public void VBNetSimpleCommentTest() + { + XmlLiteralExpression xle = ParseUtilVBNet.ParseExpression(""); + Assert.IsNotEmpty(xle.Expressions); + Assert.IsTrue(xle.Expressions[0] is XmlContentExpression); + XmlContentExpression content = xle.Expressions[0] as XmlContentExpression; + Assert.AreEqual(XmlContentType.Comment, content.Type); + Assert.AreEqual(" test ", content.Content); + Assert.AreEqual(new Location(1,1), content.StartLocation); + Assert.AreEqual(new Location(14,1), content.EndLocation); + } + #endregion + } +} diff --git a/src/Libraries/NRefactory/Test/Parser/Expressions/XmlMemberAccessExpressionTests.cs b/src/Libraries/NRefactory/Test/Parser/Expressions/XmlMemberAccessExpressionTests.cs index 046835393e..92436ffff7 100644 --- a/src/Libraries/NRefactory/Test/Parser/Expressions/XmlMemberAccessExpressionTests.cs +++ b/src/Libraries/NRefactory/Test/Parser/Expressions/XmlMemberAccessExpressionTests.cs @@ -55,6 +55,57 @@ namespace ICSharpCode.NRefactory.Tests.Ast Assert.IsTrue(xmae.TargetObject is IdentifierExpression); Assert.AreEqual("xml", ((IdentifierExpression)xmae.TargetObject).Identifier); } + + [Test] + public void VBNetSimpleDescendentsReferenceTest() + { + XmlMemberAccessExpression xmae = ParseUtilVBNet.ParseExpression("xml..."); + Assert.AreEqual("ns:Element", xmae.Identifier); + Assert.IsTrue(xmae.IsXmlIdentifier); + Assert.AreEqual(XmlAxisType.Descendents, xmae.AxisType); + Assert.IsTrue(xmae.TargetObject is IdentifierExpression); + Assert.AreEqual("xml", ((IdentifierExpression)xmae.TargetObject).Identifier); + } + + [Test] + public void VBNetSimpleElementReferenceWithDotTest() + { + XmlMemberAccessExpression xmae = ParseUtilVBNet.ParseExpression("."); + Assert.AreEqual("ns:MyElement", xmae.Identifier); + Assert.IsTrue(xmae.IsXmlIdentifier); + Assert.AreEqual(XmlAxisType.Element, xmae.AxisType); + Assert.IsTrue(xmae.TargetObject.IsNull); + } + + [Test] + public void VBNetSimpleAttributeReferenceWithDotTest() + { + XmlMemberAccessExpression xmae = ParseUtilVBNet.ParseExpression(".@attribute"); + Assert.AreEqual("attribute", xmae.Identifier); + Assert.IsFalse(xmae.IsXmlIdentifier); + Assert.AreEqual(XmlAxisType.Attribute, xmae.AxisType); + Assert.IsTrue(xmae.TargetObject.IsNull); + } + + [Test] + public void VBNetXmlNameAttributeReferenceWithDotTest() + { + XmlMemberAccessExpression xmae = ParseUtilVBNet.ParseExpression(".@"); + Assert.AreEqual("ns:attribute", xmae.Identifier); + Assert.IsTrue(xmae.IsXmlIdentifier); + Assert.AreEqual(XmlAxisType.Attribute, xmae.AxisType); + Assert.IsTrue(xmae.TargetObject.IsNull); + } + + [Test] + public void VBNetSimpleDescendentsReferenceWithDotTest() + { + XmlMemberAccessExpression xmae = ParseUtilVBNet.ParseExpression("..."); + Assert.AreEqual("ns:Element", xmae.Identifier); + Assert.IsTrue(xmae.IsXmlIdentifier); + Assert.AreEqual(XmlAxisType.Descendents, xmae.AxisType); + Assert.IsTrue(xmae.TargetObject.IsNull); + } #endregion } }