Import Tcl 8.6.12
This commit is contained in:
@@ -882,27 +882,19 @@ Tcl_WrongNumArgs(
|
||||
}
|
||||
|
||||
/*
|
||||
* Check to see if we are processing an ensemble implementation, and if so
|
||||
* rewrite the results in terms of how the ensemble was invoked.
|
||||
* If processing an an ensemble implementation, rewrite the results in
|
||||
* terms of how the ensemble was invoked.
|
||||
*/
|
||||
|
||||
if (iPtr->ensembleRewrite.sourceObjs != NULL) {
|
||||
int toSkip = iPtr->ensembleRewrite.numInsertedObjs;
|
||||
int toPrint = iPtr->ensembleRewrite.numRemovedObjs;
|
||||
Tcl_Obj *const *origObjv = iPtr->ensembleRewrite.sourceObjs;
|
||||
Tcl_Obj *const *origObjv = TclEnsembleGetRewriteValues(interp);
|
||||
|
||||
/*
|
||||
* Check for spelling fixes, and substitute the fixed values.
|
||||
*/
|
||||
|
||||
if (origObjv[0] == NULL) {
|
||||
origObjv = (Tcl_Obj *const *)origObjv[2];
|
||||
}
|
||||
|
||||
/*
|
||||
* We only know how to do rewriting if all the replaced objects are
|
||||
* Only do rewrite the command if all the replaced objects are
|
||||
* actually arguments (in objv) to this function. Otherwise it just
|
||||
* gets too complicated and we'd be better off just giving a slightly
|
||||
* gets too complicated and it's to just give a slightly
|
||||
* confusing error message...
|
||||
*/
|
||||
|
||||
@@ -1328,7 +1320,6 @@ PrintUsage(
|
||||
int width, numSpaces;
|
||||
#define NUM_SPACES 20
|
||||
static const char spaces[] = " ";
|
||||
char tmp[TCL_DOUBLE_SPACE];
|
||||
Tcl_Obj *msg;
|
||||
|
||||
/*
|
||||
@@ -1378,7 +1369,6 @@ PrintUsage(
|
||||
case TCL_ARGV_FLOAT:
|
||||
Tcl_AppendPrintfToObj(msg, "\n\t\tDefault value: %g",
|
||||
*((double *) infoPtr->dstPtr));
|
||||
sprintf(tmp, "%g", *((double *) infoPtr->dstPtr));
|
||||
break;
|
||||
case TCL_ARGV_STRING: {
|
||||
char *string = *((char **) infoPtr->dstPtr);
|
||||
|
||||
Reference in New Issue
Block a user