Changeset 56

Show
Ignore:
Timestamp:
11/16/04 01:24:04 (4 years ago)
Author:
aldacron
Message:

[DerelictPY]
* added codecs.d, cstringio.d and datetime.d
* went through all existing source files and converted tabs to spaces.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/DerelictPY/Makefile

    r50 r56  
    1717    $(PY.SRC.DIR)\classobject.d \ 
    1818    $(PY.SRC.DIR)\cobject.d \ 
     19    $(PY.SRC.DIR)\codecs.d \ 
    1920    $(PY.SRC.DIR)\compile.d \ 
    2021    $(PY.SRC.DIR)\complexobject.d \ 
     22    $(PY.SRC.DIR)\cstringio.d \ 
     23    $(PY.SRC.DIR)\datetime.d \ 
    2124    $(PY.SRC.DIR)\descrobject.d \ 
    2225    $(PY.SRC.DIR)\errcode.d \ 
    …… 
    4447    $(PY.OBJ.DIR)\classobject.obj \ 
    4548    $(PY.OBJ.DIR)\cobject.obj \ 
     49    $(PY.OBJ.DIR)\codecs.obj \ 
    4650    $(PY.OBJ.DIR)\compile.obj \ 
    4751    $(PY.OBJ.DIR)\complexobject.obj \ 
     52    $(PY.OBJ.DIR)\cstringio.obj \ 
     53    $(PY.OBJ.DIR)\datetime.obj \ 
    4854    $(PY.OBJ.DIR)\descrobject.obj \ 
    4955    $(PY.OBJ.DIR)\errcode.obj \ 

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

    r40 r56  
    66// TYPES 
    77//============================================================================== 
    8 alias PyObject_Size            PyObject_Length; 
    9 alias PySequence_Size          PySequence_Length; 
    10 alias PySequence_Contains      PySequence_In; 
    11 alias PyMapping_Size           PyMapping_Length; 
    12 alias PyObject_DelItemString   PyMapping_DelItemString; 
    13 alias PyObject_DelItem         PyMapping_DelItem; 
    14  
    15  
    16 const int PY_ITERSEARCH_COUNT          = 1; 
    17 const int PY_ITERSEARCH_INDEX          = 2; 
    18 const int PY_ITERSEARCH_CONTAINS       = 3; 
     8alias PyObject_Size             PyObject_Length; 
     9alias PySequence_Size           PySequence_Length; 
     10alias PySequence_Contains       PySequence_In; 
     11alias PyMapping_Size            PyMapping_Length; 
     12alias PyObject_DelItemString    PyMapping_DelItemString; 
     13alias PyObject_DelItem          PyMapping_DelItem; 
     14 
     15 
     16const int PY_ITERSEARCH_COUNT           = 1; 
     17const int PY_ITERSEARCH_INDEX           = 2; 
     18const int PY_ITERSEARCH_CONTAINS        = 3; 
    1919 
    2020//============================================================================== 
    …… 
    2323bit PyIter_Check(PyObject* ob) 
    2424{/* 
    25    return (PyType_HasFeature(ob.ob_type, Py_TPFLAGS_HAVE_ITER) && 
    26            ob.ob_type.tp_iternext !== null); */ 
    27    return false; 
     25    return (PyType_HasFeature(ob.ob_type, Py_TPFLAGS_HAVE_ITER) && 
     26            ob.ob_type.tp_iternext !== null); */ 
     27    return false; 
    2828} 
    2929 
    3030PyObject* PyMapping_Keys(PyObject* ob) 
    3131{ 
    32    return PyObject_CallMethod(ob, "keys", null); 
     32    return PyObject_CallMethod(ob, "keys", null); 
    3333} 
    3434 
    3535PyObject* PyMapping_Values(PyObject* ob) 
    3636{ 
    37    return PyObject_CallMethod(ob, "values", null); 
     37    return PyObject_CallMethod(ob, "values", null); 
    3838} 
    3939 
    4040PyObject* PyMapping_Items(PyObject* ob) 
    4141{ 
    42    return PyObject_CallMethod(ob, "items", null); 
     42    return PyObject_CallMethod(ob, "items", null); 
    4343} 
    4444 
    …… 
    4848extern(C) 
    4949{ 
    50      
     50 
    5151typedef int function(PyObject*, PyObject*, int*) pfPyObject_Cmp; 
    5252typedef int function(PyObject*) pfPyCallable_Check; 
    …… 
    6969typedef PyObject* function(PyObject*) pfPyObject_GetIter; 
    7070typedef PyObject* function(PyObject*) pfPyIter_Next; 
    71 pfPyObject_Cmp                     PyObject_Cmp; 
    72 pfPyCallable_Check                 PyCallable_Check; 
    73 pfPyObject_Call                        PyObject_Call; 
    74 pfPyObject_CallObject              PyObject_CallObject; 
    75 pfPyObject_CallFunction                PyObject_CallFunction; 
    76 pfPyObject_CallMethod              PyObject_CallMethod; 
    77 pfPyObject_CallFunctionObjArgs     PyObject_CallFunctionObjArgs; 
    78 pfPyObject_CallMethodObjArgs       PyObject_CallMethodObjArgs; 
    79 pfPyObject_Type                        PyObject_Type; 
    80 pfPyObject_Size                        PyObject_Size; 
    81 pfPyObject_GetItem                 PyObject_GetItem; 
    82 pfPyObject_SetItem                 PyObject_SetItem; 
    83 pfPyObject_DelItemString           PyObject_DelItemString; 
    84 pfPyObject_DelItem                 PyObject_DelItem; 
    85 pfPyObject_AsCharBuffer                PyObject_AsCharBuffer; 
    86 pfPyObject_CheckReadBuffer         PyObject_CheckReadBuffer; 
    87 pfPyObject_AsReadBuffer                PyObject_AsReadBuffer; 
    88 pfPyObject_AsWriteBuffer           PyObject_AsWriteBuffer; 
    89 pfPyObject_GetIter                 PyObject_GetIter; 
    90 pfPyIter_Next                      PyIter_Next; 
     71pfPyObject_Cmp                      PyObject_Cmp; 
     72pfPyCallable_Check                  PyCallable_Check; 
     73pfPyObject_Call                     PyObject_Call; 
     74pfPyObject_CallObject               PyObject_CallObject; 
     75pfPyObject_CallFunction             PyObject_CallFunction; 
     76pfPyObject_CallMethod               PyObject_CallMethod; 
     77pfPyObject_CallFunctionObjArgs      PyObject_CallFunctionObjArgs; 
     78pfPyObject_CallMethodObjArgs        PyObject_CallMethodObjArgs; 
     79pfPyObject_Type                     PyObject_Type; 
     80pfPyObject_Size                     PyObject_Size; 
     81pfPyObject_GetItem                  PyObject_GetItem; 
     82pfPyObject_SetItem                  PyObject_SetItem; 
     83pfPyObject_DelItemString            PyObject_DelItemString; 
     84pfPyObject_DelItem                  PyObject_DelItem; 
     85pfPyObject_AsCharBuffer             PyObject_AsCharBuffer; 
     86pfPyObject_CheckReadBuffer          PyObject_CheckReadBuffer; 
     87pfPyObject_AsReadBuffer             PyObject_AsReadBuffer; 
     88pfPyObject_AsWriteBuffer            PyObject_AsWriteBuffer; 
     89pfPyObject_GetIter                  PyObject_GetIter; 
     90pfPyIter_Next                       PyIter_Next; 
    9191 
    9292typedef int function(PyObject*) pfPyNumber_Check; 
    …… 
    125125typedef PyObject* function(PyObject*, PyObject*) pfPyNumber_InPlaceXor; 
    126126typedef PyObject* function(PyObject*, PyObject*) pfPyNumber_InPlaceOr; 
    127 pfPyNumber_Check                   PyNumber_Check; 
    128 pfPyNumber_Add                     PyNumber_Add; 
    129 pfPyNumber_Subtract                    PyNumber_Subtract; 
    130 pfPyNumber_Multiply                    PyNumber_Multiply; 
    131 pfPyNumber_Divide                  PyNumber_Divide; 
    132 pfPyNumber_FloorDivide             PyNumber_FloorDivide; 
    133 pfPyNumber_TrueDivide              PyNumber_TrueDivide; 
    134 pfPyNumber_Remainder               PyNumber_Remainder; 
    135 pfPyNumber_Divmod                  PyNumber_Divmod; 
    136 pfPyNumber_Power                   PyNumber_Power; 
    137 pfPyNumber_Negative                    PyNumber_Negative; 
    138 pfPyNumber_Positive                    PyNumber_Positive; 
    139 pfPyNumber_Absolute                    PyNumber_Absolute; 
    140 pfPyNumber_Invert                  PyNumber_Invert; 
    141 pfPyNumber_Lshift                  PyNumber_Lshift; 
    142 pfPyNumber_Rshift                  PyNumber_Rshift; 
    143 pfPyNumber_And                     PyNumber_And; 
    144 pfPyNumber_Xor                     PyNumber_Xor; 
    145 pfPyNumber_Or                      PyNumber_Or; 
    146 pfPyNumber_Int                     PyNumber_Int; 
    147 pfPyNumber_Long                        PyNumber_Long; 
    148 pfPyNumber_Float                   PyNumber_Float; 
    149 pfPyNumber_InPlaceAdd              PyNumber_InPlaceAdd; 
    150 pfPyNumber_InPlaceSubtract         PyNumber_InPlaceSubtract; 
    151 pfPyNumber_InPlaceMultiply         PyNumber_InPlaceMultiply; 
    152 pfPyNumber_InPlaceDivide           PyNumber_InPlaceDivide; 
    153 pfPyNumber_InPlaceFloorDivide      PyNumber_InPlaceFloorDivide; 
    154 pfPyNumber_InPlaceTrueDivide       PyNumber_InPlaceTrueDivide; 
    155 pfPyNumber_InPlaceRemainder            PyNumber_InPlaceRemainder;                       
    156 pfPyNumber_InPlacePower                PyNumber_InPlacePower; 
    157 pfPyNumber_InPlaceLshift           PyNumber_InPlaceLshift; 
    158 pfPyNumber_InPlaceRshift           PyNumber_InPlaceRshift; 
    159 pfPyNumber_InPlaceAnd              PyNumber_InPlaceAnd; 
    160 pfPyNumber_InPlaceXor              PyNumber_InPlaceXor; 
    161 pfPyNumber_InPlaceOr               PyNumber_InPlaceOr; 
     127pfPyNumber_Check                    PyNumber_Check; 
     128pfPyNumber_Add                      PyNumber_Add; 
     129pfPyNumber_Subtract                 PyNumber_Subtract; 
     130pfPyNumber_Multiply                 PyNumber_Multiply; 
     131pfPyNumber_Divide                   PyNumber_Divide; 
     132pfPyNumber_FloorDivide              PyNumber_FloorDivide; 
     133pfPyNumber_TrueDivide               PyNumber_TrueDivide; 
     134pfPyNumber_Remainder                PyNumber_Remainder; 
     135pfPyNumber_Divmod                   PyNumber_Divmod; 
     136pfPyNumber_Power                    PyNumber_Power; 
     137pfPyNumber_Negative                 PyNumber_Negative; 
     138pfPyNumber_Positive                 PyNumber_Positive; 
     139pfPyNumber_Absolute                 PyNumber_Absolute; 
     140pfPyNumber_Invert                   PyNumber_Invert; 
     141pfPyNumber_Lshift                   PyNumber_Lshift; 
     142pfPyNumber_Rshift                   PyNumber_Rshift; 
     143pfPyNumber_And                      PyNumber_And; 
     144pfPyNumber_Xor                      PyNumber_Xor; 
     145pfPyNumber_Or                       PyNumber_Or; 
     146pfPyNumber_Int                      PyNumber_Int; 
     147pfPyNumber_Long                     PyNumber_Long; 
     148pfPyNumber_Float                    PyNumber_Float; 
     149pfPyNumber_InPlaceAdd               PyNumber_InPlaceAdd; 
     150pfPyNumber_InPlaceSubtract          PyNumber_InPlaceSubtract; 
     151pfPyNumber_InPlaceMultiply          PyNumber_InPlaceMultiply; 
     152pfPyNumber_InPlaceDivide            PyNumber_InPlaceDivide; 
     153pfPyNumber_InPlaceFloorDivide       PyNumber_InPlaceFloorDivide; 
     154pfPyNumber_InPlaceTrueDivide        PyNumber_InPlaceTrueDivide; 
     155pfPyNumber_InPlaceRemainder         PyNumber_InPlaceRemainder; 
     156pfPyNumber_InPlacePower             PyNumber_InPlacePower; 
     157pfPyNumber_InPlaceLshift            PyNumber_InPlaceLshift; 
     158pfPyNumber_InPlaceRshift            PyNumber_InPlaceRshift; 
     159pfPyNumber_InPlaceAnd               PyNumber_InPlaceAnd; 
     160pfPyNumber_InPlaceXor               PyNumber_InPlaceXor; 
     161pfPyNumber_InPlaceOr                PyNumber_InPlaceOr; 
    162162 
    163163typedef int function(PyObject*) pfPySequence_Check; 
    …… 
    180180typedef PyObject* function(PyObject*, PyObject*) pfPySequence_InPlaceConcat; 
    181181typedef PyObject* function(PyObject*, int) pfPySequence_InPlaceRepeat; 
    182 pfPySequence_Check                 PySequence_Check; 
    183 pfPySequence_Size                  PySequence_Size; 
    184 pfPySequence_Concat                    PySequence_Concat; 
    185 pfPySequence_Repeat                    PySequence_Repeat; 
    186 pfPySequence_GetItem               PySequence_GetItem; 
    187 pfPySequence_GetSlice              PySequence_GetSlice; 
    188 pfPySequence_SetItem               PySequence_SetItem; 
    189 pfPySequence_DelItem               PySequence_DelItem; 
    190 pfPySequence_SetSlice              PySequence_SetSlice; 
    191 pfPySequence_DelSlice              PySequence_DelSlice; 
    192 pfPySequence_Tuple                 PySequence_Tuple; 
    193 pfPySequence_List                  PySequence_List; 
    194 pfPySequence_Fast                  PySequence_Fast; 
    195 pfPySequence_Count                 PySequence_Count; 
    196 pfPySequence_Contains              PySequence_Contains; 
    197 pf_PySequence_IterSearch           _PySequence_IterSearch; 
    198 pfPySequence_Index                 PySequence_Index; 
    199 pfPySequence_InPlaceConcat         PySequence_InPlaceConcat; 
    200 pfPySequence_InPlaceRepeat         PySequence_InPlaceRepeat; 
     182pfPySequence_Check                  PySequence_Check; 
     183pfPySequence_Size                   PySequence_Size; 
     184pfPySequence_Concat                 PySequence_Concat; 
     185pfPySequence_Repeat                 PySequence_Repeat; 
     186pfPySequence_GetItem                PySequence_GetItem; 
     187pfPySequence_GetSlice               PySequence_GetSlice; 
     188pfPySequence_SetItem                PySequence_SetItem; 
     189pfPySequence_DelItem                PySequence_DelItem; 
     190pfPySequence_SetSlice               PySequence_SetSlice; 
     191pfPySequence_DelSlice               PySequence_DelSlice; 
     192pfPySequence_Tuple                  PySequence_Tuple; 
     193pfPySequence_List                   PySequence_List; 
     194pfPySequence_Fast                   PySequence_Fast; 
     195pfPySequence_Count                  PySequence_Count; 
     196pfPySequence_Contains               PySequence_Contains; 
     197pf_PySequence_IterSearch            _PySequence_IterSearch; 
     198pfPySequence_Index                  PySequence_Index; 
     199pfPySequence_InPlaceConcat          PySequence_InPlaceConcat; 
     200pfPySequence_InPlaceRepeat          PySequence_InPlaceRepeat; 
    201201 
    202202typedef int function(PyObject*) pfPyMapping_Check; 
    …… 
    208208typedef int function(PyObject*, PyObject*) pfPyObject_IsInstance; 
    209209typedef int function(PyObject*, PyObject*) pfPyObject_IsSubclass; 
    210 pfPyMapping_Check                  PyMapping_Check; 
    211 pfPyMapping_Size                   PyMapping_Size; 
    212 pfPyMapping_HasKeyString           PyMapping_HasKeyString; 
    213 pfPyMapping_HasKey                 PyMapping_HasKey; 
    214 pfPyMapping_GetItemString          PyMapping_GetItemString; 
    215 pfPyMapping_SetItemString          PyMapping_SetItemString; 
    216 pfPyObject_IsInstance              PyObject_IsInstance; 
    217 pfPyObject_IsSubclass              PyObject_IsSubclass; 
     210pfPyMapping_Check                   PyMapping_Check; 
     211pfPyMapping_Size                    PyMapping_Size; 
     212pfPyMapping_HasKeyString            PyMapping_HasKeyString; 
     213pfPyMapping_HasKey                  PyMapping_HasKey; 
     214pfPyMapping_GetItemString           PyMapping_GetItemString; 
     215pfPyMapping_SetItemString           PyMapping_SetItemString; 
     216pfPyObject_IsInstance               PyObject_IsInstance; 
     217pfPyObject_IsSubclass               PyObject_IsSubclass; 
    218218 
    219219} // extern(C) 

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

    r48 r56  
    1919bit PyBool_Check(PyObject* obj) 
    2020{ 
    21    return (obj.ob_type is PyBool_Type); 
     21    return (obj.ob_type is PyBool_Type); 
    2222} 
    2323 
    …… 
    2828{ 
    2929typedef PyObject* function(int) pfPyBool_FromLong; 
    30 pfPyBool_FromLong          PyBool_FromLong; 
     30pfPyBool_FromLong           PyBool_FromLong; 
    3131} 

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

    r48 r56  
    66// TYPES 
    77//============================================================================== 
    8 const int Py_END_OF_BUFFER         = -1; 
     8const int Py_END_OF_BUFFER          = -1; 
    99 
    1010PyTypeObject* PyBuffer_Type; 
    …… 
    1515bit PyBuffer_Check(PyObject *obj) 
    1616{ 
    17    return (obj.ob_type is PyBuffer_Type); 
     17    return (obj.ob_type is PyBuffer_Type); 
    1818} 
    1919 
    …… 
    2323extern(C) 
    2424{ 
    25      
     25 
    2626typedef PyObject* function(PyObject*, int, int) pfPyBuffer_FromObject; 
    2727typedef PyObject* function(PyObject*, int, int) pfPyBuffer_FromReadWriteObject; 
    …… 
    2929typedef PyObject* function(void*, int) pfPyBuffer_FromReadWriteMemory; 
    3030typedef PyObject* function(int) pfPyBuffer_New; 
    31 pfPyBuffer_FromObject                  PyBuffer_FromObject; 
    32 pfPyBuffer_FromReadWriteObject         PyBuffer_FromReadWriteObject; 
    33 pfPyBuffer_FromMemory                  PyBuffer_FromMemory; 
    34 pfPyBuffer_FromReadWriteMemory         PyBuffer_FromReadWriteMemory; 
    35 pfPyBuffer_New                         PyBuffer_New; 
     31pfPyBuffer_FromObject                   PyBuffer_FromObject; 
     32pfPyBuffer_FromReadWriteObject          PyBuffer_FromReadWriteObject; 
     33pfPyBuffer_FromMemory                   PyBuffer_FromMemory; 
     34pfPyBuffer_FromReadWriteMemory          PyBuffer_FromReadWriteMemory; 
     35pfPyBuffer_New                          PyBuffer_New; 
    3636 
    3737} // extern(C) 

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

    r48 r56  
    88struct PyCellObject 
    99{ 
    10    mixin PyObject_HEAD; 
    11    PyObject* ob_ref; 
     10    mixin PyObject_HEAD; 
     11    PyObject* ob_ref; 
    1212} 
    1313 
    …… 
    1919bit PyCell_Check(PyObject *obj) 
    2020{ 
    21    return (obj.ob_type is PyCell_Type); 
     21    return (obj.ob_type is PyCell_Type); 
    2222} 
    2323 
    …… 
    2727extern(C) 
    2828{ 
    29      
     29 
    3030typedef PyObject* function(PyObject*) pfPyCell_New; 
    3131typedef PyObject* function(PyObject*) pfPyCell_Get; 
    3232typedef int function(PyObject*, PyObject*) pfPyCell_Set; 
    33 pfPyCell_New                   PyCell_New; 
    34 pfPyCell_Get                   PyCell_Get; 
    35 pfPyCell_Set                   PyCell_Set; 
     33pfPyCell_New                    PyCell_New; 
     34pfPyCell_Get                    PyCell_Get; 
     35pfPyCell_Set                    PyCell_Set; 
    3636 
    3737} // extern(C) 

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

    r50 r56  
    2020PyObject* PyEval_CallObject(PyObject* func, PyObject* arg) 
    2121{ 
    22    return PyEval_CallObjectWithKeywords(func, arg, null); 
     22    return PyEval_CallObjectWithKeywords(func, arg, null); 
    2323} 
    2424 
    …… 
    3333typedef void function(Py_tracefunc,PyObject*) pfPyEval_SetProfile; 
    3434typedef void function(Py_tracefunc,PyObject*) pfPyEval_SetTrace; 
    35 pfPyEval_CallObjectWithKeywords            PyEval_CallObjectWithKeywords; 
    36 pfPyEval_CallFunction                  PyEval_CallFunction; 
    37 pfPyEval_CallMethod                        PyEval_CallMethod; 
    38 pfPyEval_SetProfile                        PyEval_SetProfile; 
    39 pfPyEval_SetTrace                      PyEval_SetTrace; 
     35pfPyEval_CallObjectWithKeywords         PyEval_CallObjectWithKeywords; 
     36pfPyEval_CallFunction                   PyEval_CallFunction; 
     37pfPyEval_CallMethod                     PyEval_CallMethod; 
     38pfPyEval_SetProfile                     PyEval_SetProfile; 
     39pfPyEval_SetTrace                       PyEval_SetTrace; 
    4040 
    4141typedef PyObject* function() pfPyEval_GetBuiltins; 
    …… 
    4444typedef PyFrameObject* function() pfPyEval_GetFrame; 
    4545typedef int function() pfPyEval_GetRestricted; 
    46 pfPyEval_GetBuiltins                   PyEval_GetBuiltins; 
    47 pfPyEval_GetGlobals                        PyEval_GetGlobals; 
    48 pfPyEval_GetLocals                     PyEval_GetLocals; 
    49 pfPyEval_GetFrame                      PyEval_GetFrame; 
    50 pfPyEval_GetRestricted                 PyEval_GetRestricted; 
     46pfPyEval_GetBuiltins                    PyEval_GetBuiltins; 
     47pfPyEval_GetGlobals                     PyEval_GetGlobals; 
     48pfPyEval_GetLocals                      PyEval_GetLocals; 
     49pfPyEval_GetFrame                       PyEval_GetFrame; 
     50pfPyEval_GetRestricted                  PyEval_GetRestricted; 
    5151 
    5252typedef int function(PyCompilerFlags*) pfPyEval_MergeCompilerFlags; 
    53 pfPyEval_MergeCompilerFlags                PyEval_MergeCompilerFlags; 
     53pfPyEval_MergeCompilerFlags             PyEval_MergeCompilerFlags; 
    5454 
    5555typedef int function() pfPy_FlushLine; 
    …… 
    5858typedef void function(int) pfPy_SetRecursionLimit; 
    5959typedef int function() pfPy_GetRecursionLimit; 
    60 pfPy_FlushLine                         Py_FlushLine; 
    61 pfPy_AddPendingCall                        Py_AddPendingCall; 
    62 pfPy_MakePendingCalls                  Py_MakePendingCalls; 
    63 pfPy_SetRecursionLimit                 Py_SetRecursionLimit; 
    64 pfPy_GetRecursionLimit                 Py_GetRecursionLimit; 
     60pfPy_FlushLine                          Py_FlushLine; 
     61pfPy_AddPendingCall                     Py_AddPendingCall; 
     62pfPy_MakePendingCalls                   Py_MakePendingCalls; 
     63pfPy_SetRecursionLimit                  Py_SetRecursionLimit; 
     64pfPy_GetRecursionLimit                  Py_GetRecursionLimit; 
    6565 
    6666typedef char* function(PyObject*) pfPyEval_GetFuncName; 
    6767typedef char* function(PyObject*) pfPyEval_GetFuncDesc; 
    6868typedef PyObject* function(PyObject*) pfPyEval_GetCallStats; 
    69 pfPyEval_GetFuncName                   PyEval_GetFuncName; 
    70 pfPyEval_GetFuncDesc                   PyEval_GetFuncDesc; 
    71 pfPyEval_GetCallStats                  PyEval_GetCallStats; 
     69pfPyEval_GetFuncName                    PyEval_GetFuncName; 
     70pfPyEval_GetFuncDesc                    PyEval_GetFuncDesc; 
     71pfPyEval_GetCallStats                   PyEval_GetCallStats; 
    7272 
    7373typedef PyThreadState* function() pfPyEval_SaveThread; 
    7474typedef void function(PyThreadState*) pfPyEval_RestoreThread; 
    75 pfPyEval_SaveThread                        PyEval_SaveThread; 
    76 pfPyEval_RestoreThread                 PyEval_RestoreThread; 
     75pfPyEval_SaveThread                     PyEval_SaveThread; 
     76pfPyEval_RestoreThread                  PyEval_RestoreThread; 
    7777 
    7878typedef int function(PyObject*,int*) pf_PyEval_SliceIndex; 
    79 pf_PyEval_SliceIndex                   _PyEval_SliceIndex; 
     79pf_PyEval_SliceIndex                    _PyEval_SliceIndex; 
    8080 
    8181version(WITH_THREAD) 
    8282{ 
    83      
     83 
    8484typedef void function() pfPyEval_InitThreads; 
    8585typedef void function() pfPyEval_AcquireLock; 
    …… 
    8888typedef void function(PyThreadState*) pfPyEval_ReleaseThread; 
    8989typedef void function() pfPyEval_ReInitThreads; 
    90 pfPyEval_InitThreads                   PyEval_InitThreads; 
    91 pfPyEval_AcquireLock                   PyEval_AcquireLock; 
    92 pfPyEval_ReleaseLock                   PyEval_ReleaseLock; 
    93 pfPyEval_AcquireThread                 PyEval_AcquireThread; 
    94 pfPyEval_ReleaseThread                 PyEval_ReleaseThread; 
    95 pfPyEval_ReInitThreads                 PyEval_ReInitThreads; 
    96      
     90pfPyEval_InitThreads                    PyEval_InitThreads; 
     91pfPyEval_AcquireLock                    PyEval_AcquireLock; 
     92pfPyEval_ReleaseLock                    PyEval_ReleaseLock; 
     93pfPyEval_AcquireThread                  PyEval_AcquireThread; 
     94pfPyEval_ReleaseThread                  PyEval_ReleaseThread; 
     95pfPyEval_ReInitThreads                  PyEval_ReInitThreads; 
     96 
    9797} // version(WITH_THREAD) 
    9898 

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

    r50 r56  
    88struct PyClassObject 
    99{ 
    10    mixin PyObject_HEAD; 
    11    PyObject* cl_bases; 
    12    PyObject* cl_dict; 
    13    PyObject* cl_name; 
    14    PyObject* cl_getattr; 
    15    PyObject* cl_setattr; 
    16    PyObject* cl_delattr; 
     10    mixin PyObject_HEAD; 
     11    PyObject* cl_bases; 
     12    PyObject* cl_dict; 
     13    PyObject* cl_name; 
     14    PyObject* cl_getattr; 
     15    PyObject* cl_setattr; 
     16    PyObject* cl_delattr; 
    1717} 
    1818 
    1919struct PyInstanceObject 
    2020{ 
    21    mixin PyObject_HEAD; 
    22    PyClassObject* in_class; 
    23    PyObject* in_dict; 
    24    PyObject* in_weakreflist; 
     21    mixin PyObject_HEAD; 
     22    PyClassObject* in_class; 
     23    PyObject* in_dict; 
     24    PyObject* in_weakreflist; 
    2525} 
    2626 
    2727struct PyMethodObject 
    2828{ 
    29    mixin PyObject_HEAD; 
    30    PyObject* im_func; 
    31    PyObject* im_self; 
    32    PyObject* im_class; 
    33    PyObject* in_weakreflist; 
     29    mixin PyObject_HEAD; 
     30    PyObject* im_func; 
     31    PyObject* im_self; 
     32    PyObject* im_class; 
     33    PyObject* in_weakreflist; 
    3434} 
    3535 
    …… 
    4444bit PyClass_Check(PyObject* obj) 
    4545{ 
    46    return (obj.ob_type == PyClass_Type); 
     46    return (obj.ob_type == PyClass_Type); 
    4747} 
    4848 
    4949bit PyInstance_Check(PyObject* obj) 
    5050{ 
    51    return (obj.ob_type == PyInstance_Type); 
     51    return (obj.ob_type == PyInstance_Type); 
    5252} 
    5353 
    5454bit PyMethod_Check(PyObject* obj) 
    5555{ 
    56    return (obj.ob_type == PyMethod_Type); 
     56    return (obj.ob_type == PyMethod_Type); 
    5757} 
    5858 
    5959PyObject* PyMethod_GET_FUNCTION(PyObject* obj) 
    6060{ 
    61    PyMethodObject* meth = cast(PyMethodObject*)obj; 
    62    return meth.im_func; 
     61    PyMethodObject* meth = cast(PyMethodObject*)obj; 
     62    return meth.im_func; 
    6363} 
    6464 
    6565PyObject* PyMethod_GET_SELF(PyObject* obj) 
    6666{ 
    67    PyMethodObject* meth = cast(PyMethodObject*)obj; 
    68    return meth.im_self; 
     67    PyMethodObject* meth = cast(PyMethodObject*)obj; 
     68    return meth.im_self; 
    6969} 
    7070 
    7171PyObject* PyMethod_GET_CLASS(PyObject* obj) 
    7272{ 
    73    PyMethodObject* meth = cast(PyMethodObject*)obj; 
    74    return meth.im_class; 
     73    PyMethodObject* meth = cast(PyMethodObject*)obj; 
     74    return meth.im_class; 
    7575} 
    7676 
    …… 
    8484typedef PyObject* function(PyObject*,PyObject*) pfPyInstance_NewRaw; 
    8585typedef PyObject* function(PyObject*,PyObject*,PyObject*) pfPyMethod_New; 
    86 pfPyClass_New                          PyClass_New; 
    87 pfPyInstance_New                       PyInstance_New; 
    88 pfPyInstance_NewRaw                        PyInstance_NewRaw; 
    89 pfPyMethod_New                         PyMethod_New; 
     86pfPyClass_New                           PyClass_New; 
     87pfPyInstance_New                        PyInstance_New; 
     88pfPyInstance_NewRaw                     PyInstance_NewRaw; 
     89pfPyMethod_New                          PyMethod_New; 
    9090 
    9191typedef PyObject* function(PyObject*) pfPyMethod_Function; 
    9292typedef PyObject* function(PyObject*) pfPyMethod_Self; 
    9393typedef PyObject* function(PyObject*) pfPyMethod_Class; 
    94 pfPyMethod_Function                        PyMethod_Function; 
    95 pfPyMethod_Self                            PyMethod_Self; 
    96 pfPyMethod_Class                       PyMethod_Class; 
     94pfPyMethod_Function                     PyMethod_Function; 
     95pfPyMethod_Self                         PyMethod_Self; 
     96pfPyMethod_Class                        PyMethod_Class; 
    9797 
    9898typedef PyObject* function(PyObject*,PyObject*) pfPyInstance_Lookup; 
    9999typedef int function(PyObject*,PyObject*) pfPyClass_IsSubClass; 
    100 pfPyInstance_Lookup                        PyInstance_Lookup; 
    101 pfPyClass_IsSubClass                   PyClass_IsSubClass; 
     100pfPyInstance_Lookup                     PyInstance_Lookup; 
     101pfPyClass_IsSubClass                    PyClass_IsSubClass; 
    102102 
    103103} 

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

    r48 r56  
    1313bit PyCObject_Check(PyObject* obj) 
    1414{ 
    15    return (obj.ob_type is PyCObject_Type); 
     15    return (obj.ob_type is PyCObject_Type); 
    1616} 
    1717 
    …… 
    2525typedef PyObject* function(void*, void*, void (*destruct)(void*, void*)) pfPyCObject_FromVoidPtrAndDesc; 
    2626typedef void* function(PyObject*) pfPyCObject_AsVoidPtr; 
    27 typedef    void* function(PyObject*) pfPyCObject_GetDesc; 
     27typedef void* function(PyObject*) pfPyCObject_GetDesc; 
    2828typedef void* function(char*, char*) pfPyCObject_Import; 
    29 pfPyCObject_FromVoidPtr                PyCObject_FromVoidPtr; 
    30 pfPyCObject_FromVoidPtrAndDesc     PyCObject_FromVoidPtrAndDesc; 
    31 pfPyCObject_AsVoidPtr              PyCObject_AsVoidPtr; 
    32 pfPyCObject_GetDesc                    PyCObject_GetDesc; 
    33 pfPyCObject_Import                 PyCObject_Import; 
    34      
     29pfPyCObject_FromVoidPtr             PyCObject_FromVoidPtr; 
     30pfPyCObject_FromVoidPtrAndDesc      PyCObject_FromVoidPtrAndDesc; 
     31pfPyCObject_AsVoidPtr               PyCObject_AsVoidPtr; 
     32pfPyCObject_GetDesc                 PyCObject_GetDesc; 
     33pfPyCObject_Import                  PyCObject_Import; 
     34 
    3535} // extern(C) 

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

    r48 r56  
    1111struct PyCodeObject 
    1212{ 
    13    mixin PyObject_HEAD; 
    14    int co_argcount; 
    15    int co_nlocals; 
    16    int co_stacksize; 
    17    int co_flags; 
    18    PyObject* co_code; 
    19    PyObject* co_consts; 
    20    PyObject* co_names; 
    21    PyObject* co_varnames; 
    22    PyObject* co_freevars; 
    23    PyObject* co_cellvars; 
    24    PyObject* co_filename; 
    25    PyObject* co_name; 
    26    int co_firstlineno; 
    27    PyObject* co_lnotab; 
     13    mixin PyObject_HEAD; 
     14    int co_argcount; 
     15    int co_nlocals; 
     16    int co_stacksize; 
     17    int co_flags; 
     18    PyObject* co_code; 
     19    PyObject* co_consts; 
     20    PyObject* co_names; 
     21    PyObject* co_varnames; 
     22    PyObject* co_freevars; 
     23    PyObject* co_cellvars; 
     24    PyObject* co_filename; 
     25    PyObject* co_name; 
     26    int co_firstlineno; 
     27    PyObject* co_lnotab; 
    2828} 
    2929 
    30 const int CO_OPTIMIZED             = 0x0001; 
    31 const int CO_NEWLOCALS             = 0x0002; 
    32 const int CO_VARARGS               = 0x0004; 
    33 const int CO_VARKEYWORDS           = 0x0008; 
    34 const int CO_NESTED                    = 0x0010; 
    35 const int CO_GENERATOR             = 0x0020; 
    36 const int CO_NOFREE                    = 0x0040; 
    37 const int CO_GENERATOR_ALLOWED     = 0x1000; 
    38 const int CO_FUTURE_DIVISION       = 0x2000; 
     30const int CO_OPTIMIZED              = 0x0001; 
     31const int CO_NEWLOCALS              = 0x0002; 
     32const int CO_VARARGS                = 0x0004; 
     33const int CO_VARKEYWORDS            = 0x0008; 
     34const int CO_NESTED                 = 0x0010; 
     35const int CO_GENERATOR              = 0x0020; 
     36const int CO_NOFREE                 = 0x0040; 
     37const int CO_GENERATOR_ALLOWED      = 0x1000; 
     38const int CO_FUTURE_DIVISION        = 0x2000; 
    3939 
    4040PyTypeObject* PyCode_Type; 
    4141 
    42 const int CO_MAXBLOCKS             = 20; 
     42const int CO_MAXBLOCKS              = 20; 
    4343 
    4444struct PyFutureFeatures 
    4545{ 
    46    int ff_found_docstring; 
    47    int ff_last_lineno; 
    48    int ff_features; 
     46    int ff_found_docstring; 
     47    int ff_last_lineno; 
     48    int ff_features; 
    4949} 
    5050 
    51 const char[] FUTURE_NESTED_SCOPES  = "nested_scopes"; 
    52 const char[] FUTURE_GENERATORS     = "generators"; 
    53 const char[] FUTURE_DIVISION       = "division"; 
     51const char[] FUTURE_NESTED_SCOPES   = "nested_scopes"; 
     52const char[] FUTURE_GENERATORS      = "generators"; 
     53const char[] FUTURE_DIVISION        = "division"; 
    5454 
    5555//============================================================================== 
    …… 
    5858bit PyCode_Check(PyObject* obj) 
    5959{ 
    60    return (obj.ob_type is PyCode_Type); 
     60    return (obj.ob_type is PyCode_Type); 
    6161} 
    6262 
    6363int PyCode_GetNumFree(PyObject *obj) 
    6464{ 
    65    PyCodeObject *co = cast(PyCodeObject*)obj; 
    66    PyTupleObject* tuple = cast(PyTupleObject*)co.co_freevars; 
    67    return tuple.ob_size; 
     65    PyCodeObject *co = cast(PyCodeObject*)obj; 
     66    PyTupleObject* tuple = cast(PyTupleObject*)co.co_freevars; 
     67    return tuple.ob_size; 
    6868} 
    6969 
    …… 
    7878typedef PyFutureFeatures* function(node*, char*) pfPyNode_Future; 
    7979typedef PyCodeObject* function(node*, char*, PyCompilerFlags*) pfPyNode_CompileFlags; 
    80 pfPyNode_Compile           PyNode_Compile; 
    81 pfPyCode_New               PyCode_New; 
    82 pfPyCode_Addr2Line         PyCode_Addr2Line; 
    83 pfPyNode_Future                PyNode_Future; 
    84 pfPyNode_CompileFlags      PyNode_CompileFlags; 
     80pfPyNode_Compile            PyNode_Compile; 
     81pfPyCode_New                PyCode_New; 
     82pfPyCode_Addr2Line          PyCode_Addr2Line; 
     83pfPyNode_Future             PyNode_Future; 
     84pfPyNode_CompileFlags       PyNode_CompileFlags; 
    8585} 

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

    r48 r56  
    66// TYPES 
    77//============================================================================== 
    8 struct Py_complex  
     8struct Py_complex 
    99{ 
    10    double _real; 
    11    double _imag; 
     10    double _real; 
     11    double _imag; 
    1212} 
    1313 
    14 struct PyComplexObject  
     14struct PyComplexObject 
    1515{ 
    16    mixin PyObject_HEAD; 
    17    Py_complex cval; 
     16    mixin PyObject_HEAD; 
     17    Py_complex cval; 
    1818} 
    1919 
    …… 
    2525bit PyComplex_Check(PyObject *obj) 
    2626{ 
    27    return PyObject_TypeCheck(obj, PyComplex_Type); 
     27    return PyObject_TypeCheck(obj, PyComplex_Type); 
    2828} 
    2929 
    3030bit PyComplex_CheckExact(PyObject *obj) 
    3131{ 
    32    return (obj.ob_type is PyComplex_Type); 
     32    return (obj.ob_type is PyComplex_Type); 
    3333} 
    3434 
    …… 
    3838extern(C) 
    3939{ 
    40      
     40 
    4141typedef PyObject* function(Py_complex) pfPyComplex_FromCComplex; 
    4242typedef PyObject* function(double, double) pfPyComplex_FromDoubles; 
    …… 
    4444typedef double function(PyObject*) pfPyComplex_ImagAsDouble; 
    4545typedef Py_complex function(PyObject*) pfPyComplex_AsCComplex; 
    46 pfPyComplex_FromCComplex           PyComplex_FromCComplex; 
    47 pfPyComplex_FromDoubles                PyComplex_FromDoubles; 
    48 pfPyComplex_RealAsDouble           PyComplex_RealAsDouble; 
    49 pfPyComplex_ImagAsDouble           PyComplex_ImagAsDouble; 
    50 pfPyComplex_AsCComplex             PyComplex_AsCComplex; 
     46pfPyComplex_FromCComplex            PyComplex_FromCComplex; 
     47pfPyComplex_FromDoubles             PyComplex_FromDoubles; 
     48pfPyComplex_RealAsDouble            PyComplex_RealAsDouble; 
     49pfPyComplex_ImagAsDouble            PyComplex_ImagAsDouble; 
     50pfPyComplex_AsCComplex              PyComplex_AsCComplex; 
    5151 
    5252typedef Py_complex function(Py_complex, Py_complex) _Py_c_sum; 
    …… 
    5757typedef Py_complex function(Py_complex, Py_complex) _Py_c_pow; 
    5858 
    59 alias _Py_c_sum        pfc_sum; 
    60 alias _Py_c_diff       pfc_diff; 
    61 alias _Py_c_neg            pfc_neg; 
    62 alias _Py_c_prod       pfc_prod; 
    63 alias _Py_c_quot       pfc_quot; 
    64 alias _Py_c_pow            pfc_pow; 
     59alias _Py_c_sum         pfc_sum; 
     60alias _Py_c_diff        pfc_diff; 
     61alias _Py_c_neg         pfc_neg; 
     62alias _Py_c_prod        pfc_prod; 
     63alias _Py_c_quot        pfc_quot; 
     64alias _Py_c_pow         pfc_pow; 
    6565 
    66 pfc_sum    c_sum; 
    67 pfc_diff   c_diff; 
    68 pfc_neg        c_neg; 
    69 pfc_prod   c_prod; 
    70 pfc_quot   c_quot; 
    71 pfc_pow        c_pow; 
     66pfc_sum     c_sum; 
     67pfc_diff    c_diff; 
     68pfc_neg     c_neg; 
     69pfc_prod    c_prod; 
     70pfc_quot    c_quot; 
     71pfc_pow     c_pow; 
    7272 
    7373} // extern(C) 

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

    r48 r56  
    1919struct wrapperbase 
    2020{ 
    21    char* name; 
    22    int offset; 
    23    void* func; 
    24    wrapperfunc wrapper; 
    25    char* doc; 
    26    int flags;&nb