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

Moved all the text method stuff into text.moon instead of splitting

Browse Source 
across string2/containers. Modified the type stuff to output better type
names and use (a Dict) and (a List) instead of (Dict) and (List). (Text)
now also has a proper constructor. (assume) now also handles a bunch of
different assumptions with smart error messages.
This commit is contained in:
Bruce Hill 2019-01-22 16:15:25 -08:00
parent a596195f6c
commit f746ba34d7
20 changed files with 173 additions and 604 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -13,10 +13,10 @@ UNINSTALL_VERSION=
MOON_FILES= code_obj.moon error_handling.moon files.moon nomsu.moon nomsu_compiler.moon \ MOON_FILES= code_obj.moon error_handling.moon files.moon nomsu.moon nomsu_compiler.moon \
syntax_tree.moon containers.moon bitops.moon parser.moon pretty_errors.moon \ syntax_tree.moon containers.moon bitops.moon parser.moon pretty_errors.moon \
string2.moon nomsu_decompiler.moon nomsu_environment.moon bootstrap.moon text.moon nomsu_decompiler.moon nomsu_environment.moon bootstrap.moon
LUA_FILES= code_obj.lua error_handling.lua files.lua nomsu.lua nomsu_compiler.lua \ LUA_FILES= code_obj.lua error_handling.lua files.lua nomsu.lua nomsu_compiler.lua \
syntax_tree.lua containers.lua bitops.lua parser.lua pretty_errors.lua \ syntax_tree.lua containers.lua bitops.lua parser.lua pretty_errors.lua \
string2.lua nomsu_decompiler.lua nomsu_environment.lua bootstrap.lua text.lua nomsu_decompiler.lua nomsu_environment.lua bootstrap.lua
CORE_NOM_FILES=$(shell cat lib/core/init.nom | sed -n 's;export "\(.*\)";lib/\1.nom;p') lib/core/init.nom CORE_NOM_FILES=$(shell cat lib/core/init.nom | sed -n 's;export "\(.*\)";lib/\1.nom;p') lib/core/init.nom
CORE_LUA_FILES= $(patsubst %.nom,%.lua, $(CORE_NOM_FILES)) CORE_LUA_FILES= $(patsubst %.nom,%.lua, $(CORE_NOM_FILES))
COMPAT_NOM_FILES=$(wildcard lib/compatibility/*.nom) COMPAT_NOM_FILES=$(wildcard lib/compatibility/*.nom)

2
README.md
View File

@ -60,8 +60,8 @@ All `.moon` files have been precompiled into corresponding `.lua` files, so you
* [error\_handling.moon](error_handling.moon) - The logic for producing good error messages within Lua that reference the Nomsu source code that led to them. * [error\_handling.moon](error_handling.moon) - The logic for producing good error messages within Lua that reference the Nomsu source code that led to them.
* [files.moon](files.moon) - A library for interacting with the filesystem. * [files.moon](files.moon) - A library for interacting with the filesystem.
* [pretty_errors.moon](pretty_errors.moon) - A simple library for displaying errors in a more visually pleasing/readable way. * [pretty_errors.moon](pretty_errors.moon) - A simple library for displaying errors in a more visually pleasing/readable way.
* [string2.moon](string2.moon) - A library defining some extra functionality for strings.
* [syntax\_tree.moon](syntax_tree.moon) - Datastructures used for Nomsu Abstract Syntax Trees. * [syntax\_tree.moon](syntax_tree.moon) - Datastructures used for Nomsu Abstract Syntax Trees.
* [text.moon](text.moon) - A library defining some extra functionality for strings.
* [examples/how\_do\_i.nom](examples/how_do_i.nom) - A simple walkthrough of some of the features of Nomsu, written in Nomsu code. **This is a good place to start.** * [examples/how\_do\_i.nom](examples/how_do_i.nom) - A simple walkthrough of some of the features of Nomsu, written in Nomsu code. **This is a good place to start.**
* [lib/\*/\*.nom](lib) - Language libraries, including the core language stuff like control flow, operators, and metaprogramming (in [lib/core](lib/core)) and optional language libraries for stuff you might want. * [lib/\*/\*.nom](lib) - Language libraries, including the core language stuff like control flow, operators, and metaprogramming (in [lib/core](lib/core)) and optional language libraries for stuff you might want.
* [lib/compatibility/\*.nom](compatibility) - Code for automatically upgrading Nomsu code from old versions to the current version. * [lib/compatibility/\*.nom](compatibility) - Code for automatically upgrading Nomsu code from old versions to the current version.

112
containers.lua
View File

