TIP #330 IMPLEMENTATION

        * generic/tcl.h:        Remove the "result" and "freeProc" fields
        * generic/tclBasic.c:   from the default public declaration of the
        * generic/tclResult.c:  Tcl_Interp struct.  Code should no longer
        * generic/tclStubLib.c: be accessing these fields.  Access can be
        * generic/tclTest.c:    restored by defining USE_INTERP_RESULT, but
        * generic/tclUtil.c:    that should only be a temporary migration aid.
        *** POTENTIAL INCOMPATIBILITY ***

1 files changed, 9 insertions, 7 deletions

diff --git a/generic/tclTest.c b/generic/tclTest.c
index be7853e..b6230df 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclTest.c,v 1.124 2008/08/20 13:14:41 dkf Exp $
+ * RCS: @(#) $Id: tclTest.c,v 1.125 2008/10/02 20:59:45 dgp Exp $
  */
 
 #define TCL_TEST
@@ -1593,6 +1593,7 @@ TestdstringCmd(
     const char **argv)		/* Argument strings. */
 {
     int count;
+    Interp* iPtr = (Interp*) interp;
 
     if (argc < 2) {
 	wrongNumArgs:
@@ -1637,12 +1638,12 @@ TestdstringCmd(
 	    Tcl_SetResult(interp, "first0 first1 first2 first3 first4 first5 first6 first7 first8 first9\nsecond0 second1 second2 second3 second4 second5 second6 second7 second8 second9\nthird0 third1 third2 third3 third4 third5 third6 third7 third8 third9\nfourth0 fourth1 fourth2 fourth3 fourth4 fourth5 fourth6 fourth7 fourth8 fourth9\nfifth0 fifth1 fifth2 fifth3 fifth4 fifth5 fifth6 fifth7 fifth8 fifth9\nsixth0 sixth1 sixth2 sixth3 sixth4 sixth5 sixth6 sixth7 sixth8 sixth9\nseventh0 seventh1 seventh2 seventh3 seventh4 seventh5 seventh6 seventh7 seventh8 seventh9\n", TCL_STATIC);
 	} else if (strcmp(argv[2], "free") == 0) {
 	    Tcl_SetResult(interp, (char *) ckalloc(100), TCL_DYNAMIC);
-	    strcpy(interp->result, "This is a malloc-ed string");
+	    strcpy(iPtr->result, "This is a malloc-ed string");
 	} else if (strcmp(argv[2], "special") == 0) {
-	    interp->result = (char *) ckalloc(100);
-	    interp->result += 4;
-	    interp->freeProc = SpecialFree;
-	    strcpy(interp->result, "This is a specially-allocated string");
+	    iPtr->result = (char *) ckalloc(100);
+	    iPtr->result += 4;
+	    iPtr->freeProc = SpecialFree;
+	    strcpy(iPtr->result, "This is a specially-allocated string");
 	} else {
 	    Tcl_AppendResult(interp, "bad gresult option \"", argv[2],
 		    "\": must be staticsmall, staticlarge, free, or special",
@@ -4847,6 +4848,7 @@ TestsaveresultCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* The argument objects. */
 {
+    Interp* iPtr = (Interp*) interp;
     int discard, result, index;
     Tcl_SavedResult state;
     Tcl_Obj *objPtr;
@@ -4915,7 +4917,7 @@ TestsaveresultCmd(
 
     switch ((enum options) index) {
     case RESULT_DYNAMIC: {
-	int present = interp->freeProc == TestsaveresultFree;
+	int present = iPtr->freeProc == TestsaveresultFree;
 	int called = freeCount;
 
 	Tcl_AppendElement(interp, called ? "called" : "notCalled");