Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2005-12-18 18:04:46
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7980/wxLua/modules/wxlua/include Modified Files: internal.h Log Message: added doxygen config file, fixed int <-> wxWindowId Index: internal.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** internal.h 12 Dec 2005 05:16:31 -0000 1.15 --- internal.h 18 Dec 2005 18:04:38 -0000 1.16 *************** *** 142,146 **** wxLuaObject(); // Constructor that is passed a lua state and a parameter index. ! wxLuaObject(lua_State *, int iParam, int iRef = 1); // Constructor that is passed a lua state and a parameter index. wxLuaObject(const wxLuaState& wxlState, int iParam, int iRef = 1); --- 142,146 ---- wxLuaObject(); // Constructor that is passed a lua state and a parameter index. ! wxLuaObject(lua_State *L, int iParam, int iRef = 1); // Constructor that is passed a lua state and a parameter index. wxLuaObject(const wxLuaState& wxlState, int iParam, int iRef = 1); |
|
From: John L. <jr...@us...> - 2005-12-18 18:04:46
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7980/wxLua/docs Added Files: doxygen.cfg Log Message: added doxygen config file, fixed int <-> wxWindowId --- NEW FILE: doxygen.cfg --- # Doxyfile 1.4.4 #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = wxLua PROJECT_NUMBER = 1 OUTPUT_DIRECTORY = doxygen CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English USE_WINDOWS_ENCODING = NO BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = ALWAYS_DETAILED_SEC = NO INLINE_INHERITED_MEMB = NO FULL_PATH_NAMES = YES STRIP_FROM_PATH = STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = NO MULTILINE_CPP_IS_BRIEF = YES DETAILS_AT_TOP = YES INHERIT_DOCS = YES DISTRIBUTE_GROUP_DOC = NO SEPARATE_MEMBER_PAGES = NO TAB_SIZE = 4 ALIASES = OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO SUBGROUPING = YES #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- EXTRACT_ALL = YES EXTRACT_PRIVATE = YES EXTRACT_STATIC = YES EXTRACT_LOCAL_CLASSES = YES EXTRACT_LOCAL_METHODS = YES HIDE_UNDOC_MEMBERS = NO HIDE_UNDOC_CLASSES = NO HIDE_FRIEND_COMPOUNDS = NO HIDE_IN_BODY_DOCS = NO INTERNAL_DOCS = NO CASE_SENSE_NAMES = YES HIDE_SCOPE_NAMES = NO SHOW_INCLUDE_FILES = YES INLINE_INFO = NO SORT_MEMBER_DOCS = YES SORT_BRIEF_DOCS = NO SORT_BY_SCOPE_NAME = NO GENERATE_TODOLIST = NO GENERATE_TESTLIST = NO GENERATE_BUGLIST = NO GENERATE_DEPRECATEDLIST= NO ENABLED_SECTIONS = MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = YES SHOW_DIRECTORIES = YES FILE_VERSION_FILTER = #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- QUIET = NO WARNINGS = YES WARN_IF_UNDOCUMENTED = YES WARN_IF_DOC_ERROR = YES WARN_NO_PARAMDOC = NO WARN_FORMAT = "$file:$line: $text" WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- INPUT = ../modules/wxlua/include ../modules/wxlua/src ../modules/wxluadebug/include ../modules/wxluadebug/src ../modules/wxluasocket/include ../modules/wxluasocket/src FILE_PATTERNS = *.h *.cpp RECURSIVE = NO EXCLUDE = EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXAMPLE_PATH = EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO IMAGE_PATH = INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = NO #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- SOURCE_BROWSER = YES INLINE_SOURCES = NO STRIP_CODE_COMMENTS = NO REFERENCED_BY_RELATION = YES REFERENCES_RELATION = YES USE_HTAGS = NO VERBATIM_HEADERS = YES #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- ALPHABETICAL_INDEX = NO COLS_IN_ALPHA_INDEX = 5 IGNORE_PREFIX = #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = html HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO CHM_FILE = HHC_LOCATION = GENERATE_CHI = NO BINARY_TOC = NO TOC_EXPAND = NO DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 4 GENERATE_TREEVIEW = YES TREEVIEW_WIDTH = 250 #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- GENERATE_LATEX = NO LATEX_OUTPUT = latex LATEX_CMD_NAME = latex MAKEINDEX_CMD_NAME = makeindex COMPACT_LATEX = NO PAPER_TYPE = a4wide EXTRA_PACKAGES = LATEX_HEADER = PDF_HYPERLINKS = NO USE_PDFLATEX = NO LATEX_BATCHMODE = NO LATEX_HIDE_INDICES = NO #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- GENERATE_RTF = NO RTF_OUTPUT = rtf COMPACT_RTF = NO RTF_HYPERLINKS = NO RTF_STYLESHEET_FILE = RTF_EXTENSIONS_FILE = #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- GENERATE_MAN = NO MAN_OUTPUT = man MAN_EXTENSION = .3 MAN_LINKS = NO #--------------------------------------------------------------------------- # configuration options related to the XML output #--------------------------------------------------------------------------- GENERATE_XML = NO XML_OUTPUT = xml XML_SCHEMA = XML_DTD = XML_PROGRAMLISTING = YES #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- GENERATE_AUTOGEN_DEF = NO #--------------------------------------------------------------------------- # configuration options related to the Perl module output #--------------------------------------------------------------------------- GENERATE_PERLMOD = NO PERLMOD_LATEX = NO PERLMOD_PRETTY = YES PERLMOD_MAKEVAR_PREFIX = #--------------------------------------------------------------------------- # Configuration options related to the preprocessor #--------------------------------------------------------------------------- ENABLE_PREPROCESSING = YES MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = PREDEFINED = "WXUNUSED(a)=a" EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = /usr/bin/perl #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES HAVE_DOT = NO CLASS_GRAPH = YES COLLABORATION_GRAPH = YES GROUP_GRAPHS = YES UML_LOOK = NO TEMPLATE_RELATIONS = NO INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES CALL_GRAPH = NO GRAPHICAL_HIERARCHY = YES DIRECTORY_GRAPH = YES DOT_IMAGE_FORMAT = png DOT_PATH = DOTFILE_DIRS = MAX_DOT_GRAPH_WIDTH = 1024 MAX_DOT_GRAPH_HEIGHT = 1024 MAX_DOT_GRAPH_DEPTH = 0 DOT_TRANSPARENT = NO DOT_MULTI_TARGETS = NO GENERATE_LEGEND = YES DOT_CLEANUP = YES #--------------------------------------------------------------------------- # Configuration::additions related to the search engine #--------------------------------------------------------------------------- SEARCHENGINE = NO |
|
From: John L. <jr...@us...> - 2005-12-18 18:04:46
|
Update of /cvsroot/wxlua/wxLua/docs/doxygen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7980/wxLua/docs/doxygen Added Files: readme.txt Log Message: added doxygen config file, fixed int <-> wxWindowId --- NEW FILE: readme.txt --- This dir is filled with the output of running $doxygen doxygen.cfg in wxLua/docs. |
|
From: John L. <jr...@us...> - 2005-12-18 18:03:36
|
Update of /cvsroot/wxlua/wxLua/docs/doxygen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7729/doxygen Log Message: Directory /cvsroot/wxlua/wxLua/docs/doxygen added to the repository |
|
From: John L. <jr...@us...> - 2005-12-16 05:12:38
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11048/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlintrp.cpp wxlstate.cpp Log Message: remove debug msgdlgs in editor add some debugging to diagnose coroutine ttag problem, no luck so far Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxlstate.cpp 12 Dec 2005 05:16:32 -0000 1.13 --- wxlstate.cpp 16 Dec 2005 05:12:26 -0000 1.14 *************** *** 1015,1021 **** --- 1015,1024 ---- lua_State* L = M_WXLSTATEDATA->m_lua_State; + wxPrintf(wxT("wxLuaState::ttag %d"), index); + int tag = TLUA_NOTAG; if (lua_getmetatable(L, index) != 0) { + wxPrintf(wxT(" has metatable")); lua_pushliteral(L, "tag"); lua_rawget(L, -2); *************** *** 1023,1029 **** --- 1026,1034 ---- { tag = (int) lua_tonumber(L, -1); + wxPrintf(wxT(" and is number %d"), tag); } lua_pop(L, 2); } + wxPrintf(wxT("\n")); return tag; } Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxlbind.cpp 12 Dec 2005 05:16:32 -0000 1.8 --- wxlbind.cpp 16 Dec 2005 05:12:26 -0000 1.9 *************** *** 82,85 **** --- 82,90 ---- const char *cpIndex = "{unknown}"; + bool init_isuserdata = lua_isuserdata(L, 1); + bool init_islightuserdata = lua_islightuserdata(L, 1); + int init_ttag = wxlState.ttag(1); + int init_class_tag = pClass ? *pClass->class_tag : -1; + if ((pClass != NULL) && lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && *************** *** 127,130 **** --- 132,138 ---- } + wxPrintf(wxT("wxLua_lua_getTableFunc '%s' pClass %d, userdata %d, lightuserdata %d, ttag %d, class_tag %d lua_State %d wxLuaStateRefData %d\n"), + lua2wx(cpIndex).c_str(), (long)pClass, init_isuserdata, init_islightuserdata, init_ttag, init_class_tag, (long)L, (long)wxlState.GetRefData()); + if (!fFound) wxlState.terror(wx2lua(wxString::Format(_("wxLua: Attempt to call an invalid method '%s'."), lua2wx(cpIndex).c_str()))); Index: wxlintrp.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlintrp.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxlintrp.cpp 15 Dec 2005 21:45:21 -0000 1.8 --- wxlintrp.cpp 16 Dec 2005 05:12:26 -0000 1.9 *************** *** 67,78 **** // set the value lua_settable( L1, LUA_REGISTRYINDEX ); ! wxLuaInterpreter *L_interp = wxFindLuaInterpreter(L); ! //printf("Adding new lua_State from a thread L=%ld L1=%ld\n", (long)L, (long)L1); fflush(stdout); if (L_interp != NULL) { s_wxHashMapLuaInterpreter[L1] = L_interp; ! // Stick us into the lua interpreter - push key, value lua_pushstring( L1, "__wxLuaInterpreter" ); --- 67,78 ---- // set the value lua_settable( L1, LUA_REGISTRYINDEX ); ! wxLuaInterpreter *L_interp = wxFindLuaInterpreter(L); ! wxPrintf(wxT("wxLuaInterpreter_newthread_handler new lua_State from a thread L=%ld L1=%ld\n"), (long)L, (long)L1); if (L_interp != NULL) { s_wxHashMapLuaInterpreter[L1] = L_interp; ! // Stick us into the lua interpreter - push key, value lua_pushstring( L1, "__wxLuaInterpreter" ); *************** *** 88,92 **** { // L is the original lua_State, L1 child thread, don't remove L ! //printf("Freeing lua_State from a thread L=%ld L1=%ld\n", (long)L, (long)L1); fflush(stdout); wxLuaStateRefData::s_wxHashMapLuaStateRefData.erase(L1); s_wxHashMapLuaInterpreter.erase(L1); --- 88,92 ---- { // L is the original lua_State, L1 child thread, don't remove L ! //wxPrintf(wxT("wxLuaInterpreter_freethread_handler lua_State from a thread L=%ld L1=%ld\n"), (long)L, (long)L1); fflush(stdout); wxLuaStateRefData::s_wxHashMapLuaStateRefData.erase(L1); s_wxHashMapLuaInterpreter.erase(L1); |
|
From: John L. <jr...@us...> - 2005-12-16 05:12:38
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11048/wxLua/apps/wxlua/src Modified Files: editor.h Log Message: remove debug msgdlgs in editor add some debugging to diagnose coroutine ttag problem, no luck so far Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** editor.h 5 Dec 2005 06:11:14 -0000 1.4 --- editor.h 16 Dec 2005 05:12:24 -0000 1.5 *************** *** 9,14 **** extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 82318; ! const unsigned char wxLuaEditor[82318] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, --- 9,14 ---- extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 81916; ! const unsigned char wxLuaEditor[81916] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, *************** *** 1879,1888 **** 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 95, 66, 82, 69, 65, 75, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 32, 61, 32,101,118,101,110,116, 58, 68,121,110, 97,109,105, 99, 67, 97,115,116, 40, 34,119,120, 76,117, 97, 68,101, 98,117,103, 69,118,101,110,116, 34, 41, 10, - 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,114,111,119, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 76,105,110,101, 78,117,109, 98,101,114, 40, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 70,105,108,101, 78, 97,109,101, 40, 41, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 49, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 70,105,108,101, 78, 97,109,101, 40, 41, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 50, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 70,105,108,101, 78, 97,109,101, 40, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,115,116,114,105,110,103, 46,115,117, 98, 40,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 44, 32, 49, 44, 32, 49, 41, 32, 61, 61, 32, 39, 64, 39, 32,116,104,101,110, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 32, 61, 32,115,116,114,105,110,103, 46,115,117, 98, 40,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 44, 32, 50, 44, 32, 45, 49, 41, 10, --- 1879,1884 ---- *************** *** 1891,1899 **** 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 49, 32, 61, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,119,120, 46,119,120, 80,108, 97,116,102,111,114,109, 87,105,110,100,111,119,115, 32,116,104,101,110, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 32, 61, 32,119,120, 46,119,120, 85,110,105,120, 50, 68,111,115, 70,105,108,101,110, 97,109,101, 40,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, - 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 77,101,115,115, 97,103,101, 66,111,120, 40, 34, 39, 34, 46, 46,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 46, 46, 34, 39, 34, 46, 46,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 49, 46, 46, 34, 39, 34, 46, 46,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 50, 46, 46, 34, 39, 34, 44, 32,101,118,101,110,116, 58, 71,101,116, 70,105,108,101, 78, 97,109,101, 40, 41, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 70,111,117,110,100, 32, 61, 32,102, 97,108,115,101, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,105,115,112,108, 97,121, 79,117,116,112,117,116, 40, 34, 65,116, 32, 66,114,101, 97,107,112,111,105,110,116, 32,108,105,110,101, 58, 32, 34, 46, 46,116,111,115,116,114,105,110,103, 40,114,111,119, 41, 46, 46, 34, 32,102,105,108,101, 58, 32, 34, 46, 46,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 46, 46, 34, 92,110, 34, 41, 10, --- 1887,1893 ---- |
|
From: John L. <jr...@us...> - 2005-12-15 21:45:29
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23190/wxLua/modules/wxlua/src Modified Files: wxlintrp.cpp Log Message: fix tracking lua_States for coroutines Index: wxlintrp.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlintrp.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxlintrp.cpp 12 Dec 2005 05:16:32 -0000 1.7 --- wxlintrp.cpp 15 Dec 2005 21:45:21 -0000 1.8 *************** *** 56,64 **** --- 56,84 ---- { // L is the original lua_State, L1 new child thread + wxLuaState wxlState(L); + wxCHECK_RET(wxlState.Ok(), wxT("Invalid wxLuaState")); + + // put into the hashmap + wxLuaStateRefData::s_wxHashMapLuaStateRefData[L1] = wxlState.GetLuaStateRefData(); + + // Stick us into the lua_State - push key, value + lua_pushstring( L1, "__wxLuaStateRefData" ); + lua_pushlightuserdata( L1, (void*)wxlState.GetRefData() ); + // set the value + lua_settable( L1, LUA_REGISTRYINDEX ); + wxLuaInterpreter *L_interp = wxFindLuaInterpreter(L); //printf("Adding new lua_State from a thread L=%ld L1=%ld\n", (long)L, (long)L1); fflush(stdout); if (L_interp != NULL) + { s_wxHashMapLuaInterpreter[L1] = L_interp; + + // Stick us into the lua interpreter - push key, value + lua_pushstring( L1, "__wxLuaInterpreter" ); + lua_pushlightuserdata( L1, L_interp); + // set the value + lua_settable( L1, LUA_REGISTRYINDEX ); + } } *************** *** 69,72 **** --- 89,93 ---- // L is the original lua_State, L1 child thread, don't remove L //printf("Freeing lua_State from a thread L=%ld L1=%ld\n", (long)L, (long)L1); fflush(stdout); + wxLuaStateRefData::s_wxHashMapLuaStateRefData.erase(L1); s_wxHashMapLuaInterpreter.erase(L1); } |
|
From: John L. <jr...@us...> - 2005-12-12 05:16:41
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9956/wxLua/modules/wxlua/src Modified Files: Makefile internal.cpp wxlbind.cpp wxlcallb.cpp wxlintrp.cpp wxlstate.cpp Log Message: Fix Makefiles to use wx-config --exec-prefix for lib dir remove wxLiaCheckRunError, make CheckRunError static in wxLuaState Capitalize all functions in genwxbind.lua, provide means to dump data types wxGetFreeMemory depends on wxLongLong in 2.6, rem out until solution found comment wx.rules and give better names to variables move garbageCollect, setTableFunc, getTableFunc to wxlbind.cpp from internal.cpp rename to wxLua_lua_XXX move callFunction from internal.cpp to wxlstate.cpp prepend with wxLua_lua_XXX Index: internal.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/internal.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** internal.cpp 1 Dec 2005 06:43:53 -0000 1.20 --- internal.cpp 12 Dec 2005 05:16:31 -0000 1.21 *************** *** 978,1026 **** } - // A function object needs to be deleted because the object is being - // garbage collected. - int LUACALL functionGarbageCollect(lua_State *L) - { - wxLuaState wxlState(L); - wxCHECK_MSG(wxlState.Ok(), 1, wxT("Invalid wxLuaState")); - - if (lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == wxlState.GetLuaFunctionTag())) - { - wxLuaFunction *pFunction = (wxLuaFunction *)wxlState.ttouserdata(1, true); - if (pFunction != NULL) - delete pFunction; - } - return 0; - } - - // if the class defines a gc function, then call it. - int LUACALL garbageCollect(lua_State *L) - { - wxLuaState wxlState(L); - wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); - - int retVal = 0; - WXLUACLASS *pClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); - - if ((pClass != NULL) && lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == *pClass->class_tag)) - { - wxHashTable *pHashTable = (wxHashTable *) wxlState.GetLuaStateRefData()->m_pDerivedList->Delete((int)wxlState.ttouserdata(1, true)); - if (pHashTable != NULL) - delete pHashTable; - - int iMethod; - for (iMethod = 0; iMethod < pClass->num_methods; ++iMethod) - { - WXLUAMETHOD *pMethod = pClass->methods + iMethod; - if (pMethod->type == LuaDelete) - { - retVal = (*pMethod->func)(L); - break; - } - } - } - return retVal; - } - // Find a derived method given an object and and a method name. // If the method can be found, push it on to the Lua stack and return 1 --- 978,981 ---- *************** *** 1073,1219 **** } - static const char baseString[] = "base_"; - - // Called by LUA to find the method that corresponds to - // a given method name. The class to lookup is in an - // upvalue. (gettable tag method). - // If the method is a function method push the create a - // wxLua function object onto the lua stack, setting its tag - // so that the function tag of the object will be called to - // invoke the function. - // todo: Handling of properties - int LUACALL getTableFunc(lua_State *L) - { - wxLuaState wxlState(L); - wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); - - bool fFound = false; - int result = 0; - WXLUACLASS *pClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); - const char *cpIndex = "{unknown}"; - - if ((pClass != NULL) && lua_isuserdata(L, 1) && - (lua_islightuserdata(L, 1) == 0) && - (wxlState.ttag(1) == *pClass->class_tag)) - { - void *pObject = wxlState.ttouserdata(1); - cpIndex = lua_tostring(L, 2); - - bool fCallbase = (memcmp(cpIndex, baseString, sizeof(baseString)-1) == 0); - if (fCallbase) - cpIndex += sizeof(baseString)-1; - else - { - if (wxlState.getDerivedMethod(pObject, cpIndex, L).Ok()) - { - fFound = true; - result = 1; - } - } - - if (!fFound) - { - bool propertyFlag; - WXLUAMETHOD *pMethod = wxlState.getLuaMethod(pClass, cpIndex, propertyFlag); - if (pMethod != NULL) - { - if (propertyFlag) - { - lua_remove(L, 2); - result = (*pMethod->func)(L); - fFound = true; - } - else - { - wxLuaFunction *pFunction = new wxLuaFunction(pMethod, pClass, pObject); - if (pFunction != NULL) - { - wxlState.tpushusertag(pFunction, wxlState.GetLuaFunctionTag()); - result = 1; - fFound = true; - } - } - } - } - } - - if (!fFound) - wxlState.terror(wx2lua(wxString::Format(_("wxLua: Attempt to call an invalid method '%s'."), lua2wx(cpIndex).c_str()))); - - return result; - } - - - // Called by LUA to find the method that corresponds to - // a given method name. The class to lookup is in an - // upvalue. (settable tag method). - // todo: Handling of properties - int LUACALL setTableFunc(lua_State *L) - { - wxLuaState wxlState(L); - wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); - - WXLUACLASS *pClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); - const char *cpIndex = lua_tostring(L, 2); - - if ((pClass != NULL) && lua_isuserdata(L, 1) && - (lua_islightuserdata(L, 1) == 0) && - (wxlState.ttag(1) == *pClass->class_tag)) - { - WXLUAMETHOD *pMethod = wxlState.getLuaProperty(pClass, cpIndex, true); - if (pMethod != NULL) - { - lua_remove(L, 2); - (*pMethod->func)(L); - } - else - { - void *pObject = wxlState.ttouserdata(1); - - bool fCreated = false; - wxHashTable *pHashTable = (wxHashTable *) wxlState.GetLuaStateRefData()->m_pDerivedList->Get((int) pObject); - if (pHashTable == NULL) - { - pHashTable = new wxHashTable(wxKEY_STRING); - if (pHashTable != NULL) - { - pHashTable->DeleteContents(true); - - wxlState.GetLuaStateRefData()->m_pDerivedList->Put((int) pObject, pHashTable); - fCreated = true; - } - } - - if (pHashTable != NULL) - { - wxString index = lua2wx(cpIndex); - if (!fCreated) - { - wxLuaObject *pObject = (wxLuaObject *)pHashTable->Delete(index); - if (pObject != NULL) - delete pObject; - } - pHashTable->Put(index, new wxLuaObject(L, 3)); - } - } - } - - return 0; - } - - // Handler for the 'function' tag method. - int LUACALL callFunction(lua_State *L) - { - wxLuaState wxlState(L); - wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); - - if (lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == wxlState.GetLuaFunctionTag())) - { - wxLuaFunction *pFunction = (wxLuaFunction *)wxlState.ttouserdata(1); - return pFunction->CallMethod(L); - } - return 0; - } - // Lookup and return the 'name' of a Lua object from its tag. const char * LUACALL GetLuaTagName(lua_State *L, int nTag) --- 1028,1031 ---- *************** *** 1445,1449 **** wxString errorMsg; ! if (!wxLuaCheckRunError(status, &errorMsg)) { switch(status) --- 1257,1261 ---- wxString errorMsg; ! if (!wxLuaState::CheckRunError(status, &errorMsg)) { switch(status) *************** *** 1505,1535 **** return status; } - - bool wxLuaCheckRunError(int ret_val, wxString *msg) - { - switch (ret_val) - { - case 0 : - return true; - case LUA_ERRRUN: - if (msg) *msg = wxT("wxLua: Error while running chunk"); - return false; - case LUA_ERRSYNTAX: - if (msg) *msg = wxT("wxLua: Syntax error during pre-compilation"); - return false; - case LUA_ERRMEM: - if (msg) *msg = wxT("wxLua: Memory allocation error"); - return false; - case LUA_ERRERR: - if (msg) *msg = wxT("wxLua: Generic error or an error occurred while running the error handler"); - return false; - case LUA_ERRFILE: - if (msg) *msg = wxT("wxLua: Error occurred while opening file"); - return false; - default : - if (msg) *msg = wxT("wxLua: Unknown error"); - break; - } - - return false; - } --- 1317,1318 ---- Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile 25 Nov 2005 19:03:28 -0000 1.4 --- Makefile 12 Dec 2005 05:16:31 -0000 1.5 *************** *** 13,17 **** WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXPREFIX)/lib LUA = $(WXLUA_DIR)/bin/lua --- 13,17 ---- WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXLIB_DIR) LUA = $(WXLUA_DIR)/bin/lua *************** *** 21,24 **** --- 21,25 ---- WXCONFIG := wx-config WXPREFIX = $(shell $(WXCONFIG) --prefix) + WXEXECDIR = $(shell $(WXCONFIG) --exec-prefix) WXBASENAME = $(shell $(WXCONFIG) --basename) WXVERSION = $(shell $(WXCONFIG) --version) *************** *** 27,31 **** WXLDLIBS = $(shell $(WXCONFIG) --libs) WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXPREFIX)/lib # ---------------------------------------------------------------------------- --- 28,32 ---- WXLDLIBS = $(shell $(WXCONFIG) --libs) WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXEXECDIR)/lib # ---------------------------------------------------------------------------- *************** *** 34,38 **** CXX = $(WXCXX) ! APPEXTRADEFS=-I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= TARGET_LIBNAME = lib$(WXBASENAME)_wxlua-$(WXRELEASE) --- 35,39 ---- CXX = $(WXCXX) ! APPEXTRADEFS = -I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= TARGET_LIBNAME = lib$(WXBASENAME)_wxlua-$(WXRELEASE) Index: wxlintrp.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlintrp.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxlintrp.cpp 5 Dec 2005 06:11:14 -0000 1.6 --- wxlintrp.cpp 12 Dec 2005 05:16:32 -0000 1.7 *************** *** 415,419 **** // register handlers to send events ! if (inL != NULL) { RegisterFunction(LuaPrint, wxT("print")); --- 415,419 ---- // register handlers to send events ! if (inL == NULL) { RegisterFunction(LuaPrint, wxT("print")); *************** *** 589,593 **** { wxString msg; ! if (!wxLuaCheckRunError(rc, &msg)) { wxLuaEvent event(wxEVT_LUA_ERROR, GetId(), this); --- 589,593 ---- { wxString msg; ! if (!wxLuaState::CheckRunError(rc, &msg)) { wxLuaEvent event(wxEVT_LUA_ERROR, GetId(), this); Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxlcallb.cpp 7 Dec 2005 05:53:30 -0000 1.8 --- wxlcallb.cpp 12 Dec 2005 05:16:32 -0000 1.9 *************** *** 1,4 **** ///////////////////////////////////////////////////////////////////////////// ! // Name: wxLuaCall // Purpose: A simple class for a C++ wxWidgets program to embed wxLua // Author: Francis Irving --- 1,4 ---- ///////////////////////////////////////////////////////////////////////////// ! // Name: wxLuaCallback // Purpose: A simple class for a C++ wxWidgets program to embed wxLua // Author: Francis Irving Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxlstate.cpp 7 Dec 2005 05:53:30 -0000 1.12 --- wxlstate.cpp 12 Dec 2005 05:16:32 -0000 1.13 *************** *** 56,59 **** --- 56,93 ---- // ---------------------------------------------------------------------------- + // C functions for lua used in wxLuaState + // ---------------------------------------------------------------------------- + + // A function object needs to be deleted because the object is being + // garbage collected. + int LUACALL wxLua_lua_functionGarbageCollect(lua_State *L) + { + wxLuaState wxlState(L); + wxCHECK_MSG(wxlState.Ok(), 1, wxT("Invalid wxLuaState")); + + if (lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == wxlState.GetLuaFunctionTag())) + { + wxLuaFunction *pFunction = (wxLuaFunction *)wxlState.ttouserdata(1, true); + if (pFunction != NULL) + delete pFunction; + } + return 0; + } + + // Handler for the 'function' tag method. + int LUACALL wxLua_lua_callFunction(lua_State *L) + { + wxLuaState wxlState(L); + wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); + + if (lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == wxlState.GetLuaFunctionTag())) + { + wxLuaFunction *pFunction = (wxLuaFunction *)wxlState.ttouserdata(1); + return pFunction->CallMethod(L); + } + return 0; + } + + // ---------------------------------------------------------------------------- // wxFindWindowByPointer - find a window by it's pointer // return NULL if doesn't exist, see wxFindWindowByID and wxFindWindowByLabel *************** *** 544,549 **** } ! tsettagmethod(M_WXLSTATEDATA->m_functionTag, "__gc", functionGarbageCollect); ! tsettagmethod(M_WXLSTATEDATA->m_functionTag, "__call", callFunction); } --- 578,583 ---- } ! tsettagmethod(M_WXLSTATEDATA->m_functionTag, "__gc", wxLua_lua_functionGarbageCollect); ! tsettagmethod(M_WXLSTATEDATA->m_functionTag, "__call", wxLua_lua_callFunction); } *************** *** 1064,1068 **** lua_State* L = M_WXLSTATEDATA->m_lua_State; ! if (tag != TLUA_NOTAG && tget(tag)) { if (!lua_setmetatable(L, -2)) --- 1098,1102 ---- lua_State* L = M_WXLSTATEDATA->m_lua_State; ! if ((tag != TLUA_NOTAG) && tget(tag)) { if (!lua_setmetatable(L, -2)) *************** *** 1076,1080 **** lua_State* L = M_WXLSTATEDATA->m_lua_State; ! if (tag != TLUA_NOTAG && tget(tag)) { if (pClass != NULL) --- 1110,1114 ---- lua_State* L = M_WXLSTATEDATA->m_lua_State; ! if ((tag != TLUA_NOTAG) && tget(tag)) { if (pClass != NULL) Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxlbind.cpp 30 Nov 2005 04:46:17 -0000 1.7 --- wxlbind.cpp 12 Dec 2005 05:16:32 -0000 1.8 *************** *** 27,31 **** WX_DEFINE_LIST(wxLuaBindingList); ! static int LUACALL wxLuaTableErrorHandler(lua_State *L) { terror(L, "Cannot modify read-only wxLua table"); --- 27,31 ---- WX_DEFINE_LIST(wxLuaBindingList); ! static int LUACALL wxLua_lua_tableErrorHandler(lua_State *L) { terror(L, "Cannot modify read-only wxLua table"); *************** *** 33,36 **** --- 33,196 ---- } + // if the class defines a gc function, then call it. + int LUACALL wxLua_lua_garbageCollect(lua_State *L) + { + wxLuaState wxlState(L); + wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); + + int retVal = 0; + WXLUACLASS *pClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); + + if ((pClass != NULL) && lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == *pClass->class_tag)) + { + wxHashTable *pHashTable = (wxHashTable *) wxlState.GetLuaStateRefData()->m_pDerivedList->Delete((int)wxlState.ttouserdata(1, true)); + if (pHashTable != NULL) + delete pHashTable; + + int iMethod; + for (iMethod = 0; iMethod < pClass->num_methods; ++iMethod) + { + WXLUAMETHOD *pMethod = pClass->methods + iMethod; + if (pMethod->type == LuaDelete) + { + retVal = (*pMethod->func)(L); + break; + } + } + } + return retVal; + } + + static const char baseString[] = "base_"; + + // Called by LUA to find the method that corresponds to + // a given method name. The class to lookup is in an + // upvalue. (gettable tag method). + // If the method is a function method push the create a + // wxLua function object onto the lua stack, setting its tag + // so that the function tag of the object will be called to + // invoke the function. + // todo: Handling of properties + int LUACALL wxLua_lua_getTableFunc(lua_State *L) + { + wxLuaState wxlState(L); + wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); + + bool fFound = false; + int result = 0; + WXLUACLASS *pClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); + const char *cpIndex = "{unknown}"; + + if ((pClass != NULL) && lua_isuserdata(L, 1) && + (lua_islightuserdata(L, 1) == 0) && + (wxlState.ttag(1) == *pClass->class_tag)) + { + void *pObject = wxlState.ttouserdata(1); + cpIndex = lua_tostring(L, 2); + + bool fCallbase = (memcmp(cpIndex, baseString, sizeof(baseString)-1) == 0); + if (fCallbase) + cpIndex += sizeof(baseString)-1; + else + { + if (wxlState.getDerivedMethod(pObject, cpIndex, L).Ok()) + { + fFound = true; + result = 1; + } + } + + if (!fFound) + { + bool propertyFlag; + WXLUAMETHOD *pMethod = wxlState.getLuaMethod(pClass, cpIndex, propertyFlag); + if (pMethod != NULL) + { + if (propertyFlag) + { + lua_remove(L, 2); + result = (*pMethod->func)(L); + fFound = true; + } + else + { + wxLuaFunction *pFunction = new wxLuaFunction(pMethod, pClass, pObject); + if (pFunction != NULL) + { + wxlState.tpushusertag(pFunction, wxlState.GetLuaFunctionTag()); + result = 1; + fFound = true; + } + } + } + } + } + + if (!fFound) + wxlState.terror(wx2lua(wxString::Format(_("wxLua: Attempt to call an invalid method '%s'."), lua2wx(cpIndex).c_str()))); + + return result; + } + + + // Called by LUA to find the method that corresponds to + // a given method name. The class to lookup is in an + // upvalue. (settable tag method). + // todo: Handling of properties + int LUACALL wxLua_lua_setTableFunc(lua_State *L) + { + wxLuaState wxlState(L); + wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); + + WXLUACLASS *pClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); + const char *cpIndex = lua_tostring(L, 2); + + if ((pClass != NULL) && lua_isuserdata(L, 1) && + (lua_islightuserdata(L, 1) == 0) && + (wxlState.ttag(1) == *pClass->class_tag)) + { + WXLUAMETHOD *pMethod = wxlState.getLuaProperty(pClass, cpIndex, true); + if (pMethod != NULL) + { + lua_remove(L, 2); + (*pMethod->func)(L); + } + else + { + void *pObject = wxlState.ttouserdata(1); + + bool fCreated = false; + wxHashTable *pHashTable = (wxHashTable *) wxlState.GetLuaStateRefData()->m_pDerivedList->Get((int) pObject); + if (pHashTable == NULL) + { + pHashTable = new wxHashTable(wxKEY_STRING); + if (pHashTable != NULL) + { + pHashTable->DeleteContents(true); + + wxlState.GetLuaStateRefData()->m_pDerivedList->Put((int) pObject, pHashTable); + fCreated = true; + } + } + + if (pHashTable != NULL) + { + wxString index = lua2wx(cpIndex); + if (!fCreated) + { + wxLuaObject *pObject = (wxLuaObject *)pHashTable->Delete(index); + if (pObject != NULL) + delete pObject; + } + pHashTable->Put(index, new wxLuaObject(L, 3)); + } + } + } + + return 0; + } + + // ---------------------------------------------------------------------------- + // Function to compare to events by eventType int wxLuaEventListCompareFn(const void *p1, const void *p2) *************** *** 116,120 **** // prevent changes from lua scripts ! wxlState.tsettagmethod(m_wxLuaTable, "__newindex", wxLuaTableErrorHandler); // register all out classes etc. in the wxLua table --- 276,280 ---- // prevent changes from lua scripts ! //wxlState.tsettagmethod(m_wxLuaTable, "__newindex", wxLua_lua_tableErrorHandler); // FIXME allow this? // register all out classes etc. in the wxLua table *************** *** 132,138 **** static const luaL_reg funcTable[] = { ! {"__gc", garbageCollect }, ! {"__index", getTableFunc }, ! {"__newindex", setTableFunc } }; static const unsigned funcCount = sizeof(funcTable)/sizeof(funcTable[0]); --- 292,298 ---- static const luaL_reg funcTable[] = { ! {"__gc", wxLua_lua_garbageCollect }, ! {"__index", wxLua_lua_getTableFunc }, ! {"__newindex", wxLua_lua_setTableFunc } }; static const unsigned funcCount = sizeof(funcTable)/sizeof(funcTable[0]); *************** *** 141,152 **** lua_State *L = wxlState.GetLuaState(); - size_t iClass; if (registerTypes) m_startTag = wxlState.tnewtag(); int iTag = m_startTag; // install the classes, functions and methods m_classList = (*pfGetClassList)(m_classCount); for (iClass = 0; iClass < m_classCount; ++iClass, iTag = registerTypes ? wxlState.tnewtag() : iTag + 1) --- 301,313 ---- lua_State *L = wxlState.GetLuaState(); if (registerTypes) m_startTag = wxlState.tnewtag(); + size_t iClass = 0; int iTag = m_startTag; // install the classes, functions and methods m_classList = (*pfGetClassList)(m_classCount); + for (iClass = 0; iClass < m_classCount; ++iClass, iTag = registerTypes ? wxlState.tnewtag() : iTag + 1) |
|
From: John L. <jr...@us...> - 2005-12-12 05:16:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9956/wxLua/modules/wxlua/include Modified Files: internal.h wxlbind.h wxlstate.h Log Message: Fix Makefiles to use wx-config --exec-prefix for lib dir remove wxLiaCheckRunError, make CheckRunError static in wxLuaState Capitalize all functions in genwxbind.lua, provide means to dump data types wxGetFreeMemory depends on wxLongLong in 2.6, rem out until solution found comment wx.rules and give better names to variables move garbageCollect, setTableFunc, getTableFunc to wxlbind.cpp from internal.cpp rename to wxLua_lua_XXX move callFunction from internal.cpp to wxlstate.cpp prepend with wxLua_lua_XXX Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxlbind.h 30 Nov 2005 04:46:17 -0000 1.6 --- wxlbind.h 12 Dec 2005 05:16:31 -0000 1.7 *************** *** 25,28 **** --- 25,39 ---- // ---------------------------------------------------------------------------- + // C functions for lua installed by the wxLuaBinding + // ---------------------------------------------------------------------------- + + // memory deallocation function, lua's __gc + int LUACALL wxLua_lua_garbageCollect(lua_State *L); + // lua 'set table' tag method handler, lua's __newindex + int LUACALL wxLua_lua_setTableFunc(lua_State *L); + // lua 'get table' tag method handler, lua's __index + int LUACALL wxLua_lua_getTableFunc(lua_State *L); + + // ---------------------------------------------------------------------------- // wxLua binding enums and structs // ---------------------------------------------------------------------------- Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxlstate.h 8 Dec 2005 16:07:07 -0000 1.10 --- wxlstate.h 12 Dec 2005 05:16:31 -0000 1.11 *************** *** 52,56 **** #define wxLUA_UNUSED_NOTUNICODE(x) x #else /* !Unicode */ ! #define wxLUA_UNUSED_NOTUNICODE(x) #endif // wxUSE_UNICODE --- 52,56 ---- #define wxLUA_UNUSED_NOTUNICODE(x) x #else /* !Unicode */ ! #define wxLUA_UNUSED_NOTUNICODE(x) #endif // wxUSE_UNICODE *************** *** 94,97 **** --- 94,107 ---- //---------------------------------------------------------------------------- + // C functions for lua used in the wxLuaState + //---------------------------------------------------------------------------- + + // free memory associated with the lua call class, lua's __gc + int LUACALL wxLua_lua_functionGarbageCollect(lua_State *L); + + // call a Lua function, lua's __call + int LUACALL wxLua_lua_callFunction(lua_State *L); + + //---------------------------------------------------------------------------- // wxLuaStateRefData - the internal data for the wxLuaState. // please use the wxLuaState accessor functions *************** *** 242,246 **** // ----------------------------------------------------------------------- ! // wxLua Lua Registry Table Functions // create a reference to the object at index iParam in the Lua index --- 252,256 ---- // ----------------------------------------------------------------------- ! // wxLua lua Registry Table Functions // create a reference to the object at index iParam in the Lua index *************** *** 331,335 **** // Check the return value of LuaDoFile, LuaDoBuffer, lua_dostring, lua_dofile // returns true for no error, if error fills msg with a useful message if !NULL ! bool CheckRunError(int ret_val, wxString *msg); // ----------------------------------------------------------------------- --- 341,345 ---- // Check the return value of LuaDoFile, LuaDoBuffer, lua_dostring, lua_dofile // returns true for no error, if error fills msg with a useful message if !NULL ! static bool CheckRunError(int ret_val, wxString *msg); // ----------------------------------------------------------------------- Index: internal.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/internal.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** internal.h 1 Dec 2005 06:43:53 -0000 1.14 --- internal.h 12 Dec 2005 05:16:31 -0000 1.15 *************** *** 234,249 **** int LUACALL toarrayint(lua_State *L, int iParam, wxArrayInt &intArray); - // free memory associated with the lua call class, lua's __gc - int LUACALL functionGarbageCollect(lua_State *L); - - // memory deallocation function, lua's __gc - int LUACALL garbageCollect(lua_State *L); - // lua 'set table' tag method handler, lua's __newindex - int LUACALL setTableFunc(lua_State *L); - // lua 'get table' tag method handler, lua's __index - int LUACALL getTableFunc(lua_State *L); - // call a Lua function, lua's __call - int LUACALL callFunction(lua_State *L); - // Given a lua tag, return the corresponding tag name wxDEPRECATED( const char * LUACALL GetLuaTagName(lua_State *L, int nTag) ); --- 234,237 ---- *************** *** 265,272 **** int LUACALL LuaDoBuffer(lua_State *L, const char *buffer, size_t len, const char *name); - // Check the return value of LuaDoFile, LuaDoBuffer, lua_dostring, lua_dofile - // returns true for no error, if error fills msg with a useful message if !NULL - bool wxLuaCheckRunError(int ret_val, wxString *msg); - // create a reference to the object at index iParam in the Lua index wxDEPRECATED( int LUACALL tinsert(lua_State *luaState, int iParam) ); --- 253,256 ---- |
|
From: John L. <jr...@us...> - 2005-12-12 05:16:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9956/wxLua/modules/wxluadebug/src Modified Files: Makefile Log Message: Fix Makefiles to use wx-config --exec-prefix for lib dir remove wxLiaCheckRunError, make CheckRunError static in wxLuaState Capitalize all functions in genwxbind.lua, provide means to dump data types wxGetFreeMemory depends on wxLongLong in 2.6, rem out until solution found comment wx.rules and give better names to variables move garbageCollect, setTableFunc, getTableFunc to wxlbind.cpp from internal.cpp rename to wxLua_lua_XXX move callFunction from internal.cpp to wxlstate.cpp prepend with wxLua_lua_XXX Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 25 Nov 2005 19:45:36 -0000 1.3 --- Makefile 12 Dec 2005 05:16:32 -0000 1.4 *************** *** 2,6 **** # Author: J Winwood # Created: 2002 ! # Updated: # Copyright: (c) 2002 Lomtick Software. All rights reserved. # --- 2,6 ---- # Author: J Winwood # Created: 2002 ! # Updated: # Copyright: (c) 2002 Lomtick Software. All rights reserved. # *************** *** 13,17 **** WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXPREFIX)/lib LUA = $(WXLUA_DIR)/bin/lua --- 13,17 ---- WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXLIB_DIR) LUA = $(WXLUA_DIR)/bin/lua *************** *** 21,24 **** --- 21,25 ---- WXCONFIG := wx-config WXPREFIX = $(shell $(WXCONFIG) --prefix) + WXEXECDIR = $(shell $(WXCONFIG) --exec-prefix) WXBASENAME = $(shell $(WXCONFIG) --basename) WXVERSION = $(shell $(WXCONFIG) --version) *************** *** 26,31 **** WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) WXLDLIBS = $(shell $(WXCONFIG) --libs) ! WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXPREFIX)/lib # ---------------------------------------------------------------------------- --- 27,32 ---- WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) WXLDLIBS = $(shell $(WXCONFIG) --libs) ! WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXEXECDIR)/lib # ---------------------------------------------------------------------------- *************** *** 34,41 **** CXX = $(WXCXX) ! APPEXTRADEFS=-I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= TARGET_LIBNAME = lib$(WXBASENAME)_wxluadebug-$(WXRELEASE) ! TARGET_LIBDIR = $(WXPREFIX)/lib TARGET_LIB_STATIC = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).a --- 35,42 ---- CXX = $(WXCXX) ! APPEXTRADEFS = -I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= TARGET_LIBNAME = lib$(WXBASENAME)_wxluadebug-$(WXRELEASE) ! TARGET_LIBDIR = $(WXLUA_LIBDIR) TARGET_LIB_STATIC = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).a *************** *** 64,72 **** .cpp.o: ! $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $< all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) ! $(TARGET_LIB_STATIC) : $(OBJECTS) @$(RM) $@ $(AR) $(AROPTIONS) $@ $(OBJECTS) --- 65,73 ---- .cpp.o: ! $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) ! $(TARGET_LIB_STATIC) : $(OBJECTS) @$(RM) $@ $(AR) $(AROPTIONS) $@ $(OBJECTS) *************** *** 84,88 **** $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \ $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) -include $(DEPFILES) --- 85,89 ---- $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \ $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) -include $(DEPFILES) |
|
From: John L. <jr...@us...> - 2005-12-12 05:16:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9956/wxLua/modules/wxluasocket/src Modified Files: Makefile wxldtarg.cpp Log Message: Fix Makefiles to use wx-config --exec-prefix for lib dir remove wxLiaCheckRunError, make CheckRunError static in wxLuaState Capitalize all functions in genwxbind.lua, provide means to dump data types wxGetFreeMemory depends on wxLongLong in 2.6, rem out until solution found comment wx.rules and give better names to variables move garbageCollect, setTableFunc, getTableFunc to wxlbind.cpp from internal.cpp rename to wxLua_lua_XXX move callFunction from internal.cpp to wxlstate.cpp prepend with wxLua_lua_XXX Index: wxldtarg.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxldtarg.cpp 2 Dec 2005 06:38:31 -0000 1.6 --- wxldtarg.cpp 12 Dec 2005 05:16:32 -0000 1.7 *************** *** 133,137 **** wxString errorMsg; ! m_fErrorsSeen = !wxLuaCheckRunError(rc, &errorMsg); if (m_fErrorsSeen) { --- 133,137 ---- wxString errorMsg; ! m_fErrorsSeen = !wxLuaState::CheckRunError(rc, &errorMsg); if (m_fErrorsSeen) { *************** *** 472,476 **** wxString errorMsg; ! if (!wxLuaCheckRunError(nResult, &errorMsg)) lua_pushlstring(L, wx2lua(errorMsg), errorMsg.Len()); else if (lua_gettop(L) == nOldTop) --- 472,476 ---- wxString errorMsg; ! if (!wxLuaState::CheckRunError(nResult, &errorMsg)) lua_pushlstring(L, wx2lua(errorMsg), errorMsg.Len()); else if (lua_gettop(L) == nOldTop) Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile 1 Dec 2005 06:43:54 -0000 1.5 --- Makefile 12 Dec 2005 05:16:32 -0000 1.6 *************** *** 2,6 **** # Author: J Winwood # Created: 2002 ! # Updated: # Copyright: (c) 2002 Lomtick Software. All rights reserved. # --- 2,6 ---- # Author: J Winwood # Created: 2002 ! # Updated: # Copyright: (c) 2002 Lomtick Software. All rights reserved. # *************** *** 13,17 **** WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXPREFIX)/lib LUA = $(WXLUA_DIR)/bin/lua --- 13,17 ---- WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXLIB_DIR) LUA = $(WXLUA_DIR)/bin/lua *************** *** 21,24 **** --- 21,25 ---- WXCONFIG := wx-config WXPREFIX = $(shell $(WXCONFIG) --prefix) + WXEXECDIR = $(shell $(WXCONFIG) --exec-prefix) WXBASENAME = $(shell $(WXCONFIG) --basename) WXVERSION = $(shell $(WXCONFIG) --version) *************** *** 26,31 **** WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) WXLDLIBS = $(shell $(WXCONFIG) --libs) ! WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXPREFIX)/lib # ---------------------------------------------------------------------------- --- 27,32 ---- WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) WXLDLIBS = $(shell $(WXCONFIG) --libs) ! WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXEXECDIR)/lib # ---------------------------------------------------------------------------- *************** *** 34,41 **** CXX = $(WXCXX) ! APPEXTRADEFS=-I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= TARGET_LIBNAME = lib$(WXBASENAME)_wxluasocket-$(WXRELEASE) ! TARGET_LIBDIR = $(WXPREFIX)/lib TARGET_LIB_STATIC = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).a --- 35,42 ---- CXX = $(WXCXX) ! APPEXTRADEFS = -I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= TARGET_LIBNAME = lib$(WXBASENAME)_wxluasocket-$(WXRELEASE) ! TARGET_LIBDIR = $(WXLUA_LIBDIR) TARGET_LIB_STATIC = $(TARGET_LIBDIR)/$(TARGET_LIBNAME).a *************** *** 70,78 **** .cpp.o: ! $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $< all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) ! $(TARGET_LIB_STATIC) : $(OBJECTS) @$(RM) $@ $(AR) $(AROPTIONS) $@ $(OBJECTS) --- 71,79 ---- .cpp.o: ! $(CXX) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< all: $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) ! $(TARGET_LIB_STATIC) : $(OBJECTS) @$(RM) $@ $(AR) $(AROPTIONS) $@ $(OBJECTS) *************** *** 90,94 **** $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \ $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) -include $(DEPFILES) --- 91,95 ---- $(TARGET_LIB_STATIC) $(TARGET_LIB_SHARED) \ $(TARGET_LIBDIR)/$(TARGET_LIB_LINK1) \ ! $(TARGET_LIBDIR)/$(TARGET_LIB_LINK2) -include $(DEPFILES) |
|
From: John L. <jr...@us...> - 2005-12-12 05:16:40
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9956/wxLua/bindings/wxwidgets Modified Files: defsutil.i wx.rules Log Message: Fix Makefiles to use wx-config --exec-prefix for lib dir remove wxLiaCheckRunError, make CheckRunError static in wxLuaState Capitalize all functions in genwxbind.lua, provide means to dump data types wxGetFreeMemory depends on wxLongLong in 2.6, rem out until solution found comment wx.rules and give better names to variables move garbageCollect, setTableFunc, getTableFunc to wxlbind.cpp from internal.cpp rename to wxLua_lua_XXX move callFunction from internal.cpp to wxlstate.cpp prepend with wxLua_lua_XXX Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** defsutil.i 28 Nov 2005 01:28:54 -0000 1.7 --- defsutil.i 12 Dec 2005 05:16:31 -0000 1.8 *************** *** 75,80 **** // Network, user, and OS functions ! !%wxchkver27 %builtin long wxGetFreeMemory() ! %wxchkver27 %builtin wxMemorySize wxGetFreeMemory() %builtin wxString wxGetFullHostName() //%builtin bool wxGetEmailAddress(const wxString& buf, int sz) --- 75,81 ---- // Network, user, and OS functions ! // !%wxchkver27 %builtin long wxGetFreeMemory() FIXME need to add wxLongLong - maybe always return longlong here? ! // %wxchkver27 %builtin wxMemorySize wxGetFreeMemory() ! %builtin wxString wxGetFullHostName() //%builtin bool wxGetEmailAddress(const wxString& buf, int sz) Index: wx.rules =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx.rules,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wx.rules 30 Nov 2005 04:46:16 -0000 1.9 --- wx.rules 12 Dec 2005 05:16:31 -0000 1.10 *************** *** 1,32 **** ! -- rules to build wxLua binding for parts/debuggermsw ! wxluapath="../" ! --cdluapath=wxluapath.."/parts/cdlua/" -- FIXME see genwxbind for this ! interfacedir = wxluapath.."/bindings/wxwidgets" ! outputdir = wxluapath.."/modules/wxbind/src" ! outputheaderdir = wxluapath.."/modules/wxbind/include" ! hook_namespace = "wx" -- lua namespace ! hook_precmp_header = "wx/wxprec.h" -- always #include this ! hook_binding_class = hook_namespace.."_Binding" -- wxLuaBinding class hook_define_file = hook_namespace.."_define" hook_define_fn = "wxLuaGetDefineList_"..hook_namespace hook_object_file = hook_namespace.."_object" hook_object_fn = "wxLuaGetObjectList_"..hook_namespace hook_event_file = hook_namespace.."_event" hook_event_fn = "wxLuaGetEventList_"..hook_namespace hook_builtin_file = hook_namespace.."_builtin" hook_builtin_fn = "wxLuaGetBuiltinList_"..hook_namespace hook_class_file = hook_namespace.."_class" hook_class_fn = "wxLuaGetClassList_"..hook_namespace - hook_header_file = "wxbind/include/wxbind.h" - - override_file = "override.hpp" -- bindings to override -- generate comments into code comment = true ! -- list of interface files to use to make the bindings interfaceFileList = { --- 1,62 ---- ! ------------------------------------------------------------------------------- ! -- rules to build wxWidgets binding for wxLua (for genwxbind.lua) ! ------------------------------------------------------------------------------- ! ------------------------------------------------------------------------------- ! -- Set the root directory of the wxLua distribution, used only in this file ! wxlua_dir = "../" ! --cdluapath=wxlua_dir.."/parts/cdlua/" -- FIXME see genwxbind for this ! ------------------------------------------------------------------------------- ! -- Set the bindings directory that contains the *.i interface files ! interface_dir = wxlua_dir.."/bindings/wxwidgets" ! -- Set the directory to output the bindings to, both C++ header and source files ! output_dir = wxlua_dir.."/modules/wxbind/src" ! output_header_dir = wxlua_dir.."/modules/wxbind/include" ! ! ------------------------------------------------------------------------------- ! -- Set the namespace that the bindings will be placed, eg. wx.wxWindow(...) ! hook_namespace = "wx" ! -- Set any #includes or other C++ code to be placed verbatim at the top of ! -- every generated file or "" for none ! hook_header_includes = "#include \"wx/wxprec.h\"\n" ! -- Set the name of the subclassed wxLuaBinding class ! hook_binding_class = hook_namespace.."_Binding" ! ! ------------------------------------------------------------------------------- ! -- Set the name of the header file that will have the #includes from the ! -- bindings in it. This will be used as #include "hook_header_file" in the C++ ! -- wrapper files, so it must include the proper #include path. ! hook_header_file = "wxbind/include/wxbind.h" ! ! ------------------------------------------------------------------------------- ! -- Set the files to output the structs of wrapped defined values, objects, ! -- events, builtin (static functionc), and classes hook_define_file = hook_namespace.."_define" hook_define_fn = "wxLuaGetDefineList_"..hook_namespace + hook_object_file = hook_namespace.."_object" hook_object_fn = "wxLuaGetObjectList_"..hook_namespace + hook_event_file = hook_namespace.."_event" hook_event_fn = "wxLuaGetEventList_"..hook_namespace + hook_builtin_file = hook_namespace.."_builtin" hook_builtin_fn = "wxLuaGetBuiltinList_"..hook_namespace + hook_class_file = hook_namespace.."_class" hook_class_fn = "wxLuaGetClassList_"..hook_namespace + ------------------------------------------------------------------------------- -- generate comments into code comment = true ! ------------------------------------------------------------------------------- ! -- Set the file that contains bindings that need to be overridden ! override_file = "override.hpp" ! ! ------------------------------------------------------------------------------- ! -- list of interface files to use to make the bindings in the "interfacedir" interfaceFileList = { *************** *** 63,69 **** } ! -- wxLuaBinding OnRegister body ! -- ! -- can load extra lua bindings here onregister = { --- 93,99 ---- } ! ------------------------------------------------------------------------------- ! -- virtual wxLuaBinding::OnRegister body - can load extra lua bindings here ! onregister = { *************** *** 82,85 **** } ! -- you can add additional conditions here ! conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" --- 112,122 ---- } ! ------------------------------------------------------------------------------- ! -- Add additional conditions here ! ! -- example: conditions["DOXYGEN_INCLUDE"] = "defined(DOXYGEN_INCLUDE)" ! ! ------------------------------------------------------------------------------- ! -- Add additional data types here ! ! -- example: dataTypes["wxArrayInt"] = AllocDataType("wxArrayInt", "class",false) |
|
From: John L. <jr...@us...> - 2005-12-12 05:16:39
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9956/wxLua/modules/wxbind/src Modified Files: Makefile Log Message: Fix Makefiles to use wx-config --exec-prefix for lib dir remove wxLiaCheckRunError, make CheckRunError static in wxLuaState Capitalize all functions in genwxbind.lua, provide means to dump data types wxGetFreeMemory depends on wxLongLong in 2.6, rem out until solution found comment wx.rules and give better names to variables move garbageCollect, setTableFunc, getTableFunc to wxlbind.cpp from internal.cpp rename to wxLua_lua_XXX move callFunction from internal.cpp to wxlstate.cpp prepend with wxLua_lua_XXX Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 20 Nov 2005 22:31:43 -0000 1.3 --- Makefile 12 Dec 2005 05:16:31 -0000 1.4 *************** *** 2,6 **** # Author: J Winwood # Created: 2002 ! # Updated: # Copyright: (c) 2002 Lomtick Software. All rights reserved. # --- 2,6 ---- # Author: J Winwood # Created: 2002 ! # Updated: # Copyright: (c) 2002 Lomtick Software. All rights reserved. # *************** *** 16,20 **** WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXPREFIX)/lib LUA = $(WXLUA_DIR)/bin/lua --- 16,20 ---- WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXLIB_DIR) LUA = $(WXLUA_DIR)/bin/lua *************** *** 24,27 **** --- 24,28 ---- WXCONFIG := wx-config WXPREFIX = $(shell $(WXCONFIG) --prefix) + WXEXECDIR = $(shell $(WXCONFIG) --exec-prefix) WXBASENAME = $(shell $(WXCONFIG) --basename) WXVERSION = $(shell $(WXCONFIG) --version) *************** *** 29,34 **** WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) WXLDLIBS = $(shell $(WXCONFIG) --libs) ! WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXPREFIX)/lib # ---------------------------------------------------------------------------- --- 30,35 ---- WXCXXFLAGS = $(shell $(WXCONFIG) --cxxflags) WXLDLIBS = $(shell $(WXCONFIG) --libs) ! WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXEXECDIR)/lib # ---------------------------------------------------------------------------- *************** *** 37,44 **** CXX = $(WXCXX) ! APPEXTRADEFS=-I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluabind-$(WXRELEASE) ! WXBIND_TARGET_LIBDIR = $(WXPREFIX)/lib WXBIND_TARGET_LIB_STATIC = $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIBNAME).a --- 38,45 ---- CXX = $(WXCXX) ! APPEXTRADEFS = -I../../ -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= WXBIND_TARGET_LIBNAME = lib$(WXBASENAME)_wxluabind-$(WXRELEASE) ! WXBIND_TARGET_LIBDIR = $(WXLUA_LIBDIR) WXBIND_TARGET_LIB_STATIC = $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIBNAME).a *************** *** 53,57 **** LN_S = ln -s ! HEADERS = SOURCES = \ --- 54,58 ---- LN_S = ln -s ! HEADERS = SOURCES = \ *************** *** 98,106 **** .cpp.o: ! $(CXX) -include $(WXLUASETUP) -c $(CXXFLAGS) $(APPEXTRADEFS)-o $@ $< all: $(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED) ! $(WXBIND_TARGET_LIB_STATIC): $(OBJECTS) @$(RM) $@ $(AR) $(AROPTIONS) $@ $(OBJECTS) --- 99,107 ---- .cpp.o: ! $(CXX) -include $(WXLUASETUP) -c $(CXXFLAGS) $(APPEXTRADEFS) -o $@ $< all: $(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED) ! $(WXBIND_TARGET_LIB_STATIC): $(OBJECTS) @$(RM) $@ $(AR) $(AROPTIONS) $@ $(OBJECTS) *************** *** 118,122 **** $(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED) \ $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK1) \ ! $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK2) -include $(DEPFILES) --- 119,123 ---- $(WXBIND_TARGET_LIB_STATIC) $(WXBIND_TARGET_LIB_SHARED) \ $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK1) \ ! $(WXBIND_TARGET_LIBDIR)/$(WXBIND_TARGET_LIB_LINK2) -include $(DEPFILES) |
|
From: John L. <jr...@us...> - 2005-12-12 05:16:39
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9956/wxLua/apps/wxluaedit/src Modified Files: Makefile Log Message: Fix Makefiles to use wx-config --exec-prefix for lib dir remove wxLiaCheckRunError, make CheckRunError static in wxLuaState Capitalize all functions in genwxbind.lua, provide means to dump data types wxGetFreeMemory depends on wxLongLong in 2.6, rem out until solution found comment wx.rules and give better names to variables move garbageCollect, setTableFunc, getTableFunc to wxlbind.cpp from internal.cpp rename to wxLua_lua_XXX move callFunction from internal.cpp to wxlstate.cpp prepend with wxLua_lua_XXX Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 1 Dec 2005 04:17:29 -0000 1.2 --- Makefile 12 Dec 2005 05:16:31 -0000 1.3 *************** *** 13,17 **** WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXPREFIX)/lib LUA = $(WXLUA_DIR)/bin/lua --- 13,17 ---- WXLUA_DIR = ../../.. ! WXLUA_LIBDIR = $(WXEXECDIR) LUA = $(WXLUA_DIR)/bin/lua *************** *** 21,24 **** --- 21,25 ---- WXCONFIG := wx-config WXPREFIX = $(shell $(WXCONFIG) --prefix) + WXEXECDIR = $(shell $(WXCONFIG) --exec-prefix) WXBASENAME = $(shell $(WXCONFIG) --basename) WXVERSION = $(shell $(WXCONFIG) --version) *************** *** 27,31 **** WXLDLIBS = $(shell $(WXCONFIG) --libs) WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXPREFIX)/lib # ---------------------------------------------------------------------------- --- 28,32 ---- WXLDLIBS = $(shell $(WXCONFIG) --libs) WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXEXECDIR)/lib # ---------------------------------------------------------------------------- *************** *** 49,53 **** WXSTEDIT_DIR = $(WXCODE)/components/wxstedit ! APPEXTRADEFS=-I$(WXSTEDIT_DIR)/include -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= # This will build a static wxLua app, staticly linked to .a libs --- 50,54 ---- WXSTEDIT_DIR = $(WXCODE)/components/wxstedit ! APPEXTRADEFS = -I$(WXSTEDIT_DIR)/include -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= # This will build a static wxLua app, staticly linked to .a libs |
|
From: John L. <jr...@us...> - 2005-12-12 05:16:39
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9956/wxLua/bindings Modified Files: genwxbind.lua Log Message: Fix Makefiles to use wx-config --exec-prefix for lib dir remove wxLiaCheckRunError, make CheckRunError static in wxLuaState Capitalize all functions in genwxbind.lua, provide means to dump data types wxGetFreeMemory depends on wxLongLong in 2.6, rem out until solution found comment wx.rules and give better names to variables move garbageCollect, setTableFunc, getTableFunc to wxlbind.cpp from internal.cpp rename to wxLua_lua_XXX move callFunction from internal.cpp to wxlstate.cpp prepend with wxLua_lua_XXX Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** genwxbind.lua 30 Nov 2005 04:46:16 -0000 1.12 --- genwxbind.lua 12 Dec 2005 05:16:31 -0000 1.13 *************** *** 58,62 **** ! -- simple function to completely dump the contents of a table function DumpTable(atable, prefix, tablelevel) if prefix == nil then prefix = "" end --- 58,65 ---- ! -- completely dump the contents of a table ! -- atable is the input table to dump the contents of [...992 lines suppressed...] SerializeDataTypes() print("Done\n") end --- 4434,4448 ---- InitDataTypes() ! ReadOverrideFile() ! local interfaceList = GenerateInterfaceData() ! WriteWrapperFiles(interfaceList) SerializeDataTypes() + --local fileTable = GenerateDataTypesFileTable() + --for i = 1, table.getn(fileTable) do print(fileTable[i]) end + --WriteTableToFile(interface.filename, fileData, false) + print("Done\n") end |
|
From: John L. <jr...@us...> - 2005-12-12 05:16:39
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9956/wxLua/apps/wxlua/src Modified Files: Makefile wxlua.cpp Log Message: Fix Makefiles to use wx-config --exec-prefix for lib dir remove wxLiaCheckRunError, make CheckRunError static in wxLuaState Capitalize all functions in genwxbind.lua, provide means to dump data types wxGetFreeMemory depends on wxLongLong in 2.6, rem out until solution found comment wx.rules and give better names to variables move garbageCollect, setTableFunc, getTableFunc to wxlbind.cpp from internal.cpp rename to wxLua_lua_XXX move callFunction from internal.cpp to wxlstate.cpp prepend with wxLua_lua_XXX Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxlua.cpp 5 Dec 2005 06:11:14 -0000 1.10 --- wxlua.cpp 12 Dec 2005 05:16:31 -0000 1.11 *************** *** 147,151 **** int rc = RunEditor(); ! fOk = wxLuaCheckRunError(rc, &errorStr); if (!fOk) DisplayError(errorStr); --- 147,151 ---- int rc = RunEditor(); ! fOk = wxLuaState::CheckRunError(rc, &errorStr); if (!fOk) DisplayError(errorStr); *************** *** 190,194 **** int rc = RunEditor(); ! fOk = wxLuaCheckRunError(rc, &errorStr); if (!fOk) DisplayError(errorStr); --- 190,194 ---- int rc = RunEditor(); ! fOk = wxLuaState::CheckRunError(rc, &errorStr); if (!fOk) DisplayError(errorStr); *************** *** 210,214 **** int rc = RunEditor(); ! fOk = wxLuaCheckRunError(rc, &errorStr); if (!fOk) DisplayError(errorStr); --- 210,214 ---- int rc = RunEditor(); ! fOk = wxLuaState::CheckRunError(rc, &errorStr); if (!fOk) DisplayError(errorStr); *************** *** 275,279 **** int rc = RunEditor(); ! fOk = wxLuaCheckRunError(rc, &errorStr); if (!fOk) DisplayError(errorStr); --- 275,279 ---- int rc = RunEditor(); ! fOk = wxLuaState::CheckRunError(rc, &errorStr); if (!fOk) DisplayError(errorStr); Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile 29 Nov 2005 05:45:09 -0000 1.8 --- Makefile 12 Dec 2005 05:16:31 -0000 1.9 *************** *** 21,24 **** --- 21,25 ---- WXCONFIG := wx-config WXPREFIX = $(shell $(WXCONFIG) --prefix) + WXEXECDIR = $(shell $(WXCONFIG) --exec-prefix) WXBASENAME = $(shell $(WXCONFIG) --basename) WXVERSION = $(shell $(WXCONFIG) --version) *************** *** 27,31 **** WXLDLIBS = $(shell $(WXCONFIG) --libs) WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXPREFIX)/lib # ---------------------------------------------------------------------------- --- 28,32 ---- WXLDLIBS = $(shell $(WXCONFIG) --libs) WXCXX = $(shell $(WXCONFIG) --cxx) ! WXLIB_DIR = $(WXEXECDIR)/lib # ---------------------------------------------------------------------------- *************** *** 45,49 **** WXFL_LIB = $(WXBASENAME)_fl-$(WXRELEASE) ! APPEXTRADEFS=-I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= # This will build a static wxLua app, staticly linked to .a libs --- 46,50 ---- WXFL_LIB = $(WXBASENAME)_fl-$(WXRELEASE) ! APPEXTRADEFS = -I$(WXLUA_DIR)/modules -I$(WXPREFIX)/contrib/include -fexceptions -DLUACALL= # This will build a static wxLua app, staticly linked to .a libs |
|
From: John L. <jr...@us...> - 2005-12-08 16:07:24
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16399/wxLua/modules/wxlua/include Modified Files: wxlstate.h Log Message: fix for nonunicode wxWidgets builds Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxlstate.h 7 Dec 2005 05:53:30 -0000 1.9 --- wxlstate.h 8 Dec 2005 16:07:07 -0000 1.10 *************** *** 49,52 **** --- 49,58 ---- class WXDLLIMPEXP_WXLUA wxLuaStateRefData; + #if wxUSE_UNICODE + #define wxLUA_UNUSED_NOTUNICODE(x) x + #else /* !Unicode */ + #define wxLUA_UNUSED_NOTUNICODE(x) + #endif // wxUSE_UNICODE + // ---------------------------------------------------------------------------- // String functions - convert between Lua (ansi string) and wxString (encoded) *************** *** 333,337 **** // Raw basic lua stack functions, lua.h ! // FIXME LuaStackObject Stack(int index) { return LuaStackObject(this, index); } int lua_GetTop(); void lua_SetTop(int index); --- 339,343 ---- // Raw basic lua stack functions, lua.h ! // FIXME LuaStackObject Stack(int index) { return LuaStackObject(this, index); } int lua_GetTop(); void lua_SetTop(int index); *************** *** 376,380 **** void lua_PushLString(const wxString& s) { lua_PushLString(wx2lua(s), s.Len()); } void lua_PushString(const char* s); ! void lua_PushString(const wxString& s) { lua_PushString(wx2lua(s)); } //wxString lua_PushVfString(); //wxString lua_PushFString(); --- 382,386 ---- void lua_PushLString(const wxString& s) { lua_PushLString(wx2lua(s), s.Len()); } void lua_PushString(const char* s); ! wxLUA_UNUSED_NOTUNICODE(void lua_PushString(const wxString& s) { lua_PushString(wx2lua(s)); }) //wxString lua_PushVfString(); //wxString lua_PushFString(); *************** *** 409,415 **** int lua_PCall(int nargs, int nresults, int errfunc); int lua_CPCall(lua_CFunction func, void *ud); - int lua_Load(lua_Chunkreader reader, void *dt, const wxString& chunkname) - { return lua_Load(reader, dt, wx2lua(chunkname)); } int lua_Load(lua_Chunkreader reader, void *dt, const char* chunkname); int lua_Dump (lua_State *L, lua_Chunkwriter writer, void *data); --- 415,420 ---- int lua_PCall(int nargs, int nresults, int errfunc); int lua_CPCall(lua_CFunction func, void *ud); int lua_Load(lua_Chunkreader reader, void *dt, const char* chunkname); + wxLUA_UNUSED_NOTUNICODE(int lua_Load(lua_Chunkreader reader, void *dt, const wxString& chunkname) { return lua_Load(reader, dt, wx2lua(chunkname)); }) int lua_Dump (lua_State *L, lua_Chunkwriter writer, void *data); *************** *** 443,448 **** //lua_pop(L,n) lua_settop(L, -(n)-1) - void lua_Register(const wxString& funcName, lua_CFunction f) { lua_Register(wx2lua(funcName), f); } void lua_Register(const char* funcName, lua_CFunction f); void lua_PushCFunction(lua_CFunction f); --- 448,453 ---- //lua_pop(L,n) lua_settop(L, -(n)-1) void lua_Register(const char* funcName, lua_CFunction f); + wxLUA_UNUSED_NOTUNICODE(void lua_Register(const wxString& funcName, lua_CFunction f) { lua_Register(wx2lua(funcName), f); }) void lua_PushCFunction(lua_CFunction f); *************** *** 461,466 **** int lua_GetStack(int level, lua_Debug* ar); - int lua_GetInfo(const wxString& what, lua_Debug* ar) { return lua_GetInfo(wx2lua(what), ar); } int lua_GetInfo(const char* what, lua_Debug* ar); const char* lua_GetLocal(const lua_Debug* ar, int n); wxString lua_GetLocalwxString(const lua_Debug* ar, int n) { return lua2wx(lua_GetLocal(ar, n)); } --- 466,471 ---- int lua_GetStack(int level, lua_Debug* ar); int lua_GetInfo(const char* what, lua_Debug* ar); + wxLUA_UNUSED_NOTUNICODE(int lua_GetInfo(const wxString& what, lua_Debug* ar) { return lua_GetInfo(wx2lua(what), ar); }) const char* lua_GetLocal(const lua_Debug* ar, int n); wxString lua_GetLocalwxString(const lua_Debug* ar, int n) { return lua2wx(lua_GetLocal(ar, n)); } |
|
From: John L. <jr...@us...> - 2005-12-07 05:53:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2986/wxLua/modules/wxluadebug/src Modified Files: staktree.cpp Log Message: add getters for tracked events and destroy events make luastaterefdata lists not pointers Index: staktree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** staktree.cpp 5 Dec 2005 06:11:15 -0000 1.11 --- staktree.cpp 7 Dec 2005 05:53:30 -0000 1.12 *************** *** 400,419 **** int derivedCount = 0, trackedCount = 0, ! appHandlerCount = 0, windowCount = 0; ! if (wxlState.GetLuaStateRefData()->m_pDerivedList) // FIXME add accessor functions or something derivedCount = wxlState.GetLuaStateRefData()->m_pDerivedList->GetCount(); if (wxlState.GetLuaStateRefData()->m_pTrackedList) trackedCount = wxlState.GetLuaStateRefData()->m_pTrackedList->GetCount(); - if (wxlState.GetLuaStateRefData()->m_pAppHandlerList) - appHandlerCount = wxlState.GetLuaStateRefData()->m_pAppHandlerList->GetCount(); - if (wxlState.GetLuaStateRefData()->m_pWindowList) - windowCount = wxlState.GetLuaStateRefData()->m_pWindowList->GetCount(); ! treeControl->AppendItem (rootItem, wxT("Derived List"), 1, 1, new wxLuaDebugDataItem(_("Derived List"), wxT("wxLuaData"), wxT(""), wxString::Format(wxT("%d"), derivedCount), LUA_NOREF, 0)); ! treeControl->AppendItem (rootItem, wxT("Tracked List"), 1, 1, new wxLuaDebugDataItem(_("Tracked List"), wxT("wxLuaData"), wxT(""), wxString::Format(wxT("%d"), trackedCount), LUA_NOREF, 0)); ! treeControl->AppendItem (rootItem, wxT("AppHandler List"), 1, 1, new wxLuaDebugDataItem(_("AppHandler List"), wxT("wxLuaData"), wxT(""), wxString::Format(wxT("%d"), appHandlerCount), LUA_NOREF, 0)); ! treeControl->AppendItem (rootItem, wxT("wxWindow List"), 1, 1, new wxLuaDebugDataItem(_("wxWindow List"), wxT("wxLuaData"), wxT(""), wxString::Format(wxT("%d"), windowCount), LUA_NOREF, 0)); } --- 400,418 ---- int derivedCount = 0, trackedCount = 0, ! eventHandlerCount = 0, windowCount = 0; ! if (wxlState.GetLuaStateRefData()->m_pDerivedList) derivedCount = wxlState.GetLuaStateRefData()->m_pDerivedList->GetCount(); if (wxlState.GetLuaStateRefData()->m_pTrackedList) trackedCount = wxlState.GetLuaStateRefData()->m_pTrackedList->GetCount(); ! eventHandlerCount = wxlState.GetLuaStateRefData()->m_eventHandlerList.GetCount(); ! windowCount = wxlState.GetLuaStateRefData()->m_windowList.GetCount(); ! ! treeControl->AppendItem(rootItem, wxT("Derived List"), 1, 1, new wxLuaDebugDataItem(_("Derived List"), wxT("wxLuaData"), wxT(""), wxString::Format(wxT("%d"), derivedCount), LUA_NOREF, 0)); ! treeControl->AppendItem(rootItem, wxT("Tracked List"), 1, 1, new wxLuaDebugDataItem(_("Tracked List"), wxT("wxLuaData"), wxT(""), wxString::Format(wxT("%d"), trackedCount), LUA_NOREF, 0)); ! treeControl->AppendItem(rootItem, wxT("Event Handler List"), 1, 1, new wxLuaDebugDataItem(_("Event Handler List"), wxT("wxLuaData"), wxT(""), wxString::Format(wxT("%d"), eventHandlerCount), LUA_NOREF, 0)); ! treeControl->AppendItem(rootItem, wxT("wxWindow List"), 1, 1, new wxLuaDebugDataItem(_("wxWindow List"), wxT("wxLuaData"), wxT(""), wxString::Format(wxT("%d"), windowCount), LUA_NOREF, 0)); } |
|
From: John L. <jr...@us...> - 2005-12-07 05:53:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2986/wxLua/modules/wxlua/src Modified Files: wxlcallb.cpp wxlstate.cpp Log Message: add getters for tracked events and destroy events make luastaterefdata lists not pointers Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxlstate.cpp 1 Dec 2005 06:43:53 -0000 1.11 --- wxlstate.cpp 7 Dec 2005 05:53:30 -0000 1.12 *************** *** 196,216 **** m_pDerivedList = new wxHashTable(wxKEY_INTEGER); m_pTrackedList = new wxHashTable(wxKEY_INTEGER); - m_pAppHandlerList = new wxList; - m_pDestroyHandlerList = new wxList; - m_pWindowList = new wxList; m_pDerivedList->DeleteContents(true); m_pTrackedList->DeleteContents(true); // don't "own" pointers to wxLuaCallbacks, let wxEventHandler do it [...1177 lines suppressed...] } ! int wxLuaState::luaL_OptInt(int numArg, int def) { wxCHECK_MSG(Ok(), 0, wxT("Invalid wxLuaState")); ! return (int)luaL_optint(M_WXLSTATEDATA->m_lua_State, numArg, def); ! } ! long wxLuaState::luaL_OptLong(int numArg, int def) ! { ! wxCHECK_MSG(Ok(), 0, wxT("Invalid wxLuaState")); ! return (long)luaL_optlong(M_WXLSTATEDATA->m_lua_State, numArg, def); ! } ! ! // ---------------------------------------------------------------------------- ! // others ! ! void wxLuaState::GetGlobals() ! { ! wxCHECK_RET(Ok(), wxT("Invalid wxLuaState")); ! lua_pushvalue(M_WXLSTATEDATA->m_lua_State, LUA_GLOBALSINDEX); } Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxlcallb.cpp 29 Nov 2005 23:52:12 -0000 1.7 --- wxlcallb.cpp 7 Dec 2005 05:53:30 -0000 1.8 *************** *** 34,38 **** IMPLEMENT_ABSTRACT_CLASS(wxLuaCallback, wxEvtHandler) - // Encapsulate a lua function reference for use by a event callback wxLuaCallback::wxLuaCallback( const wxLuaState& state, int theRoutine, --- 34,37 ---- *************** *** 53,62 **** this); ! // FIXME - Need to track events attached to an application object ! // labenski - track all of them? useful to run ClearLuaState when window is destroyed ! //if (pEvtHandler->IsKindOf(CLASSINFO(wxApp))) ! { ! m_wxlState.GetLuaStateRefData()->m_pAppHandlerList->Append(this); ! } } --- 52,56 ---- this); ! m_wxlState.AddTrackedEventHandler(this); } *************** *** 68,77 **** m_wxlState.tremove(m_routine); // delete the reference to this handler ! m_wxlState.GetLuaStateRefData()->m_pAppHandlerList->DeleteObject(this); } } - // This function is called with "this" being of the type which the event is arriving - // at. The user data is used to route it to the correct place. void wxLuaCallback::EventHandler(wxEvent& event) { --- 62,69 ---- m_wxlState.tremove(m_routine); // delete the reference to this handler ! m_wxlState.RemoveTrackedEventHandler(this); } } void wxLuaCallback::EventHandler(wxEvent& event) { *************** *** 91,95 **** wxlState.removeTrackedWindow((wxWindow*)event.GetEventObject()); // delete the reference to this handler since we're clearing it ! wxlState.GetLuaStateRefData()->m_pAppHandlerList->DeleteObject(this); // Disconnect all callbacks associated with this window's evthandler --- 83,87 ---- wxlState.removeTrackedWindow((wxWindow*)event.GetEventObject()); // delete the reference to this handler since we're clearing it ! wxlState.RemoveTrackedEventHandler(this); // Disconnect all callbacks associated with this window's evthandler *************** *** 98,102 **** wxEvtHandler *evtHandler = ((wxWindow*)event.GetEventObject())->GetEventHandler(); ! wxNode* node = wxlState.GetLuaStateRefData()->m_pAppHandlerList->GetFirst(); while (node) { --- 90,94 ---- wxEvtHandler *evtHandler = ((wxWindow*)event.GetEventObject())->GetEventHandler(); ! wxNode* node = wxlState.GetTrackedEventHandlerList()->GetFirst(); while (node) { *************** *** 108,112 **** wxNode* pc_node = node; // remember current node node = node->GetNext(); ! wxlState.GetLuaStateRefData()->m_pAppHandlerList->Erase(pc_node); pCallback->ClearLuaState(); --- 100,104 ---- wxNode* pc_node = node; // remember current node node = node->GetNext(); ! wxlState.GetTrackedEventHandlerList()->Erase(pc_node); pCallback->ClearLuaState(); *************** *** 122,127 **** } - // Call a lua function to handle an event. The lua function will receive - // a single parameter, the type of event. void wxLuaCallback::CallFunction(wxEvent *pEvent) { --- 114,117 ---- *************** *** 135,138 **** --- 125,133 ---- int eventClassTag = s_wxluatag_wxEvent; + // FIXME - alternative to the s_wxluatag_XXX + //const WXLUACLASS* luaClass = m_wxlState.GetLuaClass("wxEvent"); + //wxCHECK_RET(luaClass, wxT("wxEvent lua tag is missing in wxLuaState, forgot to add wxWidgets binding?")); + //wxPrintf(wxT("Event tag %d %d\n"), *luaClass->class_tag, eventClassTag); + const WXLUAEVENT *pLuaEvent = m_wxlState.GetLuaEvent(pEvent); if (pLuaEvent) *************** *** 198,202 **** } ! m_wxlState.GetLuaStateRefData()->m_pDestroyHandlerList->Append(this); // connect the event handler --- 193,197 ---- } ! m_wxlState.AddTrackedDestroyEventHandler(this); // connect the event handler *************** *** 215,219 **** { if (m_wxlState.Ok()) ! m_wxlState.GetLuaStateRefData()->m_pDestroyHandlerList->DeleteObject(this); } --- 210,214 ---- { if (m_wxlState.Ok()) ! m_wxlState.RemoveTrackedDestroyEventHandler(this); } *************** *** 236,240 **** return; ! // Note: do not remove from m_pDestroyHandlerList here, wait 'till destructor if (m_wxlState.tget(m_wxlState.GetLuaDeleteTable())) --- 231,235 ---- return; ! // Note: do not remove from wxLuaState's destroyHandlerList here, wait 'till destructor if (m_wxlState.tget(m_wxlState.GetLuaDeleteTable())) |
|
From: John L. <jr...@us...> - 2005-12-07 05:53:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2986/wxLua/modules/wxlua/include Modified Files: wxlcallb.h wxlstate.h Log Message: add getters for tracked events and destroy events make luastaterefdata lists not pointers Index: wxlcallb.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxlcallb.h 5 Dec 2005 06:11:14 -0000 1.6 --- wxlcallb.h 7 Dec 2005 05:53:30 -0000 1.7 *************** *** 40,47 **** --- 40,52 ---- // central event handler + // This function is called with "this" being of the type which the event is + // arriving at. The user data wxLuaCallback is used to route it to the + // correct place by calling CallFunction with the event. void EventHandler(wxEvent& event); protected: // event handler dispatcher back to Lua + // Call a lua function to handle an event. The lua function will receive + // a single parameter, the type of event. virtual void CallFunction(wxEvent *pEvent); *************** *** 51,58 **** // store the wxLuaState since we're added to a list of it's callbacks. wxLuaState m_wxlState; - wxEvtHandler *m_pHandler; wxWindowID m_id; wxEventType m_eventType; private: DECLARE_ABSTRACT_CLASS(wxLuaCallback) --- 56,63 ---- // store the wxLuaState since we're added to a list of it's callbacks. wxLuaState m_wxlState; wxEvtHandler *m_pHandler; wxWindowID m_id; wxEventType m_eventType; + private: DECLARE_ABSTRACT_CLASS(wxLuaCallback) *************** *** 85,92 **** void OnDestroy(); ! // Lua state instance ! wxLuaState m_wxlState; ! wxEvtHandler *m_pHandler; ! int m_id; private: --- 90,97 ---- void OnDestroy(); ! // store the wxLuaState since we're added to a list of it's callbacks. ! wxLuaState m_wxlState; ! wxEvtHandler *m_pHandler; ! int m_id; private: Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxlstate.h 30 Nov 2005 04:46:17 -0000 1.8 --- wxlstate.h 7 Dec 2005 05:53:30 -0000 1.9 *************** *** 124,138 **** wxEventType m_inEventType; // wxEventType set when in event, else wxEVT_NULL ! wxHashTable* m_pDerivedList; // derived objects. ! wxHashTable* m_pTrackedList; // tracked objects. ! wxList* m_pAppHandlerList; // event objects associated with the application object ! wxList* m_pDestroyHandlerList; // wxLuaDestroyCallbacks installed ! wxList* m_pWindowList; // all wxWindow objects, wxWidgets will delete these ! // but for an embedded program they must be deleted before ! // shutting down the interpreter, else they dangle ! // used in destructor wxArrayInt m_usedIndexes; ! static wxLuaStateRefData* FindLuaStateRefData(lua_State* L); static wxHashMapLuaStateRefData s_wxHashMapLuaStateRefData; --- 124,138 ---- wxEventType m_inEventType; // wxEventType set when in event, else wxEVT_NULL ! wxHashTable* m_pDerivedList; // derived objects. ! wxHashTable* m_pTrackedList; // tracked objects. ! wxList m_eventHandlerList; // event objects for wxLuaCallback ! wxList m_destroyHandlerList; // wxLuaDestroyCallbacks installed ! wxList m_windowList; // all wxWindow objects, wxWidgets will delete these ! // but for an embedded program they must be deleted before ! // shutting down the interpreter, else they dangle ! // used in destructor wxArrayInt m_usedIndexes; ! static wxLuaStateRefData* GetLuaStateRefData(lua_State* L); static wxHashMapLuaStateRefData s_wxHashMapLuaStateRefData; *************** *** 216,220 **** // ----------------------------------------------------------------------- ! // memory tracking functions void addToTrackedMemoryList(wxObject *pObject); --- 216,220 ---- // ----------------------------------------------------------------------- ! // memory tracking functions (internal use) void addToTrackedMemoryList(wxObject *pObject); *************** *** 225,228 **** --- 225,238 ---- bool isWindowTracked(wxWindow *win, bool check_parents = true) const; + // add or remove a wxEvtHandler used by lua code, see usage in wxLuaCallback + void AddTrackedEventHandler(wxEvtHandler* evtHandler); + bool RemoveTrackedEventHandler(wxEvtHandler* evtHandler); + wxList* GetTrackedEventHandlerList(); + + // add or remove a wxEvtHandler used by lua code, see usage in wxLuaDestroyCallback + void AddTrackedDestroyEventHandler(wxEvtHandler* evtHandler); + bool RemoveTrackedDestroyEventHandler(wxEvtHandler* evtHandler); + wxList* GetTrackedDestroyEventHandlerList(); + // ----------------------------------------------------------------------- // wxLua Lua Registry Table Functions *************** *** 318,389 **** // ----------------------------------------------------------------------- ! // Raw lua Stack functions. // FIXME LuaStackObject Stack(int index) { return LuaStackObject(this, index); } ! int GetTop(); ! void SetTop(int index); ! void PushValue(int index); // FIXME void PushValue(LuaStackObject object); ! void PushNil(); ! void Remove(int index); ! void Pop(int count); ! int Next(int index); ! void Insert(int index); ! void Replace(int index); ! int CheckStack(int size); ! void XMove(const wxLuaState& to, int n); ! int Equal(int index1, int index2); ! int RawEqual(int index1, int index2); ! int LessThan(int index1, int index2); // ----------------------------------------------------------------------- ! // Raw lua Arg functions. ! void GetGlobals(); ! int GetN(int index); ! int Type(int index); ! double ToNumber(int index); ! int ToBoolean(int index); ! wxString TowxString(int index); ! const void *ToPointer(int index); ! bool IsCFunction(int index); ! const void *ToCFunction(int index); ! const void *ToUserData(int index); ! int TypeError(int narg, const char* tname); ! int TypeError(int narg, const wxString& tname) { return TypeError(narg, (const char*)wx2lua(tname)); } ! int ArgError(int narg, const char* extramsg); ! int ArgError(int narg, const wxString& extramsg) { return ArgError(narg, (const char*)wx2lua(extramsg)); } ! const char* CheckLString(int numArg, size_t* len); ! const char* OptLString(int numArg, const char *def, size_t* len); ! lua_Number CheckNumber(int numArg); ! lua_Number OptNumber(int nArg, lua_Number def); ! void ArgCheck(bool condition, int numarg, const char* extramsg); ! const char* CheckString(int numArg); ! const char* OptString(int numArg, const char* def); ! int CheckInt(int numArg); ! long CheckLong(int numArg); ! int OptInt(int numArg, int def); ! long OptLong(int numArg, int def); ! void CheckStack(int sz, const char* msg); ! void CheckType(int narg, int t); ! void CheckAny(int narg); ! void* CheckUData(int ud, const char* tname); // ----------------------------------------------------------------------- ! // Raw lua Debug functions. ! int GetStack(int level, lua_Debug* ar); ! int GetInfo(const char* what, lua_Debug* ar); ! int GetInfo(const wxString& str, lua_Debug* ar) { return GetInfo((const char*)wx2lua(str), ar); } ! const char* GetLocal(const lua_Debug* ar, int n); ! wxString GetLocalwxString(const lua_Debug* ar, int n) { return lua2wx(GetLocal(ar, n)); } ! const char* SetLocal(const lua_Debug* ar, int n); ! wxString SetLocalwxString(const lua_Debug* ar, int n) { return lua2wx(SetLocal(ar, n)); } ! int SetHook(lua_Hook func, int mask, int count); ! lua_Hook GetHook(); ! unsigned long GetHookMask(); // ----------------------------------------------------------------------- --- 328,527 ---- // ----------------------------------------------------------------------- ! // C++ interface for the lua_State functions ! // functions prepended by lua_XXX directly call the 'C' lua_XXX function ! // ----------------------------------------------------------------------- ! // Raw basic lua stack functions, lua.h // FIXME LuaStackObject Stack(int index) { return LuaStackObject(this, index); } ! int lua_GetTop(); ! void lua_SetTop(int index); ! void lua_PushValue(int index); // FIXME void PushValue(LuaStackObject object); ! void lua_Remove(int index); ! void lua_Pop(int count); ! void lua_Insert(int index); ! void lua_Replace(int index); ! int lua_CheckStack(int size); ! void lua_XMove(const wxLuaState& to, int n); // ----------------------------------------------------------------------- ! // Raw lua accesses functions (stack -> C), lua.h ! bool lua_IsNumber(int index); ! bool lua_IsString(int index); ! bool lua_IsCFunction(int index); ! bool lua_IsUserData(int index); ! int lua_Type(int index); ! wxString lua_TypeName(int type); ! int lua_Equal(int index1, int index2); ! int lua_RawEqual(int index1, int index2); ! int lua_LessThan(int index1, int index2); ! double lua_ToNumber(int index); ! int lua_ToBoolean(int index); ! wxString lua_ToString(int index); ! size_t lua_StrLen(int index); ! lua_CFunction lua_ToCFunction(int index); ! void* lua_ToUserData(int index); ! wxLuaState lua_ToThread(int index); ! const void* lua_ToPointer(int index); // ----------------------------------------------------------------------- ! // Raw lua push functions (C -> stack), lua.h ! void lua_PushNil(); ! void lua_PushNumber(lua_Number n); ! void lua_PushLString(const char* s, size_t len); ! void lua_PushLString(const wxString& s) { lua_PushLString(wx2lua(s), s.Len()); } ! void lua_PushString(const char* s); ! void lua_PushString(const wxString& s) { lua_PushString(wx2lua(s)); } ! //wxString lua_PushVfString(); ! //wxString lua_PushFString(); ! void lua_PushCClosure(lua_CFunction fn, int n); ! void lua_PushBoolean(bool b); ! void lua_PushLightUserData(void* p); ! // ----------------------------------------------------------------------- ! // Raw lua get functions (Lua -> stack), lua.h ! ! void lua_GetTable(int idx); ! void lua_RawGet(int idx); ! void lua_RawGeti(int idx, int n); ! void lua_NewTable(); ! void* lua_NewUserData(size_t sz); ! int lua_GetMetaTable(int objindex); ! void lua_GetFenv(int idx); ! ! // ----------------------------------------------------------------------- ! // Raw lua set functions (stack -> Lua), lua.h ! ! void lua_SetTable(int idx); ! void lua_RawSet(int idx); ! void lua_RawSeti(int idx, int n); ! int lua_SetMetaTable(int objindex); ! int lua_SetFenv(int idx); ! ! // ----------------------------------------------------------------------- ! // Raw lua `load' and `call' functions (load and run Lua code), lua.h ! ! void lua_Call(int nargs, int nresults); ! int lua_PCall(int nargs, int nresults, int errfunc); ! int lua_CPCall(lua_CFunction func, void *ud); ! int lua_Load(lua_Chunkreader reader, void *dt, const wxString& chunkname) ! { return lua_Load(reader, dt, wx2lua(chunkname)); } ! int lua_Load(lua_Chunkreader reader, void *dt, const char* chunkname); ! ! int lua_Dump (lua_State *L, lua_Chunkwriter writer, void *data); ! ! // ----------------------------------------------------------------------- ! // Raw lua coroutine functions, lua.h ! ! int lua_Yield(int nresults); ! int lua_Resume(int narg); ! ! // ----------------------------------------------------------------------- ! // Raw lua garbage-collection functions, lua.h ! ! int lua_GetGCThreshold(); ! int lua_GetGCCount(); ! void lua_SetGCThreshold(int newthreshold); ! ! // ----------------------------------------------------------------------- ! // Raw lua miscellaneous functions, lua.h ! ! wxString lua_Version(); ! int lua_Error(); ! int lua_Next(int idx); ! void lua_Concat(int n); ! ! // ----------------------------------------------------------------------- ! // Raw lua some useful "macros", lua.h ! ! //lua_boxpointer(L,u) ! //lua_unboxpointer(L,i) ! //lua_pop(L,n) lua_settop(L, -(n)-1) ! ! void lua_Register(const wxString& funcName, lua_CFunction f) { lua_Register(wx2lua(funcName), f); } ! void lua_Register(const char* funcName, lua_CFunction f); ! void lua_PushCFunction(lua_CFunction f); ! ! bool lua_IsFunction(int idx); ! bool lua_IsTable(int idx); ! bool lua_IsLightUserData(int idx); ! bool lua_IsNil(int idx); ! bool lua_IsBoolean(int idx); ! bool lua_IsNone(int idx); ! bool lua_IsNoneOrNil(int idx); ! ! //lua_pushliteral(L, s) lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1) ! ! // ----------------------------------------------------------------------- ! // Raw lua Debug functions, lua.h ! ! int lua_GetStack(int level, lua_Debug* ar); ! int lua_GetInfo(const wxString& what, lua_Debug* ar) { return lua_GetInfo(wx2lua(what), ar); } ! int lua_GetInfo(const char* what, lua_Debug* ar); ! const char* lua_GetLocal(const lua_Debug* ar, int n); ! wxString lua_GetLocalwxString(const lua_Debug* ar, int n) { return lua2wx(lua_GetLocal(ar, n)); } ! const char* lua_SetLocal(const lua_Debug* ar, int n); ! wxString lua_SetLocalwxString(const lua_Debug* ar, int n) { return lua2wx(lua_SetLocal(ar, n)); } ! const char* lua_GetUpValue(int funcindex, int n); ! wxString lua_GetUpValuewxString(int funcindex, int n) { return lua2wx(lua_GetUpValue(funcindex, n)); } ! const char* lua_SetUpValue(int funcindex, int n); ! wxString lua_SetUpValuewxString(int funcindex, int n) { return lua2wx(lua_SetUpValue(funcindex, n)); } ! ! int lua_SetHook(lua_Hook func, int mask, int count); ! lua_Hook lua_GetHook(); ! int lua_GetHookMask(); ! int lua_GetHookCount(); ! ! // ----------------------------------------------------------------------- ! // Raw lua auxlib functions, lauxlib.h ! ! void luaL_OpenLib(const char *libname, const luaL_reg *l, int nup); ! int luaL_GetMetaField(int obj, const char *e); ! int luaL_CallMeta(int obj, const char *e); ! int luaL_TypError(int narg, const char *tname); ! int luaL_ArgError(int numarg, const char *extramsg); ! const char *luaL_CheckLString(int numArg, size_t *l); ! const char *luaL_OptLString(int numArg, const char *def, size_t *len); ! lua_Number luaL_CheckNumber(int numArg); ! lua_Number luaL_OptNumber(int nArg, lua_Number def); ! ! void luaL_CheckStack(int sz, const char *msg); ! void luaL_CheckType(int narg, int t); ! void luaL_CheckAny(int narg); ! ! int luaL_NewMetatable(const char *tname); ! void luaL_GetMetatable(const char *tname); ! void *luaL_CheckUData(int ud, const char *tname); ! ! void luaL_Where(int lvl); ! int luaL_Error(const char *fmt, ...); ! ! int luaL_FindString(const char *st, const char *const lst[]); ! ! int luaL_Ref(int t); ! void luaL_Unref(int t, int ref); ! ! int luaL_Getn(int t); ! void luaL_Setn(int t, int n); ! ! int luaL_LoadFile(const char *filename); ! int luaL_LoadBuffer(const char *buff, size_t sz, const char *name); ! ! void luaL_ArgCheck(bool condition, int numarg, const char* extramsg); ! const char* luaL_CheckString(int numArg); ! const char* luaL_OptString(int numArg, const char* def); ! int luaL_CheckInt(int numArg); ! long luaL_CheckLong(int numArg); ! int luaL_OptInt(int numArg, int def); ! long luaL_OptLong(int numArg, int def); ! ! // ----------------------------------------------------------------------- ! // others ! ! void GetGlobals(); // ----------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2005-12-05 06:11:23
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28335/wxLua/modules/wxluadebug/include Modified Files: wxldebug.h Log Message: try to make the stack tree not segfault in wxLua app (still doesn't work) no major changes Index: wxldebug.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxldebug.h 2 Dec 2005 06:38:30 -0000 1.9 --- wxldebug.h 5 Dec 2005 06:11:14 -0000 1.10 *************** *** 291,295 **** (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxLuaDebugEventFunction, &func) ! #define EVT_WXLUA_DEBUG_CLIENT_CONNECTED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAK, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), #define EVT_WXLUA_DEBUG_BREAK(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAK, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), #define EVT_WXLUA_DEBUG_PRINT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_PRINT, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), --- 291,295 ---- (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxLuaDebugEventFunction, &func) ! #define EVT_WXLUA_DEBUG_CLIENT_CONNECTED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), #define EVT_WXLUA_DEBUG_BREAK(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAK, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), #define EVT_WXLUA_DEBUG_PRINT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_PRINT, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), |
|
From: John L. <jr...@us...> - 2005-12-05 06:11:23
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28335/wxLua/samples Modified Files: editor.wx.lua Log Message: try to make the stack tree not segfault in wxLua app (still doesn't work) no major changes Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** editor.wx.lua 1 Dec 2005 04:17:29 -0000 1.4 --- editor.wx.lua 5 Dec 2005 06:11:15 -0000 1.5 *************** *** 265,270 **** function getModTime(filePath) ! local fileName = wx.wxFileName(filePath) ! return fileName:GetModificationTime(); end --- 265,270 ---- function getModTime(filePath) ! local fileName = wx.wxFileName(filePath) ! return fileName:GetModificationTime(); end |
|
From: John L. <jr...@us...> - 2005-12-05 06:11:23
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28335/wxLua/modules/wxluasocket/src Modified Files: dservice.cpp wxldserv.cpp Log Message: try to make the stack tree not segfault in wxLua app (still doesn't work) no major changes Index: dservice.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dservice.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** dservice.cpp 2 Dec 2005 06:38:31 -0000 1.7 --- dservice.cpp 5 Dec 2005 06:11:15 -0000 1.8 *************** *** 1022,1027 **** case wxLUA_EVENT_DEBUG_STACK_ENUM: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENUM); ! wxLuaDebugData *pDebugData = m_debuggerSocket->ReadDebugData(); if (pDebugData != NULL) debugEvent.SetDebugData(-1, pDebugData); --- 1022,1027 ---- case wxLUA_EVENT_DEBUG_STACK_ENUM: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENUM); ! wxLuaDebugData *pDebugData = m_debuggerSocket->ReadDebugData(); if (pDebugData != NULL) debugEvent.SetDebugData(-1, pDebugData); *************** *** 1033,1039 **** case wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM); ! int stackRef = m_debuggerSocket->ReadInt(); ! wxLuaDebugData *pDebugData = m_debuggerSocket->ReadDebugData(); if (pDebugData != NULL) debugEvent.SetDebugData(stackRef, pDebugData); --- 1033,1039 ---- case wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM); ! int stackRef = m_debuggerSocket->ReadInt(); ! wxLuaDebugData *pDebugData = m_debuggerSocket->ReadDebugData(); if (pDebugData != NULL) debugEvent.SetDebugData(stackRef, pDebugData); *************** *** 1045,1051 **** case wxLUA_EVENT_DEBUG_TABLE_ENUM: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_TABLE_ENUM); ! int itemNode = m_debuggerSocket->ReadInt(); ! wxLuaDebugData *pDebugData = m_debuggerSocket->ReadDebugData(); if (pDebugData != NULL) debugEvent.SetDebugData(itemNode, pDebugData); --- 1045,1051 ---- case wxLUA_EVENT_DEBUG_TABLE_ENUM: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_TABLE_ENUM); ! int itemNode = m_debuggerSocket->ReadInt(); ! wxLuaDebugData *pDebugData = m_debuggerSocket->ReadDebugData(); if (pDebugData != NULL) debugEvent.SetDebugData(itemNode, pDebugData); *************** *** 1057,1063 **** case wxLUA_EVENT_DEBUG_EVALUATE_EXPR: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR); ! int exprRef = m_debuggerSocket->ReadInt(); ! wxString strResult = m_debuggerSocket->ReadString(); debugEvent.SetMessage(strResult); --- 1057,1063 ---- case wxLUA_EVENT_DEBUG_EVALUATE_EXPR: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR); ! int exprRef = m_debuggerSocket->ReadInt(); ! wxString strResult = m_debuggerSocket->ReadString(); debugEvent.SetMessage(strResult); *************** *** 1070,1076 **** case wxLUA_EVENT_DEBUG_BREAKPOINT_ADDED: { ! wxString fileName = m_debuggerSocket->ReadString(); ! int line = m_debuggerSocket->ReadInt(); ! bool enabled = m_debuggerSocket->ReadInt() ? true : false; wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, line, fileName, enabled); --- 1070,1076 ---- case wxLUA_EVENT_DEBUG_BREAKPOINT_ADDED: { ! wxString fileName = m_debuggerSocket->ReadString(); ! int line = m_debuggerSocket->ReadInt(); ! bool enabled = m_debuggerSocket->ReadInt() ? true : false; wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, line, fileName, enabled); *************** *** 1081,1086 **** case wxLUA_EVENT_DEBUG_BREAKPOINT_REMOVED: { ! wxString fileName = m_debuggerSocket->ReadString(); ! int line = m_debuggerSocket->ReadInt(); wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, line, fileName); --- 1081,1086 ---- case wxLUA_EVENT_DEBUG_BREAKPOINT_REMOVED: { ! wxString fileName = m_debuggerSocket->ReadString(); ! int line = m_debuggerSocket->ReadInt(); wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, line, fileName); Index: wxldserv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxldserv.cpp 2 Dec 2005 06:38:31 -0000 1.6 --- wxldserv.cpp 5 Dec 2005 06:11:15 -0000 1.7 *************** *** 586,591 **** case wxLUA_EVENT_DEBUG_STACK_ENUM: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENUM); ! wxLuaDebugData *pDebugData = ReadDebugData(m_acceptedSocket); if (pDebugData != NULL) debugEvent.SetDebugData(-1, pDebugData); --- 586,591 ---- case wxLUA_EVENT_DEBUG_STACK_ENUM: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENUM); ! wxLuaDebugData *pDebugData = ReadDebugData(m_acceptedSocket); if (pDebugData != NULL) debugEvent.SetDebugData(-1, pDebugData); *************** *** 597,603 **** case wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM); ! int stackRef = ReadInt(m_acceptedSocket); ! wxLuaDebugData *pDebugData = ReadDebugData(m_acceptedSocket); if (pDebugData != NULL) debugEvent.SetDebugData(stackRef, pDebugData); --- 597,603 ---- case wxLUA_EVENT_DEBUG_STACK_ENTRY_ENUM: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM); ! int stackRef = ReadInt(m_acceptedSocket); ! wxLuaDebugData *pDebugData = ReadDebugData(m_acceptedSocket); if (pDebugData != NULL) debugEvent.SetDebugData(stackRef, pDebugData); *************** *** 609,615 **** case wxLUA_EVENT_DEBUG_TABLE_ENUM: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_TABLE_ENUM); ! int itemNode = ReadInt(m_acceptedSocket); ! wxLuaDebugData *pDebugData = ReadDebugData(m_acceptedSocket); if (pDebugData != NULL) debugEvent.SetDebugData(itemNode, pDebugData); --- 609,615 ---- case wxLUA_EVENT_DEBUG_TABLE_ENUM: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_TABLE_ENUM); ! int itemNode = ReadInt(m_acceptedSocket); ! wxLuaDebugData *pDebugData = ReadDebugData(m_acceptedSocket); if (pDebugData != NULL) debugEvent.SetDebugData(itemNode, pDebugData); *************** *** 621,627 **** case wxLUA_EVENT_DEBUG_EVALUATE_EXPR: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR); ! int exprRef = ReadInt(m_acceptedSocket); ! wxString strResult = ReadString(m_acceptedSocket); debugEvent.SetMessage(strResult); --- 621,627 ---- case wxLUA_EVENT_DEBUG_EVALUATE_EXPR: { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR); ! int exprRef = ReadInt(m_acceptedSocket); ! wxString strResult = ReadString(m_acceptedSocket); debugEvent.SetMessage(strResult); |
|
From: John L. <jr...@us...> - 2005-12-05 06:11:23
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28335/wxLua/modules/wxluadebug/src Modified Files: splttree.cpp staktree.cpp wxldebug.cpp Log Message: try to make the stack tree not segfault in wxLua app (still doesn't work) no major changes Index: splttree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/splttree.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** splttree.cpp 1 Dec 2005 04:17:29 -0000 1.7 --- splttree.cpp 5 Dec 2005 06:11:14 -0000 1.8 *************** *** 64,71 **** EVT_SIZE(wxRemotelyScrolledTreeCtrl::OnSize) EVT_PAINT(wxRemotelyScrolledTreeCtrl::OnPaint) ! EVT_TREE_ITEM_EXPANDED(-1, wxRemotelyScrolledTreeCtrl::OnExpand) ! EVT_TREE_ITEM_COLLAPSED(-1, wxRemotelyScrolledTreeCtrl::OnExpand) EVT_SCROLLWIN(wxRemotelyScrolledTreeCtrl::OnScroll) ! EVT_TREE_SEL_CHANGED(-1, wxRemotelyScrolledTreeCtrl::OnSelChanged) END_EVENT_TABLE() --- 64,71 ---- EVT_SIZE(wxRemotelyScrolledTreeCtrl::OnSize) EVT_PAINT(wxRemotelyScrolledTreeCtrl::OnPaint) ! EVT_TREE_ITEM_EXPANDED(wxID_ANY, wxRemotelyScrolledTreeCtrl::OnExpand) ! EVT_TREE_ITEM_COLLAPSED(wxID_ANY, wxRemotelyScrolledTreeCtrl::OnExpand) EVT_SCROLLWIN(wxRemotelyScrolledTreeCtrl::OnScroll) ! EVT_TREE_SEL_CHANGED(wxID_ANY, wxRemotelyScrolledTreeCtrl::OnSelChanged) END_EVENT_TABLE() *************** *** 802,805 **** --- 802,807 ---- #ifdef __WXMAC__ m_targetWindow->MacUpdateImmediately() ; + #else + m_targetWindow->Update(); #endif Index: wxldebug.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxldebug.cpp 2 Dec 2005 06:38:31 -0000 1.8 --- wxldebug.cpp 5 Dec 2005 06:11:15 -0000 1.9 *************** *** 71,76 **** if (event.GetDebugData() != NULL) SetDebugData(event.GetReference(), event.GetDebugData()->Clone()); - else - SetDebugData(event.GetReference()); } --- 71,74 ---- Index: staktree.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/staktree.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** staktree.cpp 2 Dec 2005 06:38:31 -0000 1.10 --- staktree.cpp 5 Dec 2005 06:11:15 -0000 1.11 *************** *** 33,36 **** --- 33,37 ---- #include "wxluasocket/include/wxldbgio.h" #include "wxluasocket/include/wxldserv.h" + #include "wxluasocket/include/wxlhandl.h" #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__) *************** *** 141,144 **** --- 142,148 ---- if (m_pServer != NULL) m_pServer->CleanupDebugReferences(); + + if (m_pServer != NULL) + wxLuaHandler::GetHandler().SetStackFrame(NULL); } *************** *** 152,155 **** --- 156,162 ---- m_secondValueWindow = NULL; + if (m_pServer != NULL) + wxLuaHandler::GetHandler().SetStackFrame(this); // FIXME remove this + m_stackComboBox = new wxComboBox( this, ID_WXLUA_STACKFRAME_COMBO, *************** *** 457,462 **** else { ! size_t n, count = pSortedList->Count(); ! for (n = 0; n < count; ++n) { const wxLuaDebugDataItem *item = pSortedList->Item(n); --- 464,469 ---- else { ! size_t n; ! for (n = 0; n < pSortedList->Count(); ++n) { const wxLuaDebugDataItem *item = pSortedList->Item(n); *************** *** 506,510 **** m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FILE"), wxBITMAP_TYPE_ICO_RESOURCE)); #else ! #error "Sorry, we don't have icons available for this platforms." #endif SetImageList(m_imageList); --- 513,517 ---- m_imageList->Add(wxIcon(wxT("wxICON_SMALL_FILE"), wxBITMAP_TYPE_ICO_RESOURCE)); #else ! #error "Sorry, we don't have icons available for this platform." #endif SetImageList(m_imageList); |
|
From: John L. <jr...@us...> - 2005-12-05 06:11:23
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28335/wxLua/apps/wxlua/src Modified Files: editor.h wxlua.cpp Log Message: try to make the stack tree not segfault in wxLua app (still doesn't work) no major changes Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxlua.cpp 1 Dec 2005 04:17:28 -0000 1.9 --- wxlua.cpp 5 Dec 2005 06:11:14 -0000 1.10 *************** *** 56,60 **** virtual void AddPendingEvent(wxEvent& event) { m_app->AddPendingEvent(event); } virtual bool ProcessEvent(wxEvent& event) { return m_app->ProcessEvent(event); } ! //virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) { m_app->SetStackFrame(pStackFrame); } virtual void DisplayError(const wxString &strError) const { m_app->DisplayError(strError); } --- 56,60 ---- virtual void AddPendingEvent(wxEvent& event) { m_app->AddPendingEvent(event); } virtual bool ProcessEvent(wxEvent& event) { return m_app->ProcessEvent(event); } ! virtual void SetStackFrame(wxLuaStackFrame *pStackFrame) { m_app->SetStackFrame(pStackFrame); } virtual void DisplayError(const wxString &strError) const { m_app->DisplayError(strError); } Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** editor.h 1 Dec 2005 04:17:28 -0000 1.3 --- editor.h 5 Dec 2005 06:11:14 -0000 1.4 *************** *** 9,14 **** extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 81924; ! const unsigned char wxLuaEditor[81924] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, --- 9,14 ---- extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 82318; ! const unsigned char wxLuaEditor[82318] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, *************** *** 277,282 **** 10, 102,117,110, 99,116,105,111,110, 32,103,101,116, 77,111,100, 84,105,109,101, 40,102,105,108,101, 80, 97,116,104, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32,119,120, 46,119,120, 70,105,108,101, 78, 97,109,101, 40,102,105,108,101, 80, 97,116,104, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,114,101,116,117,114,110, 32,102,105,108,101, 78, 97,109,101, 58, 71,101,116, 77,111,100,105,102,105, 99, 97,116,105,111,110, 84,105,109,101, 40, 41, 59, 10, 101,110,100, 10, 10, --- 277,282 ---- 10, 102,117,110, 99,116,105,111,110, 32,103,101,116, 77,111,100, 84,105,109,101, 40,102,105,108,101, 80, 97,116,104, 41, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32,119,120, 46,119,120, 70,105,108,101, 78, 97,109,101, 40,102,105,108,101, 80, 97,116,104, 41, 10, ! 32, 32, 32, 32,114,101,116,117,114,110, 32,102,105,108,101, 78, 97,109,101, 58, 71,101,116, 77,111,100,105,102,105, 99, 97,116,105,111,110, 84,105,109,101, 40, 41, 59, 10, 101,110,100, 10, 10, *************** *** 1879,1884 **** --- 1879,1888 ---- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 95, 66, 82, 69, 65, 75, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 32, 61, 32,101,118,101,110,116, 58, 68,121,110, 97,109,105, 99, 67, 97,115,116, 40, 34,119,120, 76,117, 97, 68,101, 98,117,103, 69,118,101,110,116, 34, 41, 10, + 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,114,111,119, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 76,105,110,101, 78,117,109, 98,101,114, 40, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 70,105,108,101, 78, 97,109,101, 40, 41, 10, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 49, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 70,105,108,101, 78, 97,109,101, 40, 41, 10, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 50, 32, 61, 32,101,118,101,110,116, 58, 71,101,116, 70,105,108,101, 78, 97,109,101, 40, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,115,116,114,105,110,103, 46,115,117, 98, 40,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 44, 32, 49, 44, 32, 49, 41, 32, 61, 61, 32, 39, 64, 39, 32,116,104,101,110, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 32, 61, 32,115,116,114,105,110,103, 46,115,117, 98, 40,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 44, 32, 50, 44, 32, 45, 49, 41, 10, *************** *** 1887,1893 **** --- 1891,1899 ---- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 49, 32, 61, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,119,120, 46,119,120, 80,108, 97,116,102,111,114,109, 87,105,110,100,111,119,115, 32,116,104,101,110, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 32, 61, 32,119,120, 46,119,120, 85,110,105,120, 50, 68,111,115, 70,105,108,101,110, 97,109,101, 40,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, + 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 77,101,115,115, 97,103,101, 66,111,120, 40, 34, 39, 34, 46, 46,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 46, 46, 34, 39, 34, 46, 46,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 49, 46, 46, 34, 39, 34, 46, 46,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 50, 46, 46, 34, 39, 34, 44, 32,101,118,101,110,116, 58, 71,101,116, 70,105,108,101, 78, 97,109,101, 40, 41, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 70,111,117,110,100, 32, 61, 32,102, 97,108,115,101, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,105,115,112,108, 97,121, 79,117,116,112,117,116, 40, 34, 65,116, 32, 66,114,101, 97,107,112,111,105,110,116, 32,108,105,110,101, 58, 32, 34, 46, 46,116,111,115,116,114,105,110,103, 40,114,111,119, 41, 46, 46, 34, 32,102,105,108,101, 58, 32, 34, 46, 46,101,118,101,110,116, 70,105,108,101, 78, 97,109,101, 46, 46, 34, 92,110, 34, 41, 10, |