@ -82,7 +82,7 @@ local _list_mt = {
end)(), ", ") .. "]" end)(), ", ") .. "]"
end, end,
as_lua = function(self) as_lua = function(self)
return "List{" .. concat((function() return "a_List{" .. concat((function()
local _accum_0 = { } local _accum_0 = { }
local _len_0 = 1 local _len_0 = 1
for _index_0 = 1, #self do for _index_0 = 1, #self do
@ -299,7 +299,7 @@ local _dict_mt = {
end)(), ", ") .. "}" end)(), ", ") .. "}"
end, end,
as_lua = function(self) as_lua = function(self)
return "Dict{" .. concat((function() return "a_Dict{" .. concat((function()
local _accum_0 = { } local _accum_0 = { }
local _len_0 = 1 local _len_0 = 1
for k, v in pairs(self) do for k, v in pairs(self) do
@ -408,114 +408,6 @@ Dict = function(t)
return error("Unsupported Dict type: " .. type(t)) return error("Unsupported Dict type: " .. type(t))
end end
end end
do
local reverse, upper, lower, find, byte, match, gmatch, gsub, sub, format, rep
do
local _obj_0 = string
reverse, upper, lower, find, byte, match, gmatch, gsub, sub, format, rep = _obj_0.reverse, _obj_0.upper, _obj_0.lower, _obj_0.find, _obj_0.byte, _obj_0.match, _obj_0.gmatch, _obj_0.gsub, _obj_0.sub, _obj_0.format, _obj_0.rep
end
local string2 = require('string2')
local lines, line, line_at, as_lua_id, is_lua_id
lines, line, line_at, as_lua_id, is_lua_id = string2.lines, string2.line, string2.line_at, string2.as_lua_id, string2.is_lua_id
local text_methods = {
formatted_with = format,
byte = byte,
position_of = (function(...)
return (find(...))
end),
position_of_1_after = (function(...)
return (find(...))
end),
as_a_lua_identifier = as_lua_id,
is_a_lua_identifier = is_lua_id,
as_a_lua_id = as_lua_id,
is_a_lua_id = is_lua_id,
bytes_1_to = function(self, start, stop)
return List({
byte(tostring(self), start, stop)
})
end,
[as_lua_id("with 1 ->")] = function(...)
return (gsub(...))
end,
bytes = function(self)
return List({
byte(tostring(self), 1, -1)
})
end,
lines = function(self)
return List(lines(self))
end,
line = line,
wrapped_to = function(self, maxlen)
local _lines = { }
local _list_0 = self:lines()
for _index_0 = 1, #_list_0 do
local line = _list_0[_index_0]
while #line > maxlen do
local chunk = line:sub(1, maxlen)
local split = chunk:find(' ', maxlen - 8) or maxlen
chunk = line:sub(1, split)
line = line:sub(split + 1, -1)
_lines[#_lines + 1] = chunk
end
_lines[#_lines + 1] = line
end
return table.concat(_lines, "\n")
end,
line_at = function(self, i)
return (line_at(self, i))
end,
line_number_at = function(self, i)
return select(2, line_at(self, i))
end,
line_position_at = function(self, i)
return select(3, line_at(self, i))
end,
matches = function(self, patt)
return match(self, patt) and true or false
end,
matching = function(self, patt)
return (match(self, patt))
end,
matching_groups = function(self, patt)
return List({
match(self, patt)
})
end,
[as_lua_id("* 1")] = function(self, n)
return rep(self, n)
end,
all_matches_of = function(self, patt)
local result = { }
local stepper, x, i = gmatch(self, patt)
while true do
local tmp = List({
stepper(x, i)
})
if #tmp == 0 then
break
end
i = tmp[1]
result[#result + 1] = (#tmp == 1) and tmp[1] or tmp
end
return List(result)
end,
from_1_to = sub,
from = sub,
character = function(self, i)
return sub(self, i, i)
end
}
setmetatable(text_methods, {
__index = string2
})
getmetatable("").__methods = text_methods
getmetatable("").__index = text_methods
getmetatable("").__add = function(self, x)
return tostring(self) .. tostring(x)
end
end
return { return {
List = List, List = List,
Dict = Dict Dict = Dict

55
containers.moon
View File

@ -37,7 +37,7 @@ _list_mt =
as_nomsu: => as_nomsu: =>
"["..concat([as_nomsu(b) for b in *@], ", ").."]" "["..concat([as_nomsu(b) for b in *@], ", ").."]"
as_lua: => as_lua: =>
"List{"..concat([as_lua(b) for b in *@], ", ").."}" "a_List{"..concat([as_lua(b) for b in *@], ", ").."}"
__lt: (other)=> __lt: (other)=>
assert type(@) == 'table' and type(other) == 'table', "Incompatible types for comparison" assert type(@) == 'table' and type(other) == 'table', "Incompatible types for comparison"
for i=1,math.max(#@, #other) for i=1,math.max(#@, #other)
@ -125,7 +125,7 @@ _dict_mt =
as_nomsu: => as_nomsu: =>
"{"..concat([".#{as_nomsu(k)} = #{as_nomsu(v)}" for k,v in pairs @], ", ").."}" "{"..concat([".#{as_nomsu(k)} = #{as_nomsu(v)}" for k,v in pairs @], ", ").."}"
as_lua: => as_lua: =>
"Dict{"..concat(["[ #{as_lua(k)}]= #{as_lua(v)}" for k,v in pairs @], ", ").."}" "a_Dict{"..concat(["[ #{as_lua(k)}]= #{as_lua(v)}" for k,v in pairs @], ", ").."}"
__band: (other)=> __band: (other)=>
Dict{k,v for k,v in pairs(@) when other[k] != nil} Dict{k,v for k,v in pairs(@) when other[k] != nil}
__bor: (other)=> __bor: (other)=>
@ -163,55 +163,4 @@ Dict = (t)->
return d return d
else error("Unsupported Dict type: "..type(t)) else error("Unsupported Dict type: "..type(t))
do
{:reverse, :upper, :lower, :find, :byte, :match, :gmatch, :gsub, :sub, :format, :rep} = string
string2 = require 'string2'
{:lines, :line, :line_at, :as_lua_id, :is_lua_id} = string2
text_methods =
formatted_with:format, byte:byte,
position_of:((...)->(find(...))), position_of_1_after:((...)->(find(...))),
as_a_lua_identifier: as_lua_id, is_a_lua_identifier: is_lua_id,
as_a_lua_id: as_lua_id, is_a_lua_id: is_lua_id,
bytes_1_to: (start, stop)=> List{byte(tostring(@), start, stop)}
[as_lua_id "with 1 ->"]: (...)-> (gsub(...))
bytes: => List{byte(tostring(@), 1, -1)},
lines: => List(lines(@))
line: line
wrapped_to: (maxlen)=>
_lines = {}
for line in *@lines!
while #line > maxlen
chunk = line\sub(1, maxlen)
split = chunk\find(' ', maxlen-8) or maxlen
chunk = line\sub(1, split)
line = line\sub(split+1, -1)
_lines[#_lines+1] = chunk
_lines[#_lines+1] = line
return table.concat(_lines, "\n")
line_at: (i)=> (line_at(@, i))
line_number_at: (i)=> select(2, line_at(@, i))
line_position_at: (i)=> select(3, line_at(@, i))
matches: (patt)=> match(@, patt) and true or false
matching: (patt)=> (match(@, patt))
matching_groups: (patt)=> List{match(@, patt)}
[as_lua_id "* 1"]: (n)=> rep(@, n)
all_matches_of: (patt)=>
result = {}
stepper,x,i = gmatch(@, patt)
while true
tmp = List{stepper(x,i)}
break if #tmp == 0
i = tmp[1]
result[#result+1] = (#tmp == 1) and tmp[1] or tmp
return List(result)
from_1_to: sub, from: sub,
character: (i)=> sub(@, i, i)
setmetatable(text_methods, {__index:string2})
getmetatable("").__methods = text_methods
getmetatable("").__index = text_methods
getmetatable("").__add = (x)=> tostring(@)..tostring(x)
return {:List, :Dict} return {:List, :Dict}

2
lib/compatibility/compatibility.nom
View File

@ -43,7 +43,7 @@ external:
($t is syntax tree): ($t is syntax tree):
$args = [] $args = []
for $k = $v in $t: for $k = $v in $t:
if ((type of $k) == "a number"): if ((type of $k) == "a Number"):
$args, add (make tree $v) $args, add (make tree $v)
..else: ..else:
$args, add "\($k)=\(make tree $v)" $args, add "\($k)=\(make tree $v)"

2
lib/core/control_flow.nom
View File

@ -485,7 +485,7 @@ test:
$lua = $lua =
Lua (" Lua ("
do do
local _stack_\($var as lua expr) = List{\($structure as lua expr)} local _stack_\($var as lua expr) = a_List{\($structure as lua expr)}
while #_stack_\($var as lua expr) > 0 do while #_stack_\($var as lua expr) > 0 do
\($var as lua expr) = table.remove(_stack_\($var as lua expr), 1) \($var as lua expr) = table.remove(_stack_\($var as lua expr), 1)
\($body as lua) \($body as lua)

74
lib/core/errors.nom
View File

@ -14,31 +14,67 @@ use "core/control_flow"
)) ))
") ")
(assume $condition) compiles to (" (assume $condition) compiles to:
if not \($condition as lua expr) then if ($condition.type == "Action"):
at_1_fail(\(quote "\($condition.source)"), "Assumption failed: This was not true.") when $condition.stub is:
end "1 ==":
") return
LuaCode ("
(assume $a == $b) compiles to ("
do do
local _a, _b = \($a as lua expr), \($b as lua expr) local _a, _b = \($condition.1 as lua expr), \($condition.3 as lua expr)
if _a ~= _b then if _a ~= _b then
at_1_fail(\(quote "\($a.source)"), _a = type_of(_a) == 'Text' and _a:as_lua() or tostring(_a)
"Assumption failed: This value was "..tostring(_a).." but it was expected to be "..tostring(_b)..".") _b = type_of(_b) == 'Text' and _b:as_lua() or tostring(_b)
at_1_fail(\(quote "\($condition.1.source)"),
"Assumption failed: This value was ".._a.." but it was expected to be ".._b..".")
end end
end end
") ")
"1 !=":
return
LuaCode ("
do
local _a, _b = \($condition.1 as lua expr), \($condition.3 as lua expr)
if _a == _b then
_a = type_of(_a) == 'Text' and _a:as_lua() or tostring(_a)
at_1_fail(\(quote "\($condition.1.source)"),
"Assumption failed: This value was ".._a.." but it wasn't expected to be.")
end
end
")
"1 >" "1 <" "1 >=" "1 <=":
return
LuaCode ("
do
local _a, _b = \($condition.1 as lua expr), \($condition.3 as lua expr)
if _a ~= _b then
_a = type_of(_a) == 'Text' and _a:as_lua() or tostring(_a)
_b = type_of(_b) == 'Text' and _b:as_lua() or tostring(_b)
at_1_fail(\(quote "\($condition.1.source)"),
"Assumption failed: This value was ".._a..", but it was expected to be \($condition.3)".._b..".")
end
end
")
"1 is":
return
LuaCode ("
do
local _ta, _tb = type_of(\($condition.1 as lua expr)), \($condition.3 as lua expr)
if _ta ~= _tb then
at_1_fail(\(quote "\($condition.1.source)"),
"Assumption failed: This value was ".._ta.." but it was expected to be ".._tb..".")
end
end
")
return
LuaCode ("
if not \($condition as lua expr) then
at_1_fail(\(quote "\($condition.source)"), "Assumption failed: This assumption did not hold.")
end
")
(assume $a != $b) compiles to (" (assume $a == $b) parses as (assume ($a == $b))
do (assume $a != $b) parses as (assume ($a != $b))
local _a, _b = \($a as lua expr), \($b as lua expr)
if _a == _b then
at_1_fail(\(quote "\($a.source)"),
"Assumption failed: This value was "..tostring(_a).." but it wasn't expected to be.")
end
end
")
test: test:
try: fail try: fail

34
lib/core/metaprogramming.nom
View File

@ -26,7 +26,8 @@ lua> ("
lua> (" lua> ("
COMPILE_RULES["1 ->"] = function(\(nomsu environment), _tree, \$args, \$body) COMPILE_RULES["1 ->"] = function(\(nomsu environment), _tree, \$args, \$body)
if \$args and not \$body then \$args, \$body = {}, \$args end if not \$args and not \$body then \$args, \$body = {}, SyntaxTree{type='Action', "do", "nothing"}
elseif \$args and not \$body then \$args, \$body = {}, \$args end
local body_lua = SyntaxTree:is_instance(\$body) and \(nomsu environment):compile(\$body) or \$body local body_lua = SyntaxTree:is_instance(\$body) and \(nomsu environment):compile(\$body) or \$body
if SyntaxTree:is_instance(\$body) and \$body.type ~= "Block" then body_lua:prepend("return ") end if SyntaxTree:is_instance(\$body) and \$body.type ~= "Block" then body_lua:prepend("return ") end
local lua = LuaCode("(function(") local lua = LuaCode("(function(")
@ -88,7 +89,7 @@ test:
lua> (" lua> ("
COMPILE_RULES["1 compiles to"] = function(\(nomsu environment), \(this tree), \$action, \$body) COMPILE_RULES["1 compiles to"] = function(\(nomsu environment), \(this tree), \$action, \$body)
local \$args = List{"\(nomsu environment)", "\(this tree)"} local \$args = a_List{"\(nomsu environment)", "\(this tree)"}
if \$body.type == "Text" then if \$body.type == "Text" then
\$body = SyntaxTree{source=\$body.source, type="Action", "Lua", \$body} \$body = SyntaxTree{source=\$body.source, type="Action", "Lua", \$body}
end end
@ -121,18 +122,18 @@ lua> ("
at_1_fail(\$actions, "Compile error: This should be a list of actions.") at_1_fail(\$actions, "Compile error: This should be a list of actions.")
end end
local lua = \(\($actions.1 compiles to $body) as lua) local lua = \(\($actions.1 compiles to $body) as lua)
local \$args = List{"\(nomsu environment)", "\(this tree)", unpack(\$actions[1]:get_args())} local \$args = a_List{"\(nomsu environment)", "\(this tree)", unpack(\$actions[1]:get_args())}
local \$compiled_args = List{"\(nomsu environment)", "\(this tree)"}; local \$compiled_args = a_List{"\(nomsu environment)", "\(this tree)"};
for i=3,#\$args do \$compiled_args[i] = \(nomsu environment):compile(\$args[i]) end for i=3,#\$args do \$compiled_args[i] = \(nomsu environment):compile(\$args[i]) end
for i=2,#\$actions do for i=2,#\$actions do
local alias = \$actions[i] local alias = \$actions[i]
local \$alias_args = List{"\(nomsu environment)", "\(this tree)", unpack(alias:get_args())} local \$alias_args = a_List{"\(nomsu environment)", "\(this tree)", unpack(alias:get_args())}
lua:add("\\nCOMPILE_RULES[", alias:get_stub():as_lua(), "] = ") lua:add("\\nCOMPILE_RULES[", alias:get_stub():as_lua(), "] = ")
if \$alias_args == \$args then if \$alias_args == \$args then
lua:add("COMPILE_RULES[", \$actions[1]:get_stub():as_lua(), "]") lua:add("COMPILE_RULES[", \$actions[1]:get_stub():as_lua(), "]")
else else
lua:add("function(") lua:add("function(")
local \$compiled_alias_args = List{"\(nomsu environment)", "\(this tree)"}; local \$compiled_alias_args = a_List{"\(nomsu environment)", "\(this tree)"};
for i=3,#\$alias_args do \$compiled_alias_args[i] = \(nomsu environment):compile(\$alias_args[i]) end for i=3,#\$alias_args do \$compiled_alias_args[i] = \(nomsu environment):compile(\$alias_args[i]) end
lua:concat_add(\$compiled_alias_args, ", ") lua:concat_add(\$compiled_alias_args, ", ")
lua:add(") return COMPILE_RULES[", \$actions[1]:get_stub():as_lua(), "](") lua:add(") return COMPILE_RULES[", \$actions[1]:get_stub():as_lua(), "](")
@ -183,10 +184,10 @@ test:
local first_def = (\$actions[1].type == "MethodCall" local first_def = (\$actions[1].type == "MethodCall"
and LuaCode(\(nomsu environment):compile(\$actions[1][1]), ".", \$actions[1]:get_stub():as_lua_id()) and LuaCode(\(nomsu environment):compile(\$actions[1][1]), ".", \$actions[1]:get_stub():as_lua_id())
or LuaCode(\$actions[1]:get_stub():as_lua_id())) or LuaCode(\$actions[1]:get_stub():as_lua_id()))
local \$args = List(\$actions[1]:get_args()) local \$args = a_List(\$actions[1]:get_args())
for i=2,#\$actions do for i=2,#\$actions do
local alias = \$actions[i] local alias = \$actions[i]
local \$alias_args = List(alias:get_args()) local \$alias_args = a_List(alias:get_args())
lua:add("\\n") lua:add("\\n")
if alias.type == "MethodCall" then if alias.type == "MethodCall" then
lua:add(\(nomsu environment):compile(alias[1]), ".", alias:get_stub():as_lua_id()) lua:add(\(nomsu environment):compile(alias[1]), ".", alias:get_stub():as_lua_id())
@ -392,10 +393,10 @@ external:
external: external:
(match $tree with $patt) means: (match $tree with $patt) means:
lua> (" lua> ("
if \$patt.type == "Var" then return Dict{[\$patt:as_var()]=\$tree} end if \$patt.type == "Var" then return a_Dict{[\$patt:as_var()]=\$tree} end
if \$patt.type == "Action" and \$patt:get_stub() ~= \$tree:get_stub() then return nil end if \$patt.type == "Action" and \$patt:get_stub() ~= \$tree:get_stub() then return nil end
if #\$patt ~= #\$tree then return nil end if #\$patt ~= #\$tree then return nil end
local matches = Dict{} local matches = a_Dict{}
for \($i)=1,#\$patt do for \($i)=1,#\$patt do
if SyntaxTree:is_instance(\$tree[\$i]) then if SyntaxTree:is_instance(\$tree[\$i]) then
local submatch = \(match $tree.$i with $patt.$i) local submatch = \(match $tree.$i with $patt.$i)
@ -425,6 +426,9 @@ test:
assume ({} is "a Dict") assume ({} is "a Dict")
assume ("" is text) assume ("" is text)
assume ("" is "Text") assume ("" is "Text")
assume (5 is "a Number")
assume ((->) is "an Action")
assume ((yes) is "a Boolean")
assume ("" isn't "a Dict") assume ("" isn't "a Dict")
external: external:
@ -432,14 +436,12 @@ external:
[$ is not text, $ isn't text] all mean (=lua "\(lua type of $) ~= 'string'") [$ is not text, $ isn't text] all mean (=lua "\(lua type of $) ~= 'string'")
(type of $) means: (type of $) means:
lua> (" lua> ("
local lua_type = \(lua type of $)
if lua_type == 'string' then return 'Text'
elseif lua_type == 'nil' then return 'nil'
elseif lua_type == 'table' or lua_type == 'userdata' then
local mt = getmetatable(\$) local mt = getmetatable(\$)
if mt and mt.__type then return mt.__type end if mt and mt.__type then return mt.__type end
end if \$ == nil then return 'nil' end
return 'a '..lua_type local lua_type = \(lua type of $)
if lua_type == 'function' then return "an Action" end
return 'a '..lua_type:capitalized()
") ")
($ is $type) parses as ((type of $) == $type) ($ is $type) parses as ((type of $) == $type)

2
lib/core/text.nom
View File

@ -46,7 +46,7 @@ test:
return return
Lua (" Lua ("
(function() (function()
local \(mangle "comprehension") = List{} local \(mangle "comprehension") = a_List{}
for \($match as lua expr) in (\($text as lua expr)):gmatch(\($patt as lua expr)) do for \($match as lua expr) in (\($text as lua expr)):gmatch(\($patt as lua expr)) do
\(mangle "comprehension")[#\(mangle "comprehension")+1] = \($expr as lua) \(mangle "comprehension")[#\(mangle "comprehension")+1] = \($expr as lua)
end end

81
lib/tools/tutorial.nom Normal file → Executable file
View File

@ -26,10 +26,10 @@ $lessons = [
# In Nomsu, variables have a "$" prefix, and you can just assign to them # In Nomsu, variables have a "$" prefix, and you can just assign to them
without declaring them first: without declaring them first:
$x = 10 $x = 10
assume $x == 10 assume ($x == 10)
# Variables which have not yet been set have the value (nil) # Variables which have not yet been set have the value (nil)
assume $foobar == (nil) assume ($foobar == (nil))
# Variables can be nameless: # Variables can be nameless:
$ = 99 $ = 99
@ -40,7 +40,7 @@ $lessons = [
# Figure out what value $my_var should have: # Figure out what value $my_var should have:
$my_var = 100 $my_var = 100
$my_var = ($my_var + $x + $(my favorite number)) $my_var = ($my_var + $x + $(my favorite number))
assume (???) == $my_var assume ($my_var == (???))
lesson "Actions": lesson "Actions":
# Fix this action so the tests pass, then save and quit. # Fix this action so the tests pass, then save and quit.
@ -48,8 +48,8 @@ $lessons = [
($x doubled) means ((???) * $x) ($x doubled) means ((???) * $x)
# Tests: # Tests:
assume (2 doubled) == 4 assume ((2 doubled) == 4)
assume (-5 doubled) == -10 assume ((-5 doubled) == -10)
lesson "Blocks": lesson "Blocks":
# When you need to do multiple things inside an action, use a block. # When you need to do multiple things inside an action, use a block.
@ -69,17 +69,17 @@ $lessons = [
# Make this action return "big" if its argument # Make this action return "big" if its argument
# is bigger than 99, otherwise return "small" # is bigger than 99, otherwise return "small"
(the size of $n) means: (the size of $n) means:
if (<your code here>): if (???):
<your code here> <your code here>
..else: ..else:
<your code here> <your code here>
# Tests: # Tests:
for $small_number in [0, 1, -5, -999, 99]: for $small_number in [0, 1, -5, -999, 99]:
assume (the size of $small_number) == "small" assume ((the size of $small_number) == "small")
for $big_number in [9999, 100]: for $big_number in [9999, 100]:
assume (the size of $big_number) == "big" assume ((the size of $big_number) == "big")
lesson "Loops": lesson "Loops":
# Fix this action so the tests pass: # Fix this action so the tests pass:
@ -92,14 +92,14 @@ $lessons = [
return $sum return $sum
# Tests: # Tests:
assume (the sum of [1, 2, 3, 4, 5]) == 15 assume ((the sum of [1, 2, 3, 4, 5]) == 15)
assume (the sum of [100, 200]) == 300 assume ((the sum of [100, 200]) == 300)
# You can also loop over a number range like this: # You can also loop over a number range like this:
$total = 0 $total = 0
for $i in 1 to 3: for $i in 1 to 3:
$total = ($total + $i) $total = ($total + $i)
assume (???) == $total assume ($total == (???))
lesson "Variable Scopes": lesson "Variable Scopes":
# Nomsu's variables are local by default, and actions have their own scopes: # Nomsu's variables are local by default, and actions have their own scopes:
@ -110,17 +110,17 @@ $lessons = [
(do something) means: (do something) means:
# The variable $y is never set in this action, so it has the same value # The variable $y is never set in this action, so it has the same value
it has outside this action. it has outside this action.
assume (???) == $y assume ($y == (???))
# $x is set inside this action, and actions have their own scopes. # $x is set inside this action, and actions have their own scopes.
$x = $y $x = $y
# What number should $x be here? # What number should $x be here?
assume (???) == $x assume ($x == (???))
# After running the action, what value should $x have? # After running the action, what value should $x have?
do something do something
assume (???) == $x assume ($x == (???))
lesson "More Variable Scopes": lesson "More Variable Scopes":
# Loops and conditionals do *not* have their own scopes: # Loops and conditionals do *not* have their own scopes:
@ -130,13 +130,13 @@ $lessons = [
$z = 2 $z = 2
# After assigning in a conditional, what should $z be? # After assigning in a conditional, what should $z be?
assume (???) == $z assume ($z == (???))
for $ in 1 to 1: for $ in 1 to 1:
# Set $z inside a loop: # Set $z inside a loop:
$z = 3 $z = 3
# After assigning in a loop, what should $z be? # After assigning in a loop, what should $z be?
assume (???) == $z assume ($z == (???))
lesson "Externals": lesson "Externals":
# The 'external' block lets you modify variables outside an action: # The 'external' block lets you modify variables outside an action:
@ -146,7 +146,7 @@ $lessons = [
do something do something
# After running the action that sets $x in an 'external' block, what should $x be? # After running the action that sets $x in an 'external' block, what should $x be?
assume (???) == $x assume ($x == (???))
lesson "Locals": lesson "Locals":
# The 'with' block lets you create a local scope for the variables you list: # The 'with' block lets you create a local scope for the variables you list:
@ -157,8 +157,8 @@ $lessons = [
$z = 2 $z = 2
# After setting $y and $z in the 'with [$y]' block, what should $y and $z be? # After setting $y and $z in the 'with [$y]' block, what should $y and $z be?
assume (???) == $y assume ($y == (???))
assume (???) == $z assume ($z == (???))
lesson "Failure and Recovery": lesson "Failure and Recovery":
$what_happened = "nothing" $what_happened = "nothing"
@ -172,7 +172,7 @@ $lessons = [
$what_happened = "success" $what_happened = "success"
# What do you think happened? # What do you think happened?
assume (???) == $what_happened assume ($what_happened == (???))
# Note: a 'try' block will silence failures, so this has no effect: # Note: a 'try' block will silence failures, so this has no effect:
try: fail try: fail
@ -180,11 +180,11 @@ $lessons = [
lesson "Indexing": lesson "Indexing":
# Nomsu uses the "." operator to access things inside an object: # Nomsu uses the "." operator to access things inside an object:
$dictionary = {.dog = "A lovable doofus", .cat = "An internet superstar"} $dictionary = {.dog = "A lovable doofus", .cat = "An internet superstar"}
assume $dictionary.dog == "A lovable doofus" assume ($dictionary.dog == "A lovable doofus")
assume (???) == $dictionary.cat assume ($dictionary.cat == (???))
# If you try to access a key that's not in an object, the result is (nil): # If you try to access a key that's not in an object, the result is (nil):
assume (???) == $dictionary.mimsy assume ($dictionary.mimsy == (???))
# $dictionary.dog is just a shorthand for $dictionary."dog". # $dictionary.dog is just a shorthand for $dictionary."dog".
You may need to use the longer form for strings with spaces: You may need to use the longer form for strings with spaces:
@ -195,22 +195,22 @@ $lessons = [
$dictionary.5 = "The number five" $dictionary.5 = "The number five"
$dictionary.five = 5 $dictionary.five = 5
$dictionary.myself = $dictionary $dictionary.myself = $dictionary
assume (???) == $dictionary.myself assume ($dictionary.myself == (???))
# Lists are similar, but use square brackets ([]) # Lists are similar, but use square brackets ([])
and can only have numbers as keys, starting at 1: and can only have numbers as keys, starting at 1:
$list = ["first", "second", 999] $list = ["first", "second", 999]
assume $list.1 == "first" assume ($list.1 == "first")
assume (???) == $list.2 assume ($list.2 == (???))
assume (???) == $list.3 assume ($list.3 == (???))
# Hint: 4 should be a missing key # Hint: 4 should be a missing key
assume (???) == $list.4 assume ($list.4 == (???))
assume (???) == $list.foobar assume ($list.foobar == (???))
# The "#" action gets the number of items inside something: # The "#" action gets the number of items inside something:
assume (???) == (#$list) assume ((#$list) == (???))
assume (???) == (#{.x = 10, .y = 20}) assume ((#{.x = 10, .y = 20}) == (???))
lesson "Methods": lesson "Methods":
# The "," is used for method calls, which means calling an action # The "," is used for method calls, which means calling an action
@ -218,17 +218,17 @@ $lessons = [
# Lists have an "add" method that puts new items at the end: # Lists have an "add" method that puts new items at the end:
$list = [-4, -6, 5] $list = [-4, -6, 5]
$list, add 3 $list, add 3
assume $list == [-4, -6, 5, 3] assume ($list == [-4, -6, 5, 3])
$list, add 7 $list, add 7
assume $list == [???] assume ($list == [???])
# Text also has some methods like: # Text also has some methods like:
$name = "Harry Tuttle" $name = "Harry Tuttle"
assume ($name, character 7) == "T" assume (($name, character 7) == "T")
assume (???) == ($name, with "Tuttle" -> "Buttle") assume (($name, with "Tuttle" -> "Buttle") == (???))
# Methods can be chained too: # Methods can be chained too:
assume (???) == ($name, with "Tuttle" -> "Buttle", character 7) assume (($name, with "Tuttle" -> "Buttle", character 7) == (???))
lesson "Object Oriented Programming": lesson "Object Oriented Programming":
# Object Oriented Programming deals with things that have # Object Oriented Programming deals with things that have
@ -244,17 +244,14 @@ $lessons = [
($self, add $bit) means: ($self, add $bit) means:
$bits, add $bit $bits, add $bit
($self, length) means: # Write a method called ($self, length) that returns the total
# Write some code that returns the total length of all length of all the bits in the buffer:
the bits on this buffer.
# Hint: the length operator (#$foo) works on text
<your code here> <your code here>
$b = (a Buffer) $b = (a Buffer)
$b, add "xx" $b, add "xx"
$b, add "yyy" $b, add "yyy"
assume ($b, length) == 5 assume (($b, length) == 5)
assume ($b, joined) == "xxyyy"
] ]
command line program with $args: command line program with $args:

5
nomsu.lua
View File

@ -39,11 +39,12 @@ do
local _obj_0 = require("code_obj") local _obj_0 = require("code_obj")
NomsuCode, LuaCode, Source = _obj_0.NomsuCode, _obj_0.LuaCode, _obj_0.Source NomsuCode, LuaCode, Source = _obj_0.NomsuCode, _obj_0.LuaCode, _obj_0.Source
end end
local List, Dict, Text local List, Dict
do do
local _obj_0 = require('containers') local _obj_0 = require('containers')
List, Dict, Text = _obj_0.List, _obj_0.Dict, _obj_0.Text List, Dict = _obj_0.List, _obj_0.Dict
end end
local Text = require('text')
local sep = "\3" local sep = "\3"
local parser = re.compile([[ args <- {| (flag %sep)* local parser = re.compile([[ args <- {| (flag %sep)*
{:files: {| {:files: {|

3
nomsu.moon
View File

@ -41,7 +41,8 @@ if not ok
os.exit(EXIT_FAILURE) os.exit(EXIT_FAILURE)
Files = require "files" Files = require "files"
{:NomsuCode, :LuaCode, :Source} = require "code_obj" {:NomsuCode, :LuaCode, :Source} = require "code_obj"
{:List, :Dict, :Text} = require 'containers' {:List, :Dict} = require 'containers'
Text = require 'text'
sep = "\3" sep = "\3"
parser = re.compile([[ parser = re.compile([[

16
nomsu_compiler.lua
View File

@ -1,8 +1,3 @@
local List, Dict, Text
do
local _obj_0 = require('containers')
List, Dict, Text = _obj_0.List, _obj_0.Dict, _obj_0.Text
end
local unpack = unpack or table.unpack local unpack = unpack or table.unpack
local match, sub, gsub, format, byte, find local match, sub, gsub, format, byte, find
do do
@ -232,7 +227,7 @@ compile = function(self, tree)
bit = bit[1] bit = bit[1]
end end
if bit.type == "Block" then if bit.type == "Block" then
bit_lua = LuaCode:from(bit.source, "List(function(add)", "\n ", bit_lua, "\nend):joined()") bit_lua = LuaCode:from(bit.source, "a_List(function(add)", "\n ", bit_lua, "\nend):joined()")
elseif bit.type ~= "Text" then elseif bit.type ~= "Text" then
bit_lua = LuaCode:from(bit.source, "tostring(", bit_lua, ")") bit_lua = LuaCode:from(bit.source, "tostring(", bit_lua, ")")
end end
@ -257,8 +252,9 @@ compile = function(self, tree)
end end
return lua return lua
elseif "List" == _exp_0 or "Dict" == _exp_0 then elseif "List" == _exp_0 or "Dict" == _exp_0 then
local typename = "a_" .. tree.type
if #tree == 0 then if #tree == 0 then
return LuaCode:from(tree.source, tree.type, "{}") return LuaCode:from(tree.source, typename, "{}")
end end
local lua = LuaCode:from(tree.source) local lua = LuaCode:from(tree.source)
local chunks = 0 local chunks = 0
@ -268,7 +264,7 @@ compile = function(self, tree)
if chunks > 0 then if chunks > 0 then
lua:add(" + ") lua:add(" + ")
end end
lua:add(tree.type, "(function(", (tree.type == 'List' and "add" or ("add, " .. ("add 1 ="):as_lua_id())), ")") lua:add(typename, "(function(", (tree.type == 'List' and "add" or ("add, " .. ("add 1 ="):as_lua_id())), ")")
lua:add("\n ", self:compile(tree[i]), "\nend)") lua:add("\n ", self:compile(tree[i]), "\nend)")
chunks = chunks + 1 chunks = chunks + 1
i = i + 1 i = i + 1
@ -301,9 +297,9 @@ compile = function(self, tree)
i = i + 1 i = i + 1
end end
if items_lua:is_multiline() then if items_lua:is_multiline() then
lua:add(LuaCode:from(items_lua.source, tree.type, "{\n ", items_lua, "\n}")) lua:add(LuaCode:from(items_lua.source, typename, "{\n ", items_lua, "\n}"))
else else
lua:add(LuaCode:from(items_lua.source, tree.type, "{", items_lua, "}")) lua:add(LuaCode:from(items_lua.source, typename, "{", items_lua, "}"))
end end
chunks = chunks + 1 chunks = chunks + 1
end end

12
nomsu_compiler.moon
View File

@ -1,7 +1,6 @@
-- --
-- This file contains the source code of the Nomsu compiler. -- This file contains the source code of the Nomsu compiler.
-- --
{:List, :Dict, :Text} = require 'containers'
unpack or= table.unpack unpack or= table.unpack
{:match, :sub, :gsub, :format, :byte, :find} = string {:match, :sub, :gsub, :format, :byte, :find} = string
{:LuaCode, :Source} = require "code_obj" {:LuaCode, :Source} = require "code_obj"
@ -180,7 +179,7 @@ compile = (tree)=>
if bit.type == "Block" and #bit == 1 if bit.type == "Block" and #bit == 1
bit = bit[1] bit = bit[1]
if bit.type == "Block" if bit.type == "Block"
bit_lua = LuaCode\from bit.source, "List(function(add)", bit_lua = LuaCode\from bit.source, "a_List(function(add)",
"\n ", bit_lua, "\n ", bit_lua,
"\nend):joined()" "\nend):joined()"
elseif bit.type != "Text" elseif bit.type != "Text"
@ -199,8 +198,9 @@ compile = (tree)=>
return lua return lua
when "List", "Dict" when "List", "Dict"
typename = "a_"..tree.type
if #tree == 0 if #tree == 0
return LuaCode\from tree.source, tree.type, "{}" return LuaCode\from tree.source, typename, "{}"
lua = LuaCode\from tree.source lua = LuaCode\from tree.source
chunks = 0 chunks = 0
@ -208,7 +208,7 @@ compile = (tree)=>
while tree[i] while tree[i]
if tree[i].type == 'Block' if tree[i].type == 'Block'
lua\add " + " if chunks > 0 lua\add " + " if chunks > 0
lua\add tree.type, "(function(", (tree.type == 'List' and "add" or ("add, "..("add 1 =")\as_lua_id!)), ")" lua\add typename, "(function(", (tree.type == 'List' and "add" or ("add, "..("add 1 =")\as_lua_id!)), ")"
lua\add "\n ", @compile(tree[i]), "\nend)" lua\add "\n ", @compile(tree[i]), "\nend)"
chunks += 1 chunks += 1
i += 1 i += 1
@ -234,9 +234,9 @@ compile = (tree)=>
sep = ', ' sep = ', '
i += 1 i += 1
if items_lua\is_multiline! if items_lua\is_multiline!
lua\add LuaCode\from items_lua.source, tree.type, "{\n ", items_lua, "\n}" lua\add LuaCode\from items_lua.source, typename, "{\n ", items_lua, "\n}"
else else
lua\add LuaCode\from items_lua.source, tree.type, "{", items_lua, "}" lua\add LuaCode\from items_lua.source, typename, "{", items_lua, "}"
chunks += 1 chunks += 1
return lua return lua

10
nomsu_environment.lua
View File

@ -3,11 +3,12 @@ do
local _obj_0 = require("code_obj") local _obj_0 = require("code_obj")
NomsuCode, LuaCode, Source = _obj_0.NomsuCode, _obj_0.LuaCode, _obj_0.Source NomsuCode, LuaCode, Source = _obj_0.NomsuCode, _obj_0.LuaCode, _obj_0.Source
end end
local List, Dict, Text local List, Dict
do do
local _obj_0 = require('containers') local _obj_0 = require('containers')
List, Dict, Text = _obj_0.List, _obj_0.Dict, _obj_0.Text List, Dict = _obj_0.List, _obj_0.Dict
end end
local Text = require('text')
local SyntaxTree = require("syntax_tree") local SyntaxTree = require("syntax_tree")
local Files = require("files") local Files = require("files")
local Errhand = require("error_handling") local Errhand = require("error_handling")
@ -121,8 +122,9 @@ nomsu_environment = Importer({
jit = jit, jit = jit,
_VERSION = _VERSION, _VERSION = _VERSION,
bit = (jit or _VERSION == "Lua 5.2") and require('bitops') or nil, bit = (jit or _VERSION == "Lua 5.2") and require('bitops') or nil,
List = List, a_List = List,
Dict = Dict, a_Dict = Dict,
Text = Text,
lpeg = lpeg, lpeg = lpeg,
re = re, re = re,
Files = Files, Files = Files,

5
nomsu_environment.moon
View File

@ -1,7 +1,8 @@
-- This file defines the environment in which Nomsu code runs, including some -- This file defines the environment in which Nomsu code runs, including some
-- basic bootstrapping functionality. -- basic bootstrapping functionality.
{:NomsuCode, :LuaCode, :Source} = require "code_obj" {:NomsuCode, :LuaCode, :Source} = require "code_obj"
{:List, :Dict, :Text} = require 'containers' {:List, :Dict} = require 'containers'
Text = require 'text'
SyntaxTree = require "syntax_tree" SyntaxTree = require "syntax_tree"
Files = require "files" Files = require "files"
Errhand = require "error_handling" Errhand = require "error_handling"
@ -55,7 +56,7 @@ nomsu_environment = Importer{
:pairs, :ipairs, :jit, :_VERSION :pairs, :ipairs, :jit, :_VERSION
bit: (jit or _VERSION == "Lua 5.2") and require('bitops') or nil bit: (jit or _VERSION == "Lua 5.2") and require('bitops') or nil
-- Nomsu types: -- Nomsu types:
List:List, Dict:Dict, a_List:List, a_Dict:Dict, Text:Text,
-- Utilities and misc. -- Utilities and misc.
lpeg:lpeg, re:re, Files:Files, lpeg:lpeg, re:re, Files:Files,
:SyntaxTree, TESTS: Dict({}), globals: Dict({}), :SyntaxTree, TESTS: Dict({}), globals: Dict({}),

17
pretty_errors.lua
View File

@ -1,5 +1,5 @@
require("containers") require("containers")
local string2 = require('string2') local Text = require('text')
local box local box
box = function(text) box = function(text)
local max_line = 0 local max_line = 0
@ -15,7 +15,7 @@ end
local format_error local format_error
format_error = function(err) format_error = function(err)
local context = err.context or 2 local context = err.context or 2
local err_line, err_linenum, err_linepos = string2.line_at(err.source, err.start) local err_line, err_linenum, err_linepos = err.source:line_info_at(err.start)
local err_size = math.min((err.stop - err.start), (#err_line - err_linepos) + 1) local err_size = math.min((err.stop - err.start), (#err_line - err_linepos) + 1)
local nl_indicator = (err_linepos > #err_line) and " " or "" local nl_indicator = (err_linepos > #err_line) and " " or ""
local fmt_str = " %" .. tostring(#tostring(err_linenum + context)) .. "d|" local fmt_str = " %" .. tostring(#tostring(err_linenum + context)) .. "d|"
@ -26,9 +26,10 @@ format_error = function(err)
pointer = (" "):rep(err_linepos + #fmt_str:format(0) - 1) .. "⬆" pointer = (" "):rep(err_linepos + #fmt_str:format(0) - 1) .. "⬆"
end end
local err_msg = "\027[33;41;1m" .. tostring(err.title or "Error") .. " at " .. tostring(err.filename or '???') .. ":" .. tostring(err_linenum) .. "," .. tostring(err_linepos) .. "\027[0m" local err_msg = "\027[33;41;1m" .. tostring(err.title or "Error") .. " at " .. tostring(err.filename or '???') .. ":" .. tostring(err_linenum) .. "," .. tostring(err_linepos) .. "\027[0m"
local lines = err.source:lines()
for i = err_linenum - context, err_linenum - 1 do for i = err_linenum - context, err_linenum - 1 do
do do
local line = string2.line(err.source, i) local line = lines[i]
if line then if line then
err_msg = err_msg .. "\n\027[2m" .. tostring(fmt_str:format(i)) .. "\027[0m" .. tostring(line) .. "\027[0m" err_msg = err_msg .. "\n\027[2m" .. tostring(fmt_str:format(i)) .. "\027[0m" .. tostring(line) .. "\027[0m"
end end
@ -41,14 +42,14 @@ format_error = function(err)
err_line = "\027[0m" .. tostring(before) .. "\027[41;30m" .. tostring(during) .. tostring(nl_indicator) .. "\027[0m" .. tostring(after) err_line = "\027[0m" .. tostring(before) .. "\027[41;30m" .. tostring(during) .. tostring(nl_indicator) .. "\027[0m" .. tostring(after)
err_msg = err_msg .. "\n\027[2m" .. tostring(fmt_str:format(err_linenum)) .. tostring(err_line) .. "\027[0m" err_msg = err_msg .. "\n\027[2m" .. tostring(fmt_str:format(err_linenum)) .. tostring(err_line) .. "\027[0m"
end end
local _, err_linenum_end, err_linepos_end = string2.line_at(err.source, err.stop) local _, err_linenum_end, err_linepos_end = err.source:line_info_at(err.stop)
err_linenum_end = err_linenum_end or err_linenum err_linenum_end = err_linenum_end or err_linenum
if err_linenum_end == err_linenum then if err_linenum_end == err_linenum then
err_msg = err_msg .. "\n" .. tostring(pointer) err_msg = err_msg .. "\n" .. tostring(pointer)
else else
for i = err_linenum + 1, err_linenum_end do for i = err_linenum + 1, err_linenum_end do
do do
local line = string2.line(err.source, i) local line = lines[i]
if line then if line then
if i == err_linenum_end then if i == err_linenum_end then
local during, after = line:sub(1, err_linepos_end - 1), line:sub(err_linepos_end, -1) local during, after = line:sub(1, err_linepos_end - 1), line:sub(err_linepos_end, -1)
@ -65,14 +66,14 @@ format_error = function(err)
end end
end end
local box_width = 70 local box_width = 70
local err_text = "\027[47;31;1m" .. tostring(string2.wrap(" " .. err.error, box_width, 16):gsub("\n", "\n\027[47;31;1m ")) local err_text = "\027[47;31;1m" .. tostring(" " .. err.error:wrapped_to(box_width, 16):gsub("\n", "\n\027[47;31;1m "))
if err.hint then if err.hint then
err_text = err_text .. "\n\027[47;30m" .. tostring(string2.wrap(" Suggestion: " .. tostring(err.hint), box_width, 16):gsub("\n", "\n\027[47;30m ")) err_text = err_text .. "\n\027[47;30m" .. tostring((" Suggestion: " .. tostring(err.hint)):wrapped_to(box_width, 16):gsub("\n", "\n\027[47;30m "))
end end
err_msg = err_msg .. ("\n\027[33;1m " .. box(err_text):gsub("\n", "\n ")) err_msg = err_msg .. ("\n\027[33;1m " .. box(err_text):gsub("\n", "\n "))
for i = err_linenum_end + 1, err_linenum_end + context do for i = err_linenum_end + 1, err_linenum_end + context do
do do
local line = string2.line(err.source, i) local line = lines[i]
if line then if line then
err_msg = err_msg .. "\n\027[2m" .. tostring(fmt_str:format(i)) .. "\027[0m" .. tostring(line) .. "\027[0m" err_msg = err_msg .. "\n\027[2m" .. tostring(fmt_str:format(i)) .. "\027[0m" .. tostring(line) .. "\027[0m"
end end

17
pretty_errors.moon
View File

@ -1,7 +1,7 @@
-- This file has code for converting errors to user-friendly format, with colors, -- This file has code for converting errors to user-friendly format, with colors,
-- line numbers, code excerpts, and so on. -- line numbers, code excerpts, and so on.
require "containers" require "containers"
string2 = require 'string2' Text = require 'text'
box = (text)-> box = (text)->
max_line = 0 max_line = 0
@ -14,7 +14,7 @@ box = (text)->
format_error = (err)-> format_error = (err)->
context = err.context or 2 context = err.context or 2
err_line, err_linenum, err_linepos = string2.line_at(err.source, err.start) err_line, err_linenum, err_linepos = err.source\line_info_at(err.start)
-- TODO: better handle multi-line errors -- TODO: better handle multi-line errors
err_size = math.min((err.stop - err.start), (#err_line-err_linepos) + 1) err_size = math.min((err.stop - err.start), (#err_line-err_linepos) + 1)
nl_indicator = (err_linepos > #err_line) and " " or "" nl_indicator = (err_linepos > #err_line) and " " or ""
@ -24,8 +24,9 @@ format_error = (err)->
else else
(" ")\rep(err_linepos+#fmt_str\format(0)-1).."⬆" (" ")\rep(err_linepos+#fmt_str\format(0)-1).."⬆"
err_msg = "\027[33;41;1m#{err.title or "Error"} at #{err.filename or '???'}:#{err_linenum},#{err_linepos}\027[0m" err_msg = "\027[33;41;1m#{err.title or "Error"} at #{err.filename or '???'}:#{err_linenum},#{err_linepos}\027[0m"
lines = err.source\lines!
for i=err_linenum-context,err_linenum-1 for i=err_linenum-context,err_linenum-1
if line = string2.line(err.source, i) if line = lines[i]
err_msg ..= "\n\027[2m#{fmt_str\format(i)}\027[0m#{line}\027[0m" err_msg ..= "\n\027[2m#{fmt_str\format(i)}\027[0m#{line}\027[0m"
if err_line if err_line
before = err_line\sub(1, err_linepos-1) before = err_line\sub(1, err_linepos-1)
@ -33,13 +34,13 @@ format_error = (err)->
after = err_line\sub(err_linepos+err_size, -1) after = err_line\sub(err_linepos+err_size, -1)
err_line = "\027[0m#{before}\027[41;30m#{during}#{nl_indicator}\027[0m#{after}" err_line = "\027[0m#{before}\027[41;30m#{during}#{nl_indicator}\027[0m#{after}"
err_msg ..= "\n\027[2m#{fmt_str\format(err_linenum)}#{err_line}\027[0m" err_msg ..= "\n\027[2m#{fmt_str\format(err_linenum)}#{err_line}\027[0m"
_, err_linenum_end, err_linepos_end = string2.line_at(err.source, err.stop) _, err_linenum_end, err_linepos_end = err.source\line_info_at(err.stop)
err_linenum_end or= err_linenum err_linenum_end or= err_linenum
if err_linenum_end == err_linenum if err_linenum_end == err_linenum
err_msg ..= "\n#{pointer}" err_msg ..= "\n#{pointer}"
else else
for i=err_linenum+1,err_linenum_end for i=err_linenum+1,err_linenum_end
if line = string2.line(err.source, i) if line = lines[i]
if i == err_linenum_end if i == err_linenum_end
during, after = line\sub(1,err_linepos_end-1), line\sub(err_linepos_end,-1) during, after = line\sub(1,err_linepos_end-1), line\sub(err_linepos_end,-1)
err_msg ..= "\n\027[2m#{fmt_str\format(i)}\027[0;41;30m#{during}\027[0m#{after}" err_msg ..= "\n\027[2m#{fmt_str\format(i)}\027[0;41;30m#{during}\027[0m#{after}"
@ -50,13 +51,13 @@ format_error = (err)->
break break
box_width = 70 box_width = 70
err_text = "\027[47;31;1m#{string2.wrap(" "..err.error, box_width, 16)\gsub("\n", "\n\027[47;31;1m ")}" err_text = "\027[47;31;1m#{" "..err.error\wrapped_to(box_width, 16)\gsub("\n", "\n\027[47;31;1m ")}"
if err.hint if err.hint
err_text ..= "\n\027[47;30m#{string2.wrap(" Suggestion: #{err.hint}", box_width, 16)\gsub("\n", "\n\027[47;30m ")}" err_text ..= "\n\027[47;30m#{(" Suggestion: #{err.hint}")\wrapped_to(box_width, 16)\gsub("\n", "\n\027[47;30m ")}"
err_msg ..= "\n\027[33;1m "..box(err_text)\gsub("\n", "\n ") err_msg ..= "\n\027[33;1m "..box(err_text)\gsub("\n", "\n ")
for i=err_linenum_end+1,err_linenum_end+context for i=err_linenum_end+1,err_linenum_end+context
if line = string2.line(err.source, i) if line = lines[i]
err_msg ..= "\n\027[2m#{fmt_str\format(i)}\027[0m#{line}\027[0m" err_msg ..= "\n\027[2m#{fmt_str\format(i)}\027[0m#{line}\027[0m"
return err_msg return err_msg

204
string2.lua
View File

@ -1,204 +0,0 @@
local reverse, upper, lower, find, byte, match, gmatch, gsub, sub, format, rep, char
do
local _obj_0 = string
reverse, upper, lower, find, byte, match, gmatch, gsub, sub, format, rep, char = _obj_0.reverse, _obj_0.upper, _obj_0.lower, _obj_0.find, _obj_0.byte, _obj_0.match, _obj_0.gmatch, _obj_0.gsub, _obj_0.sub, _obj_0.format, _obj_0.rep, _obj_0.char
end
local isplit
isplit = function(self, sep)
if sep == nil then
sep = '%s+'
end
local step
step = function(self, i)
local start = self.pos
if not (start) then
return
end
i = i + 1
local nl = find(self.str, self.sep, start)
self.pos = nl and (nl + 1) or nil
local line = sub(self.str, start, nl and (nl - 1) or #self.str)
return i, line, start, (nl and (nl - 1) or #self.str)
end
return step, {
str = self,
pos = 1,
sep = sep
}, 0
end
local lua_keywords = {
["and"] = true,
["break"] = true,
["do"] = true,
["else"] = true,
["elseif"] = true,
["end"] = true,
["false"] = true,
["for"] = true,
["function"] = true,
["goto"] = true,
["if"] = true,
["in"] = true,
["local"] = true,
["nil"] = true,
["not"] = true,
["or"] = true,
["repeat"] = true,
["return"] = true,
["then"] = true,
["true"] = true,
["until"] = true,
["while"] = true
}
local is_lua_id
is_lua_id = function(str)
return match(str, "^[_a-zA-Z][_a-zA-Z0-9]*$") and not lua_keywords[str]
end
local string2 = {
isplit = isplit,
uppercase = upper,
lowercase = lower,
reversed = reverse,
is_lua_id = is_lua_id,
capitalized = function(self)
return gsub(self, '%l', upper, 1)
end,
byte = byte,
bytes = function(self, i, j)
return {
byte(self, i or 1, j or -1)
}
end,
split = function(self, sep)
local _accum_0 = { }
local _len_0 = 1
for i, chunk in isplit(self, sep) do
_accum_0[_len_0] = chunk
_len_0 = _len_0 + 1
end
return _accum_0
end,
starts_with = function(self, s)
return sub(self, 1, #s) == s
end,
ends_with = function(self, s)
return #self >= #s and sub(self, #self - #s, -1) == s
end,
lines = function(self)
local _accum_0 = { }
local _len_0 = 1
for i, line in isplit(self, '\n') do
_accum_0[_len_0] = line
_len_0 = _len_0 + 1
end
return _accum_0
end,
line = function(self, line_num)
for i, line, start in isplit(self, '\n') do
if i == line_num then
return line
end
end
end,
line_at = function(self, pos)
assert(type(pos) == 'number', "Invalid string position")
for i, line, start, stop in isplit(self, '\n') do
if stop + 1 >= pos then
return line, i, (pos - start + 1)
end
end
end,
wrap = function(self, maxlen, buffer)
if maxlen == nil then
maxlen = 80
end
if buffer == nil then
buffer = 8
end
local lines = { }
local _list_0 = self:lines()
for _index_0 = 1, #_list_0 do
local line = _list_0[_index_0]
while #line > maxlen do
local chunk = sub(line, 1, maxlen)
local split = find(chunk, ' ', maxlen - buffer, true) or maxlen
chunk = sub(line, 1, split)
line = sub(line, split + 1, -1)
lines[#lines + 1] = chunk
end
lines[#lines + 1] = line
end
return table.concat(lines, "\n")
end,
indented = function(self, indent)
if indent == nil then
indent = " "
end
return indent .. (gsub(self, "\n", "\n" .. indent))
end,
as_lua = function(self)
local escaped = gsub(self, "\\", "\\\\")
escaped = gsub(escaped, "\n", "\\n")
escaped = gsub(escaped, '"', '\\"')
escaped = gsub(escaped, "[^ %g]", function(c)
return format("\\%03d", byte(c, 1))
end)
return '"' .. escaped .. '"'
end,
as_nomsu = function(self)
local escaped = gsub(self, "\\", "\\\\")
escaped = gsub(escaped, "\n", "\\n")
escaped = gsub(escaped, '"', '\\"')
escaped = gsub(escaped, "[^ %g]", function(c)
return format("\\%03d", byte(c, 1))
end)
return '"' .. escaped .. '"'
end,
as_lua_id = function(str)
str = gsub(str, "x([0-9A-F][0-9A-F])", "x78%1")
str = gsub(str, "%W", function(c)
if c == ' ' then
return '_'
else
return format("x%02X", byte(c))
end
end)
if not (is_lua_id(match(str, "^_*(.*)$"))) then
str = "_" .. str
end
return str
end,
from_lua_id = function(str)
if not (is_lua_id(match(str, "^_*(.*)$"))) then
str = sub(str, 2, -1)
end
str = gsub(str, "_", " ")
str = gsub(str, "x([0-9A-F][0-9A-F])", function(hex)
return char(tonumber(hex, 16))
end)
return str
end
}
for k, v in pairs(string) do
string2[k] = string2[k] or v
end
local _list_0 = {
"",
"_",
" ",
"return",
"asdf",
"one two",
"one_two",
"Hex2Dec",
"He-ec",
"\3"
}
for _index_0 = 1, #_list_0 do
local test = _list_0[_index_0]
local lua_id = string2.as_lua_id(test)
assert(is_lua_id(lua_id), "failed to convert '" .. tostring(test) .. "' to a valid Lua identifier (got '" .. tostring(lua_id) .. "')")
local roundtrip = string2.from_lua_id(lua_id)
assert(roundtrip == test, "Failed lua_id roundtrip: '" .. tostring(test) .. "' -> '" .. tostring(lua_id) .. "' -> '" .. tostring(roundtrip) .. "'")
end
return string2

106
string2.moon
View File

@ -1,106 +0,0 @@
-- Expand the capabilities of the built-in strings
{:reverse, :upper, :lower, :find, :byte, :match, :gmatch, :gsub, :sub, :format, :rep, :char} = string
isplit = (sep='%s+')=>
step = (i)=>
start = @pos
return unless start
i += 1
nl = find(@str, @sep, start)
@pos = nl and (nl+1) or nil
line = sub(@str, start, nl and (nl-1) or #@str)
return i, line, start, (nl and (nl-1) or #@str)
return step, {str:@, pos:1, :sep}, 0
lua_keywords = {
["and"]:true, ["break"]:true, ["do"]:true, ["else"]:true, ["elseif"]:true, ["end"]:true,
["false"]:true, ["for"]:true, ["function"]:true, ["goto"]:true, ["if"]:true,
["in"]:true, ["local"]:true, ["nil"]:true, ["not"]:true, ["or"]:true, ["repeat"]:true,
["return"]:true, ["then"]:true, ["true"]:true, ["until"]:true, ["while"]:true
}
is_lua_id = (str)->
match(str, "^[_a-zA-Z][_a-zA-Z0-9]*$") and not lua_keywords[str]
string2 = {
:isplit, uppercase:upper, lowercase:lower, reversed:reverse, :is_lua_id
capitalized: => gsub(@, '%l', upper, 1)
byte: byte, bytes: (i, j)=> {byte(@, i or 1, j or -1)}
split: (sep)=> [chunk for i,chunk in isplit(@, sep)]
starts_with: (s)=> sub(@, 1, #s) == s
ends_with: (s)=> #@ >= #s and sub(@, #@-#s, -1) == s
lines: => [line for i,line in isplit(@, '\n')]
line: (line_num)=>
for i, line, start in isplit(@, '\n')
return line if i == line_num
line_at: (pos)=>
assert(type(pos) == 'number', "Invalid string position")
for i, line, start, stop in isplit(@, '\n')
if stop+1 >= pos
return line, i, (pos-start+1)
wrap: (maxlen=80, buffer=8)=>
lines = {}
for line in *@lines!
while #line > maxlen
chunk = sub(line, 1, maxlen)
split = find(chunk, ' ', maxlen-buffer, true) or maxlen
chunk = sub(line, 1, split)
line = sub(line, split+1, -1)
lines[#lines+1] = chunk
lines[#lines+1] = line
return table.concat(lines, "\n")
indented: (indent=" ")=>
indent..(gsub(@, "\n", "\n"..indent))
as_lua: =>
escaped = gsub(@, "\\", "\\\\")
escaped = gsub(escaped, "\n", "\\n")
escaped = gsub(escaped, '"', '\\"')
escaped = gsub(escaped, "[^ %g]", (c)-> format("\\%03d", byte(c, 1)))
return '"'..escaped..'"'
as_nomsu: =>
escaped = gsub(@, "\\", "\\\\")
escaped = gsub(escaped, "\n", "\\n")
escaped = gsub(escaped, '"', '\\"')
escaped = gsub(escaped, "[^ %g]", (c)-> format("\\%03d", byte(c, 1)))
return '"'..escaped..'"'
-- Convert an arbitrary text into a valid Lua identifier. This function is injective,
-- but not idempotent. In logic terms: (x != y) => (as_lua_id(x) != as_lua_id(y)),
-- but not (as_lua_id(a) == b) => (as_lua_id(b) == b).
as_lua_id: (str)->
-- Escape 'x' (\x78) when it precedes something that looks like an uppercase hex sequence.
-- This way, all Lua IDs can be unambiguously reverse-engineered, but normal usage
-- of 'x' won't produce ugly Lua IDs.
-- i.e. "x" -> "x", "oxen" -> "oxen", but "Hex2Dec" -> "Hex782Dec" and "He-ec" -> "Hex2Dec"
str = gsub str, "x([0-9A-F][0-9A-F])", "x78%1"
-- Map spaces to underscores, and everything else non-alphanumeric to hex escape sequences
str = gsub str, "%W", (c)->
if c == ' ' then '_'
else format("x%02X", byte(c))
unless is_lua_id(match(str, "^_*(.*)$"))
str = "_"..str
return str
-- from_lua_id(as_lua_id(str)) == str, but behavior is unspecified for inputs that
-- did not come from as_lua_id()
from_lua_id: (str)->
unless is_lua_id(match(str, "^_*(.*)$"))
str = sub(str,2,-1)
str = gsub(str, "_", " ")
str = gsub(str, "x([0-9A-F][0-9A-F])", (hex)-> char(tonumber(hex, 16)))
return str
}
for k,v in pairs(string) do string2[k] or= v
for test in *{"", "_", " ", "return", "asdf", "one two", "one_two", "Hex2Dec", "He-ec", "\3"}
lua_id = string2.as_lua_id(test)
assert is_lua_id(lua_id), "failed to convert '#{test}' to a valid Lua identifier (got '#{lua_id}')"
roundtrip = string2.from_lua_id(lua_id)
assert roundtrip == test, "Failed lua_id roundtrip: '#{test}' -> '#{lua_id}' -> '#{roundtrip}'"
return string2