diff options
| author | Mike Pall <mike> | 2014-06-11 10:21:37 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-06-11 10:21:37 +0200 |
| commit | afcc3c0b8366e6d856a7504f7bc3122bec73b769 (patch) | |
| tree | 4cf1087e44b294b3de39e8ed7762a294780efdc7 | |
| parent | 95977599e71a75844143bec686b46d1a10a2771c (diff) | |
| parent | e7c6a1afa2b62888ff78679a7a48b4e303b4a8a6 (diff) | |
| download | luajit-afcc3c0b8366e6d856a7504f7bc3122bec73b769.tar.gz luajit-afcc3c0b8366e6d856a7504f7bc3122bec73b769.tar.bz2 luajit-afcc3c0b8366e6d856a7504f7bc3122bec73b769.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/lj_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_debug.c b/src/lj_debug.c index bb77ad77..18074874 100644 --- a/src/lj_debug.c +++ b/src/lj_debug.c | |||
| @@ -454,7 +454,7 @@ int lj_debug_getinfo(lua_State *L, const char *what, lj_Debug *ar, int ext) | |||
| 454 | lj_debug_shortname(ar->short_src, name, pt->firstline); | 454 | lj_debug_shortname(ar->short_src, name, pt->firstline); |
| 455 | ar->linedefined = (int)firstline; | 455 | ar->linedefined = (int)firstline; |
| 456 | ar->lastlinedefined = (int)(firstline + pt->numline); | 456 | ar->lastlinedefined = (int)(firstline + pt->numline); |
| 457 | ar->what = firstline ? "Lua" : "main"; | 457 | ar->what = (firstline || !pt->numline) ? "Lua" : "main"; |
| 458 | } else { | 458 | } else { |
| 459 | ar->source = "=[C]"; | 459 | ar->source = "=[C]"; |
| 460 | ar->short_src[0] = '['; | 460 | ar->short_src[0] = '['; |