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

Prelude.typeNameValue() for macros

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-07-07 15:34:48 -06:00
parent 5d1349241e
commit 9110dc4694
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/kiss/Kiss.hx
View File

@@ -121,6 +121,8 @@ class Kiss {
"fsMemoize" => Symbol("Prelude.fsMemoize"), "fsMemoize" => Symbol("Prelude.fsMemoize"),
"symbolName" => Symbol("Prelude.symbolName"), "symbolName" => Symbol("Prelude.symbolName"),
"symbolNameValue" => Symbol("Prelude.symbolNameValue"), "symbolNameValue" => Symbol("Prelude.symbolNameValue"),
"typeNameValue" => Symbol("Prelude.typeNameValue"),
"typeName" => Symbol("Prelude.typeNameValue"),
"symbol" => Symbol("Prelude.symbol"), "symbol" => Symbol("Prelude.symbol"),
"expList" => Symbol("Prelude.expList"), "expList" => Symbol("Prelude.expList"),
"map" => Symbol("Lambda.map"), "map" => Symbol("Lambda.map"),

13
src/kiss/Prelude.hx
View File

@@ -542,7 +542,7 @@ class Prelude {
return switch (s.def) { return switch (s.def) {
case Symbol(name): name; case Symbol(name): name;
case TypedExp(_, innerExp) if (allowTyped): symbolNameValue(innerExp, false); // Meta must always precede type annotation case TypedExp(_, innerExp) if (allowTyped): symbolNameValue(innerExp, false); // Meta must always precede type annotation
case MetaExp(_, innerExp) if (allowMeta): symbolNameValue(innerExp, allowTyped, false); // TODO will more than one meta on the same expression be necessary? case MetaExp(_, innerExp) if (allowMeta): symbolNameValue(innerExp, allowTyped, false); // TODO will more than one meta on the same expression ever be necessary?
default: default:
var allowed = "a plain symbol"; var allowed = "a plain symbol";
if (allowTyped) allowed += " or a :Typed symbol"; if (allowTyped) allowed += " or a :Typed symbol";
@@ -551,6 +551,17 @@ class Prelude {
}; };
} }
public static function typeNameValue(s:ReaderExp, allowMeta:Null<Bool> = false):String {
return switch (s.def) {
case TypedExp(type, _): type;
case MetaExp(_, innerExp) if (allowMeta): typeNameValue(innerExp, false); // TODO will more than one meta on the same expression ever be necessary?
default:
var allowed = "a :Typed symbol";
if (allowMeta) allowed += " or a &meta :Typed symbol";
throw expected(s, allowed);
};
}
public static function uuid() { public static function uuid() {
return Uuid.v4().toShort(); return Uuid.v4().toShort();
} }