局部变量在一定程度上向后推测类型

2 files changed, 31 insertions, 0 deletions

diff --git a/server-beta/src/vm/getValue.lua b/server-beta/src/vm/getValue.lua
index 6faf591e..c1b3622d 100644
--- a/server-beta/src/vm/getValue.lua
+++ b/server-beta/src/vm/getValue.lua
@@ -665,6 +665,30 @@ local function inferByBinary(results, source)
     end
 end
 
+local function inferBySetOfLocal(results, source)
+    if source.ref then
+        for i = 1, #source.ref do
+            local ref = source.ref[i]
+            if ref.type == 'setlocal' then
+                break
+            end
+            merge(results, vm.getValue(ref))
+        end
+    end
+end
+
+local function inferBySet(results, source)
+    if #results ~= 0 then
+        return
+    end
+    if source.type == 'local' then
+        inferBySetOfLocal(results, source)
+    elseif source.type == 'setlocal'
+    or     source.type == 'getlocal' then
+        inferBySetOfLocal(results, source.node)
+    end
+end
+
 local function getValue(source)
     local results = checkLiteral(source)
                  or checkValue(source)
@@ -679,6 +703,7 @@ local function getValue(source)
 
     results = {}
     checkDef(results, source)
+    inferBySet(results, source)
     inferByCall(results, source)
     inferByGetTable(results, source)
     inferByUnary(results, source)
diff --git a/server-beta/test/type_inference/init.lua b/server-beta/test/type_inference/init.lua
index 53ee6131..f509ca3f 100644
--- a/server-beta/test/type_inference/init.lua
+++ b/server-beta/test/type_inference/init.lua
@@ -176,6 +176,12 @@ TEST 'integer' [[
 local y = <?x?> << 0
 ]]
 
+TEST 'integer' [[
+local function f(<?a?>, b)
+    return a << b
+end
+]]
+
 -- 不根据调用者的输入参数来推测
 --TEST 'number' [[
 --local function x(a)