allow hollywoo readermacros to handle optional arguments

This commit is contained in:
2021-11-27 21:13:25 -07:00
parent 149d824b76
commit 4eb2a083a2

View File

@@ -344,6 +344,8 @@ class Helpers {
FieldExp(field, removeTypeAnnotations(innerExp)); FieldExp(field, removeTypeAnnotations(innerExp));
case KeyValueExp(keyExp, valueExp): case KeyValueExp(keyExp, valueExp):
KeyValueExp(removeTypeAnnotations(keyExp), removeTypeAnnotations(valueExp)); KeyValueExp(removeTypeAnnotations(keyExp), removeTypeAnnotations(valueExp));
case None:
None;
default: default:
throw CompileError.fromExp(exp, 'cannot remove type annotations'); throw CompileError.fromExp(exp, 'cannot remove type annotations');
}; };
@@ -404,6 +406,7 @@ class Helpers {
}); });
interp.variables.set("k", k.forMacroEval()); interp.variables.set("k", k.forMacroEval());
interp.variables.set("Macros", Macros); interp.variables.set("Macros", Macros);
interp.variables.set("Stream", Stream);
for (name => value in k.macroVars) { for (name => value in k.macroVars) {
interp.variables.set(name, value); interp.variables.set(name, value);
} }