Opened Lua libraries in a more correct way

Author: nickgammon

MUSHclient.cpp

@@ -30,6 +30,11 @@
 
 #include "dialogs\Splash.h"
 #include "direct.h"
+extern "C" 
+  {
+  #include "scripting\number.h"
+  void bc_free_numbers ();
+  }
 
 COLORREF xterm_256_colours [256];
 
@@ -243,6 +248,8 @@ BOOL CMUSHclientApp::InitInstance()
   // where we do file browsing from
   strcpy (file_browsing_dir, working_dir);
 
+//  bc_init_numbers();
+
 
   // First free the string that was allocated by MFC in the startup
    // of CWinApp. The string is allocated before InitInstance is
@@ -1216,6 +1223,8 @@ int CMUSHclientApp::ExitInstance()
 
   THEMEGLUE_FREE ();
 
+//  bc_free_numbers ();  // free zero, one, two
+
   // free the resources DLL
   FreeLibrary (m_hInstDLL);
 	return CWinApp::ExitInstance();
@@ -1361,18 +1370,19 @@ void CMUSHclientApp::OpenLuaDelayed ()
     return;         // can't open Lua
 
   luaL_openlibs (m_SpellChecker_Lua);    // new way of opening all libraries
-  luaopen_rex (m_SpellChecker_Lua);      // regular expression library
-  luaopen_bits (m_SpellChecker_Lua);     // bit manipulation library
-  luaopen_compress (m_SpellChecker_Lua); // compression (utils) library
-  luaopen_progress_dialog (m_SpellChecker_Lua);    // progress dialog
-  luaopen_bc (m_SpellChecker_Lua);   // open bc library 
-  luaopen_lsqlite3 (m_SpellChecker_Lua);   // open sqlite library
-  lua_pushcfunction(m_SpellChecker_Lua, luaopen_lpeg);   // open lpeg library
-  lua_call(m_SpellChecker_Lua, 0, 0);
+
+  CallLuaCFunction (m_SpellChecker_Lua, luaopen_rex);            // regular expression library
+  CallLuaCFunction (m_SpellChecker_Lua, luaopen_bits);           // bit manipulation library
+  CallLuaCFunction (m_SpellChecker_Lua, luaopen_compress);       // compression (utils) library
+  CallLuaCFunction (m_SpellChecker_Lua, luaopen_progress_dialog);// progress dialog
+  CallLuaCFunction (m_SpellChecker_Lua, luaopen_bc);             // open bc library   
+  CallLuaCFunction (m_SpellChecker_Lua, luaopen_lsqlite3);       // open sqlite library
+  CallLuaCFunction (m_SpellChecker_Lua, luaopen_lpeg);           // open lpeg library
 
   // add xml reader to utils lib
   luaL_register (m_SpellChecker_Lua, "utils", ptr_xmllib);
 
+
   lua_settop(m_SpellChecker_Lua, 0);   // clear stack
 
   // unless they explicitly enable it, remove ability to load DLLs
@@ -1711,13 +1721,12 @@ bool bSmallScreen = (iScreenX < 1024) || (iScreenY < 768);
 
     luaL_openlibs (m_Translator_Lua);    // new way of opening all libraries
 
-    luaopen_rex (m_Translator_Lua);      // regular expression library
-    luaopen_bits (m_Translator_Lua);     // bit manipulation library
-    luaopen_compress (m_Translator_Lua); // compression (utils) library
-    luaopen_bc (m_Translator_Lua);   // open bc library   
-    luaopen_lsqlite3 (m_Translator_Lua);   // open sqlite library
-    lua_pushcfunction(m_Translator_Lua, luaopen_lpeg);   // open lpeg library
-    lua_call(m_Translator_Lua, 0, 0);
+    CallLuaCFunction (m_Translator_Lua, luaopen_rex);            // regular expression library
+    CallLuaCFunction (m_Translator_Lua, luaopen_bits);           // bit manipulation library
+    CallLuaCFunction (m_Translator_Lua, luaopen_compress);       // compression (utils) library
+    CallLuaCFunction (m_Translator_Lua, luaopen_bc);             // open bc library   
+    CallLuaCFunction (m_Translator_Lua, luaopen_lsqlite3);       // open sqlite library
+    CallLuaCFunction (m_Translator_Lua, luaopen_lpeg);           // open lpeg library
 
     // add xml reader (and other stuff) to utils lib
     luaL_register (m_Translator_Lua, "utils", ptr_xmllib);

scripting/lua_scripting.cpp

@@ -188,16 +188,13 @@ void CScriptEngine::OpenLuaDelayed ()
   lua_pushlightuserdata(L, (void *)m_pDoc);    /* push value */
   lua_call(L, 2, 0);
 
-  luaopen_rex (L);    // regular expression library
-  luaopen_bits (L);   // bit manipulation library
-  luaopen_compress (L);  // compression (utils) library
-  luaopen_progress_dialog (L);    // progress dialog
-//  luaopen_trie (L);   // open trie library
-  luaopen_bc (L);   // open bc library   
-  luaopen_lsqlite3 (L);   // open sqlite library
-
-  lua_pushcfunction (L, luaopen_lpeg);   // open lpeg library
-  lua_call (L, 0, 0);
+  CallLuaCFunction (L, luaopen_rex);            // regular expression library
+  CallLuaCFunction (L, luaopen_bits);           // bit manipulation library
+  CallLuaCFunction (L, luaopen_compress);       // compression (utils) library
+  CallLuaCFunction (L, luaopen_progress_dialog);// progress dialog
+  CallLuaCFunction (L, luaopen_bc);             // open bc library   
+  CallLuaCFunction (L, luaopen_lsqlite3);       // open sqlite library
+  CallLuaCFunction (L, luaopen_lpeg);           // open lpeg library
 
   lua_settop(L, 0);   // clear stack
 
@@ -773,3 +770,11 @@ int CallLuaWithTraceBack (lua_State *L, const int iArguments, const int iReturn)
   return error;
   }  // end of CallLuaWithTraceBack
 
+
+// the more correct way of registering a Lua library -
+// this does a lua_call so we get the Lua environment in the C function
+void CallLuaCFunction (lua_State * L, lua_CFunction fn)
+  {
+  lua_pushcfunction (L, fn); 
+  lua_call (L, 0, 0);
+  }  // end of CallLuaCFunction

scripting/number.c

@@ -113,6 +113,15 @@ bc_init_numbers ()
   _two_->n_value[0] = 2;
 }
 
+/* Added by NJG to remove a memory leak */
+
+void
+bc_free_numbers ()
+  {
+  bc_free_num (&_zero_);
+  bc_free_num (&_one_);
+  bc_free_num (&_two_);
+  }
 
 /* Make a copy of a number!  Just increments the reference count! */
 

scripting/scripting.h

@@ -153,3 +153,5 @@ class CKeyValuePair
 
   };   // end of class  CStringValuePair
 
+// call a C function with the Lua environment
+void CallLuaCFunction (lua_State * L, lua_CFunction fn);