Skip to content

Commit 0425b13

Browse files
committedAug 11, 2021
refactor: 使用简洁的文件头
1 parent 368780f commit 0425b13

File tree

155 files changed

+8682
-13119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+8682
-13119
lines changed
 

‎!src-dist/tools/targetmon-format/convert.lua

+35-35
Original file line numberDiff line numberDiff line change
@@ -63,28 +63,28 @@ local function table_r(var, level, indent)
6363
local t = {}
6464
local szType = type(var)
6565
if szType == 'nil' then
66-
insert(t, 'nil')
66+
table.insert(t, 'nil')
6767
elseif szType == 'number' then
68-
insert(t, tostring(var))
68+
table.insert(t, tostring(var))
6969
elseif szType == 'string' then
70-
insert(t, string.format('%q', var))
70+
table.insert(t, string.format('%q', var))
7171
elseif szType == 'function' then
7272
local s = string.dump(var)
73-
insert(t, 'loadstring("')
73+
table.insert(t, 'loadstring("')
7474
-- 'string slice too long'
7575
for i = 1, #s, 2000 do
76-
insert(t, concat({'', byte(s, i, i + 2000 - 1)}, '\\'))
76+
table.insert(t, table.concat({'', string.byte(s, i, i + 2000 - 1)}, '\\'))
7777
end
78-
insert(t, '")')
78+
table.insert(t, '")')
7979
elseif szType == 'boolean' then
80-
insert(t, tostring(var))
80+
table.insert(t, tostring(var))
8181
elseif szType == 'table' then
82-
insert(t, '{')
82+
table.insert(t, '{')
8383
local s_tab_equ = '='
8484
if indent then
8585
s_tab_equ = ' = '
8686
if not empty(var) then
87-
insert(t, '\n')
87+
table.insert(t, '\n')
8888
end
8989
end
9090
local nohash = true
@@ -104,55 +104,55 @@ local function table_r(var, level, indent)
104104
-- process to insert to table
105105
if nohash then -- pure list table
106106
if indent then
107-
insert(t, rep(indent, level + 1))
107+
table.insert(t, string.rep(indent, level + 1))
108108
end
109-
insert(t, table_r(val, level + 1, indent))
110-
insert(t, ',')
109+
table.insert(t, table_r(val, level + 1, indent))
110+
table.insert(t, ',')
111111
if indent then
112-
insert(t, '\n')
112+
table.insert(t, '\n')
113113
end
114114
elseif type(key) == 'string' and key:find('^[a-zA-Z_][a-zA-Z0-9_]*$') then -- a = val
115115
if indent then
116-
insert(t, rep(indent, level + 1))
116+
table.insert(t, string.rep(indent, level + 1))
117117
end
118-
insert(t, key)
119-
insert(t, s_tab_equ) --' = '
120-
insert(t, table_r(val, level + 1, indent))
121-
insert(t, ',')
118+
table.insert(t, key)
119+
table.insert(t, s_tab_equ) --' = '
120+
table.insert(t, table_r(val, level + 1, indent))
121+
table.insert(t, ',')
122122
if indent then
123-
insert(t, '\n')
123+
table.insert(t, '\n')
124124
end
125125
else -- [10010] = val -- ['.start with or contains special char'] = val
126126
if indent then
127-
insert(t, rep(indent, level + 1))
127+
table.insert(t, string.rep(indent, level + 1))
128128
end
129-
insert(t, '[')
130-
insert(t, table_r(key, level + 1, indent))
131-
insert(t, ']')
132-
insert(t, s_tab_equ) --' = '
133-
insert(t, table_r(val, level + 1, indent))
134-
insert(t, ',')
129+
table.insert(t, '[')
130+
table.insert(t, table_r(key, level + 1, indent))
131+
table.insert(t, ']')
132+
table.insert(t, s_tab_equ) --' = '
133+
table.insert(t, table_r(val, level + 1, indent))
134+
table.insert(t, ',')
135135
if indent then
136-
insert(t, '\n')
136+
table.insert(t, '\n')
137137
end
138138
end
139139
lastkey, lastval = key, val
140140
end
141141
until not key
142142
if not empty(var) then
143143
if indent then -- insert `}` with indent
144-
insert(t, rep(indent, level))
144+
table.insert(t, string.rep(indent, level))
145145
else -- remove last comma when no indent
146-
remove(t)
146+
table.remove(t)
147147
end
148148
end
149-
insert(t, '}')
149+
table.insert(t, '}')
150150
else --if (szType == 'userdata') then
151-
insert(t, '"')
152-
insert(t, tostring(var))
153-
insert(t, '"')
151+
table.insert(t, '"')
152+
table.insert(t, tostring(var))
153+
table.insert(t, '"')
154154
end
155-
return concat(t)
155+
return table.concat(t)
156156
end
157157

158158
function var2str(var, indent, level)
@@ -185,7 +185,7 @@ function str2var(str, env)
185185
if bdata then
186186
datalist = {env.data}
187187
else
188-
remove(datalist, 1)
188+
table.remove(datalist, 1)
189189
end
190190
else
191191
Log('[CALL ERROR]str2var("' .. str .. '"): \nERROR:' .. datalist[2])

0 commit comments

Comments
 (0)
Please sign in to comment.