From 12d52f743c47c9fcb244b3d6221a18057d0a9e48 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Wed, 13 Jun 2018 13:23:24 -0700 Subject: [PATCH] Simplifying code. --- nomsu_tree.lua | 115 ++++++++++++++++++++++++------------------------ nomsu_tree.moon | 47 ++++++-------------- 2 files changed, 72 insertions(+), 90 deletions(-) diff --git a/nomsu_tree.lua b/nomsu_tree.lua index 446da20..baec3ef 100644 --- a/nomsu_tree.lua +++ b/nomsu_tree.lua @@ -11,19 +11,40 @@ local AST = { } AST.is_syntax_tree = function(n) return type(n) == 'table' and getmetatable(n) and AST[n.type] == getmetatable(n) end -local Tree -Tree = function(name, methods) - local cls = methods or { } +local types = { + "Number", + "Var", + "Block", + "EscapedNomsu", + "Text", + "List", + "Dict", + "DictEntry", + "IndexChain", + "Action" +} +for _index_0 = 1, #types do + local name = types[_index_0] + local cls = { } do - cls.type = name cls.__class = cls + cls.__index = cls cls.__name = name + cls.type = name cls.is_instance = function(self, x) return getmetatable(x) == self end - cls.__index = cls cls.__tostring = function(self) - return tostring(self.name) .. "(#{table.concat([repr(v) for v in *@]), ', '})" + return tostring(self.name) .. "(" .. tostring(concat((function() + local _accum_0 = { } + local _len_0 = 1 + for _index_1 = 1, #self do + local v = self[_index_1] + _accum_0[_len_0] = repr(v) + _len_0 = _len_0 + 1 + end + return _accum_0 + end)(), ', ')) .. ")" end cls.map = function(self, fn) do @@ -32,26 +53,29 @@ Tree = function(name, methods) return replacement end end - local made_changes, new_vals = false, { } - for i, v in ipairs(self) do - if AST.is_syntax_tree(v) then - do - local replacement = v:map(fn) - if replacement then - if replacement ~= v then - made_changes = true - v = replacement - end - end - end + local replacements + do + local _accum_0 = { } + local _len_0 = 1 + for _index_1 = 1, #self do + local v = self[_index_1] + _accum_0[_len_0] = AST.is_syntax_tree(v) and v:map(fn) or nil + _len_0 = _len_0 + 1 end - new_vals[i] = v + replacements = _accum_0 end - if not (made_changes) then + if not (next(replacements)) then return self end - local replacement = getmetatable(self)(self.source, unpack(new_vals)) - return replacement + return (self.__class)(self.source, unpack((function() + local _accum_0 = { } + local _len_0 = 1 + for i, v in ipairs(self) do + _accum_0[_len_0] = replacements[i] or v + _len_0 = _len_0 + 1 + end + return _accum_0 + end)())) end end AST[name] = setmetatable(cls, { @@ -78,41 +102,18 @@ Tree = function(name, methods) end }) end -Tree("Number") -Tree("Var") -Tree("Block") -Tree("EscapedNomsu") -Tree("Text") -Tree("List") -Tree("Dict") -Tree("DictEntry") -Tree("IndexChain") -Tree("Action", { - __init = function(self) - local stub_bits - do - local _accum_0 = { } - local _len_0 = 1 - for _index_0 = 1, #self do - local a = self[_index_0] - _accum_0[_len_0] = type(a) == 'string' and a or '%' - _len_0 = _len_0 + 1 - end - stub_bits = _accum_0 +AST.Action.__init = function(self) + local stub_bits + do + local _accum_0 = { } + local _len_0 = 1 + for _index_0 = 1, #self do + local a = self[_index_0] + _accum_0[_len_0] = type(a) == 'string' and a or '%' + _len_0 = _len_0 + 1 end - self.stub = concat(stub_bits, " ") - end, - get_spec = function(self) - return concat((function() - local _accum_0 = { } - local _len_0 = 1 - for _index_0 = 1, #self do - local a = self[_index_0] - _accum_0[_len_0] = type(a) == "string" and a or "%" .. tostring(a[1]) - _len_0 = _len_0 + 1 - end - return _accum_0 - end)(), " ") + stub_bits = _accum_0 end -}) + self.stub = concat(stub_bits, " ") +end return AST diff --git a/nomsu_tree.moon b/nomsu_tree.moon index 89d51c4..b9bcdbd 100644 --- a/nomsu_tree.moon +++ b/nomsu_tree.moon @@ -8,29 +8,22 @@ AST = {} AST.is_syntax_tree = (n)-> type(n) == 'table' and getmetatable(n) and AST[n.type] == getmetatable(n) --- Helper method: -Tree = (name, methods)-> - cls = methods or {} +types = {"Number", "Var", "Block", "EscapedNomsu", "Text", "List", "Dict", "DictEntry", + "IndexChain", "Action"} +for name in *types + cls = {} with cls - .type = name .__class = cls - .__name = name - .is_instance = (x)=> getmetatable(x) == @ .__index = cls - .__tostring = => "#{@name}(#{table.concat([repr(v) for v in *@]), ', '})" + .__name = name + .type = name + .is_instance = (x)=> getmetatable(x) == @ + .__tostring = => "#{@name}(#{concat([repr(v) for v in *@], ', ')})" .map = (fn)=> if replacement = fn(@) then return replacement - made_changes, new_vals = false, {} - for i,v in ipairs @ - if AST.is_syntax_tree(v) - if replacement = v\map(fn) - if replacement ~= v - made_changes = true - v = replacement - new_vals[i] = v - return @ unless made_changes - replacement = getmetatable(self)(@source, unpack(new_vals)) - return replacement + replacements = [AST.is_syntax_tree(v) and v\map(fn) or nil for v in *@] + return @ unless next(replacements) + return (@__class)(@source, unpack([replacements[i] or v for i,v in ipairs(@)])) AST[name] = setmetatable cls, __tostring: => @name @@ -44,20 +37,8 @@ Tree = (name, methods)-> if inst.__init then inst\__init! return inst -Tree "Number" -Tree "Var" -Tree "Block" -Tree "EscapedNomsu" -Tree "Text" -Tree "List" -Tree "Dict" -Tree "DictEntry" -Tree "IndexChain" -Tree "Action", - __init: => - stub_bits = [type(a) == 'string' and a or '%' for a in *@] - @stub = concat stub_bits, " " - get_spec: => - concat [type(a) == "string" and a or "%#{a[1]}" for a in *@], " " +AST.Action.__init = => + stub_bits = [type(a) == 'string' and a or '%' for a in *@] + @stub = concat stub_bits, " " return AST