Changeset 59

Show
Ignore:
Timestamp:
11/27/04 00:40:07 (4 years ago)
Author:
aldacron
Message:

[DerelictPY]
* added intrcheck.d, iterobject.d, listobject.d and pyimport.d

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/DerelictPY/Makefile

    r57 r59  
    3131    $(PY.SRC.DIR)\frameobject.d \ 
    3232    $(PY.SRC.DIR)\intobject.d \ 
     33    $(PY.SRC.DIR)\intrcheck.d \ 
     34    $(PY.SRC.DIR)\iterobject.d \ 
    3335    $(PY.SRC.DIR)\longintrepr.d \ 
    3436    $(PY.SRC.DIR)\longobject.d \ 
     37    $(PY.SRC.DIR)\listobject.d \ 
    3538    $(PY.SRC.DIR)\methodobject.d \ 
    3639    $(PY.SRC.DIR)\node.d \ 
    3740    $(PY.SRC.DIR)\object.d \ 
     41    $(PY.SRC.DIR)\pyimport.d \ 
    3842    $(PY.SRC.DIR)\pystate.d \ 
    3943    $(PY.SRC.DIR)\python.d \ 
    …… 
    6569    $(PY.OBJ.DIR)\frameobject.obj \ 
    6670    $(PY.OBJ.DIR)\intobject.obj \ 
     71    $(PY.OBJ.DIR)\intrcheck.obj \ 
     72    $(PY.OBJ.DIR)\iterobject.obj \ 
    6773    $(PY.OBJ.DIR)\longintrepr.obj \ 
    6874    $(PY.OBJ.DIR)\longobject.obj \ 
     75    $(PY.OBJ.DIR)\listobject.obj \ 
    6976    $(PY.OBJ.DIR)\methodobject.obj \ 
    7077    $(PY.OBJ.DIR)\node.obj \ 
    7178    $(PY.OBJ.DIR)\object.obj \ 
     79    $(PY.OBJ.DIR)\pyimport.obj \ 
    7280    $(PY.OBJ.DIR)\pystate.obj \ 
    7381    $(PY.OBJ.DIR)\python.obj \ 

  • trunk/DerelictPY/derelict/python/python.d

    r57 r59  
    2222import derelict.python.frameobject; 
    2323import derelict.python.intobject; 
     24import derelict.python.intrcheck; 
     25import derelict.python.iterobject; 
     26import derelict.python.listobject; 
    2427import derelict.python.longintrepr; 
    2528import derelict.python.longobject; 
    …… 
    2730import derelict.python.node; 
    2831import derelict.python.object; 
     32import derelict.python.pyimport; 
    2933import derelict.python.pystate; 
    3034import derelict.python.pythonrun; 
    …… 
    345349    PyInt_FromUnicode = cast(pfPyInt_FromUnicode)getProc("PyInt_FromUnicode"); 
    346350    } 
     351 
     352    // intrcheck.d 
     353    PyOS_InterruptOccurred = cast(pfPyOS_InterruptOccurred)getProc("PyOS_InterruptOccurred"); 
     354    PyOS_InitInterrupts = cast(pfPyOS_InitInterrupts)getProc("PyOS_InitInterrupts"); 
     355    PyOS_AfterFork = cast(pfPyOS_AfterFork)getProc("PyOS_AfterFork"); 
     356 
     357    // iterobject.d 
     358    PySeqIter_Type = cast(PyTypeObject*)getProc("PySeqIter_Type"); 
     359    PyCallIter_Type = cast(PyTypeObject*)getProc("PyCallIter_Type"); 
     360    PySeqIter_New = cast(pfPySeqIter_New)getProc("PySeqIter_New"); 
     361    PyCallIter_New = cast(pfPyCallIter_New)getProc("PyCallIter_New"); 
     362 
     363    // listobject.d 
     364    PyList_Type = cast(PyTypeObject*)getProc("PyList_Type"); 
     365    PyList_New = cast(pfPyList_New)getProc("PyList_New"); 
     366    PyList_Size = cast(pfPyList_Size)getProc("PyList_Size"); 
     367    PyList_GetItem = cast(pfPyList_GetItem)getProc("PyList_GetItem"); 
     368    PyList_SetItem = cast(pfPyList_SetItem)getProc("PyList_SetItem"); 
     369    PyList_Insert = cast(pfPyList_Insert)getProc("PyList_Insert"); 
     370    PyList_Append = cast(pfPyList_Append)getProc("PyList_Append"); 
     371    PyList_GetSlice = cast(pfPyList_GetSlice)getProc("PyList_GetSlice"); 
     372    PyList_SetSlice = cast(pfPyList_SetSlice)getProc("PyList_SetSlice"); 
     373    PyList_Sort = cast(pfPyList_Sort)getProc("PyList_Sort"); 
     374    PyList_Reverse = cast(pfPyList_Reverse)getProc("PyList_Reverse"); 
     375    PyList_AsTuple = cast(pfPyList_AsTuple)getProc("PyList_AsTuple"); 
     376 
    347377    // longintrepr.d 
    348378    _PyLong_New = cast(pf_PyLong_New)getProc("_PyLong_New"); 
    …… 
    446476    PyObject_Unicode = cast(unaryfunc)getProc("PyObject_Unicode"); 
    447477    } 
     478 
     479    // pyimport.d 
     480    // NOTE: I assume that loading pointers results in a pointer to a pointer 
     481    // being returned. This will need testing to make sure it works. 
     482    _inittab** temp_inittab = cast(_inittab**)getProc("PyImport_Inittab"); 
     483    _frozen** temp_frozen = cast(_frozen**)getProc("PyImport_FrozenModules"); 
     484    PyImport_Inittab = cast(_inittab*)*temp_inittab; 
     485    PyImport_FrozenModules = cast(_frozen*)*temp_frozen; 
     486 
     487    PyImport_GetMagicNumber = cast(pfPyImport_GetMagicNumber)getProc("PyImport_GetMagicNumber"); 
     488    PyImport_ExecCodeModule = cast(pfPyImport_ExecCodeModule)getProc("PyImport_ExecCodeModule"); 
     489    PyImport_ExecCodeModuleEx = cast(pfPyImport_ExecCodeModuleEx)getProc("PyImport_ExecCodeModuleEx"); 
     490    PyImport_GetModuleDict = cast(pfPyImport_GetModuleDict)getProc("PyImport_GetModuleDict"); 
     491    PyImport_AddModule = cast(pfPyImport_AddModule)getProc("PyImport_AddModule"); 
     492    PyImport_ImportModule = cast(pfPyImport_ImportModule)getProc("PyImport_ImportModule"); 
     493    PyImport_ImportModuleEx = cast(pfPyImport_ImportModuleEx)getProc("PyImport_ImportModuleEx"); 
     494    PyImport_Import = cast(pfPyImport_Import)getProc("PyImport_Import"); 
     495    PyImport_ReloadModule = cast(pfPyImport_ReloadModule)getProc("PyImport_ReloadModule"); 
     496    PyImport_Cleanup = cast(pfPyImport_Cleanup)getProc("PyImport_Cleanup"); 
     497    PyImport_ImportFrozenModule = cast(pfPyImport_ImportFrozenModule)getProc("PyImport_ImportFrozenModule"); 
     498    _PyImport_FindExtension = cast(pf_PyImport_FindExtension)getProc("_PyImport_FindExtension"); 
     499    _PyImport_FixupExtension = cast(pf_PyImport_FixupExtension)getProc("_PyImport_FixupExtension"); 
     500    PyImport_AppendInittab = cast(pfPyImport_AppendInittab)getProc("PyImport_AppendInittab"); 
     501    PyImport_ExtendInittab = cast(pfPyImport_ExtendInittab)getProc("PyImport_ExtendInittab"); 
    448502 
    449503    // pystate.d