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

allow :Null on lambda and arrow lambda

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-08-08 12:10:11 -05:00
parent e1bd5eff02
commit 929ae557ed
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/kiss/Reader.hx
View File

@@ -178,7 +178,7 @@ class Reader {
// -+>countVar arg body
// -+>countVar {body}
// -+>countVar (body)
// or any of those with the first expression after -> or -+> prefixed by :Void
// or any of those with the first expression after -> or -+> prefixed by :Void or :Null
function arrowSyntax(countingLambda:Bool, stream:Stream, k:HasReadTables) {
var countVar = if (countingLambda) {
_assertRead(stream, k);
@@ -192,10 +192,14 @@ class Reader {
var bodyExp:ReaderExp = null;
var returnsValue = true;
var returnsNull = false;
switch (firstExp.def) {
case TypedExp("Void", realFirstExp):
firstExp = realFirstExp;
returnsValue = false;
case TypedExp("Null", realFirstExp):
firstExp = realFirstExp;
returnsNull = true;
default:
}
switch (firstExp.def) {
@@ -209,10 +213,13 @@ class Reader {
argsExp = b.list([]);
bodyExp = firstExp;
default:
throw KissError.fromExp(firstExp, "first expression after -> should be [args...], arg, (exp) or {body}, or one of those prefixed with :Void. When an argument type must be specified, even a single argument name must be put in brackets. For example: ->[:ArgType arg] <exp>");
throw KissError.fromExp(firstExp, "first expression after -> should be [args...], arg, (exp) or {body}, or one of those prefixed with :Void or :Null. When an argument type must be specified, even a single argument name must be put in brackets. For example: ->[:ArgType arg] <exp>");
}
if (!returnsValue) {
argsExp = TypedExp("Void", argsExp).withPosOf(argsExp);
} else if(returnsNull) {
argsExp = TypedExp("Null", argsExp).withPosOf(argsExp);
bodyExp = b.begin([bodyExp, b.callSymbol("return", [b.symbol("null")])]);
}
return if (countingLambda) {
CallExp(b.symbol("countingLambda"), [countVar, argsExp, bodyExp]);

5
src/kiss/SpecialForms.hx
View File

@@ -271,12 +271,15 @@ class SpecialForms {
block;
};
k.doc("lambda", 2, null, "(lambda [<argsNames...>] <body...>)");
k.doc("lambda", 2, null, "(lambda <optional :Void or :Null> [<argsNames...>] <body...>)");
map["lambda"] = (wholeExp:ReaderExp, args:Array<ReaderExp>, k:KissState) -> {
var returnsValue = switch (args[0].def) {
case TypedExp("Void", argNames):
args[0] = argNames;
false;
case TypedExp("Null", argNames):
args[0] = argNames;
true;
default:
true;
}