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

Fix for error reporting not finding core files

Browse Source
This commit is contained in:
Bruce Hill 2019-03-22 14:37:50 -07:00
parent 7f30fb293f
commit f0f3c7e0bb
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -84,7 +84,7 @@ install: lua version optimize optimize_extra
fi; \ fi; \
version="`cat version`"; \ version="`cat version`"; \
mkdir -pv $$prefix/bin $$prefix/lib/nomsu/$$version $$prefix/share/nomsu/$$version $$prefix/share/man/man1 $$packagepath/nomsu \ mkdir -pv $$prefix/bin $$prefix/lib/nomsu/$$version $$prefix/share/nomsu/$$version $$prefix/share/man/man1 $$packagepath/nomsu \
&& echo "#!$(LUA_BIN)\\nlocal NOMSU_PREFIX, NOMSU_PACKAGEPATH = [[$$prefix]], [[$$packagepath/nomsu]]" \ && echo "#!$(LUA_BIN)\\nNOMSU_PREFIX, NOMSU_PACKAGEPATH = [[$$prefix]], [[$$packagepath/nomsu]]" \
| cat - nomsu.lua > $$prefix/bin/nomsu$$version \ | cat - nomsu.lua > $$prefix/bin/nomsu$$version \
&& chmod +x $$prefix/bin/nomsu$$version \ && chmod +x $$prefix/bin/nomsu$$version \
&& cp -v nomsu $$prefix/bin \ && cp -v nomsu $$prefix/bin \

9
nomsu_compiler.lua
View File

@ -36,6 +36,15 @@ fail_at = function(source, msg)
if source and not file then if source and not file then
file = Files.read(source.filename) file = Files.read(source.filename)
end end
if not file then
if NOMSU_PREFIX then
local path = tostring(NOMSU_PREFIX) .. "/share/nomsu/" .. tostring(table.concat(NOMSU_VERSION, ".")) .. "/" .. tostring(source.filename)
file = Files.read(path)
end
end
if not file then
error("Can't find file: " .. tostring(source.filename))
end
local title, err_msg, hint = msg:match("([^:]*):[ \n]+(.*)[ \n]+Hint: (.*)") local title, err_msg, hint = msg:match("([^:]*):[ \n]+(.*)[ \n]+Hint: (.*)")
if not err_msg then if not err_msg then
err_msg, hint = msg:match("(.*)[ \n]+Hint:[ \n]+(.*)") err_msg, hint = msg:match("(.*)[ \n]+Hint:[ \n]+(.*)")

6
nomsu_compiler.moon
View File

@ -30,6 +30,12 @@ fail_at = (source, msg)->
if source and not file if source and not file
file = Files.read(source.filename) file = Files.read(source.filename)
if not file
if NOMSU_PREFIX
path = "#{NOMSU_PREFIX}/share/nomsu/#{table.concat NOMSU_VERSION, "."}/#{source.filename}"
file = Files.read(path)
if not file
error("Can't find file: "..tostring(source.filename))
title, err_msg, hint = msg\match("([^:]*):[ \n]+(.*)[ \n]+Hint: (.*)") title, err_msg, hint = msg\match("([^:]*):[ \n]+(.*)[ \n]+Hint: (.*)")
if not err_msg if not err_msg