* generic/tcl.decls: Change the public api prefix from

	* generic/tcl.h:           TclNR_foo to Tcl_NRfoo
	* generic/tclBasic.c:
	* generic/tclDecls.h:
	* generic/tclDictObj.c:
	* generic/tclExecute.c:
	* generic/tclInterp.c:
	* generic/tclNRE.h:
	* generic/tclNamesp.c:
	* generic/tclOO.c:
	* generic/tclOOBasic.c:
	* generic/tclOOCall.c:
	* generic/tclOOMethod.c:
	* generic/tclProc.c:
	* generic/tclStubInit.c:

16 files changed, 156 insertions, 138 deletions

diff --git a/ChangeLog b/ChangeLog
index 6214b1f..c16154e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2008-07-18  Miguel Sofer  <msofer@users.sf.net>
+
+	* generic/tcl.decls:       Change the public api prefix from 
+	* generic/tcl.h:           TclNR_foo to Tcl_NRfoo
+	* generic/tclBasic.c:
+	* generic/tclDecls.h:
+	* generic/tclDictObj.c:
+	* generic/tclExecute.c:
+	* generic/tclInterp.c:
+	* generic/tclNRE.h:
+	* generic/tclNamesp.c:
+	* generic/tclOO.c:
+	* generic/tclOOBasic.c:
+	* generic/tclOOCall.c:
+	* generic/tclOOMethod.c:
+	* generic/tclProc.c:
+	* generic/tclStubInit.c:
+	
 2008-07-18  Donal K. Fellows  <dkf@users.sf.net>
 
 	* generic/tclOOBasic.c (TclOO_Object_Eval, FinalizeEval): NRE-enable
diff --git a/generic/tcl.decls b/generic/tcl.decls
index 460d6dc..5ca73c7 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: tcl.decls,v 1.134 2008/07/13 09:03:32 msofer Exp $
+# RCS: @(#) $Id: tcl.decls,v 1.135 2008/07/18 13:46:39 msofer Exp $
 
 library tcl
 
