diff options
3 files changed, 12 insertions, 11 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BuildFileAST.java b/src/main/java/com/google/devtools/build/lib/syntax/BuildFileAST.java index 6ad5a4897b..a0f6a33367 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/BuildFileAST.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/BuildFileAST.java @@ -25,6 +25,7 @@ import com.google.devtools.build.lib.syntax.Parser.ParseResult; import com.google.devtools.build.lib.syntax.SkylarkImports.SkylarkImportSyntaxException; import com.google.devtools.build.lib.util.Pair; import com.google.devtools.build.lib.vfs.Path; +import com.google.devtools.build.lib.vfs.PathFragment; import java.io.IOException; import java.util.List; import javax.annotation.Nullable; @@ -299,7 +300,7 @@ public class BuildFileAST extends ASTNode { public static BuildFileAST parseBuildString(EventHandler eventHandler, String... content) { String str = Joiner.on("\n").join(content); - ParserInputSource input = ParserInputSource.create(str, null); + ParserInputSource input = ParserInputSource.create(str, PathFragment.EMPTY_FRAGMENT); Parser.ParseResult result = Parser.parseFile(input, eventHandler); return create(ImmutableList.<Statement>of(), result, null, eventHandler); } @@ -307,7 +308,7 @@ public class BuildFileAST extends ASTNode { // TODO(laurentlb): Merge parseSkylarkString and parseBuildString. public static BuildFileAST parseSkylarkString(EventHandler eventHandler, String... content) { String str = Joiner.on("\n").join(content); - ParserInputSource input = ParserInputSource.create(str, null); + ParserInputSource input = ParserInputSource.create(str, PathFragment.EMPTY_FRAGMENT); Parser.ParseResult result = Parser.parseFileForSkylark(input, eventHandler); return create(ImmutableList.<Statement>of(), result, null, eventHandler); } diff --git a/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java b/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java index 1d93eb92b0..17599d785a 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/MethodLibraryTest.java @@ -353,15 +353,15 @@ public class MethodLibraryTest extends EvaluationTestCase { .testIfErrorContains( "Traceback (most recent call last):" + LINE_SEPARATOR - + "\tFile \"<unknown>\", line 8" + + "\tFile \"\", line 8" + LINE_SEPARATOR + "\t\tfoo()" + LINE_SEPARATOR - + "\tFile \"<unknown>\", line 2, in foo" + + "\tFile \"\", line 2, in foo" + LINE_SEPARATOR + "\t\tbar(1)" + LINE_SEPARATOR - + "\tFile \"<unknown>\", line 7, in bar" + + "\tFile \"\", line 7, in bar" + LINE_SEPARATOR + "\t\t'test'.index(x)", "def foo():", @@ -378,11 +378,11 @@ public class MethodLibraryTest extends EvaluationTestCase { public void testStackTraceWithIf() throws Exception { new SkylarkTest() .testIfErrorContains( - "File \"<unknown>\", line 5" + "File \"\", line 5" + LINE_SEPARATOR + "\t\tfoo()" + LINE_SEPARATOR - + "\tFile \"<unknown>\", line 3, in foo" + + "\tFile \"\", line 3, in foo" + LINE_SEPARATOR + "\t\ts[0]", "def foo():", @@ -411,15 +411,15 @@ public class MethodLibraryTest extends EvaluationTestCase { .testIfExactError( "Traceback (most recent call last):" + LINE_SEPARATOR - + "\tFile \"<unknown>\", line 6" + + "\tFile \"\", line 6" + LINE_SEPARATOR + "\t\tfoo()" + LINE_SEPARATOR - + "\tFile \"<unknown>\", line 2, in foo" + + "\tFile \"\", line 2, in foo" + LINE_SEPARATOR + "\t\tbar(1)" + LINE_SEPARATOR - + "\tFile \"<unknown>\", line 5, in bar" + + "\tFile \"\", line 5, in bar" + LINE_SEPARATOR + "\t\t'test'.index(x)" + LINE_SEPARATOR diff --git a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java index c2d602453c..0a701e0e5c 100644 --- a/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java +++ b/src/test/java/com/google/devtools/build/lib/syntax/SkylarkEvaluationTest.java @@ -421,7 +421,7 @@ public class SkylarkEvaluationTest extends EvaluationTest { " xs.append(4)", " return ys" // No file name in message, due to how test is set up. - ).testIfErrorContains("Object locked at the following location(s): 4:3, 5:5", "foo()"); + ).testIfErrorContains("Object locked at the following location(s): :4:3, :5:5", "foo()"); } @Test |