支持函数定义

1 files changed, 28 insertions, 10 deletions

diff --git a/src/matcher/definition.lua b/src/matcher/definition.lua
index fe92ae50..c449f7ad 100644
--- a/src/matcher/definition.lua
+++ b/src/matcher/definition.lua
@@ -7,9 +7,6 @@ local result
 
 local function getResult(name, p)
     result = {name, p}
-    for k in pairs(defs) do
-        defs[k] = nil
-    end
 end
 
 local function scopeInit()
@@ -22,8 +19,14 @@ local function scopeSet(name, p)
 end
 
 local function scopeGet(name)
-    local scope = scopes[#scopes]
-    return scope[name]
+    for i = #scopes, 1, -1 do
+        local scope = scopes[#scopes]
+        local p = scope[name]
+        if p then
+            return p
+        end
+    end
+    return nil
 end
 
 local function checkDifinition(name, p)
@@ -33,18 +36,33 @@ local function checkDifinition(name, p)
     getResult(name, scopeGet(name))
 end
 
-function defs.Name(p, name)
-    checkDifinition(name, p)
-    return name
+function defs.Name(p, str)
+    checkDifinition(str, p)
+    return {str, p}
+end
+
+function defs.LocalVar(name)
+    scopeSet(name[1], name[2])
 end
 
-function defs.LocalVar(p, name)
-    scopeSet(name, p)
+function defs.LocalSet(name)
+    scopeSet(name[1], name[2])
+end
+
+function defs.Function(func)
+    local names = func.name
+    if names and #names == 1 then
+        local name = names[1]
+        scopeSet(name[1], name[2])
+    end
+    return func
 end
 
 return function (buf, pos_)
     pos = pos_
+    result = nil
     scopeInit()
+
     parser.grammar(buf, 'Lua', defs)
 
     if not result then