Skip to content

Commit 07c639a

Browse files
committed
remove reversed
1 parent ca21c21 commit 07c639a

File tree

6 files changed

+10
-31
lines changed

6 files changed

+10
-31
lines changed

moonscript/compile/statement.lua

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
local util = require("moonscript.util")
2-
local reversed, unpack
3-
reversed, unpack = util.reversed, util.unpack
41
local ntype
52
ntype = require("moonscript.types").ntype
63
local concat, insert

moonscript/compile/statement.moon

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11

2-
util = require "moonscript.util"
3-
4-
import reversed, unpack from util
52
import ntype from require "moonscript.types"
63
import concat, insert from table
74

moonscript/transform/comprehension.lua

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
local is_value
22
is_value = require("moonscript.types").is_value
3-
local reversed
4-
reversed = require("moonscript.util").reversed
53
local construct_comprehension
64
construct_comprehension = function(inner, clauses)
75
local current_stms = inner
8-
for _, clause in reversed(clauses) do
6+
for i = #clauses, 1, -1 do
7+
local clause = clauses[i]
98
local t = clause[1]
109
local _exp_0 = t
1110
if "for" == _exp_0 then
12-
local name, bounds
11+
local _, name, bounds
1312
_, name, bounds = clause[1], clause[2], clause[3]
1413
current_stms = {
1514
"for",
@@ -18,7 +17,7 @@ construct_comprehension = function(inner, clauses)
1817
current_stms
1918
}
2019
elseif "foreach" == _exp_0 then
21-
local names, iter
20+
local _, names, iter
2221
_, names, iter = clause[1], clause[2], clause[3]
2322
current_stms = {
2423
"foreach",
@@ -29,7 +28,7 @@ construct_comprehension = function(inner, clauses)
2928
current_stms
3029
}
3130
elseif "when" == _exp_0 then
32-
local cond
31+
local _, cond
3332
_, cond = clause[1], clause[2]
3433
current_stms = {
3534
"if",

moonscript/transform/comprehension.moon

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11

22
import is_value from require "moonscript.types"
33

4-
-- TODO: reversed unecessary
5-
import reversed from require "moonscript.util"
64
construct_comprehension = (inner, clauses) ->
75
current_stms = inner
8-
for _, clause in reversed clauses
6+
for i=#clauses,1,-1
7+
clause = clauses[i]
98
t = clause[1]
9+
1010
current_stms = switch t
1111
when "for"
1212
{_, name, bounds} = clause

moonscript/util.lua

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,6 @@ get_closest_line = function(str, line_num)
6060
return line, line_num
6161
end
6262
end
63-
local reversed
64-
reversed = function(seq)
65-
return coroutine.wrap(function()
66-
for i = #seq, 1, -1 do
67-
coroutine.yield(i, seq[i])
68-
end
69-
end)
70-
end
7163
local split
7264
split = function(str, delim)
7365
if str == "" then
@@ -209,7 +201,6 @@ return {
209201
pos_to_line = pos_to_line,
210202
get_closest_line = get_closest_line,
211203
get_line = get_line,
212-
reversed = reversed,
213204
trim = trim,
214205
split = split,
215206
dump = dump,

moonscript/util.moon

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ get_closest_line = (str, line_num) ->
4848
else
4949
line, line_num
5050

51-
reversed = (seq) ->
52-
coroutine.wrap ->
53-
for i=#seq,1,-1
54-
coroutine.yield i, seq[i]
55-
5651
split = (str, delim) ->
5752
return {} if str == ""
5853
str ..= delim
@@ -136,7 +131,7 @@ safe_module = (name, tbl) ->
136131
}
137132

138133
{
139-
:moon, :pos_to_line, :get_closest_line, :get_line, :reversed, :trim, :split,
140-
:dump, :debug_posmap, :getfenv, :setfenv, :get_options, :unpack, :safe_module
134+
:moon, :pos_to_line, :get_closest_line, :get_line, :trim, :split, :dump,
135+
:debug_posmap, :getfenv, :setfenv, :get_options, :unpack, :safe_module
141136
}
142137

0 commit comments

Comments
 (0)