summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-10-27 20:06:36 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-10-27 20:06:36 (GMT)
commit6beda912ab0f8bd8784d7b1a973d3897c89b75c0 (patch)
treeaec9bfe9eee4551e972d61f3c51d4feca3e2a7a4 /generic
parentec332750d28a86537a3fc721decc3bb74d850dc9 (diff)
downloadtcl-6beda912ab0f8bd8784d7b1a973d3897c89b75c0.zip
tcl-6beda912ab0f8bd8784d7b1a973d3897c89b75c0.tar.gz
tcl-6beda912ab0f8bd8784d7b1a973d3897c89b75c0.tar.bz2
Convert INST_STR_CONCAT1 to the common `string cat` implementation.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclExecute.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index b19754e..fcf5ba9 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -2692,6 +2692,13 @@ TEBCresume(
opnd = TclGetUInt1AtPtr(pc+1);
+#if 1
+ if (TCL_OK != TclStringCatObjv(interp, opnd, &OBJ_AT_DEPTH(opnd-1),
+ &objResultPtr)) {
+ TRACE_ERROR(interp);
+ goto gotError;
+ }
+#else
/*
* Detect only-bytearray-or-null case.
*/
@@ -2828,6 +2835,7 @@ TEBCresume(
}
}
}
+#endif
TRACE_WITH_OBJ(("%u => ", opnd), objResultPtr);
NEXT_INST_V(2, opnd, 1);