Changeset 57

Show
Ignore:
Timestamp:
11/17/04 22:29:46 (4 years ago)
Author:
aldacron
Message:

[DerelictPY]
* added dictobject.d, enumobject.d, eval.d, and fileobject.d

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/DerelictPY/Makefile

    r56 r57  
    2323    $(PY.SRC.DIR)\datetime.d \ 
    2424    $(PY.SRC.DIR)\descrobject.d \ 
     25    $(PY.SRC.DIR)\dictobject.d \ 
     26    $(PY.SRC.DIR)\enumobject.d \ 
     27    $(PY.SRC.DIR)\eval.d \ 
    2528    $(PY.SRC.DIR)\errcode.d \ 
     29    $(PY.SRC.DIR)\fileobject.d \ 
    2630    $(PY.SRC.DIR)\floatobject.d \ 
    2731    $(PY.SRC.DIR)\frameobject.d \ 
    …… 
    5357    $(PY.OBJ.DIR)\datetime.obj \ 
    5458    $(PY.OBJ.DIR)\descrobject.obj \ 
     59    $(PY.OBJ.DIR)\dictobject.obj \ 
     60    $(PY.OBJ.DIR)\enumobject.obj \ 
    5561    $(PY.OBJ.DIR)\errcode.obj \ 
     62    $(PY.OBJ.DIR)\eval.obj \ 
     63    $(PY.OBJ.DIR)\fileobject.obj \ 
    5664    $(PY.OBJ.DIR)\floatobject.obj \ 
    5765    $(PY.OBJ.DIR)\frameobject.obj \ 

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

    r56 r57  
    1414import derelict.python.datetime; 
    1515import derelict.python.descrobject; 
     16import derelict.python.dictobject; 
     17import derelict.python.enumobject; 
     18import derelict.python.eval; 
    1619import derelict.python.errcode; 
     20import derelict.python.fileobject; 
    1721import derelict.python.floatobject; 
    1822import derelict.python.frameobject; 
    …… 
    263267    PyWrapper_New = cast(pfPyWrapper_New)getProc("PyWrapper_New"); 
    264268 
     269    // dictobject.d 
     270    PyDict_Type = cast(PyTypeObject*)getProc("PyDict_Type"); 
     271    PyDict_New = cast(pfPyDict_New)getProc("PyDict_New"); 
     272    PyDict_GetItem = cast(pfPyDict_GetItem)getProc("PyDict_GetItem"); 
     273    PyDict_SetItem = cast(pfPyDict_SetItem)getProc("PyDict_SetItem"); 
     274    PyDict_DelItem = cast(pfPyDict_DelItem)getProc("PyDict_DelItem"); 
     275    PyDict_Clear = cast(pfPyDict_Clear)getProc("PyDict_Clear"); 
     276    PyDict_Next = cast(pfPyDict_Next)getProc("PyDict_Next"); 
     277    PyDict_Keys = cast(pfPyDict_Keys)getProc("PyDict_Keys"); 
     278    PyDict_Values = cast(pfPyDict_Values)getProc("PyDict_Values"); 
     279    PyDict_Items = cast(pfPyDict_Items)getProc("PyDict_Items"); 
     280    PyDict_Size = cast(pfPyDict_Size)getProc("PyDict_Size"); 
     281    PyDict_Copy = cast(pfPyDict_Copy)getProc("PyDict_Copy"); 
     282    PyDict_Update = cast(pfPyDict_Update)getProc("PyDict_Update"); 
     283    PyDict_Merge = cast(pfPyDict_Merge)getProc("PyDict_Merge"); 
     284    PyDict_MergeFromSeq2 = cast(pfPyDict_MergeFromSeq2)getProc("PyDict_MergeFromSeq2"); 
     285    PyDict_GetItemString = cast(pfPyDict_GetItemString)getProc("PyDict_GetItemString"); 
     286    PyDict_SetItemString = cast(pfPyDict_SetItemString)getProc("PyDict_SetItemString"); 
     287    PyDict_DelItemString = cast(pfPyDict_DelItemString)getProc("PyDict_DelItemString"); 
     288 
     289    // enumobject.d 
     290    PyEnum_Type = cast(PyTypeObject*)getProc("PyEnum_Type"); 
     291 
     292    // eval.d 
     293    PyEval_EvalCode = cast(pfPyEval_EvalCode)getProc("PyEval_EvalCode"); 
     294    PyEval_EvalCodeEx = cast(pfPyEval_EvalCodeEx)getProc("PyEval_EvalCodeEx"); 
     295    _PyEval_CallTracing = cast(pf_PyEval_CallTracing)getProc("_PyEval_CallTracing"); 
     296 
     297    // fileobject.d 
     298    PyFile_Type = cast(PyTypeObject*)getProc("PyFile_Type"); 
     299    Py_FileSystemDefaultEncoding = cast(PyTypeObject*)getProc("Py_FileSystemDefaultEncoding"); 
     300    PyFile_FromString = cast(pfPyFile_FromString)getProc("PyFile_FromString"); 
     301    PyFile_SetBufSize = cast(pfPyFile_SetBufSize)getProc("PyFile_SetBufSize"); 
     302    PyFile_SetEncoding = cast(pfPyFile_SetEncoding)getProc("PyFile_SetEncoding"); 
     303    PyFile_FromFile = cast(pfPyFile_FromFile)getProc("PyFile_FromFile"); 
     304    PyFile_AsFile = cast(pfPyFile_AsFile)getProc("PyFile_AsFile"); 
     305    PyFile_Name = cast(pfPyFile_Name)getProc("PyFile_Name"); 
     306    PyFile_GetLine = cast(pfPyFile_GetLine)getProc("PyFile_GetLine"); 
     307    PyFile_WriteObject = cast(pfPyFile_WriteObject)getProc("PyFile_WriteObject"); 
     308    PyFile_SoftSpace = cast(pfPyFile_SoftSpace)getProc("PyFile_SoftSpace"); 
     309    PyFile_WriteString = cast(pfPyFile_WriteString)getProc("PyFile_WriteString"); 
     310    PyFile_AsFileDescriptor = cast(pfPyFile_AsFileDescriptor)getProc("PyFile_AsFileDescriptor"); 
     311 
    265312    // floatobject.d 
    266313    PyFloat_Type = cast(PyTypeObject*)getProc("PyFloat_Type");