summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-11-16 08:45:54 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-11-16 08:45:54 (GMT)
commit5ff5853a6e9eac4dc0692fbacc53034b3fec1c58 (patch)
tree432d13aec8d0e6bd8ab24962224bffc8404b7674
parent346cce57455de92d12fcef5ea4115a9657458b84 (diff)
parent24d7fa64015b310278717d5f2462d84b7f7cd124 (diff)
downloadtcl-5ff5853a6e9eac4dc0692fbacc53034b3fec1c58.zip
tcl-5ff5853a6e9eac4dc0692fbacc53034b3fec1c58.tar.gz
tcl-5ff5853a6e9eac4dc0692fbacc53034b3fec1c58.tar.bz2
merge core-8-6-branch
-rw-r--r--doc/Object.32
-rw-r--r--doc/SaveResult.34
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/Object.3 b/doc/Object.3
index bf80fe2..eadd041 100644
--- a/doc/Object.3
+++ b/doc/Object.3
@@ -257,7 +257,7 @@ The \fBincr\fR command first gets an integer from \fIx\fR's value
by calling \fBTcl_GetIntFromObj\fR.
This procedure checks whether the value is already an integer value.
Since it is not, it converts the value
-by setting the value's \fIinternalRep.longValue\fR member
+by setting the value's internal representation
to the integer \fB123\fR
and setting the value's \fItypePtr\fR
to point to the integer Tcl_ObjType structure.
diff --git a/doc/SaveResult.3 b/doc/SaveResult.3
index b2270a2..6dd6cb6 100644
--- a/doc/SaveResult.3
+++ b/doc/SaveResult.3
@@ -54,9 +54,9 @@ is called, Tcl will take care of memory management.
.PP
The second triplet stores the snapshot of only the interpreter
result (not its complete state) in memory allocated by the caller.
-These routines are passed a pointer to a \fBTcl_SavedResult\fR structure
+These routines are passed a pointer to \fBTcl_SavedResult\fR
that is used to store enough information to restore the interpreter result.
-This structure can be allocated on the stack of the calling
+\fBTcl_SavedResult\fR can be allocated on the stack of the calling
procedure. These routines do not save the state of any error
information in the interpreter (e.g. the \fB\-errorcode\fR or
\fB\-errorinfo\fR return options, when an error is in progress).