Allow sub sub defines

5 files changed, 31 insertions, 0 deletions

diff --git a/test/test-lace.compile-subdefine2.rules b/test/test-lace.compile-subdefine2.rules
new file mode 100644
index 0000000..a753015
--- /dev/null
+++ b/test/test-lace.compile-subdefine2.rules
@@ -0,0 +1 @@
+allow "OK" {anyof {equal user daniel} {equal user geoff}}
diff --git a/test/test-lace.compiler.lua b/test/test-lace.compiler.lua
index 28d68e6..d6a26a2 100644
--- a/test/test-lace.compiler.lua
+++ b/test/test-lace.compiler.lua
@@ -393,6 +393,11 @@ function suite.okay_subdefine()
    assert(result, msg)
 end
 
+function suite.okay_nested_subdefine()
+   local result, msg = compiler.compile(comp_context, "subdefine2")
+   assert(result, msg)
+end
+
 local count_ok = 0
 for _, testname in ipairs(testnames) do
 --   print("Run: " .. testname)
diff --git a/test/test-lace.engine-subsubdefine-error.rules b/test/test-lace.engine-subsubdefine-error.rules
new file mode 100644
index 0000000..78022af
--- /dev/null
+++ b/test/test-lace.engine-subsubdefine-error.rules
@@ -0,0 +1 @@
+allow "FAIL" {anyof {equal jeff banana} {error}}
diff --git a/test/test-lace.engine-subsubdefine-works.rules b/test/test-lace.engine-subsubdefine-works.rules
new file mode 100644
index 0000000..1fd3ee8
--- /dev/null
+++ b/test/test-lace.engine-subsubdefine-works.rules
@@ -0,0 +1 @@
+allow "PASS" {anyof {equal jeff harry} {equal jeff geoff}}
diff --git a/test/test-lace.engine.lua b/test/test-lace.engine.lua
index b3c38fd..e8721fc 100644
--- a/test/test-lace.engine.lua
+++ b/test/test-lace.engine.lua
@@ -266,6 +266,29 @@ function suite.subdefine_err_reported()
    assert(line4 == "            ^^^^^^^", "The fourth line highlights relevant words")
 end
 
+function suite.subsubdefine_works()
+   local ruleset, msg = lace.compiler.compile(comp_context, "subsubdefine-works")
+   assert(type(ruleset) == "table", "Ruleset did not compile")
+   local ectx = {jeff = "geoff"}
+   local result, msg = lace.engine.run(ruleset, ectx)
+   assert(result, msg)
+   assert(result == "allow", "Result should be allow")
+   assert(msg == "PASS", "Message should be pass")
+end
+
+function suite.subsubdefine_err_reported()
+   local ruleset, msg = lace.compiler.compile(comp_context, "subsubdefine-error")
+   assert(type(ruleset) == "table", "Ruleset did not compile")
+   local ectx = {error = true}
+   local result, msg = lace.engine.run(ruleset, ectx)
+   assert(result == false, "Did not error out")
+   local line1, line2, line3, line4 = msg:match("^([^\n]*)\n([^\n]*)\n([^\n]*)\n([^\n]*)$")
+   assert(line1 == "woah", "The first line must mention the error")
+   assert(line2 == "real-subsubdefine-error :: 1", "The second line is where the error happened")
+   assert(line3 == 'allow "FAIL" {anyof {equal jeff banana} {error}}', "The third line is the original line")
+   assert(line4 == "             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^", "The fourth line highlights relevant words")
+end
+
 local count_ok = 0
 for _, testname in ipairs(testnames) do
 --   print("Run: " .. testname)