Change raiseEvent to allow nil arguments and return an error when pas…

…sed arguments of unhandled types.
EldFitheach · Jan 21, 2016 · a087649 · a087649
1 parent 2836052
commit a087649
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/TEvent.h b/src/TEvent.h
@@ -30,6 +30,7 @@
 #define ARGUMENT_TYPE_NUMBER 0
 #define ARGUMENT_TYPE_STRING 1
 #define ARGUMENT_TYPE_BOOLEAN 2
+#define ARGUMENT_TYPE_NIL 3
 
 class TEvent
 {

diff --git a/src/TLuaInterpreter.cpp b/src/TLuaInterpreter.cpp
@@ -314,6 +314,17 @@ int TLuaInterpreter::raiseEvent( lua_State * L )
             pE.mArgumentList.append( QString::number(lua_toboolean( L, i )) );
             pE.mArgumentTypeList.append( ARGUMENT_TYPE_BOOLEAN );
         }
+        else if( lua_isnil( L, i ) )
+        {
+            pE.mArgumentList.append( QString() );
+            pE.mArgumentTypeList.append( ARGUMENT_TYPE_NIL );
+        }
+        else
+        {
+            lua_pushstring( L, "raiseEvent: invalid argument type" );
+            lua_error( L );
+            return 1;
+        }
     }
     Host * pHost = TLuaInterpreter::luaInterpreterMap[L];
     pHost->raiseEvent( pE );
@@ -11915,6 +11926,10 @@ bool TLuaInterpreter::callEventHandler(const QString & function, const TEvent &
         {
             lua_pushboolean( L, pE.mArgumentList[i].toInt() );
         }
+        else if( pE.mArgumentTypeList[i] == ARGUMENT_TYPE_NIL )
+        {
+            lua_pushnil( L );
+        }
         else
         {
             lua_pushstring( L, pE.mArgumentList[i].toLatin1().data() );