* generic/tcl.h:

* generic/tcl.decls:
* generic/tclDecls.h:
* generic/tclInt.h:
* generic/tclInt.decls:
* generic/tclIntDecls.h:
* generic/tclRegexp.h:
* generic/tclStubInit.c: Move some exported public and internal
functions to the stub tables.  Removed functions that are in the
stub tables (from this and previous changes) from the original
header files.

8 files changed, 38 insertions, 36 deletions

diff --git a/generic/tcl.decls b/generic/tcl.decls
index 32dc15a..56ce744 100644
--- a/generic/tcl.decls
+++ b/generic/tcl.decls
@@ -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: tcl.decls,v 1.22 1999/07/22 01:08:04 redman Exp $
+# RCS: @(#) $Id: tcl.decls,v 1.23 1999/08/02 17:45:36 redman Exp $
 
 library tcl
 
@@ -1335,6 +1335,11 @@ declare 386 generic {
     void Tcl_SetNotifier(Tcl_NotifierProcs *notifierProcPtr)
 }
 
+declare 387 generic {
+    int Tcl_RegExpMatchObj (Tcl_Interp *interp, \
+	    char *string, Tcl_Obj *patObj)
+}
+
 ##############################################################################
 
 # Define the platform specific public Tcl interface.  These functions are
diff --git a/generic/tcl.h b/generic/tcl.h
index d62faa6..b80bc91 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -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.h,v 1.55 1999/07/22 21:50:54 redman Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.56 1999/08/02 17:45:36 redman Exp $
  */
 
 #ifndef _TCL
