bazel syntax: delete Statement.parse
PiperOrigin-RevId: 268894044
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Statement.java b/src/main/java/com/google/devtools/build/lib/syntax/Statement.java
index 0849dbd..1f08bbb 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Statement.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Statement.java
@@ -13,7 +13,6 @@
// limitations under the License.
package com.google.devtools.build.lib.syntax;
-import com.google.devtools.build.lib.events.EventHandler;
/**
* Base class for all statements nodes in the AST.
@@ -42,10 +41,4 @@
* can be used in a switch/case.
*/
public abstract Kind kind();
-
- /** Parses a statement. */
- // TODO(adonovan): eliminate this temporary function; make all callers use BuildFileAST.parse.
- public static Statement parse(ParserInputSource input, EventHandler eventHandler) {
- return Parser.parseStatement(input, eventHandler);
- }
}
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
index b56e813..37a7ce8 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/util/EvaluationTestCase.java
@@ -168,14 +168,17 @@
return ast.validate(env, /*isBuildFile=*/ false, getEventHandler());
}
+ /** Parses and validates a file and returns its statements. */
// TODO(adonovan): don't let subclasses inherit vaguely specified "helpers".
+ // Separate all the tests clearly into tests of the scanner, parser, resolver,
+ // and evaluation.
protected List<Statement> parseFile(String... lines) {
return parseBuildFileAST(lines).getStatements();
}
- /** Parses a statement. */
+ /** Parses a statement, without validation. */
protected final Statement parseStatement(String... lines) {
- return Statement.parse(ParserInputSource.fromLines(lines), getEventHandler());
+ return parseBuildFileASTWithoutValidation(lines).getStatements().get(0);
}
/** Parses an expression. */
