aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/skylark
diff options
context:
space:
mode:
authorGravatar laurentlb <laurentlb@google.com>2017-08-10 23:00:53 +0200
committerGravatar Marcel Hlopko <hlopko@google.com>2017-08-11 12:56:34 +0200
commite18ccda6a70a8c43db12942f56c786c51803d809 (patch)
tree667f83821d87c7525420dd08c67abbc53beb3408 /src/main/java/com/google/devtools/skylark
parentd1c59169921d9aa3d066f9694517454221dac089 (diff)
Skylark interpreter uses Latin1 instead of Utf8 for consistency with Bazel.
RELNOTES: None. PiperOrigin-RevId: 164899416
Diffstat (limited to 'src/main/java/com/google/devtools/skylark')
-rw-r--r--src/main/java/com/google/devtools/skylark/Skylark.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/google/devtools/skylark/Skylark.java b/src/main/java/com/google/devtools/skylark/Skylark.java
index 3e4d77ee8f..f7c7d11628 100644
--- a/src/main/java/com/google/devtools/skylark/Skylark.java
+++ b/src/main/java/com/google/devtools/skylark/Skylark.java
@@ -24,6 +24,7 @@ import com.google.devtools.build.lib.syntax.Printer;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
@@ -49,8 +50,9 @@ class Skylark {
}
};
+ private static final Charset CHARSET = StandardCharsets.ISO_8859_1;
private final BufferedReader reader =
- new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8));
+ new BufferedReader(new InputStreamReader(System.in, CHARSET));
private final Mutability mutability = Mutability.create("interpreter");
private final Environment env =
Environment.builder(mutability)
@@ -98,7 +100,7 @@ class Skylark {
public int execute(String path) {
String content;
try {
- content = new String(Files.readAllBytes(Paths.get(path)), StandardCharsets.UTF_8);
+ content = new String(Files.readAllBytes(Paths.get(path)), CHARSET);
BuildFileAST.eval(env, content);
return 0;
} catch (EvalException e) {