Made pumpEvents hook type a formal enumeration.

icculus · Feb 23, 2007 · d240fd7 · d240fd7
1 parent 0a9d2d3
commit d240fd7
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/src/toby_app.c b/src/toby_app.c
@@ -868,7 +868,7 @@ static int luahook_stackwalk(lua_State *L)
 
 static void luaDebugHook(lua_State *L, lua_Debug *ar)
 {
-    if (!TOBY_pumpEvents(ar->event, ar->currentline))
+    if (!TOBY_pumpEvents((TobyHookType) ar->event, ar->currentline))
         haltProgram(L);
 } /* luaDebugHook */
 
@@ -946,10 +946,10 @@ void TOBY_runProgram(const char *source_code, int run_for_printing)
 {
     lua_State *L;
 
-    assert(TOBY_HOOKCALL == LUA_HOOKCALL);
-    assert(TOBY_HOOKRET == LUA_HOOKRET);
-    assert(TOBY_HOOKLINE == LUA_HOOKLINE);
-    assert(TOBY_HOOKCOUNT == LUA_HOOKCOUNT);
+    assert(((int) TOBY_HOOKCALL) == LUA_HOOKCALL);
+    assert(((int) TOBY_HOOKRET) == LUA_HOOKRET);
+    assert(((int) TOBY_HOOKLINE) == LUA_HOOKLINE);
+    assert(((int) TOBY_HOOKCOUNT) == LUA_HOOKCOUNT);
 
     resetProgramState();
 

diff --git a/src/toby_app.h b/src/toby_app.h
@@ -71,12 +71,14 @@ typedef struct TobyCallstack
     int linenum;
 } TobyCallstack;
 
-
-#define TOBY_HOOKDELAY  -1
-#define TOBY_HOOKCALL   0
-#define TOBY_HOOKRET    1
-#define TOBY_HOOKLINE   2
-#define TOBY_HOOKCOUNT  3
+typedef enum TobyHookType
+{
+    TOBY_HOOKDELAY=-1,
+    TOBY_HOOKCALL,
+    TOBY_HOOKRET,
+    TOBY_HOOKLINE,
+    TOBY_HOOKCOUNT,
+} TobyHookType;
 
 
 /* !!! FIXME: comment this */
@@ -126,7 +128,7 @@ void TOBY_stopRun(void);
  * Let UI pump its event queue. Return non-zero to keep going, zero to
  *  stop program execution, making TOBY_runProgram() return.
  */
-int TOBY_pumpEvents(int hook, int currentline);
+int TOBY_pumpEvents(TobyHookType hook, int currentline);
 
 
 /*

diff --git a/src/toby_sdl.c b/src/toby_sdl.c
@@ -69,7 +69,7 @@ void TOBY_stopRun()
 } /* TOBY_stopRun */
 
 
-int TOBY_pumpEvents(int hook, int currentline)
+int TOBY_pumpEvents(TobyHookType hook, int currentline)
 {
     SDL_Event e;
     const Uint32 now = SDL_GetTicks();

diff --git a/src/toby_wxwidgets.cpp b/src/toby_wxwidgets.cpp
@@ -145,7 +145,7 @@ class TobyFrame : public wxFrame
     void openFile(const wxString &path);
     void startRun();
     void stopRun();
-    bool pumpEvents(int hook=TOBY_HOOKDELAY, int currentline=-1);
+    bool pumpEvents(TobyHookType hook=TOBY_HOOKDELAY, int currentline=-1);
     inline long delayTicksPerLine() { return this->delayPerLine; }
     inline void requestQuit();
     inline void runProgram(bool printing);
@@ -342,7 +342,7 @@ void TOBY_stopRun()
 } // TOBY_stopRun
 
 
-int TOBY_pumpEvents(int hook, int currentline)
+int TOBY_pumpEvents(TobyHookType hook, int currentline)
 {
     return wxGetApp().getTobyFrame()->pumpEvents(hook, currentline) ? 1 : 0;
 } // TOBY_pumpEvents
@@ -844,7 +844,7 @@ const wxSize TobyFrame::getPreviousSize()
 } // TobyFrame::getPreviousSize
 
 
-bool TobyFrame::pumpEvents(int hook, int currentline)
+bool TobyFrame::pumpEvents(TobyHookType hook, int currentline)
 {
     // should only break inside this function, and should block here until
     //  breakpoint ends and program continues.