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 cea574d1a5..0e5304b15d 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.atg +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/ExpressionFinder.atg @@ -540,13 +540,13 @@ IfStatement = "If" Expression ( "Then" ( Statement { ":" Statement } [ "Else" Statement { ":" Statement } ] EOL - | MultilineIfRest + | MultilineIfRemainder ) - | MultilineIfRest + | MultilineIfRemainder ) . -MultilineIfRest = +MultilineIfRemainder = StatementTerminatorAndBlock { ("Else" [ "If" Expression [ "Then" ] ] @@ -560,12 +560,20 @@ MultilineIfRest = SelectStatement = "Select" [ "Case" ] Expression StatementTerminator { - "Case" ( "Else" | [ "Is" ] Expression { "," [ "Is" ] Expression } ) + "Case" ( + "Else" | + ( [ "Is" ] ComparisonOperator SimpleExpressionWithSuffix | Expression ) + { "," ( [ "Is" ] ComparisonOperator SimpleExpressionWithSuffix | Expression ) } + ) StatementTerminatorAndBlock } "End" "Select" . +ComparisonOperator = + "=" | "<>" | "<" | ">" | ">=" | "<=" +. + InvocationStatement = [ "Call" ] Expression . 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 768e2c05a2..a90aa5ed1c 100644 --- a/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/Parser.cs +++ b/src/Libraries/NRefactory/Project/Src/Parser/VBNet/Experimental/Parser.cs @@ -52,7 +52,7 @@ int currentState = 0; if (t == null) { currentState = 1; break; } if (t.kind == 172) { stateStack.Push(1); - goto case 248; + goto case 250; } else { goto case 2; } @@ -61,7 +61,7 @@ int currentState = 0; if (t == null) { currentState = 2; break; } if (t.kind == 136) { stateStack.Push(2); - goto case 245; + goto case 247; } else { goto case 3; } @@ -70,7 +70,7 @@ int currentState = 0; if (t == null) { currentState = 3; break; } if (t.kind == 39) { stateStack.Push(3); - goto case 178; + goto case 180; } else { goto case 4; } @@ -89,7 +89,7 @@ int currentState = 0; case 5: { if (t == null) { currentState = 5; break; } if (t.kind == 159) { - goto case 241; + goto case 243; } else { if (set[1, t.kind]) { goto case 7; @@ -107,7 +107,7 @@ int currentState = 0; if (t == null) { currentState = 7; break; } if (t.kind == 39) { stateStack.Push(7); - goto case 178; + goto case 180; } else { goto case 8; } @@ -119,7 +119,7 @@ int currentState = 0; break; } else { if (t.kind == 83 || t.kind == 154) { - goto case 240; + goto case 242; } else { Error(t); goto case 9; @@ -129,7 +129,7 @@ int currentState = 0; case 9: { if (t == null) { currentState = 9; break; } if (set[3, t.kind]) { - goto case 240; + goto case 242; } else { stateStack.Push(10); goto case 15; @@ -190,7 +190,7 @@ int currentState = 0; if (t == null) { currentState = 18; break; } if (t.kind == 39) { stateStack.Push(18); - goto case 178; + goto case 180; } else { goto case 19; } @@ -203,23 +203,23 @@ int currentState = 0; } else { if (set[6, t.kind]) { stateStack.Push(20); - goto case 233; + goto case 235; } else { if (t.kind == 126 || t.kind == 208) { stateStack.Push(20); - goto case 221; + goto case 223; } else { if (t.kind == 100) { stateStack.Push(20); - goto case 210; + goto case 212; } else { if (t.kind == 118) { stateStack.Push(20); - goto case 200; + goto case 202; } else { if (t.kind == 97) { stateStack.Push(20); - goto case 188; + goto case 190; } else { if (t.kind == 171) { stateStack.Push(20); @@ -259,7 +259,7 @@ int currentState = 0; } case 24: { stateStack.Push(25); - goto case 183; + goto case 185; } case 25: { if (t == null) { currentState = 25; break; } @@ -270,7 +270,7 @@ int currentState = 0; case 26: { if (t == null) { currentState = 26; break; } if (t.kind == 62) { - currentState = 177; + currentState = 179; break; } else { goto case 27; @@ -321,19 +321,19 @@ int currentState = 0; case 34: { if (t == null) { currentState = 34; break; } if (t.kind == 87 || t.kind == 104 || t.kind == 202) { - goto case 160; + goto case 162; } else { if (t.kind == 209 || t.kind == 231) { - goto case 155; + goto case 157; } else { if (t.kind == 55 || t.kind == 191) { - goto case 152; + goto case 154; } else { if (t.kind == 187) { - goto case 149; + goto case 151; } else { if (t.kind == 134) { - goto case 131; + goto case 133; } else { if (t.kind == 195) { goto case 120; @@ -1063,19 +1063,25 @@ int currentState = 0; } case 128: { if (t == null) { currentState = 128; break; } - if (t.kind == 143) { - currentState = 129; - break; + if (set[27, t.kind]) { + if (t.kind == 143) { + currentState = 130; + break; + } else { + goto case 130; + } } else { - goto case 129; + if (set[15, t.kind]) { + stateStack.Push(129); + goto case 37; + } else { + Error(t); + goto case 129; + } } } case 129: { - stateStack.Push(130); - goto case 37; - } - case 130: { - if (t == null) { currentState = 130; break; } + if (t == null) { currentState = 129; break; } if (t.kind == 23) { currentState = 128; break; @@ -1083,149 +1089,165 @@ int currentState = 0; goto case 127; } } + case 130: { + stateStack.Push(131); + goto case 132; + } case 131: { - if (t == null) { currentState = 131; break; } - Expect(134, t); // "If" - currentState = 132; - break; + stateStack.Push(129); + goto case 50; } case 132: { - stateStack.Push(133); - goto case 37; + if (t == null) { currentState = 132; break; } + if (set[28, t.kind]) { + goto case 16; + } else { + goto case 6; + } } case 133: { if (t == null) { currentState = 133; break; } + Expect(134, t); // "If" + currentState = 134; + break; + } + case 134: { + stateStack.Push(135); + goto case 37; + } + case 135: { + if (t == null) { currentState = 135; break; } if (t.kind == 212) { - currentState = 142; + currentState = 144; break; } else { - goto case 134; + goto case 136; } } - case 134: { - if (t == null) { currentState = 134; break; } + case 136: { + if (t == null) { currentState = 136; break; } if (t.kind == 1 || t.kind == 22) { - goto case 135; + goto case 137; } else { goto case 6; } } - case 135: { - stateStack.Push(136); + case 137: { + stateStack.Push(138); goto case 31; } - case 136: { - if (t == null) { currentState = 136; break; } + case 138: { + if (t == null) { currentState = 138; break; } if (t.kind == 110 || t.kind == 111) { if (t.kind == 110) { - currentState = 141; + currentState = 143; break; } else { if (t.kind == 111) { - goto case 138; + goto case 140; } else { Error(t); - goto case 135; + goto case 137; } } } else { Expect(112, t); // "End" - currentState = 137; + currentState = 139; break; } } - case 137: { - if (t == null) { currentState = 137; break; } + case 139: { + if (t == null) { currentState = 139; break; } Expect(134, t); // "If" currentState = stateStack.Pop(); break; } - case 138: { - if (t == null) { currentState = 138; break; } - currentState = 139; + case 140: { + if (t == null) { currentState = 140; break; } + currentState = 141; break; } - case 139: { - stateStack.Push(140); + case 141: { + stateStack.Push(142); goto case 37; } - case 140: { - if (t == null) { currentState = 140; break; } + case 142: { + if (t == null) { currentState = 142; break; } if (t.kind == 212) { - currentState = 135; + currentState = 137; break; } else { - goto case 135; + goto case 137; } } - case 141: { - if (t == null) { currentState = 141; break; } + case 143: { + if (t == null) { currentState = 143; break; } if (t.kind == 134) { - goto case 138; + goto case 140; } else { - goto case 135; + goto case 137; } } - case 142: { - if (t == null) { currentState = 142; break; } + case 144: { + if (t == null) { currentState = 144; break; } if (set[8, t.kind]) { - goto case 143; + goto case 145; } else { - goto case 134; + goto case 136; } } - case 143: { - stateStack.Push(144); + case 145: { + stateStack.Push(146); goto case 34; } - case 144: { - if (t == null) { currentState = 144; break; } + case 146: { + if (t == null) { currentState = 146; break; } if (t.kind == 22) { - currentState = 143; + currentState = 145; break; } else { if (t.kind == 110) { - goto case 146; + goto case 148; } else { - goto case 145; + goto case 147; } } } - case 145: { - if (t == null) { currentState = 145; break; } + case 147: { + if (t == null) { currentState = 147; break; } Expect(1, t); // EOL currentState = stateStack.Pop(); break; } - case 146: { - if (t == null) { currentState = 146; break; } - currentState = 147; + case 148: { + if (t == null) { currentState = 148; break; } + currentState = 149; break; } - case 147: { - stateStack.Push(148); + case 149: { + stateStack.Push(150); goto case 34; } - case 148: { - if (t == null) { currentState = 148; break; } + case 150: { + if (t == null) { currentState = 150; break; } if (t.kind == 22) { - goto case 146; + goto case 148; } else { - goto case 145; + goto case 147; } } - case 149: { - if (t == null) { currentState = 149; break; } + case 151: { + if (t == null) { currentState = 151; break; } Expect(187, t); // "RaiseEvent" - currentState = 150; + currentState = 152; break; } - case 150: { - stateStack.Push(151); + case 152: { + stateStack.Push(153); goto case 16; } - case 151: { - if (t == null) { currentState = 151; break; } + case 153: { + if (t == null) { currentState = 153; break; } if (t.kind == 36) { currentState = 76; break; @@ -1234,105 +1256,105 @@ int currentState = 0; goto switchlbl; } } - case 152: { - if (t == null) { currentState = 152; break; } + case 154: { + if (t == null) { currentState = 154; break; } if (t.kind == 55 || t.kind == 191) { - currentState = 153; + currentState = 155; break; } else { Error(t); - goto case 153; + goto case 155; } } - case 153: { - stateStack.Push(154); + case 155: { + stateStack.Push(156); goto case 37; } - case 154: { - if (t == null) { currentState = 154; break; } + case 156: { + if (t == null) { currentState = 156; break; } Expect(23, t); // "," currentState = 36; break; } - case 155: { - if (t == null) { currentState = 155; break; } + case 157: { + if (t == null) { currentState = 157; break; } if (t.kind == 209 || t.kind == 231) { - currentState = 156; + currentState = 158; break; } else { Error(t); - goto case 156; + goto case 158; } } - case 156: { - stateStack.Push(157); + case 158: { + stateStack.Push(159); goto case 37; } - case 157: { - stateStack.Push(158); + case 159: { + stateStack.Push(160); goto case 31; } - case 158: { - if (t == null) { currentState = 158; break; } + case 160: { + if (t == null) { currentState = 160; break; } Expect(112, t); // "End" - currentState = 159; + currentState = 161; break; } - case 159: { - if (t == null) { currentState = 159; break; } + case 161: { + if (t == null) { currentState = 161; break; } if (t.kind == 209 || t.kind == 231) { goto case 16; } else { goto case 6; } } - case 160: { - if (t == null) { currentState = 160; break; } + case 162: { + if (t == null) { currentState = 162; break; } if (t.kind == 87 || t.kind == 104 || t.kind == 202) { - currentState = 161; + currentState = 163; break; } else { Error(t); - goto case 161; + goto case 163; } } - case 161: { - stateStack.Push(162); + case 163: { + stateStack.Push(164); goto case 84; } - case 162: { - if (t == null) { currentState = 162; break; } + case 164: { + if (t == null) { currentState = 164; break; } if (t.kind == 32) { - currentState = 163; + currentState = 165; break; } else { - goto case 163; + goto case 165; } } - case 163: { - if (t == null) { currentState = 163; break; } + case 165: { + if (t == null) { currentState = 165; break; } if (t.kind == 36) { - goto case 175; + goto case 177; } else { - goto case 164; + goto case 166; } } - case 164: { - if (t == null) { currentState = 164; break; } + case 166: { + if (t == null) { currentState = 166; break; } if (t.kind == 23) { - currentState = 169; + currentState = 171; break; } else { if (t.kind == 62) { - currentState = 166; + currentState = 168; break; } else { - goto case 165; + goto case 167; } } } - case 165: { - if (t == null) { currentState = 165; break; } + case 167: { + if (t == null) { currentState = 167; break; } if (t.kind == 21) { goto case 119; } else { @@ -1340,113 +1362,113 @@ int currentState = 0; goto switchlbl; } } - case 166: { - if (t == null) { currentState = 166; break; } + case 168: { + if (t == null) { currentState = 168; break; } if (t.kind == 161) { - goto case 168; + goto case 170; } else { - goto case 167; + goto case 169; } } - case 167: { - stateStack.Push(165); + case 169: { + stateStack.Push(167); goto case 69; } - case 168: { - if (t == null) { currentState = 168; break; } - currentState = 167; + case 170: { + if (t == null) { currentState = 170; break; } + currentState = 169; break; } - case 169: { - stateStack.Push(170); + case 171: { + stateStack.Push(172); goto case 84; } - case 170: { - if (t == null) { currentState = 170; break; } + case 172: { + if (t == null) { currentState = 172; break; } if (t.kind == 32) { - currentState = 171; + currentState = 173; break; } else { - goto case 171; + goto case 173; } } - case 171: { - if (t == null) { currentState = 171; break; } + case 173: { + if (t == null) { currentState = 173; break; } if (t.kind == 36) { - goto case 172; + goto case 174; } else { - goto case 164; + goto case 166; } } - case 172: { - if (t == null) { currentState = 172; break; } - currentState = 173; + case 174: { + if (t == null) { currentState = 174; break; } + currentState = 175; break; } - case 173: { - if (t == null) { currentState = 173; break; } + case 175: { + if (t == null) { currentState = 175; break; } if (t.kind == 23) { - goto case 172; - } else { goto case 174; + } else { + goto case 176; } } - case 174: { - if (t == null) { currentState = 174; break; } + case 176: { + if (t == null) { currentState = 176; break; } Expect(37, t); // ")" - currentState = 164; + currentState = 166; break; } - case 175: { - if (t == null) { currentState = 175; break; } - currentState = 176; + case 177: { + if (t == null) { currentState = 177; break; } + currentState = 178; break; } - case 176: { - if (t == null) { currentState = 176; break; } + case 178: { + if (t == null) { currentState = 178; break; } if (t.kind == 23) { - goto case 175; + goto case 177; } else { - goto case 174; + goto case 176; } } - case 177: { - if (t == null) { currentState = 177; break; } + case 179: { + if (t == null) { currentState = 179; break; } if (t.kind == 39) { - stateStack.Push(177); - goto case 178; + stateStack.Push(179); + goto case 180; } else { stateStack.Push(27); goto case 69; } } - case 178: { - if (t == null) { currentState = 178; break; } + case 180: { + if (t == null) { currentState = 180; break; } Expect(39, t); // "<" - currentState = 179; + currentState = 181; break; } - case 179: { + case 181: { PushContext(Context.Attribute, t); - goto case 180; + goto case 182; } - case 180: { - if (t == null) { currentState = 180; break; } - if (set[27, t.kind]) { - currentState = 180; + case 182: { + if (t == null) { currentState = 182; break; } + if (set[29, t.kind]) { + currentState = 182; break; } else { Expect(38, t); // ">" - currentState = 181; + currentState = 183; break; } } - case 181: { + case 183: { PopContext(); - goto case 182; + goto case 184; } - case 182: { - if (t == null) { currentState = 182; break; } + case 184: { + if (t == null) { currentState = 184; break; } if (t.kind == 1) { goto case 16; } else { @@ -1454,334 +1476,334 @@ int currentState = 0; goto switchlbl; } } - case 183: { - stateStack.Push(184); - goto case 185; + case 185: { + stateStack.Push(186); + goto case 187; } - case 184: { - if (t == null) { currentState = 184; break; } + case 186: { + if (t == null) { currentState = 186; break; } if (t.kind == 23) { - currentState = 183; + currentState = 185; break; } else { currentState = stateStack.Pop(); goto switchlbl; } } - case 185: { - if (t == null) { currentState = 185; break; } + case 187: { + if (t == null) { currentState = 187; break; } if (t.kind == 39) { - stateStack.Push(185); - goto case 178; + stateStack.Push(187); + goto case 180; } else { - goto case 186; + goto case 188; } } - case 186: { - if (t == null) { currentState = 186; break; } - if (set[28, t.kind]) { - currentState = 186; + case 188: { + if (t == null) { currentState = 188; break; } + if (set[30, t.kind]) { + currentState = 188; break; } else { - stateStack.Push(187); + stateStack.Push(189); goto case 84; } } - case 187: { - if (t == null) { currentState = 187; break; } + case 189: { + if (t == null) { currentState = 189; break; } if (t.kind == 62) { - goto case 168; + goto case 170; } else { - goto case 165; + goto case 167; } } - case 188: { - if (t == null) { currentState = 188; break; } + case 190: { + if (t == null) { currentState = 190; break; } Expect(97, t); // "Custom" - currentState = 189; + currentState = 191; break; } - case 189: { - stateStack.Push(190); - goto case 200; + case 191: { + stateStack.Push(192); + goto case 202; } - case 190: { - if (t == null) { currentState = 190; break; } - if (set[29, t.kind]) { - goto case 192; + case 192: { + if (t == null) { currentState = 192; break; } + if (set[31, t.kind]) { + goto case 194; } else { Expect(112, t); // "End" - currentState = 191; + currentState = 193; break; } } - case 191: { - if (t == null) { currentState = 191; break; } + case 193: { + if (t == null) { currentState = 193; break; } Expect(118, t); // "Event" currentState = 30; break; } - case 192: { - if (t == null) { currentState = 192; break; } + case 194: { + if (t == null) { currentState = 194; break; } if (t.kind == 39) { - stateStack.Push(192); - goto case 178; + stateStack.Push(194); + goto case 180; } else { if (t.kind == 55 || t.kind == 187 || t.kind == 191) { - currentState = 193; + currentState = 195; break; } else { Error(t); - goto case 193; + goto case 195; } } } - case 193: { - if (t == null) { currentState = 193; break; } - Expect(36, t); // "(" - currentState = 194; - break; - } - case 194: { - stateStack.Push(195); - goto case 183; - } case 195: { if (t == null) { currentState = 195; break; } - Expect(37, t); // ")" + Expect(36, t); // "(" currentState = 196; break; } case 196: { stateStack.Push(197); - goto case 31; + goto case 185; } case 197: { if (t == null) { currentState = 197; break; } - Expect(112, t); // "End" + Expect(37, t); // ")" currentState = 198; break; } case 198: { - if (t == null) { currentState = 198; break; } + stateStack.Push(199); + goto case 31; + } + case 199: { + if (t == null) { currentState = 199; break; } + Expect(112, t); // "End" + currentState = 200; + break; + } + case 200: { + if (t == null) { currentState = 200; break; } if (t.kind == 55 || t.kind == 187 || t.kind == 191) { - currentState = 199; + currentState = 201; break; } else { Error(t); - goto case 199; + goto case 201; } } - case 199: { - stateStack.Push(190); + case 201: { + stateStack.Push(192); goto case 15; } - case 200: { - if (t == null) { currentState = 200; break; } + case 202: { + if (t == null) { currentState = 202; break; } Expect(118, t); // "Event" - currentState = 201; + currentState = 203; break; } - case 201: { - stateStack.Push(202); + case 203: { + stateStack.Push(204); goto case 84; } - case 202: { - if (t == null) { currentState = 202; break; } + case 204: { + if (t == null) { currentState = 204; break; } if (t.kind == 62) { - currentState = 209; + currentState = 211; break; } else { - if (set[30, t.kind]) { + if (set[32, t.kind]) { if (t.kind == 36) { - currentState = 207; + currentState = 209; break; } else { - goto case 203; + goto case 205; } } else { Error(t); - goto case 203; + goto case 205; } } } - case 203: { - if (t == null) { currentState = 203; break; } + case 205: { + if (t == null) { currentState = 205; break; } if (t.kind == 135) { - goto case 204; + goto case 206; } else { goto case 30; } } - case 204: { - if (t == null) { currentState = 204; break; } - currentState = 205; + case 206: { + if (t == null) { currentState = 206; break; } + currentState = 207; break; } - case 205: { - stateStack.Push(206); + case 207: { + stateStack.Push(208); goto case 69; } - case 206: { - if (t == null) { currentState = 206; break; } + case 208: { + if (t == null) { currentState = 208; break; } if (t.kind == 23) { - goto case 204; + goto case 206; } else { goto case 30; } } - case 207: { - if (t == null) { currentState = 207; break; } - if (set[31, t.kind]) { - stateStack.Push(208); - goto case 183; + case 209: { + if (t == null) { currentState = 209; break; } + if (set[33, t.kind]) { + stateStack.Push(210); + goto case 185; } else { - goto case 208; + goto case 210; } } - case 208: { - if (t == null) { currentState = 208; break; } + case 210: { + if (t == null) { currentState = 210; break; } Expect(37, t); // ")" - currentState = 203; + currentState = 205; break; } - case 209: { - stateStack.Push(203); + case 211: { + stateStack.Push(205); goto case 69; } - case 210: { - if (t == null) { currentState = 210; break; } + case 212: { + if (t == null) { currentState = 212; break; } Expect(100, t); // "Declare" - currentState = 211; + currentState = 213; break; } - case 211: { - if (t == null) { currentState = 211; break; } + case 213: { + if (t == null) { currentState = 213; break; } if (t.kind == 61 || t.kind == 65 || t.kind == 221) { - currentState = 212; + currentState = 214; break; } else { - goto case 212; + goto case 214; } } - case 212: { - if (t == null) { currentState = 212; break; } + case 214: { + if (t == null) { currentState = 214; break; } if (t.kind == 126 || t.kind == 208) { - currentState = 213; + currentState = 215; break; } else { Error(t); - goto case 213; + goto case 215; } } - case 213: { - stateStack.Push(214); + case 215: { + stateStack.Push(216); goto case 84; } - case 214: { - if (t == null) { currentState = 214; break; } + case 216: { + if (t == null) { currentState = 216; break; } Expect(148, t); // "Lib" - currentState = 215; + currentState = 217; break; } - case 215: { - if (t == null) { currentState = 215; break; } + case 217: { + if (t == null) { currentState = 217; break; } Expect(3, t); // LiteralString - currentState = 216; + currentState = 218; break; } - case 216: { - if (t == null) { currentState = 216; break; } + case 218: { + if (t == null) { currentState = 218; break; } if (t.kind == 58) { - currentState = 220; + currentState = 222; break; } else { - goto case 217; + goto case 219; } } - case 217: { - if (t == null) { currentState = 217; break; } + case 219: { + if (t == null) { currentState = 219; break; } if (t.kind == 36) { - currentState = 218; + currentState = 220; break; } else { goto case 30; } } - case 218: { - if (t == null) { currentState = 218; break; } - if (set[31, t.kind]) { - stateStack.Push(219); - goto case 183; + case 220: { + if (t == null) { currentState = 220; break; } + if (set[33, t.kind]) { + stateStack.Push(221); + goto case 185; } else { - goto case 219; + goto case 221; } } - case 219: { - if (t == null) { currentState = 219; break; } + case 221: { + if (t == null) { currentState = 221; break; } Expect(37, t); // ")" currentState = 30; break; } - case 220: { - if (t == null) { currentState = 220; break; } + case 222: { + if (t == null) { currentState = 222; break; } Expect(3, t); // LiteralString - currentState = 217; + currentState = 219; break; } - case 221: { - if (t == null) { currentState = 221; break; } + case 223: { + if (t == null) { currentState = 223; break; } if (t.kind == 126 || t.kind == 208) { - currentState = 222; + currentState = 224; break; } else { Error(t); - goto case 222; + goto case 224; } } - case 222: { + case 224: { PushContext(Context.IdentifierExpected, t); - goto case 223; + goto case 225; } - case 223: { - if (t == null) { currentState = 223; break; } - currentState = 224; + case 225: { + if (t == null) { currentState = 225; break; } + currentState = 226; break; } - case 224: { + case 226: { PopContext(); - goto case 225; + goto case 227; } - case 225: { - if (t == null) { currentState = 225; break; } + case 227: { + if (t == null) { currentState = 227; break; } if (t.kind == 36) { - currentState = 231; + currentState = 233; break; } else { - goto case 226; + goto case 228; } } - case 226: { - if (t == null) { currentState = 226; break; } + case 228: { + if (t == null) { currentState = 228; break; } if (t.kind == 62) { - currentState = 230; + currentState = 232; break; } else { - goto case 227; + goto case 229; } } - case 227: { - stateStack.Push(228); + case 229: { + stateStack.Push(230); goto case 31; } - case 228: { - if (t == null) { currentState = 228; break; } + case 230: { + if (t == null) { currentState = 230; break; } Expect(112, t); // "End" - currentState = 229; + currentState = 231; break; } - case 229: { - if (t == null) { currentState = 229; break; } + case 231: { + if (t == null) { currentState = 231; break; } if (t.kind == 126 || t.kind == 208) { currentState = 30; break; @@ -1790,139 +1812,139 @@ int currentState = 0; goto case 30; } } - case 230: { - stateStack.Push(227); + case 232: { + stateStack.Push(229); goto case 69; } - case 231: { - if (t == null) { currentState = 231; break; } - if (set[31, t.kind]) { - stateStack.Push(232); - goto case 183; + case 233: { + if (t == null) { currentState = 233; break; } + if (set[33, t.kind]) { + stateStack.Push(234); + goto case 185; } else { - goto case 232; + goto case 234; } } - case 232: { - if (t == null) { currentState = 232; break; } + case 234: { + if (t == null) { currentState = 234; break; } Expect(37, t); // ")" - currentState = 226; + currentState = 228; break; } - case 233: { - if (t == null) { currentState = 233; break; } + case 235: { + if (t == null) { currentState = 235; break; } if (t.kind == 87) { - currentState = 234; + currentState = 236; break; } else { - goto case 234; + goto case 236; } } - case 234: { - stateStack.Push(235); - goto case 239; + case 236: { + stateStack.Push(237); + goto case 241; } - case 235: { - if (t == null) { currentState = 235; break; } + case 237: { + if (t == null) { currentState = 237; break; } if (t.kind == 62) { - currentState = 238; + currentState = 240; break; } else { - goto case 236; + goto case 238; } } - case 236: { - if (t == null) { currentState = 236; break; } + case 238: { + if (t == null) { currentState = 238; break; } if (t.kind == 21) { - currentState = 237; + currentState = 239; break; } else { goto case 30; } } - case 237: { + case 239: { stateStack.Push(30); goto case 37; } - case 238: { - stateStack.Push(236); + case 240: { + stateStack.Push(238); goto case 69; } - case 239: { - if (t == null) { currentState = 239; break; } - if (set[32, t.kind]) { + case 241: { + if (t == null) { currentState = 241; break; } + if (set[34, t.kind]) { goto case 16; } else { goto case 6; } } - case 240: { - if (t == null) { currentState = 240; break; } + case 242: { + if (t == null) { currentState = 242; break; } currentState = 9; break; } - case 241: { - if (t == null) { currentState = 241; break; } + case 243: { + if (t == null) { currentState = 243; break; } Expect(159, t); // "Namespace" - currentState = 242; + currentState = 244; break; } - case 242: { - if (t == null) { currentState = 242; break; } + case 244: { + if (t == null) { currentState = 244; break; } if (set[3, t.kind]) { - currentState = 242; + currentState = 244; break; } else { - stateStack.Push(243); + stateStack.Push(245); goto case 15; } } - case 243: { - if (t == null) { currentState = 243; break; } - if (set[33, t.kind]) { - stateStack.Push(243); + case 245: { + if (t == null) { currentState = 245; break; } + if (set[35, t.kind]) { + stateStack.Push(245); goto case 5; } else { Expect(112, t); // "End" - currentState = 244; + currentState = 246; break; } } - case 244: { - if (t == null) { currentState = 244; break; } + case 246: { + if (t == null) { currentState = 246; break; } Expect(159, t); // "Namespace" currentState = 30; break; } - case 245: { - if (t == null) { currentState = 245; break; } + case 247: { + if (t == null) { currentState = 247; break; } Expect(136, t); // "Imports" - currentState = 246; + currentState = 248; break; } - case 246: { + case 248: { nextTokenIsPotentialStartOfXmlMode = true; - goto case 247; + goto case 249; } - case 247: { - if (t == null) { currentState = 247; break; } + case 249: { + if (t == null) { currentState = 249; break; } if (set[3, t.kind]) { - currentState = 247; + currentState = 249; break; } else { goto case 30; } } - case 248: { - if (t == null) { currentState = 248; break; } + case 250: { + if (t == null) { currentState = 250; break; } Expect(172, t); // "Option" - currentState = 249; + currentState = 251; break; } - case 249: { - if (t == null) { currentState = 249; break; } + case 251: { + if (t == null) { currentState = 251; break; } if (set[3, t.kind]) { - currentState = 249; + currentState = 251; break; } else { goto case 30; @@ -1965,7 +1987,9 @@ int currentState = 0; {x,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,T,T,T, T,x}, {x,T,T,T, T,T,T,T, T,T,x,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,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,x}, - {x,x,T,T, T,T,T,T, T,T,T,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,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,x,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,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,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,x, x,T,x,x, x,x,x,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,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,x,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,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,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,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, + {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,T,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,T,T, T,T,T,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, 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,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,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,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, T,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x}, {x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,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,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,T, x,x,x,T, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x,x,x, x,x},