diff options
author | joye <joye> | 2014-07-08 17:13:47 (GMT) |
---|---|---|
committer | joye <joye> | 2014-07-08 17:13:47 (GMT) |
commit | ce9561bee4d1cd04214541cce65c3a93fe605ad5 (patch) | |
tree | dd64cca971f11d68e2542fc17d108d4bd5e68393 /src/bltVecCmd.C | |
parent | f6affbcfef4841070559bd95d40f5a2c26581f7e (diff) | |
download | blt-ce9561bee4d1cd04214541cce65c3a93fe605ad5.zip blt-ce9561bee4d1cd04214541cce65c3a93fe605ad5.tar.gz blt-ce9561bee4d1cd04214541cce65c3a93fe605ad5.tar.bz2 |
*** empty log message ***
Diffstat (limited to 'src/bltVecCmd.C')
-rw-r--r-- | src/bltVecCmd.C | 2906 |
1 files changed, 1453 insertions, 1453 deletions
diff --git a/src/bltVecCmd.C b/src/bltVecCmd.C index e615ec2..dda383e 100644 --- a/src/bltVecCmd.C +++ b/src/bltVecCmd.C @@ -58,80 +58,80 @@ #include "bltSwitch.h" extern int Blt_SimplifyLine (Point2d *origPts, int low, int high, - double tolerance, int *indices); + double tolerance, int *indices); typedef int (VectorCmdProc)(Vector *vPtr, Tcl_Interp* interp, int objc, - Tcl_Obj* const objv[]); + Tcl_Obj* const objv[]); typedef int (QSortCompareProc) (const void *, const void *); static Blt_SwitchParseProc ObjToFFTVector; static Blt_SwitchCustom fftVectorSwitch = { - ObjToFFTVector, NULL, (ClientData)0, + ObjToFFTVector, NULL, (ClientData)0, }; static Blt_SwitchParseProc ObjToIndex; static Blt_SwitchCustom indexSwitch = { - ObjToIndex, NULL, (ClientData)0, + ObjToIndex, NULL, (ClientData)0, }; typedef struct { - Tcl_Obj *formatObjPtr; - int from, to; + Tcl_Obj *formatObjPtr; + int from, to; } PrintSwitches; static Blt_SwitchSpec printSwitches[] = -{ + { {BLT_SWITCH_OBJ, "-format", "string", - Tk_Offset(PrintSwitches, formatObjPtr), 0}, + Tk_Offset(PrintSwitches, formatObjPtr), 0}, {BLT_SWITCH_CUSTOM, "-from", "index", - Tk_Offset(PrintSwitches, from), 0, 0, &indexSwitch}, + Tk_Offset(PrintSwitches, from), 0, 0, &indexSwitch}, {BLT_SWITCH_CUSTOM, "-to", "index", - Tk_Offset(PrintSwitches, to), 0, 0, &indexSwitch}, + Tk_Offset(PrintSwitches, to), 0, 0, &indexSwitch}, {BLT_SWITCH_END} -}; + }; typedef struct { - int flags; + int flags; } SortSwitches; #define SORT_DECREASING (1<<0) #define SORT_UNIQUE (1<<1) static Blt_SwitchSpec sortSwitches[] = -{ + { {BLT_SWITCH_BITMASK, "-decreasing", "", Tk_Offset(SortSwitches, flags), 0, SORT_DECREASING}, - {BLT_SWITCH_BITMASK, "-reverse", "", - Tk_Offset(SortSwitches, flags), 0, SORT_DECREASING}, - {BLT_SWITCH_BITMASK, "-uniq", "", - Tk_Offset(SortSwitches, flags), 0, SORT_UNIQUE}, - {BLT_SWITCH_END} -}; + {BLT_SWITCH_BITMASK, "-reverse", "", + Tk_Offset(SortSwitches, flags), 0, SORT_DECREASING}, + {BLT_SWITCH_BITMASK, "-uniq", "", + Tk_Offset(SortSwitches, flags), 0, SORT_UNIQUE}, + {BLT_SWITCH_END} + }; typedef struct { - double delta; - Vector *imagPtr; /* Vector containing imaginary part. */ - Vector *freqPtr; /* Vector containing frequencies. */ - VectorInterpData *dataPtr; - int mask; /* Flags controlling FFT. */ + double delta; + Vector *imagPtr; /* Vector containing imaginary part. */ + Vector *freqPtr; /* Vector containing frequencies. */ + VectorInterpData *dataPtr; + int mask; /* Flags controlling FFT. */ } FFTData; static Blt_SwitchSpec fftSwitches[] = { - {BLT_SWITCH_CUSTOM, "-imagpart", "vector", - Tk_Offset(FFTData, imagPtr), 0, 0, &fftVectorSwitch}, - {BLT_SWITCH_BITMASK, "-noconstant", "", - Tk_Offset(FFTData, mask), 0, FFT_NO_CONSTANT}, - {BLT_SWITCH_BITMASK, "-spectrum", "", - Tk_Offset(FFTData, mask), 0, FFT_SPECTRUM}, - {BLT_SWITCH_BITMASK, "-bartlett", "", - Tk_Offset(FFTData, mask), 0, FFT_BARTLETT}, - {BLT_SWITCH_DOUBLE, "-delta", "float", - Tk_Offset(FFTData, mask), 0, 0, }, - {BLT_SWITCH_CUSTOM, "-frequencies", "vector", - Tk_Offset(FFTData, freqPtr), 0, 0, &fftVectorSwitch}, - {BLT_SWITCH_END} + {BLT_SWITCH_CUSTOM, "-imagpart", "vector", + Tk_Offset(FFTData, imagPtr), 0, 0, &fftVectorSwitch}, + {BLT_SWITCH_BITMASK, "-noconstant", "", + Tk_Offset(FFTData, mask), 0, FFT_NO_CONSTANT}, + {BLT_SWITCH_BITMASK, "-spectrum", "", + Tk_Offset(FFTData, mask), 0, FFT_SPECTRUM}, + {BLT_SWITCH_BITMASK, "-bartlett", "", + Tk_Offset(FFTData, mask), 0, FFT_BARTLETT}, + {BLT_SWITCH_DOUBLE, "-delta", "float", + Tk_Offset(FFTData, mask), 0, 0, }, + {BLT_SWITCH_CUSTOM, "-frequencies", "vector", + Tk_Offset(FFTData, freqPtr), 0, 0, &fftVectorSwitch}, + {BLT_SWITCH_END} }; static int Blt_ExprIntFromObj(Tcl_Interp* interp, Tcl_Obj *objPtr, int *valuePtr) @@ -177,27 +177,27 @@ static int Blt_ExprDoubleFromObj(Tcl_Interp* interp, Tcl_Obj *objPtr, double *va /*ARGSUSED*/ static int ObjToFFTVector( - ClientData clientData, /* Not used. */ - Tcl_Interp* interp, /* Interpreter to send results back to */ - const char *switchName, /* Not used. */ - Tcl_Obj *objPtr, /* Name of vector. */ - char *record, /* Structure record */ - int offset, /* Offset to field in structure */ - int flags) /* Not used. */ + ClientData clientData, /* Not used. */ + Tcl_Interp* interp, /* Interpreter to send results back to */ + const char *switchName, /* Not used. */ + Tcl_Obj *objPtr, /* Name of vector. */ + char *record, /* Structure record */ + int offset, /* Offset to field in structure */ + int flags) /* Not used. */ { - FFTData *dataPtr = (FFTData *)record; - Vector *vPtr; - Vector **vPtrPtr = (Vector **)(record + offset); - int isNew; /* Not used. */ - char *string; - - string = Tcl_GetString(objPtr); - vPtr = Blt_Vec_Create(dataPtr->dataPtr, string, string, string, &isNew); - if (vPtr == NULL) { - return TCL_ERROR; - } - *vPtrPtr = vPtr; - return TCL_OK; + FFTData *dataPtr = (FFTData *)record; + Vector *vPtr; + Vector **vPtrPtr = (Vector **)(record + offset); + int isNew; /* Not used. */ + char *string; + + string = Tcl_GetString(objPtr); + vPtr = Blt_Vec_Create(dataPtr->dataPtr, string, string, string, &isNew); + if (vPtr == NULL) { + return TCL_ERROR; + } + *vPtrPtr = vPtr; + return TCL_OK; } /* @@ -215,116 +215,116 @@ ObjToFFTVector( /*ARGSUSED*/ static int ObjToIndex( - ClientData clientData, /* Contains the vector in question to verify - * its length. */ - Tcl_Interp* interp, /* Interpreter to send results back to */ - const char *switchName, /* Not used. */ - Tcl_Obj *objPtr, /* Name of vector. */ - char *record, /* Structure record */ - int offset, /* Offset to field in structure */ - int flags) /* Not used. */ + ClientData clientData, /* Contains the vector in question to verify + * its length. */ + Tcl_Interp* interp, /* Interpreter to send results back to */ + const char *switchName, /* Not used. */ + Tcl_Obj *objPtr, /* Name of vector. */ + char *record, /* Structure record */ + int offset, /* Offset to field in structure */ + int flags) /* Not used. */ { - Vector *vPtr = clientData; - int *indexPtr = (int *)(record + offset); - int index; + Vector *vPtr = (Vector*)clientData; + int *indexPtr = (int *)(record + offset); + int index; - if (Blt_Vec_GetIndex(interp, vPtr, Tcl_GetString(objPtr), &index, - INDEX_CHECK, (Blt_VectorIndexProc **)NULL) != TCL_OK) { - return TCL_ERROR; - } - *indexPtr = index; - return TCL_OK; + if (Blt_Vec_GetIndex(interp, vPtr, Tcl_GetString(objPtr), &index, + INDEX_CHECK, (Blt_VectorIndexProc **)NULL) != TCL_OK) { + return TCL_ERROR; + } + *indexPtr = index; + return TCL_OK; } static Tcl_Obj * GetValues(Vector *vPtr, int first, int last) { - Tcl_Obj *listObjPtr; - double *vp, *vend; - - listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); - for (vp = vPtr->valueArr + first, vend = vPtr->valueArr + last; vp <= vend; - vp++) { - Tcl_ListObjAppendElement(vPtr->interp, listObjPtr, - Tcl_NewDoubleObj(*vp)); - } - return listObjPtr; + Tcl_Obj *listObjPtr; + double *vp, *vend; + + listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); + for (vp = vPtr->valueArr + first, vend = vPtr->valueArr + last; vp <= vend; + vp++) { + Tcl_ListObjAppendElement(vPtr->interp, listObjPtr, + Tcl_NewDoubleObj(*vp)); + } + return listObjPtr; } static void ReplicateValue(Vector *vPtr, int first, int last, double value) { - double *vp, *vend; + double *vp, *vend; - for (vp = vPtr->valueArr + first, vend = vPtr->valueArr + last; - vp <= vend; vp++) { - *vp = value; - } - vPtr->notifyFlags |= UPDATE_RANGE; + for (vp = vPtr->valueArr + first, vend = vPtr->valueArr + last; + vp <= vend; vp++) { + *vp = value; + } + vPtr->notifyFlags |= UPDATE_RANGE; } static int CopyList(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - int i; + int i; - if (Blt_Vec_SetLength(interp, vPtr, objc) != TCL_OK) { - return TCL_ERROR; - } - for (i = 0; i < objc; i++) { - double value; + if (Blt_Vec_SetLength(interp, vPtr, objc) != TCL_OK) { + return TCL_ERROR; + } + for (i = 0; i < objc; i++) { + double value; - if (Blt_ExprDoubleFromObj(interp, objv[i], &value) != TCL_OK) { - Blt_Vec_SetLength(interp, vPtr, i); - return TCL_ERROR; - } - vPtr->valueArr[i] = value; + if (Blt_ExprDoubleFromObj(interp, objv[i], &value) != TCL_OK) { + Blt_Vec_SetLength(interp, vPtr, i); + return TCL_ERROR; } - return TCL_OK; + vPtr->valueArr[i] = value; + } + return TCL_OK; } static int AppendVector(Vector *destPtr, Vector *srcPtr) { - size_t nBytes; - size_t oldSize, newSize; + size_t nBytes; + size_t oldSize, newSize; - oldSize = destPtr->length; - newSize = oldSize + srcPtr->last - srcPtr->first + 1; - if (Blt_Vec_ChangeLength(destPtr->interp, destPtr, newSize) != TCL_OK) { - return TCL_ERROR; - } - nBytes = (newSize - oldSize) * sizeof(double); - memcpy((char *)(destPtr->valueArr + oldSize), - (srcPtr->valueArr + srcPtr->first), nBytes); - destPtr->notifyFlags |= UPDATE_RANGE; - return TCL_OK; + oldSize = destPtr->length; + newSize = oldSize + srcPtr->last - srcPtr->first + 1; + if (Blt_Vec_ChangeLength(destPtr->interp, destPtr, newSize) != TCL_OK) { + return TCL_ERROR; + } + nBytes = (newSize - oldSize) * sizeof(double); + memcpy((char *)(destPtr->valueArr + oldSize), + (srcPtr->valueArr + srcPtr->first), nBytes); + destPtr->notifyFlags |= UPDATE_RANGE; + return TCL_OK; } static int AppendList(Vector *vPtr, int objc, Tcl_Obj* const objv[]) { - Tcl_Interp* interp = vPtr->interp; - int count; - int i; - double value; - int oldSize; - - oldSize = vPtr->length; - if (Blt_Vec_ChangeLength(interp, vPtr, vPtr->length + objc) != TCL_OK) { - return TCL_ERROR; - } - count = oldSize; - for (i = 0; i < objc; i++) { - if (Blt_ExprDoubleFromObj(interp, objv[i], &value) != TCL_OK) { - Blt_Vec_ChangeLength(interp, vPtr, count); - return TCL_ERROR; - } - vPtr->valueArr[count++] = value; + Tcl_Interp* interp = vPtr->interp; + int count; + int i; + double value; + int oldSize; + + oldSize = vPtr->length; + if (Blt_Vec_ChangeLength(interp, vPtr, vPtr->length + objc) != TCL_OK) { + return TCL_ERROR; + } + count = oldSize; + for (i = 0; i < objc; i++) { + if (Blt_ExprDoubleFromObj(interp, objv[i], &value) != TCL_OK) { + Blt_Vec_ChangeLength(interp, vPtr, count); + return TCL_ERROR; } - vPtr->notifyFlags |= UPDATE_RANGE; - return TCL_OK; + vPtr->valueArr[count++] = value; + } + vPtr->notifyFlags |= UPDATE_RANGE; + return TCL_OK; } /* Vector instance option commands */ @@ -350,36 +350,36 @@ AppendList(Vector *vPtr, int objc, Tcl_Obj* const objv[]) static int AppendOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - int i; - int result; - Vector *v2Ptr; + int i; + int result; + Vector *v2Ptr; - for (i = 2; i < objc; i++) { - v2Ptr = Blt_Vec_ParseElement((Tcl_Interp *)NULL, vPtr->dataPtr, - Tcl_GetString(objv[i]), (const char **)NULL, NS_SEARCH_BOTH); - if (v2Ptr != NULL) { - result = AppendVector(vPtr, v2Ptr); - } else { - int nElem; - Tcl_Obj **elemObjArr; - - if (Tcl_ListObjGetElements(interp, objv[i], &nElem, &elemObjArr) - != TCL_OK) { - return TCL_ERROR; - } - result = AppendList(vPtr, nElem, elemObjArr); - } - if (result != TCL_OK) { - return TCL_ERROR; - } - } - if (objc > 2) { - if (vPtr->flush) { - Blt_Vec_FlushCache(vPtr); - } - Blt_Vec_UpdateClients(vPtr); + for (i = 2; i < objc; i++) { + v2Ptr = Blt_Vec_ParseElement((Tcl_Interp *)NULL, vPtr->dataPtr, + Tcl_GetString(objv[i]), (const char **)NULL, NS_SEARCH_BOTH); + if (v2Ptr != NULL) { + result = AppendVector(vPtr, v2Ptr); + } else { + int nElem; + Tcl_Obj **elemObjArr; + + if (Tcl_ListObjGetElements(interp, objv[i], &nElem, &elemObjArr) + != TCL_OK) { + return TCL_ERROR; + } + result = AppendList(vPtr, nElem, elemObjArr); } - return TCL_OK; + if (result != TCL_OK) { + return TCL_ERROR; + } + } + if (objc > 2) { + if (vPtr->flush) { + Blt_Vec_FlushCache(vPtr); + } + Blt_Vec_UpdateClients(vPtr); + } + return TCL_OK; } /* @@ -403,8 +403,8 @@ AppendOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int ClearOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - Blt_Vec_FlushCache(vPtr); - return TCL_OK; + Blt_Vec_FlushCache(vPtr); + return TCL_OK; } /* @@ -429,53 +429,53 @@ ClearOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int DeleteOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - unsigned char *unsetArr; - int i, j; - int count; - char *string; + unsigned char *unsetArr; + int i, j; + int count; + char *string; + + /* FIXME: Don't delete vector with no indices. */ + if (objc == 2) { + Blt_Vec_Free(vPtr); + return TCL_OK; + } - /* FIXME: Don't delete vector with no indices. */ - if (objc == 2) { - Blt_Vec_Free(vPtr); - return TCL_OK; - } - - /* Allocate an "unset" bitmap the size of the vector. */ - unsetArr = calloc(sizeof(unsigned char), (vPtr->length + 7) / 8); -#define SetBit(i) \ - unsetArr[(i) >> 3] |= (1 << ((i) & 0x07)) -#define GetBit(i) \ - (unsetArr[(i) >> 3] & (1 << ((i) & 0x07))) - - for (i = 2; i < objc; i++) { - string = Tcl_GetString(objv[i]); - if (Blt_Vec_GetIndexRange(interp, vPtr, string, - (INDEX_COLON | INDEX_CHECK), (Blt_VectorIndexProc **) NULL) - != TCL_OK) { - free(unsetArr); - return TCL_ERROR; - } - for (j = vPtr->first; j <= vPtr->last; j++) { - SetBit(j); /* Mark the range of elements for deletion. */ - } - } - count = 0; - for (i = 0; i < vPtr->length; i++) { - if (GetBit(i)) { - continue; /* Skip elements marked for deletion. */ - } - if (count < i) { - vPtr->valueArr[count] = vPtr->valueArr[i]; - } - count++; + /* Allocate an "unset" bitmap the size of the vector. */ + unsetArr = (unsigned char*)calloc(sizeof(unsigned char), (vPtr->length + 7) / 8); +#define SetBit(i) \ + unsetArr[(i) >> 3] |= (1 << ((i) & 0x07)) +#define GetBit(i) \ + (unsetArr[(i) >> 3] & (1 << ((i) & 0x07))) + + for (i = 2; i < objc; i++) { + string = Tcl_GetString(objv[i]); + if (Blt_Vec_GetIndexRange(interp, vPtr, string, + (INDEX_COLON | INDEX_CHECK), (Blt_VectorIndexProc **) NULL) + != TCL_OK) { + free(unsetArr); + return TCL_ERROR; } - free(unsetArr); - vPtr->length = count; - if (vPtr->flush) { - Blt_Vec_FlushCache(vPtr); + for (j = vPtr->first; j <= vPtr->last; j++) { + SetBit(j); /* Mark the range of elements for deletion. */ } - Blt_Vec_UpdateClients(vPtr); - return TCL_OK; + } + count = 0; + for (i = 0; i < vPtr->length; i++) { + if (GetBit(i)) { + continue; /* Skip elements marked for deletion. */ + } + if (count < i) { + vPtr->valueArr[count] = vPtr->valueArr[i]; + } + count++; + } + free(unsetArr); + vPtr->length = count; + if (vPtr->flush) { + Blt_Vec_FlushCache(vPtr); + } + Blt_Vec_UpdateClients(vPtr); + return TCL_OK; } /* @@ -498,32 +498,32 @@ DeleteOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int DupOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - int i; + int i; + + for (i = 2; i < objc; i++) { + Vector *v2Ptr; + char *name; + int isNew; - for (i = 2; i < objc; i++) { - Vector *v2Ptr; - char *name; - int isNew; - - name = Tcl_GetString(objv[i]); - v2Ptr = Blt_Vec_Create(vPtr->dataPtr, name, name, name, &isNew); - if (v2Ptr == NULL) { - return TCL_ERROR; - } - if (v2Ptr == vPtr) { - continue; - } - if (Blt_Vec_Duplicate(v2Ptr, vPtr) != TCL_OK) { - return TCL_ERROR; - } - if (!isNew) { - if (v2Ptr->flush) { - Blt_Vec_FlushCache(v2Ptr); - } - Blt_Vec_UpdateClients(v2Ptr); - } + name = Tcl_GetString(objv[i]); + v2Ptr = Blt_Vec_Create(vPtr->dataPtr, name, name, name, &isNew); + if (v2Ptr == NULL) { + return TCL_ERROR; } - return TCL_OK; + if (v2Ptr == vPtr) { + continue; + } + if (Blt_Vec_Duplicate(v2Ptr, vPtr) != TCL_OK) { + return TCL_ERROR; + } + if (!isNew) { + if (v2Ptr->flush) { + Blt_Vec_FlushCache(v2Ptr); + } + Blt_Vec_UpdateClients(v2Ptr); + } + } + return TCL_OK; } @@ -534,88 +534,88 @@ DupOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int FFTOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - Vector *v2Ptr = NULL; - int isNew; - FFTData data; - char *realVecName; - - memset(&data, 0, sizeof(data)); - data.delta = 1.0; - - realVecName = Tcl_GetString(objv[2]); - v2Ptr = Blt_Vec_Create(vPtr->dataPtr, realVecName, realVecName, - realVecName, &isNew); - if (v2Ptr == NULL) { - return TCL_ERROR; - } - if (v2Ptr == vPtr) { - Tcl_AppendResult(interp, "real vector \"", realVecName, "\"", - " can't be the same as the source", (char *)NULL); - return TCL_ERROR; - } - if (Blt_ParseSwitches(interp, fftSwitches, objc - 3, objv + 3, &data, - BLT_SWITCH_DEFAULTS) < 0) { - return TCL_ERROR; + Vector *v2Ptr = NULL; + int isNew; + FFTData data; + char *realVecName; + + memset(&data, 0, sizeof(data)); + data.delta = 1.0; + + realVecName = Tcl_GetString(objv[2]); + v2Ptr = Blt_Vec_Create(vPtr->dataPtr, realVecName, realVecName, + realVecName, &isNew); + if (v2Ptr == NULL) { + return TCL_ERROR; + } + if (v2Ptr == vPtr) { + Tcl_AppendResult(interp, "real vector \"", realVecName, "\"", + " can't be the same as the source", (char *)NULL); + return TCL_ERROR; + } + if (Blt_ParseSwitches(interp, fftSwitches, objc - 3, objv + 3, &data, + BLT_SWITCH_DEFAULTS) < 0) { + return TCL_ERROR; + } + if (Blt_Vec_FFT(interp, v2Ptr, data.imagPtr, data.freqPtr, data.delta, + data.mask, vPtr) != TCL_OK) { + return TCL_ERROR; + } + /* Update bookkeeping. */ + if (!isNew) { + if (v2Ptr->flush) { + Blt_Vec_FlushCache(v2Ptr); } - if (Blt_Vec_FFT(interp, v2Ptr, data.imagPtr, data.freqPtr, data.delta, - data.mask, vPtr) != TCL_OK) { - return TCL_ERROR; + Blt_Vec_UpdateClients(v2Ptr); + } + if (data.imagPtr != NULL) { + if (data.imagPtr->flush) { + Blt_Vec_FlushCache(data.imagPtr); } - /* Update bookkeeping. */ - if (!isNew) { - if (v2Ptr->flush) { - Blt_Vec_FlushCache(v2Ptr); - } - Blt_Vec_UpdateClients(v2Ptr); - } - if (data.imagPtr != NULL) { - if (data.imagPtr->flush) { - Blt_Vec_FlushCache(data.imagPtr); - } - Blt_Vec_UpdateClients(data.imagPtr); - } - if (data.freqPtr != NULL) { - if (data.freqPtr->flush) { - Blt_Vec_FlushCache(data.freqPtr); - } - Blt_Vec_UpdateClients(data.freqPtr); + Blt_Vec_UpdateClients(data.imagPtr); + } + if (data.freqPtr != NULL) { + if (data.freqPtr->flush) { + Blt_Vec_FlushCache(data.freqPtr); } - return TCL_OK; + Blt_Vec_UpdateClients(data.freqPtr); + } + return TCL_OK; } /*ARGSUSED*/ static int InverseFFTOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - int isNew; - char *name; - Vector *srcImagPtr; - Vector *destRealPtr; - Vector *destImagPtr; - - name = Tcl_GetString(objv[2]); - if (Blt_Vec_LookupName(vPtr->dataPtr, name, &srcImagPtr) != TCL_OK ) { - return TCL_ERROR; - } - name = Tcl_GetString(objv[3]); - destRealPtr = Blt_Vec_Create(vPtr->dataPtr, name, name, name, &isNew); - name = Tcl_GetString(objv[4]); - destImagPtr = Blt_Vec_Create(vPtr->dataPtr, name, name, name, &isNew); - - if (Blt_Vec_InverseFFT(interp, srcImagPtr, destRealPtr, destImagPtr, vPtr) - != TCL_OK ){ - return TCL_ERROR; - } - if (destRealPtr->flush) { - Blt_Vec_FlushCache(destRealPtr); - } - Blt_Vec_UpdateClients(destRealPtr); + int isNew; + char *name; + Vector *srcImagPtr; + Vector *destRealPtr; + Vector *destImagPtr; + + name = Tcl_GetString(objv[2]); + if (Blt_Vec_LookupName(vPtr->dataPtr, name, &srcImagPtr) != TCL_OK ) { + return TCL_ERROR; + } + name = Tcl_GetString(objv[3]); + destRealPtr = Blt_Vec_Create(vPtr->dataPtr, name, name, name, &isNew); + name = Tcl_GetString(objv[4]); + destImagPtr = Blt_Vec_Create(vPtr->dataPtr, name, name, name, &isNew); + + if (Blt_Vec_InverseFFT(interp, srcImagPtr, destRealPtr, destImagPtr, vPtr) + != TCL_OK ){ + return TCL_ERROR; + } + if (destRealPtr->flush) { + Blt_Vec_FlushCache(destRealPtr); + } + Blt_Vec_UpdateClients(destRealPtr); - if (destImagPtr->flush) { - Blt_Vec_FlushCache(destImagPtr); - } - Blt_Vec_UpdateClients(destImagPtr); - return TCL_OK; + if (destImagPtr->flush) { + Blt_Vec_FlushCache(destImagPtr); + } + Blt_Vec_UpdateClients(destImagPtr); + return TCL_OK; } @@ -637,51 +637,51 @@ InverseFFTOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int IndexOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - int first, last; - char *string; + int first, last; + char *string; - string = Tcl_GetString(objv[2]); - if (Blt_Vec_GetIndexRange(interp, vPtr, string, INDEX_ALL_FLAGS, - (Blt_VectorIndexProc **) NULL) != TCL_OK) { + string = Tcl_GetString(objv[2]); + if (Blt_Vec_GetIndexRange(interp, vPtr, string, INDEX_ALL_FLAGS, + (Blt_VectorIndexProc **) NULL) != TCL_OK) { + return TCL_ERROR; + } + first = vPtr->first, last = vPtr->last; + if (objc == 3) { + Tcl_Obj *listObjPtr; + + if (first == vPtr->length) { + Tcl_AppendResult(interp, "can't get index \"", string, "\"", + (char *)NULL); + return TCL_ERROR; /* Can't read from index "++end" */ + } + listObjPtr = GetValues(vPtr, first, last); + Tcl_SetObjResult(interp, listObjPtr); + } else { + double value; + + /* FIXME: huh? Why set values here?. */ + if (first == SPECIAL_INDEX) { + Tcl_AppendResult(interp, "can't set index \"", string, "\"", + (char *)NULL); + return TCL_ERROR; /* Tried to set "min" or "max" */ + } + if (Blt_ExprDoubleFromObj(interp, objv[3], &value) != TCL_OK) { + return TCL_ERROR; + } + if (first == vPtr->length) { + if (Blt_Vec_ChangeLength(interp, vPtr, vPtr->length + 1) + != TCL_OK) { return TCL_ERROR; + } } - first = vPtr->first, last = vPtr->last; - if (objc == 3) { - Tcl_Obj *listObjPtr; - - if (first == vPtr->length) { - Tcl_AppendResult(interp, "can't get index \"", string, "\"", - (char *)NULL); - return TCL_ERROR; /* Can't read from index "++end" */ - } - listObjPtr = GetValues(vPtr, first, last); - Tcl_SetObjResult(interp, listObjPtr); - } else { - double value; - - /* FIXME: huh? Why set values here?. */ - if (first == SPECIAL_INDEX) { - Tcl_AppendResult(interp, "can't set index \"", string, "\"", - (char *)NULL); - return TCL_ERROR; /* Tried to set "min" or "max" */ - } - if (Blt_ExprDoubleFromObj(interp, objv[3], &value) != TCL_OK) { - return TCL_ERROR; - } - if (first == vPtr->length) { - if (Blt_Vec_ChangeLength(interp, vPtr, vPtr->length + 1) - != TCL_OK) { - return TCL_ERROR; - } - } - ReplicateValue(vPtr, first, last, value); - Tcl_SetObjResult(interp, objv[3]); - if (vPtr->flush) { - Blt_Vec_FlushCache(vPtr); - } - Blt_Vec_UpdateClients(vPtr); + ReplicateValue(vPtr, first, last, value); + Tcl_SetObjResult(interp, objv[3]); + if (vPtr->flush) { + Blt_Vec_FlushCache(vPtr); } - return TCL_OK; + Blt_Vec_UpdateClients(vPtr); + } + return TCL_OK; } /* @@ -702,28 +702,28 @@ IndexOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int LengthOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - if (objc == 3) { - int nElem; - - if (Tcl_GetIntFromObj(interp, objv[2], &nElem) != TCL_OK) { - return TCL_ERROR; - } - if (nElem < 0) { - Tcl_AppendResult(interp, "bad vector size \"", - Tcl_GetString(objv[2]), "\"", (char *)NULL); - return TCL_ERROR; - } - if ((Blt_Vec_SetSize(interp, vPtr, nElem) != TCL_OK) || - (Blt_Vec_SetLength(interp, vPtr, nElem) != TCL_OK)) { - return TCL_ERROR; - } - if (vPtr->flush) { - Blt_Vec_FlushCache(vPtr); - } - Blt_Vec_UpdateClients(vPtr); - } - Tcl_SetIntObj(Tcl_GetObjResult(interp), vPtr->length); - return TCL_OK; + if (objc == 3) { + int nElem; + + if (Tcl_GetIntFromObj(interp, objv[2], &nElem) != TCL_OK) { + return TCL_ERROR; + } + if (nElem < 0) { + Tcl_AppendResult(interp, "bad vector size \"", + Tcl_GetString(objv[2]), "\"", (char *)NULL); + return TCL_ERROR; + } + if ((Blt_Vec_SetSize(interp, vPtr, nElem) != TCL_OK) || + (Blt_Vec_SetLength(interp, vPtr, nElem) != TCL_OK)) { + return TCL_ERROR; + } + if (vPtr->flush) { + Blt_Vec_FlushCache(vPtr); + } + Blt_Vec_UpdateClients(vPtr); + } + Tcl_SetIntObj(Tcl_GetObjResult(interp), vPtr->length); + return TCL_OK; } /* @@ -745,16 +745,16 @@ LengthOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int MapOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - if (objc > 2) { - if (Blt_Vec_MapVariable(interp, vPtr, Tcl_GetString(objv[2])) - != TCL_OK) { - return TCL_ERROR; - } - } - if (vPtr->arrayName != NULL) { - Tcl_SetStringObj(Tcl_GetObjResult(interp), vPtr->arrayName, -1); + if (objc > 2) { + if (Blt_Vec_MapVariable(interp, vPtr, Tcl_GetString(objv[2])) + != TCL_OK) { + return TCL_ERROR; } - return TCL_OK; + } + if (vPtr->arrayName != NULL) { + Tcl_SetStringObj(Tcl_GetObjResult(interp), vPtr->arrayName, -1); + } + return TCL_OK; } /* @@ -773,8 +773,8 @@ MapOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int MaxOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - Tcl_SetDoubleObj(Tcl_GetObjResult(interp), Blt_Vec_Max(vPtr)); - return TCL_OK; + Tcl_SetDoubleObj(Tcl_GetObjResult(interp), Blt_Vec_Max(vPtr)); + return TCL_OK; } /* @@ -795,63 +795,63 @@ MaxOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int MergeOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - Vector **vecArr; - int refSize, nElem; - int i; - double *valuePtr, *valueArr; - Vector **vPtrPtr; + Vector **vecArr; + int refSize, nElem; + int i; + double *valuePtr, *valueArr; + Vector **vPtrPtr; - /* Allocate an array of vector pointers of each vector to be - * merged in the current vector. */ - vecArr = malloc(sizeof(Vector *) * objc); - vPtrPtr = vecArr; - - refSize = -1; - nElem = 0; - for (i = 2; i < objc; i++) { - Vector *v2Ptr; - int length; - - if (Blt_Vec_LookupName(vPtr->dataPtr, Tcl_GetString(objv[i]), &v2Ptr) - != TCL_OK) { - free(vecArr); - return TCL_ERROR; - } - /* Check that all the vectors are the same length */ - length = v2Ptr->last - v2Ptr->first + 1; - if (refSize < 0) { - refSize = length; - } else if (length != refSize) { - Tcl_AppendResult(vPtr->interp, "vectors \"", vPtr->name, - "\" and \"", v2Ptr->name, "\" differ in length", - (char *)NULL); - free(vecArr); - return TCL_ERROR; - } - *vPtrPtr++ = v2Ptr; - nElem += refSize; - } - *vPtrPtr = NULL; - - valueArr = malloc(sizeof(double) * nElem); - if (valueArr == NULL) { - Tcl_AppendResult(vPtr->interp, "not enough memory to allocate ", - Blt_Itoa(nElem), " vector elements", (char *)NULL); - return TCL_ERROR; - } + /* Allocate an array of vector pointers of each vector to be + * merged in the current vector. */ + vecArr = (Vector**)malloc(sizeof(Vector *) * objc); + vPtrPtr = vecArr; + + refSize = -1; + nElem = 0; + for (i = 2; i < objc; i++) { + Vector *v2Ptr; + int length; - /* Merge the values from each of the vectors into the current vector */ - valuePtr = valueArr; - for (i = 0; i < refSize; i++) { - Vector **vpp; + if (Blt_Vec_LookupName(vPtr->dataPtr, Tcl_GetString(objv[i]), &v2Ptr) + != TCL_OK) { + free(vecArr); + return TCL_ERROR; + } + /* Check that all the vectors are the same length */ + length = v2Ptr->last - v2Ptr->first + 1; + if (refSize < 0) { + refSize = length; + } else if (length != refSize) { + Tcl_AppendResult(vPtr->interp, "vectors \"", vPtr->name, + "\" and \"", v2Ptr->name, "\" differ in length", + (char *)NULL); + free(vecArr); + return TCL_ERROR; + } + *vPtrPtr++ = v2Ptr; + nElem += refSize; + } + *vPtrPtr = NULL; + + valueArr = (double*)malloc(sizeof(double) * nElem); + if (valueArr == NULL) { + Tcl_AppendResult(vPtr->interp, "not enough memory to allocate ", + Blt_Itoa(nElem), " vector elements", (char *)NULL); + return TCL_ERROR; + } - for (vpp = vecArr; *vpp != NULL; vpp++) { - *valuePtr++ = (*vpp)->valueArr[i + (*vpp)->first]; - } + /* Merge the values from each of the vectors into the current vector */ + valuePtr = valueArr; + for (i = 0; i < refSize; i++) { + Vector **vpp; + + for (vpp = vecArr; *vpp != NULL; vpp++) { + *valuePtr++ = (*vpp)->valueArr[i + (*vpp)->first]; } - free(vecArr); - Blt_Vec_Reset(vPtr, valueArr, nElem, nElem, TCL_DYNAMIC); - return TCL_OK; + } + free(vecArr); + Blt_Vec_Reset(vPtr, valueArr, nElem, nElem, TCL_DYNAMIC); + return TCL_OK; } /* @@ -870,8 +870,8 @@ MergeOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int MinOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - Tcl_SetDoubleObj(Tcl_GetObjResult(interp), Blt_Vec_Min(vPtr)); - return TCL_OK; + Tcl_SetDoubleObj(Tcl_GetObjResult(interp), Blt_Vec_Min(vPtr)); + return TCL_OK; } /* @@ -891,48 +891,48 @@ MinOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int NormalizeOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - int i; - double range; - - Blt_Vec_UpdateRange(vPtr); - range = vPtr->max - vPtr->min; - if (objc > 2) { - Vector *v2Ptr; - int isNew; - char *string; - - string = Tcl_GetString(objv[2]); - v2Ptr = Blt_Vec_Create(vPtr->dataPtr, string, string, string, &isNew); - if (v2Ptr == NULL) { - return TCL_ERROR; - } - if (Blt_Vec_SetLength(interp, v2Ptr, vPtr->length) != TCL_OK) { - return TCL_ERROR; - } - for (i = 0; i < vPtr->length; i++) { - v2Ptr->valueArr[i] = (vPtr->valueArr[i] - vPtr->min) / range; - } - Blt_Vec_UpdateRange(v2Ptr); - if (!isNew) { - if (v2Ptr->flush) { - Blt_Vec_FlushCache(v2Ptr); - } - Blt_Vec_UpdateClients(v2Ptr); - } - } else { - Tcl_Obj *listObjPtr; + int i; + double range; + + Blt_Vec_UpdateRange(vPtr); + range = vPtr->max - vPtr->min; + if (objc > 2) { + Vector *v2Ptr; + int isNew; + char *string; - listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); - for (i = 0; i < vPtr->length; i++) { - double norm; + string = Tcl_GetString(objv[2]); + v2Ptr = Blt_Vec_Create(vPtr->dataPtr, string, string, string, &isNew); + if (v2Ptr == NULL) { + return TCL_ERROR; + } + if (Blt_Vec_SetLength(interp, v2Ptr, vPtr->length) != TCL_OK) { + return TCL_ERROR; + } + for (i = 0; i < vPtr->length; i++) { + v2Ptr->valueArr[i] = (vPtr->valueArr[i] - vPtr->min) / range; + } + Blt_Vec_UpdateRange(v2Ptr); + if (!isNew) { + if (v2Ptr->flush) { + Blt_Vec_FlushCache(v2Ptr); + } + Blt_Vec_UpdateClients(v2Ptr); + } + } else { + Tcl_Obj *listObjPtr; - norm = (vPtr->valueArr[i] - vPtr->min) / range; - Tcl_ListObjAppendElement(interp, listObjPtr, - Tcl_NewDoubleObj(norm)); - } - Tcl_SetObjResult(interp, listObjPtr); + listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); + for (i = 0; i < vPtr->length; i++) { + double norm; + + norm = (vPtr->valueArr[i] - vPtr->min) / range; + Tcl_ListObjAppendElement(interp, listObjPtr, + Tcl_NewDoubleObj(norm)); } - return TCL_OK; + Tcl_SetObjResult(interp, listObjPtr); + } + return TCL_OK; } /* @@ -959,49 +959,49 @@ NormalizeOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int NotifyOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - int option; - int bool; - enum optionIndices { - OPTION_ALWAYS, OPTION_NEVER, OPTION_WHENIDLE, - OPTION_NOW, OPTION_CANCEL, OPTION_PENDING - }; - static const char *optionArr[] = { - "always", "never", "whenidle", "now", "cancel", "pending", NULL - }; - - if (Tcl_GetIndexFromObj(interp, objv[2], optionArr, "qualifier", TCL_EXACT, - &option) != TCL_OK) { - return TCL_OK; - } - switch (option) { - case OPTION_ALWAYS: - vPtr->notifyFlags &= ~NOTIFY_WHEN_MASK; - vPtr->notifyFlags |= NOTIFY_ALWAYS; - break; - case OPTION_NEVER: - vPtr->notifyFlags &= ~NOTIFY_WHEN_MASK; - vPtr->notifyFlags |= NOTIFY_NEVER; - break; - case OPTION_WHENIDLE: - vPtr->notifyFlags &= ~NOTIFY_WHEN_MASK; - vPtr->notifyFlags |= NOTIFY_WHENIDLE; - break; - case OPTION_NOW: - /* FIXME: How does this play when an update is pending? */ - Blt_Vec_NotifyClients(vPtr); - break; - case OPTION_CANCEL: - if (vPtr->notifyFlags & NOTIFY_PENDING) { - vPtr->notifyFlags &= ~NOTIFY_PENDING; - Tcl_CancelIdleCall(Blt_Vec_NotifyClients, (ClientData)vPtr); - } - break; - case OPTION_PENDING: - bool = (vPtr->notifyFlags & NOTIFY_PENDING); - Tcl_SetBooleanObj(Tcl_GetObjResult(interp), bool); - break; - } + int option; + int boll; + enum optionIndices { + OPTION_ALWAYS, OPTION_NEVER, OPTION_WHENIDLE, + OPTION_NOW, OPTION_CANCEL, OPTION_PENDING + }; + static const char *optionArr[] = { + "always", "never", "whenidle", "now", "cancel", "pending", NULL + }; + + if (Tcl_GetIndexFromObj(interp, objv[2], optionArr, "qualifier", TCL_EXACT, + &option) != TCL_OK) { return TCL_OK; + } + switch (option) { + case OPTION_ALWAYS: + vPtr->notifyFlags &= ~NOTIFY_WHEN_MASK; + vPtr->notifyFlags |= NOTIFY_ALWAYS; + break; + case OPTION_NEVER: + vPtr->notifyFlags &= ~NOTIFY_WHEN_MASK; + vPtr->notifyFlags |= NOTIFY_NEVER; + break; + case OPTION_WHENIDLE: + vPtr->notifyFlags &= ~NOTIFY_WHEN_MASK; + vPtr->notifyFlags |= NOTIFY_WHENIDLE; + break; + case OPTION_NOW: + /* FIXME: How does this play when an update is pending? */ + Blt_Vec_NotifyClients(vPtr); + break; + case OPTION_CANCEL: + if (vPtr->notifyFlags & NOTIFY_PENDING) { + vPtr->notifyFlags &= ~NOTIFY_PENDING; + Tcl_CancelIdleCall(Blt_Vec_NotifyClients, (ClientData)vPtr); + } + break; + case OPTION_PENDING: + boll = (vPtr->notifyFlags & NOTIFY_PENDING); + Tcl_SetBooleanObj(Tcl_GetObjResult(interp), boll); + break; + } + return TCL_OK; } /* @@ -1021,56 +1021,56 @@ NotifyOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int PopulateOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - Vector *v2Ptr; - int size, density; - int isNew; - int i, j; - double *valuePtr; - int count; - char *string; - - string = Tcl_GetString(objv[2]); - v2Ptr = Blt_Vec_Create(vPtr->dataPtr, string, string, string, &isNew); - if (v2Ptr == NULL) { - return TCL_ERROR; - } - if (vPtr->length == 0) { - return TCL_OK; /* Source vector is empty. */ - } - if (Tcl_GetIntFromObj(interp, objv[3], &density) != TCL_OK) { - return TCL_ERROR; - } - if (density < 1) { - Tcl_AppendResult(interp, "bad density \"", Tcl_GetString(objv[3]), - "\"", (char *)NULL); - return TCL_ERROR; - } - size = (vPtr->length - 1) * (density + 1) + 1; - if (Blt_Vec_SetLength(interp, v2Ptr, size) != TCL_OK) { - return TCL_ERROR; - } - count = 0; - valuePtr = v2Ptr->valueArr; - for (i = 0; i < (vPtr->length - 1); i++) { - double slice, range; - - range = vPtr->valueArr[i + 1] - vPtr->valueArr[i]; - slice = range / (double)(density + 1); - for (j = 0; j <= density; j++) { - *valuePtr = vPtr->valueArr[i] + (slice * (double)j); - valuePtr++; - count++; - } + Vector *v2Ptr; + int size, density; + int isNew; + int i, j; + double *valuePtr; + int count; + char *string; + + string = Tcl_GetString(objv[2]); + v2Ptr = Blt_Vec_Create(vPtr->dataPtr, string, string, string, &isNew); + if (v2Ptr == NULL) { + return TCL_ERROR; + } + if (vPtr->length == 0) { + return TCL_OK; /* Source vector is empty. */ + } + if (Tcl_GetIntFromObj(interp, objv[3], &density) != TCL_OK) { + return TCL_ERROR; + } + if (density < 1) { + Tcl_AppendResult(interp, "bad density \"", Tcl_GetString(objv[3]), + "\"", (char *)NULL); + return TCL_ERROR; + } + size = (vPtr->length - 1) * (density + 1) + 1; + if (Blt_Vec_SetLength(interp, v2Ptr, size) != TCL_OK) { + return TCL_ERROR; + } + count = 0; + valuePtr = v2Ptr->valueArr; + for (i = 0; i < (vPtr->length - 1); i++) { + double slice, range; + + range = vPtr->valueArr[i + 1] - vPtr->valueArr[i]; + slice = range / (double)(density + 1); + for (j = 0; j <= density; j++) { + *valuePtr = vPtr->valueArr[i] + (slice * (double)j); + valuePtr++; + count++; } - count++; - *valuePtr = vPtr->valueArr[i]; - if (!isNew) { - if (v2Ptr->flush) { - Blt_Vec_FlushCache(v2Ptr); - } - Blt_Vec_UpdateClients(v2Ptr); + } + count++; + *valuePtr = vPtr->valueArr[i]; + if (!isNew) { + if (v2Ptr->flush) { + Blt_Vec_FlushCache(v2Ptr); } - return TCL_OK; + Blt_Vec_UpdateClients(v2Ptr); + } + return TCL_OK; } /* @@ -1089,49 +1089,49 @@ PopulateOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int ValuesOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - PrintSwitches switches; - - switches.formatObjPtr = NULL; - switches.from = 0; - switches.to = vPtr->length - 1; - indexSwitch.clientData = vPtr; - if (Blt_ParseSwitches(interp, printSwitches, objc - 2, objv + 2, &switches, - BLT_SWITCH_DEFAULTS) < 0) { - return TCL_ERROR; + PrintSwitches switches; + + switches.formatObjPtr = NULL; + switches.from = 0; + switches.to = vPtr->length - 1; + indexSwitch.clientData = vPtr; + if (Blt_ParseSwitches(interp, printSwitches, objc - 2, objv + 2, &switches, + BLT_SWITCH_DEFAULTS) < 0) { + return TCL_ERROR; + } + if (switches.from > switches.to) { + int tmp; + /* swap positions. */ + tmp = switches.to; + switches.to = switches.from; + switches.from = tmp; + } + if (switches.formatObjPtr == NULL) { + Tcl_Obj *listObjPtr; + int i; + + listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); + for (i = switches.from; i <= switches.to; i++) { + Tcl_ListObjAppendElement(interp, listObjPtr, + Tcl_NewDoubleObj(vPtr->valueArr[i])); } - if (switches.from > switches.to) { - int tmp; - /* swap positions. */ - tmp = switches.to; - switches.to = switches.from; - switches.from = tmp; - } - if (switches.formatObjPtr == NULL) { - Tcl_Obj *listObjPtr; - int i; - - listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); - for (i = switches.from; i <= switches.to; i++) { - Tcl_ListObjAppendElement(interp, listObjPtr, - Tcl_NewDoubleObj(vPtr->valueArr[i])); - } - Tcl_SetObjResult(interp, listObjPtr); - } else { - Tcl_DString ds; - char buffer[200]; - const char *fmt; - int i; - - Tcl_DStringInit(&ds); - fmt = Tcl_GetString(switches.formatObjPtr); - for (i = switches.from; i <= switches.to; i++) { - sprintf(buffer, fmt, vPtr->valueArr[i]); - Tcl_DStringAppend(&ds, buffer, -1); - } - Tcl_DStringResult(interp, &ds); - Tcl_DStringFree(&ds); + Tcl_SetObjResult(interp, listObjPtr); + } else { + Tcl_DString ds; + char buffer[200]; + const char *fmt; + int i; + + Tcl_DStringInit(&ds); + fmt = Tcl_GetString(switches.formatObjPtr); + for (i = switches.from; i <= switches.to; i++) { + sprintf(buffer, fmt, vPtr->valueArr[i]); + Tcl_DStringAppend(&ds, buffer, -1); } - return TCL_OK; + Tcl_DStringResult(interp, &ds); + Tcl_DStringFree(&ds); + } + return TCL_OK; } /* @@ -1152,40 +1152,40 @@ ValuesOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int RangeOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - Tcl_Obj *listObjPtr; - int first, last; - int i; - - if (objc == 2) { - first = 0; - last = vPtr->length - 1; - } else if (objc == 4) { - if ((Blt_Vec_GetIndex(interp, vPtr, Tcl_GetString(objv[2]), &first, - INDEX_CHECK, (Blt_VectorIndexProc **) NULL) != TCL_OK) || - (Blt_Vec_GetIndex(interp, vPtr, Tcl_GetString(objv[3]), &last, - INDEX_CHECK, (Blt_VectorIndexProc **) NULL) != TCL_OK)) { - return TCL_ERROR; - } - } else { - Tcl_AppendResult(interp, "wrong # args: should be \"", - Tcl_GetString(objv[0]), " range ?first last?", (char *)NULL); - return TCL_ERROR; - } - listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); - if (first > last) { - /* Return the list reversed */ - for (i = last; i <= first; i++) { - Tcl_ListObjAppendElement(interp, listObjPtr, - Tcl_NewDoubleObj(vPtr->valueArr[i])); - } - } else { - for (i = first; i <= last; i++) { - Tcl_ListObjAppendElement(interp, listObjPtr, - Tcl_NewDoubleObj(vPtr->valueArr[i])); - } + Tcl_Obj *listObjPtr; + int first, last; + int i; + + if (objc == 2) { + first = 0; + last = vPtr->length - 1; + } else if (objc == 4) { + if ((Blt_Vec_GetIndex(interp, vPtr, Tcl_GetString(objv[2]), &first, + INDEX_CHECK, (Blt_VectorIndexProc **) NULL) != TCL_OK) || + (Blt_Vec_GetIndex(interp, vPtr, Tcl_GetString(objv[3]), &last, + INDEX_CHECK, (Blt_VectorIndexProc **) NULL) != TCL_OK)) { + return TCL_ERROR; + } + } else { + Tcl_AppendResult(interp, "wrong # args: should be \"", + Tcl_GetString(objv[0]), " range ?first last?", (char *)NULL); + return TCL_ERROR; + } + listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); + if (first > last) { + /* Return the list reversed */ + for (i = last; i <= first; i++) { + Tcl_ListObjAppendElement(interp, listObjPtr, + Tcl_NewDoubleObj(vPtr->valueArr[i])); + } + } else { + for (i = first; i <= last; i++) { + Tcl_ListObjAppendElement(interp, listObjPtr, + Tcl_NewDoubleObj(vPtr->valueArr[i])); } - Tcl_SetObjResult(interp, listObjPtr); - return TCL_OK; + } + Tcl_SetObjResult(interp, listObjPtr); + return TCL_OK; } /* @@ -1211,26 +1211,26 @@ RangeOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) INLINE static int InRange(double value, double min, double max) { - double range; + double range; - range = max - min; - if (range < DBL_EPSILON) { - return (fabs(max - value) < DBL_EPSILON); - } else { - double norm; + range = max - min; + if (range < DBL_EPSILON) { + return (fabs(max - value) < DBL_EPSILON); + } else { + double norm; - norm = (value - min) / range; - return ((norm >= -DBL_EPSILON) && ((norm - 1.0) < DBL_EPSILON)); - } + norm = (value - min) / range; + return ((norm >= -DBL_EPSILON) && ((norm - 1.0) < DBL_EPSILON)); + } } enum NativeFormats { - FMT_UNKNOWN = -1, - FMT_UCHAR, FMT_CHAR, - FMT_USHORT, FMT_SHORT, - FMT_UINT, FMT_INT, - FMT_ULONG, FMT_LONG, - FMT_FLOAT, FMT_DOUBLE + FMT_UNKNOWN = -1, + FMT_UCHAR, FMT_CHAR, + FMT_USHORT, FMT_SHORT, + FMT_UINT, FMT_INT, + FMT_ULONG, FMT_LONG, + FMT_FLOAT, FMT_DOUBLE }; /* @@ -1253,137 +1253,137 @@ enum NativeFormats { static enum NativeFormats GetBinaryFormat(Tcl_Interp* interp, char *string, int *sizePtr) { - char c; - - c = tolower(string[0]); - if (Tcl_GetInt(interp, string + 1, sizePtr) != TCL_OK) { - Tcl_AppendResult(interp, "unknown binary format \"", string, - "\": incorrect byte size", (char *)NULL); - return FMT_UNKNOWN; - } - switch (c) { - case 'r': - if (*sizePtr == sizeof(double)) { - return FMT_DOUBLE; - } else if (*sizePtr == sizeof(float)) { - return FMT_FLOAT; - } - break; - - case 'i': - if (*sizePtr == sizeof(char)) { - return FMT_CHAR; - } else if (*sizePtr == sizeof(int)) { - return FMT_INT; - } else if (*sizePtr == sizeof(long)) { - return FMT_LONG; - } else if (*sizePtr == sizeof(short)) { - return FMT_SHORT; - } - break; - - case 'u': - if (*sizePtr == sizeof(unsigned char)) { - return FMT_UCHAR; - } else if (*sizePtr == sizeof(unsigned int)) { - return FMT_UINT; - } else if (*sizePtr == sizeof(unsigned long)) { - return FMT_ULONG; - } else if (*sizePtr == sizeof(unsigned short)) { - return FMT_USHORT; - } - break; - - default: - Tcl_AppendResult(interp, "unknown binary format \"", string, - "\": should be either i#, r#, u# (where # is size in bytes)", - (char *)NULL); - return FMT_UNKNOWN; - } - Tcl_AppendResult(interp, "can't handle format \"", string, "\"", + char c; + + c = tolower(string[0]); + if (Tcl_GetInt(interp, string + 1, sizePtr) != TCL_OK) { + Tcl_AppendResult(interp, "unknown binary format \"", string, + "\": incorrect byte size", (char *)NULL); + return FMT_UNKNOWN; + } + switch (c) { + case 'r': + if (*sizePtr == sizeof(double)) { + return FMT_DOUBLE; + } else if (*sizePtr == sizeof(float)) { + return FMT_FLOAT; + } + break; + + case 'i': + if (*sizePtr == sizeof(char)) { + return FMT_CHAR; + } else if (*sizePtr == sizeof(int)) { + return FMT_INT; + } else if (*sizePtr == sizeof(long)) { + return FMT_LONG; + } else if (*sizePtr == sizeof(short)) { + return FMT_SHORT; + } + break; + + case 'u': + if (*sizePtr == sizeof(unsigned char)) { + return FMT_UCHAR; + } else if (*sizePtr == sizeof(unsigned int)) { + return FMT_UINT; + } else if (*sizePtr == sizeof(unsigned long)) { + return FMT_ULONG; + } else if (*sizePtr == sizeof(unsigned short)) { + return FMT_USHORT; + } + break; + + default: + Tcl_AppendResult(interp, "unknown binary format \"", string, + "\": should be either i#, r#, u# (where # is size in bytes)", (char *)NULL); return FMT_UNKNOWN; + } + Tcl_AppendResult(interp, "can't handle format \"", string, "\"", + (char *)NULL); + return FMT_UNKNOWN; } static int CopyValues(Vector *vPtr, char *byteArr, enum NativeFormats fmt, int size, - int length, int swap, int *indexPtr) + int length, int swap, int *indexPtr) { - int i, n; - int newSize; + int i, n; + int newSize; - if ((swap) && (size > 1)) { - int nBytes = size * length; - unsigned char *p; - int left, right; + if ((swap) && (size > 1)) { + int nBytes = size * length; + unsigned char *p; + int left, right; - for (i = 0; i < nBytes; i += size) { - p = (unsigned char *)(byteArr + i); - for (left = 0, right = size - 1; left < right; left++, right--) { - p[left] ^= p[right]; - p[right] ^= p[left]; - p[left] ^= p[right]; - } + for (i = 0; i < nBytes; i += size) { + p = (unsigned char *)(byteArr + i); + for (left = 0, right = size - 1; left < right; left++, right--) { + p[left] ^= p[right]; + p[right] ^= p[left]; + p[left] ^= p[right]; + } - } - } - newSize = *indexPtr + length; - if (newSize > vPtr->length) { - if (Blt_Vec_ChangeLength(vPtr->interp, vPtr, newSize) != TCL_OK) { - return TCL_ERROR; - } } -#define CopyArrayToVector(vPtr, arr) \ - for (i = 0, n = *indexPtr; i < length; i++, n++) { \ - (vPtr)->valueArr[n] = (double)(arr)[i]; \ + } + newSize = *indexPtr + length; + if (newSize > vPtr->length) { + if (Blt_Vec_ChangeLength(vPtr->interp, vPtr, newSize) != TCL_OK) { + return TCL_ERROR; } + } +#define CopyArrayToVector(vPtr, arr) \ + for (i = 0, n = *indexPtr; i < length; i++, n++) { \ + (vPtr)->valueArr[n] = (double)(arr)[i]; \ + } - switch (fmt) { - case FMT_CHAR: - CopyArrayToVector(vPtr, (char *)byteArr); - break; + switch (fmt) { + case FMT_CHAR: + CopyArrayToVector(vPtr, (char *)byteArr); + break; - case FMT_UCHAR: - CopyArrayToVector(vPtr, (unsigned char *)byteArr); - break; + case FMT_UCHAR: + CopyArrayToVector(vPtr, (unsigned char *)byteArr); + break; - case FMT_INT: - CopyArrayToVector(vPtr, (int *)byteArr); - break; + case FMT_INT: + CopyArrayToVector(vPtr, (int *)byteArr); + break; - case FMT_UINT: - CopyArrayToVector(vPtr, (unsigned int *)byteArr); - break; + case FMT_UINT: + CopyArrayToVector(vPtr, (unsigned int *)byteArr); + break; - case FMT_LONG: - CopyArrayToVector(vPtr, (long *)byteArr); - break; + case FMT_LONG: + CopyArrayToVector(vPtr, (long *)byteArr); + break; - case FMT_ULONG: - CopyArrayToVector(vPtr, (unsigned long *)byteArr); - break; + case FMT_ULONG: + CopyArrayToVector(vPtr, (unsigned long *)byteArr); + break; - case FMT_SHORT: - CopyArrayToVector(vPtr, (short int *)byteArr); - break; + case FMT_SHORT: + CopyArrayToVector(vPtr, (short int *)byteArr); + break; - case FMT_USHORT: - CopyArrayToVector(vPtr, (unsigned short int *)byteArr); - break; + case FMT_USHORT: + CopyArrayToVector(vPtr, (unsigned short int *)byteArr); + break; - case FMT_FLOAT: - CopyArrayToVector(vPtr, (float *)byteArr); - break; + case FMT_FLOAT: + CopyArrayToVector(vPtr, (float *)byteArr); + break; - case FMT_DOUBLE: - CopyArrayToVector(vPtr, (double *)byteArr); - break; + case FMT_DOUBLE: + CopyArrayToVector(vPtr, (double *)byteArr); + break; - case FMT_UNKNOWN: - break; - } - *indexPtr += length; - return TCL_OK; + case FMT_UNKNOWN: + break; + } + *indexPtr += length; + return TCL_OK; } /* @@ -1419,133 +1419,133 @@ CopyValues(Vector *vPtr, char *byteArr, enum NativeFormats fmt, int size, static int BinreadOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - Tcl_Channel channel; - char *byteArr; - char *string; - enum NativeFormats fmt; - int arraySize, bytesRead; - int count, total; - int first; - int size, length, mode; - int swap; - int i; - - string = Tcl_GetString(objv[2]); - channel = Tcl_GetChannel(interp, string, &mode); - if (channel == NULL) { + Tcl_Channel channel; + char *byteArr; + char *string; + enum NativeFormats fmt; + int arraySize, bytesRead; + int count, total; + int first; + int size, length, mode; + int swap; + int i; + + string = Tcl_GetString(objv[2]); + channel = Tcl_GetChannel(interp, string, &mode); + if (channel == NULL) { + return TCL_ERROR; + } + if ((mode & TCL_READABLE) == 0) { + Tcl_AppendResult(interp, "channel \"", string, + "\" wasn't opened for reading", (char *)NULL); + return TCL_ERROR; + } + first = vPtr->length; + fmt = FMT_DOUBLE; + size = sizeof(double); + swap = 0; + count = 0; + + if (objc > 3) { + string = Tcl_GetString(objv[3]); + if (string[0] != '-') { + long int value; + /* Get the number of values to read. */ + if (Tcl_GetLongFromObj(interp, objv[3], &value) != TCL_OK) { return TCL_ERROR; - } - if ((mode & TCL_READABLE) == 0) { - Tcl_AppendResult(interp, "channel \"", string, - "\" wasn't opened for reading", (char *)NULL); + } + if (value < 0) { + Tcl_AppendResult(interp, "count can't be negative", + (char *)NULL); return TCL_ERROR; + } + count = (size_t)value; + objc--, objv++; } - first = vPtr->length; - fmt = FMT_DOUBLE; - size = sizeof(double); - swap = 0; - count = 0; - - if (objc > 3) { - string = Tcl_GetString(objv[3]); - if (string[0] != '-') { - long int value; - /* Get the number of values to read. */ - if (Tcl_GetLongFromObj(interp, objv[3], &value) != TCL_OK) { - return TCL_ERROR; - } - if (value < 0) { - Tcl_AppendResult(interp, "count can't be negative", - (char *)NULL); - return TCL_ERROR; - } - count = (size_t)value; - objc--, objv++; - } - } - /* Process any option-value pairs that remain. */ - for (i = 3; i < objc; i++) { - string = Tcl_GetString(objv[i]); - if (strcmp(string, "-swap") == 0) { - swap = 1; - } else if (strcmp(string, "-format") == 0) { - i++; - if (i >= objc) { - Tcl_AppendResult(interp, "missing arg after \"", string, - "\"", (char *)NULL); - return TCL_ERROR; - } - string = Tcl_GetString(objv[i]); - fmt = GetBinaryFormat(interp, string, &size); - if (fmt == FMT_UNKNOWN) { - return TCL_ERROR; - } - } else if (strcmp(string, "-at") == 0) { - i++; - if (i >= objc) { - Tcl_AppendResult(interp, "missing arg after \"", string, - "\"", (char *)NULL); - return TCL_ERROR; - } - string = Tcl_GetString(objv[i]); - if (Blt_Vec_GetIndex(interp, vPtr, string, &first, 0, - (Blt_VectorIndexProc **)NULL) != TCL_OK) { - return TCL_ERROR; - } - if (first > vPtr->length) { - Tcl_AppendResult(interp, "index \"", string, - "\" is out of range", (char *)NULL); - return TCL_ERROR; - } - } + } + /* Process any option-value pairs that remain. */ + for (i = 3; i < objc; i++) { + string = Tcl_GetString(objv[i]); + if (strcmp(string, "-swap") == 0) { + swap = 1; + } else if (strcmp(string, "-format") == 0) { + i++; + if (i >= objc) { + Tcl_AppendResult(interp, "missing arg after \"", string, + "\"", (char *)NULL); + return TCL_ERROR; + } + string = Tcl_GetString(objv[i]); + fmt = GetBinaryFormat(interp, string, &size); + if (fmt == FMT_UNKNOWN) { + return TCL_ERROR; + } + } else if (strcmp(string, "-at") == 0) { + i++; + if (i >= objc) { + Tcl_AppendResult(interp, "missing arg after \"", string, + "\"", (char *)NULL); + return TCL_ERROR; + } + string = Tcl_GetString(objv[i]); + if (Blt_Vec_GetIndex(interp, vPtr, string, &first, 0, + (Blt_VectorIndexProc **)NULL) != TCL_OK) { + return TCL_ERROR; + } + if (first > vPtr->length) { + Tcl_AppendResult(interp, "index \"", string, + "\" is out of range", (char *)NULL); + return TCL_ERROR; + } } + } #define BUFFER_SIZE 1024 - if (count == 0) { - arraySize = BUFFER_SIZE * size; - } else { - arraySize = count * size; - } + if (count == 0) { + arraySize = BUFFER_SIZE * size; + } else { + arraySize = count * size; + } - byteArr = malloc(arraySize); - /* FIXME: restore old channel translation later? */ - if (Tcl_SetChannelOption(interp, channel, "-translation", - "binary") != TCL_OK) { - return TCL_ERROR; + byteArr = (char*)malloc(arraySize); + /* FIXME: restore old channel translation later? */ + if (Tcl_SetChannelOption(interp, channel, "-translation", + "binary") != TCL_OK) { + return TCL_ERROR; + } + total = 0; + while (!Tcl_Eof(channel)) { + bytesRead = Tcl_Read(channel, byteArr, arraySize); + if (bytesRead < 0) { + Tcl_AppendResult(interp, "error reading channel: ", + Tcl_PosixError(interp), (char *)NULL); + return TCL_ERROR; + } + if ((bytesRead % size) != 0) { + Tcl_AppendResult(interp, "error reading channel: short read", + (char *)NULL); + return TCL_ERROR; + } + length = bytesRead / size; + if (CopyValues(vPtr, byteArr, fmt, size, length, swap, &first) + != TCL_OK) { + return TCL_ERROR; } - total = 0; - while (!Tcl_Eof(channel)) { - bytesRead = Tcl_Read(channel, byteArr, arraySize); - if (bytesRead < 0) { - Tcl_AppendResult(interp, "error reading channel: ", - Tcl_PosixError(interp), (char *)NULL); - return TCL_ERROR; - } - if ((bytesRead % size) != 0) { - Tcl_AppendResult(interp, "error reading channel: short read", - (char *)NULL); - return TCL_ERROR; - } - length = bytesRead / size; - if (CopyValues(vPtr, byteArr, fmt, size, length, swap, &first) - != TCL_OK) { - return TCL_ERROR; - } - total += length; - if (count > 0) { - break; - } - } - free(byteArr); - - if (vPtr->flush) { - Blt_Vec_FlushCache(vPtr); + total += length; + if (count > 0) { + break; } - Blt_Vec_UpdateClients(vPtr); + } + free(byteArr); - /* Set the result as the number of values read. */ - Tcl_SetIntObj(Tcl_GetObjResult(interp), total); - return TCL_OK; + if (vPtr->flush) { + Blt_Vec_FlushCache(vPtr); + } + Blt_Vec_UpdateClients(vPtr); + + /* Set the result as the number of values read. */ + Tcl_SetIntObj(Tcl_GetObjResult(interp), total); + return TCL_OK; } /* @@ -1567,53 +1567,53 @@ BinreadOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int SearchOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - double min, max; - int i; - int wantValue; - char *string; - Tcl_Obj *listObjPtr; - - wantValue = 0; - string = Tcl_GetString(objv[2]); - if ((string[0] == '-') && (strcmp(string, "-value") == 0)) { - wantValue = 1; - objv++, objc--; - } - if (Blt_ExprDoubleFromObj(interp, objv[2], &min) != TCL_OK) { - return TCL_ERROR; - } - max = min; - if (objc > 4) { - Tcl_AppendResult(interp, "wrong # arguments: should be \"", - Tcl_GetString(objv[0]), " search ?-value? min ?max?", - (char *)NULL); - return TCL_ERROR; - } - if ((objc > 3) && - (Blt_ExprDoubleFromObj(interp, objv[3], &max) != TCL_OK)) { - return TCL_ERROR; - } - if ((min - max) >= DBL_EPSILON) { - return TCL_OK; /* Bogus range. Don't bother looking. */ + double min, max; + int i; + int wantValue; + char *string; + Tcl_Obj *listObjPtr; + + wantValue = 0; + string = Tcl_GetString(objv[2]); + if ((string[0] == '-') && (strcmp(string, "-value") == 0)) { + wantValue = 1; + objv++, objc--; + } + if (Blt_ExprDoubleFromObj(interp, objv[2], &min) != TCL_OK) { + return TCL_ERROR; + } + max = min; + if (objc > 4) { + Tcl_AppendResult(interp, "wrong # arguments: should be \"", + Tcl_GetString(objv[0]), " search ?-value? min ?max?", + (char *)NULL); + return TCL_ERROR; + } + if ((objc > 3) && + (Blt_ExprDoubleFromObj(interp, objv[3], &max) != TCL_OK)) { + return TCL_ERROR; + } + if ((min - max) >= DBL_EPSILON) { + return TCL_OK; /* Bogus range. Don't bother looking. */ + } + listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); + if (wantValue) { + for (i = 0; i < vPtr->length; i++) { + if (InRange(vPtr->valueArr[i], min, max)) { + Tcl_ListObjAppendElement(interp, listObjPtr, + Tcl_NewDoubleObj(vPtr->valueArr[i])); + } } - listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); - if (wantValue) { - for (i = 0; i < vPtr->length; i++) { - if (InRange(vPtr->valueArr[i], min, max)) { - Tcl_ListObjAppendElement(interp, listObjPtr, - Tcl_NewDoubleObj(vPtr->valueArr[i])); - } - } - } else { - for (i = 0; i < vPtr->length; i++) { - if (InRange(vPtr->valueArr[i], min, max)) { - Tcl_ListObjAppendElement(interp, listObjPtr, - Tcl_NewIntObj(i + vPtr->offset)); - } - } + } else { + for (i = 0; i < vPtr->length; i++) { + if (InRange(vPtr->valueArr[i], min, max)) { + Tcl_ListObjAppendElement(interp, listObjPtr, + Tcl_NewIntObj(i + vPtr->offset)); + } } - Tcl_SetObjResult(interp, listObjPtr); - return TCL_OK; + } + Tcl_SetObjResult(interp, listObjPtr); + return TCL_OK; } /* @@ -1635,16 +1635,16 @@ SearchOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int OffsetOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - if (objc == 3) { - int newOffset; + if (objc == 3) { + int newOffset; - if (Tcl_GetIntFromObj(interp, objv[2], &newOffset) != TCL_OK) { - return TCL_ERROR; - } - vPtr->offset = newOffset; + if (Tcl_GetIntFromObj(interp, objv[2], &newOffset) != TCL_OK) { + return TCL_ERROR; } - Tcl_SetIntObj(Tcl_GetObjResult(interp), vPtr->offset); - return TCL_OK; + vPtr->offset = newOffset; + } + Tcl_SetIntObj(Tcl_GetObjResult(interp), vPtr->offset); + return TCL_OK; } /* @@ -1663,16 +1663,16 @@ OffsetOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int RandomOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - int i; + int i; - for (i = 0; i < vPtr->length; i++) { - vPtr->valueArr[i] = drand48(); - } - if (vPtr->flush) { - Blt_Vec_FlushCache(vPtr); - } - Blt_Vec_UpdateClients(vPtr); - return TCL_OK; + for (i = 0; i < vPtr->length; i++) { + vPtr->valueArr[i] = drand48(); + } + if (vPtr->flush) { + Blt_Vec_FlushCache(vPtr); + } + Blt_Vec_UpdateClients(vPtr); + return TCL_OK; } /* @@ -1691,36 +1691,36 @@ RandomOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int SeqOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - int n; - double start, stop; + int n; + double start, stop; - if (Blt_ExprDoubleFromObj(interp, objv[2], &start) != TCL_OK) { - return TCL_ERROR; - } - if (Blt_ExprDoubleFromObj(interp, objv[3], &stop) != TCL_OK) { - return TCL_ERROR; + if (Blt_ExprDoubleFromObj(interp, objv[2], &start) != TCL_OK) { + return TCL_ERROR; + } + if (Blt_ExprDoubleFromObj(interp, objv[3], &stop) != TCL_OK) { + return TCL_ERROR; + } + n = vPtr->length; + if ((objc > 4) && (Blt_ExprIntFromObj(interp, objv[4], &n) != TCL_OK)) { + return TCL_ERROR; + } + if (n > 1) { + int i; + double step; + + if (Blt_Vec_SetLength(interp, vPtr, n) != TCL_OK) { + return TCL_ERROR; } - n = vPtr->length; - if ((objc > 4) && (Blt_ExprIntFromObj(interp, objv[4], &n) != TCL_OK)) { - return TCL_ERROR; + step = (stop - start) / (double)(n - 1); + for (i = 0; i < n; i++) { + vPtr->valueArr[i] = start + (step * i); } - if (n > 1) { - int i; - double step; - - if (Blt_Vec_SetLength(interp, vPtr, n) != TCL_OK) { - return TCL_ERROR; - } - step = (stop - start) / (double)(n - 1); - for (i = 0; i < n; i++) { - vPtr->valueArr[i] = start + (step * i); - } - if (vPtr->flush) { - Blt_Vec_FlushCache(vPtr); - } - Blt_Vec_UpdateClients(vPtr); + if (vPtr->flush) { + Blt_Vec_FlushCache(vPtr); } - return TCL_OK; + Blt_Vec_UpdateClients(vPtr); + } + return TCL_OK; } /* @@ -1745,50 +1745,50 @@ SeqOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int SetOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - int result; - Vector *v2Ptr; - int nElem; - Tcl_Obj **elemObjArr; - - /* The source can be either a list of numbers or another vector. */ - - v2Ptr = Blt_Vec_ParseElement((Tcl_Interp *)NULL, vPtr->dataPtr, - Tcl_GetString(objv[2]), NULL, NS_SEARCH_BOTH); - if (v2Ptr != NULL) { - if (vPtr == v2Ptr) { - Vector *tmpPtr; - /* - * Source and destination vectors are the same. Copy the source - * first into a temporary vector to avoid memory overlaps. - */ - tmpPtr = Blt_Vec_New(vPtr->dataPtr); - result = Blt_Vec_Duplicate(tmpPtr, v2Ptr); - if (result == TCL_OK) { - result = Blt_Vec_Duplicate(vPtr, tmpPtr); - } - Blt_Vec_Free(tmpPtr); - } else { - result = Blt_Vec_Duplicate(vPtr, v2Ptr); - } - } else if (Tcl_ListObjGetElements(interp, objv[2], &nElem, &elemObjArr) - == TCL_OK) { - result = CopyList(vPtr, interp, nElem, elemObjArr); + int result; + Vector *v2Ptr; + int nElem; + Tcl_Obj **elemObjArr; + + /* The source can be either a list of numbers or another vector. */ + + v2Ptr = Blt_Vec_ParseElement((Tcl_Interp *)NULL, vPtr->dataPtr, + Tcl_GetString(objv[2]), NULL, NS_SEARCH_BOTH); + if (v2Ptr != NULL) { + if (vPtr == v2Ptr) { + Vector *tmpPtr; + /* + * Source and destination vectors are the same. Copy the source + * first into a temporary vector to avoid memory overlaps. + */ + tmpPtr = Blt_Vec_New(vPtr->dataPtr); + result = Blt_Vec_Duplicate(tmpPtr, v2Ptr); + if (result == TCL_OK) { + result = Blt_Vec_Duplicate(vPtr, tmpPtr); + } + Blt_Vec_Free(tmpPtr); } else { - return TCL_ERROR; + result = Blt_Vec_Duplicate(vPtr, v2Ptr); } + } else if (Tcl_ListObjGetElements(interp, objv[2], &nElem, &elemObjArr) + == TCL_OK) { + result = CopyList(vPtr, interp, nElem, elemObjArr); + } else { + return TCL_ERROR; + } - if (result == TCL_OK) { - /* - * The vector has changed; so flush the array indices (they're wrong - * now), find the new range of the data, and notify the vector's - * clients that it's been modified. - */ - if (vPtr->flush) { - Blt_Vec_FlushCache(vPtr); - } - Blt_Vec_UpdateClients(vPtr); + if (result == TCL_OK) { + /* + * The vector has changed; so flush the array indices (they're wrong + * now), find the new range of the data, and notify the vector's + * clients that it's been modified. + */ + if (vPtr->flush) { + Blt_Vec_FlushCache(vPtr); } - return result; + Blt_Vec_UpdateClients(vPtr); + } + return result; } /* @@ -1813,33 +1813,33 @@ SetOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int SimplifyOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - size_t i, n; - int length, nPoints; - int *simple; - double tolerance = 10.0; - Point2d *orig, *reduced; - - length = vPtr->length; - nPoints = vPtr->length / 2; - simple = malloc(nPoints * sizeof(int)); - reduced = malloc(nPoints * sizeof(Point2d)); - orig = (Point2d *)vPtr->valueArr; - n = Blt_SimplifyLine(orig, 0, nPoints - 1, tolerance, simple); - for (i = 0; i < n; i++) { - reduced[i] = orig[simple[i]]; - } - free(simple); - Blt_Vec_Reset(vPtr, (double *)reduced, n * 2, vPtr->length, TCL_DYNAMIC); - /* - * The vector has changed; so flush the array indices (they're wrong - * now), find the new range of the data, and notify the vector's - * clients that it's been modified. - */ - if (vPtr->flush) { - Blt_Vec_FlushCache(vPtr); - } - Blt_Vec_UpdateClients(vPtr); - return TCL_OK; + size_t i, n; + int length, nPoints; + int *simple; + double tolerance = 10.0; + Point2d *orig, *reduced; + + length = vPtr->length; + nPoints = vPtr->length / 2; + simple = (int*)malloc(nPoints * sizeof(int)); + reduced = (Point2d*)malloc(nPoints * sizeof(Point2d)); + orig = (Point2d *)vPtr->valueArr; + n = Blt_SimplifyLine(orig, 0, nPoints - 1, tolerance, simple); + for (i = 0; i < n; i++) { + reduced[i] = orig[simple[i]]; + } + free(simple); + Blt_Vec_Reset(vPtr, (double *)reduced, n * 2, vPtr->length, TCL_DYNAMIC); + /* + * The vector has changed; so flush the array indices (they're wrong + * now), find the new range of the data, and notify the vector's + * clients that it's been modified. + */ + if (vPtr->flush) { + Blt_Vec_FlushCache(vPtr); + } + Blt_Vec_UpdateClients(vPtr); + return TCL_OK; } /* @@ -1858,40 +1858,40 @@ SimplifyOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int SplitOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - int nVectors; + int nVectors; - nVectors = objc - 2; - if ((vPtr->length % nVectors) != 0) { - Tcl_AppendResult(interp, "can't split vector \"", vPtr->name, - "\" into ", Blt_Itoa(nVectors), " even parts.", (char *)NULL); + nVectors = objc - 2; + if ((vPtr->length % nVectors) != 0) { + Tcl_AppendResult(interp, "can't split vector \"", vPtr->name, + "\" into ", Blt_Itoa(nVectors), " even parts.", (char *)NULL); + return TCL_ERROR; + } + if (nVectors > 0) { + Vector *v2Ptr; + char *string; /* Name of vector. */ + int i, j, k; + int oldSize, newSize, extra, isNew; + + extra = vPtr->length / nVectors; + for (i = 0; i < nVectors; i++) { + string = Tcl_GetString(objv[i+2]); + v2Ptr = Blt_Vec_Create(vPtr->dataPtr, string, string, string, + &isNew); + oldSize = v2Ptr->length; + newSize = oldSize + extra; + if (Blt_Vec_SetLength(interp, v2Ptr, newSize) != TCL_OK) { return TCL_ERROR; + } + for (j = i, k = oldSize; j < vPtr->length; j += nVectors, k++) { + v2Ptr->valueArr[k] = vPtr->valueArr[j]; + } + Blt_Vec_UpdateClients(v2Ptr); + if (v2Ptr->flush) { + Blt_Vec_FlushCache(v2Ptr); + } } - if (nVectors > 0) { - Vector *v2Ptr; - char *string; /* Name of vector. */ - int i, j, k; - int oldSize, newSize, extra, isNew; - - extra = vPtr->length / nVectors; - for (i = 0; i < nVectors; i++) { - string = Tcl_GetString(objv[i+2]); - v2Ptr = Blt_Vec_Create(vPtr->dataPtr, string, string, string, - &isNew); - oldSize = v2Ptr->length; - newSize = oldSize + extra; - if (Blt_Vec_SetLength(interp, v2Ptr, newSize) != TCL_OK) { - return TCL_ERROR; - } - for (j = i, k = oldSize; j < vPtr->length; j += nVectors, k++) { - v2Ptr->valueArr[k] = vPtr->valueArr[j]; - } - Blt_Vec_UpdateClients(v2Ptr); - if (v2Ptr->flush) { - Blt_Vec_FlushCache(v2Ptr); - } - } - } - return TCL_OK; + } + return TCL_OK; } @@ -1905,22 +1905,22 @@ static int sortDecreasing; /* Indicates the ordering of the sort. If static int CompareVectors(void *a, void *b) { - double delta; - int i; - int sign; - Vector *vPtr; - - sign = (sortDecreasing) ? -1 : 1; - for (i = 0; i < nSortVectors; i++) { - vPtr = sortVectors[i]; - delta = vPtr->valueArr[*(int *)a] - vPtr->valueArr[*(int *)b]; - if (delta < 0.0) { - return (-1 * sign); - } else if (delta > 0.0) { - return (1 * sign); - } - } - return 0; + double delta; + int i; + int sign; + Vector *vPtr; + + sign = (sortDecreasing) ? -1 : 1; + for (i = 0; i < nSortVectors; i++) { + vPtr = sortVectors[i]; + delta = vPtr->valueArr[*(int *)a] - vPtr->valueArr[*(int *)b]; + if (delta < 0.0) { + return (-1 * sign); + } else if (delta > 0.0) { + return (1 * sign); + } + } + return 0; } /* @@ -1945,51 +1945,51 @@ CompareVectors(void *a, void *b) size_t * Blt_Vec_SortMap(Vector **vectors, int nVectors) { - size_t *map; - int i; - Vector *vPtr = *vectors; - int length; - - length = vPtr->last - vPtr->first + 1; - map = malloc(sizeof(size_t) * length); - for (i = vPtr->first; i <= vPtr->last; i++) { - map[i] = i; - } - /* Set global variables for sorting routine. */ - sortVectors = vectors; - nSortVectors = nVectors; - qsort((char *)map, length, sizeof(size_t), - (QSortCompareProc *)CompareVectors); - return map; + size_t *map; + int i; + Vector *vPtr = *vectors; + int length; + + length = vPtr->last - vPtr->first + 1; + map = (size_t*)malloc(sizeof(size_t) * length); + for (i = vPtr->first; i <= vPtr->last; i++) { + map[i] = i; + } + /* Set global variables for sorting routine. */ + sortVectors = vectors; + nSortVectors = nVectors; + qsort((char *)map, length, sizeof(size_t), + (QSortCompareProc *)CompareVectors); + return map; } static size_t * SortVectors(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - Vector **vectors, *v2Ptr; - size_t *map; - int i; - - vectors = malloc(sizeof(Vector *) * (objc + 1)); - vectors[0] = vPtr; - map = NULL; - for (i = 0; i < objc; i++) { - if (Blt_Vec_LookupName(vPtr->dataPtr, Tcl_GetString(objv[i]), - &v2Ptr) != TCL_OK) { - goto error; - } - if (v2Ptr->length != vPtr->length) { - Tcl_AppendResult(interp, "vector \"", v2Ptr->name, - "\" is not the same size as \"", vPtr->name, "\"", - (char *)NULL); - goto error; - } - vectors[i + 1] = v2Ptr; - } - map = Blt_Vec_SortMap(vectors, objc + 1); - error: - free(vectors); - return map; + Vector **vectors, *v2Ptr; + size_t *map; + int i; + + vectors = (Vector**)malloc(sizeof(Vector *) * (objc + 1)); + vectors[0] = vPtr; + map = NULL; + for (i = 0; i < objc; i++) { + if (Blt_Vec_LookupName(vPtr->dataPtr, Tcl_GetString(objv[i]), + &v2Ptr) != TCL_OK) { + goto error; + } + if (v2Ptr->length != vPtr->length) { + Tcl_AppendResult(interp, "vector \"", v2Ptr->name, + "\" is not the same size as \"", vPtr->name, "\"", + (char *)NULL); + goto error; + } + vectors[i + 1] = v2Ptr; + } + map = Blt_Vec_SortMap(vectors, objc + 1); + error: + free(vectors); + return map; } @@ -2015,93 +2015,93 @@ SortVectors(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int SortOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - Vector *v2Ptr; - double *copy; - size_t *map; - size_t sortLength, nBytes; - int result; - int i; - unsigned int n; - SortSwitches switches; - - sortDecreasing = 0; - switches.flags = 0; - i = Blt_ParseSwitches(interp, sortSwitches, objc - 2, objv + 2, &switches, - BLT_SWITCH_OBJV_PARTIAL); - if (i < 0) { - return TCL_ERROR; - } - objc -= i, objv += i; - sortDecreasing = (switches.flags & SORT_DECREASING); - if (objc > 2) { - map = SortVectors(vPtr, interp, objc - 2, objv + 2); - } else { - map = Blt_Vec_SortMap(&vPtr, 1); + Vector *v2Ptr; + double *copy; + size_t *map; + size_t sortLength, nBytes; + int result; + int i; + unsigned int n; + SortSwitches switches; + + sortDecreasing = 0; + switches.flags = 0; + i = Blt_ParseSwitches(interp, sortSwitches, objc - 2, objv + 2, &switches, + BLT_SWITCH_OBJV_PARTIAL); + if (i < 0) { + return TCL_ERROR; + } + objc -= i, objv += i; + sortDecreasing = (switches.flags & SORT_DECREASING); + if (objc > 2) { + map = SortVectors(vPtr, interp, objc - 2, objv + 2); + } else { + map = Blt_Vec_SortMap(&vPtr, 1); + } + if (map == NULL) { + return TCL_ERROR; + } + sortLength = vPtr->length; + /* + * Create an array to store a copy of the current values of the + * vector. We'll merge the values back into the vector based upon the + * indices found in the index array. + */ + nBytes = sizeof(double) * sortLength; + copy = (double*)malloc(nBytes); + memcpy((char *)copy, (char *)vPtr->valueArr, nBytes); + if (switches.flags & SORT_UNIQUE) { + int count; + + for (count = n = 1; n < sortLength; n++) { + size_t next, prev; + + next = map[n]; + prev = map[n - 1]; + if (copy[next] != copy[prev]) { + map[count] = next; + count++; + } } - if (map == NULL) { - return TCL_ERROR; + sortLength = count; + nBytes = sortLength * sizeof(double); + } + if (sortLength != vPtr->length) { + Blt_Vec_SetLength(interp, vPtr, sortLength); + } + for (n = 0; n < sortLength; n++) { + vPtr->valueArr[n] = copy[map[n]]; + } + if (vPtr->flush) { + Blt_Vec_FlushCache(vPtr); + } + Blt_Vec_UpdateClients(vPtr); + + /* Now sort any other vectors in the same fashion. The vectors must be + * the same size as the map though. */ + result = TCL_ERROR; + for (i = 2; i < objc; i++) { + if (Blt_Vec_LookupName(vPtr->dataPtr, Tcl_GetString(objv[i]), + &v2Ptr) != TCL_OK) { + goto error; } - sortLength = vPtr->length; - /* - * Create an array to store a copy of the current values of the - * vector. We'll merge the values back into the vector based upon the - * indices found in the index array. - */ - nBytes = sizeof(double) * sortLength; - copy = malloc(nBytes); - memcpy((char *)copy, (char *)vPtr->valueArr, nBytes); - if (switches.flags & SORT_UNIQUE) { - int count; - - for (count = n = 1; n < sortLength; n++) { - size_t next, prev; - - next = map[n]; - prev = map[n - 1]; - if (copy[next] != copy[prev]) { - map[count] = next; - count++; - } - } - sortLength = count; - nBytes = sortLength * sizeof(double); - } - if (sortLength != vPtr->length) { - Blt_Vec_SetLength(interp, vPtr, sortLength); + if (sortLength != v2Ptr->length) { + Blt_Vec_SetLength(interp, v2Ptr, sortLength); } + memcpy((char *)copy, (char *)v2Ptr->valueArr, nBytes); for (n = 0; n < sortLength; n++) { - vPtr->valueArr[n] = copy[map[n]]; + v2Ptr->valueArr[n] = copy[map[n]]; } - if (vPtr->flush) { - Blt_Vec_FlushCache(vPtr); + Blt_Vec_UpdateClients(v2Ptr); + if (v2Ptr->flush) { + Blt_Vec_FlushCache(v2Ptr); } - Blt_Vec_UpdateClients(vPtr); - - /* Now sort any other vectors in the same fashion. The vectors must be - * the same size as the map though. */ - result = TCL_ERROR; - for (i = 2; i < objc; i++) { - if (Blt_Vec_LookupName(vPtr->dataPtr, Tcl_GetString(objv[i]), - &v2Ptr) != TCL_OK) { - goto error; - } - if (sortLength != v2Ptr->length) { - Blt_Vec_SetLength(interp, v2Ptr, sortLength); - } - memcpy((char *)copy, (char *)v2Ptr->valueArr, nBytes); - for (n = 0; n < sortLength; n++) { - v2Ptr->valueArr[n] = copy[map[n]]; - } - Blt_Vec_UpdateClients(v2Ptr); - if (v2Ptr->flush) { - Blt_Vec_FlushCache(v2Ptr); - } - } - result = TCL_OK; - error: - free(copy); - free(map); - return result; + } + result = TCL_OK; + error: + free(copy); + free(map); + return result; } /* @@ -2122,15 +2122,15 @@ static int InstExprOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - if (Blt_ExprVector(interp, Tcl_GetString(objv[2]), (Blt_Vector *)vPtr) - != TCL_OK) { - return TCL_ERROR; - } - if (vPtr->flush) { - Blt_Vec_FlushCache(vPtr); - } - Blt_Vec_UpdateClients(vPtr); - return TCL_OK; + if (Blt_ExprVector(interp, Tcl_GetString(objv[2]), (Blt_Vector *)vPtr) + != TCL_OK) { + return TCL_ERROR; + } + if (vPtr->flush) { + Blt_Vec_FlushCache(vPtr); + } + Blt_Vec_UpdateClients(vPtr); + return TCL_OK; } /* @@ -2153,104 +2153,104 @@ InstExprOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) static int ArithOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - double value; - int i; - Vector *v2Ptr; - double scalar; - Tcl_Obj *listObjPtr; - char *string; + double value; + int i; + Vector *v2Ptr; + double scalar; + Tcl_Obj *listObjPtr; + char *string; + + v2Ptr = Blt_Vec_ParseElement((Tcl_Interp *)NULL, vPtr->dataPtr, + Tcl_GetString(objv[2]), NULL, NS_SEARCH_BOTH); + if (v2Ptr != NULL) { + int j; + int length; - v2Ptr = Blt_Vec_ParseElement((Tcl_Interp *)NULL, vPtr->dataPtr, - Tcl_GetString(objv[2]), NULL, NS_SEARCH_BOTH); - if (v2Ptr != NULL) { - int j; - int length; - - length = v2Ptr->last - v2Ptr->first + 1; - if (length != vPtr->length) { - Tcl_AppendResult(interp, "vectors \"", Tcl_GetString(objv[0]), - "\" and \"", Tcl_GetString(objv[2]), - "\" are not the same length", (char *)NULL); - return TCL_ERROR; - } - string = Tcl_GetString(objv[1]); - listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); - switch (string[0]) { - case '*': - for (i = 0, j = v2Ptr->first; i < vPtr->length; i++, j++) { - value = vPtr->valueArr[i] * v2Ptr->valueArr[j]; - Tcl_ListObjAppendElement(interp, listObjPtr, - Tcl_NewDoubleObj(value)); - } - break; - - case '/': - for (i = 0, j = v2Ptr->first; i < vPtr->length; i++, j++) { - value = vPtr->valueArr[i] / v2Ptr->valueArr[j]; - Tcl_ListObjAppendElement(interp, listObjPtr, - Tcl_NewDoubleObj(value)); - } - break; - - case '-': - for (i = 0, j = v2Ptr->first; i < vPtr->length; i++, j++) { - value = vPtr->valueArr[i] - v2Ptr->valueArr[j]; - Tcl_ListObjAppendElement(interp, listObjPtr, - Tcl_NewDoubleObj(value)); - } - break; - - case '+': - for (i = 0, j = v2Ptr->first; i < vPtr->length; i++, j++) { - value = vPtr->valueArr[i] + v2Ptr->valueArr[j]; - Tcl_ListObjAppendElement(interp, listObjPtr, - Tcl_NewDoubleObj(value)); - } - break; - } - Tcl_SetObjResult(interp, listObjPtr); - - } else if (Blt_ExprDoubleFromObj(interp, objv[2], &scalar) == TCL_OK) { - listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); - string = Tcl_GetString(objv[1]); - switch (string[0]) { - case '*': - for (i = 0; i < vPtr->length; i++) { - value = vPtr->valueArr[i] * scalar; - Tcl_ListObjAppendElement(interp, listObjPtr, - Tcl_NewDoubleObj(value)); - } - break; - - case '/': - for (i = 0; i < vPtr->length; i++) { - value = vPtr->valueArr[i] / scalar; - Tcl_ListObjAppendElement(interp, listObjPtr, - Tcl_NewDoubleObj(value)); - } - break; - - case '-': - for (i = 0; i < vPtr->length; i++) { - value = vPtr->valueArr[i] - scalar; - Tcl_ListObjAppendElement(interp, listObjPtr, - Tcl_NewDoubleObj(value)); - } - break; - - case '+': - for (i = 0; i < vPtr->length; i++) { - value = vPtr->valueArr[i] + scalar; - Tcl_ListObjAppendElement(interp, listObjPtr, - Tcl_NewDoubleObj(value)); - } - break; - } - Tcl_SetObjResult(interp, listObjPtr); - } else { - return TCL_ERROR; + length = v2Ptr->last - v2Ptr->first + 1; + if (length != vPtr->length) { + Tcl_AppendResult(interp, "vectors \"", Tcl_GetString(objv[0]), + "\" and \"", Tcl_GetString(objv[2]), + "\" are not the same length", (char *)NULL); + return TCL_ERROR; } - return TCL_OK; + string = Tcl_GetString(objv[1]); + listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); + switch (string[0]) { + case '*': + for (i = 0, j = v2Ptr->first; i < vPtr->length; i++, j++) { + value = vPtr->valueArr[i] * v2Ptr->valueArr[j]; + Tcl_ListObjAppendElement(interp, listObjPtr, + Tcl_NewDoubleObj(value)); + } + break; + + case '/': + for (i = 0, j = v2Ptr->first; i < vPtr->length; i++, j++) { + value = vPtr->valueArr[i] / v2Ptr->valueArr[j]; + Tcl_ListObjAppendElement(interp, listObjPtr, + Tcl_NewDoubleObj(value)); + } + break; + + case '-': + for (i = 0, j = v2Ptr->first; i < vPtr->length; i++, j++) { + value = vPtr->valueArr[i] - v2Ptr->valueArr[j]; + Tcl_ListObjAppendElement(interp, listObjPtr, + Tcl_NewDoubleObj(value)); + } + break; + + case '+': + for (i = 0, j = v2Ptr->first; i < vPtr->length; i++, j++) { + value = vPtr->valueArr[i] + v2Ptr->valueArr[j]; + Tcl_ListObjAppendElement(interp, listObjPtr, + Tcl_NewDoubleObj(value)); + } + break; + } + Tcl_SetObjResult(interp, listObjPtr); + + } else if (Blt_ExprDoubleFromObj(interp, objv[2], &scalar) == TCL_OK) { + listObjPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL); + string = Tcl_GetString(objv[1]); + switch (string[0]) { + case '*': + for (i = 0; i < vPtr->length; i++) { + value = vPtr->valueArr[i] * scalar; + Tcl_ListObjAppendElement(interp, listObjPtr, + Tcl_NewDoubleObj(value)); + } + break; + + case '/': + for (i = 0; i < vPtr->length; i++) { + value = vPtr->valueArr[i] / scalar; + Tcl_ListObjAppendElement(interp, listObjPtr, + Tcl_NewDoubleObj(value)); + } + break; + + case '-': + for (i = 0; i < vPtr->length; i++) { + value = vPtr->valueArr[i] - scalar; + Tcl_ListObjAppendElement(interp, listObjPtr, + Tcl_NewDoubleObj(value)); + } + break; + + case '+': + for (i = 0; i < vPtr->length; i++) { + value = vPtr->valueArr[i] + scalar; + Tcl_ListObjAppendElement(interp, listObjPtr, + Tcl_NewDoubleObj(value)); + } + break; + } + Tcl_SetObjResult(interp, listObjPtr); + } else { + return TCL_ERROR; + } + return TCL_OK; } /* @@ -2266,39 +2266,39 @@ ArithOp(Vector *vPtr, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) *--------------------------------------------------------------------------- */ static Blt_OpSpec vectorInstOps[] = -{ - {"*", 1, ArithOp, 3, 3, "item",}, /*Deprecated*/ - {"+", 1, ArithOp, 3, 3, "item",}, /*Deprecated*/ - {"-", 1, ArithOp, 3, 3, "item",}, /*Deprecated*/ - {"/", 1, ArithOp, 3, 3, "item",}, /*Deprecated*/ - {"append", 1, AppendOp, 3, 0, "item ?item...?",}, - {"binread", 1, BinreadOp, 3, 0, "channel ?numValues? ?flags?",}, - {"clear", 1, ClearOp, 2, 2, "",}, - {"delete", 2, DeleteOp, 2, 0, "index ?index...?",}, - {"dup", 2, DupOp, 3, 0, "vecName",}, - {"expr", 1, InstExprOp, 3, 3, "expression",}, - {"fft", 1, FFTOp, 3, 0, "vecName ?switches?",}, - {"index", 3, IndexOp, 3, 4, "index ?value?",}, - {"inversefft",3, InverseFFTOp,4, 4, "vecName vecName",}, - {"length", 1, LengthOp, 2, 3, "?newSize?",}, - {"max", 2, MaxOp, 2, 2, "",}, - {"merge", 2, MergeOp, 3, 0, "vecName ?vecName...?",}, - {"min", 2, MinOp, 2, 2, "",}, - {"normalize", 3, NormalizeOp, 2, 3, "?vecName?",}, /*Deprecated*/ - {"notify", 3, NotifyOp, 3, 3, "keyword",}, - {"offset", 1, OffsetOp, 2, 3, "?offset?",}, - {"populate", 1, PopulateOp, 4, 4, "vecName density",}, - {"random", 4, RandomOp, 2, 2, "",}, /*Deprecated*/ - {"range", 4, RangeOp, 2, 4, "first last",}, - {"search", 3, SearchOp, 3, 5, "?-value? value ?value?",}, - {"seq", 3, SeqOp, 4, 5, "begin end ?num?",}, - {"set", 3, SetOp, 3, 3, "list",}, - {"simplify", 2, SimplifyOp, 2, 2, }, - {"sort", 2, SortOp, 2, 0, "?switches? ?vecName...?",}, - {"split", 2, SplitOp, 2, 0, "?vecName...?",}, - {"values", 3, ValuesOp, 2, 0, "?switches?",}, - {"variable", 3, MapOp, 2, 3, "?varName?",}, -}; + { + {"*", 1, (void*)ArithOp, 3, 3, "item",}, /*Deprecated*/ + {"+", 1, (void*)ArithOp, 3, 3, "item",}, /*Deprecated*/ + {"-", 1, (void*)ArithOp, 3, 3, "item",}, /*Deprecated*/ + {"/", 1, (void*)ArithOp, 3, 3, "item",}, /*Deprecated*/ + {"append", 1, (void*)AppendOp, 3, 0, "item ?item...?",}, + {"binread", 1, (void*)BinreadOp, 3, 0, "channel ?numValues? ?flags?",}, + {"clear", 1, (void*)ClearOp, 2, 2, "",}, + {"delete", 2, (void*)DeleteOp, 2, 0, "index ?index...?",}, + {"dup", 2, (void*)DupOp, 3, 0, "vecName",}, + {"expr", 1, (void*)InstExprOp, 3, 3, "expression",}, + {"fft", 1, (void*)FFTOp, 3, 0, "vecName ?switches?",}, + {"index", 3, (void*)IndexOp, 3, 4, "index ?value?",}, + {"inversefft",3, (void*)InverseFFTOp,4, 4, "vecName vecName",}, + {"length", 1, (void*)LengthOp, 2, 3, "?newSize?",}, + {"max", 2, (void*)MaxOp, 2, 2, "",}, + {"merge", 2, (void*)MergeOp, 3, 0, "vecName ?vecName...?",}, + {"min", 2, (void*)MinOp, 2, 2, "",}, + {"normalize", 3, (void*)NormalizeOp, 2, 3, "?vecName?",}, /*Deprecated*/ + {"notify", 3, (void*)NotifyOp, 3, 3, "keyword",}, + {"offset", 1, (void*)OffsetOp, 2, 3, "?offset?",}, + {"populate", 1, (void*)PopulateOp, 4, 4, "vecName density",}, + {"random", 4, (void*)RandomOp, 2, 2, "",}, /*Deprecated*/ + {"range", 4, (void*)RangeOp, 2, 4, "first last",}, + {"search", 3, (void*)SearchOp, 3, 5, "?-value? value ?value?",}, + {"seq", 3, (void*)SeqOp, 4, 5, "begin end ?num?",}, + {"set", 3, (void*)SetOp, 3, 3, "list",}, + {"simplify", 2, (void*)SimplifyOp, 2, 2, }, + {"sort", 2, (void*)SortOp, 2, 0, "?switches? ?vecName...?",}, + {"split", 2, (void*)SplitOp, 2, 0, "?vecName...?",}, + {"values", 3, (void*)ValuesOp, 2, 0, "?switches?",}, + {"variable", 3, (void*)MapOp, 2, 3, "?varName?",}, + }; static int nInstOps = sizeof(vectorInstOps) / sizeof(Blt_OpSpec); @@ -2306,17 +2306,17 @@ int Blt_Vec_InstCmd(ClientData clientData, Tcl_Interp* interp, int objc, Tcl_Obj* const objv[]) { - VectorCmdProc *proc; - Vector *vPtr = clientData; - - vPtr->first = 0; - vPtr->last = vPtr->length - 1; - proc = Blt_GetOpFromObj(interp, nInstOps, vectorInstOps, BLT_OP_ARG1, objc, - objv, 0); - if (proc == NULL) { - return TCL_ERROR; - } - return (*proc) (vPtr, interp, objc, objv); + VectorCmdProc* proc; + Vector* vPtr = (Vector*)clientData; + + vPtr->first = 0; + vPtr->last = vPtr->length - 1; + proc = (VectorCmdProc*)Blt_GetOpFromObj(interp, nInstOps, vectorInstOps, BLT_OP_ARG1, objc, + objv, 0); + if (proc == NULL) { + return TCL_ERROR; + } + return (*proc) (vPtr, interp, objc, objv); } @@ -2336,117 +2336,117 @@ char * Blt_Vec_VarTrace(ClientData clientData, Tcl_Interp* interp, const char *part1, const char *part2, int flags) { - Blt_VectorIndexProc *indexProc; - Vector *vPtr = clientData; - int first, last; - int varFlags; + Blt_VectorIndexProc *indexProc; + Vector* vPtr = (Vector*)clientData; + int first, last; + int varFlags; #define MAX_ERR_MSG 1023 - static char message[MAX_ERR_MSG + 1]; - - if (part2 == NULL) { - if (flags & TCL_TRACE_UNSETS) { - free((void*)(vPtr->arrayName)); - vPtr->arrayName = NULL; - if (vPtr->freeOnUnset) { - Blt_Vec_Free(vPtr); - } - } - return NULL; - } - if (Blt_Vec_GetIndexRange(interp, vPtr, part2, INDEX_ALL_FLAGS, &indexProc) - != TCL_OK) { - goto error; + static char message[MAX_ERR_MSG + 1]; + + if (part2 == NULL) { + if (flags & TCL_TRACE_UNSETS) { + free((void*)(vPtr->arrayName)); + vPtr->arrayName = NULL; + if (vPtr->freeOnUnset) { + Blt_Vec_Free(vPtr); + } } - first = vPtr->first, last = vPtr->last; - varFlags = TCL_LEAVE_ERR_MSG | (TCL_GLOBAL_ONLY & flags); - if (flags & TCL_TRACE_WRITES) { - double value; - Tcl_Obj *objPtr; - - if (first == SPECIAL_INDEX) { /* Tried to set "min" or "max" */ - return (char *)"read-only index"; - } - objPtr = Tcl_GetVar2Ex(interp, part1, part2, varFlags); - if (objPtr == NULL) { - goto error; - } - if (Blt_ExprDoubleFromObj(interp, objPtr, &value) != TCL_OK) { - if ((last == first) && (first >= 0)) { - /* Single numeric index. Reset the array element to - * its old value on errors */ - Tcl_SetVar2Ex(interp, part1, part2, objPtr, varFlags); - } - goto error; - } - if (first == vPtr->length) { - if (Blt_Vec_ChangeLength((Tcl_Interp *)NULL, vPtr, vPtr->length + 1) - != TCL_OK) { - return (char *)"error resizing vector"; - } - } - /* Set possibly an entire range of values */ - ReplicateValue(vPtr, first, last, value); - } else if (flags & TCL_TRACE_READS) { - double value; - Tcl_Obj *objPtr; - - if (vPtr->length == 0) { - if (Tcl_SetVar2(interp, part1, part2, "", varFlags) == NULL) { - goto error; - } - return NULL; - } - if (first == vPtr->length) { - return (char *)"write-only index"; - } - if (first == last) { - if (first >= 0) { - value = vPtr->valueArr[first]; - } else { - vPtr->first = 0, vPtr->last = vPtr->length - 1; - value = (*indexProc) ((Blt_Vector *) vPtr); - } - objPtr = Tcl_NewDoubleObj(value); - if (Tcl_SetVar2Ex(interp, part1, part2, objPtr, varFlags) == NULL) { - Tcl_DecrRefCount(objPtr); - goto error; - } - } else { - objPtr = GetValues(vPtr, first, last); - if (Tcl_SetVar2Ex(interp, part1, part2, objPtr, varFlags) == NULL) { - Tcl_DecrRefCount(objPtr); - goto error; - } - } - } else if (flags & TCL_TRACE_UNSETS) { - int i, j; - - if ((first == vPtr->length) || (first == SPECIAL_INDEX)) { - return (char *)"special vector index"; - } - /* - * Collapse the vector from the point of the first unset element. - * Also flush any array variable entries so that the shift is - * reflected when the array variable is read. - */ - for (i = first, j = last + 1; j < vPtr->length; i++, j++) { - vPtr->valueArr[i] = vPtr->valueArr[j]; - } - vPtr->length -= ((last - first) + 1); - if (vPtr->flush) { - Blt_Vec_FlushCache(vPtr); - } + return NULL; + } + if (Blt_Vec_GetIndexRange(interp, vPtr, part2, INDEX_ALL_FLAGS, &indexProc) + != TCL_OK) { + goto error; + } + first = vPtr->first, last = vPtr->last; + varFlags = TCL_LEAVE_ERR_MSG | (TCL_GLOBAL_ONLY & flags); + if (flags & TCL_TRACE_WRITES) { + double value; + Tcl_Obj *objPtr; + + if (first == SPECIAL_INDEX) { /* Tried to set "min" or "max" */ + return (char *)"read-only index"; + } + objPtr = Tcl_GetVar2Ex(interp, part1, part2, varFlags); + if (objPtr == NULL) { + goto error; + } + if (Blt_ExprDoubleFromObj(interp, objPtr, &value) != TCL_OK) { + if ((last == first) && (first >= 0)) { + /* Single numeric index. Reset the array element to + * its old value on errors */ + Tcl_SetVar2Ex(interp, part1, part2, objPtr, varFlags); + } + goto error; + } + if (first == vPtr->length) { + if (Blt_Vec_ChangeLength((Tcl_Interp *)NULL, vPtr, vPtr->length + 1) + != TCL_OK) { + return (char *)"error resizing vector"; + } + } + /* Set possibly an entire range of values */ + ReplicateValue(vPtr, first, last, value); + } else if (flags & TCL_TRACE_READS) { + double value; + Tcl_Obj *objPtr; + + if (vPtr->length == 0) { + if (Tcl_SetVar2(interp, part1, part2, "", varFlags) == NULL) { + goto error; + } + return NULL; + } + if (first == vPtr->length) { + return (char *)"write-only index"; + } + if (first == last) { + if (first >= 0) { + value = vPtr->valueArr[first]; + } else { + vPtr->first = 0, vPtr->last = vPtr->length - 1; + value = (*indexProc) ((Blt_Vector *) vPtr); + } + objPtr = Tcl_NewDoubleObj(value); + if (Tcl_SetVar2Ex(interp, part1, part2, objPtr, varFlags) == NULL) { + Tcl_DecrRefCount(objPtr); + goto error; + } } else { - return (char *)"unknown variable trace flag"; + objPtr = GetValues(vPtr, first, last); + if (Tcl_SetVar2Ex(interp, part1, part2, objPtr, varFlags) == NULL) { + Tcl_DecrRefCount(objPtr); + goto error; + } } - if (flags & (TCL_TRACE_UNSETS | TCL_TRACE_WRITES)) { - Blt_Vec_UpdateClients(vPtr); + } else if (flags & TCL_TRACE_UNSETS) { + int i, j; + + if ((first == vPtr->length) || (first == SPECIAL_INDEX)) { + return (char *)"special vector index"; } - Tcl_ResetResult(interp); - return NULL; + /* + * Collapse the vector from the point of the first unset element. + * Also flush any array variable entries so that the shift is + * reflected when the array variable is read. + */ + for (i = first, j = last + 1; j < vPtr->length; i++, j++) { + vPtr->valueArr[i] = vPtr->valueArr[j]; + } + vPtr->length -= ((last - first) + 1); + if (vPtr->flush) { + Blt_Vec_FlushCache(vPtr); + } + } else { + return (char *)"unknown variable trace flag"; + } + if (flags & (TCL_TRACE_UNSETS | TCL_TRACE_WRITES)) { + Blt_Vec_UpdateClients(vPtr); + } + Tcl_ResetResult(interp); + return NULL; error: - strncpy(message, Tcl_GetStringResult(interp), MAX_ERR_MSG); - message[MAX_ERR_MSG] = '\0'; - return message; + strncpy(message, Tcl_GetStringResult(interp), MAX_ERR_MSG); + message[MAX_ERR_MSG] = '\0'; + return message; } |