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

implicit begin in assertLet

Browse Source
This commit is contained in:
Nat Quayle Nelson
2021-11-15 00:34:03 -07:00
parent 1578884e2f
commit 925cbb80cb
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -600,9 +600,10 @@ class Macros {
// Macros that null-check and extract patterns from enums (inspired by Rust) // Macros that null-check and extract patterns from enums (inspired by Rust)
function ifLet(assertLet:Bool, wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) { function ifLet(assertLet:Bool, wholeExp:ReaderExp, exps:Array<ReaderExp>, k:KissState) {
var funcName = if (assertLet) "assertLet" else "ifLet"; var funcName = if (assertLet) "assertLet" else "ifLet";
var thenExpStr = if (assertLet) "<body...>" else "<thenExp>";
var elseExpStr = if (assertLet) "" else " <?elseExp>"; var elseExpStr = if (assertLet) "" else " <?elseExp>";
var maxArgs = if (assertLet) 2 else 3; var maxArgs = if (assertLet) null else 3;
wholeExp.checkNumArgs(2, maxArgs, '($funcName [<enum bindings...>] <thenExp>${elseExpStr})'); wholeExp.checkNumArgs(2, maxArgs, '($funcName [<enum bindings...>] ${thenExpStr}${elseExpStr})');
var b = wholeExp.expBuilder(); var b = wholeExp.expBuilder();
var bindingList = exps[0].bindingList(funcName); var bindingList = exps[0].bindingList(funcName);
@@ -610,8 +611,8 @@ class Macros {
var firstValue = bindingList.shift(); var firstValue = bindingList.shift();
var firstValueSymbol = b.symbol(); var firstValueSymbol = b.symbol();
var thenExp = exps[1]; var thenExp = if (assertLet) b.begin(exps.slice(1)) else exps[1];
var elseExp = if (exps.length > 2) { var elseExp = if (!assertLet && exps.length > 2) {
exps[2]; exps[2];
} else if (assertLet) { } else if (assertLet) {
b.callSymbol("throw", [b.str('Assertion binding ${firstValue.def.toString()} -> ${firstPattern.def.toString()} failed')]); b.callSymbol("throw", [b.str('Assertion binding ${firstValue.def.toString()} -> ${firstPattern.def.toString()} failed')]);
@@ -629,7 +630,7 @@ class Macros {
b.call( b.call(
firstPattern, [ firstPattern, [
if (bindingList.length == 0) { if (bindingList.length == 0) {
exps[1]; thenExp;
} else { } else {
ifLet(assertLet, wholeExp, [ ifLet(assertLet, wholeExp, [
b.list(bindingList) b.list(bindingList)

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

@@ -620,4 +620,5 @@ class Prelude {
} }
public static var newLine = "\n"; public static var newLine = "\n";
public static var backSlash = "\\";
} }

6
projects/kiss-vscode/src/ktxt2/KTxt2Editor.kiss
View File

@@ -231,12 +231,6 @@
// (print "posting $message") // (print "posting $message")
(_vscode.postMessage message)) (_vscode.postMessage message))
(function replaceComment [element newText]
(case element
((Comment (object text text start start end end))
(postMessage (object type "replace" text newText start start end end)))
(otherwise (throw "element $element is not a comment"))))
(function insertBlockBeforeBlock [element] (function insertBlockBeforeBlock [element]
(case element (case element
((Block (object sourceStart position)) ((Block (object sourceStart position))