Changeset 2509 for code/branches/buildsystem2/src/tolua/lua/compat-5.1.lua

Timestamp:

Dec 17, 2008, 8:59:48 PM (16 years ago)

Author:

rgrieder

Message:

Merged revisions 1875-2278 of the buildsystem branch to buildsystem2.

Location:

code/branches/buildsystem2

Files:

• . (modified) (2 props)
• src/tolua/lua/compat-5.1.lua (modified) (2 diffs)

code/branches/buildsystem2/src/tolua/lua/compat-5.1.lua

@@ -1 +1 @@
 if string.find(_VERSION, "5%.0") then
-        return
+    return
 end
 
 -- "loadfile"
 local function pp_dofile(path)
+    local loaded = false
+    local getfile = function()
 
-        local loaded = false
-        local getfile = function()
+        if loaded then
+            return
+        else
+            local file,err = io.open(path)
+            if not file then
+                error("error loading file "..path..": "..err)
+            end
+            local ret = file:read("*a")
+            file:close()
 
-                if loaded then
-                        return
-                else
-                        local file,err = io.open(path)
-                        if not file then
-                                error("error loading file "..path..": "..err)
-                        end
-                        local ret = file:read("*a")
-                        file:close()
+            ret = string.gsub(ret, "%.%.%.%s*%)", "...) local arg = {n=select('#', ...), ...};")
 
-                        ret = string.gsub(ret, "%.%.%.%s*%)", "...) local arg = {n=select('#', ...), ...};")
+            loaded = true
+            return ret
+        end
+    end
 
-                        loaded = true
-                        return ret
-                end
-        end
-
-        local f = load(getfile, path)
-        return f()
+    local f = load(getfile, path)
+    return f()
 end
 
@@ -38 +37 @@
 local ogsub = string.gsub
 local function compgsub(a,b,c,d)
-  if type(c) == "function" then
-    local oc = c
-    c = function (...) return oc(...) or '' end
-  end
-  return ogsub(a,b,c,d)
+    if type(c) == "function" then
+        local oc = c
+        c = function (...) return oc(...) or '' end
+    end
+    return ogsub(a,b,c,d)
 end
 string.repl = ogsub