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

compileToFile() working for hello world

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-07-25 23:55:52 -06:00
parent dcaf0a1a7f
commit 206ab8972d
5 changed files with 141 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
kiss/src/kiss/CompilerTools.hx
View File

@@ -1,7 +1,15 @@
package kiss;
import sys.io.Process;
#if macro
import kiss.Kiss;
import kiss.Helpers;
import sys.FileSystem;
import sys.io.File;
import haxe.io.Path;
using StringTools;
using haxe.io.Path;
enum CompileLang {
JavaScript;
@@ -43,26 +51,92 @@ class CompilerTools {
* @return A function that, when called, executes the script and returns the script output as a string.
*/
public static function compileToScript(exps:Array<ReaderExp>, args:CompilationArgs):() -> String {
// TODO if folder exists, delete it
// TODO create it again
// TODO copy all files in
// import.hx if given
// hxml file if given
// language-specific project file if given
// main .hx file if given, or default
// make sure it calls build() on the right file, and imports kiss.Prelude
// all extra files
// make the main.kiss file just a begin of array(exps)
// if folder exists, delete it
if (FileSystem.exists(args.outputFolder)) {
for (file in FileSystem.readDirectory(args.outputFolder)) {
FileSystem.deleteFile(Path.join([args.outputFolder, file]));
}
FileSystem.deleteDirectory(args.outputFolder);
}
// TODO generate build.hxml
// -lib kiss
// target compiler arguments and -cmd argument according to lang
// run haxelib install all in folder
// install language-specific dependencies
// call haxe args.hxml build.hxml
// create it again
FileSystem.createDirectory(args.outputFolder);
// Copy all files in that don't need to be processed in some way
function copyToFolder(file) {
File.copy(file, Path.join([args.outputFolder, file.withoutDirectory()]));
}
if (args.extraFiles == null) {
args.extraFiles = [];
}
for (file in [args.importHxFile, args.hxmlFile, args.langProjectFile].concat(args.extraFiles)) {
if (file != null) {
copyToFolder(file);
}
}
// If a main haxe file was given, use it
var mainHxFile = if (args.mainHxFile != null) {
args.mainHxFile;
}
// Otherwise use the default
else {
Path.join([Helpers.libPath("kiss"), "src", "kiss", "ScriptMain.hx"]);
}
copyToFolder(mainHxFile);
var mainClassName = mainHxFile.withoutDirectory().withoutExtension();
// make the kiss file just the given expressions dumped into a file,
// with a corresponding name to the mainClassName
var kissFileContent = "";
for (exp in exps) {
kissFileContent += Reader.toString(exp.def) + "\n";
}
File.saveContent(Path.join([args.outputFolder, '$mainClassName.kiss']), kissFileContent);
// generate build.hxml
var buildHxmlContent = "";
buildHxmlContent += "-lib kiss\n";
buildHxmlContent += '--main $mainClassName\n';
switch (args.lang) {
case JavaScript:
// Throw in hxnodejs because we know node will be running the script:
buildHxmlContent += '-lib hxnodejs\n';
buildHxmlContent += '-js $mainClassName.js\n';
case Python:
buildHxmlContent += '-python $mainClassName.py\n';
}
var buildHxmlFile = Path.join([args.outputFolder, 'build.hxml']);
File.saveContent(buildHxmlFile, buildHxmlContent);
// run haxelib install on given hxml and generated hxml
var hxmlFiles = [buildHxmlFile];
Helpers.assertProcess("haxelib", ["install", "--always", buildHxmlFile]);
if (args.hxmlFile != null) {
hxmlFiles.push(args.hxmlFile);
Helpers.assertProcess("haxelib", ["install", "--always", args.hxmlFile]);
}
// TODO install language-specific dependencies from langProjectFile (which might be tricky because we can't set the working directory)
// Compile the script
Helpers.assertProcess("haxe", ["--cwd", args.outputFolder].concat(hxmlFiles.map(Path.withoutDirectory)));
var command = "";
var scriptExt = "";
switch (args.lang) {
case JavaScript:
command = "node";
scriptExt = "js";
case Python:
command = "python";
scriptExt = "py";
}
// return lambda that calls new Process() that runs the target-specific file
return () -> "";
return () -> Helpers.assertProcess(command, [Path.join([args.outputFolder, '$mainClassName.$scriptExt'])]);
}
}
#end

16
kiss/src/kiss/Helpers.hx
View File

@@ -12,6 +12,7 @@ import kiss.Kiss;
import kiss.SpecialForms;
import kiss.Prelude;
import uuid.Uuid;
import sys.io.Process;
using uuid.Uuid;
using tink.MacroApi;
@@ -492,4 +493,19 @@ class Helpers {
throw CompileError.fromExp(exp, '$forThis bindings should be a list expression with an even number of sub expressions (at least 2)');
};
}
// Get the path to a haxelib the user has installed
public static function libPath(haxelibName:String) {
return assertProcess("haxelib", ["libpath", haxelibName]);
}
public static function assertProcess(command:String, args:Array<String>):String {
var p = new Process(command, args);
switch (p.exitCode()) {
case 0:
return p.stdout.readAll().toString().trim();
default:
throw p.stderr.readAll().toString().trim();
}
}
}

3
kiss/src/kiss/Macros.hx
View File

@@ -7,7 +7,6 @@ import kiss.ReaderExp;
import kiss.Kiss;
import kiss.CompileError;
import uuid.Uuid;
import sys.io.Process;
import hscript.Parser;
using kiss.Kiss;
@@ -46,7 +45,7 @@ class Macros {
var libPath = switch (args[0].def) {
case StrExp(libName):
new Process("haxelib", ["libpath", libName]).stdout.readAll().toString().trim();
Helpers.libPath(libName);
default:
throw CompileError.fromExp(args[0], "first argument to loadFrom should be a string literal of a haxe library's name");
};

7
kiss/src/kiss/ScriptMain.hx Normal file
View File

@@ -0,0 +1,7 @@
package;
import kiss.Kiss;
import kiss.Prelude;
@:build(kiss.Kiss.build())
class ScriptMain {}

29
kiss/src/test/cases/CompilerToolsTestCase.hx
View File

@@ -9,15 +9,15 @@ import haxe.macro.Context;
#end
class CompilerToolsTestCase extends Test {
function testCompileHelloWorld() {
Assert.equals("Hello, world!", _testCompileHelloWorld());
function testCompileHelloWorldJs() {
Assert.equals("Hello world!", _testCompileHelloWorldJs());
}
static macro function _testCompileHelloWorld() {
static macro function _testCompileHelloWorldJs() {
var runHelloWorld = CompilerTools.compileFileToScript(
"kiss/template/src/template/Main.kiss", {
lang: JavaScript,
outputFolder: "bin/js",
outputFolder: "bin/helloWorldJsTest",
});
return {
@@ -25,4 +25,25 @@ class CompilerToolsTestCase extends Test {
expr: EConst(CString(runHelloWorld(), DoubleQuotes))
};
}
function testCompileHelloWorldPy() {
Assert.equals("Hello world!", _testCompileHelloWorldPy());
}
static macro function _testCompileHelloWorldPy() {
var runHelloWorld = CompilerTools.compileFileToScript(
"kiss/template/src/template/Main.kiss", {
lang: Python,
outputFolder: "bin/helloWorldPyTest",
});
return {
pos: Context.currentPos(),
expr: EConst(CString(runHelloWorld(), DoubleQuotes))
};
}
// TODO test what happens when passing more arguments/files
}