Changeset: 2fecafac7dc0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2fecafac7dc0
Modified Files:
monetdb5/extras/pyapi/emit.c
Branch: pythonloader
Log Message:
Tabs and spaces fun.
diffs (223 lines):
diff --git a/monetdb5/extras/pyapi/emit.c b/monetdb5/extras/pyapi/emit.c
--- a/monetdb5/extras/pyapi/emit.c
+++ b/monetdb5/extras/pyapi/emit.c
@@ -10,115 +10,115 @@
#endif
#define scalar_convert(tpe) {\
- tpe val = (tpe) tpe##_nil; msg = pyobject_to_##tpe(&dictEntry, 42,
&val); \
- BUNappend(self->cols[i].b, &val, 0); \
- if (msg != MAL_SUCCEED) { \
- PyErr_Format(PyExc_TypeError, "Conversion Failed: %s", msg); \
- return NULL; \
- }}
+ tpe val = (tpe) tpe##_nil; msg = pyobject_to_##tpe(&dictEntry, 42, &val); \
+ BUNappend(self->cols[i].b, &val, 0); \
+ if (msg != MAL_SUCCEED) { \
+ PyErr_Format(PyExc_TypeError, "Conversion Failed: %s", msg); \
+ return NULL; \
+ }}
static PyObject *
_emit_emit(Py_EmitObject *self, PyObject *args) {
- size_t i, ai;
- ssize_t el_count = -1;
- str msg = MAL_SUCCEED;
- (void) self;
- if (!PyDict_Check(args)) {
- // complain
- PyErr_SetString(PyExc_TypeError, "need dict");
- return NULL;
- }
+ size_t i, ai;
+ ssize_t el_count = -1;
+ str msg = MAL_SUCCEED;
+ (void) self;
+ if (!PyDict_Check(args)) {
+ // complain
+ PyErr_SetString(PyExc_TypeError, "need dict");
+ return NULL;
+ }
- for (i = 0; i < self->ncols; i++) {
- PyObject *dictEntry = PyDict_GetItemString(args,
self->cols[i].name);
- ssize_t this_size = 1;
- if (dictEntry) {
- if (!PyType_IsPyScalar(dictEntry)) {
- this_size = Py_SIZE(dictEntry);
- }
- if (el_count < 0) el_count = this_size;
- else {
- if (el_count != this_size) {
- PyErr_SetString(PyExc_TypeError, "need
same length values");
- // todo: better error message!
- return NULL;
- }
- }
- }
- }
- if (el_count < 1) {
- PyErr_SetString(PyExc_TypeError, "need at least some values");
- // todo: better error message!
- return NULL;
- }
+ for (i = 0; i < self->ncols; i++) {
+ PyObject *dictEntry = PyDict_GetItemString(args, self->cols[i].name);
+ ssize_t this_size = 1;
+ if (dictEntry) {
+ if (!PyType_IsPyScalar(dictEntry)) {
+ this_size = Py_SIZE(dictEntry);
+ }
+ if (el_count < 0) el_count = this_size;
+ else {
+ if (el_count != this_size) {
+ PyErr_SetString(PyExc_TypeError, "need same length
values");
+ // todo: better error message!
+ return NULL;
+ }
+ }
+ }
+ }
+ if (el_count < 1) {
+ PyErr_SetString(PyExc_TypeError, "need at least some values");
+ // todo: better error message!
+ return NULL;
+ }
- // TODO: check for dict entries not matched by any column and complain
if present
+ // TODO: check for dict entries not matched by any column and complain if
present
- for (i = 0; i < self->ncols; i++) {
- PyObject *dictEntry = PyDict_GetItemString(args,
self->cols[i].name);
- if (dictEntry) {
- if (PyType_IsPyScalar(dictEntry)) {
- switch (self->cols[i].b->T->type)
- {
- case TYPE_bit:
- scalar_convert(bit);
- break;
- case TYPE_bte:
- scalar_convert(bte);
- break;
- case TYPE_sht:
- scalar_convert(sht);
- break;
- case TYPE_int:
- scalar_convert(int);
- break;
- case TYPE_oid:
- scalar_convert(oid);
- break;
- case TYPE_lng:
- scalar_convert(lng);
- break;
- case TYPE_flt:
- scalar_convert(flt);
- break;
- case TYPE_dbl:
- scalar_convert(dbl);
- break;
- #ifdef HAVE_HGE
- case TYPE_hge:
- scalar_convert(hge);
- break;
- #endif
- case TYPE_str:
+ for (i = 0; i < self->ncols; i++) {
+ PyObject *dictEntry = PyDict_GetItemString(args, self->cols[i].name);
+ if (dictEntry) {
+ if (PyType_IsPyScalar(dictEntry)) {
+ switch (self->cols[i].b->T->type)
+ {
+ case TYPE_bit:
+ scalar_convert(bit);
+ break;
+ case TYPE_bte:
+ scalar_convert(bte);
+ break;
+ case TYPE_sht:
+ scalar_convert(sht);
+ break;
+ case TYPE_int:
+ scalar_convert(int);
+ break;
+ case TYPE_oid:
+ scalar_convert(oid);
+ break;
+ case TYPE_lng:
+ scalar_convert(lng);
+ break;
+ case TYPE_flt:
+ scalar_convert(flt);
+ break;
+ case TYPE_dbl:
+ scalar_convert(dbl);
+ break;
+ #ifdef HAVE_HGE
+ case TYPE_hge:
+ scalar_convert(hge);
+ break;
+ #endif
+ case TYPE_str:
{
str val = NULL;
msg = pyobject_to_str(&dictEntry, 42, &val);
- BUNappend(self->cols[i].b, val, 0);
+ BUNappend(self->cols[i].b, val, 0);
if (val) {
free(val);
}
- if (msg != MAL_SUCCEED) {
- PyErr_Format(PyExc_TypeError, "Conversion
Failed: %s", msg);
- return NULL;
- }
+ if (msg != MAL_SUCCEED) {
+ PyErr_Format(PyExc_TypeError, "Conversion Failed:
%s", msg);
+ return NULL;
+ }
}
- break;
- default:
- break;
- // complain
- }
- } else {
- // TODO: handle dicts with array values
- }
- } else {
- for (ai = 0; ai < (size_t) el_count; ai++) {
- BUNappend(self->cols[i].b,
ATOMnil(self->cols[i].b->T->type), 0);
- }
- }
- }
- self->nvals += el_count;
- Py_RETURN_NONE;
+ break;
+ default:
+ break;
+ // complain
+ }
+ } else {
+ // TODO: handle dicts with array values
+ }
+ } else {
+ for (ai = 0; ai < (size_t) el_count; ai++) {
+ BUNappend(self->cols[i].b, ATOMnil(self->cols[i].b->T->type),
0);
+ }
+ }
+ }
+ self->nvals += el_count;
+ Py_RETURN_NONE;
}
@@ -199,7 +199,7 @@ PyObject *Py_Emit_Create(EmitCol *cols,
str _emit_init(void)
{
- _import_array();
+ _import_array();
if (PyType_Ready(&Py_EmitType) < 0)
return createException(MAL, "pyapi.eval", "Failed to initialize emit
type.");
return MAL_SUCCEED;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
