move Helpers.argList to Prelude

This commit is contained in:
2024-12-12 20:54:48 -06:00
parent 35471dc318
commit 22c8ce4247
2 changed files with 20 additions and 16 deletions

View File

@@ -698,22 +698,7 @@ class Helpers {
}
public static function argList(exp:ReaderExp, forThis:String, allowEmpty = true):Array<ReaderExp> {
return switch (exp.def) {
// At macro-time, a list of exps could be passed instead of a ListExp. Handle
// that tricky case:
case null if (Std.isOfType(exp, Array)):
var expList = cast(exp, Array<Dynamic>);
var expDynamic:Dynamic = exp;
argList({pos:expList[0].pos, def: ListExp(expDynamic)}, forThis, allowEmpty);
case ListExp([]) if (allowEmpty):
[];
case ListExp([]) if (!allowEmpty):
throw KissError.fromExp(exp, 'arg list for $forThis must not be empty');
case ListExp(argExps):
argExps;
default:
throw KissError.fromExp(exp, '$forThis arg list should be a list or list expression');
};
return Prelude.argList(exp, forThis, allowEmpty);
}
public static function bindingList(exp:ReaderExp, forThis:String, allowEmpty = false):Array<ReaderExp> {

View File

@@ -554,6 +554,25 @@ class Prelude {
};
}
public static function argList(exp:ReaderExp, forThis:String, allowEmpty = true):Array<ReaderExp> {
return switch (exp.def) {
// At macro-time, a list of exps could be passed instead of a ListExp. Handle
// that tricky case:
case null if (Std.isOfType(exp, Array)):
var expList = cast(exp, Array<Dynamic>);
var expDynamic:Dynamic = exp;
argList({pos:expList[0].pos, def: ListExp(expDynamic)}, forThis, allowEmpty);
case ListExp([]) if (allowEmpty):
[];
case ListExp([]) if (!allowEmpty):
throw KissError.fromExp(exp, 'arg list for $forThis must not be empty');
case ListExp(argExps):
argExps;
default:
throw KissError.fromExp(exp, '$forThis arg list should be a list or list expression');
};
}
public static function symbolNameValue(s:ReaderExp, allowTyped:Null<Bool> = false, allowMeta:Null<Bool> = false):String {
return switch (s.def) {
case Symbol(name): name;