stash

Author: sumneko

script/vm/compiler.lua

@@ -716,13 +716,13 @@ function vm.selectNode(list, index)
     local result
     if exp.type == 'call' then
         result = getReturn(exp.node, index, exp.args)
-        if result:isEmpty() then
+        if not result:isTyped() then
             result:merge(vm.declareGlobal('type', 'unknown'))
         end
     else
         ---@type vm.node
         result = vm.compileNode(exp)
-        if result:isEmpty() then
+        if not result:isTyped() then
             result:merge(vm.declareGlobal('type', 'unknown'))
         end
     end
@@ -1526,7 +1526,7 @@ local compilerSwitch = util.switch()
             if not node then
                 return
             end
-            if node:isEmpty() then
+            if not node:isTyped() then
                 node = vm.runOperator('call', vararg.node) or node
             end
             vm.setNode(source, node)
@@ -1547,7 +1547,7 @@ local compilerSwitch = util.switch()
         if not node then
             return
         end
-        if node:isEmpty() then
+        if not node:isTyped() then
             node = vm.runOperator('call', source.node) or node
         end
         vm.setNode(source, node)
@@ -1829,15 +1829,15 @@ end
 
 ---@param source vm.object
 local function compileByParentNode(source)
-    if not vm.getNode(source):isEmpty() then
+    if vm.getNode(source):isTyped() then
         return
     end
     vm.compileByNodeChain(source, function (result)
         vm.setNode(source, vm.compileNode(result))
     end)
 end
 
----@param source vm.object
+---@param source vm.object | vm.variable
 ---@return vm.node
 function vm.compileNode(source)
     if not source then
@@ -1863,6 +1863,7 @@ function vm.compileNode(source)
     ---@cast source parser.object
     vm.setNode(source, vm.createNode(), true)
     vm.compileByGlobal(source)
+    vm.compileByVariable(source)
     compileByNode(source)
     compileByParentNode(source)
     matchCall(source)

script/vm/generic.lua

@@ -124,11 +124,11 @@ function mt:resolve(uri, args)
     local protoNode = vm.compileNode(self.proto)
     local result = vm.createNode()
     for nd in protoNode:eachObject() do
-        if nd.type == 'global' then
-            ---@cast nd vm.global
+        if nd.type == 'global' or nd.type == 'variable' then
+            ---@cast nd vm.global | vm.variable
             result:merge(nd)
         else
-            ---@cast nd -vm.global
+            ---@cast nd -vm.global, -vm.variable
             local clonedObject = cloneObject(nd, resolved)
             if clonedObject then
                 local clonedNode   = vm.compileNode(clonedObject)

script/vm/node.lua

@@ -9,7 +9,7 @@ local util     = require 'utility'
 ---@type table<vm.object, vm.node>
 vm.nodeCache = setmetatable({}, util.MODE_K)
 
----@alias vm.node.object vm.object | vm.global
+---@alias vm.node.object vm.object | vm.global | vm.variable
 
 ---@class vm.node
 ---@field [integer] vm.node.object
@@ -58,6 +58,19 @@ function mt:isEmpty()
     return #self == 0
 end
 
+---@return boolean
+function mt:isTyped()
+    for _, c in ipairs(self) do
+        if c.type == 'global' and c.cate == 'variable' then
+            return true
+        end
+        if guide.isLiteral(c) then
+            return true
+        end
+    end
+    return false
+end
+
 function mt:clear()
     self.optional = nil
     for i, c in ipairs(self) do
@@ -278,7 +291,7 @@ function mt:narrow(uri, name)
     return self
 end
 
----@param obj vm.object
+---@param obj vm.object | vm.variable
 function mt:removeObject(obj)
     for index, c in ipairs(self) do
         if c == obj then

script/vm/tracer.lua

@@ -13,6 +13,7 @@ local util      = require 'utility'
 ---@field mode      tracer.mode
 ---@field name      string
 ---@field source    parser.object
