CLI: do not use unicode on --ascii-only

aya-prover · Nov 12, 2021 · 9c49f87 · 9c49f87
1 parent e2d8c4d
commit 9c49f87
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 18 deletions.
diff --git a/api/src/main/java/org/aya/api/error/Problem.java b/api/src/main/java/org/aya/api/error/Problem.java
@@ -35,7 +35,7 @@ enum Stage {
   }
 
   @NotNull SourcePos sourcePos();
-  /** @see Problem#computeFullErrorMessage(DistillerOptions) */
+  /** @see Problem#computeFullErrorMessage(DistillerOptions, boolean) */
   @NotNull Doc describe(@NotNull DistillerOptions options);
   @NotNull Severity level();
   default @NotNull Stage stage() {
@@ -84,9 +84,10 @@ default boolean isError() {
     );
   }
 
-  default @NotNull String computeFullErrorMessage(@NotNull DistillerOptions options) {
-    if (sourcePos() == SourcePos.NONE) return describe(options).commonRender();
-    return toPrettyError(options).toDoc().commonRender();
+  int PAGE_WIDTH = 80;
+  default @NotNull String computeFullErrorMessage(@NotNull DistillerOptions options, boolean unicode) {
+    if (sourcePos() == SourcePos.NONE) return describe(options).renderWithPageWidth(PAGE_WIDTH, unicode);
+    return toPrettyError(options).toDoc().renderWithPageWidth(PAGE_WIDTH, unicode);
   }
 
   default @NotNull String computeBriefErrorMessage(@NotNull DistillerOptions options) {

diff --git a/api/src/main/java/org/aya/api/error/StreamReporter.java b/api/src/main/java/org/aya/api/error/StreamReporter.java
@@ -12,6 +12,6 @@
  */
 public record StreamReporter(@NotNull PrintStream stream) implements Reporter {
   @Override public void report(@NotNull Problem problem) {
-    stream.println(problem.computeFullErrorMessage(DistillerOptions.informative()));
+    stream.println(problem.computeFullErrorMessage(DistillerOptions.informative(), false));
   }
 }
diff --git a/base/src/test/java/org/aya/test/ThrowingReporter.java b/base/src/test/java/org/aya/test/ThrowingReporter.java
@@ -17,7 +17,7 @@ private ThrowingReporter() {
   }
 
   @Override public void report(@NotNull Problem problem) {
-    var render = problem.computeFullErrorMessage(DistillerOptions.informative());
+    var render = problem.computeFullErrorMessage(DistillerOptions.informative(), false);
     if (!problem.isError()) {
       System.err.println(render);
       return;

diff --git a/cli/src/main/java/org/aya/cli/Main.java b/cli/src/main/java/org/aya/cli/Main.java
@@ -34,10 +34,10 @@ public Integer call() throws Exception {
     var distillOptions = ReplConfig.loadFromDefault().distillerOptions;
     if (action.compile.isLibrary) {
       // TODO: move to a new tool
-      return LibraryCompiler.compile(filePath);
+      return LibraryCompiler.compile(filePath, !asciiOnly);
     }
     var traceBuilder = enableTrace ? new Trace.Builder() : null;
-    var compiler = new SingleFileCompiler(CliReporter.INSTANCE, null, traceBuilder, distillOptions);
+    var compiler = new SingleFileCompiler(CliReporter.stdio(!asciiOnly), null, traceBuilder, distillOptions);
     var distillation = prettyStage != null ? new CompilerFlags.DistillInfo(
       prettyStage,
       prettyFormat,

diff --git a/cli/src/main/java/org/aya/cli/library/LibraryCompiler.java b/cli/src/main/java/org/aya/cli/library/LibraryCompiler.java
@@ -29,10 +29,10 @@
 /**
  * @author kiva
  */
-public record LibraryCompiler(@NotNull Path buildRoot) {
-  public static int compile(@NotNull Path libraryRoot) throws IOException {
+public record LibraryCompiler(@NotNull Path buildRoot, boolean unicode) {
+  public static int compile(@NotNull Path libraryRoot, boolean unicode) throws IOException {
     var config = LibraryConfigData.fromLibraryRoot(libraryRoot);
-    new LibraryCompiler(config.libraryBuildRoot()).make(config);
+    new LibraryCompiler(config.libraryBuildRoot(), unicode).make(config);
     return 0;
   }
 
@@ -88,7 +88,7 @@ private void callSingleFileCompiler(
       System.out.println("UP-TO-DATE");
       return;
     }
-    var compiler = new SingleFileCompiler(CliReporter.INSTANCE, locator, null);
+    var compiler = new SingleFileCompiler(CliReporter.stdio(unicode), locator, null);
     try {
       compiler.compile(file, new CompilerFlags(
         CompilerFlags.Message.EMOJI, false, null, compiledModulePath

diff --git a/cli/src/main/java/org/aya/cli/repl/Repl.java b/cli/src/main/java/org/aya/cli/repl/Repl.java
@@ -40,9 +40,6 @@ private static Repl makeRepl(MainArgs.@NotNull ReplAction replAction, ReplConfig
     };
   }
 
-  public final @NotNull ReplCompiler replCompiler = new ReplCompiler(new CliReporter(this::println, this::errPrintln), null);
-  public final @NotNull CommandManager commandManager = makeCommand();
-
   public CommandManager makeCommand() {
     return new CommandManager(ImmutableSeq.of(
       CommandArg.STRING,
@@ -71,9 +68,12 @@ public CommandManager makeCommand() {
   public final @NotNull ReplConfig config;
   public @NotNull Path cwd = Path.of("");
   public int prettyPrintWidth = 80;
+  public final @NotNull ReplCompiler replCompiler;
+  public final @NotNull CommandManager commandManager = makeCommand();
 
   public Repl(@NotNull ReplConfig config) {
     this.config = config;
+    replCompiler = new ReplCompiler(new CliReporter(config.enableUnicode, this::println, this::errPrintln), null);
   }
 
   protected abstract void println(@NotNull String x);

diff --git a/cli/src/main/java/org/aya/cli/single/CliReporter.java b/cli/src/main/java/org/aya/cli/single/CliReporter.java
@@ -5,18 +5,26 @@
 import org.aya.api.distill.DistillerOptions;
 import org.aya.api.error.Problem;
 import org.aya.api.error.Reporter;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Consumer;
 
 /**
  * @author ice1000
  */
-public record CliReporter(@NotNull Consumer<String> out, @NotNull Consumer<String> err) implements Reporter {
-  public static final CliReporter INSTANCE = new CliReporter(System.out::println, System.err::println);
+public record CliReporter(
+  boolean unicode,
+  @NotNull Consumer<String> out,
+  @NotNull Consumer<String> err
+) implements Reporter {
+  @Contract(pure = true, value = "_ -> new")
+  public static @NotNull CliReporter stdio(boolean unicode) {
+    return new CliReporter(unicode, System.out::println, System.err::println);
+  }
 
   @Override public void report(@NotNull Problem problem) {
-    var errorMsg = problem.computeFullErrorMessage(DistillerOptions.informative());
+    var errorMsg = problem.computeFullErrorMessage(DistillerOptions.informative(), unicode);
     var level = problem.level();
     if (problem.isError() || level == Problem.Severity.WARN) err.accept(errorMsg);
     else out.accept(errorMsg);

diff --git a/gradle/upload-maven.cmd b/gradle/upload-maven.cmd
@@ -0,0 +1,6 @@
+./gradlew :api:publish
+./gradlew :base:publish
+./gradlew :cli:publish
+./gradlew :pretty:publish
+./gradlew :parser:publish
+./gradlew :tools:publish