summaryrefslogtreecommitdiffstats
path: root/generic/tclAssembly.c
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2013-01-30 08:19:22 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2013-01-30 08:19:22 (GMT)
commit52368789306fda3ae17cf554333fa3adb617ba0a (patch)
tree10729608c91275933e64387693a867743563aab0 /generic/tclAssembly.c
parentbc3ea33b9b409c840682f5feb2b4efb4c78029f8 (diff)
parent75972077579a3e9bf1363e817260d11f17d60266 (diff)
downloadtcl-novem_no_startcmd.zip
tcl-novem_no_startcmd.tar.gz
tcl-novem_no_startcmd.tar.bz2
merge changes from trunknovem_no_startcmd
Diffstat (limited to 'generic/tclAssembly.c')
-rw-r--r--generic/tclAssembly.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c
index dbc5e36..300e3fd 100644
--- a/generic/tclAssembly.c
+++ b/generic/tclAssembly.c
@@ -703,12 +703,10 @@ TclNRAssembleObjCmd(
if (codePtr == NULL) {
Tcl_AddErrorInfo(interp, "\n (\"");
- Tcl_AddErrorInfo(interp, Tcl_GetString(objv[0]));
+ Tcl_AppendObjToErrorInfo(interp, objv[0]);
Tcl_AddErrorInfo(interp, "\" body, line ");
backtrace = Tcl_NewIntObj(Tcl_GetErrorLine(interp));
- Tcl_IncrRefCount(backtrace);
- Tcl_AddErrorInfo(interp, Tcl_GetString(backtrace));
- Tcl_DecrRefCount(backtrace);
+ Tcl_AppendObjToErrorInfo(interp, backtrace);
Tcl_AddErrorInfo(interp, ")");
return TCL_ERROR;
}
@@ -4114,11 +4112,11 @@ AddBasicBlockRangeToErrorInfo(
Tcl_AddErrorInfo(interp, "\n in assembly code between lines ");
lineNo = Tcl_NewIntObj(bbPtr->startLine);
Tcl_IncrRefCount(lineNo);
- Tcl_AddErrorInfo(interp, Tcl_GetString(lineNo));
+ Tcl_AppendObjToErrorInfo(interp, lineNo);
Tcl_AddErrorInfo(interp, " and ");
if (bbPtr->successor1 != NULL) {
Tcl_SetIntObj(lineNo, bbPtr->successor1->startLine);
- Tcl_AddErrorInfo(interp, Tcl_GetString(lineNo));
+ Tcl_AppendObjToErrorInfo(interp, lineNo);
} else {
Tcl_AddErrorInfo(interp, "end of assembly code");
}