Skip to content

Commit 235a304

Browse files
sumnekosumneko
committed
cleanup
1 parent 3278c8c commit 235a304

File tree

6 files changed

+89
-52
lines changed

6 files changed

+89
-52
lines changed

‎script/vm/compiler.lua‎

Lines changed: 62 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ end
6666
local function searchFieldByLocalID(source, key, pushResult)
6767
local fields
6868
if key then
69-
fields = vm.getLocalSourcesSets(source, key)
69+
fields = vm.getLocalSets(source, key)
7070
else
7171
fields = vm.getLocalFields(source, false)
7272
end
@@ -1234,42 +1234,72 @@ local compilerSwitch = util.switch()
12341234
if key == nil then
12351235
return
12361236
end
1237-
if type(key) == 'table' then
1238-
---@cast key vm.node
1239-
local uri = guide.getUri(source)
1240-
local value = vm.getTableValue(uri, vm.compileNode(source.node), key)
1241-
if value then
1242-
vm.setNode(source, value)
1243-
end
1244-
for k in key:eachObject() do
1245-
if k.type == 'global' and k.cate == 'type' then
1246-
---@cast k vm.global
1247-
vm.compileByParentNode(source.node, k, function (src)
1248-
vm.setNode(source, vm.compileNode(src))
1249-
if src.value then
1250-
vm.setNode(source, vm.compileNode(src.value))
1251-
end
1252-
end)
1237+
1238+
---@type vm.node, boolean
1239+
local cacheNode, needCompile
1240+
1241+
do
1242+
local localInfo = vm.getLocalInfo(source)
1243+
if localInfo then
1244+
cacheNode = localInfo.node
1245+
if not cacheNode then
1246+
needCompile = true
1247+
cacheNode = vm.createNode()
1248+
localInfo.node = cacheNode
1249+
end
1250+
else
1251+
local parentNode = vm.compileNode(source.node)
1252+
if not parentNode.fields then
1253+
parentNode.fields = {}
1254+
end
1255+
cacheNode = parentNode.fields[key]
1256+
if not cacheNode then
1257+
needCompile = true
1258+
cacheNode = vm.createNode()
1259+
parentNode.fields[key] = cacheNode
12531260
end
12541261
end
1255-
else
1256-
---@cast key string
1257-
vm.compileByParentNode(source.node, key, function (src)
1258-
if src.value then
1259-
if bindDocs(src) then
1260-
vm.setNode(source, vm.compileNode(src))
1261-
elseif src.value.type ~= 'nil' then
1262-
vm.setNode(source, vm.compileNode(src.value))
1263-
local node = vm.getNode(src)
1264-
if node then
1265-
vm.setNode(source, node)
1266-
end
1262+
end
1263+
1264+
if needCompile then
1265+
if type(key) == 'table' then
1266+
---@cast key vm.node
1267+
local uri = guide.getUri(source)
1268+
local value = vm.getTableValue(uri, vm.compileNode(source.node), key)
1269+
if value then
1270+
cacheNode:merge(value)
1271+
end
1272+
for k in key:eachObject() do
1273+
if k.type == 'global' and k.cate == 'type' then
1274+
---@cast k vm.global
1275+
vm.compileByParentNode(source.node, k, function (src)
1276+
cacheNode:merge(vm.compileNode(src))
1277+
if src.value then
1278+
cacheNode:merge(vm.compileNode(src.value))
1279+
end
1280+
end)
12671281
end
1268-
else
1269-
vm.setNode(source, vm.compileNode(src))
12701282
end
1271-
end)
1283+
else
1284+
---@cast key string
1285+
vm.compileByParentNode(source.node, key, function (src)
1286+
if src.value then
1287+
if bindDocs(src) then
1288+
cacheNode:merge(vm.compileNode(src))
1289+
elseif src.value.type ~= 'nil' then
1290+
cacheNode:merge(vm.compileNode(src.value))
1291+
local node = vm.getNode(src)
1292+
if node then
1293+
cacheNode:merge(node)
1294+
end
1295+
end
1296+
else
1297+
cacheNode:merge(vm.compileNode(src))
1298+
end
1299+
end)
1300+
end
12721301
end
1302+
vm.setNode(source, cacheNode)
12731303
end)
12741304
: case 'setglobal'
12751305
: call(function (source)

‎script/vm/def.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ end
3333
---@param source parser.object
3434
---@param pushResult fun(src: parser.object)
3535
local function searchByLocalID(source, pushResult)
36-
local idSources = vm.getLocalSourcesSets(source)
36+
local idSources = vm.getLocalSets(source)
3737
if not idSources then
3838
return
3939
end

‎script/vm/local-id.lua‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@ local guide = require 'parser.guide'
33
---@class vm
44
local vm = require 'vm.vm'
55

6+
---@class vm.local
7+
---@field sets parser.object[]
8+
---@field gets parser.object[]
9+
---@field node? vm.node
10+
611
---@class parser.object
712
---@field package _localID string|false
8-
---@field package _localIDs table<string, { sets: parser.object[], gets: parser.object[] }>
13+
---@field package _localIDs table<string, vm.local>
914

1015
local compileLocalID, getLocal
1116

@@ -163,8 +168,8 @@ end
163168

164169
---@param source parser.object
165170
---@param key? string
166-
---@return parser.object[]?
167-
function vm.getLocalSourcesSets(source, key)
171+
---@return vm.local?
172+
function vm.getLocalInfo(source, key)
168173
local id = vm.getLocalID(source)
169174
if not id then
170175
return nil
@@ -179,28 +184,29 @@ function vm.getLocalSourcesSets(source, key)
179184
end
180185
id = id .. vm.ID_SPLITE .. key
181186
end
182-
return root._localIDs[id].sets
187+
return root._localIDs[id]
183188
end
184189

185190
---@param source parser.object
186191
---@param key? string
187192
---@return parser.object[]?
188-
function vm.getLocalSourcesGets(source, key)
189-
local id = vm.getLocalID(source)
190-
if not id then
193+
function vm.getLocalSets(source, key)
194+
local localInfo = vm.getLocalInfo(source, key)
195+
if not localInfo then
191196
return nil
192197
end
193-
local root = guide.getRoot(source)
194-
if not root._localIDs then
198+
return localInfo.sets
199+
end
200+
201+
---@param source parser.object
202+
---@param key? string
203+
---@return parser.object[]?
204+
function vm.getLocalGets(source, key)
205+
local localInfo = vm.getLocalInfo(source, key)
206+
if not localInfo then
195207
return nil
196208
end
197-
if key then
198-
if type(key) ~= 'string' then
199-
return nil
200-
end
201-
id = id .. vm.ID_SPLITE .. key
202-
end
203-
return root._localIDs[id].gets
209+
return localInfo.gets
204210
end
205211

206212
---@param source parser.object

‎script/vm/node.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ vm.nodeCache = setmetatable({}, util.MODE_K)
1414
---@class vm.node
1515
---@field [integer] vm.node.object
1616
---@field [vm.node.object] true
17+
---@field fields? table<vm.node|string, vm.node>
1718
local mt = {}
1819
mt.__index = mt
1920
mt.id = 0

‎script/vm/ref.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,13 +228,13 @@ end
228228
---@param source parser.object
229229
---@param pushResult fun(src: parser.object)
230230
local function searchByLocalID(source, pushResult)
231-
local sourceSets = vm.getLocalSourcesSets(source)
231+
local sourceSets = vm.getLocalSets(source)
232232
if sourceSets then
233233
for _, src in ipairs(sourceSets) do
234234
pushResult(src)
235235
end
236236
end
237-
local sourceGets = vm.getLocalSourcesGets(source)
237+
local sourceGets = vm.getLocalGets(source)
238238
if sourceGets then
239239
for _, src in ipairs(sourceGets) do
240240
pushResult(src)

‎script/vm/visible.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ end
7676
---@return vm.global?
7777
function vm.getDefinedClass(suri, source)
7878
source = guide.getSelfNode(source) or source
79-
local sets = vm.getLocalSourcesSets(source)
79+
local sets = vm.getLocalSets(source)
8080
if sets then
8181
for _, set in ipairs(sets) do
8282
if set.bindDocs then

0 commit comments

Comments
 (0)