1 files changed, 12 insertions, 6 deletions

diff --git a/lvm.c b/lvm.c
index ed29602c..0ea8ea9f 100644
--- a/lvm.c
+++ b/lvm.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lvm.c,v 1.119 2000/06/28 20:20:36 roberto Exp roberto $
+** $Id: lvm.c,v 1.120 2000/06/30 14:35:17 roberto Exp roberto $
 ** Lua virtual machine
 ** See Copyright Notice in lua.h
 */
@@ -69,14 +69,20 @@ int luaV_tostring (lua_State *L, TObject *obj) {  /* LUA_NUMBER */
 
 static void traceexec (lua_State *L, StkId base, StkId top, lua_Hook linehook) {
   CallInfo *ci = infovalue(base-1);
-  int *lines = ci->func->f.l->lines;
+  int *lineinfo = ci->func->f.l->lineinfo;
   int pc = (*ci->pc - 1) - ci->func->f.l->code;
-  if (lines) {
+  if (lineinfo) {
+    int newline;
+    if (ci->line == 0) {  /* first time? */
+      ci->line = 1;
+      ci->refi = 0;
+    }
+    newline = luaG_getline(lineinfo, pc, ci->line, &ci->refi);
     /* calls linehook when enters a new line or jumps back (loop) */
-    if (lines[pc] != ci->line || pc <= ci->lastpc) {
-      ci->line = lines[pc];
+    if (newline != ci->line || pc <= ci->lastpc) {
+      ci->line = newline;
       L->top = top;
-      luaD_lineHook(L, base-2, lines[pc], linehook);
+      luaD_lineHook(L, base-2, newline, linehook);
     }
   }
   ci->lastpc = pc;