diff options
| author |  laurentlb <laurentlb@google.com> | 2017-09-01 17:49:23 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-09-01 20:08:25 +0200 |
| commit | 17d975ee226c59c164ecdab9c897a35d9604e192 (patch) | |
| tree | 16bd9374019b499a441847c8137f7448e94376f2 /src/tools/skylark | |
| parent | 9bd280ba663557a44c0177327cf668ff813a397d (diff) | |
Remove the Dialect type from the Parser.
Let's use the same parser. Dialect differences are checked in a separate
validation pass.
RELNOTES: None.
PiperOrigin-RevId: 167280201
Diffstat (limited to 'src/tools/skylark')
6 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/skylark/java/com/google/devtools/skylark/skylint/Skylint.java b/src/tools/skylark/java/com/google/devtools/skylark/skylint/Skylint.java index d95a0778a4..428c6b4d4e 100644 --- a/src/tools/skylark/java/com/google/devtools/skylark/skylint/Skylint.java +++ b/src/tools/skylark/java/com/google/devtools/skylark/skylint/Skylint.java @@ -29,7 +29,7 @@ public class Skylint { Path path = Paths.get(args[0]).toAbsolutePath(); String content = new String(Files.readAllBytes(path), StandardCharsets.ISO_8859_1); BuildFileAST ast = - BuildFileAST.parseSkylarkString( + BuildFileAST.parseString( event -> { System.err.println(event); }, diff --git a/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/ControlFlowCheckerTest.java b/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/ControlFlowCheckerTest.java index 6266f6f9b9..12d1125366 100644 --- a/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/ControlFlowCheckerTest.java +++ b/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/ControlFlowCheckerTest.java @@ -26,7 +26,7 @@ public class ControlFlowCheckerTest { private static List<Issue> findIssues(String... lines) { String content = String.join("\n", lines); BuildFileAST ast = - BuildFileAST.parseSkylarkString( + BuildFileAST.parseString( event -> { throw new IllegalArgumentException(event.getMessage()); }, diff --git a/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/DocstringCheckerTests.java b/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/DocstringCheckerTests.java index 92742e29ae..84b4e6b9b2 100644 --- a/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/DocstringCheckerTests.java +++ b/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/DocstringCheckerTests.java @@ -27,7 +27,7 @@ public class DocstringCheckerTests { private static List<Issue> findIssues(String... lines) { String content = String.join("\n", lines); BuildFileAST ast = - BuildFileAST.parseSkylarkString( + BuildFileAST.parseString( event -> { throw new IllegalArgumentException(event.getMessage()); }, diff --git a/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/NamingConventionsCheckerTest.java b/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/NamingConventionsCheckerTest.java index b8fefb305c..74793aaf72 100644 --- a/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/NamingConventionsCheckerTest.java +++ b/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/NamingConventionsCheckerTest.java @@ -27,7 +27,7 @@ public class NamingConventionsCheckerTest { private static List<Issue> findIssues(String... lines) { String content = String.join("\n", lines); BuildFileAST ast = - BuildFileAST.parseSkylarkString( + BuildFileAST.parseString( event -> { throw new IllegalArgumentException(event.getMessage()); }, diff --git a/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/StatementWithoutEffectCheckerTest.java b/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/StatementWithoutEffectCheckerTest.java index a0326c9d10..4e2d024269 100644 --- a/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/StatementWithoutEffectCheckerTest.java +++ b/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/StatementWithoutEffectCheckerTest.java @@ -26,7 +26,7 @@ public class StatementWithoutEffectCheckerTest { private static List<Issue> findIssues(String... lines) { String content = String.join("\n", lines); BuildFileAST ast = - BuildFileAST.parseSkylarkString( + BuildFileAST.parseString( event -> { throw new IllegalArgumentException(event.getMessage()); }, diff --git a/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/UsageCheckerTest.java b/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/UsageCheckerTest.java index 86163fab47..6251921143 100644 --- a/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/UsageCheckerTest.java +++ b/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/UsageCheckerTest.java @@ -27,7 +27,7 @@ public class UsageCheckerTest { private static List<Issue> findIssues(String... lines) { String content = String.join("\n", lines); BuildFileAST ast = - BuildFileAST.parseSkylarkString( + BuildFileAST.parseString( event -> { throw new IllegalArgumentException(event.getMessage()); }, |