cleanup

Author: sumneko

script/vm/node.lua

@@ -227,7 +227,7 @@ function mt:remove(name)
         or (c.type == 'doc.type.boolean'  and name == 'false' and c[1] == false)
         or (c.type == 'doc.type.table'    and name == 'table')
         or (c.type == 'doc.type.array'    and name == 'table')
-        or (c.type == 'doc.type.sign'     and name == 'table')
+        or (c.type == 'doc.type.sign'     and name == c.node[1])
         or (c.type == 'doc.type.function' and name == 'function') then
             table.remove(self, index)
             self[c] = nil
@@ -248,7 +248,7 @@ function mt:narrow(name)
         or (c.type == 'doc.type.boolean'  and name == 'boolean')
         or (c.type == 'doc.type.table'    and name == 'table')
         or (c.type == 'doc.type.array'    and name == 'table')
-        or (c.type == 'doc.type.sign'    and name == 'table')
+        or (c.type == 'doc.type.sign'     and name == c.node[1])
         or (c.type == 'doc.type.function' and name == 'function') then
             goto CONTINUE
         end
@@ -337,10 +337,15 @@ function mt:asTable()
         local c = self[index]
         if c.type == 'table'
         or c.type == 'doc.type.table'
-        or c.type == 'doc.type.array'
-        or c.type == 'doc.type.sign' then
+        or c.type == 'doc.type.array' then
             goto CONTINUE
         end
+        if c.type == 'doc.type.sign' then
+            if c.node[1] == 'table'
+            or not guide.isBasicType(c.node[1]) then
+                goto CONTINUE
+            end
+        end
         if c.type == 'global' and c.cate == 'type' then
             ---@cast c vm.global
             if c.name == 'table'

script/vm/type.lua

@@ -259,16 +259,16 @@ end
 ---@param uri uri
 ---@param tnode vm.node
 ---@param vnode vm.node|string|vm.object
----@param inversion? boolean
+---@param reverse? boolean
 ---@return vm.node?
-function vm.getTableKey(uri, tnode, vnode, inversion)
+function vm.getTableKey(uri, tnode, vnode, reverse)
     local result = vm.createNode()
     for tn in tnode:eachObject() do
         if tn.type == 'doc.type.table' then
             for _, field in ipairs(tn.fields) do
                 if  field.name.type ~= 'doc.field.name'
                 and field.extends then
-                    if inversion then
+                    if reverse then
                         if vm.isSubType(uri, vm.compileNode(field.extends), vnode) then
                             result:merge(vm.compileNode(field.name))
                         end