Use C enums instead of clusters of #defines

2021-04-17 23:26:50 +00:00
114 changed files with 2356 additions and 3391 deletions
@@ -27,14 +27,14 @@ jobs:
        working-directory: unix
      - name: Package
        run: |
-          cp ../unix/tclsh tclsh${TCL_PATCHLEVEL}_snapshot
-          chmod +x tclsh${TCL_PATCHLEVEL}_snapshot
-          tar -cf tclsh${TCL_PATCHLEVEL}_snapshot.tar tclsh${TCL_PATCHLEVEL}_snapshot
+          cp ../unix/tclsh tclsh${TCL_PATCHLEVEL}_unofficial
+          chmod +x tclsh${TCL_PATCHLEVEL}_unofficial
+          tar -cf tclsh${TCL_PATCHLEVEL}_unofficial.tar tclsh${TCL_PATCHLEVEL}_unofficial
        working-directory: 1dist
      - name: Upload
        uses: actions/upload-artifact@v2
        with:
-          name: Tclsh ${{ env.TCL_PATCHLEVEL }} Linux single-file build (snapshot)
+          name: Tclsh ${{ env.TCL_PATCHLEVEL }} Linux single-file build (unofficial)
          path: 1dist/*.tar
  macos:
    name: macOS
@@ -74,8 +74,8 @@ jobs:
      - name: Package
        run: |
          mkdir contents
-          cp $TCL_BIN contents/tclsh${TCL_PATCHLEVEL}_snapshot
-          chmod +x contents/tclsh${TCL_PATCHLEVEL}_snapshot
+          cp $TCL_BIN contents/tclsh${TCL_PATCHLEVEL}_unofficial
+          chmod +x contents/tclsh${TCL_PATCHLEVEL}_unofficial
          cat > contents/README.txt <<EOF
          This is a single-file executable developer preview of Tcl $TCL_PATCHLEVEL

@@ -83,20 +83,20 @@ jobs:
          Use strictly at your own risk.

          To run it, you need to copy the executable out and run:
-              xattr -d com.apple.quarantine tclsh${TCL_PATCHLEVEL}_snapshot
+              xattr -d com.apple.quarantine tclsh${TCL_PATCHLEVEL}_unofficial
          to mark the executable as runnable on your machine.
          EOF
          $CREATE_DMG \
-              --volname "Tcl $TCL_PATCHLEVEL (snapshot)" \
+              --volname "Tcl $TCL_PATCHLEVEL (unofficial)" \
              --window-pos 200 120 \
              --window-size 800 400 \
-              "Tcl-$TCL_PATCHLEVEL-(snapshot).dmg" \
+              "Tcl-$TCL_PATCHLEVEL-(unofficial).dmg" \
              "contents/"
        working-directory: 1dist
      - name: Upload
        uses: actions/upload-artifact@v2
        with:
-          name: Tclsh ${{ env.TCL_PATCHLEVEL }} macOS single-file build (snapshot)
+          name: Tclsh ${{ env.TCL_PATCHLEVEL }} macOS single-file build (unofficial)
          path: 1dist/*.dmg
  win:
    name: Windows
@@ -129,10 +129,10 @@ jobs:
        working-directory: win
      - name: Set Executable Name
        run: |
-          cp ../win/tclsh*.exe tclsh${TCL_PATCHLEVEL}_snapshot.exe
+          cp ../win/tclsh*.exe tclsh${TCL_PATCHLEVEL}_unofficial.exe
        working-directory: 1dist
      - name: Upload
        uses: actions/upload-artifact@v2
        with:
-          name: Tclsh ${{ env.TCL_PATCHLEVEL }} Windows single-file build (snapshot)
-          path: '1dist/*_snapshot.exe'
+          name: Tclsh ${{ env.TCL_PATCHLEVEL }} Windows single-file build (unofficial)
+          path: '1dist/*_unofficial.exe'
@@ -308,22 +308,6 @@ The global variables \fBerrorInfo\fR and
 \fBerrorCode\fR are not modified by \fBTcl_ResetResult\fR
 so they continue to hold a record of information about the
 most recent error seen in an interpreter.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The result of \fBTcl_GetReturnOptions\fR will have at least one
-reference to it from the Tcl interpreter. If not using it immediately,
-you should use \fBTcl_IncrRefCount\fR to add your own reference.
-.PP
-The \fIoptions\fR argument to \fBTcl_SetReturnOptions\fR will have a
-reference added by the Tcl interpreter; it may safely be called with a
-zero-reference value.
-.PP
-\fBTcl_AppendObjToErrorInfo\fR only reads its \fIobjPtr\fR argument;
-it does not modify its reference count at all.
-.PP
-The \fIerrorObjPtr\fR argument to \fBTcl_SetObjErrorCode\fR will have a
-reference added by the Tcl interpreter; it may safely be called with a
-zero-reference value.
 .SH "SEE ALSO"
 Tcl_DecrRefCount(3), Tcl_IncrRefCount(3), Tcl_Interp(3), Tcl_ResetResult(3),
 Tcl_SetErrno(3), errorCode(n), errorInfo(n)
@@ -88,18 +88,6 @@ will lead to a \fBTCL_OK\fR return (and the boolean value 1),
 while the same value passed to \fBTcl_GetBoolean\fR will lead to
 a \fBTCL_ERROR\fR return.

-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_NewBooleanObj\fR always returns a zero-reference object, much
-like \fBTcl_NewObj\fR.
-.PP
-\fBTcl_SetBooleanObj\fR does not modify the reference count of its
-\fIobjPtr\fR argument, but does require that the object be unshared.
-.PP
-\fBTcl_GetBooleanFromObj\fR does not modify the reference count of its
-\fIobjPtr\fR argument; it only reads. Note however that this function
-may set the interpreter result; if that is the only place that
-is holding a reference to the object, it will be deleted.
 .SH "SEE ALSO"
 Tcl_NewObj, Tcl_IsShared, Tcl_GetBoolean

@@ -85,18 +85,6 @@ newly allocated bytes at the end of the array have arbitrary values.  If
 the length of array is reduced to the new length.  The return value is a
 pointer to the value's new array of bytes.

-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_NewByteArrayObj\fR always returns a zero-reference object, much
-like \fBTcl_NewObj\fR.
-.PP
-\fBTcl_SetByteArrayObj\fR and \fBTcl_SetByteArrayLength\fR do not modify the
-reference count of their \fIobjPtr\fR arguments, but do require that the
-object be unshared.
-.PP
-\fBTcl_GetByteArrayFromObj\fR does not modify the reference count of its
-\fIobjPtr\fR argument; it only reads.
-
 .SH "SEE ALSO"
 Tcl_GetStringFromObj, Tcl_NewObj, Tcl_IncrRefCount, Tcl_DecrRefCount

@@ -67,14 +67,6 @@ other procedures.  If an error is returned and this bit is set in
 result, where it can be retrieved with \fBTcl_GetObjResult\fR or
 \fBTcl_GetStringResult\fR.  If this flag bit is not set then no error
 message is left and the interpreter's result will not be modified.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_CancelEval\fR always decrements the reference count of its
-\fIresultObjPtr\fR argument (if that is non-NULL). It is expected to
-be usually called with an object with zero reference count. If the
-object is shared with some other location (including the Tcl
-evaluation stack) it should have its reference count incremented
-before calling this function.
 .SH "SEE ALSO"
 interp(n), Tcl_Eval(3),
 TIP 285
@@ -241,29 +241,6 @@ NULL if the whole chain is to be processed (the argument itself is never
 NULL); this variable may be updated by the callback. The \fImethodNameObj\fR
 parameter gives an unshared object containing the name of the method being
 invoked, as provided by the user; this object may be updated by the callback.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The \fIobjPtr\fR argument to \fBTcl_GetObjectFromObj\fR will not have its
-reference count manipulated, but this function may modify the interpreter
-result (to report any error) so interpreter results should not be fed into
-this without an additional reference being used.
-.PP
-The result of \fBTcl_GetObjectName\fR is a value that is owned by the object
-that is regenerated when this function is first called after the object is
-renamed.  If the value is to be retained at all, the caller should increment
-the reference count.
-.PP
-The first \fIobjc\fR values in the \fIobjv\fR argument to
-\fBTcl_NewObjectInstance\fR are the arguments to pass to the constructor. They
-must have a reference count of at least 1, and may have their reference counts
-changed during the running of the constructor. Constructors may modify the
-interpreter result, which consequently means that interpreter results should
-not be used as arguments without an additional reference being taken.
-.PP
-The \fImethodNameObj\fR argument to a Tcl_ObjectMapMethodNameProc
-implementation will be a value with a reference count of at least 1 where at
-least one reference is not held by the interpreter result. It is expected that
-method name mappers will only read their \fImethodNameObj\fR arguments.
 .SH "SEE ALSO"
 Method(3), oo::class(n), oo::copy(n), oo::define(n), oo::object(n)
 .SH KEYWORDS
@@ -243,16 +243,8 @@ any script evaluation mechanism will fail.
 .PP
 For a description of the Tcl interface to multiple interpreters, see
 \fIinterp(n)\fR.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_CreateAliasObj\fR increments the reference counts of the values
-in its \fIobjv\fR argument. (That reference lasts the same length of
-time as the owning alias.)
-.PP
-\fBTcl_GetAliasObj\fR returns (via its \fIobjvPtr\fR argument) a
-pointer to values that it holds a reference to.
 .SH "SEE ALSO"
-interp(n)
+interp

 .SH KEYWORDS
 alias, command, exposed commands, hidden commands, interpreter, invoke,
@@ -156,10 +156,6 @@ pointed to by \fIargTypesPointer\fR.
 \fBTcl_ListMathFuncs\fR returns a Tcl value containing a list of all
 the math functions defined in the interpreter whose name matches
 \fIpattern\fR.  The returned value has a reference count of zero.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_ListMathFuncs\fR always returns a zero-reference object, much
-like \fBTcl_NewObj\fR.
 .SH "SEE ALSO"
 expr(n), info(n), Tcl_CreateObjCommand(3), Tcl_Free(3), Tcl_NewListObj(3)
 .SH KEYWORDS
@@ -323,21 +323,6 @@ instead. The result from \fBTcl_GetCommandTypeName\fR will be exactly that
 string which was registered, and not a copy; use of a compile-time constant
 string is \fIstrongly recommended\fR.
 .VE "info cmdtype feature"
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-When the \fIproc\fR passed to \fBTcl_CreateObjCommand\fR is called,
-the values in its \fIobjv\fR argument will have a reference count of
-at least 1, with that guaranteed reference being from the Tcl
-evaluation stack. You should not call \fBTcl_DecrRefCount\fR on any of
-those values unless you call \fBTcl_IncrRefCount\fR on them first.
-Also, when the \fIproc\fR is called, the interpreter result is
-guaranteed to be an empty string value with a reference count of 1.
-.PP
-\fBTcl_GetCommandFullName\fR does not modify the reference count of its
-\fIobjPtr\fR argument, but does require that the object be unshared.
-.PP
-\fBTcl_GetCommandFromObj\fR does not modify the reference count of its
-\fIobjPtr\fR argument; it only reads.
 .SH "SEE ALSO"
 Tcl_CreateCommand(3), Tcl_ResetResult(3), Tcl_SetObjResult(3)
 .SH KEYWORDS
@@ -187,14 +187,5 @@ There is no way to be notified when the trace created by
 \fBTcl_CreateTrace\fR is deleted.  There is no way for the \fIproc\fR
 associated with a call to \fBTcl_CreateTrace\fR to abort execution of
 \fIcommand\fR.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-When the \fIproc\fR passed to \fBTcl_CreateObjTrace\fR is called,
-the values in its \fIobjv\fR argument will have a reference count of
-at least 1, with that guaranteed reference being from the Tcl
-evaluation stack. You should not call \fBTcl_DecrRefCount\fR on any of
-those values unless you call \fBTcl_IncrRefCount\fR on them first.
-.SH "SEE ALSO"
-trace(n)
 .SH KEYWORDS
 command, create, delete, interpreter, trace
@@ -190,73 +190,6 @@ path as this is easy to construct from repeated use of
 dictionaries are created for non-terminal keys where they do not
 already exist. With \fBTcl_DictObjRemoveKeyList\fR, all non-terminal
 keys must exist and have dictionaries as their values.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_NewDictObj\fR always returns a zero-reference object, much like
-\fBTcl_NewObj\fR.
-.PP
-\fBTcl_DictObjPut\fR does not modify the reference count of its \fIdictPtr\fR
-argument, but does require that the object be unshared.  If
-\fBTcl_DictObjPut\fR returns \fBTCL_ERROR\fR it does not manipulate any
-reference counts; but if it returns \fBTCL_OK\fR then it definitely increments
-the reference count of \fIvaluePtr\fR and may increment the reference count of
-\fIkeyPtr\fR; the latter case happens exactly when the key did not previously
-exist in the dictionary.  Note however that this function may set the
-interpreter result; if that is the only place that is holding a reference to
-an object, it will be deleted.
-.PP
-\fBTcl_DictObjGet\fR only reads from its \fIdictPtr\fR and \fIkeyPtr\fR
-arguments, and does not manipulate their reference counts at all.  If the
-\fIvaluePtrPtr\fR argument is not set to NULL (and the function doesn't return
-\fBTCL_ERROR\fR), it will be set to a value with a reference count of at least
-1, with a reference owned by the dictionary.  Note however that this function
-may set the interpreter result; if that is the only place that is holding a
-reference to an object, it will be deleted.
-.PP
-\fBTcl_DictObjRemove\fR does not modify the reference count of its
-\fIdictPtr\fR argument, but does require that the object be unshared. It does
-not manipulate the reference count of its \fIkeyPtr\fR argument at all.  Note
-however that this function may set the interpreter result; if that is the only
-place that is holding a reference to an object, it will be deleted.
-.PP
-\fBTcl_DictObjSize\fR does not modify the reference count of its \fIdictPtr\fR
-argument; it only reads.  Note however that this function may set the
-interpreter result; if that is the only place that is holding a reference to
-the dictionary object, it will be deleted.
-.PP
-\fBTcl_DictObjFirst\fR does not modify the reference count of its
-\fIdictPtr\fR argument; it only reads. The variables given by the
-\fIkeyPtrPtr\fR and \fIvaluePtrPtr\fR arguments (if not NULL) will be updated
-to contain references to the relevant values in the dictionary; their
-reference counts will be at least 1 (due to the dictionary holding a reference
-to them). It may also manipulate internal references; these are not exposed to
-user code, but require a matching \fBTcl_DictObjDone\fR call.  Note however
-that this function may set the interpreter result; if that is the only place
-that is holding a reference to the dictionary object, it will be deleted.
-.PP
-Similarly for \fBTcl_DictObjNext\fR; the variables given by the
-\fIkeyPtrPtr\fR and \fIvaluePtrPtr\fR arguments (if not NULL) will be updated
-to contain references to the relevant values in the dictionary; their
-reference counts will be at least 1 (due to the dictionary holding a reference
-to them).
-.PP
-\fBTcl_DictObjDone\fR does not manipulate (user-visible) reference counts.
-.PP
-\fBTcl_DictObjPutKeyList\fR is similar to \fBTcl_DictObjPut\fR; it does not
-modify the reference count of its \fIdictPtr\fR argument, but does require
-that the object be unshared. It may increment the reference count of any value
-passed in the \fIkeyv\fR argument, and will increment the reference count of
-the \fIvaluePtr\fR argument on success. It is recommended that values passed
-via \fIkeyv\fR and \fIvaluePtr\fR do not have zero reference counts.  Note
-however that this function may set the interpreter result; if that is the only
-place that is holding a reference to an object, it will be deleted.
-.PP
-\fBTcl_DictObjRemoveKeyList\fR is similar to \fBTcl_DictObjRemove\fR; it does
-not modify the reference count of its \fIdictPtr\fR argument, but does require
-that the object be unshared, and does not modify the reference counts of any
-of the values passed in the \fIkeyv\fR argument.  Note however that this
-function may set the interpreter result; if that is the only place that is
-holding a reference to an object, it will be deleted.
 .SH EXAMPLE
 Using the dictionary iteration interface to search determine if there
 is a key that maps to itself:
@@ -58,18 +58,6 @@ and if \fIinterp\fR is non-NULL, an error message is left in \fIinterp\fR.
 The \fBTcl_ObjType\fR of \fIobjPtr\fR may be changed to make subsequent
 calls to \fBTcl_GetDoubleFromObj\fR more efficient.
 '\" TODO: add discussion of treatment of NaN value
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_NewDoubleObj\fR always returns a zero-reference object, much
-like \fBTcl_NewObj\fR.
-.PP
-\fBTcl_SetDoubleObj\fR does not modify the reference count of its
-\fIobjPtr\fR argument, but does require that the object be unshared.
-.PP
-\fBTcl_GetDoubleFromObj\fR does not modify the reference count of its
-\fIobjPtr\fR argument; it only reads. Note however that this function
-may set the interpreter result; if that is the only place that
-is holding a reference to the object, it will be deleted.
 .SH "SEE ALSO"
 Tcl_NewObj, Tcl_DecrRefCount, Tcl_IncrRefCount, Tcl_GetObjResult
 .SH KEYWORDS
@@ -556,16 +556,5 @@ been loaded, it attempts to load an encoding file called \fIname\fB.enc\fR
 from the \fBencoding\fR subdirectory of each directory that Tcl searches
 for its script library.  If the encoding file exists, but is
 malformed, an error message will be left in \fIinterp\fR.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_GetEncodingFromObj\fR does not modify the reference count of its
-\fIobjPtr\fR argument; it only reads. Note however that this function may set
-the interpreter result; if that is the only place that is holding a reference
-to the object, it will be deleted.
-.PP
-\fBTcl_GetEncodingSearchPath\fR returns an object with a reference count of at
-least 1.
-.SH "SEE ALSO"
-encoding(n)
 .SH KEYWORDS
 utf, encoding, convert
@@ -209,27 +209,6 @@ namespace whose list of exported commands is used if both the mapping
 dictionary and the subcommand list properties are NULL. May be read
 using \fBTcl_GetEnsembleNamespace\fR which returns a Tcl result code
 (\fBTCL_OK\fR, or \fBTCL_ERROR\fR if the token does not refer to an ensemble).
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_FindEnsemble\fR does not modify the reference count of its
-\fIcmdNameObj\fR argument; it only reads. Note however that this function may
-set the interpreter result; if that is the only place that is holding a
-reference to the object, it will be deleted.
-.PP
-The ensemble property getters (\fBTcl_GetEnsembleMappingDict\fR,
-\fBTcl_GetEnsembleParameterList\fR, \fBTcl_GetEnsembleSubcommandList\fR, and
-\fBTcl_GetEnsembleUnknownHandler\fR) do not manipulate the reference count of
-the values they provide out; if those are non-NULL, they will have a reference
-count of at least 1.  Note that these functions may set the interpreter
-result.
-.PP
-The ensemble property setters (\fBTcl_SetEnsembleMappingDict\fR,
-\fBTcl_SetEnsembleParameterList\fR, \fBTcl_SetEnsembleSubcommandList\fR, and
-\fBTcl_SetEnsembleUnknownHandler\fR) will increment the reference count of the
-new value of the property they are given if they succeed (and decrement the
-reference count of the old value of the property, if relevant). If the
-property setters return \fBTCL_ERROR\fR, the reference count of the Tcl_Obj
-argument is left unchanged.
 .SH "SEE ALSO"
 namespace(n), Tcl_DeleteCommandFromToken(3)
 .SH KEYWORDS
@@ -207,20 +207,6 @@ the \fBreturn\fR, \fBbreak\fR, or \fBcontinue\fR command was
 invoked in an inappropriate place.
 This means that top-level applications should never see a return code
 from \fBTcl_EvalObjEx\fR other than \fBTCL_OK\fR or \fBTCL_ERROR\fR.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_EvalObjEx\fR and \fBTcl_GlobalEvalObj\fR both increment and
-decrement the reference count of their \fIobjPtr\fR argument; you must
-not pass them any value with a reference count of zero. They also
-manipulate the interpreter result; you must not count on the
-interpreter result to hold the reference count of any value over
-these calls.
-.PP
-\fBTcl_EvalObjv\fR may increment and decrement the reference count of
-any value passed via its \fIobjv\fR argument; you must not pass any
-value with a reference count of zero. This function also manipulates
-the interpreter result; you must not count on the interpreter result
-to hold the reference count of any value over this call.

 .SH KEYWORDS
 execute, file, global, result, script, value
@@ -98,15 +98,6 @@ containing the expression's value at \fI*resultPtrPtr\fR.
 In this case, the caller is responsible for calling
 \fBTcl_DecrRefCount\fR to decrement the value's reference count
 when it is finished with the value.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_ExprLongObj\fR, \fBTcl_ExprDoubleObj\fR,
-\fBTcl_ExprBooleanObj\fR, and \fBTcl_ExprObj\fR all increment and
-decrement the reference count of their \fIobjPtr\fR arguments; you
-must not pass them any value with a reference count of zero. They also
-manipulate the interpreter result; you must not count on the
-interpreter result to hold the reference count of any value over these
-calls.

 .SH "SEE ALSO"
 Tcl_ExprLong, Tcl_ExprDouble, Tcl_ExprBoolean, Tcl_ExprString, Tcl_GetObjResult
@@ -45,7 +45,7 @@ int
 \fBTcl_FSDeleteFile\fR(\fIpathPtr\fR)
 .sp
 int
-\fBTcl_FSRemoveDirectory\fR(\fIpathPtr, recursive, errorPtr\fR)
+\fBTcl_FSRemoveDirectory\fR(\fIpathPtr, int recursive, errorPtr\fR)
 .sp
 int
 \fBTcl_FSRenameFile\fR(\fIsrcPathPtr, destPathPtr\fR)
@@ -79,10 +79,10 @@ int
 \fBTcl_FSUtime\fR(\fIpathPtr, tval\fR)
 .sp
 int
-\fBTcl_FSFileAttrsGet\fR(\fIinterp, index, pathPtr, objPtrRef\fR)
+\fBTcl_FSFileAttrsGet\fR(\fIinterp, int index, pathPtr, objPtrRef\fR)
 .sp
 int
-\fBTcl_FSFileAttrsSet\fR(\fIinterp, index, pathPtr, objPtr\fR)
+\fBTcl_FSFileAttrsSet\fR(\fIinterp, int index, pathPtr, Tcl_Obj *objPtr\fR)
 .sp
 const char *const *
 \fBTcl_FSFileAttrStrings\fR(\fIpathPtr, objPtrRef\fR)
@@ -197,8 +197,6 @@ rename operation.
 .AP Tcl_Obj *destPathPtr in
 As for \fIpathPtr\fR, but used for the destination filename for a copy or
 rename operation.
-.AP int recursive in
-Whether to remove subdirectories and their contents as well.
 .AP "const char" *encodingName in
 The encoding of the data stored in the
 file identified by \fIpathPtr\fR and to be evaluated.
@@ -226,10 +224,6 @@ be joined together. If negative, then all elements are joined.
 .AP Tcl_Obj **errorPtr out
 In the case of an error, filled with a value containing the name of
 the file which caused an error in the various copy/rename operations.
-.AP int index in
-The index of the attribute in question.
-.AP Tcl_Obj *objPtr in
-The value to set in the operation.
 .AP Tcl_Obj **objPtrRef out
 Filled with a value containing the result of the operation.
 .AP Tcl_Obj *resultPtr out
@@ -1634,158 +1628,6 @@ typedef int \fBTcl_FSChdirProc\fR(
 The \fBTcl_FSChdirProc\fR changes the applications current working
 directory to the value specified in \fIpathPtr\fR. The function returns
 -1 on error or 0 on success.
-.SH "REFERENCE COUNT MANAGEMENT"
-.SS "PUBLIC API CALLS"
-.PP
-For all of these functions, \fIpathPtr\fR (including the \fIsrcPathPtr\fR and
-\fIdestPathPtr\fR arguments to \fBTcl_FSCopyFile\fR,
-\fBTcl_FSCopyDirectory\fR, and \fBTcl_FSRenameFile\fR, the \fIfirstPtr\fR and
-\fIsecondPtr\fR arguments to \fBTcl_FSEqualPaths\fR, and the \fIlinkNamePtr\fR
-and \fItoPtr\fR arguments to \fBTcl_FSLink\fR) must not be a zero reference
-count value; references may be retained in internal caches even for
-theoretically read-only operations.  These functions may also manipulate the
-interpreter result (if they take and are given a non-NULL \fIinterp\fR
-argument); you must not count on the interpreter result to hold the reference
-count of any argument value over these calls and should manage your own
-references there. However, references held by the arguments to a Tcl command
-\fIare\fR suitable for reference count management purposes for the duration of
-the implementation of that command.
-.PP
-The \fIerrorPtr\fR argument to \fBTcl_FSCopyDirectory\fR and
-\fBTcl_FSRemoveDirectory\fR is, when an object is set into it at all, set to
-an object with a non-zero reference count that should be passed to
-\fBTcl_DecrRefCount\fR when no longer needed.
-.PP
-\fBTcl_FSListVolumes\fR always returns a zero-reference object, much
-like \fBTcl_NewObj\fR.
-.PP
-\fBTcl_FSLink\fR always returns a non-zero-reference object when it is
-asked to read; you must call \fBTcl_DecrRefCount\fR on the object
-once you no longer need it.
-.PP
-\fBTcl_FSGetCwd\fR always returns a non-zero-reference object; you
-must call \fBTcl_DecrRefCount\fR on the object once you no longer need
-it.
-.PP
-\fBTcl_FSPathSeparator\fR always returns a zero-reference object, much
-like \fBTcl_NewObj\fR.
-.PP
-\fBTcl_FSJoinPath\fR always returns a zero-reference object, much
-like \fBTcl_NewObj\fR. Its \fIlistObj\fR argument can have any reference
-count; it is only read by this function.
-.PP
-\fBTcl_FSSplitPath\fR always returns a zero-reference object, much
-like \fBTcl_NewObj\fR.
-.PP
-\fBTcl_FSGetNormalizedPath\fR returns an object with a non-zero
-reference count where Tcl is the owner. You should increment its
-reference count if you want to retain it, but do not need to if you
-are just using the value immediately.
-.PP
-\fBTcl_FSJoinToPath\fR always returns a zero-reference object, much like
-\fBTcl_NewObj\fR. Its \fIbasePtr\fR argument follows the rules above for
-\fIpathPtr\fR, as do the values in the \fIobjv\fR argument.
-.PP
-\fBTcl_FSGetTranslatedPath\fR returns a non-zero-reference object (or
-NULL in the error case); you must call \fBTcl_DecrRefCount\fR on the
-object once you no longer need it.
-.PP
-\fBTcl_FSNewNativePath\fR always returns a zero-reference object (or
-NULL), much like \fBTcl_NewObj\fR.
-.PP
-\fBTcl_FSFileSystemInfo\fR always returns a zero-reference object (or
-NULL), much like \fBTcl_NewObj\fR.
-.PP
-The \fIobjPtr\fR and \fIobjPtrRef\fR arguments to \fBTcl_FSFileAttrsGet\fR,
-\fBTcl_FSFileAttrsSet\fR and \fBTcl_FSFileAttrStrings\fR are conventional Tcl
-values; the \fIobjPtr\fR argument will be read but not retained, and the
-\fIobjPtrRef\fR argument will have (on success) a zero-reference value written
-into it (as with \fBTcl_NewObj\fR). \fBTcl_FSFileAttrsGet\fR and
-\fBTcl_FSFileAttrsSet\fR may also manipulate the interpreter result.
-.PP
-The \fIresultPtr\fR argument to \fBTcl_FSMatchInDirectory\fR will not have its
-reference count manipulated, but it should have a reference count of no more
-than 1, and should not be the current interpreter result (as the function may
-overwrite that on error).
-.SS "VIRTUAL FILESYSTEM INTERFACE"
-.PP
-For all virtual filesystem implementation functions, any \fIpathPtr\fR
-arguments should not have their reference counts manipulated. If they take an
-\fIinterp\fR argument, they may set an error message in that, but must not
-manipulate the \fIpathPtr\fR afterwards. Aside from that:
-.TP
-\fIinternalToNormalizedProc\fR
-.
-This should return a zero-reference count value, as if allocated with
-\fBTcl_NewObj\fR.
-.TP
-\fInormalizePathProc\fR
-.
-Unlike with other API implementation functions, the \fIpathPtr\fR argument
-here is guaranteed to be an unshared object that should be updated. Its
-reference count should not be modified.
-.TP
-\fIfilesystemPathTypeProc\fR
-.
-The return value (if non-NULL) either has a reference count of zero or needs
-to be maintained (on a per-thread basis) by the filesystem. Tcl will increment
-the reference count of the value if it wishes to retain it.
-.TP
-\fIfilesystemSeparatorProc\fR
-.
-The return value should be a value with reference count of zero.
-.TP
-\fImatchInDirectoryProc\fR
-.
-The \fIresultPtr\fR argument should be assumed to hold a list that can be
-appended to (i.e., that has a reference count no greater than 1). No reference
-to it should be retained.
-.TP
-\fIlinkProc\fR
-.
-If \fItoPtr\fR is NULL, this should return a value with reference count 1 that
-has just been allocated and passed to \fBTcl_IncrRefCount\fR. If \fItoPtr\fR
-is not NULL, it should be returned on success.
-.TP
-\fIlistVolumesProc\fR
-.
-The result value should be a list (if non-NULL); it will have its reference
-count decremented once (with \fBTcl_DecrRefCount\fR) by Tcl once done.
-.TP
-\fIfileAttrStringsProc\fR
-.
-If the result is NULL, the \fIobjPtrRef\fR should have a list value written to
-it; that list will have its reference count both incremented (with
-\fBTcl_IncrRefCount\fR) and decremented (with \fBTcl_DecrRefCount\fR).
-.TP
-\fIfileAttrsGetProc\fR
-.
-The \fIobjPtrRef\fR argument should have (on non-error return) a zero
-reference count value written to it (allocated as if with \fBTcl_NewObj\fR).
-.TP
-\fIfileAttrsSetProc\fR
-.
-The \fIobjPtr\fR argument should either just be read or its reference count
-incremented to retain it.
-.TP
-\fIremoveDirectoryProc\fR
-.
-If an error is being reported, the problem filename reported via
-\fIerrorPtr\fR should be newly allocated (as if with \fBTcl_NewObj\fR) and
-have a reference count of 1 (i.e., have been passed to
-\fBTcl_IncrRefCount\fR).
-.TP
-\fIcopyDirectoryProc\fR
-.
-If an error is being reported, the problem filename reported via
-\fIerrorPtr\fR should be newly allocated (as if with \fBTcl_NewObj\fR) and
-have a reference count of 1 (i.e., have been passed to
-\fBTcl_IncrRefCount\fR).
-.TP
-\fIgetCwdProc\fR
-.
-The result will be passed to \fBTcl_DecrRefCount\fR by the implementation of
-\fBTcl_FSGetCwd\fR after it has been normalized.
 .SH "SEE ALSO"
 cd(n), file(n), filename(n), load(n), open(n), pwd(n), source(n), unload(n)
 .SH KEYWORDS
@@ -105,12 +105,6 @@ array of characters at \fItablePtr\fR+\fIoffset\fR bytes, etc.)
 This is particularly useful when processing things like
 \fBTk_ConfigurationSpec\fR, whose string keys are in the same place in
 each of several array elements.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_GetIndexFromObj\fR and \fBTcl_GetIndexFromObjStruct\fR do not modify
-the reference count of their \fIobjPtr\fR arguments; they only read. Note
-however that these functions may set the interpreter result; if that is the
-only place that is holding a reference to the object, it will be deleted.
 .SH "SEE ALSO"
 prefix(n), Tcl_WrongNumArgs(3)
 .SH KEYWORDS
@@ -330,19 +330,5 @@ typedef void \fBTcl_FreeHashEntryProc\fR(
 If this is NULL then \fBTcl_Free\fR is used to free the space for the entry.
 Tcl_Obj* keys use this function to decrement the reference count on the
 value.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-When a hash table is created with \fBTcl_InitCustomHashTable\fR, the
-\fBTcl_CreateHashEntry\fR function will increment the reference count of its
-\fIkey\fR argument when it creates a key (but not if there is an existing
-matching key). The reference count of the key will be decremented when the
-corresponding hash entry is deleted, whether with \fBTcl_DeleteHashEntry\fR or
-with \fBTcl_DeleteHashTable\fR. The \fBTcl_GetHashKey\fR function will return
-the key without further modifying its reference count.
-.PP
-Custom hash tables that use a Tcl_Obj* as key will generally need to do
-something similar in their \fIallocEntryProc\fR.
-.SH "SEE ALSO"
-Dict(3)
 .SH KEYWORDS
 hash table, key, lookup, search, value
@@ -2,7 +2,7 @@
 '\" Copyright (c) 1998-2000 Scriptics Corporation.
 '\" All rights reserved.
 '\"
-.TH Tcl_Init 3 8.7 Tcl "Tcl Library Procedures"
+.TH Tcl_Init 3 8.0 Tcl "Tcl Library Procedures"
 .so man.macros
 .BS
 .SH NAME
@@ -13,15 +13,10 @@ Tcl_Init \- find and source initialization script
 .sp
 int
 \fBTcl_Init\fR(\fIinterp\fR)
-.sp
-const char *
-\fBTcl_SetPreInitScript\fR(\fIscriptPtr\fR)
 .SH ARGUMENTS
 .AS Tcl_Interp *interp
 .AP Tcl_Interp *interp in
 Interpreter to initialize.
-.AP "const char" *scriptPtr in
-Address of the initialization script.
 .BE

 .SH DESCRIPTION
@@ -31,13 +26,6 @@ Address of the initialization script.
 path.
 .PP
 \fBTcl_Init\fR is typically called from \fBTcl_AppInit\fR procedures.
-.PP
-\fBTcl_SetPreInitScript\fR registers the pre-initialization script and
-returns the former (now replaced) script pointer.
-A value of \fINULL\fR may be passed to not register any script.
-The pre-initialization script is executed by \fBTcl_Init\fR before accessing
-the file system. The purpose is to typically prepare a custom file system
-(like an embedded zip-file) to be activated before the search.

 .SH "SEE ALSO"
 Tcl_AppInit, Tcl_Main
@@ -160,27 +160,6 @@ If anything later in the caller requires
 The \fBTcl_InitBignumFromDouble\fR routine is a utility procedure
 that extracts the integer part of \fIdoubleValue\fR and stores that
 integer value in the \fBmp_int\fR value \fIbigValue\fR.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_NewIntObj\fR, \fBTcl_NewLongObj\fR, \fBTcl_NewWideIntObj\fR, and
-\fBTcl_NewBignumObj\fR always return a zero-reference object, much like
-\fBTcl_NewObj\fR.
-.PP
-\fBTcl_SetIntObj\fR, \fBTcl_SetLongObj\fR, \fBTcl_SetWideIntObj\fR, and
-\fBTcl_SetBignumObj\fR do not modify the reference count of their \fIobjPtr\fR
-arguments, but do require that the object be unshared.
-.PP
-\fBTcl_GetIntFromObj\fR, \fBTcl_GetIntForIndex\fR, \fBTcl_GetLongFromObj\fR,
-\fBTcl_GetWideIntFromObj\fR, \fBTcl_GetBignumFromObj\fR, and
-\fBTcl_TakeBignumFromObj\fR do not modify the reference count of their
-\fIobjPtr\fR arguments; they only read. Note however that this function may
-set the interpreter result; if that is the only place that is holding a
-reference to the object, it will be deleted. Also note that if
-\fBTcl_TakeBignumFromObj\fR is given an unshared value, the value of that
-object may be modified; it is intended to be used when the value is
-.QW consumed
-by the operation at this point.
-
 .SH "SEE ALSO"
 Tcl_NewObj, Tcl_DecrRefCount, Tcl_IncrRefCount, Tcl_GetObjResult
 .SH KEYWORDS
@@ -246,31 +246,6 @@ with a NULL \fIobjvPtr\fR:
 result = \fBTcl_ListObjReplace\fR(interp, listPtr, first, count,
        0, NULL);
 .CE
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_NewListObj\fR always returns a zero-reference object, much like
-\fBTcl_NewObj\fR. If a non-NULL \fIobjv\fR argument is given, the reference
-counts of the first \fIobjc\fR values in that array are incremented.
-.PP
-\fBTcl_SetListObj\fR does not modify the reference count of its \fIobjPtr\fR
-argument, but does require that the object be unshared. The reference counts
-of the first \fIobjc\fR values in the \fIobjv\fR array are incremented.
-.PP
-\fBTcl_ListObjGetElements\fR, \fBTcl_ListObjIndex\fR, and
-\fBTcl_ListObjLength\fR do not modify the reference count of their
-\fIlistPtr\fR arguments; they only read. Note however that these three
-functions may set the interpreter result; if that is the only place that is
-holding a reference to the object, it will be deleted.
-.PP
-\fBTcl_ListObjAppendList\fR, \fBTcl_ListObjAppendElement\fR, and
-\fBTcl_ListObjReplace\fR require an unshared \fIlistPtr\fR argument.
-\fBTcl_ListObjAppendList\fR only reads its \fIelemListPtr\fR argument.
-\fBTcl_ListObjAppendElement\fR increments the reference count of its
-\fIobjPtr\fR on success. \fBTcl_ListObjReplace\fR increments the reference
-count of the first \fIobjc\fR values in the \fIobjv\fR array on success.  Note
-however that all these three functions may set the interpreter result on
-failure; if that is the only place that is holding a reference to the object,
-it will be deleted.
 .SH "SEE ALSO"
 Tcl_NewObj(3), Tcl_DecrRefCount(3), Tcl_IncrRefCount(3), Tcl_GetObjResult(3)
 .SH KEYWORDS
@@ -60,10 +60,6 @@ be unloaded with \fBTcl_FSUnloadFile\fR.
 the symbol cannot be found, it returns NULL and sets an error message in the
 given \fIinterp\fR (if that is non-NULL). Note that it is unsafe to use this
 operation on a handle that has been passed to \fBTcl_FSUnloadFile\fR.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The reference count of the \fIpathPtr\fR argument to \fBTcl_LoadFile\fR may be
-incremented. As such, it should not be given a zero reference count value.
 .SH "SEE ALSO"
 Tcl_FSLoadFile(3), Tcl_FSUnloadFile(3), load(n), unload(n)
 .SH KEYWORDS
@@ -258,32 +258,8 @@ also return TCL_ERROR; it should return TCL_OK otherwise.
 The \fIoldClientData\fR field to a Tcl_CloneProc gives the value from the
 method being copied from, and the \fInewClientDataPtr\fR field will point to
 a variable in which to write the value for the method being copied to.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The \fInameObj\fR argument to \fBTcl_NewMethod\fR and
-\fBTcl_NewInstanceMethod\fR (when non-NULL) will have its reference count
-incremented if there is no existing method with that name in that
-class/object.
-.PP
-The result of \fBTcl_MethodName\fR is a value with a reference count of at
-least one. It should not be modified without first duplicating it (with
-\fBTcl_DuplicateObj\fR).
-.PP
-The values in the first \fIobjc\fR values of the \fIobjv\fR argument to
-\fBTcl_ObjectContextInvokeNext\fR are assumed to have a reference count of at
-least 1; the containing array is assumed to endure until the next method
-implementation (see \fBnext\fR) returns. Be aware that methods may
-\fByield\fR; if any post-call actions are desired (e.g., decrementing the
-reference count of values passed in here), they must be scheduled with
-\fBTcl_NRAddCallback\fR.
-.PP
-The \fIcallProc\fR of the \fBTcl_MethodType\fR structure takes values of at
-least reference count 1 in its \fIobjv\fR argument. It may add its own
-references, but must not decrement the reference count below that level; the
-caller of the method will decrement the reference count once the method
-returns properly (and the reference will be held if the method \fByield\fRs).
 .SH "SEE ALSO"
-Class(3), NRE(3), oo::class(n), oo::define(n), oo::object(n)
+Class(3), oo::class(n), oo::define(n), oo::object(n)
 .SH KEYWORDS
 constructor, method, object

@@ -227,25 +227,6 @@ int
 Any function comprising a routine can push other functions, making it possible
 implement looping and sequencing constructs using the function stack.
 .PP
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The first \fIobjc\fR values in the \fIobjv\fR array passed to the functions
-\fBTcl_NRCallObjProc\fR, \fBTcl_NREvalObjv\fR, and \fBTcl_NRCmdSwap\fR should
-have a reference count of at least 1; they may have additional references
-taken during the execution.
-.PP
-The \fIobjPtr\fR argument to \fBTcl_NREvalObj\fR and \fBTcl_NRExprObj\fR
-should have a reference count of at least 1, and may have additional
-references taken to it during execution.
-.PP
-The \fIresultObj\fR argument to \fBTcl_NRExprObj\fR should be an unshared
-object.
-.PP
-Use \fBTcl_NRAddCallback\fR to schedule any required final decrementing of the
-reference counts of arguments to any of the other functions on this page, as
-with any other post-processing step in the non-recursive execution engine.
-.PP
-The
 .SH "SEE ALSO"
 Tcl_CreateCommand(3), Tcl_CreateObjCommand(3), Tcl_EvalObjEx(3), Tcl_GetCommandFromObj(3), Tcl_ExprObj(3)
 .SH KEYWORDS
@@ -46,10 +46,10 @@ Tcl_Command
 \fBTcl_FindCommand\fR(\fIinterp, name, contextNsPtr, flags\fR)
 .sp
 Tcl_Obj *
-\fBTcl_GetNamespaceUnknownHandler\fR(\fIinterp, nsPtr\fR)
+\fBTcl_GetNamespaceUnknownHandler(\fIinterp, nsPtr\fR)
 .sp
 int
-\fBTcl_SetNamespaceUnknownHandler\fR(\fIinterp, nsPtr, handlerPtr\fR)
+\fBTcl_SetNamespaceUnknownHandler(\fIinterp, nsPtr, handlerPtr\fR)
 .SH ARGUMENTS
 .AS Tcl_NamespaceDeleteProc allowOverwrite in/out
 .AP Tcl_Interp *interp in/out
@@ -159,18 +159,6 @@ for the namespace, or NULL if none is set.
 \fBTcl_SetNamespaceUnknownHandler\fR sets the unknown command handler for
 the namespace. If \fIhandlerPtr\fR is NULL, then the handler is reset to
 its default.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The \fIobjPtr\fR argument to \fBTcl_AppendExportList\fR should be an
-unshared object, as it will be modified by this function. The
-reference count of \fIobjPtr\fR will not be altered.
-.PP
-\fBTcl_GetNamespaceUnknownHandler\fR returns a possibly shared value.
-Its reference count should be incremented if the value is to be
-retained.
-.PP
-The \fIhandlerPtr\fR argument to \fBTcl_SetNamespaceUnknownHandler\fR
-will have its reference count incremented if it is a non-empty list.
 .SH "SEE ALSO"
 Tcl_CreateCommand(3), Tcl_ListObjAppendList(3), Tcl_SetVar(3)
 .SH KEYWORDS
@@ -283,12 +283,7 @@ to reduce storage requirements.
 Reference counting is used to determine when a value is
 no longer needed and can safely be freed.
 A value just created by \fBTcl_NewObj\fR or \fBTcl_NewStringObj\fR
-has \fIrefCount\fR 0, meaning that the object can often be given to a function
-like \fBTcl_SetObjResult\fR, \fBTcl_ListObjAppendElement\fR, or
-\fBTcl_DictObjPut\fR (as a value) without explicit reference management, all
-of which are common use cases. (The latter two require that the the target
-list or dictionary be well-formed, but that is often easy to arrange when the
-value is being initially constructed.)
+has \fIrefCount\fR 0.
 The macro \fBTcl_IncrRefCount\fR increments the reference count
 when a new reference to the value is created.
 The macro \fBTcl_DecrRefCount\fR decrements the count
@@ -248,28 +248,6 @@ The \fIfreeIntRepProc\fR implementation must not access the
 uses of that field during value deletion.  The defined tasks for
 the \fIfreeIntRepProc\fR have no need to consult the \fIbytes\fR
 member.
-.PP
-Note that if a subsidiary value has its reference count reduced to zero
-during the running of a \fIfreeIntRepProc\fR, that value may be not freed
-immediately, in order to limit stack usage. However, the value will be freed
-before the outermost current \fBTcl_DecrRefCount\fR returns.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The \fIobjPtr\fR argument to \fBTcl_AppendAllObjTypes\fR should be an unshared
-value; this function will not modify the reference count of that value, but
-will modify its contents. If \fIobjPtr\fR is not (interpretable as) a list,
-this function will set the interpreter result and produce an error; using an
-unshared empty value is strongly recommended.
-.PP
-The \fIobjPtr\fR argument to \fBTcl_ConvertToType\fR can have any non-zero
-reference count; this function will not modify the reference count, but may
-write to the interpreter result on error so values that originate from there
-should have an additional reference made before calling this.
-.PP
-None of the callback functions in the \fBTcl_ObjType\fR structure should
-modify the reference count of their arguments, but if the values contain
-subsidiary values (e.g., the elements of a list or the keys of a dictionary)
-then those subsidiary values may have their reference counts modified.
 .SH "SEE ALSO"
 Tcl_NewObj(3), Tcl_DecrRefCount(3), Tcl_IncrRefCount(3)
 .SH KEYWORDS
@@ -641,24 +641,6 @@ the channel was created with \fBTcl_OpenFileChannel\fR,
 \fBTcl_OpenCommandChannel\fR, or \fBTcl_MakeFileChannel\fR.  Other
 channel types may return a different type of handle on Windows
 platforms.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The \fIreadObjPtr\fR argument to \fBTcl_ReadChars\fR must be an unshared
-value; it will be modified by this function.  Using the interpreter result for
-this purpose is \fIstrongly\fR not recommended; the preferred pattern is to
-use a new value from \fBTcl_NewObj\fR to receive the data and only to pass it
-to \fBTcl_SetObjResult\fR if this function succeeds.
-.PP
-The \fIlineObjPtr\fR argument to \fBTcl_GetsObj\fR must be an unshared value;
-it will be modified by this function.  Using the interpreter result for this
-purpose is \fIstrongly\fR not recommended; the preferred pattern is to use a
-new value from \fBTcl_NewObj\fR to receive the data and only to pass it to
-\fBTcl_SetObjResult\fR if this function succeeds.
-.PP
-The \fIwriteObjPtr\fR argument to \fBTcl_WriteObj\fR should be a value with
-any reference count. This function will not modify the reference count. Using
-the interpreter result without adding an additional reference to it is not
-recommended.
 .SH "SEE ALSO"
 DString(3), fconfigure(n), filename(n), fopen(3), Tcl_CreateChannel(3)
 .SH KEYWORDS
@@ -189,12 +189,6 @@ will be stored at \fIdstPtr\fR; the string inside will have a lifetime linked
 to the lifetime of the string representation of the argument value that it
 came from, and so should be copied if it needs to be retained. The
 \fIsrcPtr\fR and \fIclientData\fR fields are ignored.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The values in the \fIobjv\fR argument to \fBTcl_ParseArgsObjv\fR will not have
-their reference counts modified by this function. The interpreter result may
-be modified on error; the values passed should not be the interpreter result
-with no further reference added.
 .SH "SEE ALSO"
 Tcl_GetIndexFromObj(3), Tcl_Main(3), Tcl_CreateObjCommand(3)
 .SH KEYWORDS
@@ -191,7 +191,6 @@ code with one of the values \fBTCL_OK\fR, \fBTCL_ERROR\fR,
 some other integer value originating in an extension.
 In addition, a result value or error message is left in \fIinterp\fR's
 result; it can be retrieved using \fBTcl_GetObjResult\fR.
-.SS "DEPRECATED FUNCTIONS"
 .PP
 \fBTcl_EvalTokens\fR differs from \fBTcl_EvalTokensStandard\fR only in
 the return convention used: it returns the result in a new Tcl_Obj.
@@ -464,12 +463,5 @@ There are additional fields in the Tcl_Parse structure after the
 \fBTcl_ParseCommand\fR, \fBTcl_ParseExpr\fR, \fBTcl_ParseBraces\fR,
 \fBTcl_ParseQuotedString\fR, and \fBTcl_ParseVarName\fR; they should not be
 referenced by code outside of these procedures.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The result of \fBTcl_EvalTokens\fR is an unshared value with a reference count
-of 1; the caller of that function should call \fBTcl_DecrRefCount\fR on the
-result value to dispose of it. (The equivalent with
-\fBTcl_EvalTokenStandard\fR is just the interpreter result, which can be
-retrieved with \fBTcl_GetObjResult\fR.)
 .SH KEYWORDS
 backslash substitution, braces, command, expression, parse, token, variable substitution
@@ -91,10 +91,6 @@ functions.
 \fBTcl_PkgRequireProc\fR is the form of \fBpackage require\fR handling
 multiple requirements. The other forms are present for backward
 compatibility and translate their invocations to this form.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The requirements values given (in the \fIobjv\fR argument) to
-\fBTcl_PkgRequireProc\fR must have non-zero reference counts.
 .SH KEYWORDS
 package, present, provide, require, version
 .SH "SEE ALSO"
@@ -44,12 +44,6 @@ allow the user to re-issue recently invoked commands.
 If the \fIflags\fR argument contains the \fBTCL_NO_EVAL\fR bit then
 the command is recorded without being evaluated.

-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The reference count of the \fIcmdPtr\fR argument to \fBTcl_RecordAndEvalObj\fR
-must be at least 1. This function will modify the interpreter result; do not
-use an existing result as \fIcmdPtr\fR directly without incrementing its
-reference count.
 .SH "SEE ALSO"
 Tcl_EvalObjEx, Tcl_GetObjResult

@@ -377,22 +377,6 @@ If no match was found, then it indicates the earliest point at which a
 match might occur if additional text is appended to the string.  If it
 is no match is possible even with further text, this field will be set
 to \-1.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The \fItextObj\fR and \fIpatObj\fR arguments to \fBTcl_RegExpMatchObj\fR must
-have reference counts of at least 1.  Note however that this function may set
-the interpreter result; neither argument should be the direct interpreter
-result without an additional reference being taken.
-.PP
-The \fIpatObj\fR argument to \fBTcl_GetRegExpFromObj\fR must have a reference
-count of at least 1.  Note however that this function may set the interpreter
-result; the argument should not be the direct interpreter result without an
-additional reference being taken.
-.PP
-The \fItextObj\fR argument to \fBTcl_RegExpExecObj\fR must have a reference
-count of at least 1.  Note however that this function may set the interpreter
-result; the argument should not be the direct interpreter result without an
-additional reference being taken.
 .SH "SEE ALSO"
 re_syntax(n)
 .SH KEYWORDS
@@ -35,20 +35,20 @@ Refers to the Tcl interpreter whose bypass area is accessed.
 .AP Tcl_Obj* msg in
 Error message put into a bypass area. A list of return options and values,
 followed by a string message. Both message and the option/value information
-are optional. This \fImust\fR be a well-formed list.
+are optional.
 .AP Tcl_Obj** msgPtr out
 Reference to a place where the message stored in the accessed bypass area can
 be stored in.
 .BE
 .SH DESCRIPTION
 .PP
-The standard definition of a Tcl channel driver does not permit the direct
+The current definition of a Tcl channel driver does not permit the direct
 return of arbitrary error messages, except for the setting and retrieval of
 channel options. All other functions are restricted to POSIX error codes.
 .PP
 The functions described here overcome this limitation. Channel drivers are
 allowed to use \fBTcl_SetChannelError\fR and \fBTcl_SetChannelErrorInterp\fR
-to place arbitrary error messages in \fIbypass areas\fR defined for channels
+to place arbitrary error messages in \fBbypass areas\fR defined for channels
 and interpreters. And the generic I/O layer uses \fBTcl_GetChannelError\fR and
 \fBTcl_GetChannelErrorInterp\fR to look for messages in the bypass areas and
 arrange for their return as errors. The POSIX error codes set by a driver are
@@ -134,15 +134,6 @@ leave all their error information in the interpreter result.
 .ta 1.9i 4i
 \fBTcl_Close\fR	\fBTcl_UnstackChannel\fR	\fBTcl_UnregisterChannel\fR
 .DE
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The \fImsg\fR argument to \fBTcl_SetChannelError\fR and
-\fBTcl_SetChannelErrorInterp\fR, if not NULL, may have any reference count;
-these functions will copy.
-.PP
-\fBTcl_GetChannelError\fR and \fBTcl_GetChannelErrorInterp\fR write a value
-reference into their \fImsgPtr\fR, but do not manipulate its reference count.
-The reference count will be at least 1 (unless the reference is NULL).
 .SH "SEE ALSO"
 Tcl_Close(3), Tcl_OpenFileChannel(3), Tcl_SetErrno(3)
 .SH KEYWORDS
@@ -239,33 +239,6 @@ typedef void \fBTcl_FreeProc\fR(
 .PP
 When \fIfreeProc\fR is called, its \fIblockPtr\fR will be set to
 the value of \fIresult\fR passed to \fBTcl_SetResult\fR.
-
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The interpreter result is one of the main places that owns references to
-values, along with the bytecode execution stack, argument lists, variables,
-and the list and dictionary collection values.
-.PP
-\fBTcl_SetObjResult\fR takes a value with an arbitrary reference count
-\fI(specifically including zero)\fR and guarantees to increment the reference
-count. If code wishes to continue using the value after setting it as the
-result, it should add its own reference to it with \fBTcl_IncrRefCount\fR.
-.PP
-\fBTcl_GetObjResult\fR returns the current interpreter result value. This will
-have a reference count of at least 1. If the caller wishes to keep the
-interpreter result value, it should increment its reference count.
-.PP
-\fBTcl_GetStringResult\fR does not manipulate reference counts, but the string
-it returns is owned by (and has a lifetime controlled by) the current
-interpreter result value; it should be copied instead of being relied upon to
-persist after the next Tcl API call, as most Tcl operations can modify the
-interpreter result.
-.PP
-\fBTcl_SetResult\fR, \fBTcl_AppendResult\fR, \fBTcl_AppendResultVA\fR,
-\fBTcl_AppendElement\fR, and \fBTcl_ResetResult\fR all modify the interpreter
-result. They may cause the old interpreter result to have its reference count
-decremented and a new interpreter result to be allocated. After they have been
-called, the reference count of the interpreter result is guaranteed to be 1.
 .SH "SEE ALSO"
 Tcl_AddErrorInfo, Tcl_CreateObjCommand, Tcl_SetErrorCode, Tcl_Interp,
 Tcl_GetReturnOptions
@@ -242,27 +242,6 @@ but the array remains.
 If an array name is specified without an index, then the entire
 array is removed.

-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The result of \fBTcl_SetVar2Ex\fR, \fBTcl_ObjSetVar2\fR, \fBTcl_GetVar2Ex\fR,
-and \fBTcl_ObjGetVar2\fR is (if non-NULL) a value with a reference of at least
-1, where that reference is held by the variable that the function has just
-operated upon.
-.PP
-The \fInewValuePtr\fR argument to \fBTcl_SetVar2Ex\fR and \fBTcl_ObjSetVar2\fR
-may be an arbitrary reference count value; its reference count will be
-incremented on success. However, it is recommended to not use a zero reference
-count value, as that makes correct handling of the error case tricky.
-.PP
-The \fIpart1\fR argument to \fBTcl_ObjSetVar2\fR and \fBTcl_ObjGetVar2\fR can
-have any reference count; these functions never modify it. It is recommended
-to not use a zero reference count for this argument.
-.PP
-The \fIpart2\fR argument to \fBTcl_ObjSetVar2\fR and \fBTcl_ObjGetVar2\fR, if
-non-NULL, should not have a zero reference count as these functions may
-retain a reference to it (particularly when it is used to create an array
-element that did not previously exist).
-
 .SH "SEE ALSO"
 Tcl_GetObjResult, Tcl_GetStringResult, Tcl_TraceVar

@@ -383,33 +383,6 @@ white space, then that value is ignored entirely. This white-space
 removal was added to make the output of the \fBconcat\fR command
 cleaner-looking. \fBTcl_ConcatObj\fR returns a pointer to a
 newly-created value whose ref count is zero.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_NewStringObj\fR, \fBTcl_NewUnicodeObj\fR, \fBTcl_Format\fR,
-\fBTcl_ObjPrintf\fR, and \fBTcl_ConcatObj\fR always return a zero-reference
-object, much like \fBTcl_NewObj\fR.
-.PP
-\fBTcl_GetStringFromObj\fR, \fBTcl_GetString\fR, \fBTcl_GetUnicodeFromObj\fR,
-\fBTcl_GetUnicode\fR, \fBTcl_GetUniChar\fR, \fBTcl_GetCharLength\fR, and
-\fBTcl_GetRange\fR all only work with an existing value; they do not
-manipulate its reference count in any way.
-.PP
-\fBTcl_SetStringObj\fR, \fBTcl_SetUnicodeObj\fR, \fBTcl_AppendToObj\fR,
-\fBTcl_AppendUnicodeToObj\fR, \fBTcl_AppendObjToObj\fR,
-\fBTcl_AppendStringsToObj\fR, \fBTcl_AppendStringsToObjVA\fR,
-\fBTcl_AppendLimitedToObj\fR, \fBTcl_AppendFormatToObj\fR,
-\fBTcl_AppendPrintfToObj\fR, \fBTcl_SetObjLength\fR, and
-\fBTcl_AttemptSetObjLength\fR and require their \fIobjPtr\fR to be an unshared
-value (i.e, a reference count no more than 1) as they will modify it.
-.PP
-Additional arguments to the above functions (the \fIappendObjPtr\fR argument
-to \fBTcl_AppendObjToObj\fR, values in the \fIobjv\fR argument to
-\fBTcl_Format\fR, \fBTcl_AppendFormatToObj\fR, and \fBTcl_ConcatObj\fR) can
-have any reference count, but reference counts of zero are not recommended.
-.PP
-\fBTcl_Format\fR and \fBTcl_AppendFormatToObj\fR may modify the interpreter
-result, which involves changing the reference count of a value.
-
 .SH "SEE ALSO"
 Tcl_NewObj(3), Tcl_IncrRefCount(3), Tcl_DecrRefCount(3), format(n), sprintf(3)
 .SH KEYWORDS
@@ -62,13 +62,6 @@ result of the whole substitution on \fIobjPtr\fR will be truncated at
 the point immediately before the start of the command substitution,
 and no characters will be added to the result or substitutions
 performed after that point.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The \fIobjPtr\fR argument to \fBTcl_SubstObj\fR must not have a reference
-count of zero. This function modifies the interpreter result, both on success
-and on failure; the result of this function on success is exactly the current
-interpreter result. Successful results should have their reference count
-incremented if they are to be retained.
 .SH "SEE ALSO"
 subst(n)
 .SH KEYWORDS
@@ -262,31 +262,6 @@ file named by the \fBfilename\fR field was modified. Suitable for use with
 .
 The type of the uncompressed data (either \fBbinary\fR or \fBtext\fR) if
 known.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_ZlibDeflate\fR and \fBTcl_ZlibInflate\fR take a value with arbitrary
-reference count for their \fIdataObj\fR and \fIdictObj\fR arguments (the
-latter often being NULL instead), and set the interpreter result with their
-output value (or an error).  The existing interpreter result should not be
-passed as any argument value unless an additional reference is held.
-.PP
-\fBTcl_ZlibStreamInit\fR takes a value with arbitrary reference count for its
-\fIdictObj\fR argument; it only reads from it. The existing interpreter result
-should not be passed unless an additional reference is held.
-.PP
-\fBTcl_ZlibStreamGetCommandName\fR returns a zero reference count value, much
-like \fBTcl_NewObj\fR.
-.PP
-The \fIdataObj\fR argument to \fBTcl_ZlibStreamPut\fR is a value with
-arbitrary reference count; it is only ever read from.
-.PP
-The \fIdataObj\fR argument to \fBTcl_ZlibStreamGet\fR is an unshared value
-(see \fBTcl_IsShared\fR) that will be updated by the function.
-.PP
-The \fIcompDict\fR argument to \fBTcl_ZlibStreamSetCompressionDictionary\fR,
-if non-NULL, may be duplicated or may have its reference count incremented.
-Using a zero reference count value is not recommended.
-
 .SH "PORTABILITY NOTES"
 These functions will fail gracefully if Tcl is not linked with the zlib
 library.
@@ -201,15 +201,6 @@ procedure (if any) returns, \fBTcl_Main\fR will also evaluate
 the \fBexit\fR command.
 .PP
 \fBTcl_Main\fR can not be used in stub-enabled extensions.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-\fBTcl_SetStartupScript\fR takes a value (or NULL) for its \fIpath\fR
-argument, and will increment the reference count of it.
-.PP
-\fBTcl_GetStartupScript\fR returns a value with reference count at least 1, or
-NULL. It's \fIencodingPtr\fR is also used (if non-NULL) to return a value with
-a reference count at least 1, or NULL. In both cases, the owner of the values
-is the current thread.
 .SH "SEE ALSO"
 tclsh(1), Tcl_GetStdChannel(3), Tcl_StandardChannels(3), Tcl_AppInit(3),
 exit(n), encoding(n)
@@ -359,14 +359,6 @@ Traces on a variable are always removed whenever the variable
 is deleted;  the only time \fBTCL_TRACE_DESTROYED\fR is not set is for
 a whole-array trace invoked when only a single element of an
 array is unset.
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-When a \fIproc\fR callback is invoked, and that callback was installed with
-the \fBTCL_TRACE_RESULT_OBJECT\fR flag, the result of the callback is a
-Tcl_Obj reference when there is an error. The result will have its reference
-count decremented once when no longer needed, or may have additional
-references made to it (e.g., by setting it as the interpreter result with
-\fBTcl_SetObjResult\fR).
 .SH BUGS
 .PP
 Array traces are not yet integrated with the Tcl \fBinfo exists\fR command,
@@ -8,7 +8,7 @@
 .so man.macros
 .BS
 .SH NAME
-Tcl_UniCharIsAlnum, Tcl_UniCharIsAlpha, Tcl_UniCharIsControl, Tcl_UniCharIsDigit, Tcl_UniCharIsGraph, Tcl_UniCharIsLower, Tcl_UniCharIsPrint, Tcl_UniCharIsPunct, Tcl_UniCharIsSpace, Tcl_UniCharIsUpper, Tcl_UniCharIsUnicode, Tcl_UniCharIsWordChar \- routines for classification of Tcl_UniChar characters
+Tcl_UniCharIsAlnum, Tcl_UniCharIsAlpha, Tcl_UniCharIsControl, Tcl_UniCharIsDigit, Tcl_UniCharIsGraph, Tcl_UniCharIsLower, Tcl_UniCharIsPrint, Tcl_UniCharIsPunct, Tcl_UniCharIsSpace, Tcl_UniCharIsUpper, Tcl_UniCharIsWordChar \- routines for classification of Tcl_UniChar characters
 .SH SYNOPSIS
 .nf
 \fB#include <tcl.h>\fR
@@ -44,9 +44,6 @@ int
 \fBTcl_UniCharIsUpper\fR(\fIch\fR)
 .sp
 int
-\fBTcl_UniCharIsUnicode\fR(\fIch\fR)
-.sp
-int
 \fBTcl_UniCharIsWordChar\fR(\fIch\fR)
 .SH ARGUMENTS
 .AS int ch
@@ -84,9 +81,6 @@ with the various routines.
 .PP
 \fBTcl_UniCharIsUpper\fR tests if the character is an uppercase Unicode character.
 .PP
-\fBTcl_UniCharIsUnicode\fR tests if the character is a Unicode character, not being
-a surrogate or noncharacter.
-.PP
 \fBTcl_UniCharIsWordChar\fR tests if the character is alphanumeric or
 a connector punctuation mark.

@@ -73,12 +73,6 @@ is now an \fIindexObject\fR because it was passed to
 .CS
 wrong # args: should be "foo barfly fileName count"
 .CE
-.SH "REFERENCE COUNT MANAGEMENT"
-.PP
-The \fIobjv\fR argument to \fBTcl_WrongNumArgs\fR should be the exact
-arguments passed to the command or method implementation function that is
-calling \fBTcl_WrongNumArgs\fR. As such, all values referenced in it should
-have reference counts greater than zero; this is usually a non-issue.
 .SH "SEE ALSO"
 Tcl_GetIndexFromObj(3)
 .SH KEYWORDS
@@ -81,13 +81,29 @@ omitted then the command returns the current system encoding.  The
 system encoding is used whenever Tcl passes strings to system calls.
 .SH EXAMPLE
 .PP
-The following example converts a byte sequence in Japanese euc-jp encoding to a TCL string:
+It is common practice to write script files using a text editor that
+produces output in the euc-jp encoding, which represents the ASCII
+characters as singe bytes and Japanese characters as two bytes.  This
+makes it easy to embed literal strings that correspond to non-ASCII
+characters by simply typing the strings in place in the script.
+However, because the \fBsource\fR command always reads files using the
+current system encoding, Tcl will only source such files correctly
+when the encoding used to write the file is the same.  This tends not
+to be true in an internationalized setting.  For example, if such a
+file was sourced in North America (where the ISO8859\-1 is normally
+used), each byte in the file would be treated as a separate character
+that maps to the 00 page in Unicode.  The resulting Tcl strings will
+not contain the expected Japanese characters.  Instead, they will
+contain a sequence of Latin-1 characters that correspond to the bytes
+of the original string.  The \fBencoding\fR command can be used to
+convert this string to the expected Japanese Unicode characters.  For
+example,
 .PP
 .CS
 set s [\fBencoding convertfrom\fR euc-jp "\exA4\exCF"]
 .CE
 .PP
-The result is the unicode codepoint:
+would return the Unicode string
 .QW "\eu306F" ,
 which is the Hiragana letter HA.
 .SH "SEE ALSO"
@@ -413,10 +413,10 @@ store the representation is of very low value (except to C extension
 code, which has direct access for the purpose of memory management,
 etc.)
 .PP
-\fICompatibility note:\fR This subcommand is deprecated and will
-be removed in Tcl 9.0. It is better to use the \fBencoding convertto\fR
-command to convert a string to a known encoding (e.g. "utf-8" or "cesu-8")
-and then apply \fBstring length\fR to that.
+\fICompatibility note:\fR it is likely that this subcommand will be
+withdrawn in a future version of Tcl. It is better to use the
+\fBencoding convertto\fR command to convert a string to a known
+encoding and then apply \fBstring length\fR to that.
 .PP
 .CS
 \fBstring length\fR [encoding convertto utf-8 $theString]
@@ -2423,9 +2423,6 @@ declare 655 {
 declare 656 {
    const char *Tcl_UtfPrev(const char *src, const char *start)
 }
-declare 657 {
-    int Tcl_UniCharIsUnicode(int ch)
-}

 # ----- BASELINE -- FOR -- 8.7.0 ----- #

@@ -527,33 +527,38 @@ typedef void (Tcl_ThreadCreateProc) (ClientData clientData);
 * Flag values passed to Tcl_StringCaseMatch.
 */

