diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2009-06-10 13:57:53 -0300 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 2009-06-10 13:57:53 -0300 |
| commit | 2258ec6bc94bc127024a49e29a0b40f58a5ae0a3 (patch) | |
| tree | b748fbe9028183c4aa4727a24cf3a50382819b6b /lvm.c | |
| parent | 2598138eced28b6ff8d4db9550a4e70c26cd4baa (diff) | |
| download | lua-2258ec6bc94bc127024a49e29a0b40f58a5ae0a3.tar.gz lua-2258ec6bc94bc127024a49e29a0b40f58a5ae0a3.tar.bz2 lua-2258ec6bc94bc127024a49e29a0b40f58a5ae0a3.zip | |
'getline' renamed to 'getfuncline' (to avoid problems with POSIX)
Diffstat (limited to 'lvm.c')
| -rw-r--r-- | lvm.c | 6 |
1 files changed, 3 insertions, 3 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lvm.c,v 2.89 2009/05/27 17:11:27 roberto Exp roberto $ | 2 | ** $Id: lvm.c,v 2.90 2009/06/01 19:09:26 roberto Exp roberto $ |
| 3 | ** Lua virtual machine | 3 | ** Lua virtual machine |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -67,10 +67,10 @@ static void traceexec (lua_State *L) { | |||
| 67 | if (mask & LUA_MASKLINE) { | 67 | if (mask & LUA_MASKLINE) { |
| 68 | Proto *p = ci_func(ci)->l.p; | 68 | Proto *p = ci_func(ci)->l.p; |
| 69 | int npc = pcRel(ci->u.l.savedpc, p); | 69 | int npc = pcRel(ci->u.l.savedpc, p); |
| 70 | int newline = getline(p, npc); | 70 | int newline = getfuncline(p, npc); |
| 71 | if (npc == 0 || /* call linehook when enter a new function, */ | 71 | if (npc == 0 || /* call linehook when enter a new function, */ |
| 72 | ci->u.l.savedpc <= L->oldpc || /* when jump back (loop), or when */ | 72 | ci->u.l.savedpc <= L->oldpc || /* when jump back (loop), or when */ |
| 73 | newline != getline(p, pcRel(L->oldpc, p))) /* enter a new line */ | 73 | newline != getfuncline(p, pcRel(L->oldpc, p))) /* enter a new line */ |
| 74 | luaD_callhook(L, LUA_HOOKLINE, newline); | 74 | luaD_callhook(L, LUA_HOOKLINE, newline); |
| 75 | } | 75 | } |
| 76 | L->oldpc = ci->u.l.savedpc; | 76 | L->oldpc = ci->u.l.savedpc; |