@@ -616,9 +616,9 @@ typedef struct Tcl_Obj {
  * expression that is expensive to compute or has side effects.
  */
 
-EXTERN void		Tcl_IncrRefCount _ANSI_ARGS_((Tcl_Obj *objPtr));
-EXTERN void		Tcl_DecrRefCount _ANSI_ARGS_((Tcl_Obj *objPtr));
-EXTERN int		Tcl_IsShared _ANSI_ARGS_((Tcl_Obj *objPtr));
+void		Tcl_IncrRefCount _ANSI_ARGS_((Tcl_Obj *objPtr));
+void		Tcl_DecrRefCount _ANSI_ARGS_((Tcl_Obj *objPtr));
+int		Tcl_IsShared _ANSI_ARGS_((Tcl_Obj *objPtr));
 
 #ifdef TCL_MEM_DEBUG
 #   define Tcl_IncrRefCount(objPtr) \
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index eb1c35a..9dcedc4 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.23 1999/07/22 01:08:04 redman Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.24 1999/08/02 17:45:36 redman Exp $
  */
 
 #ifndef _TCLDECLS
@@ -1208,6 +1208,9 @@ EXTERN int		Tcl_RegExpMatchObj _ANSI_ARGS_((Tcl_Interp * interp,
 /* 386 */
 EXTERN void		Tcl_SetNotifier _ANSI_ARGS_((
 				Tcl_NotifierProcs * notifierProcPtr));
+/* 387 */
+EXTERN int		Tcl_RegExpMatchObj _ANSI_ARGS_((Tcl_Interp * interp, 
+				char * string, Tcl_Obj * patObj));
 
 typedef struct TclStubHooks {
     struct TclPlatStubs *tclPlatStubs;
@@ -1662,6 +1665,7 @@ typedef struct TclStubs {
     void (*tcl_AppendUnicodeToObj) _ANSI_ARGS_((register Tcl_Obj * objPtr, Tcl_UniChar * unicode, int length)); /* 384 */
     int (*tcl_RegExpMatchObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * stringObj, Tcl_Obj * patternObj)); /* 385 */
     void (*tcl_SetNotifier) _ANSI_ARGS_((Tcl_NotifierProcs * notifierProcPtr)); /* 386 */
+    int (*tcl_RegExpMatchObj) _ANSI_ARGS_((Tcl_Interp * interp, char * string, Tcl_Obj * patObj)); /* 387 */
 } TclStubs;
 
 #ifdef __cplusplus
@@ -3255,6 +3259,10 @@ extern TclStubs *tclStubsPtr;
 #define Tcl_SetNotifier \
 	(tclStubsPtr->tcl_SetNotifier) /* 386 */
 #endif
+#ifndef Tcl_RegExpMatchObj
+#define Tcl_RegExpMatchObj \
+	(tclStubsPtr->tcl_RegExpMatchObj) /* 387 */
+#endif
 
 #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
 
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 69e37d7..b4cab7c 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -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: tclInt.decls,v 1.15 1999/08/01 20:44:10 hobbs Exp $
+# RCS: @(#) $Id: tclInt.decls,v 1.16 1999/08/02 17:45:37 redman Exp $
 
 library tcl
 
@@ -583,6 +583,10 @@ declare 155 generic {
     int TclTestChannelEventCmd(ClientData clientData, \
 	    Tcl_Interp *interp, int argc, char **argv)
 }
+declare 156 generic {
+    void TclRegError (Tcl_Interp *interp, char *msg, \
+	    int status)
+}
 
 ##############################################################################
 
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 2d76792..b11e88b 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclInt.h,v 1.34 1999/06/26 19:35:58 redman Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.35 1999/08/02 17:45:37 redman Exp $
  */
 
 #ifndef _TCLINT
@@ -1618,7 +1618,6 @@ EXTERN int		TclGetIntForIndex _ANSI_ARGS_((Tcl_Interp *interp,
 			    Tcl_Obj *objPtr, int endValue, int *indexPtr));
 EXTERN Tcl_Obj *	TclGetIndexedScalar _ANSI_ARGS_((Tcl_Interp *interp,
 			    int localIndex, int leaveErrorMsg));
-EXTERN Tcl_Obj *	TclGetLibraryPath _ANSI_ARGS_((void));
 EXTERN int		TclGetLong _ANSI_ARGS_((Tcl_Interp *interp,
 			    char *string, long *longPtr));
 EXTERN int		TclGetLoadedPackages _ANSI_ARGS_((
@@ -1786,7 +1785,6 @@ EXTERN Tcl_Obj *	TclSetElementOfIndexedArray _ANSI_ARGS_((
 			    Tcl_Interp *interp, int localIndex,
 			    Tcl_Obj *elemPtr, Tcl_Obj *objPtr,
 			    int leaveErrorMsg));
-EXTERN void		TclSetLibraryPath _ANSI_ARGS_((Tcl_Obj *pathPtr));
 EXTERN Tcl_Obj *	TclSetIndexedScalar _ANSI_ARGS_((Tcl_Interp *interp,
 			    int localIndex, Tcl_Obj *objPtr,
 			    int leaveErrorMsg));
@@ -1801,11 +1799,6 @@ EXTERN int		TclStat _ANSI_ARGS_((CONST char *path,
 EXTERN int		TclStatDeleteProc _ANSI_ARGS_((TclStatProc_ *proc));
 EXTERN int		TclStatInsertProc _ANSI_ARGS_((TclStatProc_ *proc));
 EXTERN void		TclTeardownNamespace _ANSI_ARGS_((Namespace *nsPtr));
-EXTERN int		TclTestChannelCmd _ANSI_ARGS_((ClientData clientData,
-			    Tcl_Interp *interp, int argc, char **argv));
-EXTERN int		TclTestChannelEventCmd _ANSI_ARGS_((
-			    ClientData clientData, Tcl_Interp *interp,
-			    int argc, char **argv));
 EXTERN void		TclTransferResult _ANSI_ARGS_((Tcl_Interp *sourceInterp,
 			    int result, Tcl_Interp *targetInterp));
 EXTERN int		TclUpdateReturnInfo _ANSI_ARGS_((Interp *iPtr));
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 481f0bf..b6f3c8f 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclIntDecls.h,v 1.15 1999/08/01 20:44:11 hobbs Exp $
+ * RCS: @(#) $Id: tclIntDecls.h,v 1.16 1999/08/02 17:45:37 redman Exp $
  */
 
 #ifndef _TCLINTDECLS
@@ -513,6 +513,9 @@ EXTERN int		TclTestChannelCmd _ANSI_ARGS_((ClientData clientData,
 EXTERN int		TclTestChannelEventCmd _ANSI_ARGS_((
 				ClientData clientData, Tcl_Interp * interp, 
 				int argc, char ** argv));
+/* 156 */
+EXTERN void		TclRegError _ANSI_ARGS_((Tcl_Interp * interp, 
+				char * msg, int status));
 
 typedef struct TclIntStubs {
     int magic;
@@ -706,6 +709,7 @@ typedef struct TclIntStubs {
     Tcl_Obj * (*tclGetLibraryPath) _ANSI_ARGS_((void)); /* 153 */
     int (*tclTestChannelCmd) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, int argc, char ** argv)); /* 154 */
     int (*tclTestChannelEventCmd) _ANSI_ARGS_((ClientData clientData, Tcl_Interp * interp, int argc, char ** argv)); /* 155 */
+    void (*tclRegError) _ANSI_ARGS_((Tcl_Interp * interp, char * msg, int status)); /* 156 */
 } TclIntStubs;
 
 #ifdef __cplusplus
@@ -1339,6 +1343,10 @@ extern TclIntStubs *tclIntStubsPtr;
 #define TclTestChannelEventCmd \
 	(tclIntStubsPtr->tclTestChannelEventCmd) /* 155 */
 #endif
+#ifndef TclRegError
+#define TclRegError \
+	(tclIntStubsPtr->tclRegError) /* 156 */
+#endif
 
 #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
 
diff --git a/generic/tclRegexp.h b/generic/tclRegexp.h
index 04d381d..ef93d1e 100644
--- a/generic/tclRegexp.h
+++ b/generic/tclRegexp.h
@@ -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: tclRegexp.h,v 1.10 1999/06/17 19:32:15 stanton Exp $
+ * RCS: @(#) $Id: tclRegexp.h,v 1.11 1999/08/02 17:45:38 redman Exp $
  */
 
 #ifndef _TCLREGEXP
@@ -48,22 +48,4 @@ typedef struct TclRegexp {
 				 * compiled regexp. */
 } TclRegexp;
 
-/*
- * Functions exported for use within the rest of Tcl.
- */
-
-EXTERN int		TclRegAbout _ANSI_ARGS_((Tcl_Interp *interp,
-			    Tcl_RegExp re));
-EXTERN int		TclRegExpMatchObj _ANSI_ARGS_((Tcl_Interp *interp,
-			    char *string, Tcl_Obj *patObj));
-EXTERN void		TclRegExpRangeUniChar _ANSI_ARGS_((Tcl_RegExp re,
-			    int index, int *startPtr, int *endPtr));
-
-/*
- * Functions exported from the regexp package for the test package to use.
- */
-
-EXTERN void		TclRegError _ANSI_ARGS_((Tcl_Interp *interp, char *msg,
-			    int status));
-
 #endif /* _TCLREGEXP */
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 4dfa544..9c1cf74 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.24 1999/08/01 20:44:12 hobbs Exp $
+ * RCS: @(#) $Id: tclStubInit.c,v 1.25 1999/08/02 17:45:38 redman Exp $
  */
 
 #include "tclInt.h"
@@ -231,6 +231,7 @@ TclIntStubs tclIntStubs = {
     TclGetLibraryPath, /* 153 */
     TclTestChannelCmd, /* 154 */
     TclTestChannelEventCmd, /* 155 */
+    TclRegError, /* 156 */
 };
 
 TclIntPlatStubs tclIntPlatStubs = {
@@ -779,6 +780,7 @@ TclStubs tclStubs = {
     Tcl_AppendUnicodeToObj, /* 384 */
     Tcl_RegExpMatchObj, /* 385 */
     Tcl_SetNotifier, /* 386 */
+    Tcl_RegExpMatchObj, /* 387 */
 };
 
 /* !END!: Do not edit above this line. */