-#define TCL_MATCH_NOCASE	(1<<0)
+enum TclStringCaseMatchFlags {
+    TCL_MATCH_NOCASE = (1<<0)
+};

 /*
 * Flag values passed to Tcl_GetRegExpFromObj.
 */

-#define	TCL_REG_BASIC		000000	/* BREs (convenience). */
-#define	TCL_REG_EXTENDED	000001	/* EREs. */
-#define	TCL_REG_ADVF		000002	/* Advanced features in EREs. */
-#define	TCL_REG_ADVANCED	000003	/* AREs (which are also EREs). */
-#define	TCL_REG_QUOTE		000004	/* No special characters, none. */
-#define	TCL_REG_NOCASE		000010	/* Ignore case. */
-#define	TCL_REG_NOSUB		000020	/* Don't care about subexpressions. */
-#define	TCL_REG_EXPANDED	000040	/* Expanded format, white space &
-					 * comments. */
-#define	TCL_REG_NLSTOP		000100  /* \n doesn't match . or [^ ] */
-#define	TCL_REG_NLANCH		000200  /* ^ matches after \n, $ before. */
-#define	TCL_REG_NEWLINE		000300  /* Newlines are line terminators. */
-#define	TCL_REG_CANMATCH	001000  /* Report details on partial/limited
-					 * matches. */
+enum TclRegExpObjFlags {
+    TCL_REG_BASIC =	00000,	/* BREs (convenience). */
+    TCL_REG_EXTENDED =	00001,	/* EREs. */
+    TCL_REG_ADVF =	00002,	/* Advanced features in EREs. */
+    TCL_REG_ADVANCED =	00003,	/* AREs (which are also EREs). */
+    TCL_REG_QUOTE =	00004,	/* No special characters, none. */
+    TCL_REG_NOCASE =	00010,	/* Ignore case. */
+    TCL_REG_NOSUB =	00020,	/* Don't care about subexpressions. */
+    TCL_REG_EXPANDED =	00040,	/* Expanded format, white space & comments. */
+    TCL_REG_NLSTOP =	00100,	/* \n doesn't match . or [^ ] */
+    TCL_REG_NLANCH =	00200,	/* ^ matches after \n, $ before. */
+    TCL_REG_NEWLINE =	00300,	/* Newlines are line terminators. */
+    TCL_REG_CANMATCH =	01000	/* Report details on partial/limited
+				 * matches. */
+};

 /*
 * Flags values passed to Tcl_RegExpExecObj.
 */

-#define	TCL_REG_NOTBOL	0001	/* Beginning of string does not match ^.  */
-#define	TCL_REG_NOTEOL	0002	/* End of string does not match $. */
+enum TclRegExpExecFlags {
+    TCL_REG_NOTBOL = 0001,	/* Beginning of string does not match ^. */
+    TCL_REG_NOTEOL = 0002	/* End of string does not match $. */
+};

 /*
 * Structures filled in by Tcl_RegExpInfo. Note that all offset values are
@@ -592,25 +597,36 @@ typedef struct stat *Tcl_OldStat_;
 * Tcl_GetObjResult() or Tcl_GetStringResult() to read the interpreter's
 * result. See the SetResult man page for details. Besides this result, the
 * command function returns an integer code, which is one of the following:
- *
- * TCL_OK		Command completed normally; the interpreter's result
- *			contains the command's result.
- * TCL_ERROR		The command couldn't be completed successfully; the
- *			interpreter's result describes what went wrong.
- * TCL_RETURN		The command requests that the current function return;
- *			the interpreter's result contains the function's
- *			return value.
- * TCL_BREAK		The command requests that the innermost loop be
- *			exited; the interpreter's result is meaningless.
- * TCL_CONTINUE		Go on to the next iteration of the current loop; the
- *			interpreter's result is meaningless.
 */

-#define TCL_OK			0
-#define TCL_ERROR		1
-#define TCL_RETURN		2
-#define TCL_BREAK		3
-#define TCL_CONTINUE		4
+enum TclStandardResultCodes {
+    TCL_OK = 0,			/* Command completed normally; the
+				 * interpreter's result contains the command's
+				 * result. */
+    TCL_ERROR = 1,		/* The command couldn't be completed
+				 * successfully; the interpreter's result
+				 * describes what went wrong. */
+    TCL_RETURN = 2,		/* The command requests that the current
+				 * function return; the interpreter's result
+				 * contains the function's return value. */
+    TCL_BREAK = 3,		/* The command requests that the innermost
+				 * loop be exited; the interpreter's result is
+				 * meaningless (conventionally the empty
+				 * string). */
+    TCL_CONTINUE = 4		/* Go on to the next iteration of the current
+				 * loop; the interpreter's result is
+				 * meaningless (conventionally the empty
+				 * string). */
+
+    /*
+     * NOTE: This is NOT a closed set! Application-specific result codes
+     * appear in the wild, usually for doing some sort of "fast exception".
+     * They all behave the same, like an error except that no stack trace is
+     * accumulated in the errorInfo. Because there's no registry of codes
+     * used, they are all reserved to applications; library code cannot safely
+     * use them.
+     */
+};

 #if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 #define TCL_RESULT_SIZE		200
@@ -621,10 +637,12 @@ typedef struct stat *Tcl_OldStat_;
 * Flags to control what substitutions are performed by Tcl_SubstObj():
 */