+---@field variable  vm.variable
 ---@field assigns   parser.object[]
 ---@field assignMap table<parser.object, true>
 ---@field getMap    table<parser.object, true>
@@ -94,10 +95,7 @@ function mt:collectLocal()
     local startPos  = self.source.start
     local finishPos = 0
 
-    self.assigns[#self.assigns+1] = self.source
-    self.assignMap[self.source] = true
-
-    local variable = vm.getVariableInfoByCodeName(self.source, self.name)
+    local variable = self.variable
 
     assert(variable)
 
@@ -131,6 +129,10 @@ function mt:collectLocal()
     if #self.casts > 0 then
         self.fastCalc = false
     end
+
+    if variable ~= vm.getVariable(self.source) then
+        self.fastCalc = false
+    end
 end
 
 function mt:collectGlobal()
@@ -171,8 +173,13 @@ end
 ---@param finish integer
 ---@return parser.object?
 function mt:getLastAssign(start, finish)
-    local assign = self.assigns[1]
+    local assign
     for _, obj in ipairs(self.assigns) do
+        if obj.type == 'local'
+        or obj.type == 'self' then
+            assign = obj
+            break
+        end
         if obj.start < start then
             goto CONTINUE
         end
@@ -742,7 +749,9 @@ end
 function mt:calcNode(source)
     if self.getMap[source] then
         local lastAssign = self:getLastAssign(0, source.finish)
-        assert(lastAssign)
+        if not lastAssign then
+            return
+        end
         if self.fastCalc then
             self.nodes[source] = vm.compileNode(lastAssign)
             return
@@ -783,9 +792,10 @@ end
 ---@param mode tracer.mode
 ---@param source parser.object
 ---@param name string
+---@param variable vm.variable?
 ---@return vm.tracer?
-local function createTracer(mode, source, name)
-    local node = vm.compileNode(source)
+local function createTracer(mode, source, name, variable)
+    local node = vm.compileNode(variable or source)
     local tracer = node._tracer
     if tracer then
         return tracer
@@ -796,6 +806,7 @@ local function createTracer(mode, source, name)
     end
     tracer = setmetatable({
         source    = source,
+        variable  = variable,
         mode      = mode,
         name      = name,
         assigns   = {},
@@ -806,7 +817,7 @@ local function createTracer(mode, source, name)
         casts     = {},
         nodes     = {},
         main      = main,
-        uri       = guide.getUri(source),
+        uri       = guide.getUri(main),
     }, mt)
     node._tracer = tracer
 
@@ -822,7 +833,7 @@ end
 ---@param source parser.object
 ---@return vm.node?
 function vm.traceNode(source)
-    local mode, base, name
+    local mode, base, name, variable
     if vm.getGlobalNode(source) then
         base = vm.getGlobalBase(source)
         if not base then
@@ -831,15 +842,15 @@ function vm.traceNode(source)
         mode = 'global'
         name = base.global:getCodeName()
     else
-        local variable = vm.getVariable(source)
+        variable = vm.getVariable(source)
         if not variable then
             return nil
         end
-        base = variable.base
+        base = variable:getBase()
         name = variable:getCodeName()
         mode = 'local'
     end
-    local tracer = createTracer(mode, base, name)
+    local tracer = createTracer(mode, base, name, variable)
     if not tracer then
         return nil
     end

script/vm/type.lua

@@ -721,8 +721,9 @@ function vm.viewTypeErrorMessage(uri, errs)
             elseif value.type == 'generic' then
                 ---@cast value vm.generic
                 lparams[paramName] = vm.viewObject(value, uri)
+            elseif value.type == 'variable' then
             else
-                ---@cast value -string, -vm.global, -vm.node, -vm.generic
+                ---@cast value -string, -vm.global, -vm.node, -vm.generic, -vm.variable
                 if paramName == 'key' then
                     lparams[paramName] = vm.viewKey(value, uri)
                 else