Skip to content

Commit c189df2

Browse files
committed
Revert "JS: Add support for " of " syntax to help during transition"
This reverts commit 9bf522b.
1 parent 57bf0b1 commit c189df2

File tree

4 files changed

+0
-28
lines changed

4 files changed

+0
-28
lines changed

javascript/ql/lib/semmle/javascript/frameworks/data/internal/AccessPathSyntax.qll

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,6 @@ class AccessPath extends string instanceof AccessPath::Range {
5252
AccessPathToken getLastToken(int n) { result = getToken(getNumToken() - 1 - n) }
5353
}
5454

55-
/**
56-
* An access path that uses `A of B` syntax, which should now be written as `B.A`.
57-
*
58-
* This is a compatibility layer to help test at checkpoints during transition to the new syntax.
59-
*/
60-
private class LegacyAccessPath extends AccessPath {
61-
LegacyAccessPath() { this.matches("% of %") }
62-
63-
private string getRawSplit(int n) { result = this.splitAt(" of ", n) }
64-
65-
private int getNumRawSplits() { result = strictcount(int n | exists(getRawSplit(n))) }
66-
67-
override string getRawToken(int n) { result = getRawSplit(getNumRawSplits() - n - 1) }
68-
69-
override predicate hasSyntaxError() { none() }
70-
}
71-
7255
/**
7356
* An access part token such as `Argument[1]` or `ReturnValue`, appearing in one or more access paths.
7457
*/

javascript/ql/test/library-tests/frameworks/data/test.expected

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ taintFlow
2828
| test.js:76:31:76:38 | source() | test.js:76:31:76:38 | source() |
2929
| test.js:77:34:77:41 | source() | test.js:77:34:77:41 | source() |
3030
| test.js:81:28:81:35 | source() | test.js:81:28:81:35 | source() |
31-
| test.js:87:40:87:47 | source() | test.js:87:40:87:47 | source() |
3231
isSink
3332
| test.js:46:18:46:25 | source() | test-sink |
3433
| test.js:47:22:47:29 | source() | test-sink |
@@ -72,7 +71,6 @@ isSink
7271
| test.js:78:34:78:34 | 3 | test-sink |
7372
| test.js:81:28:81:35 | source() | test-sink |
7473
| test.js:82:28:82:28 | 1 | test-sink |
75-
| test.js:87:40:87:47 | source() | test-sink |
7674
syntaxErrors
7775
| Member[foo |
7876
| Member[foo] .Member[bar] |

javascript/ql/test/library-tests/frameworks/data/test.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,4 @@ function testSinks() {
8383
testlib.mySinkIfArityTwo(source(), 2, 3); // OK
8484
testlib.mySinkIfArityTwo(1, source(), 3); // OK
8585
testlib.mySinkIfArityTwo(1, 2, source()); // OK
86-
87-
testlib.one.two.three().legacySyntax(source()); // NOT OK
8886
}

javascript/ql/test/library-tests/frameworks/data/test.ql

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ class Sinks extends ModelInput::SinkModelCsv {
3434
}
3535
}
3636

37-
class LegacySyntaxTest extends ModelInput::SinkModelCsv {
38-
override predicate row(string row) {
39-
row =
40-
"testlib;;Argument[0] of Member[legacySyntax] of ReturnValue of Member[three] of Member[two] of Member[one];test-sink"
41-
}
42-
}
43-
4437
class BasicTaintTracking extends TaintTracking::Configuration {
4538
BasicTaintTracking() { this = "BasicTaintTracking" }
4639

0 commit comments

Comments
 (0)