@@ -2110,24 +2110,24 @@ declare 581 generic {
 
 # NRE public interface
 declare 582 generic {
-    Tcl_Command TclNR_CreateCommand(Tcl_Interp *interp, 
+    Tcl_Command Tcl_NRCreateCommand(Tcl_Interp *interp, 
 		    CONST char *cmdName, Tcl_ObjCmdProc *proc, 
 	            Tcl_ObjCmdProc *nreProc, ClientData clientData, 
 		    Tcl_CmdDeleteProc *deleteProc)
 }
 declare 583 generic {
-    int TclNR_EvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int flags)
+    int Tcl_NREvalObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int flags)
 }
 declare 584 generic {
-    int TclNR_EvalObjv(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[],
+    int Tcl_NREvalObjv(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[],
 	    int flags)
 }
 declare 585 generic {
-    int TclNR_ObjProc(Tcl_Interp *interp, Tcl_ObjCmdProc *objProc,
+    int Tcl_NRObjProc(Tcl_Interp *interp, Tcl_ObjCmdProc *objProc,
                       ClientData clientData)
 }
 declare 586 generic {
-    void TclNR_AddCallback(Tcl_Interp *interp, TclNR_PostProc *postProcPtr, 
+    void Tcl_NRAddCallback(Tcl_Interp *interp, Tcl_NRPostProc *postProcPtr, 
                       ClientData data0, ClientData data1,
                       ClientData data2, ClientData data3)
 }
@@ -2135,7 +2135,7 @@ declare 586 generic {
 # For use by NR extenders, to have a simple way to also provide a (required!)
 # classic objProc 
 declare 587 generic {
-    int TclNR_CallObjProc(Tcl_Interp *interp, Tcl_ObjCmdProc *objProc,
+    int Tcl_NRCallObjProc(Tcl_Interp *interp, Tcl_ObjCmdProc *objProc,
 			  ClientData clientData, int objc,
 	                     Tcl_Obj *const objv[])
 }
diff --git a/generic/tcl.h b/generic/tcl.h
index 50bd3c1..ef6d360 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tcl.h,v 1.260 2008/07/13 09:03:32 msofer Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.261 2008/07/18 13:46:43 msofer Exp $
  */
 
 #ifndef _TCL
@@ -2255,7 +2255,7 @@ EXTERN void		Tcl_GetMemoryInfo _ANSI_ARGS_((Tcl_DString *dsPtr));
  * Single public declaration for NRE
  */
 
-typedef int (TclNR_PostProc) (ClientData data[], Tcl_Interp *interp,
+typedef int (Tcl_NRPostProc) (ClientData data[], Tcl_Interp *interp,
 	                      int result);
 
 /*
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index e0e2220..b52ff39 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -16,7 +16,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclBasic.c,v 1.314 2008/07/18 13:08:47 dkf Exp $
+ * RCS: @(#) $Id: tclBasic.c,v 1.315 2008/07/18 13:46:43 msofer Exp $
  */
 
 #include "tclInt.h"
@@ -122,12 +122,12 @@ static int		TEOV_RunEnterTraces(Tcl_Interp *interp,
 			    Tcl_Obj *const objv[], Namespace *lookupNsPtr);
 static int		NRPostProcess(Tcl_Interp *interp, int result,
 			    int objc, Tcl_Obj *const objv[]);
-static TclNR_PostProc	TEOV_RestoreVarFrame;
-static TclNR_PostProc	TEOV_RunLeaveTraces;
-static TclNR_PostProc	TEOV_Exception;
-static TclNR_PostProc	TEOV_Error;
-static TclNR_PostProc	TEOEx_ListCallback;
-static TclNR_PostProc	TEOEx_ByteCodeCallback;
+static Tcl_NRPostProc	TEOV_RestoreVarFrame;
+static Tcl_NRPostProc	TEOV_RunLeaveTraces;
+static Tcl_NRPostProc	TEOV_Exception;
+static Tcl_NRPostProc	TEOV_Error;
+static Tcl_NRPostProc	TEOEx_ListCallback;
+static Tcl_NRPostProc	TEOEx_ByteCodeCallback;
 
 /*
  * The following structure define the commands in the Tcl core.
@@ -763,7 +763,7 @@ Tcl_CreateInterp(void)
      * Create an unsupported command for tailcalls
      */
 
-    TclNR_CreateCommand(interp, "::tcl::unsupported::tailcall",
+    Tcl_NRCreateCommand(interp, "::tcl::unsupported::tailcall",
 	    /*objProc*/ NULL, TclTailcallObjCmd, NULL, NULL);
 
 #ifdef USE_DTRACE
@@ -4183,7 +4183,7 @@ Tcl_EvalObjv(
 	/*
 	 * This is a rewrite like ns-import does, without a new cmdPtr or new
 	 * reentrant call. FIXME: add the possibility of a new callback
-	 * (TclNR_ObjProc has that), and maybe also edition of objc/objv?
+	 * (Tcl_NRObjProc has that), and maybe also edition of objc/objv?
 	 */
 
 	objProc = recordPtr->data.objProc.objProc;
@@ -4304,7 +4304,7 @@ TEOV_PushExceptionHandlers(
 	 * Error messages
 	 */
 
-	TclNR_AddCallback(interp, TEOV_Error, INT2PTR(objc),
+	Tcl_NRAddCallback(interp, TEOV_Error, INT2PTR(objc),
 		(ClientData) objv, NULL,NULL);
     }
 
@@ -4313,7 +4313,7 @@ TEOV_PushExceptionHandlers(
 	 * No CONTINUE or BREAK at level 0, manage RETURN
 	 */
 
-	TclNR_AddCallback(interp, TEOV_Exception, NULL, NULL, NULL, NULL);
+	Tcl_NRAddCallback(interp, TEOV_Exception, NULL, NULL, NULL, NULL);
     }
 }
 
@@ -4328,7 +4328,7 @@ TEOV_SwitchVarFrame(
      * restore things at the end.
      */
 
-    TclNR_AddCallback(interp, TEOV_RestoreVarFrame, iPtr->varFramePtr, NULL,
+    Tcl_NRAddCallback(interp, TEOV_RestoreVarFrame, iPtr->varFramePtr, NULL,
 	    NULL, NULL);
     iPtr->varFramePtr = iPtr->rootFramePtr;
 }
@@ -4545,7 +4545,7 @@ TEOV_RunEnterTraces(
 	 * Command was found: push a record to schedule the leave traces.
 	 */
 
-	TclNR_AddCallback(interp, TEOV_RunLeaveTraces, INT2PTR(traceCode),
+	Tcl_NRAddCallback(interp, TEOV_RunLeaveTraces, INT2PTR(traceCode),
 		commandPtr, cmdPtr, NULL);
 	cmdPtr->refCount++;
     } else {
@@ -5388,9 +5388,9 @@ TclNREvalObjEx(
 
 	    iPtr->cmdFramePtr = eoFramePtr;
 
-	    TclNR_AddCallback(interp, TEOEx_ListCallback, objPtr, eoFramePtr,
+	    Tcl_NRAddCallback(interp, TEOEx_ListCallback, objPtr, eoFramePtr,
 		    copyPtr, NULL);
-	    return TclNR_EvalObj(interp, objPtr, flags);
+	    return Tcl_NREvalObj(interp, objPtr, flags);
 	}
     }
 
@@ -5411,7 +5411,7 @@ TclNREvalObjEx(
 	    savedVarFramePtr = iPtr->varFramePtr;
 	    iPtr->varFramePtr = iPtr->rootFramePtr;
 	}
-	TclNR_AddCallback(interp, TEOEx_ByteCodeCallback, savedVarFramePtr,
+	Tcl_NRAddCallback(interp, TEOEx_ByteCodeCallback, savedVarFramePtr,
 		    objPtr, INT2PTR(allowExceptions), NULL);
 
 	newCodePtr = TclCompileObj(interp, objPtr, invoker, word);
@@ -7349,7 +7349,7 @@ TclDTraceInfo(
 /*
  *----------------------------------------------------------------------
  *
- * TclNR_CallObjProc --
+ * Tcl_NRCallObjProc --
  *
  *	This function calls an objProc directly while managing things properly
  *	if it happens to be an NR objProc. It is meant to be used by extenders
@@ -7367,7 +7367,7 @@ TclDTraceInfo(
  */
 
 int
-TclNR_CallObjProc(
+Tcl_NRCallObjProc(
     Tcl_Interp *interp,
     Tcl_ObjCmdProc *objProc,
     ClientData clientData,
@@ -7441,7 +7441,7 @@ NRPostProcess(
 /*
  *----------------------------------------------------------------------
  *
- * TclNR_CreateCommand --
+ * Tcl_NRCreateCommand --
  *
  *	Define a new NRE-enabled object-based command in a command table.
  *
@@ -7467,7 +7467,7 @@ NRPostProcess(
  */
 
 Tcl_Command
-TclNR_CreateCommand(
+Tcl_NRCreateCommand(
     Tcl_Interp *interp,		/* Token for command interpreter (returned by
 				 * previous call to Tcl_CreateInterp). */
     const char *cmdName,	/* Name of command. If it contains namespace
@@ -7520,7 +7520,7 @@ TclNREvalCmd(
  ****************************************************************************/
 
 int
-TclNR_EvalObjv(
+Tcl_NREvalObjv(
     Tcl_Interp *interp,		/* Interpreter in which to evaluate the
 				 * command. Also used for error reporting. */
     int objc,			/* Number of words in command. */
@@ -7537,7 +7537,7 @@ TclNR_EvalObjv(
 }
 
 int
-TclNR_EvalObj(
+Tcl_NREvalObj(
     Tcl_Interp *interp,
     Tcl_Obj *objPtr,
     int flags)
@@ -7570,7 +7570,7 @@ TclNR_EvalObj(
 }
 
 int
-TclNR_ObjProc(
+Tcl_NRObjProc(
     Tcl_Interp *interp,
     Tcl_ObjCmdProc *objProc,
     ClientData clientData)
@@ -7629,15 +7629,15 @@ TclTailcallObjCmd(
     }
 
     listPtr = Tcl_NewListObj(objc-1, objv+1);
-    TclNR_EvalObj(interp, listPtr, 0);
+    Tcl_NREvalObj(interp, listPtr, 0);
     recordPtr->type = TCL_NR_TAILCALL_TYPE;
     return TCL_OK;
 }
 
 void
-TclNR_AddCallback(
+Tcl_NRAddCallback(
     Tcl_Interp *interp,
-    TclNR_PostProc *postProcPtr,
+    Tcl_NRPostProc *postProcPtr,
     ClientData data0,
     ClientData data1,
     ClientData data2,
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 5198401..31e3751 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclDecls.h,v 1.135 2008/07/13 09:03:33 msofer Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.136 2008/07/18 13:46:43 msofer Exp $
  */
 
 #ifndef _TCLDECLS
@@ -3513,46 +3513,46 @@ EXTERN int		Tcl_CancelEval (Tcl_Interp * interp,
 /* 581 */
 EXTERN int		Tcl_Canceled (Tcl_Interp * interp, int flags);
 #endif
-#ifndef TclNR_CreateCommand_TCL_DECLARED
-#define TclNR_CreateCommand_TCL_DECLARED
+#ifndef Tcl_NRCreateCommand_TCL_DECLARED
+#define Tcl_NRCreateCommand_TCL_DECLARED
 /* 582 */
-EXTERN Tcl_Command	TclNR_CreateCommand (Tcl_Interp * interp, 
+EXTERN Tcl_Command	Tcl_NRCreateCommand (Tcl_Interp * interp, 
 				CONST char * cmdName, Tcl_ObjCmdProc * proc, 
 				Tcl_ObjCmdProc * nreProc, 
 				ClientData clientData, 
 				Tcl_CmdDeleteProc * deleteProc);
 #endif
-#ifndef TclNR_EvalObj_TCL_DECLARED
-#define TclNR_EvalObj_TCL_DECLARED
+#ifndef Tcl_NREvalObj_TCL_DECLARED
+#define Tcl_NREvalObj_TCL_DECLARED
 /* 583 */
-EXTERN int		TclNR_EvalObj (Tcl_Interp * interp, Tcl_Obj * objPtr, 
+EXTERN int		Tcl_NREvalObj (Tcl_Interp * interp, Tcl_Obj * objPtr, 
 				int flags);
 #endif
-#ifndef TclNR_EvalObjv_TCL_DECLARED
-#define TclNR_EvalObjv_TCL_DECLARED
+#ifndef Tcl_NREvalObjv_TCL_DECLARED
+#define Tcl_NREvalObjv_TCL_DECLARED
 /* 584 */
-EXTERN int		TclNR_EvalObjv (Tcl_Interp * interp, int objc, 
+EXTERN int		Tcl_NREvalObjv (Tcl_Interp * interp, int objc, 
 				Tcl_Obj *CONST objv[], int flags);
 #endif
-#ifndef TclNR_ObjProc_TCL_DECLARED
-#define TclNR_ObjProc_TCL_DECLARED
+#ifndef Tcl_NRObjProc_TCL_DECLARED
+#define Tcl_NRObjProc_TCL_DECLARED
 /* 585 */
-EXTERN int		TclNR_ObjProc (Tcl_Interp * interp, 
+EXTERN int		Tcl_NRObjProc (Tcl_Interp * interp, 
 				Tcl_ObjCmdProc * objProc, 
 				ClientData clientData);
 #endif
-#ifndef TclNR_AddCallback_TCL_DECLARED
-#define TclNR_AddCallback_TCL_DECLARED
+#ifndef Tcl_NRAddCallback_TCL_DECLARED
+#define Tcl_NRAddCallback_TCL_DECLARED
 /* 586 */
-EXTERN void		TclNR_AddCallback (Tcl_Interp * interp, 
-				TclNR_PostProc * postProcPtr, 
+EXTERN void		Tcl_NRAddCallback (Tcl_Interp * interp, 
+				Tcl_NRPostProc * postProcPtr, 
 				ClientData data0, ClientData data1, 
 				ClientData data2, ClientData data3);
 #endif
-#ifndef TclNR_CallObjProc_TCL_DECLARED
-#define TclNR_CallObjProc_TCL_DECLARED
+#ifndef Tcl_NRCallObjProc_TCL_DECLARED
+#define Tcl_NRCallObjProc_TCL_DECLARED
 /* 587 */
-EXTERN int		TclNR_CallObjProc (Tcl_Interp * interp, 
+EXTERN int		Tcl_NRCallObjProc (Tcl_Interp * interp, 
 				Tcl_ObjCmdProc * objProc, 
 				ClientData clientData, int objc, 
 				Tcl_Obj *const objv[]);
@@ -4198,12 +4198,12 @@ typedef struct TclStubs {
     void (*tcl_AppendPrintfToObj) (Tcl_Obj * objPtr, CONST char * format, ...); /* 579 */
     int (*tcl_CancelEval) (Tcl_Interp * interp, Tcl_Obj * resultObjPtr, ClientData clientData, int flags); /* 580 */
     int (*tcl_Canceled) (Tcl_Interp * interp, int flags); /* 581 */
-    Tcl_Command (*tclNR_CreateCommand) (Tcl_Interp * interp, CONST char * cmdName, Tcl_ObjCmdProc * proc, Tcl_ObjCmdProc * nreProc, ClientData clientData, Tcl_CmdDeleteProc * deleteProc); /* 582 */
-    int (*tclNR_EvalObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags); /* 583 */
-    int (*tclNR_EvalObjv) (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags); /* 584 */
-    int (*tclNR_ObjProc) (Tcl_Interp * interp, Tcl_ObjCmdProc * objProc, ClientData clientData); /* 585 */
-    void (*tclNR_AddCallback) (Tcl_Interp * interp, TclNR_PostProc * postProcPtr, ClientData data0, ClientData data1, ClientData data2, ClientData data3); /* 586 */
-    int (*tclNR_CallObjProc) (Tcl_Interp * interp, Tcl_ObjCmdProc * objProc, ClientData clientData, int objc, Tcl_Obj *const objv[]); /* 587 */
+    Tcl_Command (*tcl_NRCreateCommand) (Tcl_Interp * interp, CONST char * cmdName, Tcl_ObjCmdProc * proc, Tcl_ObjCmdProc * nreProc, ClientData clientData, Tcl_CmdDeleteProc * deleteProc); /* 582 */
+    int (*tcl_NREvalObj) (Tcl_Interp * interp, Tcl_Obj * objPtr, int flags); /* 583 */
+    int (*tcl_NREvalObjv) (Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[], int flags); /* 584 */
+    int (*tcl_NRObjProc) (Tcl_Interp * interp, Tcl_ObjCmdProc * objProc, ClientData clientData); /* 585 */
+    void (*tcl_NRAddCallback) (Tcl_Interp * interp, Tcl_NRPostProc * postProcPtr, ClientData data0, ClientData data1, ClientData data2, ClientData data3); /* 586 */
+    int (*tcl_NRCallObjProc) (Tcl_Interp * interp, Tcl_ObjCmdProc * objProc, ClientData clientData, int objc, Tcl_Obj *const objv[]); /* 587 */
 } TclStubs;
 
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
@@ -6604,29 +6604,29 @@ extern CONST TclStubs *tclStubsPtr;
 #define Tcl_Canceled \
 	(tclStubsPtr->tcl_Canceled) /* 581 */
 #endif
-#ifndef TclNR_CreateCommand
-#define TclNR_CreateCommand \
-	(tclStubsPtr->tclNR_CreateCommand) /* 582 */
+#ifndef Tcl_NRCreateCommand
+#define Tcl_NRCreateCommand \
+	(tclStubsPtr->tcl_NRCreateCommand) /* 582 */
 #endif
-#ifndef TclNR_EvalObj
-#define TclNR_EvalObj \
-	(tclStubsPtr->tclNR_EvalObj) /* 583 */
+#ifndef Tcl_NREvalObj
+#define Tcl_NREvalObj \
+	(tclStubsPtr->tcl_NREvalObj) /* 583 */
 #endif
-#ifndef TclNR_EvalObjv
-#define TclNR_EvalObjv \
-	(tclStubsPtr->tclNR_EvalObjv) /* 584 */
+#ifndef Tcl_NREvalObjv
+#define Tcl_NREvalObjv \
+	(tclStubsPtr->tcl_NREvalObjv) /* 584 */
 #endif
-#ifndef TclNR_ObjProc
-#define TclNR_ObjProc \
-	(tclStubsPtr->tclNR_ObjProc) /* 585 */
+#ifndef Tcl_NRObjProc
+#define Tcl_NRObjProc \
+	(tclStubsPtr->tcl_NRObjProc) /* 585 */
 #endif
-#ifndef TclNR_AddCallback
-#define TclNR_AddCallback \
-	(tclStubsPtr->tclNR_AddCallback) /* 586 */
+#ifndef Tcl_NRAddCallback
+#define Tcl_NRAddCallback \
+	(tclStubsPtr->tcl_NRAddCallback) /* 586 */
 #endif
-#ifndef TclNR_CallObjProc
-#define TclNR_CallObjProc \
-	(tclStubsPtr->tclNR_CallObjProc) /* 587 */
+#ifndef Tcl_NRCallObjProc
+#define Tcl_NRCallObjProc \
+	(tclStubsPtr->tcl_NRCallObjProc) /* 587 */
 #endif
 
 #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
diff --git a/generic/tclDictObj.c b/generic/tclDictObj.c
index 9cf2739..5b47c22 100644
--- a/generic/tclDictObj.c
+++ b/generic/tclDictObj.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclDictObj.c,v 1.62 2008/07/18 04:23:55 msofer Exp $
+ * RCS: @(#) $Id: tclDictObj.c,v 1.63 2008/07/18 13:46:43 msofer Exp $
  */
 
 #include "tclInt.h"
@@ -2932,7 +2932,7 @@ DictUpdateCmd(
     objPtr = Tcl_NewListObj(objc-3, objv+2);
     Tcl_IncrRefCount(objPtr);
     Tcl_IncrRefCount(objv[1]);
-    TclNR_AddCallback(interp, FinalizeDictUpdate, objv[1], objPtr, NULL,NULL);
+    Tcl_NRAddCallback(interp, FinalizeDictUpdate, objv[1], objPtr, NULL,NULL);
 
     return TclNREvalObjEx(interp, objv[objc-1], 0, iPtr->cmdFramePtr, objc-1);
 }
@@ -3111,7 +3111,7 @@ DictWithCmd(
 	Tcl_IncrRefCount(pathPtr);
     }
     Tcl_IncrRefCount(objv[1]);
-    TclNR_AddCallback(interp, FinalizeDictWith, objv[1], keysPtr, pathPtr,
+    Tcl_NRAddCallback(interp, FinalizeDictWith, objv[1], keysPtr, pathPtr,
 	    NULL);
 
     return TclNREvalObjEx(interp, objv[objc-1], 0, iPtr->cmdFramePtr, objc-1);
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index fc1ca9c..dd09802 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclExecute.c,v 1.380 2008/07/14 02:03:53 msofer Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.381 2008/07/18 13:46:43 msofer Exp $
  */
 
 #include "tclInt.h"
@@ -25,7 +25,7 @@
 #include <math.h>
 #include <float.h>
 
-static TclNR_PostProc TailcallFromTebc;
+static Tcl_NRPostProc TailcallFromTebc;
 
 
 /*
@@ -7796,7 +7796,7 @@ TclExecuteByteCode(
 
 	rootPtr = TOP_RECORD(iPtr);
 	PUSH_RECORD(iPtr, recordPtr);
-	TclNR_AddCallback(interp, TailcallFromTebc, tailObjPtr, lookupNsPtr, NULL, NULL);
+	Tcl_NRAddCallback(interp, TailcallFromTebc, tailObjPtr, lookupNsPtr, NULL, NULL);
 
 	/* Now swap them! */
 	recordPtr->nextPtr = rootPtr->nextPtr;
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
index f2975d0..358d85c 100644
--- a/generic/tclInterp.c
+++ b/generic/tclInterp.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclInterp.c,v 1.88 2008/07/13 23:15:23 nijtmans Exp $
+ * RCS: @(#) $Id: tclInterp.c,v 1.89 2008/07/18 13:46:45 msofer Exp $
  */
 
 #include "tclInt.h"
@@ -1486,7 +1486,7 @@ AliasCreate(
     Tcl_Preserve(masterInterp);
 
     if (slaveInterp == masterInterp) {
-	aliasPtr->slaveCmd = TclNR_CreateCommand(slaveInterp,
+	aliasPtr->slaveCmd = Tcl_NRCreateCommand(slaveInterp,
 		TclGetString(namePtr), AliasObjCmd, AliasNRCmd, aliasPtr, 
 		AliasObjCmdDeleteProc);
     } else {
@@ -1805,7 +1805,7 @@ AliasNRCmd(
      */
 
     if (isRootEnsemble) {
-	TclNR_AddCallback(interp, TclClearRootEnsemble, NULL, NULL, NULL, NULL);
+	Tcl_NRAddCallback(interp, TclClearRootEnsemble, NULL, NULL, NULL, NULL);
     }
     return TclNREvalCmd(interp, listPtr, flags);
 }
diff --git a/generic/tclNRE.h b/generic/tclNRE.h
index 729cf51..0d13d3a 100644
--- a/generic/tclNRE.h
+++ b/generic/tclNRE.h
@@ -11,7 +11,7 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * // FIXME: RCS numbering?
- * RCS: @(#) $Id: tclNRE.h,v 1.2 2008/07/14 08:22:14 dkf Exp $
+ * RCS: @(#) $Id: tclNRE.h,v 1.3 2008/07/18 13:46:46 msofer Exp $
  */
 
 
@@ -89,7 +89,7 @@ struct ByteCode;
 
 /* Fill up a SmallAlloc: 4 free ptrs for the user */
 typedef struct TEOV_callback {
-    TclNR_PostProc *procPtr;
+    Tcl_NRPostProc *procPtr;
     ClientData data[4];
     struct TEOV_callback *nextPtr;
 } TEOV_callback;
@@ -223,8 +223,8 @@ typedef struct TEOV_record {
 
 #if 0
 /* built as static inline in tclProc.c. Do TclOO/Itcl need this? */
-MODULE_SCOPE int TclNR_BC  (Tcl_Interp * interp, ByteCode *codePtr,
-                           TclNR_PostProc *postProcPtr, ClientData clientData);
+MODULE_SCOPE int Tcl_NRBC  (Tcl_Interp * interp, ByteCode *codePtr,
+                           Tcl_NRPostProc *postProcPtr, ClientData clientData);
 #endif
 
 /* The following starts purges the stack popping TclStackAllocs down to where
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 3faae95..f541a1e 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -23,7 +23,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclNamesp.c,v 1.166 2008/07/15 10:15:52 dkf Exp $
+ * RCS: @(#) $Id: tclNamesp.c,v 1.167 2008/07/18 13:46:46 msofer Exp $
  */
 
 #include "tclInt.h"
@@ -231,7 +231,7 @@ static void		DupEnsembleCmdRep(Tcl_Obj *objPtr, Tcl_Obj *copyPtr);
 static void		StringOfEnsembleCmdRep(Tcl_Obj *objPtr);
 static void		UnlinkNsPath(Namespace *nsPtr);
 
-static TclNR_PostProc NsEval_Callback;
+static Tcl_NRPostProc NsEval_Callback;
 
 /*
  * This structure defines a Tcl object type that contains a namespace
@@ -1647,7 +1647,7 @@ DoImport(
 	}
 
 	dataPtr = (ImportedCmdData *) ckalloc(sizeof(ImportedCmdData));
-	importedCmd = TclNR_CreateCommand(interp, Tcl_DStringValue(&ds),
+	importedCmd = Tcl_NRCreateCommand(interp, Tcl_DStringValue(&ds),
 		InvokeImportedCmd, InvokeImportedNRCmd, dataPtr,
 		DeleteImportedCmd);
 	dataPtr->realCmdPtr = cmdPtr;
@@ -2799,7 +2799,7 @@ Tcl_NamespaceObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    return TclNR_CallObjProc(interp, TclNRNamespaceObjCmd, clientData, objc,
+    return Tcl_NRCallObjProc(interp, TclNRNamespaceObjCmd, clientData, objc,
 	    objv);
 }
 
@@ -3332,7 +3332,7 @@ NamespaceEvalCmd(
      * TIP #280: Make invoking context available to eval'd script.
      */
     
-    TclNR_AddCallback(interp, NsEval_Callback, namespacePtr, "eval",
+    Tcl_NRAddCallback(interp, NsEval_Callback, namespacePtr, "eval",
 	    NULL, NULL);
     return TclNREvalObjEx(interp, objPtr, 0, iPtr->cmdFramePtr, 3);
 }
@@ -3778,7 +3778,7 @@ NamespaceInscopeCmd(
 	Tcl_DecrRefCount(listPtr);    /* We're done with the list object. */
     }
 
-    TclNR_AddCallback(interp, NsEval_Callback, namespacePtr, "inscope",
+    Tcl_NRAddCallback(interp, NsEval_Callback, namespacePtr, "inscope",
 	    NULL, NULL);
     return TclNREvalObjEx(interp, cmdObjPtr, 0, NULL, 0);
 }
@@ -5325,7 +5325,7 @@ Tcl_CreateEnsemble(
     ensemblePtr->subcommandDict = NULL;
     ensemblePtr->flags = flags;
     ensemblePtr->unknownHandler = NULL;
-    ensemblePtr->token = TclNR_CreateCommand(interp, name,
+    ensemblePtr->token = Tcl_NRCreateCommand(interp, name,
 	    NsEnsembleImplementationCmd, NsEnsembleImplementationCmdNR,
 	    ensemblePtr, DeleteEnsembleConfig);
     ensemblePtr->next = (EnsembleConfig *) nsPtr->ensembles;
@@ -6046,7 +6046,7 @@ NsEnsembleImplementationCmd(
     int objc,
     Tcl_Obj *const objv[])
 {
-    return TclNR_CallObjProc(interp, NsEnsembleImplementationCmdNR,
+    return Tcl_NRCallObjProc(interp, NsEnsembleImplementationCmdNR,
 	    clientData, objc, objv);
 }
 
@@ -6263,7 +6263,7 @@ NsEnsembleImplementationCmdNR(
 	    iPtr->ensembleRewrite.sourceObjs = objv;
 	    iPtr->ensembleRewrite.numRemovedObjs = 2;
 	    iPtr->ensembleRewrite.numInsertedObjs = prefixObjc;
-	    TclNR_AddCallback(interp, TclClearRootEnsemble, NULL, NULL, NULL,
+	    Tcl_NRAddCallback(interp, TclClearRootEnsemble, NULL, NULL, NULL,
 		    NULL);
 	} else {
 	    register int ni = iPtr->ensembleRewrite.numInsertedObjs;
diff --git a/generic/tclOO.c b/generic/tclOO.c
index 176e90a..dbf85ea 100644
--- a/generic/tclOO.c
+++ b/generic/tclOO.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclOO.c,v 1.10 2008/07/16 22:09:00 dkf Exp $
+ * RCS: @(#) $Id: tclOO.c,v 1.11 2008/07/18 13:46:46 msofer Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -570,7 +570,7 @@ ObjectRenamedTrace(
 	    contextPtr->callPtr->flags |= DESTRUCTOR;
 	    contextPtr->skip = 0;
 	    state = Tcl_SaveInterpState(interp, TCL_OK);
-	    result = TclNR_CallObjProc(interp, TclOOInvokeContext, contextPtr,
+	    result = Tcl_NRCallObjProc(interp, TclOOInvokeContext, contextPtr,
 		    0, NULL);
 	    if (result != TCL_OK) {
 		Tcl_BackgroundError(interp);
@@ -1256,7 +1256,7 @@ Tcl_NewObjectInstance(
 	    state = Tcl_SaveInterpState(interp, TCL_OK);
 	    contextPtr->callPtr->flags |= CONSTRUCTOR;
 	    contextPtr->skip = skip;
-	    result = TclNR_CallObjProc(interp, TclOOInvokeContext, contextPtr,
+	    result = Tcl_NRCallObjProc(interp, TclOOInvokeContext, contextPtr,
 		    objc, objv);
 	    TclOODeleteContext(contextPtr);
 	    DelRef(oPtr);
@@ -1793,7 +1793,7 @@ PublicObjectCmd(
     int objc,
     Tcl_Obj *const *objv)
 {
-    return TclNR_CallObjProc(interp, PublicNRObjectCmd, clientData,objc,objv);
+    return Tcl_NRCallObjProc(interp, PublicNRObjectCmd, clientData,objc,objv);
 }
 
 static int
@@ -1814,7 +1814,7 @@ PrivateObjectCmd(
     int objc,
     Tcl_Obj *const *objv)
 {
-    return TclNR_CallObjProc(interp, PrivateNRObjectCmd,clientData,objc,objv);
+    return Tcl_NRCallObjProc(interp, PrivateNRObjectCmd,clientData,objc,objv);
 }
 
 static int
@@ -1947,7 +1947,7 @@ TclOOObjectCmdCore(
      */
 
     AddRef(oPtr);
-    TclNR_AddCallback(interp, FinalizeObjectCall, contextPtr,oPtr, NULL,NULL);
+    Tcl_NRAddCallback(interp, FinalizeObjectCall, contextPtr,oPtr, NULL,NULL);
     return TclOOInvokeContext(contextPtr, interp, objc, objv);
 }
 
@@ -2032,7 +2032,7 @@ Tcl_ObjectContextInvokeNext(
      * Invoke the (advanced) method call context in the caller context.
      */
 
-    result = TclNR_CallObjProc(interp, TclOOInvokeContext, contextPtr, objc,
+    result = Tcl_NRCallObjProc(interp, TclOOInvokeContext, contextPtr, objc,
 	    objv);
 
     /*
@@ -2086,7 +2086,7 @@ TclNRObjectContextInvokeNext(
      * all) come through the same code.
      */
 
-    TclNR_AddCallback(interp, FinalizeNext, contextPtr,
+    Tcl_NRAddCallback(interp, FinalizeNext, contextPtr,
 	    INT2PTR(contextPtr->index), INT2PTR(contextPtr->skip), NULL);
     contextPtr->index++;
     contextPtr->skip = skip;
diff --git a/generic/tclOOBasic.c b/generic/tclOOBasic.c
index 350dba6..2951cc8 100644
--- a/generic/tclOOBasic.c
+++ b/generic/tclOOBasic.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclOOBasic.c,v 1.4 2008/07/18 13:10:55 dkf Exp $
+ * RCS: @(#) $Id: tclOOBasic.c,v 1.5 2008/07/18 13:46:46 msofer Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -313,7 +313,7 @@ TclOO_Object_Eval(
      * the script completes.
      */
 
-    TclNR_AddCallback(interp, FinalizeEval, object, NULL, NULL, NULL);
+    Tcl_NRAddCallback(interp, FinalizeEval, object, NULL, NULL, NULL);
     return TclNREvalObjEx(interp, scriptPtr, flags, invoker, skip);
 }
 
@@ -626,7 +626,7 @@ TclOONextObjCmd(
      * that this is like [uplevel 1] and not [eval].
      */
 
-    TclNR_AddCallback(interp, RestoreFrame, framePtr, NULL, NULL, NULL);
+    Tcl_NRAddCallback(interp, RestoreFrame, framePtr, NULL, NULL, NULL);
     iPtr->varFramePtr = framePtr->callerVarPtr;
     return TclNRObjectContextInvokeNext(interp, context, objc, objv, 1);
 }
diff --git a/generic/tclOOCall.c b/generic/tclOOCall.c
index 162e7e2..8686ee4 100644
--- a/generic/tclOOCall.c
+++ b/generic/tclOOCall.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclOOCall.c,v 1.8 2008/07/16 22:09:02 dkf Exp $
+ * RCS: @(#) $Id: tclOOCall.c,v 1.9 2008/07/18 13:46:46 msofer Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -277,7 +277,7 @@ TclOOInvokeContext(
 	 * this call is finished.
 	 */
 
-	TclNR_AddCallback(interp, FinalizeMethodRefs, contextPtr, NULL, NULL,
+	Tcl_NRAddCallback(interp, FinalizeMethodRefs, contextPtr, NULL, NULL,
 		NULL);
     }
 
@@ -286,9 +286,9 @@ TclOOInvokeContext(
      */
 
     if (contextPtr->oPtr->flags & FILTER_HANDLING) {
-	TclNR_AddCallback(interp, SetFilterFlags, contextPtr, NULL,NULL,NULL);
+	Tcl_NRAddCallback(interp, SetFilterFlags, contextPtr, NULL,NULL,NULL);
     } else {
-	TclNR_AddCallback(interp, ResetFilterFlags,contextPtr,NULL,NULL,NULL);
+	Tcl_NRAddCallback(interp, ResetFilterFlags,contextPtr,NULL,NULL,NULL);
     }
     if (isFilter || contextPtr->callPtr->flags & FILTER_HANDLING) {
 	contextPtr->oPtr->flags |= FILTER_HANDLING;
diff --git a/generic/tclOOMethod.c b/generic/tclOOMethod.c
index 62585b7..7ef07e2 100644
--- a/generic/tclOOMethod.c
+++ b/generic/tclOOMethod.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclOOMethod.c,v 1.6 2008/07/16 22:09:02 dkf Exp $
+ * RCS: @(#) $Id: tclOOMethod.c,v 1.7 2008/07/18 13:46:46 msofer Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -682,7 +682,7 @@ InvokeProcedureMethod(
      * Now invoke the body of the method.
      */
 
-    TclNR_AddCallback(interp, FinalizePMCall, pmPtr, context, fdPtr, NULL);
+    Tcl_NRAddCallback(interp, FinalizePMCall, pmPtr, context, fdPtr, NULL);
     return TclNRInterpProcCore(interp, fdPtr->nameObj,
 	    Tcl_ObjectContextSkippedArgs(context), fdPtr->errProc);
 }
@@ -1150,7 +1150,7 @@ InvokeForwardMethod(
     argObjs = InitEnsembleRewrite(interp, objc, objv, skip,
 	    numPrefixes, prefixObjs, &len);
 
-    result = TclNR_EvalObjv(interp, len, argObjs, TCL_EVAL_INVOKE);
+    result = Tcl_NREvalObjv(interp, len, argObjs, TCL_EVAL_INVOKE);
     TclStackFree(interp, argObjs);
     return result;
 }
diff --git a/generic/tclProc.c b/generic/tclProc.c
index a74a064..7816b5c 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclProc.c,v 1.146 2008/07/14 14:15:11 dkf Exp $
+ * RCS: @(#) $Id: tclProc.c,v 1.147 2008/07/18 13:46:47 msofer Exp $
  */
 
 #include "tclInt.h"
@@ -58,9 +58,9 @@ static int		ProcCompileProc(Tcl_Interp *interp, Proc *procPtr,
 			    Tcl_Obj *bodyPtr, Namespace *nsPtr,
 			    const char *description, const char *procName,
 			    Proc **procPtrPtr);
-static TclNR_PostProc ApplyNR2;
-static TclNR_PostProc InterpProcNR2;
-static TclNR_PostProc Uplevel_Callback;
+static Tcl_NRPostProc ApplyNR2;
+static Tcl_NRPostProc InterpProcNR2;
+static Tcl_NRPostProc Uplevel_Callback;
 
 /*
  * The ProcBodyObjType type
@@ -200,7 +200,7 @@ Tcl_ProcObjCmd(
     }
     Tcl_DStringAppend(&ds, procName, -1);
 
-    cmd = TclNR_CreateCommand(interp, Tcl_DStringValue(&ds), TclObjInterpProc,
+    cmd = Tcl_NRCreateCommand(interp, Tcl_DStringValue(&ds), TclObjInterpProc,
 	    TclNRInterpProc, procPtr, TclProcDeleteProc);
     Tcl_DStringFree(&ds);
 
@@ -907,7 +907,7 @@ Tcl_UplevelObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    return TclNR_CallObjProc(interp, TclNRUplevelObjCmd, dummy, objc, objv);
+    return Tcl_NRCallObjProc(interp, TclNRUplevelObjCmd, dummy, objc, objv);
 }
 
 int
@@ -966,7 +966,7 @@ TclNRUplevelObjCmd(
 	objPtr = Tcl_ConcatObj(objc, objv);
     }
 
-    TclNR_AddCallback(interp, Uplevel_Callback, savedVarFramePtr, NULL, NULL,
+    Tcl_NRAddCallback(interp, Uplevel_Callback, savedVarFramePtr, NULL, NULL,
 	    NULL);
     return TclNREvalObjEx(interp, objPtr, 0, NULL, 0);
 }
@@ -1611,10 +1611,10 @@ PushProcCallFrame(
 }
 
 static int
-TclNR_BC(
+Tcl_NRBC(
     Tcl_Interp *interp,
     ByteCode *codePtr,
-    TclNR_PostProc *postProcPtr,
+    Tcl_NRPostProc *postProcPtr,
     Tcl_Obj *procNameObj,
     ProcErrorProc errorProc)
 {
@@ -1622,7 +1622,7 @@ TclNR_BC(
 
     recordPtr->type = TCL_NR_BC_TYPE;
     recordPtr->data.codePtr = codePtr;
-    TclNR_AddCallback(interp, postProcPtr, procNameObj, errorProc, NULL,
+    Tcl_NRAddCallback(interp, postProcPtr, procNameObj, errorProc, NULL,
 	    NULL);
     return TCL_OK;
 }
@@ -1825,7 +1825,7 @@ TclNRInterpProcCore(
 		(Tcl_Obj **)(iPtr->varFramePtr->objv + l));
     }
 
-    TclNR_BC(interp, codePtr, InterpProcNR2, procNameObj, errorProc);
+    Tcl_NRBC(interp, codePtr, InterpProcNR2, procNameObj, errorProc);
     return TCL_OK;
 }
 
@@ -2704,7 +2704,7 @@ Tcl_ApplyObjCmd(
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    return TclNR_CallObjProc(interp, TclNRApplyObjCmd, dummy, objc, objv);
+    return Tcl_NRCallObjProc(interp, TclNRApplyObjCmd, dummy, objc, objv);
 }
 
 int
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 61e8ad1..84aca49 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclStubInit.c,v 1.156 2008/07/13 09:03:35 msofer Exp $
+ * RCS: @(#) $Id: tclStubInit.c,v 1.157 2008/07/18 13:46:47 msofer Exp $
  */
 
 #include "tclInt.h"
@@ -1108,12 +1108,12 @@ static const TclStubs tclStubs = {
     Tcl_AppendPrintfToObj, /* 579 */
     Tcl_CancelEval, /* 580 */
     Tcl_Canceled, /* 581 */
-    TclNR_CreateCommand, /* 582 */
-    TclNR_EvalObj, /* 583 */
-    TclNR_EvalObjv, /* 584 */
-    TclNR_ObjProc, /* 585 */
-    TclNR_AddCallback, /* 586 */
-    TclNR_CallObjProc, /* 587 */
+    Tcl_NRCreateCommand, /* 582 */
+    Tcl_NREvalObj, /* 583 */
+    Tcl_NREvalObjv, /* 584 */
+    Tcl_NRObjProc, /* 585 */
+    Tcl_NRAddCallback, /* 586 */
+    Tcl_NRCallObjProc, /* 587 */
 };
 
 /* !END!: Do not edit above this line. */