.scl disallows non-ASCII string literals
There's no simple way to distinguish non-ASCII errors from other types of compilation failures, aside from something brittle like string matching the error message. Consequently, there's no hint provided to the user that they're getting this error because they're in an .scl file as opposed to a .bzl. At the moment I'm inclined to let it be.
PiperOrigin-RevId: 534406767
Change-Id: I4d73fecbc43311efd8ebcfafd6e9295b9c4bc492
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BzlCompileFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BzlCompileFunction.java
index 82e9119..bcfdd33 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BzlCompileFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BzlCompileFunction.java
@@ -169,6 +169,13 @@
// statements whose bindings are intended to be visible in all BUILD
// files. The loadBindsGlobally flag allows us to retrieve them.
.loadBindsGlobally(key.isBuildPrelude())
+ // .scl files should be ASCII-only in string literals.
+ // TODO(bazel-team): It'd be nice if we could intercept non-ASCII errors from the lexer,
+ // and modify the displayed message to clarify to the user that the string would be
+ // permitted in a .bzl file. But there's no easy way to do that short of either string
+ // matching the error message or reworking the interpreter API to put more structured
+ // detail in errors (i.e. new fields or error subclasses).
+ .stringLiteralsAreAsciiOnly(key.isSclDialect())
.build();
StarlarkFile file = StarlarkFile.parse(input, options);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java
index 833508f..f247b5d 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/BzlLoadFunctionTest.java
@@ -342,6 +342,24 @@
assertContainsEvent("name 'depset' is not defined");
}
+ @Test
+ public void testSclDisallowsNonAsciiStringLiterals() throws Exception {
+ setBuildLanguageOptions("--experimental_enable_scl_dialect=true");
+
+ scratch.file("pkg/BUILD");
+ scratch.file(
+ "pkg/ext1.bzl", //
+ "'x\377z'"); // xÿz
+ scratch.file(
+ "pkg/ext2.scl", //
+ "'x\377z'");
+
+ checkSuccessfulLookup("//pkg:ext1.bzl");
+ reporter.removeHandler(failFastHandler);
+ checkFailingLookup("//pkg:ext2.scl", "compilation of module 'pkg/ext2.scl' failed");
+ assertContainsEvent("string literal contains non-ASCII character");
+ }
+
private EvaluationResult<BzlLoadValue> get(SkyKey skyKey) throws Exception {
EvaluationResult<BzlLoadValue> result =
SkyframeExecutorTestUtils.evaluate(