-#define TCL_SUBST_COMMANDS	001
-#define TCL_SUBST_VARIABLES	002
-#define TCL_SUBST_BACKSLASHES	004
-#define TCL_SUBST_ALL		007
+enum TclSubstControlFlags {
+    TCL_SUBST_COMMANDS = 001,
+    TCL_SUBST_VARIABLES = 002,
+    TCL_SUBST_BACKSLASHES = 004,
+    TCL_SUBST_ALL = 007
+};

 /*
 * Argument descriptors for math function callbacks in expressions:
@@ -963,55 +981,56 @@ typedef struct Tcl_DString {

 /*
 * Flag values passed to Tcl_ConvertElement.
- * TCL_DONT_USE_BRACES forces it not to enclose the element in braces, but to
- *	use backslash quoting instead.
- * TCL_DONT_QUOTE_HASH disables the default quoting of the '#' character. It
- *	is safe to leave the hash unquoted when the element is not the first
- *	element of a list, and this flag can be used by the caller to indicate
- *	that condition.
 */

-#define TCL_DONT_USE_BRACES	1
-#define TCL_DONT_QUOTE_HASH	8
+enum TclConvertElementFlags {
+    TCL_DONT_USE_BRACES = 1,	/* Force Tcl_ConvertElement not to enclose the
+				 * element in braces, but to use backslash
+				 * quoting instead.*/
+    TCL_DONT_QUOTE_HASH = 8	/* Disable the default quoting of the '#'
+				 * character. It is safe to leave the hash
+				 * unquoted when the element is not the first
+				 * element of a list, and this flag can be
+				 * used by the caller to indicate that
+				 * condition. */
+};

 /*
 * Flags that may be passed to Tcl_GetIndexFromObj.
- * TCL_EXACT disallows abbreviated strings.
- * TCL_INDEX_TEMP_TABLE disallows caching of lookups. A possible use case is
- *      a table that will not live long enough to make it worthwhile.
 */

-#define TCL_EXACT		1
-#define TCL_INDEX_TEMP_TABLE	2
+enum TclGetIndexFromObjFlags {
+    TCL_EXACT = 1,		/* Disallow abbreviated strings. */
+    TCL_INDEX_TEMP_TABLE = 2	/* Disallow caching of lookups. A possible use
+				 * case is a table that will not live long
+				 * enough to make it worthwhile. */
+};

 /*
 *----------------------------------------------------------------------------
 * Flag values passed to Tcl_RecordAndEval, Tcl_EvalObj, Tcl_EvalObjv.
 * WARNING: these bit choices must not conflict with the bit choices for
 * evalFlag bits in tclInt.h!
- *
- * Meanings:
- *	TCL_NO_EVAL:		Just record this command
- *	TCL_EVAL_GLOBAL:	Execute script in global namespace
- *	TCL_EVAL_DIRECT:	Do not compile this script
- *	TCL_EVAL_INVOKE:	Magical Tcl_EvalObjv mode for aliases/ensembles
- *				o Run in iPtr->lookupNsPtr or global namespace
- *				o Cut out of error traces
- *				o Don't reset the flags controlling ensemble
- *				  error message rewriting.
- *	TCL_CANCEL_UNWIND:	Magical Tcl_CancelEval mode that causes the
- *				stack for the script in progress to be
- *				completely unwound.
- *	TCL_EVAL_NOERR:	Do no exception reporting at all, just return
- *				as the caller will report.
 */

-#define TCL_NO_EVAL		0x010000
-#define TCL_EVAL_GLOBAL		0x020000
-#define TCL_EVAL_DIRECT		0x040000
-#define TCL_EVAL_INVOKE		0x080000
-#define TCL_CANCEL_UNWIND	0x100000
-#define TCL_EVAL_NOERR          0x200000
+enum TclEvalFlags {
+    TCL_NO_EVAL =     0x010000,	/* Just record this command */
+    TCL_EVAL_GLOBAL = 0x020000,	/* Execute script in global namespace */
+    TCL_EVAL_DIRECT = 0x040000,	/* Do not compile this script */
+    TCL_EVAL_INVOKE = 0x080000,	/* Magical Tcl_EvalObjv mode for
+				 * aliases/ensembles
+				 * o Run in iPtr->lookupNsPtr or global
+				 *   namespace
+				 * o Cut out of error traces
+				 * o Don't reset the flags controlling
+				 *   ensemble error message rewriting. */
+    TCL_CANCEL_UNWIND = 0x100000,
+				/* Magical Tcl_CancelEval mode that causes the
+				 * stack for the script in progress to be
+				 * completely unwound. */
+    TCL_EVAL_NOERR =  0x200000	/* Do no exception reporting at all, just
+				 * return as the caller will report.  */
+};

 /*
 * Special freeProc values that may be passed to Tcl_SetResult (see the man
@@ -1028,45 +1047,48 @@ typedef struct Tcl_DString {
 * TCL_CANCEL_UNWIND, above.
 */

-#define TCL_GLOBAL_ONLY		 1
-#define TCL_NAMESPACE_ONLY	 2
-#define TCL_APPEND_VALUE	 4
-#define TCL_LIST_ELEMENT	 8
-#define TCL_TRACE_READS		 0x10
-#define TCL_TRACE_WRITES	 0x20
-#define TCL_TRACE_UNSETS	 0x40
-#define TCL_TRACE_DESTROYED	 0x80
-
+enum TclVariableFlags {
+    TCL_GLOBAL_ONLY = 1,
+    TCL_NAMESPACE_ONLY = 2,
+    TCL_APPEND_VALUE = 4,
+    TCL_LIST_ELEMENT = 8,
+    TCL_TRACE_READS = 0x10,
+    TCL_TRACE_WRITES = 0x20,
+    TCL_TRACE_UNSETS = 0x40,
+    TCL_TRACE_DESTROYED = 0x80,
 #if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
-#define TCL_INTERP_DESTROYED	 0x100
+    TCL_INTERP_DESTROYED = 0x100,
 #endif
-
-#define TCL_LEAVE_ERR_MSG	 0x200
-#define TCL_TRACE_ARRAY		 0x800
+    TCL_LEAVE_ERR_MSG = 0x200,
+    TCL_TRACE_ARRAY = 0x800,
 #ifndef TCL_REMOVE_OBSOLETE_TRACES
-/* Required to support old variable/vdelete/vinfo traces. */
-#define TCL_TRACE_OLD_STYLE	 0x1000
+    /* Required to support old variable/vdelete/vinfo traces. */
+    TCL_TRACE_OLD_STYLE = 0x1000,
 #endif
-/* Indicate the semantics of the result of a trace. */
-#define TCL_TRACE_RESULT_DYNAMIC 0x8000
-#define TCL_TRACE_RESULT_OBJECT  0x10000
+    /* Indicate the semantics of the result of a trace. */
+    TCL_TRACE_RESULT_DYNAMIC = 0x8000,
+    TCL_TRACE_RESULT_OBJECT = 0x10000
+};

 /*
 * Flag values for ensemble commands.
 */

-#define TCL_ENSEMBLE_PREFIX 0x02/* Flag value to say whether to allow
+enum TclEnsembleFlags {
+    TCL_ENSEMBLE_PREFIX = 0x02	/* Flag value to say whether to allow
 				 * unambiguous prefixes of commands or to
 				 * require exact matches for command names. */
+};

 /*
 * Flag values passed to command-related functions.
 */

-#define TCL_TRACE_RENAME	0x2000
-#define TCL_TRACE_DELETE	0x4000
-
-#define TCL_ALLOW_INLINE_COMPILATION 0x20000
+enum TclCommandFlags {
+    TCL_TRACE_RENAME = 0x2000,
+    TCL_TRACE_DELETE = 0x4000,
+    TCL_ALLOW_INLINE_COMPILATION = 0x20000
+};

 /*
 * The TCL_PARSE_PART1 flag is deprecated and has no effect. The part1 is now
@@ -1083,28 +1105,30 @@ typedef struct Tcl_DString {
 * Types for linked variables:
 */

-#define TCL_LINK_INT		1
-#define TCL_LINK_DOUBLE		2
-#define TCL_LINK_BOOLEAN	3
-#define TCL_LINK_STRING		4
-#define TCL_LINK_WIDE_INT	5
-#define TCL_LINK_CHAR		6
-#define TCL_LINK_UCHAR		7
-#define TCL_LINK_SHORT		8
-#define TCL_LINK_USHORT		9
-#define TCL_LINK_UINT		10
+enum TclLinkVariableTypes {
+    TCL_LINK_INT = 1,
+    TCL_LINK_DOUBLE = 2,
+    TCL_LINK_BOOLEAN = 3,
+    TCL_LINK_STRING = 4,
+    TCL_LINK_WIDE_INT = 5,
+    TCL_LINK_CHAR = 6,
+    TCL_LINK_UCHAR = 7,
+    TCL_LINK_SHORT = 8,
+    TCL_LINK_USHORT = 9,
+    TCL_LINK_UINT = 10,
+    TCL_LINK_FLOAT = 13,
+    TCL_LINK_WIDE_UINT = 14,
+    TCL_LINK_CHARS = 15,
+    TCL_LINK_BINARY = 16,
 #if defined(TCL_WIDE_INT_IS_LONG) || defined(_WIN32) || defined(__CYGWIN__)
-#define TCL_LINK_LONG		((sizeof(long) != sizeof(int)) ? TCL_LINK_WIDE_INT : TCL_LINK_INT)
-#define TCL_LINK_ULONG		((sizeof(long) != sizeof(int)) ? TCL_LINK_WIDE_UINT : TCL_LINK_UINT)
+    TCL_LINK_LONG = ((sizeof(long) != sizeof(int)) ? TCL_LINK_WIDE_INT : TCL_LINK_INT),
+    TCL_LINK_ULONG = ((sizeof(long) != sizeof(int)) ? TCL_LINK_WIDE_UINT : TCL_LINK_UINT),
 #else
-#define TCL_LINK_LONG		11
-#define TCL_LINK_ULONG		12
+    TCL_LINK_LONG = 11,
+    TCL_LINK_ULONG = 12,
 #endif
-#define TCL_LINK_FLOAT		13
-#define TCL_LINK_WIDE_UINT	14
-#define TCL_LINK_CHARS		15
-#define TCL_LINK_BINARY		16
-#define TCL_LINK_READ_ONLY	0x80
+    TCL_LINK_READ_ONLY = 0x80
+};

 /*
 *----------------------------------------------------------------------------
@@ -1152,21 +1176,23 @@ struct Tcl_HashEntry {

 /*
 * Flags used in Tcl_HashKeyType.
- *
- * TCL_HASH_KEY_RANDOMIZE_HASH -
- *				There are some things, pointers for example
- *				which don't hash well because they do not use
- *				the lower bits. If this flag is set then the
- *				hash table will attempt to rectify this by
- *				randomising the bits and then using the upper
- *				N bits as the index into the table.
- * TCL_HASH_KEY_SYSTEM_HASH -	If this flag is set then all memory internally
- *                              allocated for the hash table that is not for an
- *                              entry will use the system heap.
 */

-#define TCL_HASH_KEY_RANDOMIZE_HASH 0x1
-#define TCL_HASH_KEY_SYSTEM_HASH    0x2
+enum TclHashKeyFlags {
+    TCL_HASH_KEY_RANDOMIZE_HASH = 0x1,
+				/* There are some things, pointers for example
+				 * which don't hash well because they do not
+				 * use the lower bits. If this flag is set
+				 * then the hash table will attempt to rectify
+				 * this by randomising the bits and then using
+				 * the upper N bits as the index into the
+				 * table. */
+    TCL_HASH_KEY_SYSTEM_HASH = 0x2
+				/* If this flag is set then all memory
+				 * internally allocated for the hash table
+				 * that is not for an entry will use the
+				 * system heap. */
+};

 /*
 * Structure definition for the methods associated with a hash table key type.
@@ -1307,12 +1333,14 @@ typedef struct {
 * events:
 */

-#define TCL_DONT_WAIT		(1<<1)
-#define TCL_WINDOW_EVENTS	(1<<2)
-#define TCL_FILE_EVENTS		(1<<3)
-#define TCL_TIMER_EVENTS	(1<<4)
-#define TCL_IDLE_EVENTS		(1<<5)	/* WAS 0x10 ???? */
-#define TCL_ALL_EVENTS		(~TCL_DONT_WAIT)
+enum TclDoOneEventFlags {
+    TCL_DONT_WAIT = (1<<1),
+    TCL_WINDOW_EVENTS = (1<<2),
+    TCL_FILE_EVENTS = (1<<3),
+    TCL_TIMER_EVENTS = (1<<4),
+    TCL_IDLE_EVENTS = (1<<5),	/* WAS 0x10 ???? */
+    TCL_ALL_EVENTS = (~TCL_DONT_WAIT)
+};

 /*
 * The following structure defines a generic event for the Tcl event system.
@@ -1341,8 +1369,10 @@ typedef enum {
 * event routines.
 */

-#define TCL_SERVICE_NONE 0
-#define TCL_SERVICE_ALL 1
+enum TclServiceModes {
+    TCL_SERVICE_NONE = 0,
+    TCL_SERVICE_ALL = 1
+};

 /*
 * The following structure keeps is used to hold a time value, either as an
@@ -1371,9 +1401,11 @@ typedef void (Tcl_ScaleTimeProc) (Tcl_Time *timebuf, ClientData clientData);
 * indicate what sorts of events are of interest:
 */

-#define TCL_READABLE		(1<<1)
-#define TCL_WRITABLE		(1<<2)
-#define TCL_EXCEPTION		(1<<3)
+enum TclChannelHandlerFlags {
+    TCL_READABLE = (1<<1),
+    TCL_WRITABLE = (1<<2),
+    TCL_EXCEPTION = (1<<3)
+};

 /*
 * Flag values to pass to Tcl_OpenCommandChannel to indicate the disposition
@@ -1381,18 +1413,22 @@ typedef void (Tcl_ScaleTimeProc) (Tcl_Time *timebuf, ClientData clientData);
 * Tcl_GetStdChannel.
 */

-#define TCL_STDIN		(1<<1)
-#define TCL_STDOUT		(1<<2)
-#define TCL_STDERR		(1<<3)
-#define TCL_ENFORCE_MODE	(1<<4)
+enum TclOpenCommandChannelFlags {
+    TCL_STDIN = (1<<1),
+    TCL_STDOUT = (1<<2),
+    TCL_STDERR = (1<<3),
+    TCL_ENFORCE_MODE = (1<<4)
+};

 /*
 * Bits passed to Tcl_DriverClose2Proc to indicate which side of a channel
 * should be closed.
 */

-#define TCL_CLOSE_READ		(1<<1)
-#define TCL_CLOSE_WRITE		(1<<2)
+enum TclChannelCloseFlags {
+    TCL_CLOSE_READ = (1<<1),
+    TCL_CLOSE_WRITE = (1<<2)
+};

 /*
 * Value to use as the closeProc for a channel that supports the close2Proc
@@ -1417,8 +1453,10 @@ typedef void (Tcl_ScaleTimeProc) (Tcl_Time *timebuf, ClientData clientData);
 * TIP #218: Channel Actions, Ids for Tcl_DriverThreadActionProc.
 */

-#define TCL_CHANNEL_THREAD_INSERT (0)
-#define TCL_CHANNEL_THREAD_REMOVE (1)
+enum TclChannelThreadActionOperations {
+    TCL_CHANNEL_THREAD_INSERT = 0,
+    TCL_CHANNEL_THREAD_REMOVE = 1
+};

 /*
 * Typedefs for the various operations in a channel type:
@@ -1479,8 +1517,8 @@ typedef struct Tcl_ChannelType {
 				/* Version of the channel type. */
    Tcl_DriverCloseProc *closeProc;
 				/* Function to call to close the channel, or
-				 * NULL or TCL_CLOSE2PROC if the close2Proc should be
-				 * used instead. */
+				 * NULL or TCL_CLOSE2PROC if the close2Proc
+				 * should be used instead. */
    Tcl_DriverInputProc *inputProc;
 				/* Function to call for input on channel. */
    Tcl_DriverOutputProc *outputProc;
