diff options
| -rw-r--r-- | doc/CrtAlias.3 | 9 | ||||
| -rw-r--r-- | generic/tcl.decls | 2 | ||||
| -rw-r--r-- | generic/tclDecls.h | 5 | ||||
| -rw-r--r-- | generic/tclInterp.c | 3 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 1 |
5 files changed, 12 insertions, 8 deletions
diff --git a/doc/CrtAlias.3 b/doc/CrtAlias.3 index 77a3bc2..724e16b 100644 --- a/doc/CrtAlias.3 +++ b/doc/CrtAlias.3 @@ -198,16 +198,17 @@ restrictions on how they are related. that it takes a vector of values to pass as additional arguments instead of a vector of strings. .PP -\fBTcl_GetAlias\fR returns information about an alias \fIaliasName\fR +\fBTcl_GetAliasObj\fR returns information in the form of a pointer to +a vector of Tcl_Obj structures about an alias \fIaliasName\fR in \fIinterp\fR. Any of the result fields can be \fBNULL\fR, in which case the corresponding datum is not returned. If a result field is non\-\fBNULL\fR, the address indicated is set to the corresponding datum. For example, if \fItargetNamePtr\fR is non\-\fBNULL\fR it is set to a pointer to the string containing the name of the target command. .PP -\fBTcl_GetAliasObj\fR is similar to \fBTcl_GetAlias\fR except that it -returns a pointer to a vector of Tcl_Obj structures instead of a vector of -strings. +\fBTcl_GetAlias\fR is similar to \fBTcl_GetAliasObj\fR except that it +returns a pointer to a vector of string instead of a vector of +Tcl_Obj structures. \fBTcl_GetAlias\fR is deprecated. .PP \fBTcl_ExposeCommand\fR moves the command named \fIhiddenCmdName\fR from the set of hidden commands to the set of exposed commands, putting diff --git a/generic/tcl.decls b/generic/tcl.decls index f3e2dca..76a1d6b 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -528,7 +528,7 @@ declare 146 { declare 147 {deprecated {see TIP #559. Use Tcl_ResetResult}} { void Tcl_FreeResult(Tcl_Interp *interp) } -declare 148 { +declare 148 {deprecated {Use Tcl_GetAliasObj}} { int Tcl_GetAlias(Tcl_Interp *interp, const char *childCmd, Tcl_Interp **targetInterpPtr, const char **targetCmdPtr, int *argcPtr, const char ***argvPtr) diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 4f9ed7c..9ea6f0c 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -489,7 +489,8 @@ EXTERN int Tcl_Flush(Tcl_Channel chan); TCL_DEPRECATED("see TIP #559. Use Tcl_ResetResult") void Tcl_FreeResult(Tcl_Interp *interp); /* 148 */ -EXTERN int Tcl_GetAlias(Tcl_Interp *interp, +TCL_DEPRECATED("Use Tcl_GetAliasObj") +int Tcl_GetAlias(Tcl_Interp *interp, const char *childCmd, Tcl_Interp **targetInterpPtr, const char **targetCmdPtr, int *argcPtr, @@ -2194,7 +2195,7 @@ typedef struct TclStubs { Tcl_HashEntry * (*tcl_FirstHashEntry) (Tcl_HashTable *tablePtr, Tcl_HashSearch *searchPtr); /* 145 */ int (*tcl_Flush) (Tcl_Channel chan); /* 146 */ TCL_DEPRECATED_API("see TIP #559. Use Tcl_ResetResult") void (*tcl_FreeResult) (Tcl_Interp *interp); /* 147 */ - int (*tcl_GetAlias) (Tcl_Interp *interp, const char *childCmd, Tcl_Interp **targetInterpPtr, const char **targetCmdPtr, int *argcPtr, const char ***argvPtr); /* 148 */ + TCL_DEPRECATED_API("Use Tcl_GetAliasObj") int (*tcl_GetAlias) (Tcl_Interp *interp, const char *childCmd, Tcl_Interp **targetInterpPtr, const char **targetCmdPtr, int *argcPtr, const char ***argvPtr); /* 148 */ int (*tcl_GetAliasObj) (Tcl_Interp *interp, const char *childCmd, Tcl_Interp **targetInterpPtr, const char **targetCmdPtr, int *objcPtr, Tcl_Obj ***objv); /* 149 */ void * (*tcl_GetAssocData) (Tcl_Interp *interp, const char *name, Tcl_InterpDeleteProc **procPtr); /* 150 */ Tcl_Channel (*tcl_GetChannel) (Tcl_Interp *interp, const char *chanName, int *modePtr); /* 151 */ diff --git a/generic/tclInterp.c b/generic/tclInterp.c index 95b9215..38cab4b 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -1281,7 +1281,7 @@ Tcl_CreateAliasObj( * *---------------------------------------------------------------------- */ - +#ifndef TCL_NO_DEPRECATED int Tcl_GetAlias( Tcl_Interp *interp, /* Interp to start search from. */ @@ -1327,6 +1327,7 @@ Tcl_GetAlias( } return TCL_OK; } +#endif /* TCL_NO_DEPRECATED */ /* *---------------------------------------------------------------------- diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index a3144be..e05c5b2 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -313,6 +313,7 @@ mp_err TclBN_mp_mul_d(const mp_int *a, unsigned int b, mp_int *c) { # undef TclSetPreInitScript # define TclSetPreInitScript 0 # define TclInitCompiledLocals 0 +# define Tcl_GetAlias 0 #else #define TclGuessPackageName guessPackageName |