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

Slight API tweaks.

Browse Source
This commit is contained in:
Bruce Hill 2018-09-28 18:35:37 -07:00
parent 258527750c
commit 7b127fca61
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
containers.lua
View File

@ -27,7 +27,7 @@ as_nomsu = function(self)
end end
end end
end end
return error("Not supported: " .. tostring(self)) return tostring(self)
end end
local as_lua local as_lua
as_lua = function(self) as_lua = function(self)
@ -45,7 +45,7 @@ as_lua = function(self)
end end
end end
end end
return error("Not supported: " .. tostring(self)) return tostring(self)
end end
local _list_mt = { local _list_mt = {
__type = "List", __type = "List",
@ -56,7 +56,7 @@ local _list_mt = {
local _len_0 = 1 local _len_0 = 1
for _index_0 = 1, #self do for _index_0 = 1, #self do
local b = self[_index_0] local b = self[_index_0]
_accum_0[_len_0] = tostring(b) _accum_0[_len_0] = as_nomsu(b)
_len_0 = _len_0 + 1 _len_0 = _len_0 + 1
end end
return _accum_0 return _accum_0
@ -194,7 +194,7 @@ local _list_mt = {
end end
return nil return nil
end, end,
slice_1_to_2 = function(self, start, stop) from_1_to_2 = function(self, start, stop)
local n = #self local n = #self
if n < 0 then if n < 0 then
start = (n + 1 - start) start = (n + 1 - start)
@ -240,7 +240,7 @@ local _dict_mt = {
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
_accum_0[_len_0] = tostring(tostring(k)) .. ": " .. tostring(tostring(v)) _accum_0[_len_0] = tostring(as_nomsu(k)) .. ": " .. tostring(as_nomsu(v))
_len_0 = _len_0 + 1 _len_0 = _len_0 + 1
end end
return _accum_0 return _accum_0

11
containers.moon
View File

@ -13,7 +13,7 @@ as_nomsu = =>
if mt = getmetatable(@) if mt = getmetatable(@)
if _as_nomsu = mt.as_nomsu if _as_nomsu = mt.as_nomsu
return _as_nomsu(@) return _as_nomsu(@)
error("Not supported: #{@}") return tostring(@)
as_lua = => as_lua = =>
if type(@) == 'number' if type(@) == 'number'
@ -21,16 +21,17 @@ as_lua = =>
if mt = getmetatable(@) if mt = getmetatable(@)
if _as_lua = mt.as_lua if _as_lua = mt.as_lua
return _as_lua(@) return _as_lua(@)
error("Not supported: #{@}") return tostring(@)
-- List and Dict classes to provide basic equality/tostring functionality for the tables -- List and Dict classes to provide basic equality/tostring functionality for the tables
-- used in Nomsu. This way, they retain a notion of whether they were originally lists or dicts. -- used in Nomsu. This way, they retain a notion of whether they were originally lists or dicts.
_list_mt = _list_mt =
__type: "List" __type: "List"
__eq:equivalent __eq:equivalent
-- Could consider adding a __newindex to enforce list-ness, but would hurt performance -- Could consider adding a __newindex to enforce list-ness, but would hurt performance
__tostring: => __tostring: =>
"["..concat([tostring(b) for b in *@], ", ").."]" "["..concat([as_nomsu(b) for b in *@], ", ").."]"
as_nomsu: => as_nomsu: =>
"["..concat([as_nomsu(b) for b in *@], ", ").."]" "["..concat([as_nomsu(b) for b in *@], ", ").."]"
as_lua: => as_lua: =>
@ -77,7 +78,7 @@ _list_mt =
if x == item if x == item
return i return i
return nil return nil
slice_1_to_2: (start, stop)=> from_1_to_2: (start, stop)=>
n = #@ n = #@
start = (n+1-start) if n < 0 start = (n+1-start) if n < 0
stop = (n+1-stop) if n < 0 stop = (n+1-stop) if n < 0
@ -101,7 +102,7 @@ _dict_mt =
__eq:equivalent __eq:equivalent
__len:size __len:size
__tostring: => __tostring: =>
"{"..concat(["#{tostring(k)}: #{tostring(v)}" for k,v in pairs @], ", ").."}" "{"..concat(["#{as_nomsu(k)}: #{as_nomsu(v)}" for k,v in pairs @], ", ").."}"
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: =>