diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-06-14 18:19:28 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-06-14 18:19:28 +0200 |
| commit | 039c1a75f391b078f2b27a388e73bb203afed58e (patch) | |
| tree | f4f213b794eb0c3a2713358c3d5bdd3f0b931486 /lib/tolua++/src/bin/lua/compat-5.1.lua | |
| parent | Fixed bad merge (diff) | |
| parent | Merge pull request #1093 from mc-server/BindingsFix (diff) | |
| download | cuberite-039c1a75f391b078f2b27a388e73bb203afed58e.tar cuberite-039c1a75f391b078f2b27a388e73bb203afed58e.tar.gz cuberite-039c1a75f391b078f2b27a388e73bb203afed58e.tar.bz2 cuberite-039c1a75f391b078f2b27a388e73bb203afed58e.tar.lz cuberite-039c1a75f391b078f2b27a388e73bb203afed58e.tar.xz cuberite-039c1a75f391b078f2b27a388e73bb203afed58e.tar.zst cuberite-039c1a75f391b078f2b27a388e73bb203afed58e.zip | |
Diffstat (limited to 'lib/tolua++/src/bin/lua/compat-5.1.lua')
| -rw-r--r-- | lib/tolua++/src/bin/lua/compat-5.1.lua | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/tolua++/src/bin/lua/compat-5.1.lua b/lib/tolua++/src/bin/lua/compat-5.1.lua index 7a2c60b69..c591592a6 100644 --- a/lib/tolua++/src/bin/lua/compat-5.1.lua +++ b/lib/tolua++/src/bin/lua/compat-5.1.lua @@ -18,17 +18,16 @@ local function pp_dofile(path) 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 - local f = load(getfile, path) + local f, err = load(getfile, path) if not f then - - error("error loading file "..path) + error("error loading file " .. path .. ": " .. err) end return f() end |