compiler tweaks

This commit is contained in:
David Rose 2004-05-19 05:09:44 +00:00
parent 8625787a5e
commit 27b8913ad9
3 changed files with 13 additions and 9 deletions

View File

@ -9,7 +9,7 @@
#begin bin_target #begin bin_target
#define TARGET dcparse #define TARGET dcparse
#define LOCAL_LIBS dcparser #define LOCAL_LIBS dcparser
#define OTHER_LIBS $[OTHER_LIBS] pystub #define USE_PACKAGES python
#define SOURCES \ #define SOURCES \
dcparse.cxx dcparse.cxx

View File

@ -7,6 +7,7 @@
#define YACC_PREFIX dcyy #define YACC_PREFIX dcyy
#define C++FLAGS -DWITHIN_PANDA #define C++FLAGS -DWITHIN_PANDA
#define UNIX_SYS_LIBS m #define UNIX_SYS_LIBS m
#define USE_PACKAGES python
#begin lib_target #begin lib_target
#define TARGET dcparser #define TARGET dcparser

View File

@ -373,35 +373,35 @@ pack_arg(Datagram &datagram, PyObject *item, DCSubatomicType type) const {
} else { } else {
switch (type) { switch (type) {
case ST_int8: case ST_int8:
datagram.add_int8(floor(PyFloat_AsDouble(item) * _divisor + 0.5)); datagram.add_int8((PN_int8)floor(PyFloat_AsDouble(item) * _divisor + 0.5));
break; break;
case ST_int16: case ST_int16:
datagram.add_int16(floor(PyFloat_AsDouble(item) * _divisor + 0.5)); datagram.add_int16((PN_int16)floor(PyFloat_AsDouble(item) * _divisor + 0.5));
break; break;
case ST_int32: case ST_int32:
datagram.add_int32(floor(PyFloat_AsDouble(item) * _divisor + 0.5)); datagram.add_int32((PN_int32)floor(PyFloat_AsDouble(item) * _divisor + 0.5));
break; break;
case ST_int64: case ST_int64:
datagram.add_int64(floor(PyFloat_AsDouble(item) * _divisor + 0.5)); datagram.add_int64((PN_int64)floor(PyFloat_AsDouble(item) * _divisor + 0.5));
break; break;
case ST_uint8: case ST_uint8:
datagram.add_uint8(floor(PyFloat_AsDouble(item) * _divisor + 0.5)); datagram.add_uint8((PN_uint8)floor(PyFloat_AsDouble(item) * _divisor + 0.5));
break; break;
case ST_uint16: case ST_uint16:
datagram.add_uint16(floor(PyFloat_AsDouble(item) * _divisor + 0.5)); datagram.add_uint16((PN_uint16)floor(PyFloat_AsDouble(item) * _divisor + 0.5));
break; break;
case ST_uint32: case ST_uint32:
datagram.add_uint32(floor(PyFloat_AsDouble(item) * _divisor + 0.5)); datagram.add_uint32((PN_uint32)floor(PyFloat_AsDouble(item) * _divisor + 0.5));
break; break;
case ST_uint64: case ST_uint64:
datagram.add_uint64(floor(PyFloat_AsDouble(item) * _divisor + 0.5)); datagram.add_uint64((PN_uint64)floor(PyFloat_AsDouble(item) * _divisor + 0.5));
break; break;
case ST_float64: case ST_float64:
@ -418,6 +418,9 @@ pack_arg(Datagram &datagram, PyObject *item, DCSubatomicType type) const {
PyString_AsStringAndSize(item, &str, &size); PyString_AsStringAndSize(item, &str, &size);
datagram.add_string32(string(str, size)); datagram.add_string32(string(str, size));
break; break;
default:
break;
} }
} }
} }