diff options
| -rw-r--r-- | core.nom | 9 | ||||
| -rwxr-xr-x | nomsu.moon | 13 |
2 files changed, 15 insertions, 7 deletions
@@ -26,7 +26,11 @@ rule ["eval %code", "run %code"]: lua expr "compiler:run(vars.code)" macro "source code %code": - lua expr "compiler.utils.repr(vars.code.src, true)" + lua block ".." + |if vars.code.value.type ~= "Thunk" then + | compiler:error("'source code %' only takes code blocks, not "..vars.code.value.type) + |end + lua expr "compiler.utils.repr(vars.code.value.value.src, true)" rule "run file %filename": lua block ".." @@ -138,6 +142,9 @@ rule "%a == %b": rule "%a != %b": lua expr "((vars.a ~= vars.b) or not compiler.utils.equivalent(vars.a, vars.b))" +macro "repr %obj": + ".."|compiler.utils.repr(\%obj as lua expr\, true) + macro "say %str": ".."|compiler:writeln(compiler.utils.repr(\%str as lua expr\)) @@ -108,7 +108,7 @@ class NomsuCompiler if fn_info == nil @error "Attempt to call undefined function: #{fn_name}" if fn_info.is_macro - @error "Attempt to call macro at runtime: #{fn_name}" + @error "Attempt to call macro at runtime: #{fn_name}\nThis can be caused by using a macro in a function that is defined before the macro." unless @check_permission(fn_name) @error "You do not have the authority to call: #{fn_name}" table.insert @callstack, fn_name @@ -130,11 +130,11 @@ class NomsuCompiler return true return false - def: (spec, fn)=> + def: (spec, fn, src)=> if @debug @writeln "Defining rule: #{spec}" invocations,arg_names = @get_invocations spec - fn_info = {:fn, :arg_names, :invocations, is_macro:false} + fn_info = {:fn, :arg_names, :invocations, :src, is_macro:false} for invocation in *invocations @defs[invocation] = fn_info @@ -154,9 +154,9 @@ class NomsuCompiler arg_names[invocation] = _arg_names return invocations, arg_names - defmacro: (spec, lua_gen_fn)=> + defmacro: (spec, lua_gen_fn, src)=> invocations,arg_names = @get_invocations spec - fn_info = {fn:lua_gen_fn, :arg_names, :invocations, is_macro:true} + fn_info = {fn:lua_gen_fn, :arg_names, :invocations, :src, is_macro:true} for invocation in *invocations @defs[invocation] = fn_info @@ -167,6 +167,7 @@ class NomsuCompiler code, retval = @compile(text) if @debug @writeln "\nGENERATED LUA CODE:\n#{code}" + @writeln "\nPRODUCED RETURN VALUE:\n#{retval}" return retval serialize: (obj)=> @@ -192,7 +193,7 @@ class NomsuCompiler if not lua_thunk error("Failed to compile generated code:\n#{str}\n\n#{err}") return (lua_thunk!)(self, {}) - + parse: (str)=> if @debug @writeln("PARSING:\n#{str}") |