branch: elpa/geiser-kawa commit 45dc276338f969052c2887244167eedd705edcd5 Author: spellcard199 <spellcard...@protonmail.com> Commit: spellcard199 <spellcard...@protonmail.com>
Fix and set pretty print default to true --- src/main/java/kawageiser/Geiser.java | 20 ++------------------ src/main/java/kawageiser/GeiserEval.java | 2 +- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/main/java/kawageiser/Geiser.java b/src/main/java/kawageiser/Geiser.java index 2573a24..8f8e843 100644 --- a/src/main/java/kawageiser/Geiser.java +++ b/src/main/java/kawageiser/Geiser.java @@ -13,24 +13,6 @@ import java.util.Map; public class Geiser implements Runnable { - private static boolean prettyPrintResult = true; - - public static boolean isPrettyPrintResult() { - return prettyPrintResult; - } - - public static boolean isPrettyPrintOutput() { - return GeiserEval.evaluator.isPrettyPrintOutput(); - } - - public static void setPrettyPrintResult(boolean v) { - prettyPrintResult = v; - } - - public static void setPrettyPrintOutput(boolean v) { - GeiserEval.evaluator.setPrettyPrintOutput(v); - } - @Override public void run() { // In a previous version, geiser's procedures definitions were like this: @@ -49,6 +31,8 @@ public class Geiser implements Runnable { // and replace methods paths as string with PrimProcedure. This would avoid Kawa-specific syntax. HashMap<String, String> procMap = new java.util.HashMap<>(); procMap.put("geiser:eval", "kawageiser.GeiserEval:evalStr"); + GeiserEval.evaluator.setPrettyPrintResult(true); + GeiserEval.evaluator.setPrettyPrintOutput(true); procMap.put("geiser:autodoc", "kawageiser.GeiserAutodoc:autodoc"); procMap.put("geiser:module-completions", "kawageiser.GeiserCompleteModule:completeModule"); procMap.put("geiser:load-file", "kawageiser.GeiserLoadFile:loadFile"); diff --git a/src/main/java/kawageiser/GeiserEval.java b/src/main/java/kawageiser/GeiserEval.java index 1d99542..08150f5 100644 --- a/src/main/java/kawageiser/GeiserEval.java +++ b/src/main/java/kawageiser/GeiserEval.java @@ -56,7 +56,7 @@ public class GeiserEval { // result String geiserResult = evalRes.isSuccess() - ? evalRes.getResultAsString(Geiser.isPrettyPrintResult()) + ? evalRes.getResultAsString(evaluator.isPrettyPrintResult()) : ""; // output