summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2013-10-22 09:18:19 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2013-10-22 09:18:19 (GMT)
commitfff622bfb179b6e2fb8d95991ae911a0f056774d (patch)
treea751c22a819556bae4f6a87bd30f792e123f44f5 /generic
parentc82e0deccaa9e752ec6ba8c53fe81d2a410ce529 (diff)
downloadtcl-fff622bfb179b6e2fb8d95991ae911a0f056774d.zip
tcl-fff622bfb179b6e2fb8d95991ae911a0f056774d.tar.gz
tcl-fff622bfb179b6e2fb8d95991ae911a0f056774d.tar.bz2
corrected trace printing
Diffstat (limited to 'generic')
-rw-r--r--generic/tclExecute.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 8470389..6357008 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -5272,13 +5272,13 @@ TEBCresume(
trim2 = 0;
}
if (trim1 == 0 && trim2 == 0) {
- TRACE_WITH_OBJ(("\"%.30s\" \"%.30s\" => ", valuePtr, value2Ptr),
- valuePtr);
+ TRACE_WITH_OBJ(("\"%.30s\" \"%.30s\" => ",
+ O2S(valuePtr), O2S(value2Ptr)), valuePtr);
NEXT_INST_F(1, 1, 0);
} else {
objResultPtr = Tcl_NewStringObj(string1+trim1, length-trim1-trim2);
- TRACE_WITH_OBJ(("\"%.30s\" \"%.30s\" => ", valuePtr, value2Ptr),
- objResultPtr);
+ TRACE_WITH_OBJ(("\"%.30s\" \"%.30s\" => ",
+ O2S(valuePtr), O2S(value2Ptr)), objResultPtr);
NEXT_INST_F(1, 2, 1);
}
case INST_STRTRIM_LEFT:
@@ -5288,13 +5288,13 @@ TEBCresume(
string1 = TclGetStringFromObj(valuePtr, &length);
trim1 = TclTrimLeft(string1, length, string2, length2);
if (trim1 == 0) {
- TRACE_WITH_OBJ(("\"%.30s\" \"%.30s\" => ", valuePtr, value2Ptr),
- valuePtr);
+ TRACE_WITH_OBJ(("\"%.30s\" \"%.30s\" => ",
+ O2S(valuePtr), O2S(value2Ptr)), valuePtr);
NEXT_INST_F(1, 1, 0);
} else {
objResultPtr = Tcl_NewStringObj(string1+trim1, length-trim1);
- TRACE_WITH_OBJ(("\"%.30s\" \"%.30s\" => ", valuePtr, value2Ptr),
- objResultPtr);
+ TRACE_WITH_OBJ(("\"%.30s\" \"%.30s\" => ",
+ O2S(valuePtr), O2S(value2Ptr)), objResultPtr);
NEXT_INST_F(1, 2, 1);
}
case INST_STRTRIM_RIGHT:
@@ -5304,9 +5304,13 @@ TEBCresume(
string1 = TclGetStringFromObj(valuePtr, &length);
trim2 = TclTrimRight(string1, length, string2, length2);
if (trim2 == 0) {
+ TRACE_WITH_OBJ(("\"%.30s\" \"%.30s\" => ",
+ O2S(valuePtr), O2S(value2Ptr)), valuePtr);
NEXT_INST_F(1, 1, 0);
} else {
objResultPtr = Tcl_NewStringObj(string1, length-trim2);
+ TRACE_WITH_OBJ(("\"%.30s\" \"%.30s\" => ",
+ O2S(valuePtr), O2S(value2Ptr)), objResultPtr);
NEXT_INST_F(1, 2, 1);
}
}