update

1 files changed, 125 insertions, 18 deletions

diff --git a/script/vm/value.lua b/script/vm/value.lua
index 259dc56a..fd119571 100644
--- a/script/vm/value.lua
+++ b/script/vm/value.lua
@@ -1,5 +1,6 @@
-local nodeMgr = require 'vm.node'
-local guide   = require 'parser.guide'
+local nodeMgr  = require 'vm.node'
+local guide    = require 'parser.guide'
+local compiler = require 'vm.compiler'
 
 ---@class vm.value-manager
 local m = {}
@@ -7,7 +8,6 @@ local m = {}
 ---@param source parser.object
 ---@return boolean|nil
 function m.test(source)
-    local compiler = require 'vm.compiler'
     local node = compiler.compileNode(source)
     local hasTrue, hasFalse
     for n in nodeMgr.eachNode(node) do
@@ -41,7 +41,7 @@ function m.test(source)
 end
 
 ---@param v vm.node
----@return string
+---@return string?
 local function getUnique(v)
     if v.type == 'local' then
         return ('loc:%s@%d'):format(guide.getUri(v), v.start)
@@ -50,38 +50,145 @@ local function getUnique(v)
         return ('%s:%s'):format(v.cate, v.name)
     end
     if v.type == 'boolean' then
+        if not v[1] then
+            return false
+        end
         return ('bool:%s'):format(v[1])
     end
     if v.type == 'number' then
+        if not v[1] then
+            return false
+        end
         return ('num:%s'):format(v[1])
     end
     if v.type == 'integer' then
+        if not v[1] then
+            return false
+        end
         return ('num:%s'):format(v[1])
     end
-end
-
-local function nodeToMap(node)
-    local map = {}
-    for n in nodeMgr.eachNode(node) do
-        if n.type == 'local' then
-            map[n] = true
-        end
-        if n.type == 'global' then
-            
-        end
+    if v.type == 'table' then
+        return ('table:%s@%d'):format(guide.getUri(v), v.start)
+    end
+    if v.type == 'function' then
+        return ('func:%s@%d'):format(guide.getUri(v), v.start)
     end
-    return map
+    return false
 end
 
 ---@param a vm.node
 ---@param b vm.node
 ---@return boolean|nil
 function m.equal(a, b)
-    local compiler = require 'vm.compiler'
     local nodeA = compiler.compileNode(a)
     local nodeB = compiler.compileNode(b)
     local mapA = {}
-    local mapB = {}
+    for n in nodeMgr.eachNode(nodeA) do
+        local unique = getUnique(n)
+        if not unique then
+            return nil
+        end
+        mapA[unique] = true
+    end
+    for n in nodeMgr.eachNode(nodeB) do
+        local unique = getUnique(n)
+        if not unique then
+            return nil
+        end
+        if not mapA[unique] then
+            return false
+        end
+    end
+    return true
+end
+
+---@param v vm.node
+---@return integer?
+function m.getInteger(v)
+    local node = compiler.compileNode(v)
+    local result
+    for n in nodeMgr.eachNode(node) do
+        if n.type == 'integer' then
+            if result then
+                return nil
+            else
+                result = n[1]
+            end
+        elseif n.type == 'number' then
+            if result then
+                return nil
+            elseif not math.tointeger(n[1]) then
+                return nil
+            else
+                result = math.tointeger(n[1])
+            end
+        elseif n.type ~= 'local'
+        and    n.type ~= 'global' then
+            return nil
+        end
+    end
+    return result
+end
+
+---@param v vm.node
+---@return integer?
+function m.getString(v)
+    local node = compiler.compileNode(v)
+    local result
+    for n in nodeMgr.eachNode(node) do
+        if n.type == 'string' then
+            if result then
+                return nil
+            else
+                result = n[1]
+            end
+        elseif n.type ~= 'local'
+        and    n.type ~= 'global' then
+            return nil
+        end
+    end
+    return result
+end
+
+---@param v vm.node
+---@return number?
+function m.getNumber(v)
+    local node = compiler.compileNode(v)
+    local result
+    for n in nodeMgr.eachNode(node) do
+        if n.type == 'number'
+        or n.type == 'integer' then
+            if result then
+                return nil
+            else
+                result = n[1]
+            end
+        elseif n.type ~= 'local'
+        and    n.type ~= 'global' then
+            return nil
+        end
+    end
+    return result
+end
+
+---@param v vm.node
+---@return boolean|nil
+function m.getBoolean(v)
+    local node = compiler.compileNode(v)
+    local result
+    for n in nodeMgr.eachNode(node) do
+        if n.type == 'boolean' then
+            if result then
+                return nil
+            else
+                result = n[1]
+            end
+        elseif n.type ~= 'local'
+        and    n.type ~= 'global' then
+            return nil
+        end
+    end
+    return result
 end
 
 return m