2 files changed, 14 insertions, 9 deletions

diff --git a/ldblib.c b/ldblib.c
index d2566889..b5027ff1 100644
--- a/ldblib.c
+++ b/ldblib.c
@@ -1,5 +1,5 @@
 /*
-** $Id: ldblib.c,v 1.70 2002/09/16 19:18:01 roberto Exp roberto $
+** $Id: ldblib.c,v 1.71 2002/11/14 15:41:38 roberto Exp roberto $
 ** Interface from Lua to its debug API
 ** See Copyright Notice in lua.h
 */
@@ -167,8 +167,13 @@ static int sethook (lua_State *L) {
 static int gethook (lua_State *L) {
   char buff[5];
   unsigned long mask = lua_gethookmask(L);
-  lua_pushlightuserdata(L, (void *)&KEY_HOOK);
-  lua_rawget(L, LUA_REGISTRYINDEX);   /* get hook */
+  lua_Hook hook = lua_gethook(L);
+  if (hook != NULL && hook != hookf)  /* external hook? */
+    lua_pushliteral(L, "external hook");
+  else {
+    lua_pushlightuserdata(L, (void *)&KEY_HOOK);
+    lua_rawget(L, LUA_REGISTRYINDEX);   /* get hook */
+  }
   lua_pushstring(L, unmakemask(mask, buff));
   lua_pushnumber(L, lua_getmaskcount(mask));
   return 3;
diff --git a/lstate.h b/lstate.h
index 6d1deb18..828c14b8 100644
--- a/lstate.h
+++ b/lstate.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lstate.h,v 1.101 2002/11/13 11:31:39 roberto Exp roberto $
+** $Id: lstate.h,v 1.102 2002/11/18 11:01:55 roberto Exp roberto $
 ** Global State
 ** See Copyright Notice in lua.h
 */
@@ -92,14 +92,14 @@ typedef struct CallInfo {
 /*
 ** bit fields for `CallInfo.state'
 */
-#define CI_C            1  /* 1 if function is a C function */
+#define CI_C            (1<<0)  /* 1 if function is a C function */
 /* 1 if (Lua) function has an active `luaV_execute' running it */
-#define CI_HASFRAME     2
+#define CI_HASFRAME     (1<<1)
 /* 1 if Lua function is calling another Lua function (and therefore its
    `pc' is being used by the other, and therefore CI_SAVEDPC is 1 too) */
-#define CI_CALLING      4
-#define CI_SAVEDPC      8  /* 1 if `savedpc' is updated */
-#define CI_YIELD        16  /* 1 if thread is suspended */
+#define CI_CALLING      (1<<2)
+#define CI_SAVEDPC      (1<<3)  /* 1 if `savedpc' is updated */
+#define CI_YIELD        (1<<4)  /* 1 if thread is suspended */
 
 
 #define ci_func(ci)     (clvalue((ci)->base - 1))