summaryrefslogtreecommitdiffstats
path: root/generic/tclInt.h
diff options
context:
space:
mode:
authordgp@users.sourceforge.net <dgp>2003-10-14 15:44:52 (GMT)
committerdgp@users.sourceforge.net <dgp>2003-10-14 15:44:52 (GMT)
commita0eead93fc730793b7931cd773b6344b23f16cb1 (patch)
treebdeafc412fed0f5ab5d71500254ea6d40c14174c /generic/tclInt.h
parent4f5a1e722174aa3b57e3937677dc7b6e652ed9cf (diff)
downloadtcl-a0eead93fc730793b7931cd773b6344b23f16cb1.zip
tcl-a0eead93fc730793b7931cd773b6344b23f16cb1.tar.gz
tcl-a0eead93fc730793b7931cd773b6344b23f16cb1.tar.bz2
* generic/tclBasic.c (TclAppendObjToErrorInfo): New internal routine
that appends a Tcl_Obj to the errorInfo, saving the caller the trouble of extracting the string rep. * generic/tclStringObj.c (TclAppendLimitedToObj): New internal routine that supports truncated appends with optional ellipsis marking. This single routine supports UTF-8-safe truncated appends needed in several places throughout the Tcl source code, mostly for error and stack messages. Clean fix for [Bug 760872]. * generic/tclInt.h: Declarations for new internal routines. * generic/tclCmdMZ.c: Updated callers to use the new routines. * generic/tclCompExpr.c: * generic/tclCompile.c: * generic/tclExecute.c: * generic/tclIOUtil.c: * generic/tclNamesp.c: * generic/tclObj.c: * generic/tclParseExpr.c: * generic/tclProc.c: * generic/tclStringObj.c: * mac/tclMacResource.c: * library/init.tcl: Updated ::errorInfo cleanup in [unknown] to reflect slight modifications to Tcl_LogCommandInfo(). Corrects failing init-4.* tests.
Diffstat (limited to 'generic/tclInt.h')
-rw-r--r--generic/tclInt.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h
index a844485..cbdbd10 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclInt.h,v 1.135 2003/09/29 22:51:50 dkf Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.136 2003/10/14 15:44:52 dgp Exp $
*/
#ifndef _TCLINT
@@ -1622,6 +1622,11 @@ extern char tclEmptyString;
*----------------------------------------------------------------
*/
+EXTERN void TclAppendLimitedToObj _ANSI_ARGS_((Tcl_Obj *objPtr,
+ CONST char *bytes, int length, int limit,
+ CONST char *ellipsis));
+EXTERN void TclAppendObjToErrorInfo _ANSI_ARGS_((
+ Tcl_Interp *interp, Tcl_Obj *objPtr));
EXTERN int TclArraySet _ANSI_ARGS_((Tcl_Interp *interp,
Tcl_Obj *arrayNameObj, Tcl_Obj *arrayElemObj));
EXTERN int TclCheckBadOctal _ANSI_ARGS_((Tcl_Interp *interp,