From a7472c646840b943a78b210cfbbcaed6dc934765 Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Thu, 12 Aug 2021 23:12:10 -0600
Subject: [PATCH] more debuggable #extern

---
 src/kiss/Macros.hx  | 13 ++++++++++---
 src/kiss/Prelude.hx | 40 +++++++++++++++++++++++++++++++---------
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/kiss/Macros.hx b/src/kiss/Macros.hx
index e92a539..cc104cd 100644
--- a/src/kiss/Macros.hx
+++ b/src/kiss/Macros.hx
@@ -864,15 +864,22 @@ class Macros {
             }
 
             var externExps = [
-                b.let([b.symbol("__args__"), b.callSymbol("Sys.args", [])],
-                    [b.print(
+                b.let([b.symbol("__args__"), b.callSymbol("Sys.args", [])], [
+                    b.callSymbol("set", [
+                        b.symbol("Prelude.printStr"),
+                        b.symbol("Prelude._externPrintStr")
+                    ]),
+                    b.callSymbol("Prelude._printStr", [
                         b.callSymbol("tink.Json.stringify", [
                             b.the(bodyType, if (bindingList.length > 0) {
                                 b.let(parseBindingList, exps);
                             } else {
                                 b.begin(exps);
                             })
-                        ]))])
+                        ])
+                    ]),
+                    b.callSymbol("Sys.exit", [b.symbol("0")])
+                ])
             ];
             b.the(
                 bodyType,
diff --git a/src/kiss/Prelude.hx b/src/kiss/Prelude.hx
index de8f2d0..c500754 100644
--- a/src/kiss/Prelude.hx
+++ b/src/kiss/Prelude.hx
@@ -13,6 +13,7 @@ import sys.io.Process;
 #end
 #if (sys || hxnodejs)
 import sys.FileSystem;
+import sys.io.File;
 #end
 #if python
 import python.lib.subprocess.Popen;
@@ -334,7 +335,7 @@ class Prelude {
         return f;
     }
 
-    public static dynamic function printStr(s:String) {
+    public static function _printStr(s:String) {
         #if (sys || hxnodejs)
         Sys.println(s);
         #else
@@ -342,6 +343,21 @@ class Prelude {
         #end
     }
 
+    #if (sys || hxnodejs)
+    static var externLogFile = "externLog.txt";
+
+    public static function _externPrintStr(s:String) {
+        var logContent = try {
+            File.getContent(externLogFile);
+        } catch (e) {
+            "";
+        }
+        File.saveContent(externLogFile, '${logContent}${s}\n');
+    }
+    #end
+
+    public static var printStr:(String) -> Void = _printStr;
+
     public static function print<T>(v:T, label = ""):T {
         var toPrint = label;
         if (label.length > 0) {
@@ -497,9 +513,9 @@ class Prelude {
             }
         }
 
-        if (fullProcess) {
+        var output = if (fullProcess) {
             if (p.wait() == 0) {
-                return p.stdout.readall().decode().trim();
+                p.stdout.readall().decode().trim();
             } else {
                 throw 'process $command $args failed:\n${p.stdout.readall().decode().trim() + p.stderr.readall().decode().trim();}';
             }
@@ -507,8 +523,10 @@ class Prelude {
             // The haxe extern for FileIO.readline() says it's a string, but it's not, it's bytes!
             var bytes:Dynamic = p.stdout.readline();
             var s:String = bytes.decode();
-            return s.trim();
+            s.trim();
         }
+        p.terminate();
+        return output;
         #elseif sys
         var p = new Process(command, args);
         if (inputLines != null) {
@@ -516,30 +534,34 @@ class Prelude {
                 p.stdin.writeString('$line\n');
             }
         }
-        if (fullProcess) {
+        var output = if (fullProcess) {
             if (p.exitCode() == 0) {
-                return p.stdout.readAll().toString().trim();
+                p.stdout.readAll().toString().trim();
             } else {
                 throw 'process $command $args failed:\n${p.stdout.readAll().toString().trim() + p.stderr.readAll().toString().trim()}';
             }
         } else {
-            return p.stdout.readLine().toString().trim();
+            p.stdout.readLine().toString().trim();
         }
+        p.kill();
+        p.close();
+        return output;
         #elseif hxnodejs
         var p = if (inputLines != null) {
             ChildProcess.spawnSync(command, args, {input: inputLines.join("\n")});
         } else {
             ChildProcess.spawnSync(command, args);
         }
-        switch (p.status) {
+        var output = switch (p.status) {
             case 0:
                 var output:Buffer = p.stdout;
-                return output.toString();
+                output.toString();
             default:
                 var output:Buffer = p.stdout;
                 var error:Buffer = p.stderr;
                 throw 'process $command $args failed:\n${output.toString() + error.toString()}';
         }
+        return output;
         #else
         throw "Can't run a subprocess on this target.";
         #end