[Lace 10/11] Ensure defines used in include are checked for existing

From: Daniel Silverstone <dsilvers(a)digital-scurf.org&gt; --- lib/lace/builtin.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/lace/builtin.lua b/lib/lace/builtin.lua index 5f32811..dfa4c04 100644 --- a/lib/lace/builtin.lua +++ b/lib/lace/builtin.lua @@ -409,6 +409,17 @@ function builtin.include(comp_context, cmd, file, ...) return err.error("No ruleset named for inclusion", {1}) end + -- Check the conditions are defined + comp_context._lace.defined = (comp_context._lace.defined or {}) + for i, dname in ipairs(conds) do + if dname:sub(1,1) == "!" then + dname = dname:sub(2) + end + if not comp_context._lace.defined[dname] then + return err.error("Undefined name used in include condition ("..dname..")", {i+1}) + end + end + local loader = compiler().internal_loader(comp_context) local real, content = loader(comp_context, file) -- 2.11.0