Skip to content

Commit 10b09d2

Browse files
committed
remove unnecessary diff
1 parent d74fae4 commit 10b09d2

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

script/vm/type.lua

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ end
148148
---@param mark table
149149
---@param errs? typecheck.err[]
150150
---@return boolean?
151-
local function checkChildEnum(childName, parent , uri, mark, errs)
151+
local function checkChildEnum(childName, parent, uri, mark, errs)
152152
if mark[childName] then
153153
return
154154
end
@@ -168,7 +168,7 @@ local function checkChildEnum(childName, parent , uri, mark, errs)
168168
end
169169
mark[childName] = true
170170
for _, enum in ipairs(enums) do
171-
if not vm.isSubType(uri, vm.compileNode(enum), parent, mark ,errs) then
171+
if not vm.isSubType(uri, vm.compileNode(enum), parent, mark, errs) then
172172
mark[childName] = nil
173173
return false
174174
end
@@ -328,7 +328,7 @@ function vm.isSubType(uri, child, parent, mark, errs)
328328
for n in child:eachObject() do
329329
local nodeName = vm.getNodeName(n)
330330
if nodeName
331-
and not (nodeName == 'nil' and weakNil)
331+
and not (nodeName == 'nil' and weakNil)
332332
and vm.isSubType(uri, n, parent, mark, errs) == false then
333333
if errs then
334334
errs[#errs+1] = 'TYPE_ERROR_UNION_DISMATCH'
@@ -463,7 +463,6 @@ function vm.isSubType(uri, child, parent, mark, errs)
463463
return true
464464
end
465465
if childName == 'table' and not guide.isBasicType(parentName) then
466-
-------------------------------------------------------------------------
467466
local requiresKeys = {}
468467
local t = parent
469468
local set = {}
@@ -475,14 +474,14 @@ function vm.isSubType(uri, child, parent, mark, errs)
475474
end)
476475

477476
for i, field in ipairs(set) do
478-
local key = vm.getKeyName(field)
479-
local node = vm.compileNode(field)
480-
if key and not requiresKeys[key] then
481-
requiresKeys[key] = node
477+
local key = vm.getKeyName(field)
478+
local node = vm.compileNode(field)
479+
if key and not requiresKeys[key] then
480+
requiresKeys[key] = node
482481
end
483482
end
484-
if #requiresKeys == 0 then
485-
return --true
483+
if not next(requiresKeys) then
484+
return true
486485
end
487486
local refkey = {}
488487
for _, field in ipairs(child) do
@@ -495,16 +494,15 @@ function vm.isSubType(uri, child, parent, mark, errs)
495494
local ok
496495
for key, node in pairs(requiresKeys) do
497496
if refkey[key] then
498-
ok = vm.isSubType(uri, refkey[key], requiresKeys[key], mark, errs)
497+
ok = vm.isSubType(uri, refkey[key], requiresKeys[key], mark, errs)
499498
elseif not node:isNullable() then
500499
return false
501500
end
502501
if not ok then
503502
return false
504503
end
505504
end
506-
507-
-------------------------------
505+
508506
return true
509507
end
510508

@@ -612,11 +610,11 @@ function vm.getTableValue(uri, tnode, knode, inversion)
612610
and field.value
613611
and field.tindex == 1 then
614612
if inversion then
615-
if vm.isSubType(uri, 'integer', knode) then
613+
if vm.isSubType(uri, 'integer', knode) then
616614
result:merge(vm.compileNode(field.value))
617615
end
618616
else
619-
if vm.isSubType(uri, knode, 'integer') then
617+
if vm.isSubType(uri, knode, 'integer') then
620618
result:merge(vm.compileNode(field.value))
621619
end
622620
end
@@ -796,7 +794,7 @@ function vm.viewTypeErrorMessage(uri, errs)
796794
lparams[paramName] = vm.viewKey(value, uri)
797795
else
798796
lparams[paramName] = vm.getInfer(value):view(uri)
799-
or vm.getInfer(value):view(uri)
797+
or vm.getInfer(value):view(uri)
800798
end
801799
end
802800
index = index + 1

0 commit comments

Comments
 (0)