Skip to content

Commit 76af996

Browse files
committed
refactor apart transfromers
1 parent 53ef9fe commit 76af996

20 files changed

+2760
-2576
lines changed

moonscript/cmd/lint.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ do
6565
end
6666
end,
6767
lint_check_unused = function(self)
68+
do
69+
return
70+
end
6871
if not (self.lint_unused_names and next(self.lint_unused_names)) then
6972
return
7073
end

moonscript/cmd/lint.moon

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ class LinterBlock extends Block
105105
@parent\lint_mark_used name
106106

107107
lint_check_unused: =>
108+
do return
108109
return unless @lint_unused_names and next @lint_unused_names
109110

110111
names_by_position = {}

moonscript/parse.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ Num = Space * (Num / function(v)
2727
v
2828
}
2929
end)
30-
local Indent, Cut, ensure, extract_line, mark, pos, flatten_or_mark, is_assignable, check_assignable, format_assign, format_single_assign, sym, symx, simple_string, wrap_func_arg, join_chain, flatten_string_chain, wrap_decorator, check_lua_string, self_assign
30+
local Indent, Cut, ensure, extract_line, mark, pos, flatten_or_mark, is_assignable, check_assignable, format_assign, format_single_assign, sym, symx, simple_string, wrap_func_arg, join_chain, wrap_decorator, check_lua_string, self_assign
3131
do
3232
local _obj_0 = require("moonscript.parse.util")
33-
Indent, Cut, ensure, extract_line, mark, pos, flatten_or_mark, is_assignable, check_assignable, format_assign, format_single_assign, sym, symx, simple_string, wrap_func_arg, join_chain, flatten_string_chain, wrap_decorator, check_lua_string, self_assign = _obj_0.Indent, _obj_0.Cut, _obj_0.ensure, _obj_0.extract_line, _obj_0.mark, _obj_0.pos, _obj_0.flatten_or_mark, _obj_0.is_assignable, _obj_0.check_assignable, _obj_0.format_assign, _obj_0.format_single_assign, _obj_0.sym, _obj_0.symx, _obj_0.simple_string, _obj_0.wrap_func_arg, _obj_0.join_chain, _obj_0.flatten_string_chain, _obj_0.wrap_decorator, _obj_0.check_lua_string, _obj_0.self_assign
33+
Indent, Cut, ensure, extract_line, mark, pos, flatten_or_mark, is_assignable, check_assignable, format_assign, format_single_assign, sym, symx, simple_string, wrap_func_arg, join_chain, wrap_decorator, check_lua_string, self_assign = _obj_0.Indent, _obj_0.Cut, _obj_0.ensure, _obj_0.extract_line, _obj_0.mark, _obj_0.pos, _obj_0.flatten_or_mark, _obj_0.is_assignable, _obj_0.check_assignable, _obj_0.format_assign, _obj_0.format_single_assign, _obj_0.sym, _obj_0.symx, _obj_0.simple_string, _obj_0.wrap_func_arg, _obj_0.join_chain, _obj_0.wrap_decorator, _obj_0.check_lua_string, _obj_0.self_assign
3434
end
3535
local build_grammar = wrap_env(debug_grammar, function(root)
3636
local _indent = Stack(0)

moonscript/parse.moon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Num = Space * (Num / (v) -> {"number", v})
2929
:Indent, :Cut, :ensure, :extract_line, :mark, :pos, :flatten_or_mark,
3030
:is_assignable, :check_assignable, :format_assign, :format_single_assign,
3131
:sym, :symx, :simple_string, :wrap_func_arg, :join_chain,
32-
:flatten_string_chain, :wrap_decorator, :check_lua_string, :self_assign
32+
:wrap_decorator, :check_lua_string, :self_assign
3333
} = require "moonscript.parse.util"
3434

3535

moonscript/parse/util.lua

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -197,17 +197,6 @@ join_chain = function(callee, args)
197197
args
198198
}
199199
end
200-
local flatten_string_chain
201-
flatten_string_chain = function(str, chain, args)
202-
if not (chain) then
203-
return str
204-
end
205-
return flatten_chain({
206-
"chain",
207-
str,
208-
unpack(chain)
209-
}, args)
210-
end
211200
local wrap_decorator
212201
wrap_decorator = function(stm, dec)
213202
if not (dec) then
@@ -254,7 +243,6 @@ return {
254243
simple_string = simple_string,
255244
wrap_func_arg = wrap_func_arg,
256245
join_chain = join_chain,
257-
flatten_string_chain = flatten_string_chain,
258246
wrap_decorator = wrap_decorator,
259247
check_lua_string = check_lua_string,
260248
self_assign = self_assign

moonscript/parse/util.moon

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,6 @@ join_chain = (callee, args) ->
139139

140140
{"chain", callee, args}
141141

142-
flatten_string_chain = (str, chain, args) ->
143-
return str unless chain
144-
flatten_chain {"chain", str, unpack chain}, args
145-
146142
-- constructor for decorator node
147143
wrap_decorator = (stm, dec) ->
148144
return stm unless dec
@@ -157,5 +153,5 @@ self_assign = (name, pos) ->
157153

158154
{ :Indent, :Cut, :ensure, :extract_line, :mark, :pos, :flatten_or_mark,
159155
:is_assignable, :check_assignable, :format_assign, :format_single_assign,
160-
:sym, :symx, :simple_string, :wrap_func_arg, :join_chain,
161-
:flatten_string_chain, :wrap_decorator, :check_lua_string, :self_assign }
156+
:sym, :symx, :simple_string, :wrap_func_arg, :join_chain, :wrap_decorator,
157+
:check_lua_string, :self_assign }

0 commit comments

Comments
 (0)