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

Tweaked code to not rely on moonscript.

Browse Source
This commit is contained in:
Bruce Hill 2018-01-27 16:39:56 -08:00
parent 90c56d3135
commit 855fe23439
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nomsu.lua
View File

@ -1563,8 +1563,14 @@ if arg then
err_hand = function(error_message) err_hand = function(error_message)
print(tostring(colored.red("ERROR:")) .. " " .. tostring(colored.bright(colored.yellow(colored.onred((error_message or "")))))) print(tostring(colored.red("ERROR:")) .. " " .. tostring(colored.bright(colored.yellow(colored.onred((error_message or ""))))))
print("stack traceback:") print("stack traceback:")
local to_lua local ok, to_lua = pcall(function()
to_lua = require("moonscript.base").to_lua return require('moonscript.base').to_lua
end)
if not ok then
to_lua = function()
return nil
end
end
local nomsu_file = io.open("nomsu.moon") local nomsu_file = io.open("nomsu.moon")
local nomsu_source = nomsu_file:read("*a") local nomsu_source = nomsu_file:read("*a")
local _, line_table = to_lua(nomsu_source) local _, line_table = to_lua(nomsu_source)
@ -1611,7 +1617,7 @@ if arg then
if calling_fn.istailcall and not name then if calling_fn.istailcall and not name then
name = "<tail call>" name = "<tail call>"
end end
if calling_fn.short_src == "./nomsu.moon" then if calling_fn.short_src == "./nomsu.moon" and line_table then
local char = line_table[calling_fn.currentline] local char = line_table[calling_fn.currentline]
local line_num = 1 local line_num = 1
for _ in nomsu_source:sub(1, char):gmatch("\n") do for _ in nomsu_source:sub(1, char):gmatch("\n") do

5
nomsu.moon
View File

@ -1006,7 +1006,8 @@ if arg
-- TODO: properly print out the calling site of nomsu code, not just the *called* code -- TODO: properly print out the calling site of nomsu code, not just the *called* code
import to_lua from require "moonscript.base" ok, to_lua = pcall -> require('moonscript.base').to_lua
if not ok then to_lua = -> nil
nomsu_file = io.open("nomsu.moon") nomsu_file = io.open("nomsu.moon")
nomsu_source = nomsu_file\read("*a") nomsu_source = nomsu_file\read("*a")
_, line_table = to_lua(nomsu_source) _, line_table = to_lua(nomsu_source)
@ -1038,7 +1039,7 @@ if arg
else else
if calling_fn.istailcall and not name if calling_fn.istailcall and not name
name = "<tail call>" name = "<tail call>"
if calling_fn.short_src == "./nomsu.moon" if calling_fn.short_src == "./nomsu.moon" and line_table
char = line_table[calling_fn.currentline] char = line_table[calling_fn.currentline]
line_num = 1 line_num = 1
for _ in nomsu_source\sub(1,char)\gmatch("\n") do line_num += 1 for _ in nomsu_source\sub(1,char)\gmatch("\n") do line_num += 1