kiss-lang/kiss-vscode
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix convertToHScript on js, python

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-08-01 20:20:36 -06:00
parent 4914eda951
commit 69897192f5
1 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
kiss/src/kiss/Prelude.hx
View File

@@ -368,14 +368,26 @@ class Prelude {
* So don't use raw string literals in Kiss you want parsed and evaluated at runtime. * So don't use raw string literals in Kiss you want parsed and evaluated at runtime.
*/ */
public static function convertToHScript(kissStr:String):String { public static function convertToHScript(kissStr:String):String {
#if (!macro && (hxnodejs || python)) #if (!macro && hxnodejs)
var hscript = try { var hscript = try {
assertProcess("haxelib", ["run", "kiss", "convert", "--all", "--hscript"], kissStr.split('\n')); assertProcess("haxelib", ["run", "kiss", "convert", "--all", "--hscript"], kissStr.split('\n'));
} catch (e) { } catch (e) {
throw 'failed to convert ${kissStr} to hscript:\n$e'; throw 'failed to convert ${kissStr} to hscript:\n$e';
} }
var output:Buffer = kissProcess.stdout; if (hscript.startsWith(">>> ")) {
return output.toString(); hscript = hscript.substr(4);
}
return hscript.trim();
#elseif (!macro && python)
var hscript = try {
assertProcess("haxelib", ["run", "kiss", "convert", "--hscript"], [kissStr.replace('\n', ' ')], false);
} catch (e) {
throw 'failed to convert ${kissStr} to hscript:\n$e';
}
if (hscript.startsWith(">>> ")) {
hscript = hscript.substr(4);
}
return hscript.trim();
#elseif sys #elseif sys
if (kissProcess == null) if (kissProcess == null)
kissProcess = new Process("haxelib", ["run", "kiss", "convert", "--hscript"]); kissProcess = new Process("haxelib", ["run", "kiss", "convert", "--hscript"]);
@@ -397,7 +409,7 @@ class Prelude {
#end #end
} }
public static function assertProcess(command:String, args:Array<String>, ?inputLines:Array<String>):String { public static function assertProcess(command:String, args:Array<String>, ?inputLines:Array<String>, fullProcess = true):String {
if (inputLines != null) { if (inputLines != null) {
for (line in inputLines) { for (line in inputLines) {
if (line.indexOf("\n") != -1) { if (line.indexOf("\n") != -1) {
@@ -415,14 +427,20 @@ class Prelude {
if (inputLines != null) { if (inputLines != null) {
for (line in inputLines) { for (line in inputLines) {
p.stdin.write(new Bytearray('$line\n', "utf-8")); p.stdin.write(new Bytearray('$line\n', "utf-8"));
trace(line);
} }
} }
switch (p.wait()) {
case 0: if (fullProcess) {
if (p.wait() == 0) {
return p.stdout.readall().decode().trim(); return p.stdout.readall().decode().trim();
default: } else {
throw 'process $command $args failed:\n${p.stdout.readall().decode().trim() + p.stderr.readall().decode().trim();}'; throw 'process $command $args failed:\n${p.stdout.readall().decode().trim() + p.stderr.readall().decode().trim();}';
}
} else {
// 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 Prelude.print(s.trim());
} }
#elseif sys #elseif sys
var p = new Process(command, args); var p = new Process(command, args);
@@ -431,11 +449,14 @@ class Prelude {
p.stdin.writeString('$line\n'); p.stdin.writeString('$line\n');
} }
} }
switch (p.exitCode()) { if (fullProcess) {
case 0: if (p.exitCode() == 0) {
return p.stdout.readAll().toString().trim(); return p.stdout.readAll().toString().trim();
default: } else {
throw 'process $command $args failed:\n${p.stdout.readAll().toString().trim() + p.stderr.readAll().toString().trim()}'; throw 'process $command $args failed:\n${p.stdout.readAll().toString().trim() + p.stderr.readAll().toString().trim()}';
}
} else {
return p.stdout.readLine().toString().trim();
} }
#elseif hxnodejs #elseif hxnodejs
var p = if (inputLines != null) { var p = if (inputLines != null) {