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

Better (load) call error checking

Browse Source
This commit is contained in:
Nat Quayle Nelson
2020-12-31 17:46:51 -07:00
parent cc84067b36
commit 5dd47261da
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
kiss/src/kiss/Kiss.hx
View File

@@ -97,14 +97,20 @@ class Kiss {
#end #end
switch (nextExp.def) { switch (nextExp.def) {
// (load... ) is the specialest of forms because it calls build() again and those fields need to be merged // (load... ) is the specialest of forms because it calls build() again and those fields need to be merged
case CallExp({pos: _, def: Symbol("load")}, [{pos: _, def: StrExp(otherKissFile)}]): case CallExp({pos: _, def: Symbol("load")}, loadArgs):
var filePath = Path.join([loadingDirectory, otherKissFile]); nextExp.checkNumArgs(1, 1, "(load \"[file]\")");
if (!k.loadedFiles.exists(filePath)) { switch (loadArgs[0].def) {
var loadedFields = Kiss.build(filePath, k, false); case StrExp(otherKissFile):
for (field in loadedFields) { var filePath = Path.join([loadingDirectory, otherKissFile]);
classFields.push(field); if (!k.loadedFiles.exists(filePath)) {
} var loadedFields = Kiss.build(filePath, k, false);
k.loadedFiles[filePath] = true; for (field in loadedFields) {
classFields.push(field);
}
k.loadedFiles[filePath] = true;
}
default:
throw CompileError.fromExp(loadArgs[0], "only argument to load should be a string literal");
} }
default: default:
var field = readerExpToField(nextExp, k); var field = readerExpToField(nextExp, k);