summaryrefslogtreecommitdiffstats
path: root/generic/tclCompExpr.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2018-12-08 17:16:36 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2018-12-08 17:16:36 (GMT)
commit795fcf4f08882df1123a1ab6228a6cdf31fbb3eb (patch)
treece1eec15448d13d9dff53c233970313d8f68876e /generic/tclCompExpr.c
parentb5fe898956f0d887cbda3595f970480144e89073 (diff)
parenta7858d818d69719efc88a5de7dfcf85032e7540b (diff)
downloadtcl-795fcf4f08882df1123a1ab6228a6cdf31fbb3eb.zip
tcl-795fcf4f08882df1123a1ab6228a6cdf31fbb3eb.tar.gz
tcl-795fcf4f08882df1123a1ab6228a6cdf31fbb3eb.tar.bz2
Merge 8.7
Bring back Tcl_InitSubsystems to what Tcl_InitSubsystems was: without additional parameters or additional functionality
Diffstat (limited to 'generic/tclCompExpr.c')
-rw-r--r--generic/tclCompExpr.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index f8835b9..e96e264 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -2476,11 +2476,13 @@ CompileExprTree(
* already, then use it to share via the literal table.
*/
- if (objPtr->bytes) {
+ if (TclHasStringRep(objPtr)) {
Tcl_Obj *tableValue;
+ int numBytes;
+ const char *bytes
+ = Tcl_GetStringFromObj(objPtr, &numBytes);
- index = TclRegisterLiteral(envPtr, objPtr->bytes,
- objPtr->length, 0);
+ index = TclRegisterLiteral(envPtr, bytes, numBytes, 0);
tableValue = TclFetchLiteral(envPtr, index);
if ((tableValue->typePtr == NULL) &&
(objPtr->typePtr != NULL)) {