Navigation

← Previous Changeset
Next Changeset →

Changeset 41

Timestamp:

07/29/04 05:32:59 (4 years ago)

Author:

aldacron

Message:

*[DerelictPY] added cobject.d and errcode.d
*[DerelictPY] updated python.d and the makefile
*[DerelictPY] removed an extraneous 'extern(C)' from complexobject.d

Files:

trunk/DerelictPY/Makefile (modified) (2 diffs)
trunk/DerelictPY/derelict/python/cobject.d (added)
trunk/DerelictPY/derelict/python/complexobject.d (modified) (2 diffs)
trunk/DerelictPY/derelict/python/errcode.d (added)
trunk/DerelictPY/derelict/python/python.d (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/DerelictPY/Makefile

r40	r41
14	14	$(PY.SRC.DIR)\bufferobject.d \
15	15	$(PY.SRC.DIR)\cellobject.d \
	16	$(PY.SRC.DIR)\cobject.d \
16	17	$(PY.SRC.DIR)\complexobject.d \
17	18	$(PY.SRC.DIR)\descrobject.d \
	19	$(PY.SRC.DIR)\errcode.d \
18	20	$(PY.SRC.DIR)\floatobject.d \
19	21	$(PY.SRC.DIR)\intobject.d \
…	…
30	32	$(PY.OBJ.DIR)\boolobject.obj \
31	33	$(PY.OBJ.DIR)\bufferobject.obj \
	34	$(PY.OBJ.DIR)\cobject.obj \
32	35	$(PY.OBJ.DIR)\complexobject.obj \
33	36	$(PY.OBJ.DIR)\cellobject.obj \
34	37	$(PY.OBJ.DIR)\descrobject.obj \
	38	$(PY.OBJ.DIR)\errcode.obj \
35	39	$(PY.OBJ.DIR)\floatobject.obj \
36	40	$(PY.OBJ.DIR)\intobject.obj \

trunk/DerelictPY/derelict/python/complexobject.d

r37	r41
6	6	// TYPES
7	7	//==============================================================================
8		~~extern(C)~~
9		{
10
11	8	struct Py_complex
12	9	{
…	…
23	20
24	21	PyTypeObject* PyComplex_Type;
25
26		~~} // extern(C)~~
27	22
28	23	//==============================================================================

trunk/DerelictPY/derelict/python/python.d

r40	r41
5	5	import derelict.python.bufferobject;
6	6	import derelict.python.cellobject;
	7	import derelict.python.cobject;
7	8	import derelict.python.complexobject;
8	9	import derelict.python.descrobject;
	10	import derelict.python.errcode;
9	11	import derelict.python.floatobject;
10	12	import derelict.python.intobject;
…	…
130	132	PyCell_New = cast(pfPyCell_New)getProc("PyCell_New");
131	133	PyCell_Get = cast(pfPyCell_Get)getProc("PyCell_Get");
132		PyCell_Set = cast(pfPyCell_Set)getProc("PyCell_Set");
	134	PyCell_Set = cast(pfPyCell_Set)getProc("PyCell_Set");
	135	// cobject.d
	136	PyCObject_Type = cast(PyTypeObject*)getProc("PyCObject_Type");
	137	PyCObject_FromVoidPtr = cast(pfPyCObject_FromVoidPtr)getProc("PyCObject_FromVoidPtr");
	138	PyCObject_FromVoidPtrAndDesc = cast(pfPyCObject_FromVoidPtrAndDesc)getProc("PyCObject_FromVoidPtrAndDesc");
	139	PyCObject_AsVoidPtr = cast(pfPyCObject_AsVoidPtr)getProc("PyCObject_AsVoidPtr");
	140	PyCObject_GetDesc = cast(pfPyCObject_GetDesc)getProc("PyCObject_GetDesc");
	141	PyCObject_Import = cast(pfPyCObject_Import)getProc("PyCObject_Import");
133	142	// complexobject.d
134	143	PyComplex_Type = cast(PyTypeObject*)getProc("PyComplex_Type");

derelict