Menu
▾
▴
frontierkernel-commits — Mailing list for Subversion commit messages.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(447) |
Nov
(163) |
Dec
(57) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(172) |
Feb
|
Mar
(123) |
Apr
(64) |
May
(1) |
Jun
(278) |
Jul
(89) |
Aug
(97) |
Sep
(62) |
Oct
(53) |
Nov
(119) |
Dec
(60) |
| 2006 |
Jan
(76) |
Feb
(1094) |
Mar
(363) |
Apr
(163) |
May
(57) |
Jun
(43) |
Jul
(39) |
Aug
(15) |
Sep
(33) |
Oct
(62) |
Nov
(8) |
Dec
|
| 2007 |
Jan
(9) |
Feb
(34) |
Mar
(2) |
Apr
(14) |
May
(8) |
Jun
(40) |
Jul
(21) |
Aug
(1) |
Sep
(20) |
Oct
(15) |
Nov
(26) |
Dec
|
| 2008 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
(1) |
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(32) |
Jun
|
Jul
|
Aug
(3) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Andre R. <and...@us...> - 2004-11-23 16:18:59
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23585 Modified Files: Tag: sidewinder-branch shell.c Log Message: Only call pythoninitverbs in shellinit if FRONTIER_PYTHON is defined. Index: shell.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shell.c,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** shell.c 22 Nov 2004 04:29:52 -0000 1.4.4.1 --- shell.c 23 Nov 2004 16:18:49 -0000 1.4.4.2 *************** *** 78,83 **** #include "WinSockNetEvents.h" - #include "langpython.h" - #ifdef flcomponent #include <uisharing.h> --- 78,81 ---- *************** *** 1323,1329 **** #endif ! pythoninitverbs(); ! if (keyboardescape ()) /*check again before landinit; after this, must do shellquit*/ exittooperatingsystem (); --- 1321,1331 ---- #endif ! ! #ifdef FRONTIER_PYTHON ! pythoninitverbs(); ! ! #endif ! if (keyboardescape ()) /*check again before landinit; after this, must do shellquit*/ exittooperatingsystem (); |
|
From: Andre R. <and...@us...> - 2004-11-23 16:18:03
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23349 Modified Files: Tag: sidewinder-branch langpython.c Log Message: Don't define FRONTIER_PYTHON here anymore, it's now handled in frontierdefs.h. Comment out unneeded header includes, possibly to be removed completely later. Index: langpython.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v retrieving revision 1.2.4.8 retrieving revision 1.2.4.9 diff -C2 -d -r1.2.4.8 -r1.2.4.9 *** langpython.c 23 Nov 2004 15:43:42 -0000 1.2.4.8 --- langpython.c 23 Nov 2004 16:17:52 -0000 1.2.4.9 *************** *** 27,32 **** #include "standard.h" - #define FRONTIER_PYTHON 1 - #ifdef MACVERSION #include <iac.h> --- 27,30 ---- *************** *** 34,38 **** #include "error.h" ! #include "file.h" #include "memory.h" #include "ops.h" --- 32,36 ---- #include "error.h" ! //#include "file.h" #include "memory.h" #include "ops.h" *************** *** 40,65 **** #include "strings.h" #include "lang.h" ! #include "langipc.h" #include "langinternal.h" #include "langexternal.h" ! #include "langsystem7.h" ! #include "langhtml.h" ! #include "langwinipc.h" ! #include "process.h" ! #include "tableinternal.h" #include "tablestructure.h" ! #include "tableverbs.h" ! #include "op.h" ! #include "opinternal.h" ! #include "oplist.h" ! #include "opverbs.h" #include "kernelverbs.h" #include "kernelverbdefs.h" ! #include "shell.rsrc.h" ! #include "timedate.h" ! #include "winsocknetevents.h" ! #ifdef flcomponent ! #include "osacomponent.h" ! #endif #ifdef FRONTIER_PYTHON --- 38,63 ---- #include "strings.h" #include "lang.h" ! //#include "langipc.h" #include "langinternal.h" #include "langexternal.h" ! //#include "langsystem7.h" ! //#include "langhtml.h" ! //#include "langwinipc.h" ! //#include "process.h" ! //#include "tableinternal.h" #include "tablestructure.h" ! //#include "tableverbs.h" ! //#include "op.h" ! //#include "opinternal.h" ! //#include "oplist.h" ! //#include "opverbs.h" #include "kernelverbs.h" #include "kernelverbdefs.h" ! //#include "shell.rsrc.h" ! //#include "timedate.h" ! //#include "winsocknetevents.h" ! //#ifdef flcomponent ! //#include "osacomponent.h" ! //#endif #ifdef FRONTIER_PYTHON |
|
From: Andre R. <and...@us...> - 2004-11-23 16:13:33
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22396 Modified Files: Tag: sidewinder-branch kernelverbs.h langpython.h Log Message: Moved definition of pythoninitverbs from langpython.h to kernelverbs.h where all the prototypes for all the other kernel verb initialization functions live. Index: kernelverbs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/kernelverbs.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** kernelverbs.h 9 Oct 2004 20:56:44 -0000 1.1 --- kernelverbs.h 23 Nov 2004 16:13:23 -0000 1.1.4.1 *************** *** 50,52 **** extern boolean quicktimeinitverbs (void); /*langquicktime.c*/ ! extern boolean regexpinitverbs (void); /* langregexp.c */ \ No newline at end of file --- 50,55 ---- extern boolean quicktimeinitverbs (void); /*langquicktime.c*/ ! extern boolean regexpinitverbs (void); /*langregexp.c*/ ! ! extern boolean pythoninitverbs(void); /*langpython.c*/ ! Index: langpython.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langpython.h,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** langpython.h 22 Nov 2004 05:14:00 -0000 1.1.4.1 --- langpython.h 23 Nov 2004 16:13:23 -0000 1.1.4.2 *************** *** 29,33 **** boolean runstringverb(hdltreenode hp1, tyvaluerecord *v); - boolean pythoninitverbs(void); --- 29,32 ---- |
|
From: Andre R. <and...@us...> - 2004-11-23 16:11:57
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22011 Modified Files: Tag: sidewinder-branch frontierdefs.h Log Message: Define FRONTIER_PYTHON globally so that resource definition files can tell whether to include the python kernel verbs. Index: frontierdefs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/frontierdefs.h,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** frontierdefs.h 10 Nov 2004 18:18:23 -0000 1.4 --- frontierdefs.h 23 Nov 2004 16:11:47 -0000 1.4.2.1 *************** *** 79,82 **** --- 79,84 ---- #define SPEED 1 + #define FRONTIER_PYTHON 1 /*2004-11-23 aradke: enable globally for all platforms*/ + #ifdef MACVERSION #define macBirdRuntime 1 |
|
From: Andre R. <and...@us...> - 2004-11-23 15:43:51
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15832/Common/source Modified Files: Tag: sidewinder-branch langpython.c Log Message: Fixed irregular line ending characters, perhaps imported via copy and paste in Xcode. Eliminated Visual C warning about return value of Table_setIndex. Index: langpython.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v retrieving revision 1.2.4.7 retrieving revision 1.2.4.8 diff -C2 -d -r1.2.4.7 -r1.2.4.8 *** langpython.c 23 Nov 2004 07:11:27 -0000 1.2.4.7 --- langpython.c 23 Nov 2004 15:43:42 -0000 1.2.4.8 *************** *** 67,71 **** #include "langpython.h" ! #if defined(MACVERSION) && defined(TARGET_RT_MAC_MACHO) #include <Python/Python.h> #else #include <Python.h> #endif #include <time.h> --- 67,75 ---- #include "langpython.h" ! #if defined(MACVERSION) && defined(TARGET_RT_MAC_MACHO) ! #include <Python/Python.h> ! #else ! #include <Python.h> ! #endif #include <time.h> *************** *** 685,689 **** if (!hashgetnthnode(self->table, index, &node)) { PyErr_SetString(PyExc_IndexError, "Index out of bounds"); ! return NULL; } --- 689,693 ---- if (!hashgetnthnode(self->table, index, &node)) { PyErr_SetString(PyExc_IndexError, "Index out of bounds"); ! return 0; } |
|
From: Andre R. <and...@us...> - 2004-11-23 12:32:26
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29672/Common/headers Modified Files: ops.h Log Message: For bcdToLong, use unsigned long instead of UInt32 to make it compile on Windows. Index: ops.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/ops.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ops.h 22 Nov 2004 18:58:35 -0000 1.3 --- ops.h 23 Nov 2004 12:32:15 -0000 1.4 *************** *** 109,111 **** extern void getsizestring (unsigned long, bigstring); ! extern UInt32 bcdToLong (UInt32); /* 2004-11-16 creedon */ \ No newline at end of file --- 109,111 ---- extern void getsizestring (unsigned long, bigstring); ! extern unsigned long bcdToLong (unsigned long); /* 2004-11-16 creedon */ \ No newline at end of file |
|
From: Andre R. <and...@us...> - 2004-11-23 12:32:26
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29672/Common/source Modified Files: ops.c Log Message: For bcdToLong, use unsigned long instead of UInt32 to make it compile on Windows. Index: ops.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/ops.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ops.c 22 Nov 2004 19:07:28 -0000 1.4 --- ops.c 23 Nov 2004 12:32:17 -0000 1.5 *************** *** 953,960 **** ! UInt32 bcdToLong (UInt32 bcd) { /* 2004-11-16 creedon */ ! UInt32 ret = 0; ! UInt16 i; for (i = 0; i < 8; i++) { --- 953,960 ---- ! unsigned long bcdToLong (unsigned long bcd) { /* 2004-11-16 creedon */ ! unsigned long ret = 0; ! short i; for (i = 0; i < 8; i++) { |
|
From: David B. <dav...@us...> - 2004-11-23 07:11:47
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19971 Modified Files: Tag: sidewinder-branch langpython.c Log Message: moved bigstring declarations in complex conversion Index: langpython.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v retrieving revision 1.2.4.6 retrieving revision 1.2.4.7 diff -C2 -d -r1.2.4.6 -r1.2.4.7 *** langpython.c 23 Nov 2004 02:36:11 -0000 1.2.4.6 --- langpython.c 23 Nov 2004 07:11:27 -0000 1.2.4.7 *************** *** 195,198 **** --- 195,200 ---- tyvaluerecord realPart; tyvaluerecord imagPart; + bigstring realName; + bigstring imagName; double r, i; *************** *** 212,218 **** exemptfromtmpstack(&imagPart); - bigstring realName; - bigstring imagName; - copyctopstring("real", realName); copyctopstring("imag", imagName); --- 214,217 ---- |
|
From: David B. <dav...@us...> - 2004-11-23 02:36:21
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv572 Modified Files: Tag: sidewinder-branch langpython.c Log Message: removed a call to stringsize in favor of sizeof(bigstring) Index: langpython.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v retrieving revision 1.2.4.5 retrieving revision 1.2.4.6 diff -C2 -d -r1.2.4.5 -r1.2.4.6 *** langpython.c 23 Nov 2004 02:33:55 -0000 1.2.4.5 --- langpython.c 23 Nov 2004 02:36:11 -0000 1.2.4.6 *************** *** 736,741 **** Table_keysCallback(hdlhashnode node, ptrvoid refcon) { PyObject *keyList = (PyObject *)refcon; ! ! char name[stringsize((**node).hashkey)]; copyptocstring((**node).hashkey, name); --- 736,741 ---- Table_keysCallback(hdlhashnode node, ptrvoid refcon) { PyObject *keyList = (PyObject *)refcon; ! char name[sizeof(bigstring)]; ! copyptocstring((**node).hashkey, name); |
|
From: David B. <dav...@us...> - 2004-11-23 02:34:07
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32297 Modified Files: Tag: sidewinder-branch langpython.c Log Message: moved var declarations to the beginning of a block, rather than next to the code that uses them. I hate what VC++ makes me do. Why can't it at least keep up with the syntax? Index: langpython.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v retrieving revision 1.2.4.4 retrieving revision 1.2.4.5 diff -C2 -d -r1.2.4.4 -r1.2.4.5 *** langpython.c 23 Nov 2004 01:54:39 -0000 1.2.4.4 --- langpython.c 23 Nov 2004 02:33:55 -0000 1.2.4.5 *************** *** 67,74 **** #include "langpython.h" ! #ifdef MACVERSION ! #include <Python/Python.h> ! #else ! #endif #include <time.h> --- 67,71 ---- #include "langpython.h" ! #if defined(MACVERSION) && defined(TARGET_RT_MAC_MACHO) #include <Python/Python.h> #else #include <Python.h> #endif #include <time.h> *************** *** 138,143 **** int len = PyList_Size(keys); int i; - hdlhashtable newTable; if (!langassignnewtablevalue(hdl, name, &newTable)) return false; --- 135,140 ---- int len = PyList_Size(keys); int i; hdlhashtable newTable; + if (!langassignnewtablevalue(hdl, name, &newTable)) return false; *************** *** 147,151 **** PyObject *v = PyDict_GetItem(obj, k); char *key = PyString_AsString(k); - bigstring tn; --- 144,147 ---- *************** *** 197,208 **** hdlhashtable newTable; - if (!langassignnewtablevalue(hdl, name, &newTable)) - return false; - tyvaluerecord realPart; tyvaluerecord imagPart; - double r, i; r = PyComplex_RealAsDouble(obj); i = PyComplex_ImagAsDouble(obj); --- 193,203 ---- hdlhashtable newTable; tyvaluerecord realPart; tyvaluerecord imagPart; double r, i; + if (!langassignnewtablevalue(hdl, name, &newTable)) + return false; + r = PyComplex_RealAsDouble(obj); i = PyComplex_ImagAsDouble(obj); *************** *** 271,274 **** --- 266,270 ---- int len = gethandlesize(tvr->data.stringvalue); char *val = malloc(len + 1); + strncpy(val, *(tvr->data.stringvalue), len); val[len] = 0; *************** *** 309,312 **** --- 305,309 ---- case booleanvaluetype: { int val = 0; + if (tvr->data.flvalue) val = -1; *************** *** 366,369 **** --- 363,367 ---- case idtableprocessor: { hdlhashtable table; + if (!langexternalvaltotable(*tvr, &table, HNoNode)) return false; *************** *** 437,440 **** --- 435,444 ---- fetchAux(char *as) { tyvaluerecord tvr; + bigstring loc; + hdlhashtable adr; + tyvaluerecord val; + hdlhashnode node; + char cname[sizeof(bigstring)]; + PyObject *result; if (!newheapvalue(as, strlen(as), stringvaluetype, &tvr)) { *************** *** 450,456 **** } - bigstring loc; - hdlhashtable adr; - if (!getaddressvalue(tvr, &adr, loc)) { char msg[300]; --- 454,457 ---- *************** *** 459,466 **** return NULL; } ! ! tyvaluerecord val; ! hdlhashnode node; ! if (!hashtablelookup(adr, loc, &val, &node)) { char msg[300]; --- 460,464 ---- return NULL; } ! if (!hashtablelookup(adr, loc, &val, &node)) { char msg[300]; *************** *** 470,477 **** } - char cname[stringsize(loc)]; copyptocstring(loc, cname); - PyObject *result; if (!convertfrontiervalue(&val, &result)) { PyErr_SetString(PyExc_SystemError, "Cannot convert value"); --- 468,473 ---- *************** *** 497,500 **** --- 493,499 ---- evaluateString(PyObject *self, PyObject *args) { char *s; + Handle htext; + tyvaluerecord v; + PyObject *result; if (!PyArg_ParseTuple(args, "s:evaluate", &s)) { *************** *** 503,507 **** } - Handle htext; if (!newfilledhandle(s, strlen(s), &htext)) { PyErr_SetString(PyExc_SystemError, "Couldn't execute because I couldn't allocate space for the string."); --- 502,505 ---- *************** *** 509,513 **** } - tyvaluerecord v; if (!langrun(htext, &v)) { PyErr_SetString(PyExc_SyntaxError, "Couldn't execute because of a syntax error in the UserTalk code."); --- 507,510 ---- *************** *** 515,519 **** } - PyObject *result; if (!convertfrontiervalue(&v, &result)) { PyErr_SetString(PyExc_SystemError, "Couldn't execute because of an error converting the UserTalk return value."); --- 512,515 ---- *************** *** 611,619 **** Table_get(frontier_TableObject *self, char *name) { bigstring loc; - - copyctopstring(name, loc); - tyvaluerecord val; hdlhashnode node; if (!hashtablelookup(self->table, loc, &val, &node)) { --- 607,615 ---- Table_get(frontier_TableObject *self, char *name) { bigstring loc; tyvaluerecord val; hdlhashnode node; + PyObject *result; + + copyctopstring(name, loc); if (!hashtablelookup(self->table, loc, &val, &node)) { *************** *** 624,629 **** } - PyObject *result; - if (!convertfrontiervalue(&val, &result)) { char msg[300]; --- 620,623 ---- *************** *** 672,675 **** --- 666,671 ---- Table_getIndex(frontier_TableObject *self, int index) { hdlhashnode node; + PyObject *result; + if (!hashgetnthnode(self->table, index, &node)) { PyErr_SetString(PyExc_IndexError, "Index out of bounds"); *************** *** 677,681 **** } - PyObject *result; if (!convertfrontiervalue(&((**node).val), &result)) { PyErr_SetString(PyExc_ValueError, "Cannot convert value"); --- 673,676 ---- *************** *** 702,708 **** static PyObject * Table_getItem(frontier_TableObject *self, PyObject *key) { if (PyInt_Check(key)) return Table_getIndex(self, PyInt_AsLong(key)); ! char *keyName = PyString_AsString(PyObject_Str(key)); return Table_get(self, keyName); } --- 697,704 ---- static PyObject * Table_getItem(frontier_TableObject *self, PyObject *key) { + char *keyName; if (PyInt_Check(key)) return Table_getIndex(self, PyInt_AsLong(key)); ! keyName = PyString_AsString(PyObject_Str(key)); return Table_get(self, keyName); } *************** *** 710,716 **** static int Table_setItem(frontier_TableObject *self, PyObject *key, PyObject *val) { if (PyInt_Check(key)) return Table_setIndex(self, PyInt_AsLong(key), val); ! char *keyName = PyString_AsString(PyObject_Str(key)); return Table_setattr(self, keyName, val); } --- 706,713 ---- static int Table_setItem(frontier_TableObject *self, PyObject *key, PyObject *val) { + char *keyName; if (PyInt_Check(key)) return Table_setIndex(self, PyInt_AsLong(key), val); ! keyName = PyString_AsString(PyObject_Str(key)); return Table_setattr(self, keyName, val); } *************** *** 763,766 **** --- 760,766 ---- Table_newTable(frontier_TableObject *self, PyObject *args) { char *name; + bigstring loc; + hdlhashtable newTable; + if (!PyArg_ParseTuple(args, "s:newTable", &name)) { PyErr_SetString(PyExc_TypeError, "Table.newTable requires a string argument"); *************** *** 768,776 **** } - bigstring loc; - copyctopstring(name, loc); - hdlhashtable newTable; if (!langassignnewtablevalue(self->table, loc, &newTable)) { PyErr_SetString(PyExc_SystemError, "Cannot create table"); --- 768,773 ---- *************** *** 1055,1063 **** boolean runstringverb(hdltreenode hp1, tyvaluerecord *v) { ! // if Python hasn't been started, start it and create our globals. // startInterpreter(); // set up default frontier return value // --- 1052,1072 ---- boolean runstringverb(hdltreenode hp1, tyvaluerecord *v) { ! Handle pythonCode; ! tyvaluerecord adrOutput; ! tyvaluerecord adrError; ! hdlhashtable htableOutput; ! hdlhashtable htableError; ! bigstring locOutput; ! bigstring locError; ! PyObject *locals; ! PyObject *result; ! PyObject *err; ! // if Python hasn't been started, start it and create our globals. // startInterpreter(); + locals = globals; // hack alert -- confirm why I need to do this + // set up default frontier return value // *************** *** 1065,1072 **** return false; - Handle pythonCode; - tyvaluerecord adrOutput; - tyvaluerecord adrError; - // first param: handle to python code string // --- 1074,1077 ---- *************** *** 1083,1092 **** if (!getaddressparam(hp1, 3, &adrError)) return false; ! ! hdlhashtable htableOutput; ! hdlhashtable htableError; ! bigstring locOutput; ! bigstring locError; ! // derefernce pointer to output variable // --- 1088,1092 ---- if (!getaddressparam(hp1, 3, &adrError)) return false; ! // derefernce pointer to output variable // *************** *** 1103,1110 **** if (!enlargehandle(pythonCode, gethandlesize(pythonCode) + 1, "\0")) return false; ! ! PyObject *locals = globals; //PyDict_New(); ! PyObject *result; ! // set up the interpreter to capture the output // --- 1103,1107 ---- if (!enlargehandle(pythonCode, gethandlesize(pythonCode) + 1, "\0")) return false; ! // set up the interpreter to capture the output // *************** *** 1116,1189 **** result = PyRun_String(*pythonCode, Py_file_input, globals, locals); if (result) Py_DECREF(result); ! PyObject *err = PyErr_Occurred(); if (err) { PyErr_Print(); // get the error output // ! PyObject *ferr = PyDict_GetItemString(locals, "_f_err"); ! PyObject *outputString = PyObject_CallMethod(ferr, "getvalue", NULL); result = PyObject_CallMethod(ferr, "close", NULL); if (result) Py_DECREF(result); ! char *output = PyString_AsString(outputString); ! ! tyvaluerecord errorValue; ! ! if (!newheapvalue(output, strlen(output), stringvaluetype, &errorValue)) { ! Py_DECREF(outputString); ! return false; ! } ! exemptfromtmpstack(&errorValue); - if (!hashtableassign(htableError, locError, errorValue)) { - Py_DECREF(outputString); - return false; - } - - if (!setbooleanvalue(false, v)) { Py_DECREF(outputString); - return false; } - - Py_DECREF(outputString); } ! // get the output ! // ! PyObject *foutput = PyDict_GetItemString(locals, "_f_output"); ! PyObject *outputString = PyObject_CallMethod(foutput, "getvalue", NULL); ! result = PyObject_CallMethod(foutput, "close", NULL); ! if (result) Py_DECREF(result); ! ! // convert the output from a python string into a cstring ! // ! char *output = PyString_AsString(outputString); ! ! // copy the output into the frontier variable that was passed in ! // ! tyvaluerecord outputValue; ! ! boolean retcode = true; ! ! if (!newheapvalue(output, strlen(output), stringvaluetype, &outputValue)) ! retcode = false; ! ! exemptfromtmpstack(&outputValue); ! ! if (retcode && !hashtableassign(htableOutput, locOutput, outputValue)) ! retcode = false; ! // erase all sign of us ! // ! result = PyRun_String("sys.stdout = _f_old_output; sys.stderr = _f_old_err", Py_file_input, globals, locals); ! if (result) Py_DECREF(result); ! Py_DECREF(outputString); ! //Py_DECREF(locals); ! return retcode; } --- 1113,1194 ---- result = PyRun_String(*pythonCode, Py_file_input, globals, locals); if (result) Py_DECREF(result); ! err = PyErr_Occurred(); if (err) { + PyObject *ferr; + PyObject *outputString; + PyErr_Print(); // get the error output // ! ferr = PyDict_GetItemString(locals, "_f_err"); ! outputString = PyObject_CallMethod(ferr, "getvalue", NULL); result = PyObject_CallMethod(ferr, "close", NULL); if (result) Py_DECREF(result); ! bundle { ! tyvaluerecord errorValue; ! char *output = PyString_AsString(outputString); ! ! if (!newheapvalue(output, strlen(output), stringvaluetype, &errorValue)) { ! Py_DECREF(outputString); ! return false; ! } ! ! exemptfromtmpstack(&errorValue); ! if (!hashtableassign(htableError, locError, errorValue)) { ! Py_DECREF(outputString); ! return false; ! } ! ! if (!setbooleanvalue(false, v)) { ! Py_DECREF(outputString); ! return false; ! } Py_DECREF(outputString); } } ! bundle { ! PyObject *foutput; ! PyObject *outputString; ! char *output; ! tyvaluerecord outputValue; ! boolean retcode = true; ! // get the output ! // ! foutput = PyDict_GetItemString(locals, "_f_output"); ! outputString = PyObject_CallMethod(foutput, "getvalue", NULL); ! result = PyObject_CallMethod(foutput, "close", NULL); ! if (result) Py_DECREF(result); ! // convert the output from a python string into a cstring ! // ! output = PyString_AsString(outputString); ! // copy the output into the frontier variable that was passed in ! // ! if (!newheapvalue(output, strlen(output), stringvaluetype, &outputValue)) ! retcode = false; ! ! exemptfromtmpstack(&outputValue); ! ! if (retcode && !hashtableassign(htableOutput, locOutput, outputValue)) ! retcode = false; ! ! // erase all sign of us ! // ! result = PyRun_String("sys.stdout = _f_old_output; sys.stderr = _f_old_err", Py_file_input, globals, locals); ! if (result) Py_DECREF(result); ! ! Py_DECREF(outputString); ! //Py_DECREF(locals); ! ! return retcode; ! } } |
|
From: David B. <dav...@us...> - 2004-11-23 01:54:49
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24201 Modified Files: Tag: sidewinder-branch langpython.c Log Message: detabbed Index: langpython.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v retrieving revision 1.2.4.3 retrieving revision 1.2.4.4 diff -C2 -d -r1.2.4.3 -r1.2.4.4 *** langpython.c 22 Nov 2004 07:19:49 -0000 1.2.4.3 --- langpython.c 23 Nov 2004 01:54:39 -0000 1.2.4.4 *************** *** 268,272 **** switch (tvr->valuetype) { ! case stringvaluetype: { int len = gethandlesize(tvr->data.stringvalue); char *val = malloc(len + 1); --- 268,272 ---- switch (tvr->valuetype) { ! case stringvaluetype: { int len = gethandlesize(tvr->data.stringvalue); char *val = malloc(len + 1); *************** *** 281,285 **** } ! case novaluetype: Py_INCREF(Py_None); *pptr = Py_None; --- 281,285 ---- } ! case novaluetype: Py_INCREF(Py_None); *pptr = Py_None; *************** *** 307,311 **** */ ! case booleanvaluetype: { int val = 0; if (tvr->data.flvalue) --- 307,311 ---- */ ! case booleanvaluetype: { int val = 0; if (tvr->data.flvalue) *************** *** 317,351 **** } ! case intvaluetype: *pptr = Py_BuildValue("i", tvr->data.intvalue); break; ! case longvaluetype: *pptr = Py_BuildValue("i", tvr->data.longvalue); break; ! case fixedvaluetype: { ! double x = (double)(((*tvr).data.longvalue) / 65536); ! *pptr = Py_BuildValue("d", x); ! break; } ! case singlevaluetype: *pptr = Py_BuildValue("f", tvr->data.singlevalue); break; ! case doublevaluetype: *pptr = Py_BuildValue("d", **(tvr->data.doublevalue)); break; ! case pointvaluetype: *pptr = Py_BuildValue("(ii)", tvr->data.pointvalue.v, tvr->data.pointvalue.h); break; ! case rectvaluetype: *pptr = Py_BuildValue("(iiii)", (**(tvr->data.rectvalue)).top, (**(tvr->data.rectvalue)).left, (**(tvr->data.rectvalue)).bottom, (**(tvr->data.rectvalue)).right); break; ! case rgbvaluetype: *pptr = Py_BuildValue("(iii)", (**(tvr->data.rgbvalue)).red, (**(tvr->data.rgbvalue)).green, (**(tvr->data.rgbvalue)).blue); break; --- 317,351 ---- } ! case intvaluetype: *pptr = Py_BuildValue("i", tvr->data.intvalue); break; ! case longvaluetype: *pptr = Py_BuildValue("i", tvr->data.longvalue); break; ! case fixedvaluetype: { ! double x = (double)(((*tvr).data.longvalue) / 65536); ! *pptr = Py_BuildValue("d", x); ! break; } ! case singlevaluetype: *pptr = Py_BuildValue("f", tvr->data.singlevalue); break; ! case doublevaluetype: *pptr = Py_BuildValue("d", **(tvr->data.doublevalue)); break; ! case pointvaluetype: *pptr = Py_BuildValue("(ii)", tvr->data.pointvalue.v, tvr->data.pointvalue.h); break; ! case rectvaluetype: *pptr = Py_BuildValue("(iiii)", (**(tvr->data.rectvalue)).top, (**(tvr->data.rectvalue)).left, (**(tvr->data.rectvalue)).bottom, (**(tvr->data.rectvalue)).right); break; ! case rgbvaluetype: *pptr = Py_BuildValue("(iii)", (**(tvr->data.rgbvalue)).red, (**(tvr->data.rgbvalue)).green, (**(tvr->data.rgbvalue)).blue); break; *************** *** 1068,1076 **** tyvaluerecord adrOutput; tyvaluerecord adrError; ! // first param: handle to python code string // if (!gettextvalue (hp1, 1, &pythonCode)) ! return (false); // second param: pointer to var to store output --- 1068,1076 ---- tyvaluerecord adrOutput; tyvaluerecord adrError; ! // first param: handle to python code string // if (!gettextvalue (hp1, 1, &pythonCode)) ! return (false); // second param: pointer to var to store output *************** *** 1152,1156 **** } ! // get the output // PyObject *foutput = PyDict_GetItemString(locals, "_f_output"); --- 1152,1156 ---- } ! // get the output // PyObject *foutput = PyDict_GetItemString(locals, "_f_output"); *************** *** 1190,1200 **** static boolean pythonfunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) { hdltreenode hp1 = hparam1; ! tyvaluerecord *v = vreturned; ! ! setbooleanvalue (false, v); /*by default, string functions return false*/ ! ! switch (token) { ! case startinterpreterfunc: return startInterpreter(); --- 1190,1200 ---- static boolean pythonfunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) { hdltreenode hp1 = hparam1; ! tyvaluerecord *v = vreturned; ! ! setbooleanvalue (false, v); /*by default, string functions return false*/ ! ! switch (token) { ! case startinterpreterfunc: return startInterpreter(); *************** *** 1205,1211 **** return runstringverb(hp1, v); ! default: ! getstringlist (langerrorlist, unimplementedverberror, bserror); ! return (false); } /*switch*/ } /*htmlfunctionvalue*/ --- 1205,1211 ---- return runstringverb(hp1, v); ! default: ! getstringlist (langerrorlist, unimplementedverberror, bserror); ! return (false); } /*switch*/ } /*htmlfunctionvalue*/ |
|
From: icreedon <icr...@us...> - 2004-11-22 19:07:39
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27278 Modified Files: ops.c Log Message: added bcdToLong function, used to fix Mac OS X major revision number bug Index: ops.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/ops.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ops.c 26 Oct 2004 10:24:57 -0000 1.3 --- ops.c 22 Nov 2004 19:07:28 -0000 1.4 *************** *** 39,44 **** - - static tydirection directions [ctdirections] = { --- 39,42 ---- *************** *** 865,869 **** gestalt (gestaltSystemVersion, &x); ! numbertostring (x >> 8, bs); /*high byte is major rev.*/ pushchar ('.', bs); --- 863,867 ---- gestalt (gestaltSystemVersion, &x); ! numbertostring (bcdToLong (x >> 8), bs); /* high byte is major rev., 2004-11-16 creedon - convert from bcd for correct display on Mac OS X */ pushchar ('.', bs); *************** *** 955,958 **** --- 953,968 ---- + UInt32 bcdToLong (UInt32 bcd) { /* 2004-11-16 creedon */ + UInt32 ret = 0; + UInt16 i; + for (i = 0; i < 8; i++) { + if (i > 0) + ret += i * 10 * (bcd & 0x0000000f); + else + ret += bcd & 0x0000000f; + bcd >>= 4; + } + return (ret); + } /* bcdToLong */ |
|
From: icreedon <icr...@us...> - 2004-11-22 18:58:46
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25228 Modified Files: ops.h Log Message: added prototype for bcdToLong function Index: ops.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/ops.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ops.h 30 Oct 2004 23:50:16 -0000 1.2 --- ops.h 22 Nov 2004 18:58:35 -0000 1.3 *************** *** 109,110 **** --- 109,111 ---- extern void getsizestring (unsigned long, bigstring); + extern UInt32 bcdToLong (UInt32); /* 2004-11-16 creedon */ \ No newline at end of file |
|
From: Andre R. <and...@us...> - 2004-11-22 10:15:32
|
Update of /cvsroot/frontierkernel/Frontier/Common/resources/Win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32650 Modified Files: Tag: sidewinder-branch kernvelverbs.rc Log Message: Added python verbs for Windows version, ifdef'd for FRONTIER_PYTHON. Index: kernvelverbs.rc =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Win32/kernvelverbs.rc,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** kernvelverbs.rc 9 Oct 2004 08:50:17 -0000 1.1 --- kernvelverbs.rc 22 Nov 2004 10:15:23 -0000 1.1.4.1 *************** *** 1013,1016 **** --- 1013,1017 ---- */ + #ifdef flregexpverbs *************** *** 1034,1035 **** --- 1035,1053 ---- #endif //flregexpverbs + + + + #ifdef FRONTIER_PYTHON + + 1024 /*idpythonverbs*/ EFP DISCARDABLE + BEGIN + 1, //Number of "blocks" in this resource + "python\0", //Function Processor Name + false, //Window required + 3, //Count of verbs + "startinterpreter\0", + "stopinterpreter\0", + "runstring\0" + END + + #endif //FRONTIER_PYTHON |
|
From: David B. <dav...@us...> - 2004-11-22 07:20:07
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31386 Modified Files: Tag: sidewinder-branch langpython.c Log Message: got rid of namestacktoaddress -- not needed anymore Index: langpython.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v retrieving revision 1.2.4.2 retrieving revision 1.2.4.3 diff -C2 -d -r1.2.4.2 -r1.2.4.3 *** langpython.c 22 Nov 2004 05:37:03 -0000 1.2.4.2 --- langpython.c 22 Nov 2004 07:19:49 -0000 1.2.4.3 *************** *** 432,455 **** } - static char * - namestacktoaddress(PyObject *nameStack) { - int len = PyList_GET_SIZE(nameStack); - int addressLen = 0; - for (int i = 0; i < len; i++) - addressLen += PyString_GET_SIZE(PyList_GET_ITEM(nameStack, i)); - addressLen += len * 5; - - char *s = (char *)malloc(addressLen + 1); - *s = 0; - for (int i = 0; i < len; i++) { - strcat(s, "[\""); - strcat(s, PyString_AsString(PyList_GET_ITEM(nameStack, i))); - strcat(s, "\"]."); - } - s[--addressLen] = 0; - - return s; - } - /* the python library side */ --- 432,435 ---- *************** *** 544,562 **** } - static PyObject * - nameStackToAddress(PyObject *self, PyObject *args) { - PyObject *nameStack; - if (!PyArg_ParseTuple(args, "O:nameStackToAddress", &nameStack)) - return NULL; - - char *s = namestacktoaddress(nameStack); - - PyObject *result = PyString_FromString(s); - - free(s); - - return result; - } - static PyMethodDef embMethods[] = { {"fetch", fetch, METH_VARARGS, --- 524,527 ---- *************** *** 564,569 **** {"evaluate", evaluateString, METH_VARARGS, "Compile and execute the string as UserTalk code."}, - {"nameStackToAddress", nameStackToAddress, METH_VARARGS, - "turn a name stack into a frontier address specifier"}, {NULL, NULL, 0, NULL} }; --- 529,532 ---- *************** *** 1253,1256 **** } - #endif --- 1216,1218 ---- |
|
From: David B. <dav...@us...> - 2004-11-22 05:43:01
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15024 Modified Files: Tag: sidewinder-branch langpython.c langverbs.c Log Message: just one more Index: langverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langverbs.c,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -C2 -d -r1.5 -r1.5.4.1 *** langverbs.c 9 Nov 2004 20:33:06 -0000 1.5 --- langverbs.c 22 Nov 2004 05:37:03 -0000 1.5.4.1 *************** *** 3717,3722 **** } ! case pythondoscriptfunc: ! return (langrunpythonscript (hparam1, v)); --- 3717,3722 ---- } ! //case pythondoscriptfunc: ! // return (langrunpythonscript (hparam1, v)); Index: langpython.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v retrieving revision 1.2.4.1 retrieving revision 1.2.4.2 diff -C2 -d -r1.2.4.1 -r1.2.4.2 *** langpython.c 22 Nov 2004 04:28:20 -0000 1.2.4.1 --- langpython.c 22 Nov 2004 05:37:03 -0000 1.2.4.2 *************** *** 62,69 **** #include "osacomponent.h" #endif - #include "langpython.h" #ifdef FRONTIER_PYTHON #ifdef MACVERSION #include <Python/Python.h> --- 62,70 ---- #include "osacomponent.h" #endif #ifdef FRONTIER_PYTHON + #include "langpython.h" + #ifdef MACVERSION #include <Python/Python.h> |
|
From: David B. <dav...@us...> - 2004-11-22 05:37:59
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14800 Modified Files: Tag: sidewinder-branch versions.h Log Message: just one more Index: versions.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/versions.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** versions.h 11 Nov 2004 09:31:39 -0000 1.3 --- versions.h 22 Nov 2004 05:36:02 -0000 1.3.2.1 *************** *** 58,62 **** #define frontier_build_number 3 /* increment by one for every release, final or not */ ! #define frontier_version_string "10.0a3" --- 58,62 ---- #define frontier_build_number 3 /* increment by one for every release, final or not */ ! #define frontier_version_string "10.0a3P" |
|
From: David B. <dav...@us...> - 2004-11-22 05:14:12
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11256 Modified Files: Tag: sidewinder-branch langpython.h Log Message: everything in it's right place Index: langpython.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langpython.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** langpython.h 9 Oct 2004 20:58:04 -0000 1.1 --- langpython.h 22 Nov 2004 05:14:00 -0000 1.1.4.1 *************** *** 28,32 **** ! extern boolean langrunpythonscript (hdltreenode hp1, tyvaluerecord *v); --- 28,33 ---- ! boolean runstringverb(hdltreenode hp1, tyvaluerecord *v); ! boolean pythoninitverbs(void); |
|
From: David B. <dav...@us...> - 2004-11-22 05:12:38
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10955 Modified Files: langpython.h Log Message: undo revision Index: langpython.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langpython.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langpython.h 22 Nov 2004 03:52:55 -0000 1.2 --- langpython.h 22 Nov 2004 05:12:26 -0000 1.3 *************** *** 28,33 **** ! boolean runstringverb(hdltreenode hp1, tyvaluerecord *v); ! boolean pythoninitverbs(void); --- 28,32 ---- ! extern boolean langrunpythonscript (hdltreenode hp1, tyvaluerecord *v); |
|
From: David B. <dav...@us...> - 2004-11-22 04:56:28
|
Update of /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7607 Modified Files: project.pbxproj Log Message: undo revision Index: project.pbxproj =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode/project.pbxproj,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** project.pbxproj 22 Nov 2004 03:52:56 -0000 1.16 --- project.pbxproj 22 Nov 2004 04:56:18 -0000 1.17 *************** *** 569,573 **** 6515294B072C000500411831, 6515294D072C000900411831, - 6730555D0751953E006F9CD7, ); isa = PBXFrameworksBuildPhase; --- 569,572 ---- *************** *** 5292,5296 **** 651527B7072BFE0E00411831 = { children = ( - 6730555C0751953E006F9CD7, 651527B8072BFE0E00411831, 6515294A072C000500411831, --- 5291,5294 ---- *************** *** 8616,8643 **** //653 //654 - //670 - //671 - //672 - //673 - //674 - 6730555C0751953E006F9CD7 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = Python.framework; - path = /System/Library/Frameworks/Python.framework; - refType = 0; - sourceTree = "<absolute>"; - }; - 6730555D0751953E006F9CD7 = { - fileRef = 6730555C0751953E006F9CD7; - isa = PBXBuildFile; - settings = { - }; - }; - //670 - //671 - //672 - //673 - //674 //BB0 //BB1 --- 8614,8617 ---- *************** *** 8658,8662 **** fileEncoding = 30; isa = PBXFileReference; ! lastKnownFileType = text.xml; path = Info.plist; refType = 2; --- 8632,8636 ---- fileEncoding = 30; isa = PBXFileReference; ! lastKnownFileType = text.plist.xml; path = Info.plist; refType = 2; |
|
From: David B. <dav...@us...> - 2004-11-22 04:45:56
|
Update of /cvsroot/frontierkernel/Frontier/Common/resources/Mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6195 Modified Files: kernvelverbs.r Log Message: undo the revision Index: kernvelverbs.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/kernvelverbs.r,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** kernvelverbs.r 22 Nov 2004 03:52:55 -0000 1.3 --- kernvelverbs.r 22 Nov 2004 04:45:44 -0000 1.4 *************** *** 1098,1110 **** }; - resource 'EFP#' (idpythonverbs, "python") { /* 2004-11-3 ddb: python verbs */ - { - "python", false, { - "startinterpreter", - "stopinterpreter", - "runstring" - } - } - }; - - --- 1098,1099 ---- |
|
From: David B. <dav...@us...> - 2004-11-22 04:44:58
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5977 Modified Files: kernelverbdefs.h Log Message: undo the revision Index: kernelverbdefs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/kernelverbdefs.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** kernelverbdefs.h 22 Nov 2004 03:52:55 -0000 1.2 --- kernelverbdefs.h 22 Nov 2004 04:44:36 -0000 1.3 *************** *** 48,51 **** #define idquicktimeverbs 1022 /*7.0b4 PBS: QuickTime Player window verbs*/ #define idregexpverbs 1023 /*2003-04-22 AR: regular expression verbs*/ - #define idpythonverbs 1024 /* 2004-11-3 ddb: added python verbs */ --- 48,50 ---- |
|
From: David B. <dav...@us...> - 2004-11-22 04:44:07
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5814 Modified Files: shell.c Log Message: undo the revision Index: shell.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shell.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** shell.c 22 Nov 2004 03:52:56 -0000 1.5 --- shell.c 22 Nov 2004 04:43:56 -0000 1.6 *************** *** 78,83 **** #include "WinSockNetEvents.h" - #include "langpython.h" - #ifdef flcomponent #include <uisharing.h> --- 78,81 ---- *************** *** 1323,1328 **** #endif - - pythoninitverbs(); if (keyboardescape ()) /*check again before landinit; after this, must do shellquit*/ --- 1321,1324 ---- |
|
From: David B. <dav...@us...> - 2004-11-22 04:43:19
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5673 Modified Files: langpython.c Log Message: undo the revision Index: langpython.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** langpython.c 22 Nov 2004 03:52:56 -0000 1.3 --- langpython.c 22 Nov 2004 04:43:08 -0000 1.4 *************** *** 27,31 **** #include "standard.h" ! #define FRONTIER_PYTHON 1 #ifdef MACVERSION --- 27,37 ---- #include "standard.h" ! #define xxxFRONTIER_PYTHON 1 ! [...1241 lines suppressed...] ! if (PyRun_SimpleString (*h) == 0) ! fl = setbooleanvalue (true, v); ! ! unlockhandle (h); ! disposehandle (h); ! return (fl); ! }/*langrunpythonscript*/ ! #else + boolean langrunpythonscript (hdltreenode hp1, tyvaluerecord *v) { ! langerror (unimplementedverberror); + return (false); + } #endif |
|
From: David B. <dav...@us...> - 2004-11-22 04:35:18
|
Update of /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4500 Modified Files: Tag: sidewinder-branch project.pbxproj Log Message: put it in the right place Index: project.pbxproj =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode/project.pbxproj,v retrieving revision 1.15 retrieving revision 1.15.2.1 diff -C2 -d -r1.15 -r1.15.2.1 *** project.pbxproj 11 Nov 2004 09:29:37 -0000 1.15 --- project.pbxproj 22 Nov 2004 04:34:59 -0000 1.15.2.1 *************** *** 569,572 **** --- 569,573 ---- 6515294B072C000500411831, 6515294D072C000900411831, + 6730555D0751953E006F9CD7, ); isa = PBXFrameworksBuildPhase; *************** *** 5291,5294 **** --- 5292,5296 ---- 651527B7072BFE0E00411831 = { children = ( + 6730555C0751953E006F9CD7, 651527B8072BFE0E00411831, 6515294A072C000500411831, *************** *** 8614,8617 **** --- 8616,8643 ---- //653 //654 + //670 + //671 + //672 + //673 + //674 + 6730555C0751953E006F9CD7 = { + isa = PBXFileReference; + lastKnownFileType = wrapper.framework; + name = Python.framework; + path = /System/Library/Frameworks/Python.framework; + refType = 0; + sourceTree = "<absolute>"; + }; + 6730555D0751953E006F9CD7 = { + fileRef = 6730555C0751953E006F9CD7; + isa = PBXBuildFile; + settings = { + }; + }; + //670 + //671 + //672 + //673 + //674 //BB0 //BB1 *************** *** 8632,8636 **** fileEncoding = 30; isa = PBXFileReference; ! lastKnownFileType = text.plist.xml; path = Info.plist; refType = 2; --- 8658,8662 ---- fileEncoding = 30; isa = PBXFileReference; ! lastKnownFileType = text.xml; path = Info.plist; refType = 2; |
1 message has been excluded from this view by a project administrator.