@@ -1547,9 +1585,10 @@ typedef struct Tcl_ChannelType {
 * to the blockModeProc function in the above structure.
 */

-#define TCL_MODE_BLOCKING	0	/* Put channel into blocking mode. */
-#define TCL_MODE_NONBLOCKING	1	/* Put channel into nonblocking
-					 * mode. */
+enum TclChannelBlockModeFlags {
+    TCL_MODE_BLOCKING = 0,	/* Put channel into blocking mode. */
+    TCL_MODE_NONBLOCKING = 1	/* Put channel into nonblocking mode. */
+};

 /*
 *----------------------------------------------------------------------------
@@ -1578,27 +1617,33 @@ typedef struct Tcl_GlobTypeData {
 * Type and permission definitions for glob command.
 */

-#define TCL_GLOB_TYPE_BLOCK		(1<<0)
-#define TCL_GLOB_TYPE_CHAR		(1<<1)
-#define TCL_GLOB_TYPE_DIR		(1<<2)
-#define TCL_GLOB_TYPE_PIPE		(1<<3)
-#define TCL_GLOB_TYPE_FILE		(1<<4)
-#define TCL_GLOB_TYPE_LINK		(1<<5)
-#define TCL_GLOB_TYPE_SOCK		(1<<6)
-#define TCL_GLOB_TYPE_MOUNT		(1<<7)
+enum TclGlobTypes {
+    TCL_GLOB_TYPE_BLOCK = (1<<0),
+    TCL_GLOB_TYPE_CHAR = (1<<1),
+    TCL_GLOB_TYPE_DIR = (1<<2),
+    TCL_GLOB_TYPE_PIPE = (1<<3),
+    TCL_GLOB_TYPE_FILE = (1<<4),
+    TCL_GLOB_TYPE_LINK = (1<<5),
+    TCL_GLOB_TYPE_SOCK = (1<<6),
+    TCL_GLOB_TYPE_MOUNT = (1<<7)
+};

-#define TCL_GLOB_PERM_RONLY		(1<<0)
-#define TCL_GLOB_PERM_HIDDEN		(1<<1)
-#define TCL_GLOB_PERM_R			(1<<2)
-#define TCL_GLOB_PERM_W			(1<<3)
-#define TCL_GLOB_PERM_X			(1<<4)
+enum TclGlobPermissions {
+    TCL_GLOB_PERM_RONLY = (1<<0),
+    TCL_GLOB_PERM_HIDDEN = (1<<1),
+    TCL_GLOB_PERM_R = (1<<2),
+    TCL_GLOB_PERM_W = (1<<3),
+    TCL_GLOB_PERM_X = (1<<4)
+};

 /*
 * Flags for the unload callback function.
 */

-#define TCL_UNLOAD_DETACH_FROM_INTERPRETER	(1<<0)
-#define TCL_UNLOAD_DETACH_FROM_PROCESS		(1<<1)
+enum TclUnloadFlags {
+    TCL_UNLOAD_DETACH_FROM_INTERPRETER = (1<<0),
+    TCL_UNLOAD_DETACH_FROM_PROCESS = (1<<1)
+};

 /*
 * Typedefs for the various filesystem operations:
@@ -1804,8 +1849,10 @@ typedef struct Tcl_Filesystem {
 * TCL_CREATE_HARD_LINK -	Create a hard link.
 */

-#define TCL_CREATE_SYMBOLIC_LINK	0x01
-#define TCL_CREATE_HARD_LINK		0x02
+enum TclFileLinkActions {
+    TCL_CREATE_SYMBOLIC_LINK = 0x01,
+    TCL_CREATE_HARD_LINK = 0x02
+};

 /*
 *----------------------------------------------------------------------------
@@ -1848,99 +1895,101 @@ typedef struct Tcl_Token {
 /*
 * Type values defined for Tcl_Token structures. These values are defined as
 * mask bits so that it's easy to check for collections of types.
- *
- * TCL_TOKEN_WORD -		The token describes one word of a command,
- *				from the first non-blank character of the word
- *				(which may be " or {) up to but not including
- *				the space, semicolon, or bracket that
- *				terminates the word. NumComponents counts the
- *				total number of sub-tokens that make up the
- *				word. This includes, for example, sub-tokens
- *				of TCL_TOKEN_VARIABLE tokens.
- * TCL_TOKEN_SIMPLE_WORD -	This token is just like TCL_TOKEN_WORD except
- *				that the word is guaranteed to consist of a
- *				single TCL_TOKEN_TEXT sub-token.
- * TCL_TOKEN_TEXT -		The token describes a range of literal text
- *				that is part of a word. NumComponents is
- *				always 0.
- * TCL_TOKEN_BS -		The token describes a backslash sequence that
- *				must be collapsed. NumComponents is always 0.
- * TCL_TOKEN_COMMAND -		The token describes a command whose result
- *				must be substituted into the word. The token
- *				includes the enclosing brackets. NumComponents
- *				is always 0.
- * TCL_TOKEN_VARIABLE -		The token describes a variable substitution,
- *				including the dollar sign, variable name, and
- *				array index (if there is one) up through the
- *				right parentheses. NumComponents tells how
- *				many additional tokens follow to represent the
- *				variable name. The first token will be a
- *				TCL_TOKEN_TEXT token that describes the
- *				variable name. If the variable is an array
- *				reference then there will be one or more
- *				additional tokens, of type TCL_TOKEN_TEXT,
- *				TCL_TOKEN_BS, TCL_TOKEN_COMMAND, and
- *				TCL_TOKEN_VARIABLE, that describe the array
- *				index; numComponents counts the total number
- *				of nested tokens that make up the variable
- *				reference, including sub-tokens of
- *				TCL_TOKEN_VARIABLE tokens.
- * TCL_TOKEN_SUB_EXPR -		The token describes one subexpression of an
- *				expression, from the first non-blank character
- *				of the subexpression up to but not including
- *				the space, brace, or bracket that terminates
- *				the subexpression. NumComponents counts the
- *				total number of following subtokens that make
- *				up the subexpression; this includes all
- *				subtokens for any nested TCL_TOKEN_SUB_EXPR
- *				tokens. For example, a numeric value used as a
- *				primitive operand is described by a
- *				TCL_TOKEN_SUB_EXPR token followed by a
- *				TCL_TOKEN_TEXT token. A binary subexpression
- *				is described by a TCL_TOKEN_SUB_EXPR token
- *				followed by the TCL_TOKEN_OPERATOR token for
- *				the operator, then TCL_TOKEN_SUB_EXPR tokens
- *				for the left then the right operands.
- * TCL_TOKEN_OPERATOR -		The token describes one expression operator.
- *				An operator might be the name of a math
- *				function such as "abs". A TCL_TOKEN_OPERATOR
- *				token is always preceded by one
- *				TCL_TOKEN_SUB_EXPR token for the operator's
- *				subexpression, and is followed by zero or more
- *				TCL_TOKEN_SUB_EXPR tokens for the operator's
- *				operands. NumComponents is always 0.
- * TCL_TOKEN_EXPAND_WORD -	This token is just like TCL_TOKEN_WORD except
- *				that it marks a word that began with the
- *				literal character prefix "{*}". This word is
- *				marked to be expanded - that is, broken into
- *				words after substitution is complete.
 */

-#define TCL_TOKEN_WORD		1
-#define TCL_TOKEN_SIMPLE_WORD	2
-#define TCL_TOKEN_TEXT		4
-#define TCL_TOKEN_BS		8
-#define TCL_TOKEN_COMMAND	16
-#define TCL_TOKEN_VARIABLE	32
-#define TCL_TOKEN_SUB_EXPR	64
-#define TCL_TOKEN_OPERATOR	128
-#define TCL_TOKEN_EXPAND_WORD	256
+enum TclTokenTypes {
+    TCL_TOKEN_WORD = 1,		/* The token describes one word of a command,
+				 * from the first non-blank character of the
+				 * word (which may be " or {) up to but not
+				 * including the space, semicolon, or bracket
+				 * that terminates the word. NumComponents
+				 * counts the total number of sub-tokens that
+				 * make up the word. This includes, for
+				 * example, sub-tokens of TCL_TOKEN_VARIABLE
+				 * tokens. */
+    TCL_TOKEN_SIMPLE_WORD = 2,	/* This token is just like TCL_TOKEN_WORD
+				 * except that the word is guaranteed to
+				 * consist of a single TCL_TOKEN_TEXT
+				 * sub-token. */
+    TCL_TOKEN_TEXT = 4,		/* The token describes a range of literal text
+				 * that is part of a word. NumComponents is
+				 * always 0. */
+    TCL_TOKEN_BS = 8,		/* The token describes a backslash sequence
+				 * that must be collapsed. NumComponents is
+				 * always 0. */
+    TCL_TOKEN_COMMAND = 16,	/* The token describes a command whose result
+				 * must be substituted into the word. The
+				 * token includes the enclosing brackets.
+				 * NumComponents is always 0. */
+    TCL_TOKEN_VARIABLE = 32,	/* The token describes a variable
+				 * substitution, including the dollar sign,
+				 * variable name, and array index (if there is
+				 * one) up through the right parentheses.
+				 * NumComponents tells how many additional
+				 * tokens follow to represent the variable
+				 * name. The first token will be a
+				 * TCL_TOKEN_TEXT token that describes the
+				 * variable name. If the variable is an array
+				 * reference then there will be one or more
+				 * additional tokens, of type TCL_TOKEN_TEXT,
+				 * TCL_TOKEN_BS, TCL_TOKEN_COMMAND, and
+				 * TCL_TOKEN_VARIABLE, that describe the array
+				 * index; numComponents counts the total
+				 * number of nested tokens that make up the
+				 * variable reference, including sub-tokens of
+				 * TCL_TOKEN_VARIABLE tokens. */
+    TCL_TOKEN_SUB_EXPR = 64,	/* The token describes one subexpression of an
+				 * expression, from the first non-blank
+				 * character of the subexpression up to but
+				 * not including the space, brace, or bracket
+				 * that terminates the subexpression.
+				 * NumComponents counts the total number of
+				 * following subtokens that make up the
+				 * subexpression; this includes all subtokens
+				 * for any nested TCL_TOKEN_SUB_EXPR tokens.
+				 * For example, a numeric value used as a
+				 * primitive operand is described by a
+				 * TCL_TOKEN_SUB_EXPR token followed by a
+				 * TCL_TOKEN_TEXT token. A binary
+				 * subexpression is described by a
+				 * TCL_TOKEN_SUB_EXPR token followed by the
+				 * TCL_TOKEN_OPERATOR token for the operator,
+				 * then TCL_TOKEN_SUB_EXPR tokens for the left
+				 * then the right operands. */
+    TCL_TOKEN_OPERATOR = 128,	/* The token describes one expression
+				 * operator.  An operator might be the name of
+				 * a math function such as "abs". A
+				 * TCL_TOKEN_OPERATOR token is always preceded
+				 * by one TCL_TOKEN_SUB_EXPR token for the
+				 * operator's subexpression, and is followed
+				 * by zero or more TCL_TOKEN_SUB_EXPR tokens
+				 * for the operator's operands. NumComponents
+				 * is always 0. */
+    TCL_TOKEN_EXPAND_WORD = 256	/* This token is just like TCL_TOKEN_WORD
+				 * except that it marks a word that began with
+				 * the literal character prefix "{*}". This
+				 * word is marked to be expanded - that is,
+				 * broken into words after substitution is
+				 * complete. */
+};

 /*
 * Parsing error types. On any parsing error, one of these values will be
 * stored in the error field of the Tcl_Parse structure defined below.
 */

-#define TCL_PARSE_SUCCESS		0
-#define TCL_PARSE_QUOTE_EXTRA		1
-#define TCL_PARSE_BRACE_EXTRA		2
-#define TCL_PARSE_MISSING_BRACE		3
-#define TCL_PARSE_MISSING_BRACKET	4
-#define TCL_PARSE_MISSING_PAREN		5
-#define TCL_PARSE_MISSING_QUOTE		6
-#define TCL_PARSE_MISSING_VAR_BRACE	7
-#define TCL_PARSE_SYNTAX		8
-#define TCL_PARSE_BAD_NUMBER		9
+enum TclParsingErrors {
+    TCL_PARSE_SUCCESS = 0,
+    TCL_PARSE_QUOTE_EXTRA = 1,
+    TCL_PARSE_BRACE_EXTRA = 2,
+    TCL_PARSE_MISSING_BRACE = 3,
+    TCL_PARSE_MISSING_BRACKET = 4,
+    TCL_PARSE_MISSING_PAREN = 5,
+    TCL_PARSE_MISSING_QUOTE = 6,
+    TCL_PARSE_MISSING_VAR_BRACE = 7,
+    TCL_PARSE_SYNTAX = 8,
+    TCL_PARSE_BAD_NUMBER = 9
+};

 /*
 * A structure of the following type is filled in by Tcl_ParseCommand. It
@@ -2035,52 +2084,53 @@ typedef struct Tcl_EncodingType {
 /*
 * The following definitions are used as values for the conversion control
 * flags argument when converting text from one character set to another:
- *
- * TCL_ENCODING_START -		Signifies that the source buffer is the first
- *				block in a (potentially multi-block) input
- *				stream. Tells the conversion function to reset
- *				to an initial state and perform any
- *				initialization that needs to occur before the
- *				first byte is converted. If the source buffer
- *				contains the entire input stream to be
- *				converted, this flag should be set.
- * TCL_ENCODING_END -		Signifies that the source buffer is the last
- *				block in a (potentially multi-block) input
- *				stream. Tells the conversion routine to
- *				perform any finalization that needs to occur
- *				after the last byte is converted and then to
- *				reset to an initial state. If the source
- *				buffer contains the entire input stream to be
- *				converted, this flag should be set.
- * TCL_ENCODING_STOPONERROR -	If set, the converter returns immediately upon
- *				encountering an invalid byte sequence or a
- *				source character that has no mapping in the
- *				target encoding. If clear, the converter
- *				substitues the problematic character(s) with
- *				one or more "close" characters in the
- *				destination buffer and then continues to
- *				convert the source.
- * TCL_ENCODING_NO_TERMINATE - 	If set, Tcl_ExternalToUtf does not append a
- *				terminating NUL byte.  Since it does not need
- *				an extra byte for a terminating NUL, it fills
- *				all dstLen bytes with encoded UTF-8 content if
- *				needed.  If clear, a byte is reserved in the
- *				dst space for NUL termination, and a
- *				terminating NUL is appended.
- * TCL_ENCODING_CHAR_LIMIT -	If set and dstCharsPtr is not NULL, then
- *				Tcl_ExternalToUtf takes the initial value of
- *				*dstCharsPtr as a limit of the maximum number
- *				of chars to produce in the encoded UTF-8
- *				content.  Otherwise, the number of chars
- *				produced is controlled only by other limiting
- *				factors.
 */

-#define TCL_ENCODING_START		0x01
-#define TCL_ENCODING_END		0x02
-#define TCL_ENCODING_STOPONERROR	0x04
-#define TCL_ENCODING_NO_TERMINATE	0x08
-#define TCL_ENCODING_CHAR_LIMIT		0x10
+enum TclEncodingFlags {
+    TCL_ENCODING_START = 1,	/* Signifies that the source buffer is the
+				 * first block in a (potentially multi-block)
+				 * input stream. Tells the conversion function
+				 * to reset to an initial state and perform
+				 * any initialization that needs to occur
+				 * before the first byte is converted. If the
+				 * source buffer contains the entire input
+				 * stream to be converted, this flag should be
+				 * set. */
+    TCL_ENCODING_END = 2,	/* Signifies that the source buffer is the
+				 * last block in a (potentially multi-block)
+				 * input stream. Tells the conversion routine
+				 * to perform any finalization that needs to
+				 * occur after the last byte is converted and
+				 * then to reset to an initial state. If the
+				 * source buffer contains the entire input
+				 * stream to be converted, this flag should be
+				 * set. */
+    TCL_ENCODING_STOPONERROR = 4,
+				/* If set, the converter returns immediately
+				 * upon encountering an invalid byte sequence
+				 * or a source character that has no mapping
+				 * in the target encoding. If clear, the
+				 * converter substitues the problematic
+				 * character(s) with one or more "close"
+				 * characters in the destination buffer and
+				 * then continues to convert the source.*/
+    TCL_ENCODING_NO_TERMINATE = 8,
+				/* If set, Tcl_ExternalToUtf does not append a
+				 * terminating NUL byte. Since it does not
+				 * need an extra byte for a terminating NUL,
+				 * it fills all dstLen bytes with encoded
+				 * UTF-8 content if needed. If clear, a byte
+				 * is reserved in the dst space for NUL
+				 * termination, and a terminating NUL is
+				 * appended. */
+    TCL_ENCODING_CHAR_LIMIT = 16/* If set and dstCharsPtr is not NULL, then
+				 * Tcl_ExternalToUtf takes the initial value
+				 * of *dstCharsPtr as a limit of the maximum
+				 * number of chars to produce in the encoded
+				 * UTF-8 content.  Otherwise, the number of
+				 * chars produced is controlled only by other
+				 * limiting factors. */
+};

 /*
 * The following definitions are the error codes returned by the conversion
@@ -2163,8 +2213,10 @@ typedef struct Tcl_Config {
 * interpreter. Used for Tcl_{Add,Remove}LimitHandler type argument.
 */

-#define TCL_LIMIT_COMMANDS	0x01
-#define TCL_LIMIT_TIME		0x02
+enum TclLimitHandlerTypes {
+    TCL_LIMIT_COMMANDS = 0x01,
+    TCL_LIMIT_TIME = 0x02
+};

 /*
 * Structure containing information about a limit handler to be called when a
@@ -2218,15 +2270,17 @@ typedef struct {
 * documentation for details.
 */

-#define TCL_ARGV_CONSTANT	15
-#define TCL_ARGV_INT		16
-#define TCL_ARGV_STRING		17
-#define TCL_ARGV_REST		18
-#define TCL_ARGV_FLOAT		19
-#define TCL_ARGV_FUNC		20
-#define TCL_ARGV_GENFUNC	21
-#define TCL_ARGV_HELP		22
-#define TCL_ARGV_END		23
+enum TclArgvInfoTypes {
+    TCL_ARGV_CONSTANT = 15,
+    TCL_ARGV_INT = 16,
+    TCL_ARGV_STRING = 17,
+    TCL_ARGV_REST = 18,
+    TCL_ARGV_FLOAT = 19,
+    TCL_ARGV_FUNC = 20,
+    TCL_ARGV_GENFUNC = 21,
+    TCL_ARGV_HELP = 22,
+    TCL_ARGV_END = 23
+};

 /*
 * Types of callback functions for the TCL_ARGV_FUNC and TCL_ARGV_GENFUNC
@@ -2260,18 +2314,20 @@ typedef int (Tcl_ArgvGenFuncProc)(ClientData clientData, Tcl_Interp *interp,
 * Tcl_ZlibStreamInit functions.
 */

-#define TCL_ZLIB_FORMAT_RAW	1
-#define TCL_ZLIB_FORMAT_ZLIB	2
-#define TCL_ZLIB_FORMAT_GZIP	4
-#define TCL_ZLIB_FORMAT_AUTO	8
+enum TclZlibFlags {
+    TCL_ZLIB_FORMAT_RAW = 1,
+    TCL_ZLIB_FORMAT_ZLIB = 2,
+    TCL_ZLIB_FORMAT_GZIP = 4,
+    TCL_ZLIB_FORMAT_AUTO = 8,

-/*
- * Constants that describe whether the stream is to operate in compressing or
- * decompressing mode.
- */
+    /*
+     * Constants that describe whether the stream is to operate in compressing
+     * or decompressing mode.
+     */

-#define TCL_ZLIB_STREAM_DEFLATE	16
-#define TCL_ZLIB_STREAM_INFLATE	32
+    TCL_ZLIB_STREAM_DEFLATE = 16,
+    TCL_ZLIB_STREAM_INFLATE = 32
+};

 /*
 * Constants giving compression levels. Use of TCL_ZLIB_COMPRESS_DEFAULT is
@@ -2287,25 +2343,32 @@ typedef int (Tcl_ArgvGenFuncProc)(ClientData clientData, Tcl_Interp *interp,
 * Constants for types of flushing, used with Tcl_ZlibFlush.
 */

-#define TCL_ZLIB_NO_FLUSH	0
-#define TCL_ZLIB_FLUSH		2
-#define TCL_ZLIB_FULLFLUSH	3
-#define TCL_ZLIB_FINALIZE	4
+enum TclZlibFlushModes {
+    TCL_ZLIB_NO_FLUSH = 0,
+    TCL_ZLIB_FLUSH = 2,
+    TCL_ZLIB_FULLFLUSH = 3,
+    TCL_ZLIB_FINALIZE = 4
+};

 /*
 *----------------------------------------------------------------------------
 * Definitions needed for the Tcl_LoadFile function. [TIP #416]
 */

-#define TCL_LOAD_GLOBAL 1
-#define TCL_LOAD_LAZY 2
+enum TclLoadFileFlags {
+    TCL_LOAD_GLOBAL = 1,
+    TCL_LOAD_LAZY = 2
+};

 /*
 *----------------------------------------------------------------------------
 * Definitions needed for the Tcl_OpenTcpServerEx function. [TIP #456]
 */
-#define TCL_TCPSERVER_REUSEADDR (1<<0)
-#define TCL_TCPSERVER_REUSEPORT (1<<1)
+
+enum TclOpenTcpServerFlags {
+    TCL_TCPSERVER_REUSEADDR = (1<<0),
+    TCL_TCPSERVER_REUSEPORT = (1<<1)
+};

 /*
 * Constants for special int-typed values, see TIP #494
@@ -2385,7 +2448,6 @@ EXTERN const char *	Tcl_PkgInitStubsCheck(Tcl_Interp *interp,
 			    const char *version, int exact);
 EXTERN void		Tcl_InitSubsystems(void);
 EXTERN void		Tcl_GetMemoryInfo(Tcl_DString *dsPtr);
-EXTERN const char *	Tcl_SetPreInitScript(const char *string);
 #ifndef TCL_NO_DEPRECATED
 #   define Tcl_StaticPackage Tcl_StaticLibrary
 #endif
@@ -1826,28 +1826,28 @@ DeleteInterpProc(
 	ckfree(hTablePtr);
    }

+    /*
+     * Invoke deletion callbacks; note that a callback can create new
+     * callbacks, so we iterate.
+     */

-    if (iPtr->assocData != NULL) {
+    while (iPtr->assocData != NULL) {
 	AssocData *dPtr;

 	hTablePtr = iPtr->assocData;
-	/*
-	 * Invoke deletion callbacks; note that a callback can create new
-	 * callbacks, so we iterate.
-	 */
+	iPtr->assocData = NULL;
 	for (hPtr = Tcl_FirstHashEntry(hTablePtr, &search);
 		hPtr != NULL;
 		hPtr = Tcl_FirstHashEntry(hTablePtr, &search)) {
 	    dPtr = (AssocData *)Tcl_GetHashValue(hPtr);
+	    Tcl_DeleteHashEntry(hPtr);
 	    if (dPtr->proc != NULL) {
 		dPtr->proc(dPtr->clientData, interp);
 	    }
-	    Tcl_DeleteHashEntry(hPtr);
 	    ckfree(dPtr);
 	}
 	Tcl_DeleteHashTable(hTablePtr);
 	ckfree(hTablePtr);
-	iPtr->assocData = NULL;
    }

    /*
@@ -613,6 +613,8 @@ EncodingConverttoObjCmd(
    int length;			/* Length of the string being converted */
    const char *stringPtr;	/* Pointer to the first byte of the string */

+    /* TODO - ADJUST OBJ INDICES WHEN ENSEMBLIFYING THIS */
+
    if (objc == 2) {
 	encoding = Tcl_GetEncoding(interp, NULL);
 	data = objv[1];
@@ -86,12 +86,14 @@ typedef struct {
 * following values.
 */

-#define SORTMODE_ASCII		0
-#define SORTMODE_INTEGER	1
-#define SORTMODE_REAL		2
-#define SORTMODE_COMMAND	3
-#define SORTMODE_DICTIONARY	4
-#define SORTMODE_ASCII_NC	8
+enum SortModeFlags {
+    SORTMODE_ASCII = 0,
+    SORTMODE_INTEGER = 1,
+    SORTMODE_REAL = 2,
+    SORTMODE_COMMAND = 3,
+    SORTMODE_DICTIONARY = 4,
+    SORTMODE_ASCII_NC = 8
+};

 /*
 * Forward declarations for procedures defined in this file:
@@ -1533,16 +1533,16 @@ StringIsCmd(
 	"boolean",	"dict",		"digit",	"double",
 	"entier",	"false",	"graph",	"integer",
 	"list",		"lower",	"print",	"punct",
-	"space",	"true",		"upper",	"unicode",
-	"wideinteger", "wordchar",	"xdigit",	NULL
+	"space",	"true",		"upper",	"wideinteger",
+	"wordchar",	"xdigit",	NULL
    };
    enum isClassesEnum {
 	STR_IS_ALNUM,	STR_IS_ALPHA,	STR_IS_ASCII,	STR_IS_CONTROL,
 	STR_IS_BOOL,	STR_IS_DICT,	STR_IS_DIGIT,	STR_IS_DOUBLE,
 	STR_IS_ENTIER,	STR_IS_FALSE,	STR_IS_GRAPH,	STR_IS_INT,
 	STR_IS_LIST,	STR_IS_LOWER,	STR_IS_PRINT,	STR_IS_PUNCT,
-	STR_IS_SPACE,	STR_IS_TRUE,	STR_IS_UPPER,	STR_IS_UNICODE,
-	STR_IS_WIDE,	STR_IS_WORD,	STR_IS_XDIGIT
+	STR_IS_SPACE,	STR_IS_TRUE,	STR_IS_UPPER,	STR_IS_WIDE,
+	STR_IS_WORD,	STR_IS_XDIGIT
    };
    static const char *const isOptions[] = {
 	"-strict", "-failindex", NULL
@@ -1872,9 +1872,6 @@ StringIsCmd(
    case STR_IS_UPPER:
 	chcomp = Tcl_UniCharIsUpper;
 	break;
-    case STR_IS_UNICODE:
-	chcomp = Tcl_UniCharIsUnicode;
-	break;
    case STR_IS_WORD:
 	chcomp = Tcl_UniCharIsWordChar;
 	break;
@@ -2835,7 +2832,6 @@ StringCatCmd(
 *
 *----------------------------------------------------------------------
 */
-#if TCL_MAJOR_VERSION < 9 && !defined(TCL_NO_DEPRECATED)
 static int
 StringBytesCmd(
    TCL_UNUSED(ClientData),
@@ -2854,7 +2850,6 @@ StringBytesCmd(
    Tcl_SetObjResult(interp, Tcl_NewWideIntObj(length));
    return TCL_OK;
 }
-#endif

 /*
 *----------------------------------------------------------------------
@@ -3311,9 +3306,7 @@ TclInitStringCmd(
    Tcl_Interp *interp)		/* Current interpreter. */
 {
    static const EnsembleImplMap stringImplMap[] = {
-#if TCL_MAJOR_VERSION < 9 && !defined(TCL_NO_DEPRECATED)
 	{"bytelength",	StringBytesCmd,	TclCompileBasic1ArgCmd, NULL, NULL, 0},
-#endif
 	{"cat",		StringCatCmd,	TclCompileStringCatCmd, NULL, NULL, 0},
 	{"compare",	StringCmpCmd,	TclCompileStringCmpCmd, NULL, NULL, 0},
 	{"equal",	StringEqualCmd,	TclCompileStringEqualCmd, NULL, NULL, 0},
@@ -505,19 +505,19 @@ TclCompileStringIsCmd(
    Tcl_Token *tokenPtr = TokenAfter(parsePtr->tokenPtr);
    static const char *const isClasses[] = {
 	"alnum",	"alpha",	"ascii",	"control",
-	"boolean",	"dict",		"digit",	"double",
-	"entier",	"false",	"graph",	"integer",
-	"list",		"lower",	"print",	"punct",
-	"space",	"true",		"upper",	"unicode",
-	"wideinteger", "wordchar",	"xdigit",	NULL
+	"boolean",	"dict", "digit",	"double",	"entier",
+	"false",	"graph",	"integer",	"list",
+	"lower",	"print",	"punct",	"space",
+	"true",		"upper",	"wideinteger",	"wordchar",
+	"xdigit",	NULL
    };
    enum isClassesEnum {
 	STR_IS_ALNUM,	STR_IS_ALPHA,	STR_IS_ASCII,	STR_IS_CONTROL,
-	STR_IS_BOOL,	STR_IS_DICT,	STR_IS_DIGIT,	STR_IS_DOUBLE,
-	STR_IS_ENTIER,	STR_IS_FALSE,	STR_IS_GRAPH,	STR_IS_INT,
-	STR_IS_LIST,	STR_IS_LOWER,	STR_IS_PRINT,	STR_IS_PUNCT,
-	STR_IS_SPACE,	STR_IS_TRUE,	STR_IS_UPPER,	STR_IS_UNICODE,
-	STR_IS_WIDE,	STR_IS_WORD,	STR_IS_XDIGIT
+	STR_IS_BOOL,	STR_IS_DICT, STR_IS_DIGIT,	STR_IS_DOUBLE,	STR_IS_ENTIER,
+	STR_IS_FALSE,	STR_IS_GRAPH,	STR_IS_INT,	STR_IS_LIST,
+	STR_IS_LOWER,	STR_IS_PRINT,	STR_IS_PUNCT,	STR_IS_SPACE,
+	STR_IS_TRUE,	STR_IS_UPPER,	STR_IS_WIDE,	STR_IS_WORD,
+	STR_IS_XDIGIT
    };
    int t, range, allowEmpty = 0, end;
    InstStringClassType strClassType;
@@ -609,9 +609,6 @@ TclCompileStringIsCmd(
    case STR_IS_UPPER:
 	strClassType = STR_CLASS_UPPER;
 	goto compileStrClass;
-    case STR_IS_UNICODE:
-	strClassType = STR_CLASS_UNICODE;
-	goto compileStrClass;
    case STR_IS_WORD:
 	strClassType = STR_CLASS_WORD;
 	goto compileStrClass;
@@ -1418,7 +1415,6 @@ StringClassDesc const tclStringClassTable[] = {
    {"upper",	Tcl_UniCharIsUpper},
    {"word",	Tcl_UniCharIsWordChar},
    {"xdigit",	UniCharIsHexDigit},
-    {"unicode",	Tcl_UniCharIsUnicode},
    {"",	NULL}
 };

@@ -123,26 +123,27 @@ enum Marks {
 * store a NODE_TYPE code.
 */

-#define NODE_TYPE	0xC0
+enum NodeTypeFlags {
+    NODE_TYPE = 0xC0,

-/*
- * The four category values are LEAF, UNARY, and BINARY, explained below, and
- * "uncategorized", which is used either temporarily, until context determines
- * which of the other three categories is correct, or for lexemes like
- * INVALID, which aren't really lexemes at all, but indicators of a parsing
- * error. Note that the codes must be distinct to distinguish categories, but
- * need not take the form of a bit array.
- */
+    /*
+     * The four category values are LEAF, UNARY, and BINARY, explained below,
+     * and "uncategorized", which is used either temporarily, until context
+     * determines which of the other three categories is correct, or for
+     * lexemes like INVALID, which aren't really lexemes at all, but
+     * indicators of a parsing error. Note that the codes must be distinct to
+     * distinguish categories, but need not take the form of a bit array.
+     */

-#define BINARY		0x40	/* This lexeme is a binary operator. An OpNode
+    BINARY = 0x40,		/* This lexeme is a binary operator. An OpNode
 				 * representing it should go into the parse
 				 * tree, and two operands should be parsed for
 				 * it in the expression. */
-#define UNARY		0x80	/* This lexeme is a unary operator. An OpNode
+    UNARY = 0x80,		/* This lexeme is a unary operator. An OpNode
 				 * representing it should go into the parse
 				 * tree, and one operand should be parsed for
 				 * it in the expression. */
-#define LEAF		0xC0	/* This lexeme is a leaf operand in the parse
+    LEAF = 0xC0			/* This lexeme is a leaf operand in the parse
 				 * tree. No OpNode will be placed in the tree
 				 * for it. Either a literal value will be
 				 * appended to the list of literals in this
@@ -150,47 +151,42 @@ enum Marks {
 				 * be appended in a Tcl_Parse struct to
 				 * represent those leaves that require some
 				 * form of substitution. */
+};

-/* Uncategorized lexemes */
+enum LexemeTypes {
+    /* Uncategorized lexemes */

-#define PLUS		1	/* Ambiguous. Resolves to UNARY_PLUS or
+    PLUS = 1,			/* Ambiguous. Resolves to UNARY_PLUS or
 				 * BINARY_PLUS according to context. */
-#define MINUS		2	/* Ambiguous. Resolves to UNARY_MINUS or
+    MINUS = 2,			/* Ambiguous. Resolves to UNARY_MINUS or
 				 * BINARY_MINUS according to context. */
-#define BAREWORD	3	/* Ambigous. Resolves to BOOLEAN or to
+    BAREWORD = 3,		/* Ambigous. Resolves to BOOLEAN or to
 				 * FUNCTION or a parse error according to
 				 * context and value. */
-#define INCOMPLETE	4	/* A parse error. Used only when the single
+    INCOMPLETE = 4,		/* A parse error. Used only when the single
 				 * "=" is encountered.  */
-#define INVALID		5	/* A parse error. Used when any punctuation
+    INVALID = 5,		/* A parse error. Used when any punctuation
 				 * appears that's not a supported operator. */
-#define COMMENT		6	/* Comment. Lasts to end of line or end of
+    COMMENT = 6,		/* Comment. Lasts to end of line or end of
 				 * expression, whichever comes first. */

-/* Leaf lexemes */
+    /* Leaf lexemes */

-#define NUMBER		(LEAF | 1)
-				/* For literal numbers */
-#define SCRIPT		(LEAF | 2)
-				/* Script substitution; [foo] */
-#define BOOLEAN		(LEAF | BAREWORD)
-				/* For literal booleans */
-#define BRACED		(LEAF | 4)
-				/* Braced string; {foo bar} */
-#define VARIABLE	(LEAF | 5)
-				/* Variable substitution; $x */
-#define QUOTED		(LEAF | 6)
-				/* Quoted string; "foo $bar [soom]" */
-#define EMPTY		(LEAF | 7)
-				/* Used only for an empty argument list to a
+    NUMBER = (LEAF | 1),	/* For literal numbers */
+    SCRIPT = (LEAF | 2),	/* Script substitution; [foo] */
+    BOOLEAN = (LEAF | BAREWORD),/* For literal booleans */
+    BRACED = (LEAF | 4),	/* Braced string; {foo bar} */
+    VARIABLE = (LEAF | 5),	/* Variable substitution; $x */
+    QUOTED = (LEAF | 6),	/* Quoted string; "foo $bar [soom]" */
+    EMPTY = (LEAF | 7),		/* Used only for an empty argument list to a
 				 * function. Represents the empty string
 				 * within parens in the expression: rand() */

-/* Unary operator lexemes */
+    /* Unary operator lexemes */

-#define UNARY_PLUS	(UNARY | PLUS)
-#define UNARY_MINUS	(UNARY | MINUS)
-#define FUNCTION	(UNARY | BAREWORD)
+    UNARY_PLUS = (UNARY | PLUS),
+    UNARY_MINUS = (UNARY | MINUS),
+    FUNCTION = (UNARY | BAREWORD),
 				/* This is a bit of "creative interpretation"
 				 * on the part of the parser. A function call
 				 * is parsed into the parse tree according to
@@ -206,69 +202,62 @@ enum Marks {
 				 * include such exceptional handling in the
 				 * code against the need we would otherwise
 				 * have for more lexeme categories. */
-#define START		(UNARY | 4)
-				/* This lexeme isn't parsed from the
+    START = (UNARY | 4),	/* This lexeme isn't parsed from the
 				 * expression text at all. It represents the
 				 * start of the expression and sits at the
 				 * root of the parse tree where it serves as
 				 * the start/end point of traversals. */
-#define OPEN_PAREN	(UNARY | 5)
-				/* Another bit of creative interpretation,
+    OPEN_PAREN = (UNARY | 5),	/* Another bit of creative interpretation,
 				 * where we treat "(" as a unary operator with
 				 * the sub-expression between it and its
 				 * matching ")" as its operand. See
 				 * CLOSE_PAREN below. */
-#define NOT		(UNARY | 6)
-#define BIT_NOT		(UNARY | 7)
+    NOT = (UNARY | 6),
+    BIT_NOT = (UNARY | 7),

-/* Binary operator lexemes */
+    /* Binary operator lexemes */

-#define BINARY_PLUS	(BINARY |  PLUS)
-#define BINARY_MINUS	(BINARY |  MINUS)
-#define COMMA		(BINARY |  3)
-				/* The "," operator is a low precedence binary
+    BINARY_PLUS = (BINARY | PLUS),
+    BINARY_MINUS = (BINARY | MINUS),
+    COMMA =	(BINARY | 3),	/* The "," operator is a low precedence binary
 				 * operator that separates the arguments in a
 				 * function call. The additional constraint
 				 * that this operator can only legally appear
 				 * at the right places within a function call
 				 * argument list are hard coded within
-				 * ParseExpr().  */
-#define MULT		(BINARY |  4)
-#define DIVIDE		(BINARY |  5)
-#define MOD		(BINARY |  6)
-#define LESS		(BINARY |  7)
-#define GREATER		(BINARY |  8)
-#define BIT_AND		(BINARY |  9)
-#define BIT_XOR		(BINARY | 10)
-#define BIT_OR		(BINARY | 11)
-#define QUESTION	(BINARY | 12)
-				/* These two lexemes make up the */
-#define COLON		(BINARY | 13)
-				/* ternary conditional operator, $x ? $y : $z.
+				 * ParseExpr(). */
+    MULT =	(BINARY | 4),
+    DIVIDE =	(BINARY | 5),
+    MOD =	(BINARY | 6),
+    LESS =	(BINARY | 7),
+    GREATER =	(BINARY | 8),
+    BIT_AND =	(BINARY | 9),
+    BIT_XOR =	(BINARY | 10),
+    BIT_OR =	(BINARY | 11),
+    QUESTION =	(BINARY | 12),	/* These two lexemes make up the */
+    COLON =	(BINARY | 13),	/* ternary conditional operator, $x ? $y : $z.
 				 * We treat them as two binary operators to
 				 * avoid another lexeme category, and code the
 				 * additional constraints directly in
 				 * ParseExpr(). For instance, the right
 				 * operand of a "?" operator must be a ":"
 				 * operator. */
-#define LEFT_SHIFT	(BINARY | 14)
-#define RIGHT_SHIFT	(BINARY | 15)
-#define LEQ		(BINARY | 16)
-#define GEQ		(BINARY | 17)
-#define EQUAL		(BINARY | 18)
-#define NEQ		(BINARY | 19)
-#define AND		(BINARY | 20)
-#define OR		(BINARY | 21)
-#define STREQ		(BINARY | 22)
-#define STRNEQ		(BINARY | 23)
-#define EXPON		(BINARY | 24)
-				/* Unlike the other binary operators, EXPON is
+    LEFT_SHIFT =  (BINARY | 14),
+    RIGHT_SHIFT = (BINARY | 15),
+    LEQ	=	(BINARY | 16),
+    GEQ =	(BINARY | 17),
+    EQUAL =	(BINARY | 18),
+    NEQ =	(BINARY | 19),
+    AND =	(BINARY | 20),
+    OR =	(BINARY | 21),
+    STREQ =	(BINARY | 22),
+    STRNEQ =	(BINARY | 23),
+    EXPON =	(BINARY | 24),	/* Unlike the other binary operators, EXPON is
 				 * right associative and this distinction is
 				 * coded directly in ParseExpr(). */
-#define IN_LIST		(BINARY | 25)
-#define NOT_IN_LIST	(BINARY | 26)
-#define CLOSE_PAREN	(BINARY | 27)
-				/* By categorizing the CLOSE_PAREN lexeme as a
+    IN_LIST =	(BINARY | 25),
+    NOT_IN_LIST = (BINARY | 26),
+    CLOSE_PAREN = (BINARY | 27),/* By categorizing the CLOSE_PAREN lexeme as a
 				 * BINARY operator, the normal parsing rules
 				 * for binary operators assure that a close
 				 * paren will not directly follow another
@@ -283,17 +272,17 @@ enum Marks {
 				 * parse tree. The sub-expression between
 				 * parens becomes the single argument of the
 				 * matching OPEN_PAREN unary operator. */
-#define STR_LT		(BINARY | 28)
-#define STR_GT		(BINARY | 29)
-#define STR_LEQ		(BINARY | 30)
-#define STR_GEQ		(BINARY | 31)
-#define END		(BINARY | 32)
-				/* This lexeme represents the end of the
+    STR_LT = (BINARY | 28),
+    STR_GT = (BINARY | 29),
+    STR_LEQ = (BINARY | 30),
+    STR_GEQ = (BINARY | 31),
+    END = (BINARY | 32),	/* This lexeme represents the end of the
 				 * string being parsed. Treating it as a
 				 * binary operator follows the same logic as
 				 * the CLOSE_PAREN lexeme and END pairs with
 				 * START, in the same way that CLOSE_PAREN
 				 * pairs with OPEN_PAREN. */
+};

 /*
 * When ParseExpr() builds the parse tree it must choose which operands to
@@ -395,21 +395,17 @@ typedef struct CompileEnv {
 * CmdLocation map, and the compilation AuxData array.
 */

-/*
- * A PRECOMPILED bytecode struct is one that was generated from a compiled
- * image rather than implicitly compiled from source
- */
-
-#define TCL_BYTECODE_PRECOMPILED		0x0001
-
-/*
- * When a bytecode is compiled, interp or namespace resolvers have not been
- * applied yet: this is indicated by the TCL_BYTECODE_RESOLVE_VARS flag.
- */
-
-#define TCL_BYTECODE_RESOLVE_VARS		0x0002
-
-#define TCL_BYTECODE_RECOMPILE			0x0004
+enum BytecodeFlags {
+    TCL_BYTECODE_PRECOMPILED = 0x0001,
+				/* A PRECOMPILED bytecode struct is one that
+				 * was generated from a compiled image rather
+				 * than implicitly compiled from source. */
+    TCL_BYTECODE_RESOLVE_VARS = 0x0002,
+				/* When a bytecode is compiled, interp or
+				 * namespace resolvers have not been applied
+				 * yet: this is indicated by the this flag. */
+    TCL_BYTECODE_RECOMPILE = 0x0004
+};

 typedef struct ByteCode {
    TclHandle interpHandle;	/* Handle for interpreter containing the
@@ -540,316 +536,306 @@ typedef struct ByteCode {
 * tclExecute.c.
 */

-/* Opcodes 0 to 9 */
-#define INST_DONE			0
-#define INST_PUSH1			1
-#define INST_PUSH4			2
-#define INST_POP			3
-#define INST_DUP			4
-#define INST_STR_CONCAT1		5
-#define INST_INVOKE_STK1		6
-#define INST_INVOKE_STK4		7
-#define INST_EVAL_STK			8
-#define INST_EXPR_STK			9
+#ifdef _BUILD_TCL_EXECUTE
+#define IS_DEPRECATED /* nothing */
+#else
+#define IS_DEPRECATED TCL_DEPRECATED_API("no longer used")
+#endif /* _BUILD_TCL_EXECUTE*/

-/* Opcodes 10 to 23 */
-#define INST_LOAD_SCALAR1		10
-#define INST_LOAD_SCALAR4		11
-#define INST_LOAD_SCALAR_STK		12
-#define INST_LOAD_ARRAY1		13
-#define INST_LOAD_ARRAY4		14
-#define INST_LOAD_ARRAY_STK		15
-#define INST_LOAD_STK			16
-#define INST_STORE_SCALAR1		17
-#define INST_STORE_SCALAR4		18
-#define INST_STORE_SCALAR_STK		19
-#define INST_STORE_ARRAY1		20
-#define INST_STORE_ARRAY4		21
-#define INST_STORE_ARRAY_STK		22
-#define INST_STORE_STK			23
+enum TclBytecodeOpcodes {
+    /* Opcodes 0 to 9: Basic operations */
+    INST_DONE = 0,
+    INST_PUSH1 = 1,
+    INST_PUSH4 = 2,
+    INST_POP = 3,
+    INST_DUP = 4,
+    INST_STR_CONCAT1 = 5,
+    INST_INVOKE_STK1 = 6,
+    INST_INVOKE_STK4 = 7,
+    INST_EVAL_STK = 8,
+    INST_EXPR_STK = 9,

-/* Opcodes 24 to 33 */
-#define INST_INCR_SCALAR1		24
-#define INST_INCR_SCALAR_STK		25
-#define INST_INCR_ARRAY1		26
-#define INST_INCR_ARRAY_STK		27
-#define INST_INCR_STK			28
-#define INST_INCR_SCALAR1_IMM		29
-#define INST_INCR_SCALAR_STK_IMM	30
-#define INST_INCR_ARRAY1_IMM		31
-#define INST_INCR_ARRAY_STK_IMM		32
-#define INST_INCR_STK_IMM		33
+    /* Opcodes 10 to 23: LOAD and STORE */
+    INST_LOAD_SCALAR1 = 10,
+    INST_LOAD_SCALAR4 = 11,
+    INST_LOAD_SCALAR_STK = 12,
+    INST_LOAD_ARRAY1 = 13,
+    INST_LOAD_ARRAY4 = 14,
+    INST_LOAD_ARRAY_STK = 15,
+    INST_LOAD_STK = 16,
+    INST_STORE_SCALAR1 = 17,
+    INST_STORE_SCALAR4 = 18,
+    INST_STORE_SCALAR_STK = 19,
+    INST_STORE_ARRAY1 = 20,
+    INST_STORE_ARRAY4 = 21,
+    INST_STORE_ARRAY_STK = 22,
+    INST_STORE_STK = 23,

-/* Opcodes 34 to 39 */
-#define INST_JUMP1			34
-#define INST_JUMP4			35
-#define INST_JUMP_TRUE1			36
-#define INST_JUMP_TRUE4			37
-#define INST_JUMP_FALSE1		38
-#define INST_JUMP_FALSE4		39
+    /* Opcodes 24 to 33: INCR */
+    INST_INCR_SCALAR1 = 24,
+    INST_INCR_SCALAR_STK = 25,
+    INST_INCR_ARRAY1 = 26,
+    INST_INCR_ARRAY_STK = 27,
+    INST_INCR_STK = 28,
+    INST_INCR_SCALAR1_IMM = 29,
+    INST_INCR_SCALAR_STK_IMM = 30,
+    INST_INCR_ARRAY1_IMM = 31,
+    INST_INCR_ARRAY_STK_IMM = 32,
+    INST_INCR_STK_IMM = 33,

-/* Opcodes 40 to 64 */
-#define INST_LOR			40
-#define INST_LAND			41
-#define INST_BITOR			42
-#define INST_BITXOR			43
-#define INST_BITAND			44
-#define INST_EQ				45
-#define INST_NEQ			46
-#define INST_LT				47
-#define INST_GT				48
-#define INST_LE				49
-#define INST_GE				50
-#define INST_LSHIFT			51
-#define INST_RSHIFT			52
-#define INST_ADD			53
-#define INST_SUB			54
-#define INST_MULT			55
-#define INST_DIV			56
-#define INST_MOD			57
-#define INST_UPLUS			58
-#define INST_UMINUS			59
-#define INST_BITNOT			60
-#define INST_LNOT			61
-#define INST_CALL_BUILTIN_FUNC1		62
-#define INST_CALL_FUNC1			63
-#define INST_TRY_CVT_TO_NUMERIC		64
+    /* Opcodes 34 to 39: JUMP */
+    INST_JUMP1 = 34,
+    INST_JUMP4 = 35,
+    INST_JUMP_TRUE1 = 36,
+    INST_JUMP_TRUE4 = 37,
+    INST_JUMP_FALSE1 = 38,
+    INST_JUMP_FALSE4 = 39,

-/* Opcodes 65 to 66 */
-#define INST_BREAK			65
-#define INST_CONTINUE			66
+    /* Opcodes 40 to 64: Expression implementation */
+    INST_LOR = 40,
+    INST_LAND = 41,
+    INST_BITOR = 42,
+    INST_BITXOR = 43,
+    INST_BITAND = 44,
+    INST_EQ = 45,
+    INST_NEQ = 46,
+    INST_LT = 47,
+    INST_GT = 48,
+    INST_LE = 49,
+    INST_GE = 50,
+    INST_LSHIFT = 51,
+    INST_RSHIFT = 52,
+    INST_ADD = 53,
+    INST_SUB = 54,
+    INST_MULT = 55,
+    INST_DIV = 56,
+    INST_MOD = 57,
+    INST_UPLUS = 58,
+    INST_UMINUS = 59,
+    INST_BITNOT = 60,
+    INST_LNOT = 61,
+#ifndef NO_DEPRECATED_BYTECODES
+    INST_CALL_BUILTIN_FUNC1 IS_DEPRECATED = 62,
+    INST_CALL_FUNC1 IS_DEPRECATED = 63,
+#endif
+    INST_TRY_CVT_TO_NUMERIC = 64,

-/* Opcodes 67 to 68 */
-#define INST_FOREACH_START4		67 /* DEPRECATED */
-#define INST_FOREACH_STEP4		68 /* DEPRECATED */
+    /* Opcodes 65 to 66: Local exceptions */
+    INST_BREAK = 65,
+    INST_CONTINUE = 66,

-/* Opcodes 69 to 72 */
-#define INST_BEGIN_CATCH4		69
-#define INST_END_CATCH			70
-#define INST_PUSH_RESULT		71
-#define INST_PUSH_RETURN_CODE		72
+#ifndef NO_DEPRECATED_BYTECODES
+    /* Opcodes 67 to 68: Old Foreach */
+    INST_FOREACH_START4 IS_DEPRECATED = 67,
+    INST_FOREACH_STEP4 IS_DEPRECATED = 68,
+#endif

-/* Opcodes 73 to 78 */
-#define INST_STR_EQ			73
-#define INST_STR_NEQ			74
-#define INST_STR_CMP			75
-#define INST_STR_LEN			76
-#define INST_STR_INDEX			77
-#define INST_STR_MATCH			78
+    /* Opcodes 69 to 72: Catch */
+    INST_BEGIN_CATCH4 = 69,
+    INST_END_CATCH = 70,
+    INST_PUSH_RESULT = 71,
+    INST_PUSH_RETURN_CODE = 72,

-/* Opcodes 78 to 81 */
-#define INST_LIST			79
-#define INST_LIST_INDEX			80
-#define INST_LIST_LENGTH		81
+    /* Opcodes 73 to 78: misc string ops */
+    INST_STR_EQ = 73,
+    INST_STR_NEQ = 74,
+    INST_STR_CMP = 75,
+    INST_STR_LEN = 76,
+    INST_STR_INDEX = 77,
+    INST_STR_MATCH = 78,

-/* Opcodes 82 to 87 */
-#define INST_APPEND_SCALAR1		82
-#define INST_APPEND_SCALAR4		83
-#define INST_APPEND_ARRAY1		84
-#define INST_APPEND_ARRAY4		85
-#define INST_APPEND_ARRAY_STK		86
-#define INST_APPEND_STK			87
+    /* Opcodes 78 to 81: misc list ops */
+    INST_LIST = 79,
+    INST_LIST_INDEX = 80,
+    INST_LIST_LENGTH = 81,

-/* Opcodes 88 to 93 */
-#define INST_LAPPEND_SCALAR1		88
-#define INST_LAPPEND_SCALAR4		89
-#define INST_LAPPEND_ARRAY1		90
-#define INST_LAPPEND_ARRAY4		91
-#define INST_LAPPEND_ARRAY_STK		92
-#define INST_LAPPEND_STK		93
+    /* Opcodes 82 to 87: APPEND */
+    INST_APPEND_SCALAR1 = 82,
+    INST_APPEND_SCALAR4 = 83,
+    INST_APPEND_ARRAY1 = 84,
+    INST_APPEND_ARRAY4 = 85,
+    INST_APPEND_ARRAY_STK = 86,
+    INST_APPEND_STK = 87,

-/* TIP #22 - LINDEX operator with flat arg list */
+    /* Opcodes 88 to 93: LAPPEND */
+    INST_LAPPEND_SCALAR1 = 88,
+    INST_LAPPEND_SCALAR4 = 89,
+    INST_LAPPEND_ARRAY1 = 90,
+    INST_LAPPEND_ARRAY4 = 91,
+    INST_LAPPEND_ARRAY_STK = 92,
+    INST_LAPPEND_STK = 93,

-#define INST_LIST_INDEX_MULTI		94
+    /* TIP #22 - LINDEX operator with flat arg list */
+    INST_LIST_INDEX_MULTI = 94,

-/*
- * TIP #33 - 'lset' command. Code gen also required a Forth-like
- *	     OVER operation.
- */
+    /* TIP #33 - 'lset' command. Code gen also required a Forth-like OVER
+     * operation. */
+    INST_OVER = 95,
+    INST_LSET_LIST = 96,
+    INST_LSET_FLAT = 97,

-#define INST_OVER			95
-#define INST_LSET_LIST			96
-#define INST_LSET_FLAT			97
+    /* TIP#90 - 'return' command. */
+    INST_RETURN_IMM = 98,

-/* TIP#90 - 'return' command. */
+    /* TIP#123 - exponentiation operator. */
+    INST_EXPON = 99,

-#define INST_RETURN_IMM			98
+    /* TIP #157 - {*}... (word expansion) language syntax support. */
+    INST_EXPAND_START = 100,
+    INST_EXPAND_STKTOP = 101,
+    INST_INVOKE_EXPANDED = 102,

-/* TIP#123 - exponentiation operator. */
+    /* TIP #57 - 'lassign' command. Code generation requires immediate LINDEX
+     * and LRANGE operators. */
+    INST_LIST_INDEX_IMM = 103,
+    INST_LIST_RANGE_IMM = 104,

-#define INST_EXPON			99
+    INST_START_CMD = 105,

-/* TIP #157 - {*}... (word expansion) language syntax support. */
+    INST_LIST_IN = 106,
+    INST_LIST_NOT_IN = 107,

-#define INST_EXPAND_START		100
-#define INST_EXPAND_STKTOP		101
-#define INST_INVOKE_EXPANDED		102
+    INST_PUSH_RETURN_OPTIONS = 108,
+    INST_RETURN_STK = 109,

-/*
- * TIP #57 - 'lassign' command. Code generation requires immediate
- *	     LINDEX and LRANGE operators.
- */
+    /* Dictionary (TIP#111) related commands. */
+    INST_DICT_GET = 110,
+    INST_DICT_SET = 111,
+    INST_DICT_UNSET = 112,
+    INST_DICT_INCR_IMM = 113,
+    INST_DICT_APPEND = 114,
+    INST_DICT_LAPPEND = 115,
+    INST_DICT_FIRST = 116,
+    INST_DICT_NEXT = 117,
+    INST_DICT_DONE = 118,
+    INST_DICT_UPDATE_START = 119,
+    INST_DICT_UPDATE_END = 120,

-#define INST_LIST_INDEX_IMM		103
-#define INST_LIST_RANGE_IMM		104
+    /* Instruction to support jumps defined by tables (instead of the classic
+     * [switch] technique of chained comparisons). */
+    INST_JUMP_TABLE = 121,

-#define INST_START_CMD			105
+    /* Instructions to support compilation of global, variable, upvar and
+     * [namespace upvar]. */
+    INST_UPVAR = 122,
+    INST_NSUPVAR = 123,
+    INST_VARIABLE = 124,

-#define INST_LIST_IN			106
-#define INST_LIST_NOT_IN		107
+    /* Instruction to support compiling syntax error to bytecode */
+    INST_SYNTAX = 125,

-#define INST_PUSH_RETURN_OPTIONS	108
-#define INST_RETURN_STK			109
+    /* Instruction to reverse N items on top of stack */
+    INST_REVERSE = 126,

-/*
- * Dictionary (TIP#111) related commands.
- */
+    /* regexp instruction */
+    INST_REGEXP = 127,

-#define INST_DICT_GET			110
-#define INST_DICT_SET			111
-#define INST_DICT_UNSET			112
-#define INST_DICT_INCR_IMM		113
-#define INST_DICT_APPEND		114
-#define INST_DICT_LAPPEND		115
-#define INST_DICT_FIRST			116
-#define INST_DICT_NEXT			117
-#define INST_DICT_DONE			118
-#define INST_DICT_UPDATE_START		119
-#define INST_DICT_UPDATE_END		120
+    /* For [info exists] compilation */
+    INST_EXIST_SCALAR = 128,
+    INST_EXIST_ARRAY = 129,
+    INST_EXIST_ARRAY_STK = 130,
+    INST_EXIST_STK = 131,

-/*
- * Instruction to support jumps defined by tables (instead of the classic
- * [switch] technique of chained comparisons).
- */
+    /* For [subst] compilation */
+    INST_NOP = 132,
+    INST_RETURN_CODE_BRANCH = 133,

-#define INST_JUMP_TABLE			121
+    /* For [unset] compilation */
+    INST_UNSET_SCALAR = 134,
+    INST_UNSET_ARRAY = 135,
+    INST_UNSET_ARRAY_STK = 136,
+    INST_UNSET_STK = 137,

-/*
- * Instructions to support compilation of global, variable, upvar and
- * [namespace upvar].
- */
+    /* For [dict with], [dict exists], [dict create] and [dict merge] */
+    INST_DICT_EXPAND = 138,
+    INST_DICT_RECOMBINE_STK = 139,
+    INST_DICT_RECOMBINE_IMM = 140,
+    INST_DICT_EXISTS = 141,
+    INST_DICT_VERIFY = 142,

-#define INST_UPVAR			122
-#define INST_NSUPVAR			123
-#define INST_VARIABLE			124
+    /* For [string map] and [regsub] compilation */
+    INST_STR_MAP = 143,
+    INST_STR_FIND = 144,
+    INST_STR_FIND_LAST = 145,
+    INST_STR_RANGE_IMM = 146,
+    INST_STR_RANGE = 147,

-/* Instruction to support compiling syntax error to bytecode */
+    /* For operations to do with coroutines and other NRE-manipulators */
+    INST_YIELD = 148,
+    INST_COROUTINE_NAME = 149,
+    INST_TAILCALL = 150,

-#define INST_SYNTAX			125
+    /* For compilation of basic information operations */
+    INST_NS_CURRENT = 151,
+    INST_INFO_LEVEL_NUM = 152,
+    INST_INFO_LEVEL_ARGS = 153,
+    INST_RESOLVE_COMMAND = 154,

-/* Instruction to reverse N items on top of stack */
+    /* For compilation relating to TclOO */
+    INST_TCLOO_SELF = 155,
+    INST_TCLOO_CLASS = 156,
+    INST_TCLOO_NS = 157,
+    INST_TCLOO_IS_OBJECT = 158,

-#define INST_REVERSE			126
+    /* For compilation of [array] subcommands */
+    INST_ARRAY_EXISTS_STK = 159,
+    INST_ARRAY_EXISTS_IMM = 160,
+    INST_ARRAY_MAKE_STK = 161,
+    INST_ARRAY_MAKE_IMM = 162,

-/* regexp instruction */
+    INST_INVOKE_REPLACE = 163,

-#define INST_REGEXP			127
+    INST_LIST_CONCAT = 164,

-/* For [info exists] compilation */
-#define INST_EXIST_SCALAR		128
-#define INST_EXIST_ARRAY		129
-#define INST_EXIST_ARRAY_STK		130
-#define INST_EXIST_STK			131
+    INST_EXPAND_DROP = 165,

-/* For [subst] compilation */
-#define INST_NOP			132
-#define INST_RETURN_CODE_BRANCH		133
+    /* New foreach implementation */
+    INST_FOREACH_START = 166,
+    INST_FOREACH_STEP = 167,
+    INST_FOREACH_END = 168,
+    INST_LMAP_COLLECT = 169,

-/* For [unset] compilation */
-#define INST_UNSET_SCALAR		134
-#define INST_UNSET_ARRAY		135
-#define INST_UNSET_ARRAY_STK		136
-#define INST_UNSET_STK			137
+    /* For compilation of [string trim] and related */
+    INST_STR_TRIM = 170,
+    INST_STR_TRIM_LEFT = 171,
+    INST_STR_TRIM_RIGHT = 172,

-/* For [dict with], [dict exists], [dict create] and [dict merge] */
-#define INST_DICT_EXPAND		138
-#define INST_DICT_RECOMBINE_STK		139
-#define INST_DICT_RECOMBINE_IMM		140
-#define INST_DICT_EXISTS		141
-#define INST_DICT_VERIFY		142
+    INST_CONCAT_STK = 173,

-/* For [string map] and [regsub] compilation */
-#define INST_STR_MAP			143
-#define INST_STR_FIND			144
-#define INST_STR_FIND_LAST		145
-#define INST_STR_RANGE_IMM		146
-#define INST_STR_RANGE			147
+    INST_STR_UPPER = 174,
+    INST_STR_LOWER = 175,
+    INST_STR_TITLE = 176,
+    INST_STR_REPLACE = 177,

-/* For operations to do with coroutines and other NRE-manipulators */
-#define INST_YIELD			148
-#define INST_COROUTINE_NAME		149
-#define INST_TAILCALL			150
+    INST_ORIGIN_COMMAND = 178,

-/* For compilation of basic information operations */
-#define INST_NS_CURRENT			151
-#define INST_INFO_LEVEL_NUM		152
-#define INST_INFO_LEVEL_ARGS		153
-#define INST_RESOLVE_COMMAND		154
+    INST_TCLOO_NEXT = 179,
+    INST_TCLOO_NEXT_CLASS = 180,

-/* For compilation relating to TclOO */
-#define INST_TCLOO_SELF			155
-#define INST_TCLOO_CLASS		156
-#define INST_TCLOO_NS			157
-#define INST_TCLOO_IS_OBJECT		158
+    INST_YIELD_TO_INVOKE = 181,

-/* For compilation of [array] subcommands */
-#define INST_ARRAY_EXISTS_STK		159
-#define INST_ARRAY_EXISTS_IMM		160
-#define INST_ARRAY_MAKE_STK		161
-#define INST_ARRAY_MAKE_IMM		162
+    INST_NUM_TYPE = 182,
+    INST_TRY_CVT_TO_BOOLEAN = 183,
+    INST_STR_CLASS = 184,

-#define INST_INVOKE_REPLACE		163
+    INST_LAPPEND_LIST = 185,
+    INST_LAPPEND_LIST_ARRAY = 186,
+    INST_LAPPEND_LIST_ARRAY_STK = 187,
+    INST_LAPPEND_LIST_STK = 188,

-#define INST_LIST_CONCAT		164
+    INST_CLOCK_READ = 189,

-#define INST_EXPAND_DROP		165
+    INST_DICT_GET_DEF = 190,

-/* New foreach implementation */
-#define INST_FOREACH_START              166
-#define INST_FOREACH_STEP               167
-#define INST_FOREACH_END                168
-#define INST_LMAP_COLLECT               169
+    /* TIP 461 */
+    INST_STR_LT = 191,
+    INST_STR_GT = 192,
+    INST_STR_LE = 193,
+    INST_STR_GE = 194,

-/* For compilation of [string trim] and related */
-#define INST_STR_TRIM			170
-#define INST_STR_TRIM_LEFT		171
-#define INST_STR_TRIM_RIGHT		172
-
-#define INST_CONCAT_STK			173
-
-#define INST_STR_UPPER			174
-#define INST_STR_LOWER			175
-#define INST_STR_TITLE			176
-#define INST_STR_REPLACE		177
-
-#define INST_ORIGIN_COMMAND		178
-
-#define INST_TCLOO_NEXT			179
-#define INST_TCLOO_NEXT_CLASS		180
-
-#define INST_YIELD_TO_INVOKE		181
-
-#define INST_NUM_TYPE			182
-#define INST_TRY_CVT_TO_BOOLEAN		183
-#define INST_STR_CLASS			184
-
-#define INST_LAPPEND_LIST		185
-#define INST_LAPPEND_LIST_ARRAY		186
-#define INST_LAPPEND_LIST_ARRAY_STK	187
-#define INST_LAPPEND_LIST_STK		188
-
-#define INST_CLOCK_READ			189
-
-#define INST_DICT_GET_DEF		190
-
-/* TIP 461 */
-#define INST_STR_LT			191
-#define INST_STR_GT			192
-#define INST_STR_LE			193
-#define INST_STR_GE			194
-
-/* The last opcode */
-#define LAST_INST_OPCODE		194
+    /* The last opcode */
+    LAST_INST_OPCODE = 194
+};

 /*
 * Table describing the Tcl bytecode instructions: their name (for displaying
@@ -922,9 +908,8 @@ typedef enum InstStringClassType {
    STR_CLASS_UPPER,		/* Unicode upper-case alphabet characters. */
    STR_CLASS_WORD,		/* Unicode word (alphabetic, digit, connector
 				 * punctuation) characters. */
-    STR_CLASS_XDIGIT,		/* Characters that can be used as digits in
+    STR_CLASS_XDIGIT		/* Characters that can be used as digits in
 				 * hexadecimal numbers ([0-9A-Fa-f]). */
-    STR_CLASS_UNICODE		/* Unicode characters. */
 } InstStringClassType;

 typedef struct StringClassDesc {
@@ -1238,9 +1223,11 @@ MODULE_SCOPE int	TclPushProcCallFrame(ClientData clientData,
 #define TclFetchAuxData(envPtr, index) \
    (envPtr)->auxDataArrayPtr[(index)].clientData

-#define LITERAL_ON_HEAP		0x01
-#define LITERAL_CMD_NAME	0x02
-#define LITERAL_UNSHARED	0x04
+enum LiteralFlags {
+    LITERAL_ON_HEAP = 0x01,
+    LITERAL_CMD_NAME = 0x02,
+    LITERAL_UNSHARED = 0x04
+};

 /*
 * Macro used to manually adjust the stack requirements; used in cases where
@@ -1937,8 +1937,6 @@ EXTERN int		Tcl_UtfCharComplete(const char *src, int length);
 EXTERN const char *	Tcl_UtfNext(const char *src);
 /* 656 */
 EXTERN const char *	Tcl_UtfPrev(const char *src, const char *start);
-/* 657 */
-EXTERN int		Tcl_UniCharIsUnicode(int ch);

 typedef struct {
    const struct TclPlatStubs *tclPlatStubs;
@@ -2631,7 +2629,6 @@ typedef struct TclStubs {
    int (*tcl_UtfCharComplete) (const char *src, int length); /* 654 */
    const char * (*tcl_UtfNext) (const char *src); /* 655 */
    const char * (*tcl_UtfPrev) (const char *src, const char *start); /* 656 */
-    int (*tcl_UniCharIsUnicode) (int ch); /* 657 */
 } TclStubs;

 extern const TclStubs *tclStubsPtr;
@@ -3974,8 +3971,6 @@ extern const TclStubs *tclStubsPtr;
 	(tclStubsPtr->tcl_UtfNext) /* 655 */
 #define Tcl_UtfPrev \
 	(tclStubsPtr->tcl_UtfPrev) /* 656 */
-#define Tcl_UniCharIsUnicode \
-	(tclStubsPtr->tcl_UniCharIsUnicode) /* 657 */

 #endif /* defined(USE_TCL_STUBS) */

@@ -950,7 +950,7 @@ Tcl_DictObjPut(
    TclInvalidateStringRep(dictPtr);
    hPtr = CreateChainEntry(dict, keyPtr, &isNew);
    dict->refCount++;
-    TclFreeIntRep(dictPtr)
+    TclFreeIntRep(dictPtr);
    DictSetIntRep(dictPtr, dict);
    Tcl_IncrRefCount(valuePtr);
    if (!isNew) {
@@ -127,10 +127,12 @@ typedef struct {
 * file.
 */

-#define ENCODING_SINGLEBYTE	0
-#define ENCODING_DOUBLEBYTE	1
-#define ENCODING_MULTIBYTE	2
-#define ENCODING_ESCAPE		3
+enum EncodingTypes {
+    ENCODING_SINGLEBYTE = 0,
+    ENCODING_DOUBLEBYTE = 1,
+    ENCODING_MULTIBYTE = 2,
+    ENCODING_ESCAPE = 3
+};

 /*
 * A list of directories in which Tcl should look for *.enc files. This list
@@ -510,12 +512,17 @@ FillEncodingFileMap(void)
 *---------------------------------------------------------------------------
 */

-/* Those flags must not conflict with other TCL_ENCODING_* flags in tcl.h */
-/* Since TCL_ENCODING_MODIFIED is only used for utf-8/cesu-8 and
- * TCL_ENCODING_LE is only used for  utf-16/ucs-2. re-use the same value */
-#define TCL_ENCODING_MODIFIED	0x20	/* Converting NULL bytes to 0xC0 0x80 */
-#define TCL_ENCODING_LE		TCL_ENCODING_MODIFIED	/* Little-endian encoding */
-#define TCL_ENCODING_UTF	0x200	/* For UTF-8 encoding, allow 4-byte output sequences */
+/* These flags must not conflict with other TCL_ENCODING_* flags in tcl.h */
+enum EncodingFlags {
+    TCL_ENCODING_MODIFIED = 0x20,
+				/* Converting NULL bytes to 0xC0 0x80 */
+    /*
+     * Since TCL_ENCODING_MODIFIED is only used for utf-8 and TCL_ENCODING_LE
+     * is only used for utf-16/ucs-2, re-use the same value.
+     */
+    TCL_ENCODING_LE = TCL_ENCODING_MODIFIED
+				/* Little-endian encoding */
+};

 void
 TclInitEncodingSubsystem(void)
@@ -557,10 +564,7 @@ TclInitEncodingSubsystem(void)
    type.fromUtfProc	= UtfToUtfProc;
    type.freeProc	= NULL;
    type.nullSize	= 1;
-    type.clientData	= INT2PTR(TCL_ENCODING_UTF);
-    Tcl_CreateEncoding(&type);
-    type.clientData	= INT2PTR(0);
-    type.encodingName	= "cesu-8";
+    type.clientData	= NULL;
    Tcl_CreateEncoding(&type);

    type.toUtfProc	= Utf16ToUtfProc;
@@ -1145,7 +1149,7 @@ Tcl_ExternalToUtfDString(

    flags = TCL_ENCODING_START | TCL_ENCODING_END;
    if (encodingPtr->toUtfProc == UtfToUtfProc) {
-	flags |= TCL_ENCODING_MODIFIED | TCL_ENCODING_UTF;
+	flags |= TCL_ENCODING_MODIFIED;
    }

    while (1) {
@@ -1262,7 +1266,7 @@ Tcl_ExternalToUtf(
 	dstLen--;
    }
    if (encodingPtr->toUtfProc == UtfToUtfProc) {
-	flags |= TCL_ENCODING_MODIFIED | TCL_ENCODING_UTF;
+	flags |= TCL_ENCODING_MODIFIED;
    }
    do {
 	Tcl_EncodingState savedState = *statePtr;
@@ -1341,7 +1345,6 @@ Tcl_UtfToExternalDString(
 		&srcRead, &dstWrote, &dstChars);
 	soFar = dst + dstWrote - Tcl_DStringValue(dstPtr);

-	src += srcRead;
 	if (result != TCL_CONVERT_NOSPACE) {
 	    if (encodingPtr->nullSize == 2) {
 		Tcl_DStringSetLength(dstPtr, soFar + 1);
@@ -1351,6 +1354,7 @@ Tcl_UtfToExternalDString(
 	}

 	flags &= ~TCL_ENCODING_START;
+	src += srcRead;
 	srcLen -= srcRead;
 	if (Tcl_DStringLength(dstPtr) == 0) {
 	    Tcl_DStringSetLength(dstPtr, dstLen);
@@ -2219,7 +2223,7 @@ UtfToUtfProc(

    dstStart = dst;
    flags |= PTR2INT(clientData);
-    dstEnd = dst + dstLen - ((flags & TCL_ENCODING_UTF) ? TCL_UTF_MAX : 6);
+    dstEnd = dst + dstLen - TCL_UTF_MAX;

    for (numChars = 0; src < srcEnd && numChars <= charLimit; numChars++) {
 	if ((src > srcClose) && (!Tcl_UtfCharComplete(src, srcEnd - src))) {
@@ -2272,7 +2276,6 @@ UtfToUtfProc(
 	    dst += Tcl_UniCharToUtf(ch, dst);
 	} else {
 	    int low;
-	    const char *saveSrc = src;
 	    size_t len = TclUtfToUCS4(src, &ch);
 	    if ((len < 2) && (ch != 0) && (flags & TCL_ENCODING_STOPONERROR)
 		    && (flags & TCL_ENCODING_MODIFIED)) {
@@ -2280,17 +2283,7 @@ UtfToUtfProc(
 		break;
 	    }
 	    src += len;
-	    if (!(flags & TCL_ENCODING_UTF)) {
-		if (ch > 0xFFFF) {
-		    /* CESU-8 6-byte sequence for chars > U+FFFF */
-		    ch -= 0x10000;
-		    *dst++ = 0xED;
-		    *dst++ = (char) (((ch >> 16) & 0x0F) | 0xA0);
-		    *dst++ = (char) (((ch >> 10) & 0x3F) | 0x80);
-		    ch = (ch & 0x0CFF) | 0xDC00;
-		}
-		goto cesu8;
-	    } else if ((ch | 0x7FF) == 0xDFFF) {
+	    if ((ch | 0x7FF) == 0xDFFF) {
 		/*
 		 * A surrogate character is detected, handle especially.
 		 */
@@ -2299,15 +2292,6 @@ UtfToUtfProc(
 		len = (src <= srcEnd-3) ? TclUtfToUCS4(src, &low) : 0;

 		if (((low & ~0x3FF) != 0xDC00) || (ch & 0x400)) {
-		    if (flags & TCL_ENCODING_STOPONERROR) {
-			result = TCL_CONVERT_UNKNOWN;
-			src = saveSrc;
-			break;
-		    }
-		    if (!(flags & TCL_ENCODING_MODIFIED)) {
-			ch = 0xFFFD;
-		    }
-		cesu8:
 		    *dst++ = (char) (((ch >> 12) | 0xE0) & 0xEF);
 		    *dst++ = (char) (((ch >> 6) | 0x80) & 0xBF);
 		    *dst++ = (char) ((ch | 0x80) & 0xBF);
@@ -2316,15 +2300,6 @@ UtfToUtfProc(
 		src += len;
 		dst += Tcl_UniCharToUtf(ch, dst);
 		ch = low;
-	    } else if (!Tcl_UniCharIsUnicode(ch)) {
-		if (flags & TCL_ENCODING_STOPONERROR) {
-		    result = TCL_CONVERT_UNKNOWN;
-		    src = saveSrc;
-		    break;
-		}
-		if (!(flags & TCL_ENCODING_MODIFIED)) {
-		    ch = 0xFFFD;
-		}
 	    }
 	    dst += Tcl_UniCharToUtf(ch, dst);
 	}
@@ -2483,7 +2458,7 @@ UtfToUtf16Proc(
 {
    const char *srcStart, *srcEnd, *srcClose, *dstStart, *dstEnd;
    int result, numChars;
-    int ch, len;
+    int ch;

    srcStart = src;
    srcEnd = src + srcLen;
@@ -2511,15 +2486,7 @@ UtfToUtf16Proc(
 	    result = TCL_CONVERT_NOSPACE;
 	    break;
 	}
-	len = TclUtfToUCS4(src, &ch);
-	if (!Tcl_UniCharIsUnicode(ch)) {
-	    if (flags & TCL_ENCODING_STOPONERROR) {
-		result = TCL_CONVERT_UNKNOWN;
-		break;
-	    }
-	    ch = 0xFFFD;
-	}
-	src += len;
+	src += TclUtfToUCS4(src, &ch);
 	if (flags & TCL_ENCODING_LE) {
 	    if (ch <= 0xFFFF) {
 		*dst++ = (ch & 0xFF);
@@ -15,6 +15,8 @@
 * this file, and for a DISCLAIMER OF ALL WARRANTIES.
 */

+#define _BUILD_TCL_EXECUTE 1	/* Disable some warnings */
+
 #include "tclInt.h"
 #include "tclCompile.h"
 #include "tclOOInt.h"
@@ -3660,7 +3660,7 @@ Tcl_CloseEx(
     * That won't do.
     */

-    if (GotFlag(statePtr, CHANNEL_INCLOSE)) {
+    if (statePtr->flags & CHANNEL_INCLOSE) {
 	if (interp) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
                    "illegal recursive call to close through close-handler"
@@ -4321,7 +4321,6 @@ Write(
 				/* State info for channel */
    char *nextNewLine = NULL;
    int endEncoding, saved = 0, total = 0, flushed = 0, needNlFlush = 0;
-    char safe[BUFFER_PADDING];

    if (srcLen) {
        WillWrite(chanPtr);
@@ -4340,7 +4339,7 @@ Write(

    while (srcLen + saved + endEncoding > 0) {
 	ChannelBuffer *bufPtr;
-	char *dst;
+	char *dst, safe[BUFFER_PADDING];
 	int result, srcRead, dstLen, dstWrote, srcLimit = srcLen;

 	if (nextNewLine) {
@@ -4385,7 +4384,7 @@ Write(

 	    ReleaseChannelBuffer(bufPtr);
 	    if (total == 0) {
-		Tcl_SetErrno(EILSEQ);
+		Tcl_SetErrno(EINVAL);
 		return -1;
 	    }
 	    break;
@@ -8606,12 +8605,9 @@ ChannelTimerProc(
    ClientData clientData)
 {
    Channel *chanPtr = (Channel *)clientData;
-
-    /* State info for channel */
    ChannelState *statePtr = chanPtr->state;
+				/* State info for channel */

-	/* Preserve chanPtr to guard against deallocation in Tcl_NotifyChannel. */
-    TclChannelPreserve((Tcl_Channel)chanPtr);
    Tcl_Preserve(statePtr);
    statePtr->timer = NULL;
    if (statePtr->interestMask & TCL_WRITABLE
@@ -8627,27 +8623,22 @@ ChannelTimerProc(
 	Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_WRITABLE);
    }

-    /* The channel may have just been closed from within Tcl_NotifyChannel */
-    if (!GotFlag(statePtr, CHANNEL_INCLOSE)) {
-	if (!GotFlag(statePtr, CHANNEL_NEED_MORE_DATA)
-		&& (statePtr->interestMask & TCL_READABLE)
-		&& (statePtr->inQueueHead != NULL)
-		&& IsBufferReady(statePtr->inQueueHead)) {
-	    /*
-	     * Restart the timer in case a channel handler reenters the event loop
-	     * before UpdateInterest gets called by Tcl_NotifyChannel.
-	     */
+    if (!GotFlag(statePtr, CHANNEL_NEED_MORE_DATA)
+	    && (statePtr->interestMask & TCL_READABLE)
+	    && (statePtr->inQueueHead != NULL)
+	    && IsBufferReady(statePtr->inQueueHead)) {
+	/*
+	 * Restart the timer in case a channel handler reenters the event loop
+	 * before UpdateInterest gets called by Tcl_NotifyChannel.
+	 */

-	    statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
-		    ChannelTimerProc,chanPtr);
-	    Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_READABLE);
-	} else {
-	    UpdateInterest(chanPtr);
-	}
+	statePtr->timer = Tcl_CreateTimerHandler(SYNTHETIC_EVENT_TIME,
+                ChannelTimerProc,chanPtr);
+	Tcl_NotifyChannel((Tcl_Channel) chanPtr, TCL_READABLE);
+    } else {
+	UpdateInterest(chanPtr);
    }
-
    Tcl_Release(statePtr);
-    TclChannelRelease((Tcl_Channel)chanPtr);
 }

 /*
@@ -8712,7 +8703,7 @@ Tcl_CreateChannelHandler(

    /*
     * The remainder of the initialization below is done regardless of whether
-     * this is a new record or a modification of an old one.
+     * or not this is a new record or a modification of an old one.
     */

    chPtr->mask = mask;
@@ -10975,17 +10966,15 @@ Tcl_SetChannelErrorInterp(
    Tcl_Obj *msg)		/* Error message to store. */
 {
    Interp *iPtr = (Interp *) interp;
-    Tcl_Obj *disposePtr = iPtr->chanMsg;
+
+    if (iPtr->chanMsg != NULL) {
+	TclDecrRefCount(iPtr->chanMsg);
+	iPtr->chanMsg = NULL;
+    }

    if (msg != NULL) {
 	iPtr->chanMsg = FixLevelCode(msg);
 	Tcl_IncrRefCount(iPtr->chanMsg);
-    } else {
-	iPtr->chanMsg = NULL;
-    }
-
-    if (disposePtr != NULL) {
-        TclDecrRefCount(disposePtr);
    }
    return;
 }
@@ -11013,17 +11002,15 @@ Tcl_SetChannelError(
    Tcl_Obj *msg)		/* Error message to store. */
 {
    ChannelState *statePtr = ((Channel *) chan)->state;
-    Tcl_Obj *disposePtr = statePtr->chanMsg;
+
+    if (statePtr->chanMsg != NULL) {
+	TclDecrRefCount(statePtr->chanMsg);
+	statePtr->chanMsg = NULL;
+    }

    if (msg != NULL) {
 	statePtr->chanMsg = FixLevelCode(msg);
 	Tcl_IncrRefCount(statePtr->chanMsg);
-    } else {
-	statePtr->chanMsg = NULL;
-    }
-
-    if (disposePtr != NULL) {
-        TclDecrRefCount(disposePtr);
    }
    return;
 }
@@ -68,18 +68,22 @@ static int		ExecuteCallback(TransformChannelData *ctrl,
 * the procedure what to do with the result of the script it calls.
 */

-#define TRANSMIT_DONT	0	/* No transfer to do. */
-#define TRANSMIT_DOWN	1	/* Transfer to the underlying channel. */
-#define TRANSMIT_SELF	2	/* Transfer into our channel. */
-#define TRANSMIT_IBUF	3	/* Transfer to internal input buffer. */
-#define TRANSMIT_NUM	4	/* Transfer number to 'maxRead'. */
+enum TransmitAction {
+    TRANSMIT_DONT = 0,		/* No transfer to do. */
+    TRANSMIT_DOWN = 1,		/* Transfer to the underlying channel. */
+    TRANSMIT_SELF = 2,		/* Transfer into our channel. */
+    TRANSMIT_IBUF = 3,		/* Transfer to internal input buffer. */
+    TRANSMIT_NUM = 4		/* Transfer number to 'maxRead'. */
+};

 /*
 * Codes for 'preserve' of 'ExecuteCallback'.
 */

-#define P_PRESERVE	1
-#define P_NO_PRESERVE	0
+enum PreserveFlags {
+    P_PRESERVE = 1,
+    P_NO_PRESERVE = 0
+};

 /*
 * Strings for the action codes delivered to the script implementing a
@@ -44,7 +44,7 @@ static void		ReflectThread(ClientData clientData, int action);
 static int		ReflectEventRun(Tcl_Event *ev, int flags);
 static int		ReflectEventDelete(Tcl_Event *ev, ClientData cd);
 #endif
-static long long ReflectSeekWide(ClientData clientData,
+static long long        ReflectSeekWide(ClientData clientData,
 			    long long offset, int mode, int *errorCodePtr);
 #ifndef TCL_NO_DEPRECATED
 static int		ReflectSeek(ClientData clientData, long offset,
@@ -58,8 +58,8 @@ static int		ReflectSetOption(ClientData clientData,
 			    const char *newValue);
 static int		ReflectTruncate(ClientData clientData,
 			    long long length);
-static void     TimerRunRead(ClientData clientData);
-static void     TimerRunWrite(ClientData clientData);
+static void             TimerRunRead(ClientData clientData);
+static void             TimerRunWrite(ClientData clientData);

 /*
 * The C layer channel type/driver definition used by the reflection.
@@ -80,7 +80,7 @@ static const Tcl_ChannelType tclRChannelType = {
    ReflectGetOption,	   /* Get options.			NULL'able */
    ReflectWatch,	   /* Initialize notifier			  */
    NULL,		   /* Get OS handle from the channel.	NULL'able */
-    ReflectClose,	   /* No close2 support.		NULL'able */
+	ReflectClose,	   /* No close2 support.		NULL'able */
    ReflectBlock,	   /* Set blocking/nonblocking.		NULL'able */
    NULL,		   /* Flush channel. Not used by core.	NULL'able */
    NULL,		   /* Handle events.			NULL'able */
@@ -104,33 +104,27 @@ typedef struct {
 				 * Tcl level part of the channel. NULL here
 				 * signals the channel is dead because the
 				 * interpreter/thread containing its Tcl
-				 * command is gone.
-				 */
+				 * command is gone. */
 #if TCL_THREADS
-    Tcl_ThreadId thread;	/* Thread the 'interp' belongs to. == Handler thread */
-    Tcl_ThreadId owner;         /* Thread owning the structure.    == Channel thread */
+    Tcl_ThreadId thread;	/* Thread the 'interp' belongs to. == Handler
+                                 * thread */
+    Tcl_ThreadId owner;         /* Thread owning the structure.  == Channel
+                                 * thread */
 #endif
    Tcl_Obj *cmd;		/* Callback command prefix */
    Tcl_Obj *methods;		/* Methods to append to command prefix */
    Tcl_Obj *name;		/* Name of the channel as created */
-
    int mode;			/* Mask of R/W mode */
    int interest;		/* Mask of events the channel is interested
 				 * in. */
-
    int dead;			/* Boolean signal that some operations
 				 * should no longer be attempted. */
-
-    Tcl_TimerToken readTimer;   /*
-				   A token for the timer that is scheduled in
-				   order to call Tcl_NotifyChannel when the
-				   channel is readable
-			        */
-    Tcl_TimerToken writeTimer;  /*
-				   A token for the timer that is scheduled in
-				   order to call Tcl_NotifyChannel when the
-				   channel is writable
-			        */
+    Tcl_TimerToken readTimer;   /* A token for the timer that is scheduled in
+                                 * order to call Tcl_NotifyChannel when the
+                                 * channel is readable */
+    Tcl_TimerToken writeTimer;  /* A token for the timer that is scheduled in
+                                 * order to call Tcl_NotifyChannel when the
+                                 * channel is writable */

    /*
     * Note regarding the usage of timers.
@@ -1156,7 +1150,7 @@ TclChanCaughtErrorBypass(
 * ReflectClose --
 *
 *	This function is invoked when the channel is closed, to delete the
- *	driver-specific instance data.
+ *	driver specific instance data.
 *
 * Results:
 *	A posix error.
@@ -1189,8 +1183,8 @@ ReflectClose(
 	/*
 	 * This call comes from TclFinalizeIOSystem. There are no
 	 * interpreters, and therefore we cannot call upon the handler command
-	 * anymore. Threading is irrelevant as well. Simply clean up all
-	 * the C level data structures and leave the Tcl level to the other
+	 * anymore. Threading is irrelevant as well. We simply clean up all
+	 * our C level data structures and leave the Tcl level to the other
 	 * finalization functions.
 	 */

@@ -476,8 +476,10 @@ static int		TransformLimit(ReflectedTransform *rtPtr,
 * Operation codes for TransformFlush().
 */

-#define FLUSH_WRITE	1
-#define FLUSH_DISCARD	0
+enum FlushOperations {
+    FLUSH_WRITE = 1,
+    FLUSH_DISCARD = 0
+};

 /*
 * Main methods to plug into the 'chan' ensemble'. ==================
@@ -1113,7 +1115,6 @@ ReflectInput(
 	    goto stop;
 	}

-
 	/*
 	 * The buffer is exhausted, but the caller wants even more. We now
 	 * have to go to the underlying channel, get more bytes and then
@@ -1149,12 +1150,10 @@ ReflectInput(
 	    goto stop;
 	}

-
 	readBytes = Tcl_ReadRaw(rtPtr->parent,
 		(char *) Tcl_SetByteArrayLength(bufObj, toRead), toRead);
 	if (readBytes < 0) {
 	    if (Tcl_InputBlocked(rtPtr->parent) && (gotBytes > 0)) {
-
 		/*
 		 * Down channel is blocked and offers zero additional bytes.
 		 * The nonzero gotBytes already returned makes the total
@@ -1165,11 +1164,10 @@ ReflectInput(
 	    }

 	    /*
-	     * Either the down channel is not blocked (a real error)
-	     * or it is and there are gotBytes==0 byte copied so far.
-	     * In either case, pass up the error, so we either report
-	     * any real error, or do not mistakenly signal EOF by
-	     * returning 0 to the caller.
+	     * Either the down channel is not blocked (a real error) or it is
+	     * and there are gotBytes==0 byte copied so far.  In either case,
+	     * pass up the error, so we either report any real error, or do
+	     * not mistakenly signal EOF by returning 0 to the caller.
 	     */

 	    *errorCodePtr = Tcl_GetErrno();
@@ -1177,34 +1175,33 @@ ReflectInput(
 	}

 	if (readBytes == 0) {
-
 	    /*
-	     * Zero returned from Tcl_ReadRaw() always indicates EOF
-	     * on the down channel.
+	     * Zero returned from Tcl_ReadRaw() always indicates EOF on the
+	     * down channel.
 	     */

 	    rtPtr->eofPending = 1;

+	    /*
+	     * Now this is a bit different. The partial data waiting is
+	     * converted and returned.
+	     */
+
+	    if (HAS(rtPtr->methods, METH_DRAIN)) {
+		if (!TransformDrain(rtPtr, errorCodePtr)) {
+		    goto error;
+		}
+	    }
+
+	    if (ResultLength(&rtPtr->result) == 0) {
 		/*
-		 * Now this is a bit different. The partial data waiting is
-		 * converted and returned.
+		 * The drain delivered nothing.
 		 */

-		if (HAS(rtPtr->methods, METH_DRAIN)) {
-		    if (!TransformDrain(rtPtr, errorCodePtr)) {
-			goto error;
-		    }
-		}
+		goto stop;
+	    }

-		if (ResultLength(&rtPtr->result) == 0) {
-		    /*
-		     * The drain delivered nothing.
-		     */
-
-		    goto stop;
-		}
-
-		continue; /* at: while (toRead > 0) */
+	    continue; /* at: while (toRead > 0) */
 	} /* readBytes == 0 */

 	/*
@@ -1388,16 +1385,15 @@ ReflectSeekWide(
 	    curPos = -1;
 	} else {
 	    curPos = Tcl_ChannelSeekProc(parent->typePtr)(
-	    parent->instanceData, offset, seekMode,
-	    errorCodePtr);
+		    parent->instanceData, offset, seekMode, errorCodePtr);
 	}
 #else
 	*errorCodePtr = EINVAL;
 	curPos = -1;
 #endif
    } else {
-    	curPos = Tcl_ChannelWideSeekProc(parent->typePtr)(parent->instanceData, offset,
-    		seekMode, errorCodePtr);
+    	curPos = Tcl_ChannelWideSeekProc(parent->typePtr)(parent->instanceData,
+		offset, seekMode, errorCodePtr);
    }
    if (curPos == -1) {
 	Tcl_SetErrno(*errorCodePtr);
@@ -1423,8 +1419,7 @@ ReflectSeek(
     * routine.
     */

-    return ReflectSeekWide(clientData, offset, seekMode,
-	    errorCodePtr);
+    return ReflectSeekWide(clientData, offset, seekMode, errorCodePtr);
 }
 #endif

@@ -2646,9 +2646,8 @@ Tcl_FSGetCwd(
 		norm = TclFSNormalizeAbsolutePath(interp,retVal);
 		if (norm != NULL) {
 		    /*
-		     * Assign to global storage the pathname of the current
-		     * directory and copy it into thread-local storage as
-		     * well.
+		     * Assign to global storage the pathname of the current directory
+		     * and copy it into thread-local storage as well.
 		     *
 		     * At system startup multiple threads could in principle
 		     * call this function simultaneously, which is a little
@@ -3790,12 +3789,10 @@ Tcl_FSListVolumes(void)

 	    if (thisFsVolumes != NULL) {
 		Tcl_ListObjAppendList(NULL, resultPtr, thisFsVolumes);
-		/*
-		 * The refCount of each list returned by a `listVolumesProc`
-		 * is already incremented.  Do not hang onto the list, though.
-		 * It belongs to the filesystem.  Add its contents to the
-		 * result we are building, and then decrement the refCount.
-		 */
+		/* The refCount of each list returned by a `listVolumesProc` is
+		 * already incremented.  Do not hang onto the list, though.  It
+		 * belongs to the filesystem.  Add its contents to * the result
+		 * we are building, and then decrement the refCount.  */
 		Tcl_DecrRefCount(thisFsVolumes);
 	    }
 	}
@@ -4368,14 +4365,15 @@ Tcl_FSCreateDirectory(

 int
 Tcl_FSCopyDirectory(
-    Tcl_Obj *srcPathPtr,	/* The pathname of the directory to be
-				 * copied. */
+    Tcl_Obj *srcPathPtr,	/*
+				 * The pathname of the directory to be copied.
+				 */
    Tcl_Obj *destPathPtr,	/* The pathname of the target directory. */
    Tcl_Obj **errorPtr)		/* If not NULL, and there is an error, a place
-				 * to store a pointer to a new object, with
-				 * its refCount already incremented, and
-				 * containing the pathname name of file
-				 * causing the error. */
+				 *  to store a pointer to a new object, with
+				 *  its refCount already incremented, and
+				 *  containing the pathname name of file
+				 *  causing the error. */
 {
    int retVal = -1;
    const Tcl_Filesystem *fsPtr, *fsPtr2;
@@ -184,7 +184,7 @@ declare 41 {
    Tcl_Command TclGetOriginalCommand(Tcl_Command command)
 }
 declare 42 {
-    const char *TclpGetUserHome(const char *name, Tcl_DString *bufferPtr)
+    CONST86 char *TclpGetUserHome(const char *name, Tcl_DString *bufferPtr)
 }
 # Removed in 8.5a2:
 #declare 43 {
@@ -409,7 +409,7 @@ declare 98 {
 #	    Tcl_Obj *objPtr, int flags)
 #}
 declare 101 {
-    const char *TclSetPreInitScript(const char *string)
+    CONST86 char *TclSetPreInitScript(const char *string)
 }
 declare 102 {
    void TclSetupEnv(Tcl_Interp *interp)
@@ -230,7 +230,9 @@ typedef struct Tcl_ResolverInfo {
 * (Bug #835020)
 */

-#define TCL_AVOID_RESOLVERS 0x40000
+enum ResolutionFlags {
+    TCL_AVOID_RESOLVERS = 0x40000
+};

 /*
 *----------------------------------------------------------------
@@ -283,7 +285,7 @@ typedef struct Namespace {
 				 * synonym. */
    char *fullName;		/* The namespace's fully qualified name. This
 				 * starts with ::. */
-    void *clientData;	/* An arbitrary value associated with this
+    void *clientData;		/* An arbitrary value associated with this
 				 * namespace. */
    Tcl_NamespaceDeleteProc *deleteProc;
 				/* Procedure invoked when deleting the
@@ -366,7 +368,8 @@ typedef struct Namespace {
 				 * LookupCompiledLocal to resolve variable
 				 * references within the namespace at compile
 				 * time. */
-    unsigned int exportLookupEpoch;	/* Incremented whenever a command is added to
+    unsigned int exportLookupEpoch;
+				/* Incremented whenever a command is added to
 				 * a namespace, removed from a namespace or
 				 * the exports of a namespace are changed.
 				 * Allows TIP#112-driven command lists to be
@@ -413,44 +416,50 @@ struct NamespacePathEntry {

 /*
 * Flags used to represent the status of a namespace:
- *
- * NS_DYING -	1 means Tcl_DeleteNamespace has been called to delete the
- *		namespace but there are still active call frames on the Tcl
- *		stack that refer to the namespace. When the last call frame
- *		referring to it has been popped, it's variables and command
- *		will be destroyed and it will be marked "dead" (NS_DEAD). The
- *		namespace can no longer be looked up by name.
- * NS_DEAD -	1 means Tcl_DeleteNamespace has been called to delete the
- *		namespace and no call frames still refer to it. Its variables
- *		and command have already been destroyed. This bit allows the
- *		namespace resolution code to recognize that the namespace is
- *		"deleted". When the last namespaceName object in any byte code
- *		unit that refers to the namespace has been freed (i.e., when
- *		the namespace's refCount is 0), the namespace's storage will
- *		be freed.
- * NS_KILLED -	1 means that TclTeardownNamespace has already been called on
- *		this namespace and it should not be called again [Bug 1355942]
- * NS_SUPPRESS_COMPILATION -
- *		Marks the commands in this namespace for not being compiled,
- *		forcing them to be looked up every time.
 */

-#define NS_DYING	0x01
-#define NS_DEAD		0x02
-#define NS_KILLED	0x04
-#define NS_SUPPRESS_COMPILATION	0x08
+enum NamespaceFlags {
+    NS_DYING = 0x01,		/* Tcl_DeleteNamespace has been called to
+				 * delete the namespace but there are still
+				 * active call frames on the Tcl stack that
+				 * refer to the namespace. When the last call
+				 * frame referring to it has been popped, it's
+				 * variables and command will be destroyed and
+				 * it will be marked "dead" (NS_DEAD). The
+				 * namespace can no longer be looked up by
+				 * name. */
+    NS_DEAD = 0x02,		/* Tcl_DeleteNamespace has been called to
+				 * delete the namespace and no call frames
+				 * still refer to it. Its variables and
+				 * command have already been destroyed. This
+				 * bit allows the namespace resolution code to
+				 * recognize that the namespace is "deleted".
+				 * When the last namespaceName object in any
+				 * byte code unit that refers to the namespace
+				 * has been freed (i.e., when the namespace's
+				 * refCount is 0), the namespace's storage
+				 * will be freed. */
+    NS_KILLED = 0x04,		/* TclTeardownNamespace has already been
+				 * called on this namespace and it should not
+				 * be called again. [Bug 1355942] */
+    NS_SUPPRESS_COMPILATION = 0x08
+				/* Marks the commands in this namespace for
+				 * not being compiled, forcing them to be
+				 * looked up every time. */
+};

 /*
- * Flags passed to TclGetNamespaceForQualName:
+ * Flags passed to TclGetNamespaceForQualName. Also:
 *
 * TCL_GLOBAL_ONLY		- (see tcl.h) Look only in the global ns.
 * TCL_NAMESPACE_ONLY		- (see tcl.h) Look only in the context ns.
- * TCL_CREATE_NS_IF_UNKNOWN	- Create unknown namespaces.
- * TCL_FIND_ONLY_NS		- The name sought is a namespace name.
 */

-#define TCL_CREATE_NS_IF_UNKNOWN	0x800
-#define TCL_FIND_ONLY_NS		0x1000
+enum GetNamespaceFlags {
+    TCL_CREATE_NS_IF_UNKNOWN = 0x800,
+				/* Create unknown namespaces. */
+    TCL_FIND_ONLY_NS = 0x1000	/* The name sought is a namespace name. */
+};

 /*
 * The client data for an ensemble command. This consists of the table of
@@ -534,10 +543,13 @@ typedef struct EnsembleConfig {
 * Various bits for the EnsembleConfig.flags field.
 */

-#define ENSEMBLE_DEAD	0x1	/* Flag value to say that the ensemble is dead
+enum EnsembleFlags {
+    ENSEMBLE_DEAD = 0x1,	/* Flag value to say that the ensemble is dead
 				 * and on its way out. */
-#define ENSEMBLE_COMPILE 0x4	/* Flag to enable bytecode compilation of an
-				 * ensemble. */
+    ENSEMBLE_COMPILE = 0x4	/* Flag to enable bytecode compilation of an
+				 * ensemble. Possible candidate for some sort
+				 * of exposure to the public interface? */
+};

 /*
 *----------------------------------------------------------------
@@ -554,7 +566,7 @@ typedef struct EnsembleConfig {
 typedef struct VarTrace {
    Tcl_VarTraceProc *traceProc;/* Procedure to call when operations given by
 				 * flags are performed on variable. */
-    void *clientData;	/* Argument to pass to proc. */
+    void *clientData;		/* Argument to pass to proc. */
    int flags;			/* What events the trace procedure is
 				 * interested in: OR-ed combination of
 				 * TCL_TRACE_READS, TCL_TRACE_WRITES,
@@ -573,14 +585,14 @@ typedef struct CommandTrace {
    Tcl_CommandTraceProc *traceProc;
 				/* Procedure to call when operations given by
 				 * flags are performed on command. */
-    void *clientData;	/* Argument to pass to proc. */
+    void *clientData;		/* Argument to pass to proc. */
    int flags;			/* What events the trace procedure is
 				 * interested in: OR-ed combination of
 				 * TCL_TRACE_RENAME, TCL_TRACE_DELETE. */
    struct CommandTrace *nextPtr;
 				/* Next in list of traces associated with a
 				 * particular command. */
-    unsigned int refCount; /* Used to ensure this structure is not
+    unsigned int refCount;	/* Used to ensure this structure is not
 				 * deleted too early. Keeps track of how many
 				 * pieces of code have a pointer to this
 				 * structure. */
@@ -745,35 +757,38 @@ typedef struct VarInHash {
 * in precompiled scripts keep working.
 */

-/* Type of value (0 is scalar) */
-#define VAR_ARRAY		0x1
-#define VAR_LINK		0x2
+enum VariableFlags {
+    /* Type of value (0 is scalar) */
+    VAR_ARRAY = 0x1,
+    VAR_LINK = 0x2,

-/* Type of storage (0 is compiled local) */
-#define VAR_IN_HASHTABLE	0x4
-#define VAR_DEAD_HASH		0x8
-#define VAR_ARRAY_ELEMENT	0x1000
-#define VAR_NAMESPACE_VAR	0x80	/* KEEP OLD VALUE for Itcl */
+    /* Type of storage (0 is compiled local) */
+    VAR_IN_HASHTABLE = 0x4,
+    VAR_DEAD_HASH = 0x8,
+    VAR_ARRAY_ELEMENT = 0x1000,
+    VAR_NAMESPACE_VAR =	0x80,	/* KEEP OLD VALUE for Itcl */

-#define VAR_ALL_HASH \
-	(VAR_IN_HASHTABLE|VAR_DEAD_HASH|VAR_NAMESPACE_VAR|VAR_ARRAY_ELEMENT)
+    VAR_ALL_HASH = (
+	VAR_IN_HASHTABLE | VAR_DEAD_HASH | VAR_NAMESPACE_VAR |
+	VAR_ARRAY_ELEMENT),

-/* Trace and search state. */
+    /* Trace and search state. */
+    VAR_TRACED_READ = 0x10,	/* TCL_TRACE_READS */
+    VAR_TRACED_WRITE = 0x20,	/* TCL_TRACE_WRITES */
+    VAR_TRACED_UNSET = 0x40,	/* TCL_TRACE_UNSETS */
+    VAR_TRACED_ARRAY = 0x800,	/* TCL_TRACE_ARRAY */
+    VAR_TRACE_ACTIVE = 0x2000,
+    VAR_SEARCH_ACTIVE = 0x4000,
+    VAR_ALL_TRACES = (
+	VAR_TRACED_READ | VAR_TRACED_WRITE | VAR_TRACED_ARRAY |
+	VAR_TRACED_UNSET),

-#define VAR_TRACED_READ		0x10	/* TCL_TRACE_READS */
-#define VAR_TRACED_WRITE	0x20	/* TCL_TRACE_WRITES */
-#define VAR_TRACED_UNSET	0x40	/* TCL_TRACE_UNSETS */
-#define VAR_TRACED_ARRAY	0x800	/* TCL_TRACE_ARRAY */
-#define VAR_TRACE_ACTIVE	0x2000
-#define VAR_SEARCH_ACTIVE	0x4000
-#define VAR_ALL_TRACES \
-	(VAR_TRACED_READ|VAR_TRACED_WRITE|VAR_TRACED_ARRAY|VAR_TRACED_UNSET)
-
-/* Special handling on initialisation (only CompiledLocal). */
-#define VAR_ARGUMENT		0x100	/* KEEP OLD VALUE! See tclProc.c */
-#define VAR_TEMPORARY		0x200	/* KEEP OLD VALUE! See tclProc.c */
-#define VAR_IS_ARGS		0x400
-#define VAR_RESOLVED		0x8000
+    /* Special handling on initialisation (only CompiledLocal). */
+    VAR_ARGUMENT = 0x100,	/* KEEP OLD VALUE! See tclProc.c */
+    VAR_TEMPORARY = 0x200,	/* KEEP OLD VALUE! See tclProc.c */
+    VAR_IS_ARGS = 0x400,
+    VAR_RESOLVED = 0x8000
+};

 /*
 * Macros to ensure that various flag bits are set properly for variables.
@@ -974,7 +989,7 @@ typedef struct CompiledLocal {
 				 * is marked by a unique tag during
 				 * compilation, and that same tag is used to
 				 * find the variable at runtime. */
-    char name[TCLFLEXARRAY];		/* Name of the local variable starts here. If
+    char name[TCLFLEXARRAY];	/* Name of the local variable starts here. If
 				 * the name is NULL, this will just be '\0'.
 				 * The actual size of this field will be large
 				 * enough to hold the name. MUST BE THE LAST
@@ -1032,7 +1047,7 @@ typedef struct Trace {
    int level;			/* Only trace commands at nesting level less
 				 * than or equal to this. */
    Tcl_CmdObjTraceProc *proc;	/* Procedure to call to trace command. */
-    void *clientData;	/* Arbitrary value to pass to proc. */
+    void *clientData;		/* Arbitrary value to pass to proc. */
    struct Trace *nextPtr;	/* Next in list of traces for this interp. */
    int flags;			/* Flags governing the trace - see
 				 * Tcl_CreateObjTrace for details. */
@@ -1063,17 +1078,16 @@ typedef struct ActiveInterpTrace {
 /*
 * Flag values designating types of execution traces. See tclTrace.c for
 * related flag values.
- *
- * TCL_TRACE_ENTER_EXEC		- triggers enter/enterstep traces.
- * 				- passed to Tcl_CreateObjTrace to set up
- *				  "enterstep" traces.
- * TCL_TRACE_LEAVE_EXEC		- triggers leave/leavestep traces.
- * 				- passed to Tcl_CreateObjTrace to set up
- *				  "leavestep" traces.
 */

-#define TCL_TRACE_ENTER_EXEC	1
-#define TCL_TRACE_LEAVE_EXEC	2
+enum ExecutionTraceTypes {
+    TCL_TRACE_ENTER_EXEC = 1,	/* Triggers enter/enterstep traces. Passed to
+				 * Tcl_CreateObjTrace to set up "enterstep"
+				 * traces. */
+    TCL_TRACE_LEAVE_EXEC = 2	/* Triggers leave/leavestep traces. Passed to
+				 * Tcl_CreateObjTrace to set up "leavestep"
+				 * traces. */
+};

 /*
 * The structure below defines an entry in the assocData hash table which is
@@ -1176,20 +1190,24 @@ typedef struct CallFrame {
 				/* NULL if no tailcall is scheduled */
 } CallFrame;

-#define FRAME_IS_PROC	0x1
-#define FRAME_IS_LAMBDA 0x2
-#define FRAME_IS_METHOD	0x4	/* The frame is a method body, and the frame's
+enum CallFrameFlags {
+    /*FRAME_IS_NAMESPACE = 0,*/	/* The frame is a namespace. Not used except
+				 * by implication. */
+    FRAME_IS_PROC = 0x1,	/* The frame is a standard procedure. */
+    FRAME_IS_LAMBDA = 0x2,	/* The frame is a lambda term */
+    FRAME_IS_METHOD = 0x4,	/* The frame is a method body, and the frame's
 				 * clientData field contains a CallContext
 				 * reference. Part of TIP#257. */
-#define FRAME_IS_OO_DEFINE 0x8	/* The frame is part of the inside workings of
+    FRAME_IS_OO_DEFINE = 0x8,	/* The frame is part of the inside workings of
 				 * the [oo::define] command; the clientData
 				 * field contains an Object reference that has
 				 * been confirmed to refer to a class. Part of
 				 * TIP#257. */
-#define FRAME_IS_PRIVATE_DEFINE 0x10
+    FRAME_IS_PRIVATE_DEFINE = 0x10
 				/* Marks this frame as being used for private
 				 * declarations with [oo::define]. Usually
 				 * OR'd with FRAME_IS_OO_DEFINE. TIP#500. */
+};

 /*
 * TIP #280
@@ -1312,7 +1330,7 @@ typedef struct CFWordBC {
 typedef struct ContLineLoc {
    int num;			/* Number of entries in loc, not counting the
 				 * final -1 marker entry. */
-    int loc[TCLFLEXARRAY];/* Table of locations, as character offsets.
+    int loc[TCLFLEXARRAY];	/* Table of locations, as character offsets.
 				 * The table is allocated as part of the
 				 * structure, extending behind the nominal end
 				 * of the structure. An entry containing the
@@ -1336,13 +1354,15 @@ typedef struct ContLineLoc {
 * types, per the context of the byte code in execution.
 */

-#define TCL_LOCATION_EVAL	(0) /* Location in a dynamic eval script. */
-#define TCL_LOCATION_BC		(2) /* Location in byte code. */
-#define TCL_LOCATION_PREBC	(3) /* Location in precompiled byte code, no
-				     * location. */
-#define TCL_LOCATION_SOURCE	(4) /* Location in a file. */
-#define TCL_LOCATION_PROC	(5) /* Location in a dynamic proc. */
-#define TCL_LOCATION_LAST	(6) /* Number of values in the enum. */
+enum CmdFrameTypes {
+    TCL_LOCATION_EVAL =	0,	/* Location in a dynamic eval script. */
+    TCL_LOCATION_BC = 2,	/* Location in bytecode. */
+    TCL_LOCATION_PREBC = 3,	/* Location in precompiled bytecode, no
+				 * location. */
+    TCL_LOCATION_SOURCE = 4,	/* Location in a file. */
+    TCL_LOCATION_PROC = 5,	/* Location in a dynamic proc. */
+    TCL_LOCATION_LAST =	6	/* Number of values in the enum. */
+};

 /*
 * Structure passed to describe procedure-like "procedures" that are not
@@ -1353,10 +1373,10 @@ typedef struct ContLineLoc {
 typedef Tcl_Obj * (GetFrameInfoValueProc)(void *clientData);
 typedef struct {
    const char *name;		/* Name of this field. */
-    GetFrameInfoValueProc *proc;	/* Function to generate a Tcl_Obj* from the
+    GetFrameInfoValueProc *proc;/* Function to generate a Tcl_Obj* from the
 				 * clientData, or just use the clientData
 				 * directly (after casting) if NULL. */
-    void *clientData;	/* Context for above function, or Tcl_Obj* if
+    void *clientData;		/* Context for above function, or Tcl_Obj* if
 				 * proc field is NULL. */
 } ExtraFrameInfoField;
 typedef struct {
@@ -1383,8 +1403,10 @@ typedef void **TclHandle;
 *----------------------------------------------------------------
 */

-#define TCL_REG_BOSONLY 002000	/* Prepend \A to pattern so it only matches at
+enum TclRegexpFlags {
+    TCL_REG_BOSONLY = 002000	/* Prepend \A to pattern so it only matches at
 				 * the beginning of the string. */
+};

 /*
 * These are a thin layer over TclpThreadKeyDataGet and TclpThreadKeyDataSet
@@ -1691,11 +1713,11 @@ typedef struct Command {
    Tcl_ObjCmdProc *objProc;	/* Object-based command procedure. */
    void *objClientData;	/* Arbitrary value passed to object proc. */
    Tcl_CmdProc *proc;		/* String-based command procedure. */
-    void *clientData;	/* Arbitrary value passed to string proc. */
+    void *clientData;		/* Arbitrary value passed to string proc. */
    Tcl_CmdDeleteProc *deleteProc;
 				/* Procedure invoked when deleting command to,
 				 * e.g., free all client data. */
-    void *deleteData;	/* Arbitrary value passed to deleteProc. */
+    void *deleteData;		/* Arbitrary value passed to deleteProc. */
    int flags;			/* Miscellaneous bits of information about
 				 * command. See below for definitions. */
    ImportRef *importRefPtr;	/* List of each imported Command created in
@@ -1711,37 +1733,32 @@ typedef struct Command {
 } Command;

 /*
- * Flag bits for commands.
- *
- * CMD_DYING -			If 1 the command is in the process of
- *				being deleted (its deleteProc is currently
- *				executing). Other attempts to delete the
- *				command should be ignored.
- * CMD_TRACE_ACTIVE -		If 1 the trace processing is currently
- *				underway for a rename/delete change. See the
- *				two flags below for which is currently being
- *				processed.
- * CMD_HAS_EXEC_TRACES -	If 1 means that this command has at least one
- *				execution trace (as opposed to simple
- *				delete/rename traces) in its tracePtr list.
- * CMD_COMPILES_EXPANDED -	If 1 this command has a compiler that
- *				can handle expansion (provided it is not the
- *				first word).
- * TCL_TRACE_RENAME -		A rename trace is in progress. Further
+ * Flag bits for commands. Also:
+ *   TCL_TRACE_RENAME -		A rename trace is in progress. Further
 *				recursive renames will not be traced.
- * TCL_TRACE_DELETE -		A delete trace is in progress. Further
+ *   TCL_TRACE_DELETE -		A delete trace is in progress. Further
 *				recursive deletes will not be traced.
- * (these last two flags are defined in tcl.h)
+ * (these two flags are defined in tcl.h)
 */

-#define CMD_DYING		    0x01
-#define CMD_TRACE_ACTIVE	    0x02
-#define CMD_HAS_EXEC_TRACES	    0x04
-#define CMD_COMPILES_EXPANDED	    0x08
-#define CMD_REDEF_IN_PROGRESS	    0x10
-#define CMD_VIA_RESOLVER	    0x20
-#define CMD_DEAD                    0x40
-
+enum CommandFlags {
+    CMD_DYING = 0x01,		/* The command is in the process of being
+				 * deleted (its deleteProc is currently
+				 * executing). Other attempts to delete the
+				 * command should be ignored. */
+    CMD_TRACE_ACTIVE = 0x02,	/* The trace processing is currently underway
+				 * for a rename/delete change. See the two
+				 * flags (TCL_TRACE_RENAME, TCL_TRACE_DELETE)
+				 * for which is currently being processed. */
+    CMD_HAS_EXEC_TRACES = 0x04,
+    CMD_COMPILES_EXPANDED = 0x08,
+				/* This command has a compiler that can handle
+				 * expansion (provided it is not the first
+				 * word). */
+    CMD_REDEF_IN_PROGRESS = 0x10,
+    CMD_VIA_RESOLVER = 0x20,
+    CMD_DEAD = 0x40
+};

 /*
 *----------------------------------------------------------------
@@ -2267,75 +2284,81 @@ typedef struct Interp {

 /*
 * EvalFlag bits for Interp structures:
- *
- * TCL_ALLOW_EXCEPTIONS	1 means it's OK for the script to terminate with a
- *			code other than TCL_OK or TCL_ERROR; 0 means codes
- *			other than these should be turned into errors.
 */

-#define TCL_ALLOW_EXCEPTIONS		0x04
-#define TCL_EVAL_FILE			0x02
-#define TCL_EVAL_SOURCE_IN_FRAME	0x10
-#define TCL_EVAL_NORESOLVE		0x20
-#define TCL_EVAL_DISCARD_RESULT		0x40
+enum TclInterpEvalFlags {
+    TCL_ALLOW_EXCEPTIONS = 0x04,/* It's OK for the script to terminate with a
+				 * code other than TCL_OK or TCL_ERROR; not
+				 * set means codes other than these should be
+				 * turned into errors. */
+    TCL_EVAL_FILE = 0x02,
+    TCL_EVAL_SOURCE_IN_FRAME = 0x10,
+    TCL_EVAL_NORESOLVE = 0x20,
+    TCL_EVAL_DISCARD_RESULT = 0x40
+};

 /*
 * Flag bits for Interp structures:
 *
- * DELETED:		Non-zero means the interpreter has been deleted:
- *			don't process any more commands for it, and destroy
- *			the structure as soon as all nested invocations of
- *			Tcl_Eval are done.
- * ERR_ALREADY_LOGGED:	Non-zero means information has already been logged in
- *			iPtr->errorInfo for the current Tcl_Eval instance, so
- *			Tcl_Eval needn't log it (used to implement the "error
- *			message log" command).
- * DONT_COMPILE_CMDS_INLINE: Non-zero means that the bytecode compiler should
- *			not compile any commands into an inline sequence of
- *			instructions. This is set 1, for example, when command
- *			traces are requested.
- * RAND_SEED_INITIALIZED: Non-zero means that the randSeed value of the interp
- *			has not be initialized. This is set 1 when we first
- *			use the rand() or srand() functions.
- * SAFE_INTERP:		Non zero means that the current interp is a safe
- *			interp (i.e. it has only the safe commands installed,
- *			less privilege than a regular interp).
- * INTERP_DEBUG_FRAME:	Used for switching on various extra interpreter
- *			debug/info mechanisms (e.g. info frame eval/uplevel
- *			tracing) which are performance intensive.
- * INTERP_TRACE_IN_PROGRESS: Non-zero means that an interp trace is currently
- *			active; so no further trace callbacks should be
- *			invoked.
- * INTERP_ALTERNATE_WRONG_ARGS: Used for listing second and subsequent forms
- *			of the wrong-num-args string in Tcl_WrongNumArgs.
- *			Makes it append instead of replacing and uses
- *			different intermediate text.
- * CANCELED:		Non-zero means that the script in progress should be
- *			canceled as soon as possible. This can be checked by
- *			extensions (and the core itself) by calling
- *			Tcl_Canceled and checking if TCL_ERROR is returned.
- *			This is a one-shot flag that is reset immediately upon
- *			being detected; however, if the TCL_CANCEL_UNWIND flag
- *			is set Tcl_Canceled will continue to report that the
- *			script in progress has been canceled thereby allowing
- *			the evaluation stack for the interp to be fully
- *			unwound.
- *
 * WARNING: For the sake of some extensions that have made use of former
 * internal values, do not re-use the flag values 2 (formerly ERR_IN_PROGRESS)
 * or 8 (formerly ERROR_CODE_SET).
 */

-#define DELETED				     1
-#define ERR_ALREADY_LOGGED		     4
-#define INTERP_DEBUG_FRAME		  0x10
-#define DONT_COMPILE_CMDS_INLINE	  0x20
-#define RAND_SEED_INITIALIZED		  0x40
-#define SAFE_INTERP			  0x80
-#define INTERP_TRACE_IN_PROGRESS	 0x200
-#define INTERP_ALTERNATE_WRONG_ARGS	 0x400
-#define ERR_LEGACY_COPY			 0x800
-#define CANCELED			0x1000
+enum TclInterpFlags {
+    DELETED = 1,		/* If set, the interpreter has been deleted:
+				 * don't process any more commands for it, and
+				 * destroy the structure as soon as all nested
+				 * invocations of Tcl_Eval are done. */
+    ERR_ALREADY_LOGGED = 4,	/* If set, information has already been logged
+				 * in iPtr->errorInfo for the current Tcl_Eval
+				 * instance, so Tcl_Eval needn't log it (used
+				 * to implement the "error message log"
+				 * command). */
+    INTERP_DEBUG_FRAME = 0x10,	/* Used for switching on various extra
+				 * interpreter debug/info mechanisms (e.g.
+				 * info frame eval/uplevel tracing) which are
+				 * performance intensive. */
+    DONT_COMPILE_CMDS_INLINE = 0x20,
+				/* If set the bytecode compiler should not
+				 * compile any commands into an inline
+				 * sequence of instructions. This is set, for
+				 * example, when command traces are
+				 * requested. */
+    RAND_SEED_INITIALIZED = 0x40,
+				/* If set, the randSeed value of the interp
+				 * has been initialized. This is set when we
+				 * first use the rand() or srand()
+				 * functions. */
+    SAFE_INTERP = 0x80,		/* If set, the current interp is a safe interp
+				 * (i.e. it has only the safe commands
+				 * installed, less privilege than a regular
+				 * interp). */
+    INTERP_TRACE_IN_PROGRESS = 0x200,
+				/* An interp trace is currently active; so no
+				 * further trace callbacks should be
+				 * invoked. */
+    INTERP_ALTERNATE_WRONG_ARGS = 0x400,
+				/* Used for listing second and subsequent
+				 * forms of the wrong-num-args string in
+				 * Tcl_WrongNumArgs.  Makes it append instead
+				 * of replacing and uses different
+				 * intermediate text. Used by a few commands
+				 * (notably [read]). */
+    ERR_LEGACY_COPY = 0x800,
+    CANCELED = 0x1000		/* If set, the script in progress should be
+				 * canceled as soon as possible. This can be
+				 * checked by extensions (and the core itself)
+				 * by calling Tcl_Canceled and checking if
+				 * TCL_ERROR is returned.  This is a one-shot
+				 * flag that is reset immediately upon being
+				 * detected; however, if the TCL_CANCEL_UNWIND
+				 * flag is set Tcl_Canceled will continue to
+				 * report that the script in progress has been
+				 * canceled thereby allowing the evaluation
+				 * stack for the interp to be fully
+				 * unwound. */
+};

 /*
 * Maximum number of levels of nesting permitted in Tcl commands (used to
@@ -2413,22 +2436,21 @@ typedef enum TclEolTranslation {

 /*
 * Flags for TclInvoke:
- *
- * TCL_INVOKE_HIDDEN		Invoke a hidden command; if not set, invokes
- *				an exposed command.
- * TCL_INVOKE_NO_UNKNOWN	If set, "unknown" is not invoked if the
- *				command to be invoked is not found. Only has
- *				an effect if invoking an exposed command,
- *				i.e. if TCL_INVOKE_HIDDEN is not also set.
- * TCL_INVOKE_NO_TRACEBACK	Does not record traceback information if the
- *				invoked command returns an error. Used if the
- *				caller plans on recording its own traceback
- *				information.
 */

-#define	TCL_INVOKE_HIDDEN	(1<<0)
-#define TCL_INVOKE_NO_UNKNOWN	(1<<1)
-#define TCL_INVOKE_NO_TRACEBACK	(1<<2)
+enum TclInvokeFlags {
+    TCL_INVOKE_HIDDEN = 1,	/* Invoke a hidden command; if not set,
+				 * invokes an exposed command. */
+    TCL_INVOKE_NO_UNKNOWN = 2,	/* If set, "unknown" is not invoked if the
+				 * command to be invoked is not found. Only
+				 * has an effect if invoking an exposed
+				 * command, i.e. if TCL_INVOKE_HIDDEN is not
+				 * also set. */
+    TCL_INVOKE_NO_TRACEBACK = 4	/* Does not record traceback information if
+				 * the invoked command returns an error. Used
+				 * if the caller plans on recording its own
+				 * traceback information. */
+};

 /*
 * The structure used as the internal representation of Tcl list objects. This
@@ -2490,8 +2512,10 @@ typedef struct List {
 * TclNRLmapCmd and their compilations.
 */

-#define TCL_EACH_KEEP_NONE  0	/* Discard iteration result like [foreach] */
-#define TCL_EACH_COLLECT    1	/* Collect iteration result like [lmap] */
+enum ForeachFlags {
+    TCL_EACH_KEEP_NONE = 0,	/* Discard iteration result like [foreach] */
+    TCL_EACH_COLLECT = 1	/* Collect iteration result like [lmap] */
+};

 /*
 * Macros providing a faster path to booleans and integers:
@@ -2550,27 +2574,24 @@ typedef struct List {

 /*
 * Flag values for TclTraceDictPath().
- *
- * DICT_PATH_READ indicates that all entries on the path must exist but no
- * updates will be needed.
- *
- * DICT_PATH_UPDATE indicates that we are going to be doing an update at the
- * tip of the path, so duplication of shared objects should be done along the
- * way.
- *
- * DICT_PATH_EXISTS indicates that we are performing an existence test and a
- * lookup failure should therefore not be an error. If (and only if) this flag
- * is set, TclTraceDictPath() will return the special value
- * DICT_PATH_NON_EXISTENT if the path is not traceable.
- *
- * DICT_PATH_CREATE (which also requires the DICT_PATH_UPDATE bit to be set)
- * indicates that we are to create non-existent dictionaries on the path.
 */

-#define DICT_PATH_READ		0
-#define DICT_PATH_UPDATE	1
-#define DICT_PATH_EXISTS	2
-#define DICT_PATH_CREATE	5
+enum DictPathFlags {
+    DICT_PATH_READ = 0,		/* All entries on the path must exist but no
+				 * updates will be needed. */
+    DICT_PATH_UPDATE = 1,	/* We are going to be doing an update at the
+				 * tip of the path, so duplication of shared
+				 * objects should be done along the way. */
+    DICT_PATH_EXISTS = 2,	/* We are performing an existence test and a
+				 * lookup failure should therefore not be an
+				 * error. If (and only if) this flag is set,
+				 * TclTraceDictPath() will return the special
+				 * value DICT_PATH_NON_EXISTENT if the path is
+				 * not traceable. */
+    DICT_PATH_CREATE = 5	/* We are to create non-existent dictionaries
+				 * on the path. (Also requires the
+				 * DICT_PATH_UPDATE bit to be set.) */
+};

 #define DICT_PATH_NON_EXISTENT	((Tcl_Obj *) (void *) 1)

@@ -2623,10 +2644,12 @@ typedef struct TclFile_ *TclFile;
 * combination of the following values:
 */

-#define TCL_GLOBMODE_NO_COMPLAIN	1
-#define TCL_GLOBMODE_JOIN		2
-#define TCL_GLOBMODE_DIR		4
-#define TCL_GLOBMODE_TAILS		8
+enum GlobModeFlags {
+    TCL_GLOBMODE_NO_COMPLAIN = 1,
+    TCL_GLOBMODE_JOIN = 2,
+    TCL_GLOBMODE_DIR = 4,
+    TCL_GLOBMODE_TAILS = 8
+};

 typedef enum Tcl_PathPart {
    TCL_PATH_DIRNAME,
@@ -2695,24 +2718,22 @@ typedef struct ProcessGlobalValue {
 *----------------------------------------------------------------------
 */

-#define TCL_PARSE_DECIMAL_ONLY		1
-				/* Leading zero doesn't denote octal or
+enum TclParseNumberFlags {
+    TCL_PARSE_DECIMAL_ONLY = 1,	/* Leading zero doesn't denote octal or
 				 * hex. */
-#define TCL_PARSE_OCTAL_ONLY		2
-				/* Parse octal even without prefix. */
-#define TCL_PARSE_HEXADECIMAL_ONLY	4
+    TCL_PARSE_OCTAL_ONLY = 2,	/* Parse octal even without prefix. */
+    TCL_PARSE_HEXADECIMAL_ONLY = 4,
 				/* Parse hexadecimal even without prefix. */
-#define TCL_PARSE_INTEGER_ONLY		8
-				/* Disable floating point parsing. */
-#define TCL_PARSE_SCAN_PREFIXES		16
+    TCL_PARSE_INTEGER_ONLY = 8,	/* Disable floating point parsing. */
+    TCL_PARSE_SCAN_PREFIXES = 16,
 				/* Use [scan] rules dealing with 0?
 				 * prefixes. */
-#define TCL_PARSE_NO_WHITESPACE		32
+    TCL_PARSE_NO_WHITESPACE = 32,
 				/* Reject leading/trailing whitespace. */
-#define TCL_PARSE_BINARY_ONLY	64
-				/* Parse binary even without prefix. */
-#define TCL_PARSE_NO_UNDERSCORE	128
+    TCL_PARSE_BINARY_ONLY = 64,	/* Parse binary even without prefix. */
+    TCL_PARSE_NO_UNDERSCORE = 128
 				/* Reject underscore digit separator */
+};

 /*
 *----------------------------------------------------------------------
@@ -2720,14 +2741,16 @@ typedef struct ProcessGlobalValue {
 *----------------------------------------------------------------------
 */

-#define TCL_NUMBER_INT		2
+enum TclNumberTypes {
+    TCL_NUMBER_INT = 2,
 #if (TCL_MAJOR_VERSION < 9) && !defined(TCL_NO_DEPRECATED)
-#   define TCL_NUMBER_LONG		1 /* deprecated, not used any more */
-#   define TCL_NUMBER_WIDE		TCL_NUMBER_INT /* deprecated */
+    TCL_NUMBER_LONG = 1,	/* deprecated, not used any more */
+    TCL_NUMBER_WIDE = TCL_NUMBER_INT, /* deprecated */
 #endif
-#define TCL_NUMBER_BIG		3
-#define TCL_NUMBER_DOUBLE	4
-#define TCL_NUMBER_NAN		5
+    TCL_NUMBER_BIG = 3,
+    TCL_NUMBER_DOUBLE = 4,
+    TCL_NUMBER_NAN = 5
+};

 /*
 *----------------------------------------------------------------
@@ -2801,7 +2824,9 @@ MODULE_SCOPE size_t	tclObjsShared[TCL_MAX_SHARED_OBJ_STATS];
 MODULE_SCOPE char	tclEmptyString;

 enum CheckEmptyStringResult {
-	TCL_EMPTYSTRING_UNKNOWN = -1, TCL_EMPTYSTRING_NO, TCL_EMPTYSTRING_YES
+    TCL_EMPTYSTRING_UNKNOWN = -1,
+    TCL_EMPTYSTRING_NO,
+    TCL_EMPTYSTRING_YES
 };

 /*
@@ -2870,7 +2895,7 @@ typedef struct ForIterData {
 typedef void* TclFindSymbolProc(Tcl_Interp* interp, Tcl_LoadHandle loadHandle,
 				const char* symbol);
 struct Tcl_LoadHandle_ {
-    void *clientData;	/* Client data is the load handle in the
+    void *clientData;		/* Client data is the load handle in the
 				 * native filesystem if a module was loaded
 				 * there, or an opaque pointer to a structure
 				 * for further bookkeeping on load-from-VFS
@@ -2884,19 +2909,16 @@ struct Tcl_LoadHandle_ {

 /* Flags for conversion of doubles to digit strings */

-#define TCL_DD_E_FORMAT 		0x2
-				/* Use a fixed-length string of digits,
+enum DoubleFormatFlags {
+    TCL_DD_E_FORMAT = 0x2,	/* Use a fixed-length string of digits,
 				 * suitable for E format*/
-#define TCL_DD_F_FORMAT 		0x3
-				/* Use a fixed number of digits after the
+    TCL_DD_F_FORMAT = 0x3,	/* Use a fixed number of digits after the
 				 * decimal point, suitable for F format */
-#define TCL_DD_SHORTEST 		0x4
-				/* Use the shortest possible string */
-#define TCL_DD_NO_QUICK 		0x8
-				/* Debug flag: forbid quick FP conversion */
-
-#define TCL_DD_CONVERSION_TYPE_MASK	0x3
+    TCL_DD_SHORTEST = 0x4,	/* Use the shortest possible string */
+    TCL_DD_NO_QUICK = 0x8,	/* Debug flag: forbid quick FP conversion */
+    TCL_DD_CONVERSION_TYPE_MASK = 0x3
 				/* Mask to isolate the conversion type */
+};

 /*
 *----------------------------------------------------------------
@@ -2958,7 +2980,6 @@ MODULE_SCOPE Tcl_Command TclCreateEnsembleInNs(Tcl_Interp *interp,
 			    const char *name, Tcl_Namespace *nameNamespacePtr,
 			    Tcl_Namespace *ensembleNamespacePtr, int flags);
 MODULE_SCOPE void	TclDeleteNamespaceVars(Namespace *nsPtr);
-MODULE_SCOPE void	TclDeleteNamespaceChildren(Namespace *nsPtr);
 MODULE_SCOPE int	TclFindDictElement(Tcl_Interp *interp,
 			    const char *dict, int dictLength,
 			    const char **elementPtr, const char **nextPtr,
@@ -153,7 +153,7 @@ EXTERN int		TclGetOpenMode(Tcl_Interp *interp, const char *str,
 /* 41 */
 EXTERN Tcl_Command	TclGetOriginalCommand(Tcl_Command command);
 /* 42 */
-EXTERN const char *	TclpGetUserHome(const char *name,
+EXTERN CONST86 char *	TclpGetUserHome(const char *name,
 				Tcl_DString *bufferPtr);
 /* Slot 43 is reserved */
 /* 44 */
@@ -264,7 +264,7 @@ EXTERN int		TclServiceIdle(void);
 /* Slot 99 is reserved */
 /* Slot 100 is reserved */
 /* 101 */
-EXTERN const char *	TclSetPreInitScript(const char *string);
+EXTERN CONST86 char *	TclSetPreInitScript(const char *string);
 /* 102 */
 EXTERN void		TclSetupEnv(Tcl_Interp *interp);
 /* 103 */
@@ -710,7 +710,7 @@ typedef struct TclIntStubs {
    TclObjCmdProcType (*tclGetObjInterpProc) (void); /* 39 */
    int (*tclGetOpenMode) (Tcl_Interp *interp, const char *str, int *seekFlagPtr); /* 40 */
    Tcl_Command (*tclGetOriginalCommand) (Tcl_Command command); /* 41 */
-    const char * (*tclpGetUserHome) (const char *name, Tcl_DString *bufferPtr); /* 42 */
+    CONST86 char * (*tclpGetUserHome) (const char *name, Tcl_DString *bufferPtr); /* 42 */
    void (*reserved43)(void);
    int (*tclGuessPackageName) (const char *fileName, Tcl_DString *bufPtr); /* 44 */
    int (*tclHideUnsafeCommands) (Tcl_Interp *interp); /* 45 */
@@ -769,7 +769,7 @@ typedef struct TclIntStubs {
    int (*tclServiceIdle) (void); /* 98 */
    void (*reserved99)(void);
    void (*reserved100)(void);
-    const char * (*tclSetPreInitScript) (const char *string); /* 101 */
+    CONST86 char * (*tclSetPreInitScript) (const char *string); /* 101 */
    void (*tclSetupEnv) (Tcl_Interp *interp); /* 102 */
    int (*tclSockGetPort) (Tcl_Interp *interp, const char *str, const char *proto, int *portPtr); /* 103 */
    TCL_DEPRECATED_API("") int (*tclSockMinimumBuffersOld) (int sock, int size); /* 104 */
@@ -1415,9 +1415,7 @@ extern const TclIntStubs *tclIntStubsPtr;

 #undef TclGuessPackageName
 #undef TclUnusedStubEntry
-#undef TclSetPreInitScript
 #ifndef TCL_NO_DEPRECATED
-#   define TclSetPreInitScript Tcl_SetPreInitScript
 #   define TclGuessPackageName(fileName, pkgName) ((void)fileName,(void)pkgName,0)
 #endif

@@ -196,18 +196,18 @@ struct LimitHandler {

 /*
 * Values for the LimitHandler flags field.
- *      LIMIT_HANDLER_ACTIVE - Whether the handler is currently being
- *              processed; handlers are never to be entered reentrantly.
- *      LIMIT_HANDLER_DELETED - Whether the handler has been deleted. This
- *              should not normally be observed because when a handler is
- *              deleted it is also spliced out of the list of handlers, but
- *              even so we will be careful.
 */

-#define LIMIT_HANDLER_ACTIVE    0x01
-#define LIMIT_HANDLER_DELETED   0x02
-
-
+enum LimitHandlerFlags {
+    LIMIT_HANDLER_ACTIVE = 0x01,/* Whether the handler is currently being
+				 * processed; handlers are never to be entered
+				 * reentrantly. */
+    LIMIT_HANDLER_DELETED = 0x02/* Whether the handler has been deleted. This
+				 * should not normally be observed because
+				 * when a handler is deleted it is also
+				 * spliced out of the list of handlers, but
+				 * even so we will be careful. */
+};

 /*
 * Prototypes for local static functions:
@@ -276,12 +276,11 @@ static void		TimeLimitCallback(ClientData clientData);
 static Tcl_NRPostProc	NRPostInvokeHidden;
 static Tcl_ObjCmdProc	NRInterpCmd;
 static Tcl_ObjCmdProc	NRChildCmd;
-

 /*
 *----------------------------------------------------------------------
 *
- * Tcl_SetPreInitScript --
+ * TclSetPreInitScript --
 *
 *	This routine is used to change the value of the internal variable,
 *	tclPreInitScript.
@@ -296,12 +295,12 @@ static Tcl_ObjCmdProc	NRChildCmd;
 */

 const char *
-Tcl_SetPreInitScript(
+TclSetPreInitScript(
    const char *string)		/* Pointer to a script. */
 {
    const char *prevString = tclPreInitScript;
    tclPreInitScript = string;
-    return prevString;
+    return(prevString);
 }

 /*
@@ -75,21 +75,19 @@ typedef struct Link {

 /*
 * Definitions for flag bits:
- * LINK_READ_ONLY -		1 means errors should be generated if Tcl
- *				script attempts to write variable.
- * LINK_BEING_UPDATED -		1 means that a call to Tcl_UpdateLinkedVar is
- *				in progress for this variable, so trace
- *				callbacks on the variable should be ignored.
- * LINK_ALLOC_ADDR -		1 means linkPtr->addr was allocated on the
- *				heap.
- * LINK_ALLOC_LAST -		1 means linkPtr->valueLast.p was allocated on
- *				the heap.
 */

-#define LINK_READ_ONLY		1
-#define LINK_BEING_UPDATED	2
-#define LINK_ALLOC_ADDR		4
-#define LINK_ALLOC_LAST		8
+enum LinkFlags {
+    LINK_READ_ONLY = 1,		/* Errors should be generated if Tcl script
+				 * attempts to write variable. */
+    LINK_BEING_UPDATED = 2,	/* A call to Tcl_UpdateLinkedVar is in
+				 * progress for this variable, so trace
+				 * callbacks on the variable should be
+				 * ignored. */
+    LINK_ALLOC_ADDR = 4,	/* linkPtr->addr was allocated on the heap. */
+    LINK_ALLOC_LAST = 8		/* linkPtr->valueLast.p was allocated on the
+				 * heap. */
+};

 /*
 * Forward references to functions defined later in this file:
@@ -110,11 +108,11 @@ static int		SetInvalidRealFromAny(Tcl_Interp *interp,
 */

 static Tcl_ObjType invalidRealType = {
-    "invalidReal",			/* name */
-    NULL,				/* freeIntRepProc */
-    NULL,				/* dupIntRepProc */
-    NULL,				/* updateStringProc */
-    NULL				/* setFromAnyProc */
+    "invalidReal",		/* name */
+    NULL,			/* freeIntRepProc */
+    NULL,			/* dupIntRepProc */
+    NULL,			/* updateStringProc */
+    NULL			/* setFromAnyProc */
 };

 /*
@@ -804,31 +804,6 @@ Tcl_UnloadObjCmd(
 	goto done;
    }

-
-    /*
-     * Remove this library from the interpreter's library cache.
-     */
-
-    ipFirstPtr = (InterpLibrary *)Tcl_GetAssocData(target, "tclLoad", NULL);
-    ipPtr = ipFirstPtr;
-    if (ipPtr->libraryPtr == libraryPtr) {
-	ipFirstPtr = ipFirstPtr->nextPtr;
-    } else {
-	InterpLibrary *ipPrevPtr;
-
-	for (ipPrevPtr = ipPtr; ipPtr != NULL;
-		ipPrevPtr = ipPtr, ipPtr = ipPtr->nextPtr) {
-	    if (ipPtr->libraryPtr == libraryPtr) {
-		ipPrevPtr->nextPtr = ipPtr->nextPtr;
-		break;
-	    }
-	}
-    }
-    Tcl_SetAssocData(target, "tclLoad", LoadCleanupProc,
-	    ipFirstPtr);
-
-
-
    /*
     * The unload function executed fine. Examine the reference count to see
     * if we unload the DLL.
@@ -895,6 +870,27 @@ Tcl_UnloadObjCmd(
 		    }
 		}

+		/*
+		 * Remove this library from the interpreter's library cache.
+		 */
+
+		ipFirstPtr = (InterpLibrary *)Tcl_GetAssocData(target, "tclLoad", NULL);
+		ipPtr = ipFirstPtr;
+		if (ipPtr->libraryPtr == defaultPtr) {
+		    ipFirstPtr = ipFirstPtr->nextPtr;
+		} else {
+		    InterpLibrary *ipPrevPtr;
+
+		    for (ipPrevPtr = ipPtr; ipPtr != NULL;
+			    ipPrevPtr = ipPtr, ipPtr = ipPtr->nextPtr) {
+			if (ipPtr->libraryPtr == defaultPtr) {
+			    ipPrevPtr->nextPtr = ipPtr->nextPtr;
+			    break;
+			}
+		    }
+		}
+		Tcl_SetAssocData(target, "tclLoad", LoadCleanupProc,
+			ipFirstPtr);
 		ckfree(defaultPtr->fileName);
 		ckfree(defaultPtr->prefix);
 		ckfree(defaultPtr);
@@ -1073,83 +1073,6 @@ TclNamespaceDeleted(
    return (nsPtr->flags & NS_DYING) ? 1 : 0;
 }

-void
-TclDeleteNamespaceChildren(
-    Namespace *nsPtr	/* Namespace whose children to delete */
-)
-{
-    Interp *iPtr = (Interp *) nsPtr->interp;
-    Tcl_HashEntry *entryPtr;
-    int i, unchecked;
-    Tcl_HashSearch search;
-    /*
-     * Delete all the child namespaces.
-     *
-     * BE CAREFUL: When each child is deleted, it divorces itself from its
-     * parent.  The hash table can't be proplery traversed if its elements are
-     * being deleted.  Because of traces (and the desire to avoid the
-     * quadratic problems of just using Tcl_FirstHashEntry over and over, [Bug
-     * f97d4ee020]) copy to a temporary array and then delete all those
-     * namespaces.
-     *
-     * Important: leave the hash table itself still live.
-     */
-
-#ifndef BREAK_NAMESPACE_COMPAT
-    unchecked = (nsPtr->childTable.numEntries > 0);
-    while (nsPtr->childTable.numEntries > 0 && unchecked) {
-	int length = nsPtr->childTable.numEntries;
-	Namespace **children = (Namespace **)TclStackAlloc((Tcl_Interp *) iPtr,
-		sizeof(Namespace *) * length);
-
-	i = 0;
-	for (entryPtr = Tcl_FirstHashEntry(&nsPtr->childTable, &search);
-		entryPtr != NULL;
-		entryPtr = Tcl_NextHashEntry(&search)) {
-	    children[i] = (Namespace *)Tcl_GetHashValue(entryPtr);
-	    children[i]->refCount++;
-	    i++;
-	}
-	unchecked = 0;
-	for (i = 0 ; i < length ; i++) {
-	    if (!(children[i]->flags & NS_DYING)) {
-		unchecked = 1;
-		Tcl_DeleteNamespace((Tcl_Namespace *) children[i]);
-		TclNsDecrRefCount(children[i]);
-	    }
-	}
-	TclStackFree((Tcl_Interp *) iPtr, children);
-    }
-#else
-    if (nsPtr->childTablePtr != NULL) {
-	unchecked = (nsPtr->childTable.numEntries > 0);
-	while (nsPtr->childTable.numEntries > 0 && unchecked) {
-	    int length = nsPtr->childTablePtr->numEntries;
-	    Namespace **children = (Namespace **)TclStackAlloc((Tcl_Interp *) iPtr,
-		    sizeof(Namespace *) * length);
-
-	    i = 0;
-	    for (entryPtr = Tcl_FirstHashEntry(nsPtr->childTablePtr, &search);
-		    entryPtr != NULL;
-		    entryPtr = Tcl_NextHashEntry(&search)) {
-		children[i] = (Namespace *)Tcl_GetHashValue(entryPtr);
-		children[i]->refCount++;
-		i++;
-	    }
-	    unchecked = 0;
-	    for (i = 0 ; i < length ; i++) {
-		if (!(children[i]->flags & NS_DYING)) {
-		    unchecked = 1;
-		    Tcl_DeleteNamespace((Tcl_Namespace *) children[i]);
-		    TclNsDecrRefCount(children[i]);
-		}
-	    }
-	    TclStackFree((Tcl_Interp *) iPtr, children);
-	}
-    }
-#endif
-}
-
 /*
 *----------------------------------------------------------------------
 *
@@ -1258,7 +1181,62 @@ TclTeardownNamespace(
 	nsPtr->commandPathSourceList = NULL;
    }

-    TclDeleteNamespaceChildren(nsPtr);
+    /*
+     * Delete all the child namespaces.
+     *
+     * BE CAREFUL: When each child is deleted, it will divorce itself from its
+     * parent. You can't traverse a hash table properly if its elements are
+     * being deleted.  Because of traces (and the desire to avoid the
+     * quadratic problems of just using Tcl_FirstHashEntry over and over, [Bug
+     * f97d4ee020]) we copy to a temporary array and then delete all those
+     * namespaces.
+     *
+     * Important: leave the hash table itself still live.
+     */
+
+#ifndef BREAK_NAMESPACE_COMPAT
+    while (nsPtr->childTable.numEntries > 0) {
+	int length = nsPtr->childTable.numEntries;
+	Namespace **children = (Namespace **)TclStackAlloc((Tcl_Interp *) iPtr,
+		sizeof(Namespace *) * length);
+
+	i = 0;
+	for (entryPtr = Tcl_FirstHashEntry(&nsPtr->childTable, &search);
+		entryPtr != NULL;
+		entryPtr = Tcl_NextHashEntry(&search)) {
+	    children[i] = (Namespace *)Tcl_GetHashValue(entryPtr);
+	    children[i]->refCount++;
+	    i++;
+	}
+	for (i = 0 ; i < length ; i++) {
+	    Tcl_DeleteNamespace((Tcl_Namespace *) children[i]);
+	    TclNsDecrRefCount(children[i]);
+	}
+	TclStackFree((Tcl_Interp *) iPtr, children);
+    }
+#else
+    if (nsPtr->childTablePtr != NULL) {
+	while (nsPtr->childTablePtr->numEntries > 0) {
+	    int length = nsPtr->childTablePtr->numEntries;
+	    Namespace **children = (Namespace **)TclStackAlloc((Tcl_Interp *) iPtr,
+		    sizeof(Namespace *) * length);
+
+	    i = 0;
+	    for (entryPtr = Tcl_FirstHashEntry(nsPtr->childTablePtr, &search);
+		    entryPtr != NULL;
+		    entryPtr = Tcl_NextHashEntry(&search)) {
+		children[i] = Tcl_GetHashValue(entryPtr);
+		children[i]->refCount++;
+		i++;
+	    }
+	    for (i = 0 ; i < length ; i++) {
+		Tcl_DeleteNamespace((Tcl_Namespace *) children[i]);
+		TclNsDecrRefCount(children[i]);
+	    }
+	    TclStackFree((Tcl_Interp *) iPtr, children);
+	}
+    }
+#endif

    /*
     * Free the namespace's export pattern array.
@@ -105,9 +105,11 @@ typedef struct {
 * Tcl_NewInstanceMethod.
 */

-#define TCL_OO_METHOD_PUBLIC		1
-#define TCL_OO_METHOD_UNEXPORTED	0
-#define TCL_OO_METHOD_PRIVATE		0x20
+enum TclOOVisibilityConstants {
+    TCL_OO_METHOD_PUBLIC = 1,
+    TCL_OO_METHOD_UNEXPORTED = 0,
+    TCL_OO_METHOD_PRIVATE = 0x20
+};

 /*
 * The type of some object (or class) metadata. This describes how to delete
@@ -51,13 +51,15 @@ typedef struct {
 * Extra flags used for call chain management.
 */

-#define DEFINITE_PROTECTED 0x100000
-#define DEFINITE_PUBLIC    0x200000
-#define KNOWN_STATE	   (DEFINITE_PROTECTED | DEFINITE_PUBLIC)
-#define SPECIAL		   (CONSTRUCTOR | DESTRUCTOR | FORCE_UNKNOWN)
-#define BUILDING_MIXINS	   0x400000
-#define TRAVERSED_MIXIN	   0x800000
-#define OBJECT_MIXIN	   0x1000000
+enum CallChainFlags {
+    DEFINITE_PROTECTED = 0x100000,
+    DEFINITE_PUBLIC =	 0x200000,
+    BUILDING_MIXINS =	 0x400000,
+    TRAVERSED_MIXIN =	 0x800000,
+    OBJECT_MIXIN =	0x1000000,
+    KNOWN_STATE = (DEFINITE_PROTECTED | DEFINITE_PUBLIC),
+    SPECIAL = (CONSTRUCTOR | DESTRUCTOR | FORCE_UNKNOWN)
+};
 #define MIXIN_CONSISTENT(flags) \
    (((flags) & OBJECT_MIXIN) ||					\
 	!((flags) & BUILDING_MIXINS) == !((flags) & TRAVERSED_MIXIN))
@@ -152,7 +154,6 @@ static const Tcl_ObjType methodNameType = {
    NULL,
    NULL
 };
-

 /*
 * ----------------------------------------------------------------------
@@ -422,6 +423,14 @@ FinalizeMethodRefs(
 * ----------------------------------------------------------------------
 */

+/*
+ * Name the bits used in the names table values.
+ */
+enum NameTableFlags {
+    IN_LIST = 1,
+    NO_IMPLEMENTATION = 2
+};
+
 int
 TclOOGetSortedMethodList(
    Object *oPtr,		/* The object to get the method names for. */
@@ -453,12 +462,6 @@ TclOOGetSortedMethodList(
    Tcl_InitObjHashTable(&names);
    Tcl_InitHashTable(&examinedClasses, TCL_ONE_WORD_KEYS);

-    /*
-     * Name the bits used in the names table values.
-     */
-#define IN_LIST 1
-#define NO_IMPLEMENTATION 2
-
    /*
     * Process method names due to the object.
     */
@@ -2027,8 +2030,9 @@ AddSimpleClassDefineNamespaces(

 static inline void
 AddDefinitionNamespaceToChain(
-    Class *const definerCls,		/* What class defines this entry. */
-    Tcl_Obj *const namespaceName,	/* The name for this entry (or NULL, a
+    Class *const definerCls,	/* What class defines this entry. */
+    Tcl_Obj *const namespaceName,
+				/* The name for this entry (or NULL, a
 				 * no-op). */
    DefineChain *const definePtr,
 				/* The define chain to add the method
@@ -112,7 +112,9 @@ typedef struct ProcedureMethod {
 * methods.
 */

-#define USE_DECLARER_NS		0x80
+enum ProcedureMethodFlags {
+    USE_DECLARER_NS = 0x80,
+};

 /*
 * Forwarded methods have the following extra information.
@@ -213,36 +215,38 @@ typedef struct Object {
 				 * command. */
 } Object;

-#define OBJECT_DESTRUCTING	1	/* Indicates that an object is being or has
-								 *  been destroyed  */
-#define DESTRUCTOR_CALLED 2	/* Indicates that evaluation of destructor script for the
-							   object has began */
-#define OO_UNUSED_4	4	/* No longer used.  */
-#define ROOT_OBJECT 0x1000	/* Flag to say that this object is the root of
+enum ObjectFlags {
+    OBJECT_DESTRUCTING = 1,	/* Indicates that an object is being or has
+				 * been destroyed  */
+    DESTRUCTOR_CALLED = 2,	/* Indicates that evaluation of destructor
+				 * script for the object has began */
+    OO_UNUSED_4 = 4,		/* No longer used.  */
+    ROOT_OBJECT = 0x1000,	/* Flag to say that this object is the root of
 				 * the class hierarchy and should be treated
 				 * specially during teardown. */
-#define FILTER_HANDLING 0x2000	/* Flag set when the object is processing a
+    FILTER_HANDLING = 0x2000,	/* Flag set when the object is processing a
 				 * filter; when set, filters are *not*
 				 * processed on the object, preventing nasty
 				 * recursive filtering problems. */
-#define USE_CLASS_CACHE 0x4000	/* Flag set to say that the object is a pure
+    USE_CLASS_CACHE = 0x4000,	/* Flag set to say that the object is a pure
 				 * instance of the class, and has had nothing
 				 * added that changes the dispatch chain (i.e.
 				 * no methods, mixins, or filters. */
-#define ROOT_CLASS 0x8000	/* Flag to say that this object is the root
+    ROOT_CLASS = 0x8000,	/* Flag to say that this object is the root
 				 * class of classes, and should be treated
 				 * specially during teardown (and in a few
 				 * other spots). */
-#define FORCE_UNKNOWN 0x10000	/* States that we are *really* looking up the
+    FORCE_UNKNOWN = 0x10000,	/* States that we are *really* looking up the
 				 * unknown method handler at that point. */
-#define HAS_PRIVATE_METHODS 0x20000
+    HAS_PRIVATE_METHODS = 0x20000,
 				/* Object/class has (or had) private methods,
 				 * and so shouldn't be cached so
 				 * aggressively. */
-#define DONT_DELETE 0x40000	/* Inhibit deletion of this object. Used
+    DONT_DELETE = 0x40000	/* Inhibit deletion of this object. Used
 				 * during fundamental object type mutation to
 				 * make sure that the object actually survives
 				 * to the end of the operation. */
+};

 /*
 * And the definition of a class. Note that every class also has an associated
@@ -418,17 +422,18 @@ typedef struct CallContext {
 * Bits for the 'flags' field of the call chain.
 */

-#define PUBLIC_METHOD     0x01	/* This is a public (exported) method. */
-#define PRIVATE_METHOD    0x02	/* This is a private (class's direct instances
+enum TclCallChainFlags {
+    PUBLIC_METHOD = 0x01,	/* This is a public (exported) method. */
+    PRIVATE_METHOD = 0x02,	/* This is a private (class's direct instances
 				 * only) method. Supports itcl. */
-#define OO_UNKNOWN_METHOD 0x04	/* This is an unknown method. */
-#define CONSTRUCTOR	  0x08	/* This is a constructor. */
-#define DESTRUCTOR	  0x10	/* This is a destructor. */
-#define TRUE_PRIVATE_METHOD 0x20
-				/* This is a private method only accessible
+    OO_UNKNOWN_METHOD = 0x04,	/* This is an unknown method. */
+    CONSTRUCTOR = 0x08,		/* This is a constructor. */
+    DESTRUCTOR = 0x10,		/* This is a destructor. */
+    TRUE_PRIVATE_METHOD = 0x20,	/* This is a private method only accessible
 				 * from other methods defined on this class
 				 * or instance. [TIP #500] */
-#define SCOPE_FLAGS (PUBLIC_METHOD | PRIVATE_METHOD | TRUE_PRIVATE_METHOD)
+    SCOPE_FLAGS = (PUBLIC_METHOD | PRIVATE_METHOD | TRUE_PRIVATE_METHOD)
+};

 /*
 * Structure containing definition information about basic class methods.
@@ -666,7 +671,9 @@ MODULE_SCOPE void	TclOOSetupVariableResolver(Tcl_Namespace *nsPtr);
 * but all arguments are used multiple times and so must have no side effects.
 */

+#ifdef DUPLICATE
 #undef DUPLICATE /* prevent possible conflict with definition in WINAPI nb30.h */
+#endif /* DUPLICATE */
 #define DUPLICATE(target,source,type) \
    do { \
 	size_t len = sizeof(type) * ((target).num=(source).num);\
@@ -1,17 +1,35 @@
 /*
- * Minimal set of shared macro definitions and declarations so that multiple
- * source files can make use of the parsing table in tclParse.c
+ * tclParse.h --
+ *
+ *	This file contains the minimal set of shared macro definitions and
+ *	declarations so that multiple source files can make use of the parsing
+ *	table in tclParse.c.
+ *
+ * Copyright (c) 2012 by Don Porter
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
 */

-#define TYPE_NORMAL		0
-#define TYPE_SPACE		0x1
-#define TYPE_COMMAND_END	0x2
-#define TYPE_SUBS		0x4
-#define TYPE_QUOTE		0x8
-#define TYPE_CLOSE_PAREN	0x10
-#define TYPE_CLOSE_BRACK	0x20
-#define TYPE_BRACE		0x40
+enum ParseTypes {
+    TYPE_NORMAL = 0,
+    TYPE_SPACE = 0x1,
+    TYPE_COMMAND_END = 0x2,
+    TYPE_SUBS = 0x4,
+    TYPE_QUOTE = 0x8,
+    TYPE_CLOSE_PAREN = 0x10,
+    TYPE_CLOSE_BRACK = 0x20,
+    TYPE_BRACE = 0x40
+};

-#define CHAR_TYPE(c) tclCharTypeTable[(unsigned char)(c)]
+#define CHAR_TYPE(c)	tclCharTypeTable[(unsigned char)(c)]

 MODULE_SCOPE const char tclCharTypeTable[];
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */
@@ -77,23 +77,27 @@ typedef struct FsPath {
 * Flag values for FsPath->flags.
 */

-#define TCLPATH_APPENDED 1
-#define TCLPATH_NEEDNORM 4
+enum FsPathFlags {
+    TCLPATH_APPENDED = 1,
+    TCLPATH_NEEDNORM = 4
+};

 /*
 * Define some macros to give us convenient access to path-object specific
 * fields.
 */

-#define PATHOBJ(pathPtr) ((FsPath *) (TclFetchIntRep((pathPtr), &fsPathType)->twoPtrValue.ptr1))
+#define PATHOBJ(pathPtr) \
+    ((FsPath *) (TclFetchIntRep((pathPtr), &fsPathType)->twoPtrValue.ptr1))
 #define SETPATHOBJ(pathPtr,fsPathPtr) \
-	do {							\
-		Tcl_ObjIntRep ir;				\
-		ir.twoPtrValue.ptr1 = (void *) (fsPathPtr);	\
-		ir.twoPtrValue.ptr2 = NULL;			\
-		Tcl_StoreIntRep((pathPtr), &fsPathType, &ir);	\
-	} while (0)
-#define PATHFLAGS(pathPtr) (PATHOBJ(pathPtr)->flags)
+    do {							\
+	Tcl_ObjIntRep ir;					\
+	ir.twoPtrValue.ptr1 = (void *) (fsPathPtr);		\
+	ir.twoPtrValue.ptr2 = NULL;				\
+	Tcl_StoreIntRep((pathPtr), &fsPathType, &ir);		\
+    } while (0)
+#define PATHFLAGS(pathPtr) \
+    (PATHOBJ(pathPtr)->flags)

 /*
 *---------------------------------------------------------------------------
@@ -158,9 +158,6 @@ Tcl_ErrnoId(void)
 #ifdef EINIT
    case EINIT: return "EINIT";
 #endif
-#ifdef EILSEQ
-    case EILSEQ: return "EILSEQ";
-#endif
 #ifdef EINPROGRESS
    case EINPROGRESS: return "EINPROGRESS";
 #endif
@@ -620,9 +617,6 @@ Tcl_ErrnoMsg(
 #ifdef EINIT
    case EINIT: return "initialization error";
 #endif
-#ifdef EILSEQ
-    case EILSEQ: return "illegal byte sequence";
-#endif
 #ifdef EINPROGRESS
    case EINPROGRESS: return "operation now in progress";
 #endif
@@ -16,13 +16,14 @@
 * Flag values used by Tcl_ScanObjCmd.
 */

-#define SCAN_NOSKIP	0x1		/* Don't skip blanks. */
-#define SCAN_SUPPRESS	0x2		/* Suppress assignment. */
-#define SCAN_UNSIGNED	0x4		/* Read an unsigned value. */
-#define SCAN_WIDTH	0x8		/* A width value was supplied. */
-
-#define SCAN_LONGER	0x400		/* Asked for a wide value. */
-#define SCAN_BIG	0x800		/* Asked for a bignum value. */
+enum ScanFlags {
+    SCAN_NOSKIP = 0x1,		/* Don't skip blanks. */
+    SCAN_SUPPRESS = 0x2,	/* Suppress assignment. */
+    SCAN_UNSIGNED = 0x4,	/* Read an unsigned value. */
+    SCAN_WIDTH = 0x8,		/* A width value was supplied. */
+    SCAN_LONGER = 0x400,	/* Asked for a wide value. */
+    SCAN_BIG = 0x800		/* Asked for a bignum value. */
+};

 /*
 * The following structure contains the information associated with a
@@ -1227,7 +1227,6 @@ Tcl_AppendLimitedToObj(
     * force objPtr to unicode representation. See [7f1162a867] */
    if (bytes && ISCONTINUATION(bytes)) {
 	Tcl_GetUnicode(objPtr);
-	stringPtr = GET_STRING(objPtr);
    }
    if (stringPtr->hasUnicode && stringPtr->numChars > 0) {
 	AppendUtfToUnicodeRep(objPtr, bytes, toCopy);
@@ -1431,7 +1430,6 @@ Tcl_AppendObjToObj(
     * This fixes append-3.4, append-3.7 and utf-1.18 testcases. */
    if (ISCONTINUATION(TclGetString(appendObjPtr))) {
 	Tcl_GetUnicode(objPtr);
-	stringPtr = GET_STRING(objPtr);
    }
    /*
     * If objPtr has a valid Unicode rep, then get a Unicode string from
@@ -3849,7 +3847,6 @@ TclStringReverse(

    if (stringPtr->hasUnicode) {
 	Tcl_UniChar *from = Tcl_GetUnicode(objPtr);
-	stringPtr = GET_STRING(objPtr);
 	Tcl_UniChar *src = from + stringPtr->numChars;
 	Tcl_UniChar *to;

@@ -3862,7 +3859,6 @@ TclStringReverse(
 	    objPtr = Tcl_NewUnicodeObj(&ch, 1);
 	    Tcl_SetObjLength(objPtr, stringPtr->numChars);
 	    to = Tcl_GetUnicode(objPtr);
-	    stringPtr = GET_STRING(objPtr);
 	    while (--src >= from) {
 #if TCL_UTF_MAX < 4
 		ch = *src;
@@ -299,8 +299,6 @@ mp_err	TclBN_mp_mul_d(const mp_int *a, unsigned int b, mp_int *c) {
 #   define Tcl_MacOSXOpenBundleResources 0
 #   define TclGuessPackageName 0
 #   define TclGetLoadedPackages 0
-#   undef TclSetPreInitScript
-#   define TclSetPreInitScript 0
 #else

 #define TclGuessPackageName guessPackageName
@@ -1941,7 +1939,6 @@ const TclStubs tclStubs = {
    Tcl_UtfCharComplete, /* 654 */
    Tcl_UtfNext, /* 655 */
    Tcl_UtfPrev, /* 656 */
-    Tcl_UniCharIsUnicode, /* 657 */
 };

 /* !END!: Do not edit above this line. */
@@ -227,7 +227,6 @@ static Tcl_CmdProc	TestcreatecommandCmd;
 static Tcl_CmdProc	TestdcallCmd;
 static Tcl_CmdProc	TestdelCmd;
 static Tcl_CmdProc	TestdelassocdataCmd;
-static Tcl_ObjCmdProc	TestdebugObjCmd;
 static Tcl_ObjCmdProc	TestdoubledigitsObjCmd;
 static Tcl_CmdProc	TestdstringCmd;
 static Tcl_ObjCmdProc	TestencodingObjCmd;
@@ -266,7 +265,6 @@ static Tcl_ObjCmdProc	TestparsevarObjCmd;
 static Tcl_ObjCmdProc	TestparsevarnameObjCmd;
 static Tcl_ObjCmdProc	TestpreferstableObjCmd;
 static Tcl_ObjCmdProc	TestprintObjCmd;
-static Tcl_ObjCmdProc	TestpurifyObjCmd;
 static Tcl_ObjCmdProc	TestregexpObjCmd;
 static Tcl_ObjCmdProc	TestreturnObjCmd;
 static void		TestregexpXflags(const char *string,
@@ -506,8 +504,6 @@ Tcltest_Init(
    Tcl_CreateCommand(interp, "testcreatecommand", TestcreatecommandCmd,
 	    NULL, NULL);
    Tcl_CreateCommand(interp, "testdcall", TestdcallCmd, NULL, NULL);
-    Tcl_CreateObjCommand(interp, "testdebug", TestdebugObjCmd,
-	    NULL, NULL);
    Tcl_CreateCommand(interp, "testdel", TestdelCmd, NULL, NULL);
    Tcl_CreateCommand(interp, "testdelassocdata", TestdelassocdataCmd,
 	    NULL, NULL);
@@ -572,8 +568,6 @@ Tcltest_Init(
 	    NULL, NULL);
    Tcl_CreateObjCommand(interp, "testpreferstable", TestpreferstableObjCmd,
 	    NULL, NULL);
-    Tcl_CreateObjCommand(interp, "testpurify", TestpurifyObjCmd,
-	    NULL, NULL);
    Tcl_CreateObjCommand(interp, "testprint", TestprintObjCmd,
 	    NULL, NULL);
    Tcl_CreateObjCommand(interp, "testregexp", TestregexpObjCmd,
@@ -3367,40 +3361,6 @@ TestlocaleCmd(
    return TCL_OK;
 }

-/*
- *----------------------------------------------------------------------
- *
- * TestdebugObjCmd --
- *
- *	Implements the "testdebug" command, to detect whether Tcl was built with
- *	--enabble-symbols.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestdebugObjCmd(
-    TCL_UNUSED(void *),
-    Tcl_Interp *interp,		/* Current interpreter. */
-    TCL_UNUSED(int) /*objc*/,
-    TCL_UNUSED(Tcl_Obj *const *) /*objv*/)
-{
-
-#if defined(NDEBUG) && NDEBUG == 1
-	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
-#else
-	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(1));
-#endif
-
-    return TCL_OK;
-}
-
 /*
 *----------------------------------------------------------------------
 *
@@ -3802,40 +3762,6 @@ TestprintObjCmd(
    return TCL_OK;
 }

-/*
- *----------------------------------------------------------------------
- *
- * TestpurifyObjCmd --
- *
- *	Implements the "testpurify" command, to detect whether Tcl was built with
- *	-DPURIFY.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-TestpurifyObjCmd(
-    TCL_UNUSED(void *),
-    Tcl_Interp *interp,		/* Current interpreter. */
-    TCL_UNUSED(int) /*objc*/,
-    TCL_UNUSED(Tcl_Obj *const *) /*objv*/)
-{
-
-#ifdef PURIFY
-	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(1));
-#else
-	Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
-#endif
-
-    return TCL_OK;
-}
-
 /*
 *----------------------------------------------------------------------
 *
@@ -61,6 +61,7 @@ static void VarPtrDeleteProc(void *clientData, Tcl_Interp *interp)
    for (i = 0;  i < NUMBER_OF_OBJECT_VARS;  i++) {
 	if (varPtr[i]) Tcl_DecrRefCount(varPtr[i]);
    }
+    Tcl_DeleteAssocData(interp, VARPTR_KEY);
    ckfree(varPtr);
 }

@@ -68,25 +68,26 @@ typedef struct {
 * TCL_TRACE_ENTER_DURING_EXEC == 4 * TCL_TRACE_ENTER_EXEC and that
 * TCL_TRACE_LEAVE_DURING_EXEC == 4 * TCL_TRACE_LEAVE_EXEC.
 *
- * TCL_TRACE_ENTER_DURING_EXEC  - Trace each command inside the command
- *				  currently being traced, before execution.
- * TCL_TRACE_LEAVE_DURING_EXEC  - Trace each command inside the command
- *				  currently being traced, after execution.
- * TCL_TRACE_ANY_EXEC		- OR'd combination of all EXEC flags.
- * TCL_TRACE_EXEC_IN_PROGRESS   - The callback function on this trace is
- *				  currently executing. Therefore we don't let
- *				  further traces execute.
- * TCL_TRACE_EXEC_DIRECT	- This execution trace is triggered directly
- *				  by the command being traced, not because of
- *				  an internal trace.
 * The flag 'TCL_TRACE_DESTROYED' may also be used in command execution traces.
 */

-#define TCL_TRACE_ENTER_DURING_EXEC	4
-#define TCL_TRACE_LEAVE_DURING_EXEC	8
-#define TCL_TRACE_ANY_EXEC		15
-#define TCL_TRACE_EXEC_IN_PROGRESS	0x10
-#define TCL_TRACE_EXEC_DIRECT		0x20
+enum TraceExecutionFlags {
+    TCL_TRACE_ENTER_DURING_EXEC = 4,
+				/* Trace each command inside the command
+				 * currently being traced, before
+				 * execution. */
+    TCL_TRACE_LEAVE_DURING_EXEC = 8,
+				/* Trace each command inside the command
+				 * currently being traced, after execution. */
+    TCL_TRACE_ANY_EXEC = 15,	/* OR'd combination of all EXEC flags. */
+    TCL_TRACE_EXEC_IN_PROGRESS = 0x10,
+				/* The callback function on this trace is
+				 * currently executing. Therefore we don't let
+				 * further traces execute. */
+    TCL_TRACE_EXEC_DIRECT = 0x20/* This execution trace is triggered directly
+				 * by the command being traced, not because of
+				 * an internal trace. */
+};

 /*
 * Forward declarations for functions defined in this file:
@@ -2179,36 +2179,6 @@ Tcl_UniCharIsUpper(
    return (GetCategory(ch) == UPPERCASE_LETTER);
 }

-/*
- *----------------------------------------------------------------------
- *
- * Tcl_UniCharIsUnicode --
- *
- *	Test if a character is a Unicode character.
- *
- * Results:
- *	Returns non-zero if character belongs to the Unicode set.
- *
- *	Excluded are:
- *	  1) All characters > U+10FFFF
- *	  2) Surrogates U+D800 - U+DFFF
- *	  3) Last 2 characters of each plane, so U+??FFFE  and U+??FFFF
- *	  4) The characters in the range U+FDD0 - U+FDEF
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-int
-Tcl_UniCharIsUnicode(
-    int ch)			/* Unicode character to test. */
-{
-    return ((unsigned int)ch <= 0x10FFFF) && ((ch & 0xFFF800) != 0xD800)
-	    && ((ch & 0xFFFE) != 0xFFFE) && ((unsigned int)(ch - 0xFDD0) >= 32);
-}
-
 /*
 *----------------------------------------------------------------------
 *
@@ -88,11 +88,13 @@ static ProcessGlobalValue executableName = {
 */

 #define COMPAT 1
-#define CONVERT_NONE	0
-#define CONVERT_BRACE	2
-#define CONVERT_ESCAPE	4
-#define CONVERT_MASK	(CONVERT_BRACE | CONVERT_ESCAPE)
-#define CONVERT_ANY	16
+enum FormatListFlags {
+    CONVERT_NONE = 0,
+    CONVERT_BRACE = 2,
+    CONVERT_ESCAPE = 4,
+    CONVERT_MASK = (CONVERT_BRACE | CONVERT_ESCAPE),
+    CONVERT_ANY = 16
+};

 /*
 * The following key is used by Tcl_PrintDouble and TclPrecTraceProc to
@@ -249,7 +249,7 @@ typedef struct ZipChannel {
 * Most are kept in single ZipFS struct. When build with threading support
 * this struct is protected by the ZipFSMutex (see below).
 *
- * The "fileHash" component is the process-wide global table of all known ZIP
+ * The "fileHash" component is the process wide global table of all known ZIP
 * archive members in all mounted ZIP archives.
 *
 * The "zipHash" components is the process wide global table of all mounted
@@ -346,9 +346,7 @@ static int		ZipFSLoadFile(Tcl_Interp *interp, Tcl_Obj *path,
 static int		ZipMapArchive(Tcl_Interp *interp, ZipFile *zf,
 			    void *handle);
 static void		ZipfsExitHandler(ClientData clientData);
-static void		ZipfsMountExitHandler(ClientData clientData);
 static void		ZipfsSetup(void);
-static void		ZipfsFinalize(void);
 static int		ZipChannelClose(void *instanceData,
 			    Tcl_Interp *interp, int flags);
 static Tcl_DriverGetHandleProc	ZipChannelGetFile;
@@ -1542,7 +1540,7 @@ IsPasswordValid(
 static int
 ZipFSCatalogFilesystem(
    Tcl_Interp *interp,		/* Current interpreter. NULLable. */
-    ZipFile *zf,		/* Temporary buffer hold archive descriptors */
+    ZipFile *zf0,		/* Temporary buffer hold archive descriptors */
    const char *mountPoint,	/* Mount point path. */
    const char *passwd,		/* Password for opening the ZIP, or NULL if
 				 * the ZIP is unprotected. */
@@ -1550,7 +1548,7 @@ ZipFSCatalogFilesystem(
 {
    int pwlen, isNew;
    size_t i;
-    ZipFile *zf0;
+    ZipFile *zf;
    ZipEntry *z;
    Tcl_HashEntry *hPtr;
    Tcl_DString ds, dsm, fpBuf;
@@ -1572,12 +1570,10 @@ ZipFSCatalogFilesystem(
     * Validate the TOC data. If that's bad, things fall apart.
     */

-    if (zf->baseOffset >= zf->length || zf->passOffset >= zf->length ||
-	    zf->directoryOffset >= zf->length) {
+    if (zf0->baseOffset >= zf0->length || zf0->passOffset >= zf0->length ||
+	    zf0->directoryOffset >= zf0->length) {
 	ZIPFS_ERROR(interp, "bad zip data");
 	ZIPFS_ERROR_CODE(interp, "BAD_ZIP");
-	ZipFSCloseArchive(interp, zf);
-	ckfree(zf);
 	return TCL_ERROR;
    }

@@ -1598,14 +1594,19 @@ ZipFSCatalogFilesystem(
    hPtr = Tcl_CreateHashEntry(&ZipFS.zipHash, mountPoint, &isNew);
    if (!isNew) {
 	if (interp) {
-	    zf0 = (ZipFile *) Tcl_GetHashValue(hPtr);
+	    zf = (ZipFile *) Tcl_GetHashValue(hPtr);
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "%s is already mounted on %s", zf0->name, mountPoint));
+		    "%s is already mounted on %s", zf->name, mountPoint));
 	    ZIPFS_ERROR_CODE(interp, "MOUNTED");
 	}
 	Unlock();
-	ZipFSCloseArchive(interp, zf);
-	ckfree(zf);
+	ZipFSCloseArchive(interp, zf0);
+	return TCL_ERROR;
+    }
+    zf = AllocateZipFile(interp, strlen(mountPoint));
+    if (!zf) {
+	Unlock();
+	ZipFSCloseArchive(interp, zf0);
 	return TCL_ERROR;
    }
    Unlock();
@@ -1614,8 +1615,9 @@ ZipFSCatalogFilesystem(
     * Convert to a real archive descriptor.
     */

+    *zf = *zf0;
    zf->mountPoint = (char *) Tcl_GetHashKey(&ZipFS.zipHash, hPtr);
-    Tcl_CreateExitHandler(ZipfsMountExitHandler, zf);
+    Tcl_CreateExitHandler(ZipfsExitHandler, zf);
    zf->mountPointLen = strlen(zf->mountPoint);

    zf->nameLength = strlen(zipname);
@@ -1857,7 +1859,6 @@ ZipfsSetup(void)
    strcpy(ZipFS.fallbackEntryEncoding, ZIPFS_FALLBACK_ENCODING);
    ZipFS.utf8 = Tcl_GetEncoding(NULL, "utf-8");
    ZipFS.initialized = 1;
-    Tcl_CreateExitHandler(ZipfsExitHandler, NULL);
 }

 /*
@@ -2018,8 +2019,10 @@ TclZipfs_Mount(
    }
    if (ZipFSCatalogFilesystem(interp, zf, mountPoint, passwd, zipname)
 	    != TCL_OK) {
+	ckfree(zf);
 	return TCL_ERROR;
    }
+    ckfree(zf);
    return TCL_OK;
 }

@@ -2106,6 +2109,7 @@ TclZipfs_MountBuffer(
    }
    result = ZipFSCatalogFilesystem(interp, zf, mountPoint, NULL,
 	    "Memory Buffer");
+    ckfree(zf);
    return result;
 }

@@ -2181,7 +2185,7 @@ TclZipfs_Unmount(
 	ckfree(z);
    }
    ZipFSCloseArchive(interp, zf);
-    Tcl_DeleteExitHandler(ZipfsMountExitHandler, zf);
+    Tcl_DeleteExitHandler(ZipfsExitHandler, zf);
    ckfree(zf);
    unmounted = 1;

@@ -5735,45 +5739,11 @@ static void
 ZipfsExitHandler(
    ClientData clientData)
 {
-    Tcl_HashEntry *hPtr;
-    Tcl_HashSearch search;
-    if (ZipFS.initialized != -1) {
-	hPtr = Tcl_FirstHashEntry(&ZipFS.fileHash, &search);
-	if (hPtr == NULL) {
-	    ZipfsFinalize();
-	} else {
-	    /* ZipFS.fallbackEntryEncoding was already freed by
-	     * ZipfsMountExitHandler
-	    */
-	}
-    }
-}
-
-static void
-ZipfsFinalize(void) {
-    Tcl_DeleteHashTable(&ZipFS.fileHash);
-    ckfree(ZipFS.fallbackEntryEncoding);
-    ZipFS.initialized = -1;
-}
-
-static void
-ZipfsMountExitHandler(
-    ClientData clientData)
-{
-    Tcl_HashEntry *hPtr;
-    Tcl_HashSearch search;
-
    ZipFile *zf = (ZipFile *) clientData;

    if (TCL_OK != TclZipfs_Unmount(NULL, zf->mountPoint)) {
 	Tcl_Panic("tried to unmount busy filesystem");
    }
-
-    hPtr = Tcl_FirstHashEntry(&ZipFS.fileHash, &search);
-    if (hPtr == NULL) {
-	ZipfsFinalize();
-    }
-
 }

 /*
@@ -130,21 +130,19 @@ typedef struct {
 } ZlibChannelData;

 /*
- * Value bits for the flags field. Definitions are:
- *	ASYNC -		Whether this is an asynchronous channel.
- *	IN_HEADER -	Whether the inHeader field has been registered with
- *			the input compressor.
- *	OUT_HEADER -	Whether the outputHeader field has been registered
- *			with the output decompressor.
- *	STREAM_DECOMPRESS - Signal decompress pending data.
- *	STREAM_DONE -	Flag to signal stream end up to transform input.
+ * Value bits for the flags field:
 */

-#define ASYNC			0x01
-#define IN_HEADER		0x02
-#define OUT_HEADER		0x04
-#define STREAM_DECOMPRESS	0x08
-#define STREAM_DONE		0x10
+enum ZlibChannelFlags {
+    ASYNC = 0x01,		/* Whether this is an asynchronous channel. */
+    IN_HEADER = 0x02,		/* Whether the inHeader field has been
+				 * registered with the input compressor. */
+    OUT_HEADER = 0x04,		/* Whether the outputHeader field has been
+				 * registered with the output decompressor. */
+    STREAM_DECOMPRESS = 0x08,	/* Signal decompress pending data. */
+    STREAM_DONE = 0x10		/* Flag to signal stream end up to transform
+				 * input. */
+};

 /*
 * Size of buffers allocated by default, and the range it can be set to.  The
@@ -214,7 +212,7 @@ static const Tcl_ChannelType zlibChannelType = {
    ZlibTransformGetOption,
    ZlibTransformWatch,
    ZlibTransformGetHandle,
-	ZlibTransformClose,			/* close2Proc */
+    ZlibTransformClose,		/* close2Proc */
    ZlibTransformBlockMode,
    NULL,			/* flushProc */
    ZlibTransformEventHandler,
@@ -214,9 +214,9 @@ proc unknown args {
 		set errInfo [dict get $opts -errorinfo]
 		set errCode [dict get $opts -errorcode]
 		set cinfo $args
-		if {[string length [encoding convertto utf-8 $cinfo]] > 150} {
+		if {[string bytelength $cinfo] > 150} {
 		    set cinfo [string range $cinfo 0 150]
-		    while {[string length [encoding convertto utf-8 $cinfo]] > 150} {
+		    while {[string bytelength $cinfo] > 150} {
 			set cinfo [string range $cinfo 0 end-1]
 		    }
 		    append cinfo ...
@@ -32,9 +32,11 @@ extern int		copyfile(const char *from, const char *to,
 #else /* HAVE_COPYFILE_H */
 int			copyfile(const char *from, const char *to,
 			    void *state, uint32_t flags);
-#define COPYFILE_ACL		(1<<0)
-#define COPYFILE_XATTR		(1<<2)
-#define COPYFILE_NOFOLLOW_SRC	(1<<18)
+enum copyfileFlags {
+    COPYFILE_ACL = (1<<0),
+    COPYFILE_XATTR = (1<<2),
+    COPYFILE_NOFOLLOW_SRC = (1<<18)
+};
 #if defined(HAVE_WEAK_IMPORT) && (MAC_OS_X_VERSION_MIN_REQUIRED < 1040)
 /* Support for weakly importing copyfile. */
 #define WEAK_IMPORT_COPYFILE
@@ -84,11 +86,11 @@ static int		SetOSTypeFromAny(Tcl_Interp *interp, Tcl_Obj *objPtr);
 static void		UpdateStringOfOSType(Tcl_Obj *objPtr);

 static const Tcl_ObjType tclOSTypeType = {
-    "osType",				/* name */
-    NULL,				/* freeIntRepProc */
-    NULL,				/* dupIntRepProc */
-    UpdateStringOfOSType,		/* updateStringProc */
-    SetOSTypeFromAny			/* setFromAnyProc */
+    "osType",			/* name */
+    NULL,			/* freeIntRepProc */
+    NULL,			/* dupIntRepProc */
+    UpdateStringOfOSType,	/* updateStringProc */
+    SetOSTypeFromAny		/* setFromAnyProc */
 };

 enum {
@@ -689,7 +691,7 @@ SetOSTypeFromAny(

 static void
 UpdateStringOfOSType(
-    Tcl_Obj *objPtr)	/* OSType object whose string rep to
+    Tcl_Obj *objPtr)		/* OSType object whose string rep to
 				 * update. */
 {
    const int size = TCL_UTF_MAX * 4;
@@ -7518,7 +7518,7 @@ test chan-io-60.1 {writing illegal utf sequences} {fileevent testbytestring} {
    # cut of the remainder of the error stack, especially the filename
    set result [lreplace $result 3 3 [lindex [split [lindex $result 3] \n] 0]]
    list $x $result
-} {1 {gets {} catch {error writing "stdout": illegal byte sequence}}}
+} {1 {gets {} catch {error writing "stdout": invalid argument}}}

 test chan-io-61.1 {Reset eof state after changing the eof char} -setup {
    set datafile [makeFile {} eofchar]
@@ -343,61 +343,61 @@ test encoding-15.6 {UtfToUtfProc emoji character output} {
    set y [encoding convertto utf-8 \uDE02\uD83D\uDE02\uD83D]
    binary scan $y H* z
    list [string length $y] $z
-} {10 efbfbdf09f9882efbfbd}
+} {10 edb882f09f9882eda0bd}
 test encoding-15.7 {UtfToUtfProc emoji character output} {
    set x \uDE02\uD83D\uD83D
    set y [encoding convertto utf-8 \uDE02\uD83D\uD83D]
    binary scan $y H* z
    list [string length $x] [string length $y] $z
-} {3 9 efbfbdefbfbdefbfbd}
+} {3 9 edb882eda0bdeda0bd}
 test encoding-15.8 {UtfToUtfProc emoji character output} {
    set x \uDE02\uD83Dé
    set y [encoding convertto utf-8 \uDE02\uD83Dé]
    binary scan $y H* z
    list [string length $x] [string length $y] $z
-} {3 8 efbfbdefbfbdc3a9}
+} {3 8 edb882eda0bdc3a9}
 test encoding-15.9 {UtfToUtfProc emoji character output} {
    set x \uDE02\uD83DX
    set y [encoding convertto utf-8 \uDE02\uD83DX]
    binary scan $y H* z
    list [string length $x] [string length $y] $z
-} {3 7 efbfbdefbfbd58}
+} {3 7 edb882eda0bd58}
 test encoding-15.10 {UtfToUtfProc high surrogate character output} {
    set x \uDE02é
    set y [encoding convertto utf-8 \uDE02é]
    binary scan $y H* z
    list [string length $x] [string length $y] $z
-} {2 5 efbfbdc3a9}
+} {2 5 edb882c3a9}
 test encoding-15.11 {UtfToUtfProc low surrogate character output} {
    set x \uDA02é
    set y [encoding convertto utf-8 \uDA02é]
    binary scan $y H* z
    list [string length $x] [string length $y] $z
-} {2 5 efbfbdc3a9}
+} {2 5 eda882c3a9}
 test encoding-15.12 {UtfToUtfProc high surrogate character output} {
    set x \uDE02Y
    set y [encoding convertto utf-8 \uDE02Y]
    binary scan $y H* z
    list [string length $x] [string length $y] $z
-} {2 4 efbfbd59}
+} {2 4 edb88259}
 test encoding-15.13 {UtfToUtfProc low surrogate character output} {
    set x \uDA02Y
    set y [encoding convertto utf-8 \uDA02Y]
    binary scan $y H* z
    list [string length $x] [string length $y] $z
-} {2 4 efbfbd59}
+} {2 4 eda88259}
 test encoding-15.14 {UtfToUtfProc high surrogate character output} {
    set x \uDE02
    set y [encoding convertto utf-8 \uDE02]
    binary scan $y H* z
    list [string length $x] [string length $y] $z
-} {1 3 efbfbd}
+} {1 3 edb882}
 test encoding-15.15 {UtfToUtfProc low surrogate character output} {
    set x \uDA02
    set y [encoding convertto utf-8 \uDA02]
    binary scan $y H* z
    list [string length $x] [string length $y] $z
-} {1 3 efbfbd}
+} {1 3 eda882}
 test encoding-15.16 {UtfToUtfProc: Invalid 4-byte UTF-8, see [ed29806ba]} {
    set x \xF0\xA0\xA1\xC2
    set y [encoding convertfrom utf-8 \xF0\xA0\xA1\xC2]
@@ -409,26 +409,6 @@ test encoding-15.17 {UtfToUtfProc emoji character output} {
    binary scan $y H* z
    list [string length $y] $z
 } {4 f09f9882}
-test encoding-15.18 {UtfToUtfProc CESU-8 6-byte sequence} {
-    set y [encoding convertto cesu-8 \U10000]
-    binary scan $y H* z
-    list [string length $y] $z
-} {6 eda080edb080}
-test encoding-15.19 {UtfToUtfProc CESU-8 upper surrogate} {
-    set y [encoding convertto cesu-8 \uD800]
-    binary scan $y H* z
-    list [string length $y] $z
-} {3 eda080}
-test encoding-15.20 {UtfToUtfProc CESU-8 lower surrogate} {
-    set y [encoding convertto cesu-8 \uDC00]
-    binary scan $y H* z
-    list [string length $y] $z
-} {3 edb080}
-test encoding-15.21 {UtfToUtfProc CESU-8 noncharacter} {
-    set y [encoding convertto cesu-8 \uFFFF]
-    binary scan $y H* z
-    list [string length $y] $z
-} {3 efbfbf}

 test encoding-16.1 {Utf16ToUtfProc} -body {
    set val [encoding convertfrom utf-16 NN]
@@ -454,15 +434,15 @@ test encoding-16.4 {Ucs2ToUtfProc} -body {
 test encoding-17.1 {UtfToUtf16Proc} -body {
    encoding convertto utf-16 "\U460DC"
 } -result "\xD8\xD8\xDC\xDC"
-test encoding-17.2 {UtfToUcs2Proc} -body {
+test encoding-17.2 {UtfToUtf16Proc} -body {
+    encoding convertto utf-16 "\uDCDC"
+} -result "\xDC\xDC"
+test encoding-17.3 {UtfToUtf16Proc} -body {
+    encoding convertto utf-16 "\uD8D8"
+} -result "\xD8\xD8"
+test encoding-17.4 {UtfToUcs2Proc} -body {
    encoding convertfrom utf-16 [encoding convertto ucs-2 "\U460DC"]
 } -result "\uFFFD"
-test encoding-17.3 {UtfToUtf16Proc} -body {
-    encoding convertto utf-16be "\uDCDC"
-} -result "\xFF\xFD"
-test encoding-17.4 {UtfToUtf16Proc} -body {
-    encoding convertto utf-16le "\uD8D8"
-} -result "\xFD\xFF"

 test encoding-18.1 {TableToUtfProc} {
 } {}
@@ -762,7 +742,7 @@ test encoding-28.0 {all encodings load} -body {
 		llength $name
 	}
 	return $count
-} -result [expr {[info exists ::tcl_precision] ? 87 : 86}]
+} -result [expr {[info exists ::tcl_precision] ? 86 : 85}]

 runtests

@@ -22,7 +22,7 @@ if {{::tcltest} ni [namespace children]} {
 ::tcltest::loadTestedCommands
 catch [list package require -exact tcl::test [info patchlevel]]
 testConstraint zlib [llength [info commands zlib]]
-testConstraint nodep [info exists tcl_precision]
+
 # Set up namespaces needed to test operation of "info args", "info body",
 # "info default", and "info procs" with imported procedures.

@@ -101,7 +101,7 @@ test info-2.5 {info body option, returning bytecompiled bodies} -body {
 # Fix for problem tested for in info-2.5 caused problems when
 # procedure body had no string rep (i.e. was not yet bytecode)
 # causing an empty string to be returned [Bug #545644]
-test info-2.6 {info body option, returning list bodies} nodep {
+test info-2.6 {info body option, returning list bodies} {
    proc foo args [list subst bar]
    list [string bytelength [info body foo]] \
 	    [foo; string bytelength [info body foo]]
@@ -2346,9 +2346,9 @@ test io-28.3 {CloseChannel, not called before output queue is empty} \
        set result ok
    }
 } ok
-test io-28.4 Tcl_Close testchannel {
+test io-28.4 {Tcl_Close} {testchannel} {
    file delete $path(test1)
-    set l {}
+    set l ""
    lappend l [lsort [testchannel open]]
    set f [open $path(test1) w]
    lappend l [lsort [testchannel open]]
@@ -2373,74 +2373,6 @@ test io-28.5 {Tcl_Close vs standard handles} {stdio unix testchannel} {
    lsort $l
 } {file1 file2}

-
-test io-28.6 {
-	close channel in write event handler
-
-	Should not produce a segmentation fault in a Tcl built with
-	--enable-symbols and -DPURIFY
-} debugpurify {
-    variable done
-    variable res
-    after 0 [list coroutine c1 apply [list {} {
-	variable done
-	set chan [chan create w {apply {args {
-	    list initialize finalize watch write configure blocking
-	}}}]
-	chan configure $chan -blocking 0
-	while 1 {
-	    chan event $chan writable [list [info coroutine]]
-	    yield
-	    close $chan
-	    set done 1
-	    return
-	}
-    } [namespace current]]]
-    vwait [namespace current]::done
-return success
-} success
-
-
-test io-28.7 {
-    close channel in read event handler
-
-	Should not produce a segmentation fault in a Tcl built with
-	--enable-symbols and -DPURIFY
-} debugpurify {
-    variable done
-    variable res
-    after 0 [list coroutine c1 apply [list {} {
-	variable done
-	set chan [chan create r {apply {{cmd chan args} {
-	    switch $cmd {
-		blocking - finalize {
-		}
-		watch {
-		    chan postevent $chan read
-		}
-		initialize {
-		    list initialize finalize watch read write configure blocking
-		}
-		default {
-		    error [list {unexpected command} $cmd]
-		}
-	    }
-	}}}]
-	chan configure $chan -blocking 0
-	while 1 {
-	    chan event $chan readable [list [info coroutine]]
-	    yield
-	    close $chan
-	    set done 1
-	    return
-	}
-    } [namespace current]]]
-    vwait [namespace current]::done
-return success
-} success
-
-
-
 test io-29.1 {Tcl_WriteChars, channel not writable} {
    list [catch {puts stdin hello} msg] $msg
 } {1 {channel "stdin" wasn't opened for writing}}
@@ -5378,6 +5310,9 @@ test io-39.1 {Tcl_GetChannelOption} {
    close $f1
    set x
 } 1
+#
+# Test 17.2 was removed.
+#
 test io-39.2 {Tcl_GetChannelOption} {
    file delete $path(test1)
    set f1 [open $path(test1) w]
@@ -8478,7 +8413,7 @@ test io-60.1 {writing illegal utf sequences} {fileevent testbytestring} {
    # cut of the remainder of the error stack, especially the filename
    set result [lreplace $result 3 3 [lindex [split [lindex $result 3] \n] 0]]
    list $x $result
-} {1 {gets {} catch {error writing "stdout": illegal byte sequence}}}
+} {1 {gets {} catch {error writing "stdout": invalid argument}}}

 test io-61.1 {Reset eof state after changing the eof char} -setup {
    set datafile [makeFile {} eofchar]
@@ -19,7 +19,6 @@ if {"::tcltest" ni [namespace children]} {
 unset -nocomplain foo

 testConstraint exec [llength [info commands exec]]
-testConstraint nodep [info exists tcl_precision]

 # Used for constraining memory leak tests
 testConstraint memory [llength [info commands memory]]
@@ -766,7 +765,7 @@ test regexp-19.2 {regsub null replacement} {
    string equal $result $expected
 } 1

-test regexp-20.1 {regsub shared object shimmering} -constraints nodep -body {
+test regexp-20.1 {regsub shared object shimmering} -body {
    # Bug #461322
    set a abcdefghijklmnopqurstuvwxyz
    set b $a
@@ -16,8 +16,6 @@ if {"::tcltest" ni [namespace children]} {
    namespace import -force ::tcltest::*
 }

-testConstraint nodep [info exists tcl_precision]
-
 # Procedure to evaluate a script within a proc, to test compilation
 # functionality

@@ -793,7 +791,7 @@ test regexpComp-19.1 {regsub null replacement} {
    }
 } "\0a\0hel\0a\0lo\0a\0 14"

-test regexpComp-20.1 {regsub shared object shimmering} nodep {
+test regexpComp-20.1 {regsub shared object shimmering} {
    evalInProc {
 	# Bug #461322
 	set a abcdefghijklmnopqurstuvwxyz
@@ -33,7 +33,6 @@ testConstraint testindexobj [expr {[info commands testindexobj] ne {}}]
 testConstraint testevalex [expr {[info commands testevalex] ne {}}]
 testConstraint utf16 [expr {[string length \U010000] == 2}]
 testConstraint testbytestring   [llength [info commands testbytestring]]
-testConstraint nodep [info exists tcl_precision]

 # Used for constraining memory leak tests
 testConstraint memory [llength [info commands memory]]
@@ -73,9 +72,9 @@ if {$noComp} {
 }


-test string-1.1.$noComp {error conditions} -body {
+test string-1.1.$noComp {error conditions} {
    list [catch {run {string gorp a b}} msg] $msg
-} -match glob -result {1 {unknown or ambiguous subcommand "gorp": must be *cat, compare, equal, first, index, insert, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}}
+} {1 {unknown or ambiguous subcommand "gorp": must be bytelength, cat, compare, equal, first, index, insert, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}}
 test string-1.2.$noComp {error conditions} {
    list [catch {run {string}} msg] $msg
 } {1 {wrong # args: should be "string subcommand ?arg ...?"}}
@@ -526,10 +525,10 @@ test string-6.4.$noComp {string is, too many args} {
 } {1 {wrong # args: should be "string is class ?-strict? ?-failindex var? str"}}
 test string-6.5.$noComp {string is, class check} {
    list [catch {run {string is bogus str}} msg] $msg
-} {1 {bad class "bogus": must be alnum, alpha, ascii, control, boolean, dict, digit, double, entier, false, graph, integer, list, lower, print, punct, space, true, upper, unicode, wideinteger, wordchar, or xdigit}}
+} {1 {bad class "bogus": must be alnum, alpha, ascii, control, boolean, dict, digit, double, entier, false, graph, integer, list, lower, print, punct, space, true, upper, wideinteger, wordchar, or xdigit}}
 test string-6.6.$noComp {string is, ambiguous class} {
    list [catch {run {string is al str}} msg] $msg
-} {1 {ambiguous class "al": must be alnum, alpha, ascii, control, boolean, dict, digit, double, entier, false, graph, integer, list, lower, print, punct, space, true, upper, unicode, wideinteger, wordchar, or xdigit}}
+} {1 {ambiguous class "al": must be alnum, alpha, ascii, control, boolean, dict, digit, double, entier, false, graph, integer, list, lower, print, punct, space, true, upper, wideinteger, wordchar, or xdigit}}
 test string-6.7.$noComp {string is alpha, all ok} {
    run {string is alpha -strict -failindex var abc}
 } 1
@@ -962,28 +961,6 @@ test string-6.130.1.$noComp {string is entier, false on bad octal} {
 test string-6.131.$noComp {string is entier, false on bad hex} {
    list [run {string is entier -fail var 0X12345611234123456123456562345612345612345612345612345612345612345612345612345612345345XYZ}] $var
 } {0 88}
-test string-6.132.$noComp {string is unicode} {
-    run {string is unicode \U10FFFD\uD7FF\uE000\uFDCF\uFDF0}
-} 1
-test string-6.133.$noComp {string is unicode, upper surrogate} {
-    run {string is unicode \uD800}
-} 0
-test string-6.134.$noComp {string is unicode, lower surrogate} {
-    run {string is unicode \uDFFF}
-} 0
-test string-6.135.$noComp {string is unicode, noncharacter} {
-    run {string is unicode \uFFFE}
-} 0
-test string-6.136.$noComp {string is unicode, noncharacter} {
-    run {string is unicode \uFFFF}
-} 0
-test string-6.137.$noComp {string is unicode, noncharacter} {
-    run {string is unicode \uFDD0}
-} 0
-test string-6.138.$noComp {string is unicode, noncharacter} {
-    run {string is unicode \uFDEF}
-} 0
-

 test string-7.1.$noComp {string last, not enough args} {
    list [catch {run {string last a}} msg] $msg
@@ -1036,16 +1013,16 @@ test string-7.16.$noComp {string last, start index} {
    run {string last Üa ÜadÜad end-1}
 } 3

-test string-8.1.$noComp {string bytelength} nodep {
+test string-8.1.$noComp {string bytelength} {
    list [catch {run {string bytelength}} msg] $msg
 } {1 {wrong # args: should be "string bytelength string"}}
-test string-8.2.$noComp {string bytelength} nodep {
+test string-8.2.$noComp {string bytelength} {
    list [catch {run {string bytelength a b}} msg] $msg
 } {1 {wrong # args: should be "string bytelength string"}}
-test string-8.3.$noComp {string bytelength} nodep {
+test string-8.3.$noComp {string bytelength} {
    run {string bytelength "\xC7"}
 } 2
-test string-8.4.$noComp {string bytelength} nodep {
+test string-8.4.$noComp {string bytelength} {
    run {string b ""}
 } 0

@@ -1840,9 +1817,9 @@ test string-19.3.$noComp {string trimleft, unicode default} {
 test string-20.1.$noComp {string trimright errors} {
    list [catch {run {string trimright}} msg] $msg
 } {1 {wrong # args: should be "string trimright string ?chars?"}}
-test string-20.2.$noComp {string trimright errors} -body {
+test string-20.2.$noComp {string trimright errors} {
    list [catch {run {string trimg a}} msg] $msg
-} -match glob -result {1 {unknown or ambiguous subcommand "trimg": must be *cat, compare, equal, first, index, insert, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}}
+} {1 {unknown or ambiguous subcommand "trimg": must be bytelength, cat, compare, equal, first, index, insert, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}}
 test string-20.3.$noComp {string trimright} {
    run {string trimright "    XYZ      "}
 } {    XYZ}
@@ -1962,7 +1939,7 @@ test string-21.25.$noComp {string trimright, unicode} {

 test string-22.1.$noComp {string wordstart} -body {
    list [catch {run {string word a}} msg] $msg
-} -match glob -result {1 {unknown or ambiguous subcommand "word": must be *cat, compare, equal, first, index, insert, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}}
+} -result {1 {unknown or ambiguous subcommand "word": must be bytelength, cat, compare, equal, first, index, insert, is, last, length, map, match, range, repeat, replace, reverse, tolower, totitle, toupper, trim, trimleft, trimright, wordend, or wordstart}}
 test string-22.2.$noComp {string wordstart} -body {
    list [catch {run {string wordstart a}} msg] $msg
 } -result {1 {wrong # args: should be "string wordstart string index"}}
@@ -3,18 +3,6 @@
 package require tcltest 2.5
 namespace import ::tcltest::*
 testConstraint exec          [llength [info commands exec]]
-if {[namespace which testdebug] ne {}} {
-	testConstraint debug         [testdebug]
-	testConstraint purify        [testpurify]
-	testConstraint debugpurify   [
-		expr {
-		![testConstraint memory]
-		&&
-		[testConstraint debug]
-		&&
-		[testConstraint purify]
-	}]
-}
 testConstraint fcopy         [llength [info commands fcopy]]
 testConstraint fileevent     [llength [info commands fileevent]]
 testConstraint thread        [
@@ -249,33 +249,6 @@ test upvar-6.3 {retargeting an upvar} {
    p1
 } {abcde 44}

-
-
-test upvar-6.4 {
-	retargeting a variable created by upvar to itself is allowed
-} -body {
-	catch {
-		unset x
-	}
-	catch {
-		unset y
-	}
-	set res {}
-    set x abcde
-	set res [catch {
-		upvar 0 x x
-	} cres copts]
-	lappend res [dict get $copts -errorcode]
-	upvar 0 x y
-	lappend res $y
-	upvar 0 y y
-	lappend res $y
-	return $res
-} -cleanup {
-	upvar 0 {} y
-} -result {1 {TCL UPVAR SELF} abcde abcde}
-
-
 test upvar-7.1 {upvar to same level} {
    set x 44
    set y 55
@@ -37,7 +37,6 @@ proc createChildProcess {ddeServerName args} {
    file delete -force $::scriptName

    set f [open $::scriptName w+]
-    fconfigure $f -encoding utf-8
    puts $f [list set ddeServerName $ddeServerName]
    puts $f [list load $::ddelib Dde]
    puts $f {
@@ -97,7 +96,7 @@ proc createChildProcess {ddeServerName args} {

    # run the child server script.
    set f [open |[list [interpreter] $::scriptName] r]
-    fconfigure $f -buffering line -encoding utf-8
+    fconfigure $f -buffering line
    gets $f line
    return $f
 }
--- a/Show More
+++ b/Show More