stash

Author: sumneko

script/parser/guide.lua

@@ -884,7 +884,7 @@ function m.getLineRange(state, row)
     return 0
 end
 
-local isSetMap = {
+local assignTypeMap = {
     ['setglobal']         = true,
     ['local']             = true,
     ['self']              = true,
@@ -908,7 +908,7 @@ local isSetMap = {
 }
 function m.isAssign(source)
     local tp = source.type
-    if isSetMap[tp] then
+    if assignTypeMap[tp] then
         return true
     end
     if tp == 'call' then
@@ -920,7 +920,7 @@ function m.isAssign(source)
     return false
 end
 
-local isGetMap = {
+local getTypeMap = {
     ['getglobal'] = true,
     ['getlocal']  = true,
     ['getfield']  = true,
@@ -929,7 +929,7 @@ local isGetMap = {
 }
 function m.isGet(source)
     local tp = source.type
-    if isGetMap[tp] then
+    if getTypeMap[tp] then
         return true
     end
     if tp == 'call' then

script/vm/global.lua

@@ -1,7 +1,6 @@
 local util  = require 'utility'
 local scope = require 'workspace.scope'
 local guide = require 'parser.guide'
-local files = require 'files'
 ---@class vm
 local vm    = require 'vm.vm'
 
@@ -569,43 +568,6 @@ function vm.getGlobalBase(source)
     return source._globalBase
 end
 
----@param source parser.object
-local function compileSelf(source)
-    if source.parent.type ~= 'funcargs' then
-        return
-    end
-    ---@type parser.object
-    local node = source.parent.parent and source.parent.parent.parent and source.parent.parent.parent.node
-    if not node then
-        return
-    end
-    local fields = vm.getVariableFields(source, false)
-    if not fields then
-        return
-    end
-    local nodeLocalID = vm.getVariableID(node)
-    local globalNode  = node._globalNode
-    if not nodeLocalID and not globalNode then
-        return
-    end
-    for _, field in ipairs(fields) do
-        if field.type == 'setfield' then
-            local key = guide.getKeyName(field)
-            if key then
-                if nodeLocalID then
-                    local myID = nodeLocalID .. vm.ID_SPLITE .. key
-                    vm.insertVariableID(myID, field)
-                end
-                if globalNode then
-                    local myID = globalNode:getName() .. vm.ID_SPLITE .. key
-                    local myGlobal = vm.declareGlobal('variable', myID, guide.getUri(node))
-                    myGlobal:addSet(guide.getUri(node), field)
-                end
-            end
-        end
-    end
-end
-
 ---@param source parser.object
 local function compileAst(source)
     local env = guide.getENV(source)
@@ -628,18 +590,6 @@ local function compileAst(source)
     }, function (src)
         compileObject(src)
     end)
-
-    --[[
-    local mt
-    function mt:xxx()
-        self.a = 1
-    end
-
-    mt.a --> find this definition
-    ]]
-    guide.eachSourceType(source, 'self', function (src)
-        compileSelf(src)
-    end)
 end
 
 ---@param uri uri
@@ -657,18 +607,7 @@ local function dropUri(uri)
     end
 end
 
----@async
-files.watch(function (ev, uri)
-    if ev == 'update' then
-        dropUri(uri)
-    end
-    if ev == 'remove' then
-        dropUri(uri)
-    end
-    if ev == 'compile' then
-        local state = files.getLastState(uri)
-        if state then
-            compileAst(state.ast)
-        end
-    end
-end)
+return {
+    compileAst = compileAst,
+    dropUri    = dropUri,
+}

script/vm/init.lua

@@ -15,10 +15,11 @@ require 'vm.tracer'
 require 'vm.infer'
 require 'vm.generic'
 require 'vm.sign'
-require 'vm.variable-id'
+require 'vm.variable'
 require 'vm.global'
 require 'vm.function'
 require 'vm.operator'
 require 'vm.visible'
+require 'vm.precompile'
 
 return vm

script/vm/precompile.lua

@@ -0,0 +1,20 @@
+local files    = require 'files'
+local global   = require 'vm.global'
+local variable = require 'vm.variable'
+
+---@async
+files.watch(function (ev, uri)
+    if ev == 'update' then
+        global.dropUri(uri)
+    end
+    if ev == 'remove' then
+        global.dropUri(uri)
+    end
+    if ev == 'compile' then
+        local state = files.getLastState(uri)
+        if state then
+            global.compileAst(state.ast)
+            variable.compileAst(state.ast)
+        end
+    end
+end)

script/vm/tracer.lua

@@ -97,11 +97,11 @@ function mt:collectLocal()
     self.assigns[#self.assigns+1] = self.source
     self.assignMap[self.source] = true
 
-    local varInfo = vm.getVariableInfoByName(self.source, self.name)
+    local variable = vm.getVariableInfoByCodeName(self.source, self.name)
 
-    assert(varInfo)
+    assert(variable)
 
-    for _, set in ipairs(varInfo.sets) do
+    for _, set in ipairs(variable.sets) do
         self.assigns[#self.assigns+1] = set
         self.assignMap[set] = true
         self:collectCare(set)
@@ -110,7 +110,7 @@ function mt:collectLocal()
         end
     end
 
-    for _, get in ipairs(varInfo.gets) do
+    for _, get in ipairs(variable.gets) do
         self:collectCare(get)
         self.getMap[get] = true
         if get.finish > finishPos then
@@ -831,14 +831,12 @@ function vm.traceNode(source)
         mode = 'global'
         name = base.global:getCodeName()
     else
-        base = vm.getVariableHead(source)
-        if not base then
-            return nil
-        end
-        name = vm.getVariableName(source)
-        if not name then
+        local variable = vm.getVariable(source)
+        if not variable then
             return nil
         end
+        base = variable.base
+        name = variable:getCodeName()
         mode = 'local'
     end
     local tracer = createTracer(mode, base, name)