Changeset 50

Show
Ignore:
Timestamp:
10/26/04 01:38:53 (4 years ago)
Author:
aldacron
Message:

[DerelictPY]
* Added ceval.d, classobject.d and pystate.d

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/DerelictPY/Makefile

    r48 r50  
    1414    $(PY.SRC.DIR)\bufferobject.d \ 
    1515    $(PY.SRC.DIR)\cellobject.d \ 
     16    $(PY.SRC.DIR)\ceval.d \ 
     17    $(PY.SRC.DIR)\classobject.d \ 
    1618    $(PY.SRC.DIR)\cobject.d \ 
    1719    $(PY.SRC.DIR)\compile.d \ 
    …… 
    2729    $(PY.SRC.DIR)\node.d \ 
    2830    $(PY.SRC.DIR)\object.d \ 
     31    $(PY.SRC.DIR)\pystate.d \ 
    2932    $(PY.SRC.DIR)\python.d \ 
    3033    $(PY.SRC.DIR)\pythonrun.d \ 
    …… 
    3740    $(PY.OBJ.DIR)\boolobject.obj \ 
    3841    $(PY.OBJ.DIR)\bufferobject.obj \ 
     42    $(PY.OBJ.DIR)\cellobject.obj \ 
     43    $(PY.OBJ.DIR)\ceval.obj \ 
     44    $(PY.OBJ.DIR)\classobject.obj \ 
    3945    $(PY.OBJ.DIR)\cobject.obj \ 
    4046    $(PY.OBJ.DIR)\compile.obj \ 
    4147    $(PY.OBJ.DIR)\complexobject.obj \ 
    42     $(PY.OBJ.DIR)\cellobject.obj \ 
    4348    $(PY.OBJ.DIR)\descrobject.obj \ 
    4449    $(PY.OBJ.DIR)\errcode.obj \ 
    …… 
    5156    $(PY.OBJ.DIR)\node.obj \ 
    5257    $(PY.OBJ.DIR)\object.obj \ 
     58    $(PY.OBJ.DIR)\pystate.obj \ 
    5359    $(PY.OBJ.DIR)\python.obj \ 
    5460    $(PY.OBJ.DIR)\pythonrun.obj \ 

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

    r48 r50  
    55import derelict.python.bufferobject; 
    66import derelict.python.cellobject; 
     7import derelict.python.ceval; 
     8import derelict.python.classobject; 
    79import derelict.python.cobject; 
    810import derelict.python.compile; 
    …… 
    1820import derelict.python.node; 
    1921import derelict.python.object; 
     22import derelict.python.pystate; 
    2023import derelict.python.pythonrun; 
    2124import derelict.python.tupleobject; 
    …… 
    142145    PyCell_Set = cast(pfPyCell_Set)getProc("PyCell_Set"); 
    143146     
     147    // ceval.d 
     148    _Py_Ticker = cast(int*)getProc("_Py_Ticker"); 
     149    _Py_CheckInterval = cast(int*)getProc("_Py_CheckInterval"); 
     150    PyEval_CallObjectWithKeywords = cast(pfPyEval_CallObjectWithKeywords)getProc("PyEval_CallObjectWithKeywords"); 
     151    PyEval_CallFunction = cast(pfPyEval_CallFunction)getProc("PyEval_CallFunction"); 
     152    PyEval_CallMethod = cast(pfPyEval_CallMethod)getProc("PyEval_CallMethod"); 
     153    PyEval_SetProfile = cast(pfPyEval_SetProfile)getProc("PyEval_SetProfile"); 
     154    PyEval_SetTrace = cast(pfPyEval_SetTrace)getProc("PyEval_SetTrace"); 
     155    PyEval_GetBuiltins = cast(pfPyEval_GetBuiltins)getProc("PyEval_GetBuiltins"); 
     156    PyEval_GetGlobals = cast(pfPyEval_GetGlobals)getProc("PyEval_GetGlobals"); 
     157    PyEval_GetLocals = cast(pfPyEval_GetLocals)getProc("PyEval_GetLocals"); 
     158    PyEval_GetFrame = cast(pfPyEval_GetFrame)getProc("PyEval_GetFrame"); 
     159    PyEval_GetRestricted = cast(pfPyEval_GetRestricted)getProc("PyEval_GetRestricted"); 
     160    PyEval_MergeCompilerFlags = cast(pfPyEval_MergeCompilerFlags)getProc("PyEval_MergeCompilerFlags"); 
     161    Py_FlushLine = cast(pfPy_FlushLine)getProc("Py_FlushLine"); 
     162    Py_AddPendingCall = cast(pfPy_AddPendingCall)getProc("Py_AddPendingCall"); 
     163    Py_MakePendingCalls = cast(pfPy_MakePendingCalls)getProc("Py_MakePendingCalls"); 
     164    Py_SetRecursionLimit = cast(pfPy_SetRecursionLimit)getProc("Py_SetRecursionLimit"); 
     165    Py_GetRecursionLimit = cast(pfPy_GetRecursionLimit)getProc("Py_GetRecursionLimit"); 
     166    PyEval_GetFuncName = cast(pfPyEval_GetFuncName)getProc("PyEval_GetFuncName"); 
     167    PyEval_GetFuncDesc = cast(pfPyEval_GetFuncDesc)getProc("PyEval_GetFuncDesc"); 
     168    PyEval_GetCallStats = cast(pfPyEval_GetCallStats)getProc("PyEval_GetCallStats"); 
     169    PyEval_SaveThread = cast(pfPyEval_SaveThread)getProc("PyEval_SaveThread"); 
     170    PyEval_RestoreThread = cast(pfPyEval_RestoreThread)getProc("PyEval_RestoreThread"); 
     171    _PyEval_SliceIndex = cast(pf_PyEval_SliceIndex)getProc("_PyEval_SliceIndex"); 
     172     
     173    version(WITH_THREAD) 
     174    { 
     175    PyEval_InitThreads = cast(pfPyEval_InitThreads)getProc("PyEval_InitThreads"); 
     176    PyEval_AcquireLock = cast(pfPyEval_AcquireLock)getProc("PyEval_AcquireLock"); 
     177    PyEval_ReleaseLock = cast(pfPyEval_ReleaseLock)getProc("PyEval_ReleaseLock"); 
     178    PyEval_AcquireThread = cast(pfPyEval_AcquireThread)getProc("PyEval_AcquireThread"); 
     179    PyEval_ReleaseThread = cast(pfPyEval_ReleaseThread)getProc("PyEval_ReleaseThread"); 
     180    PyEval_ReInitThreads = cast(pfPyEval_ReInitThreads)getProc("PyEval_ReInitThreads");  
     181    } 
     182     
     183    // classobject.d 
     184    PyClass_Type = cast(PyTypeObject*)getProc("PyClass_Type"); 
     185    PyInstance_Type = cast(PyTypeObject*)getProc("PyInstance_Type"); 
     186    PyMethod_Type = cast(PyTypeObject*)getProc("PyMethod_Type"); 
     187    PyClass_New = cast(pfPyClass_New)getProc("PyClass_New"); 
     188    PyInstance_New = cast(pfPyInstance_New)getProc("PyInstance_New"); 
     189    PyInstance_NewRaw = cast(pfPyInstance_NewRaw)getProc("PyInstance_NewRaw"); 
     190    PyMethod_New = cast(pfPyMethod_New)getProc("PyMethod_New"); 
     191    PyMethod_Function = cast(pfPyMethod_Function)getProc("PyMethod_Function"); 
     192    PyMethod_Self = cast(pfPyMethod_Self)getProc("PyMethod_Self"); 
     193    PyMethod_Class = cast(pfPyMethod_Class)getProc("PyMethod_Class"); 
     194    PyInstance_Lookup = cast(pfPyInstance_Lookup)getProc("PyInstance_Lookup"); 
     195    PyClass_IsSubClass = cast(pfPyClass_IsSubClass)getProc("PyClass_IsSubClass"); 
     196     
    144197    // cobject.d 
    145198    PyCObject_Type = cast(PyTypeObject*)getProc("PyCObject_Type"); 
    …… 
    318371    { 
    319372    PyObject_Unicode = cast(unaryfunc)getProc("PyObject_Unicode"); 
     373    } 
     374     
     375    // pystate.d 
     376    _PyThreadState_Current = cast(PyThreadState*)getProc("_PyThreadState_Current"); 
     377    _PyThreadState_GetFrame = cast(PyThreadFrameGetter)getProc("_PyThreadState_GetFrame"); 
     378    PyInterpreterState_New = cast(pfPyInterpreterState_New)getProc("PyInterpreterState_New"); 
     379    PyInterpreterState_Clear = cast(pfPyInterpreterState_Clear)getProc("PyInterpreterState_Clear"); 
     380    PyInterpreterState_Delete = cast(pfPyInterpreterState_Delete)getProc("PyInterpreterState_Delete"); 
     381    PyThreadState_New = cast(pfPyThreadState_New)getProc("PyThreadState_New"); 
     382    PyThreadState_Clear = cast(pfPyThreadState_Clear)getProc("PyThreadState_Clear"); 
     383    PyThreadState_Delete = cast(pfPyThreadState_Delete)getProc("PyThreadState_Delete"); 
     384    PyThreadState_Get = cast(pfPyThreadState_Get)getProc("PyThreadState_Get"); 
     385    PyThreadState_Swap = cast(pfPyThreadState_Swap)getProc("PyThreadState_Swap"); 
     386    PyThreadState_GetDict = cast(pfPyThreadState_GetDict)getProc("PyThreadState_GetDict"); 
     387    PyThreadState_SetAsyncExc = cast(pfPyThreadState_SetAsyncExc)getProc("PyThreadState_SetAsyncExc"); 
     388    PyGILState_Ensure = cast(pfPyGILState_Ensure)getProc("PyGILState_Ensure"); 
     389    PyGILState_Release = cast(pfPyGILState_Release)getProc("PyGILState_Release"); 
     390    PyGILState_GetThisThreadState = cast(pfPyGILState_GetThisThreadState)getProc("PyGILState_GetThisThreadState"); 
     391    PyInterpreterState_Head = cast(pfPyInterpreterState_Head)getProc("PyInterpreterState_Head"); 
     392    PyInterpreterState_Next = cast(pfPyInterpreterState_Next)getProc("PyInterpreterState_Next"); 
     393    PyInterpreterState_ThreadHead = cast(pfPyInterpreterState_ThreadHead)getProc("PyInterpreterState_ThreadHead"); 
     394    PyThreadState_Next = cast(pfPyThreadState_Next)getProc("PyThreadState_Next"); 
     395     
     396    version(WITH_THREAD) 
     397    { 
     398    PyThreadState_DeleteCurrent = cast(pfPyThreadState_DeleteCurrent)getProc("PyThreadState_DeleteCurrent"); 
    320399    } 
    321400