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

Allow &builder argument after &rest or &body argument

Browse Source
This commit is contained in:
Nat Quayle Nelson
2023-02-19 06:12:34 -07:00
parent 7fcfc19583
commit 0a6b1eb89f
1 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -437,46 +437,51 @@ class Macros {
var builderName:String = null;
for (arg in argList) {
if (restIndex != -1) {
throw KissError.fromExp(arg, "macros cannot declare arguments after a &rest or &body argument");
}
switch (arg.def) {
case Symbol(name):
argNames.push(name);
if (optIndex == -1) {
++minArgs;
macroCallForm += ' <$name>';
} else {
macroCallForm += ' <?$name>';
}
++maxArgs;
case MetaExp("builder", {pos: _, def: Symbol(name)}):
if (builderName == null) {
builderName = name;
} else {
throw KissError.fromExp(arg, 'Cannot declare multiple &builder args. Already declared: $builderName');
}
case MetaExp("opt", {pos: _, def: Symbol(name)}):
argNames.push(name);
macroCallForm += ' <?$name>';
optIndex = maxArgs;
++maxArgs;
case MetaExp("rest", {pos: _, def: Symbol(name)}):
if (name == "body") {
KissError.warnFromExp(arg, "Consider using &body instead of &rest when writing macros with bodies.");
}
argNames.push(name);
macroCallForm += ' <$name...>';
restIndex = maxArgs;
maxArgs = null;
case MetaExp("body", {pos: _, def: Symbol(name)}):
argNames.push(name);
macroCallForm += ' <$name...>';
restIndex = maxArgs;
requireRest = true;
maxArgs = null;
default:
throw KissError.fromExp(arg, "macro argument should be an untyped symbol or a symbol annotated with &opt or &rest or &builder");
if (restIndex != -1) {
throw KissError.fromExp(arg, "macros cannot declare arguments after a &rest or &body argument");
}
switch (arg.def) {
case Symbol(name):
argNames.push(name);
if (optIndex == -1) {
++minArgs;
macroCallForm += ' <$name>';
} else {
macroCallForm += ' <?$name>';
}
++maxArgs;
case MetaExp("opt", {pos: _, def: Symbol(name)}):
argNames.push(name);
macroCallForm += ' <?$name>';
optIndex = maxArgs;
++maxArgs;
case MetaExp("rest", {pos: _, def: Symbol(name)}):
if (name == "body") {
KissError.warnFromExp(arg, "Consider using &body instead of &rest when writing macros with bodies.");
}
argNames.push(name);
macroCallForm += ' <$name...>';
restIndex = maxArgs;
maxArgs = null;
case MetaExp("body", {pos: _, def: Symbol(name)}):
argNames.push(name);
macroCallForm += ' <$name...>';
restIndex = maxArgs;
requireRest = true;
maxArgs = null;
default:
throw KissError.fromExp(arg, "macro argument should be an untyped symbol or a symbol annotated with &opt, &rest, &body or &builder");
}
}
}