diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-12-23 15:21:22 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-12-23 15:21:22 (GMT) |
| commit | 986cc9a1d8abe7ab0abc0971982fcb5f367cba18 (patch) | |
| tree | 030ee9cf12979f70eb1ad6b6b4a9f837d16df58e /generic/tclEnsemble.c | |
| parent | f69d34b905c9c0311a098b4a02ce45590e0c130f (diff) | |
| parent | 753a557ea2976254eafdc0a1711fcf3ec34d0b2d (diff) | |
| download | tcl-986cc9a1d8abe7ab0abc0971982fcb5f367cba18.zip tcl-986cc9a1d8abe7ab0abc0971982fcb5f367cba18.tar.gz tcl-986cc9a1d8abe7ab0abc0971982fcb5f367cba18.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclEnsemble.c')
| -rw-r--r-- | generic/tclEnsemble.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c index 0515408..9a0e7b0 100644 --- a/generic/tclEnsemble.c +++ b/generic/tclEnsemble.c @@ -3320,7 +3320,7 @@ CompileToInvokedCommand( Tcl_Token *tokPtr; Tcl_Obj *objPtr, **words; char *bytes; - int length, i, numWords, cmdLit, extraLiteralFlags = LITERAL_CMD_NAME; + int i, numWords, cmdLit, extraLiteralFlags = LITERAL_CMD_NAME; DefineLineInformation; /* @@ -3333,8 +3333,8 @@ CompileToInvokedCommand( for (i = 0, tokPtr = parsePtr->tokenPtr; i < parsePtr->numWords; i++, tokPtr = TokenAfter(tokPtr)) { if (i > 0 && i < numWords+1) { - bytes = TclGetStringFromObj(words[i-1], &length); - PushLiteral(envPtr, bytes, length); + bytes = TclGetString(words[i-1]); + PushLiteral(envPtr, bytes, words[i-1]->length); continue; } @@ -3362,11 +3362,11 @@ CompileToInvokedCommand( objPtr = Tcl_NewObj(); Tcl_GetCommandFullName(interp, (Tcl_Command) cmdPtr, objPtr); - bytes = Tcl_GetStringFromObj(objPtr, &length); + bytes = TclGetString(objPtr); if ((cmdPtr != NULL) && (cmdPtr->flags & CMD_VIA_RESOLVER)) { extraLiteralFlags |= LITERAL_UNSHARED; } - cmdLit = TclRegisterLiteral(envPtr, bytes, length, extraLiteralFlags); + cmdLit = TclRegisterLiteral(envPtr, bytes, objPtr->length, extraLiteralFlags); TclSetCmdNameObj(interp, TclFetchLiteral(envPtr, cmdLit), cmdPtr); TclEmitPush(cmdLit, envPtr); TclDecrRefCount(objPtr); |