Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for inequality assumptions and better error reporting for (assume

Browse Source 
$foo.$x) style index assumptions.
This commit is contained in:
Bruce Hill 2019-03-27 14:38:17 -07:00
parent dfda34254c
commit 91d1189890
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/core/errors.nom
View File

@ -16,6 +16,17 @@ use "core/control_flow"
") ")
(assume $condition) compiles to: (assume $condition) compiles to:
if ($condition.type == "IndexChain"):
return Lua ("
do -- Assumption:
local _thing, _key = \($condition.1 as lua expr), \($condition.2.1 as lua expr)
if not _thing[_key] then
_key = type_of(_key) == 'Text' and _key:as_lua() or _1_as_text(_key)
at_1_fail(\(quote "\($condition.source)"),
"Assumption failed: \($condition.1 as nomsu, text) does not have a value for ".._key..".")
end
end
")
if ($condition.type == "Action"): if ($condition.type == "Action"):
when $condition.stub is: when $condition.stub is:
"1 ==": "1 ==":
@ -47,7 +58,7 @@ use "core/control_flow"
return Lua (" return Lua ("
do -- Assumption: do -- Assumption:
local _a, _b = \($condition.1 as lua expr), \($condition.3 as lua expr) local _a, _b = \($condition.1 as lua expr), \($condition.3 as lua expr)
if _a ~= _b then if not (_a \($condition.2) _b) then
_a = type_of(_a) == 'Text' and _a:as_lua() or _1_as_text(_a) _a = type_of(_a) == 'Text' and _a:as_lua() or _1_as_text(_a)
_b = type_of(_b) == 'Text' and _b:as_lua() or _1_as_text(_b) _b = type_of(_b) == 'Text' and _b:as_lua() or _1_as_text(_b)
at_1_fail(\(quote "\($condition.1.source)"), at_1_fail(\(quote "\($condition.1.source)"),