aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/google/devtools')
-rw-r--r--src/main/java/com/google/devtools/build/lib/syntax/EvalExceptionWithStackTrace.java9
-rw-r--r--src/main/java/com/google/devtools/build/lib/syntax/Parser.java16
-rw-r--r--src/main/java/com/google/devtools/build/lib/syntax/Printer.java25
3 files changed, 9 insertions, 41 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/EvalExceptionWithStackTrace.java b/src/main/java/com/google/devtools/build/lib/syntax/EvalExceptionWithStackTrace.java
index 2ab20d02bf..7300e4b46a 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/EvalExceptionWithStackTrace.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/EvalExceptionWithStackTrace.java
@@ -17,7 +17,6 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.devtools.build.lib.events.Location;
import com.google.devtools.build.lib.packages.Rule;
-import com.google.devtools.build.lib.vfs.PathFragment;
import java.util.Deque;
import java.util.LinkedList;
@@ -246,14 +245,6 @@ public class EvalExceptionWithStackTrace extends EvalException {
}
/**
- * Returns whether the given element describes the rule definition in a BUILD file.
- */
- protected boolean describesRule(StackTraceElement element) {
- PathFragment pathFragment = element.getLocation().getPath();
- return pathFragment != null && pathFragment.getPathString().contains("BUILD");
- }
-
- /**
* Returns the string representation of the given element.
*/
protected String print(StackTraceElement element) {
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Parser.java b/src/main/java/com/google/devtools/build/lib/syntax/Parser.java
index 8d6f74b1c5..97b04e67dd 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Parser.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Parser.java
@@ -245,22 +245,6 @@ class Parser {
}
/**
- * Entry-point to parser that parses a statement. All errors encountered
- * during parsing are reported via "reporter".
- */
- @VisibleForTesting
- public static Statement parseStatement(
- Lexer lexer, EventHandler eventHandler) {
- Parser parser = new Parser(lexer, eventHandler, null);
- Statement result = parser.parseSmallStatement();
- while (parser.token.kind == TokenKind.NEWLINE) {
- parser.nextToken();
- }
- parser.expect(TokenKind.EOF);
- return result;
- }
-
- /**
* Entry-point to parser that parses an expression. All errors encountered
* during parsing are reported via "reporter". The expression may be followed
* by newline tokens.
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Printer.java b/src/main/java/com/google/devtools/build/lib/syntax/Printer.java
index 4792b25436..46ccc55763 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Printer.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Printer.java
@@ -263,7 +263,7 @@ public final class Printer {
* @param quote the quote character to use, '"' or '\''.
* @return the Appendable, in fluent style.
*/
- public static Appendable writeString(Appendable buffer, String s, char quote) {
+ private static Appendable writeString(Appendable buffer, String s, char quote) {
append(buffer, quote);
int len = s.length();
for (int i = 0; i < len; i++) {
@@ -274,19 +274,6 @@ public final class Printer {
}
/**
- * Write a properly escaped Skylark representation of a string to a buffer.
- * By default, standard Skylark convention is used, i.e., double-quoted single-line string,
- * as opposed to standard Python convention, i.e. single-quoted single-line string.
- *
- * @param buffer the Appendable we're writing to.
- * @param s the string a representation of which to write.
- * @return the buffer, in fluent style.
- */
- public static Appendable writeString(Appendable buffer, String s) {
- return writeString(buffer, s, SKYLARK_QUOTATION_MARK);
- }
-
- /**
* Print a list of object representations
* @param buffer an appendable buffer onto which to write the list.
* @param list the list of objects to write (each as with repr)
@@ -299,8 +286,14 @@ public final class Printer {
* @param quotationMark The quotation mark to be used (' or ")
* @return the Appendable, in fluent style.
*/
- public static Appendable printList(Appendable buffer, Iterable<?> list, String before,
- String separator, String after, String singletonTerminator, char quotationMark) {
+ private static Appendable printList(
+ Appendable buffer,
+ Iterable<?> list,
+ String before,
+ String separator,
+ String after,
+ String singletonTerminator,
+ char quotationMark) {
boolean printSeparator = false; // don't print the separator before the first element
int len = 0;
append(buffer, before);