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

Some minor fixes for (type of $ast) and indexing codegen.

Browse Source
This commit is contained in:
Bruce Hill 2018-12-30 21:16:49 -08:00
parent 44c3fb26bf
commit 435eae7c0a
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nomsu_decompiler.lua
View File

@ -186,7 +186,7 @@ tree_to_inline_nomsu = function(tree)
elseif "IndexChain" == _exp_0 then elseif "IndexChain" == _exp_0 then
local nomsu = NomsuCode:from(tree.source) local nomsu = NomsuCode:from(tree.source)
for i, bit in ipairs(tree) do for i, bit in ipairs(tree) do
if i > 1 then if i > 1 and bit.type ~= "Index" then
nomsu:add(".") nomsu:add(".")
end end
local bit_nomsu local bit_nomsu

2
nomsu_decompiler.moon
View File

@ -139,7 +139,7 @@ tree_to_inline_nomsu = (tree)->
when "IndexChain" when "IndexChain"
nomsu = NomsuCode\from(tree.source) nomsu = NomsuCode\from(tree.source)
for i, bit in ipairs tree for i, bit in ipairs tree
nomsu\add "." if i > 1 nomsu\add "." if i > 1 and bit.type != "Index"
local bit_nomsu local bit_nomsu
bit_nomsu = if i > 1 and bit.type == "Text" and #bit == 1 and type(bit[1]) == 'string' and is_identifier(bit[1]) bit_nomsu = if i > 1 and bit.type == "Text" and #bit == 1 and type(bit[1]) == 'string' and is_identifier(bit[1])
bit[1] bit[1]

2
syntax_tree.lua
View File

@ -202,7 +202,6 @@ do
}) })
_base_0.__class = _class_0 _base_0.__class = _class_0
local self = _class_0 local self = _class_0
self.__type = "Syntax Tree"
self.source_code_for_tree = setmetatable({ }, { self.source_code_for_tree = setmetatable({ }, {
__index = function(self, t) __index = function(self, t)
local s = t.source local s = t.source
@ -217,6 +216,7 @@ do
end end
SyntaxTree = _class_0 SyntaxTree = _class_0
end end
SyntaxTree.__base.__type = "Syntax Tree"
getmetatable(SyntaxTree).__call = function(self, t) getmetatable(SyntaxTree).__call = function(self, t)
if type(t.source) == 'string' then if type(t.source) == 'string' then
t.source = Source:from_string(t.source) t.source = Source:from_string(t.source)

3
syntax_tree.moon
View File

@ -16,8 +16,6 @@ as_lua = =>
--types = {"Number", "Var", "Block", "EscapedNomsu", "Text", "List", "Dict", "DictEntry", --types = {"Number", "Var", "Block", "EscapedNomsu", "Text", "List", "Dict", "DictEntry",
-- "IndexChain", "Action", "FileChunks", "Error", "Comment"} -- "IndexChain", "Action", "FileChunks", "Error", "Comment"}
class SyntaxTree class SyntaxTree
@__type: "Syntax Tree"
__tostring: => __tostring: =>
bits = [type(b) == 'string' and b\as_lua! or tostring(b) for b in *@] bits = [type(b) == 'string' and b\as_lua! or tostring(b) for b in *@]
for k,v in pairs(@) for k,v in pairs(@)
@ -104,6 +102,7 @@ class SyntaxTree
@is_instance: (t)=> @is_instance: (t)=>
type(t) == 'table' and getmetatable(t) == @__base type(t) == 'table' and getmetatable(t) == @__base
SyntaxTree.__base.__type = "Syntax Tree"
getmetatable(SyntaxTree).__call = (t)=> getmetatable(SyntaxTree).__call = (t)=>
if type(t.source) == 'string' if type(t.source) == 'string'