去掉重复代码

Author: actboy168

extension/script/debugger.lua

@@ -8,9 +8,10 @@ if not selfsource then
     end
 end
 
+local IsWindows = package.config:sub(1, 1) == "\\"
 local root = selfsource
-                :match "(.+)[/][^/]+$"
-                :match "(.+)[/][^/]+$"
+    :match "(.+)[/][^/]+$"
+    :match "(.+)[/][^/]+$"
 
 if debug.getregistry()["lua-debug"] then
     local dbg = debug.getregistry()["lua-debug"]
@@ -47,9 +48,6 @@ end
 
 local function detectLuaDebugPath(cfg)
     local PLATFORM
-    local function isWindows()
-        return package.config:sub(1, 1) == "\\"
-    end
     do
         local function shell(command)
             --NOTICE: io.popen可能会多线程不安全
@@ -93,7 +91,7 @@ local function detectLuaDebugPath(cfg)
                 error "unknown ARCH"
             end
         end
-        if isWindows() then
+        if IsWindows then
             detect_windows()
         else
             local name = shell 'uname -s'
@@ -133,7 +131,7 @@ local function detectLuaDebugPath(cfg)
         error(_VERSION.." is not supported.")
     end
 
-    local ext = isWindows() and "dll" or "so"
+    local ext = IsWindows and "dll" or "so"
     return root..rt..'/luadebug.'..ext
 end
 
@@ -148,8 +146,7 @@ local function initDebugger(dbg, cfg)
         luadebug = detectLuaDebugPath(cfg)
         updateenv = true
     end
-    local isWindows = package.config:sub(1, 1) == "\\"
-    if isWindows then
+    if IsWindows then
         assert(package.loadlib(luadebug, 'init'))(cfg.luaapi)
     end
 
@@ -163,7 +160,7 @@ local function initDebugger(dbg, cfg)
     end
 
     local function utf8(s)
-        if cfg.ansi and isWindows then
+        if cfg.ansi and IsWindows then
             return dbg.rdebug.a2u(s)
         end
         return s
@@ -208,7 +205,7 @@ function dbg:event(...)
 end
 
 function dbg:set_wait(name, f)
-    _G[name] = function(...)
+    _G[name] = function (...)
         _G[name] = nil
         f(...)
         self:event 'wait'
@@ -221,7 +218,7 @@ function dbg:setup_patch()
     local rawxpcall = xpcall
     function pcall(f, ...)
         return rawxpcall(f,
-            function(msg)
+            function (msg)
                 self:event("exception", msg, ERREVENT_ERRRUN, 3)
                 return msg
             end,
@@ -230,7 +227,7 @@ function dbg:setup_patch()
 
     function xpcall(f, msgh, ...)
         return rawxpcall(f,
-            function(msg)
+            function (msg)
                 self:event("exception", msg, ERREVENT_ERRRUN, 3)
                 return msgh and msgh(msg) or msg
             end
@@ -251,7 +248,7 @@ function dbg:setup_patch()
     function coroutine.wrap(f)
         local wf = rawcoroutinewrap(f)
         local _, co = debug.getupvalue(wf, 1)
-        return function(...)
+        return function (...)
             self:event("thread", co, 0)
             return coreturn(co, wf(...))
         end