Remove TryBlock and FinallyBlock.

They break the rule that syntactically identical constructs use the same syntax kind.  This
prevents node reuse in incremental parsing.
This commit is contained in:
Cyrus Najmabadi
2014-12-11 14:40:25 -08:00
parent 12f8bfb687
commit b692ea9b66
20 changed files with 117 additions and 127 deletions

View File

@@ -1,2 +1,2 @@
//// [noCatchBlock.js.map]
{"version":3,"file":"noCatchBlock.js","sourceRoot":"","sources":["noCatchBlock.ts"],"names":[],"mappings":"AACA,IAAA,CAAC;AAED,CAAC;QAAC,CAAC;AAEH,CAAC"}
{"version":3,"file":"noCatchBlock.js","sourceRoot":"","sources":["noCatchBlock.ts"],"names":[],"mappings":"AACA,IAAI,CAAC;AAEL,CAAC;QAAS,CAAC;AAEX,CAAC"}

View File

@@ -14,17 +14,17 @@ sourceFile:noCatchBlock.ts
3 > ^
1 >
>
2 >
3 > t
2 >try
3 > {
1 >Emitted(1, 1) Source(2, 1) + SourceIndex(0)
2 >Emitted(1, 5) Source(2, 1) + SourceIndex(0)
3 >Emitted(1, 6) Source(2, 2) + SourceIndex(0)
2 >Emitted(1, 5) Source(2, 5) + SourceIndex(0)
3 >Emitted(1, 6) Source(2, 6) + SourceIndex(0)
---
>>>}
1 >
2 >^
3 > ^^^^^^^^^->
1 >ry {
1 >
> // ...
>
2 >}
@@ -34,16 +34,16 @@ sourceFile:noCatchBlock.ts
>>>finally {
1->^^^^^^^^
2 > ^
1->
2 > f
1->Emitted(3, 9) Source(4, 3) + SourceIndex(0)
2 >Emitted(3, 10) Source(4, 4) + SourceIndex(0)
1-> finally
2 > {
1->Emitted(3, 9) Source(4, 11) + SourceIndex(0)
2 >Emitted(3, 10) Source(4, 12) + SourceIndex(0)
---
>>>}
1 >
2 >^
3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
1 >inally {
1 >
> // N.B. No 'catch' block
>
2 >}

View File

@@ -1,2 +1,2 @@
//// [sourceMap-SkippedNode.js.map]
{"version":3,"file":"sourceMap-SkippedNode.js","sourceRoot":"","sources":["sourceMap-SkippedNode.ts"],"names":[],"mappings":"AAAA,IAAA,CAAC;AAED,CAAC;QAAC,CAAC;AAEH,CAAC"}
{"version":3,"file":"sourceMap-SkippedNode.js","sourceRoot":"","sources":["sourceMap-SkippedNode.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC;AAEL,CAAC;QAAS,CAAC;AAEX,CAAC"}

View File

@@ -13,17 +13,17 @@ sourceFile:sourceMap-SkippedNode.ts
2 >^^^^
3 > ^
1 >
2 >
3 > t
2 >try
3 > {
1 >Emitted(1, 1) Source(1, 1) + SourceIndex(0)
2 >Emitted(1, 5) Source(1, 1) + SourceIndex(0)
3 >Emitted(1, 6) Source(1, 2) + SourceIndex(0)
2 >Emitted(1, 5) Source(1, 5) + SourceIndex(0)
3 >Emitted(1, 6) Source(1, 6) + SourceIndex(0)
---
>>>}
1 >
2 >^
3 > ^^^^^^^^^->
1 >ry {
1 >
>// ...
>
2 >}
@@ -33,16 +33,16 @@ sourceFile:sourceMap-SkippedNode.ts
>>>finally {
1->^^^^^^^^
2 > ^
1->
2 > f
1->Emitted(3, 9) Source(3, 3) + SourceIndex(0)
2 >Emitted(3, 10) Source(3, 4) + SourceIndex(0)
1-> finally
2 > {
1->Emitted(3, 9) Source(3, 11) + SourceIndex(0)
2 >Emitted(3, 10) Source(3, 12) + SourceIndex(0)
---
>>>}
1 >
2 >^
3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
1 >inally {
1 >
>// N.B. No 'catch' block
>
2 >}

View File

@@ -1,2 +1,2 @@
//// [sourceMapValidationStatements.js.map]
{"version":3,"file":"sourceMapValidationStatements.js","sourceRoot":"","sources":["sourceMapValidationStatements.ts"],"names":["f"],"mappings":"AAAA,SAAS,CAAC;IACNA,IAAIA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,EAAEA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;QAC1BA,CAACA,IAAIA,CAACA,CAACA;QACPA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IACDA,EAAEA,CAACA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;QACTA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IAACA,IAAIA,CAACA,CAACA;QACJA,CAACA,IAAIA,EAAEA,CAACA;QACRA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,IAAIA,CAACA,GAAGA;QACJA,CAACA;QACDA,CAACA;QACDA,CAACA;KACJA,CAACA;IACFA,IAAIA,GAAGA,GAAGA;QACNA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,OAAOA;KACbA,CAACA;IACFA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA,CAACA;QACdA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACbA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;IACDA,IAAAA,CAACA;QACGA,GAAGA,CAACA,CAACA,GAAGA,MAAMA,CAACA;IACnBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;QACTA,EAAEA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;YACbA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA;QACfA,CAACA;QAACA,IAAIA,CAACA,CAACA;YACJA,GAAGA,CAACA,CAACA,GAAGA,KAAKA,CAACA;QAClBA,CAACA;IACLA,CAACA;IACDA,IAAAA,CAACA;QACGA,MAAMA,IAAIA,KAAKA,EAAEA,CAACA;IACtBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;QACVA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;YAACA,CAACA;QACCA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,GAAGA,EAAEA,CAACA;QACRA,CAACA,GAAGA,CAACA,CAACA;QACNA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACZA,KAAKA,CAACA,EAAEA,CAACA;YACLA,CAACA,EAAEA,CAACA;YACJA,KAAKA,CAACA;QAEVA,CAACA;QACDA,KAAKA,CAACA,EAAEA,CAACA;YACLA,CAACA,EAAEA,CAACA;YACJA,KAAKA,CAACA;QAEVA,CAACA;QACDA,SAASA,CAACA;YACNA,CAACA,IAAIA,CAACA,CAACA;YACPA,CAACA,GAAGA,EAAEA,CAACA;YACPA,KAAKA,CAACA;QAEVA,CAACA;IACLA,CAACA;IACDA,OAAOA,CAACA,GAAGA,EAAEA,EAAEA,CAACA;QACZA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,GAAGA,CAACA;QACAA,CAACA,EAAEA,CAACA;IACRA,CAACA,QAAQA,CAACA,GAAGA,CAACA,EAACA;IACfA,CAACA,GAAGA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACjCA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACzBA,CAACA,KAAKA,CAACA,CAACA;IACRA,CAACA,GAAGA,CAACA,GAAGA,EAAEA,CAACA;IACXA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,MAAMA,CAACA;AACXA,CAACA;AACD,IAAI,CAAC,GAAG;IACJ,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAC,CAAC;AACF,CAAC,EAAE,CAAC"}
{"version":3,"file":"sourceMapValidationStatements.js","sourceRoot":"","sources":["sourceMapValidationStatements.ts"],"names":["f"],"mappings":"AAAA,SAAS,CAAC;IACNA,IAAIA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,EAAEA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;QAC1BA,CAACA,IAAIA,CAACA,CAACA;QACPA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IACDA,EAAEA,CAACA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;QACTA,CAACA,IAAIA,CAACA,CAACA;IACXA,CAACA;IAACA,IAAIA,CAACA,CAACA;QACJA,CAACA,IAAIA,EAAEA,CAACA;QACRA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,IAAIA,CAACA,GAAGA;QACJA,CAACA;QACDA,CAACA;QACDA,CAACA;KACJA,CAACA;IACFA,IAAIA,GAAGA,GAAGA;QACNA,CAACA,EAAEA,CAACA;QACJA,CAACA,EAAEA,OAAOA;KACbA,CAACA;IACFA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA,CAACA;QACdA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACbA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;IACDA,IAAIA,CAACA;QACDA,GAAGA,CAACA,CAACA,GAAGA,MAAMA,CAACA;IACnBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;QACTA,EAAEA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA,CAACA,CAACA;YACbA,GAAGA,CAACA,CAACA,GAAGA,EAAEA,CAACA;QACfA,CAACA;QAACA,IAAIA,CAACA,CAACA;YACJA,GAAGA,CAACA,CAACA,GAAGA,KAAKA,CAACA;QAClBA,CAACA;IACLA,CAACA;IACDA,IAAIA,CAACA;QACDA,MAAMA,IAAIA,KAAKA,EAAEA,CAACA;IACtBA,CAAEA;IAAAA,KAAKA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;QACVA,IAAIA,CAACA,GAAGA,EAAEA,CAACA;IACfA,CAACA;YAASA,CAACA;QACPA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,GAAGA,EAAEA,CAACA;QACRA,CAACA,GAAGA,CAACA,CAACA;QACNA,CAACA,GAAGA,EAAEA,CAACA;IACXA,CAACA;IACDA,MAAMA,CAACA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;QACZA,KAAKA,CAACA,EAAEA,CAACA;YACLA,CAACA,EAAEA,CAACA;YACJA,KAAKA,CAACA;QAEVA,CAACA;QACDA,KAAKA,CAACA,EAAEA,CAACA;YACLA,CAACA,EAAEA,CAACA;YACJA,KAAKA,CAACA;QAEVA,CAACA;QACDA,SAASA,CAACA;YACNA,CAACA,IAAIA,CAACA,CAACA;YACPA,CAACA,GAAGA,EAAEA,CAACA;YACPA,KAAKA,CAACA;QAEVA,CAACA;IACLA,CAACA;IACDA,OAAOA,CAACA,GAAGA,EAAEA,EAAEA,CAACA;QACZA,CAACA,EAAEA,CAACA;IACRA,CAACA;IACDA,GAAGA,CAACA;QACAA,CAACA,EAAEA,CAACA;IACRA,CAACA,QAAQA,CAACA,GAAGA,CAACA,EAACA;IACfA,CAACA,GAAGA,CAACA,CAACA;IACNA,IAAIA,CAACA,GAAGA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACjCA,CAACA,CAACA,IAAIA,CAACA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,GAAGA,CAACA,CAACA;IACzBA,CAACA,KAAKA,CAACA,CAACA;IACRA,CAACA,GAAGA,CAACA,GAAGA,EAAEA,CAACA;IACXA,IAAIA,CAACA,GAAGA,CAACA,CAACA;IACVA,MAAMA,CAACA;AACXA,CAACA;AACD,IAAI,CAAC,GAAG;IACJ,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAC,CAAC;AACF,CAAC,EAAE,CAAC"}

View File

@@ -501,11 +501,11 @@ sourceFile:sourceMapValidationStatements.ts
4 > ^^^^^^^^^^^^^^^->
1->
>
2 >
3 > t
2 > try
3 > {
1->Emitted(28, 5) Source(27, 5) + SourceIndex(0) name (f)
2 >Emitted(28, 9) Source(27, 5) + SourceIndex(0) name (f)
3 >Emitted(28, 10) Source(27, 6) + SourceIndex(0) name (f)
2 >Emitted(28, 9) Source(27, 9) + SourceIndex(0) name (f)
3 >Emitted(28, 10) Source(27, 10) + SourceIndex(0) name (f)
---
>>> obj.q = "ohhh";
1->^^^^^^^^
@@ -515,7 +515,7 @@ sourceFile:sourceMapValidationStatements.ts
5 > ^^^
6 > ^^^^^^
7 > ^
1->ry {
1->
>
2 > obj
3 > .
@@ -706,11 +706,11 @@ sourceFile:sourceMapValidationStatements.ts
4 > ^^^^^^^^^^^^^^^^^^->
1->
>
2 >
3 > t
2 > try
3 > {
1->Emitted(39, 5) Source(36, 5) + SourceIndex(0) name (f)
2 >Emitted(39, 9) Source(36, 5) + SourceIndex(0) name (f)
3 >Emitted(39, 10) Source(36, 6) + SourceIndex(0) name (f)
2 >Emitted(39, 9) Source(36, 9) + SourceIndex(0) name (f)
3 >Emitted(39, 10) Source(36, 10) + SourceIndex(0) name (f)
---
>>> throw new Error();
1->^^^^^^^^
@@ -719,7 +719,7 @@ sourceFile:sourceMapValidationStatements.ts
4 > ^^^^^
5 > ^^
6 > ^
1->ry {
1->
>
2 > throw
3 > new
@@ -805,10 +805,10 @@ sourceFile:sourceMapValidationStatements.ts
1->^^^^^^^^^^^^
2 > ^
3 > ^^^->
1->
2 > f
1->Emitted(45, 13) Source(40, 7) + SourceIndex(0) name (f)
2 >Emitted(45, 14) Source(40, 8) + SourceIndex(0) name (f)
1-> finally
2 > {
1->Emitted(45, 13) Source(40, 15) + SourceIndex(0) name (f)
2 >Emitted(45, 14) Source(40, 16) + SourceIndex(0) name (f)
---
>>> y = 70;
1->^^^^^^^^
@@ -816,7 +816,7 @@ sourceFile:sourceMapValidationStatements.ts
3 > ^^^
4 > ^^
5 > ^
1->inally {
1->
>
2 > y
3 > =

View File

@@ -1,2 +1,2 @@
//// [sourceMapValidationTryCatchFinally.js.map]
{"version":3,"file":"sourceMapValidationTryCatchFinally.js","sourceRoot":"","sources":["sourceMapValidationTryCatchFinally.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,EAAE,CAAC;AACX,IAAA,CAAC;IACG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAE;AAAA,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACT,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;QAAC,CAAC;IACC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;AACf,CAAC;AACD,IAAA,CAAC;IAEG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACV,MAAM,IAAI,KAAK,EAAE,CAAC;AACtB,CACA;AAAA,KAAK,CAAC,CAAC,CAAC,CAAC,CACT,CAAC;IACG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;QACD,CAAC;IAEG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;AACf,CAAC"}
{"version":3,"file":"sourceMapValidationTryCatchFinally.js","sourceRoot":"","sources":["sourceMapValidationTryCatchFinally.ts"],"names":[],"mappings":"AAAA,IAAI,CAAC,GAAG,EAAE,CAAC;AACX,IAAI,CAAC;IACD,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAE;AAAA,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACT,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;QAAS,CAAC;IACP,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;AACf,CAAC;AACD,IACA,CAAC;IACG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACV,MAAM,IAAI,KAAK,EAAE,CAAC;AACtB,CACA;AAAA,KAAK,CAAC,CAAC,CAAC,CAAC,CACT,CAAC;IACG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;QAED,CAAC;IACG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;AACf,CAAC"}

View File

@@ -35,11 +35,11 @@ sourceFile:sourceMapValidationTryCatchFinally.ts
4 > ^^^^^^^^^^->
1 >
>
2 >
3 > t
2 >try
3 > {
1 >Emitted(2, 1) Source(2, 1) + SourceIndex(0)
2 >Emitted(2, 5) Source(2, 1) + SourceIndex(0)
3 >Emitted(2, 6) Source(2, 2) + SourceIndex(0)
2 >Emitted(2, 5) Source(2, 5) + SourceIndex(0)
3 >Emitted(2, 6) Source(2, 6) + SourceIndex(0)
---
>>> x = x + 1;
1->^^^^
@@ -49,7 +49,7 @@ sourceFile:sourceMapValidationTryCatchFinally.ts
5 > ^^^
6 > ^
7 > ^
1->ry {
1->
>
2 > x
3 > =
@@ -140,10 +140,10 @@ sourceFile:sourceMapValidationTryCatchFinally.ts
1->^^^^^^^^
2 > ^
3 > ^^^^^^^->
1->
2 > f
1->Emitted(8, 9) Source(6, 3) + SourceIndex(0)
2 >Emitted(8, 10) Source(6, 4) + SourceIndex(0)
1-> finally
2 > {
1->Emitted(8, 9) Source(6, 11) + SourceIndex(0)
2 >Emitted(8, 10) Source(6, 12) + SourceIndex(0)
---
>>> x = x * 10;
1->^^^^
@@ -153,7 +153,7 @@ sourceFile:sourceMapValidationTryCatchFinally.ts
5 > ^^^
6 > ^^
7 > ^
1->inally {
1->
>
2 > x
3 > =
@@ -186,11 +186,12 @@ sourceFile:sourceMapValidationTryCatchFinally.ts
4 > ^^^^^^^^^^->
1->
>
2 >
3 > t
2 >try
>
3 > {
1->Emitted(11, 1) Source(9, 1) + SourceIndex(0)
2 >Emitted(11, 5) Source(9, 1) + SourceIndex(0)
3 >Emitted(11, 6) Source(9, 2) + SourceIndex(0)
2 >Emitted(11, 5) Source(10, 1) + SourceIndex(0)
3 >Emitted(11, 6) Source(10, 2) + SourceIndex(0)
---
>>> x = x + 1;
1->^^^^
@@ -201,8 +202,7 @@ sourceFile:sourceMapValidationTryCatchFinally.ts
6 > ^
7 > ^
8 > ^^^^^^^^^->
1->ry
>{
1->
>
2 > x
3 > =
@@ -317,10 +317,11 @@ sourceFile:sourceMapValidationTryCatchFinally.ts
2 > ^
3 > ^^^^^^^->
1->
>finally
>
2 > f
1->Emitted(18, 9) Source(18, 1) + SourceIndex(0)
2 >Emitted(18, 10) Source(18, 2) + SourceIndex(0)
2 > {
1->Emitted(18, 9) Source(19, 1) + SourceIndex(0)
2 >Emitted(18, 10) Source(19, 2) + SourceIndex(0)
---
>>> x = x * 10;
1->^^^^
@@ -330,8 +331,7 @@ sourceFile:sourceMapValidationTryCatchFinally.ts
5 > ^^^
6 > ^^
7 > ^
1->inally
>{
1->
>
2 > x
3 > =

View File

@@ -16,7 +16,7 @@
////[|fina/*3*/lly|] {
////}
debugger;
for (var i = 1; i <= test.markers().length; i++) {
goTo.marker("" + i);
verify.occurrencesAtPositionCount(3);