summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorstanton <stanton>1999-02-03 21:28:00 (GMT)
committerstanton <stanton>1999-02-03 21:28:00 (GMT)
commitd9c25afbfa5babcfcda3ba4dd27cd816106962e2 (patch)
tree23f598ce769f641aa16383d2432ce6caf760cc7e /generic
parent51100ef26ab0199626b74c3bd866099610703ee9 (diff)
downloadtcl-d9c25afbfa5babcfcda3ba4dd27cd816106962e2.zip
tcl-d9c25afbfa5babcfcda3ba4dd27cd816106962e2.tar.gz
tcl-d9c25afbfa5babcfcda3ba4dd27cd816106962e2.tar.bz2
* generic/tclInt.h:
* generic/tclNamesp.c (TclGetNamespaceForQualName): Restored signature so that TclGetNamespaceForQualName returns an int, even though it is always TCL_OK. This is needed for forwards compatibility of tbcload. This should be removed at some point, when we are willing to break forward compatibility.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclInt.h132
-rw-r--r--generic/tclNamesp.c15
2 files changed, 75 insertions, 72 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 50e973d..48d4018 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.22 1999/02/03 00:55:05 stanton Exp $
+ * RCS: @(#) $Id: tclInt.h,v 1.23 1999/02/03 21:28:00 stanton Exp $
*/
#ifndef _TCLINT
@@ -22,7 +22,7 @@
* included here, so that system-dependent personalizations for the
* include files only have to be made in once place. This results
* in a few extra includes, but greater modularity. The order of
- * the three groups of #includes is important. For example, stdio.h
+ * the three groups of #includes is important. For example, stdio.h
* is needed by tcl.h, and the _ANSI_ARGS_ declaration in tcl.h is
* needed by stdlib.h in some configurations.
*/
@@ -100,18 +100,18 @@ typedef int (Tcl_ResolveVarProc) _ANSI_ARGS_((
int flags, Tcl_Var *rPtr));
typedef int (Tcl_ResolveCmdProc) _ANSI_ARGS_((Tcl_Interp* interp,
- char* name, Tcl_Namespace *context, int flags,
- Tcl_Command *rPtr));
+ char* name, Tcl_Namespace *context, int flags,
+ Tcl_Command *rPtr));
typedef struct Tcl_ResolverInfo {
Tcl_ResolveCmdProc *cmdResProc; /* Procedure handling command name
- * resolution. */
+ * resolution. */
Tcl_ResolveVarProc *varResProc; /* Procedure handling variable name
- * resolution for variables that
- * can only be handled at runtime. */
+ * resolution for variables that
+ * can only be handled at runtime. */
Tcl_ResolveCompiledVarProc *compiledVarResProc;
- /* Procedure handling variable name
- * resolution at compile time. */
+ /* Procedure handling variable name
+ * resolution at compile time. */
} Tcl_ResolverInfo;
/*
@@ -143,7 +143,7 @@ typedef struct Namespace {
* this one. NULL if this is the global
* namespace. */
Tcl_HashTable childTable; /* Contains any child namespaces. Indexed
- * by strings; values have type
+ * by strings; values have type
* (Namespace *). */
long nsId; /* Unique id for the namespace. */
Tcl_Interp *interp; /* The interpreter containing this
@@ -160,8 +160,8 @@ typedef struct Namespace {
* objects. The namespace can't be freed
* until refCount becomes zero. */
Tcl_HashTable cmdTable; /* Contains all the commands currently
- * registered in the namespace. Indexed by
- * strings; values have type (Command *).
+ * registered in the namespace. Indexed by
+ * strings; values have type (Command *).
* Commands imported by Tcl_Import have
* Command structures that point (via an
* ImportedCmdRef structure) to the
@@ -169,7 +169,7 @@ typedef struct Namespace {
* namespace's command table. */
Tcl_HashTable varTable; /* Contains all the (global) variables
* currently in this namespace. Indexed
- * by strings; values have type (Var *). */
+ * by strings; values have type (Var *). */
char **exportArrayPtr; /* Points to an array of string patterns
* specifying which commands are exported.
* A pattern may include "string match"
@@ -232,8 +232,8 @@ typedef struct Namespace {
* namespace's storage will be freed.
*/
-#define NS_DYING 0x01
-#define NS_DEAD 0x02
+#define NS_DYING 0x01
+#define NS_DEAD 0x02
/*
* Flag passed to TclGetNamespaceForQualName to have it create all namespace
@@ -274,7 +274,7 @@ typedef struct VarTrace {
/*
* When a variable trace is active (i.e. its associated procedure is
* executing), one of the following structures is linked into a list
- * associated with the variable's interpreter. The information in
+ * associated with the variable's interpreter. The information in
* the structure is needed in order for Tcl to behave reasonably
* if traces are deleted while traces are active.
*/
@@ -306,9 +306,9 @@ typedef struct ArraySearch {
Tcl_HashSearch search; /* Info kept by the hash module about
* progress through the array. */
Tcl_HashEntry *nextEntry; /* Non-null means this is the next element
- * to be enumerated (it's leftover from
+ * to be enumerated (it's leftover from
* the Tcl_FirstHashEntry call or from
- * an "array anymore" command). NULL
+ * an "array anymore" command). NULL
* means must call Tcl_NextHashEntry
* to get value to return. */
struct ArraySearch *nextPtr;/* Next in list of all active searches
@@ -386,7 +386,7 @@ typedef struct Var {
* than a scalar variable or link. The
* "tablePtr" field points to the array's
* hashtable for its elements.
- * VAR_LINK - 1 means this Var structure contains a
+ * VAR_LINK - 1 means this Var structure contains a
* pointer to another Var structure that
* either has the real value or is itself
* another VAR_LINK pointer. Variables like
@@ -437,7 +437,7 @@ typedef struct Var {
#define VAR_SCALAR 0x1
#define VAR_ARRAY 0x2
#define VAR_LINK 0x4
-#define VAR_UNDEFINED 0x8
+#define VAR_UNDEFINED 0x8
#define VAR_IN_HASHTABLE 0x10
#define VAR_TRACE_ACTIVE 0x20
#define VAR_ARRAY_ELEMENT 0x40
@@ -609,7 +609,7 @@ typedef struct Proc {
} Proc;
/*
- * The structure below defines a command trace. This is used to allow Tcl
+ * The structure below defines a command trace. This is used to allow Tcl
* clients to find out whenever a command is about to be executed.
*/
@@ -631,7 +631,7 @@ typedef struct Trace {
typedef struct AssocData {
Tcl_InterpDeleteProc *proc; /* Proc to call when deleting. */
ClientData clientData; /* Value to pass to proc. */
-} AssocData;
+} AssocData;
/*
* The structure below defines a call frame. A call frame defines a naming
@@ -695,7 +695,7 @@ typedef struct CallFrame {
/*
*----------------------------------------------------------------
- * Data structures related to history. These are used primarily
+ * Data structures related to history. These are used primarily
* in tclHistory.c
*----------------------------------------------------------------
*/
@@ -812,7 +812,7 @@ typedef int (CompileProc) _ANSI_ARGS_((Tcl_Interp *interp, char *string,
typedef union StackItem {
Tcl_Obj *o; /* Stack item as a pointer to a Tcl_Obj. */
- int i; /* Stack item as an integer. */
+ int i; /* Stack item as an integer. */
VOID *p; /* Stack item as an arbitrary pointer. */
} StackItem;
@@ -840,7 +840,7 @@ typedef struct ExecEnv {
typedef struct ImportRef {
struct Command *importedCmdPtr;
- /* Points to the imported command created in
+ /* Points to the imported command created in
* an importing namespace; this command
* redirects its invocations to the "real"
* command. */
@@ -859,7 +859,7 @@ typedef struct ImportRef {
typedef struct ImportedCmdData {
struct Command *realCmdPtr; /* "Real" command that this imported command
- * refers to. */
+ * refers to. */
struct Command *selfPtr; /* Pointer to this imported command. Needed
* only when deleting it in order to remove
* it from the real command's linked list of
@@ -891,9 +891,9 @@ typedef struct Command {
* structure can be freed when refCount
* becomes zero. */
int cmdEpoch; /* Incremented to invalidate any references
- * that point to this command when it is
+ * that point to this command when it is
* renamed, deleted, hidden, or exposed. */
- CompileProc *compileProc; /* Procedure called to compile command. NULL
+ CompileProc *compileProc; /* Procedure called to compile command. NULL
* if no compile proc exists for command. */
Tcl_ObjCmdProc *objProc; /* Object-based command procedure. */
ClientData objClientData; /* Arbitrary value passed to object proc. */
@@ -962,7 +962,7 @@ typedef struct Interp {
/*
* Note: the first three fields must match exactly the fields in
- * a Tcl_Interp struct (see tcl.h). If you change one, be sure to
+ * a Tcl_Interp struct (see tcl.h). If you change one, be sure to
* change the other.
*
* The interpreter's result is held in both the string and the
@@ -976,25 +976,25 @@ typedef struct Interp {
* and Tcl_GetStringResult. See the SetResult man page for details.
*/
- char *result; /* If the last command returned a string
+ char *result; /* If the last command returned a string
* result, this points to it. Should not be
* accessed directly; see comment above. */
- Tcl_FreeProc *freeProc; /* Zero means a string result is statically
- * allocated. TCL_DYNAMIC means string
- * result was allocated with ckalloc and
- * should be freed with ckfree. Other values
- * give address of procedure to invoke to
- * free the string result. Tcl_Eval must
- * free it before executing next command. */
+ Tcl_FreeProc *freeProc; /* Zero means a string result is statically
+ * allocated. TCL_DYNAMIC means string
+ * result was allocated with ckalloc and
+ * should be freed with ckfree. Other values
+ * give address of procedure to invoke to
+ * free the string result. Tcl_Eval must
+ * free it before executing next command. */
int errorLine; /* When TCL_ERROR is returned, this gives
* the line number in the command where the
* error occurred (1 means first line). */
Tcl_Obj *objResultPtr; /* If the last command returned an object
* result, this points to it. Should not be
* accessed directly; see comment above. */
- Namespace *globalNsPtr; /* The interpreter's global namespace. */
+ Namespace *globalNsPtr; /* The interpreter's global namespace. */
Tcl_HashTable mathFuncTable;/* Contains all the math functions currently
- * defined for the interpreter. Indexed by
+ * defined for the interpreter. Indexed by
* strings (function names); values have
* type (MathFunc *). */
@@ -1005,7 +1005,7 @@ typedef struct Interp {
int numLevels; /* Keeps track of how many nested calls to
* Tcl_Eval are in progress for this
- * interpreter. It's used to delay deletion
+ * interpreter. It's used to delay deletion
* of the table until all Tcl_Eval
* invocations are completed. */
int maxNestingDepth; /* If numLevels exceeds this value then Tcl
@@ -1031,11 +1031,11 @@ typedef struct Interp {
/*
* Information used by Tcl_AppendResult to keep track of partial
- * results. See Tcl_AppendResult code for details.
+ * results. See Tcl_AppendResult code for details.
*/
char *appendResult; /* Storage space for results generated
- * by Tcl_AppendResult. Malloc-ed. NULL
+ * by Tcl_AppendResult. Malloc-ed. NULL
* means not yet allocated. */
int appendAvl; /* Total amount of space available at
* partialResult. */
@@ -1043,13 +1043,13 @@ typedef struct Interp {
* stored at partialResult. */
/*
- * A cache of compiled regular expressions. See Tcl_RegExpCompile
+ * A cache of compiled regular expressions. See Tcl_RegExpCompile
* in tclUtil.c for details.
*/
#define NUM_REGEXPS 5
char *patterns[NUM_REGEXPS];/* Strings corresponding to compiled
- * regular expression patterns. NULL
+ * regular expression patterns. NULL
* means that this slot isn't used.
* Malloc-ed. */
int patLengths[NUM_REGEXPS];/* Number of non-null characters in
@@ -1109,10 +1109,10 @@ typedef struct Interp {
long randSeed; /* Seed used for rand() function. */
Trace *tracePtr; /* List of traces for this interpreter. */
Tcl_HashTable *assocData; /* Hash table for associating data with
- * this interpreter. Cleaned up when
- * this interpreter is deleted. */
+ * this interpreter. Cleaned up when
+ * this interpreter is deleted. */
struct ExecEnv *execEnvPtr; /* Execution environment for Tcl bytecode
- * execution. Contains a pointer to the
+ * execution. Contains a pointer to the
* Tcl evaluation stack. */
Tcl_Obj *emptyObjPtr; /* Points to an object holding an empty
* string. Returned by Tcl_ObjSetVar2 when
@@ -1128,7 +1128,7 @@ typedef struct Interp {
* TCL_BRACKET_TERM 1 means that the current script is terminated by
* a close bracket rather than the end of the string.
* 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
+ * a code other than TCL_OK or TCL_ERROR; 0 means
* codes other than these should be turned into errors.
*/
@@ -1151,7 +1151,7 @@ typedef struct Interp {
* "error message log" command).
* ERROR_CODE_SET: Non-zero means that Tcl_SetErrorCode has been
* called to record information for the current
- * error. Zero means Tcl_Eval must clear the
+ * error. Zero means Tcl_Eval must clear the
* errorCode variable if an error is returned.
* EXPR_INITIALIZED: Non-zero means initialization specific to
* expressions has been carried out.
@@ -1160,11 +1160,11 @@ typedef struct Interp {
* 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
+ * 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 (ie it has only the safe commands
- * installed, less priviledge than a regular interp).
+ * SAFE_INTERP: Non zero means that the current interp is a
+ * safe interp (ie it has only the safe commands
+ * installed, less priviledge than a regular interp).
*/
#define DELETED 1
@@ -1174,7 +1174,7 @@ typedef struct Interp {
#define EXPR_INITIALIZED 0x10
#define DONT_COMPILE_CMDS_INLINE 0x20
#define RAND_SEED_INITIALIZED 0x40
-#define SAFE_INTERP 0x80
+#define SAFE_INTERP 0x80
/*
*----------------------------------------------------------------
@@ -1236,7 +1236,7 @@ extern unsigned char tclTypeTable[];
* TCL_OPEN_BRACE - Character is a "{".
* TCL_CLOSE_BRACE - Character is a "}".
* TCL_BACKSLASH - Character is a "\".
- * TCL_DOLLAR - Character is a "$".
+ * TCL_DOLLAR - Character is a "$".
*/
#define TCL_NORMAL 0x01
@@ -1335,7 +1335,7 @@ typedef int (TclSetFileAttrProc) _ANSI_ARGS_((Tcl_Interp *interp,
Tcl_Obj *attrObjPtr));
typedef struct TclFileAttrProcs {
- TclGetFileAttrProc *getProc; /* The procedure for getting attrs. */
+ TclGetFileAttrProc *getProc; /* The procedure for getting attrs. */
TclSetFileAttrProc *setProc; /* The procedure for setting attrs. */
} TclFileAttrProcs;
@@ -1374,11 +1374,11 @@ typedef int (*TclObjCmdProcType) _ANSI_ARGS_((ClientData clientData,
extern Tcl_Time tclBlockTime;
extern int tclBlockTimeSet;
extern char * tclExecutableName;
-extern Tcl_ChannelType tclFileChannelType;
+extern Tcl_ChannelType tclFileChannelType;
extern char * tclMemDumpFileName;
extern TclPlatformType tclPlatform;
extern char * tclpFileAttrStrings[];
-extern CONST TclFileAttrProcs tclpFileAttrProcs[];
+extern CONST TclFileAttrProcs tclpFileAttrProcs[];
/*
* Variables denoting the Tcl object types defined in the core.
@@ -1400,8 +1400,8 @@ extern Tcl_ObjType tclStringType;
extern Tcl_Obj * tclFreeObjList;
#ifdef TCL_COMPILE_STATS
-extern long tclObjsAlloced;
-extern long tclObjsFreed;
+extern long tclObjsAlloced;
+extern long tclObjsFreed;
#endif /* TCL_COMPILE_STATS */
/*
@@ -1428,7 +1428,7 @@ EXTERN void TclAllocateFreeObjects _ANSI_ARGS_((void));
EXTERN int TclChdir _ANSI_ARGS_((Tcl_Interp *interp,
char *dirName));
EXTERN int TclCleanupChildren _ANSI_ARGS_((Tcl_Interp *interp,
- int numPids, Tcl_Pid *pidPtr,
+ int numPids, Tcl_Pid *pidPtr,
Tcl_Channel errorChan));
EXTERN void TclCleanupCommand _ANSI_ARGS_((Command *cmdPtr));
EXTERN int TclCopyAndCollapse _ANSI_ARGS_((int count,
@@ -1448,7 +1448,7 @@ EXTERN int TclCreateProc _ANSI_ARGS_((Tcl_Interp *interp,
Tcl_Obj *argsPtr, Tcl_Obj *bodyPtr,
Proc **procPtrPtr));
EXTERN void TclDeleteCompiledLocalVars _ANSI_ARGS_((
- Interp *iPtr, CallFrame *framePtr));
+ Interp *iPtr, CallFrame *framePtr));
EXTERN void TclDeleteVars _ANSI_ARGS_((Interp *iPtr,
Tcl_HashTable *tablePtr));
EXTERN int TclDoGlob _ANSI_ARGS_((Tcl_Interp *interp,
@@ -1463,7 +1463,7 @@ EXTERN int TclFileAttrsCmd _ANSI_ARGS_((Tcl_Interp *interp,
int objc, Tcl_Obj *CONST objv[]));
EXTERN int TclFileCopyCmd _ANSI_ARGS_((Tcl_Interp *interp,
int argc, char **argv)) ;
-EXTERN int TclFileDeleteCmd _ANSI_ARGS_((Tcl_Interp *interp,
+EXTERN int TclFileDeleteCmd _ANSI_ARGS_((Tcl_Interp *interp,
int argc, char **argv));
EXTERN int TclFileMakeDirsCmd _ANSI_ARGS_((Tcl_Interp *interp,
int argc, char **argv)) ;
@@ -1480,14 +1480,14 @@ EXTERN Proc * TclFindProc _ANSI_ARGS_((Interp *iPtr,
EXTERN int TclFormatInt _ANSI_ARGS_((char *buffer, long n));
EXTERN void TclFreePackageInfo _ANSI_ARGS_((Interp *iPtr));
EXTERN void TclGetAndDetachPids _ANSI_ARGS_((Tcl_Interp *interp,
- Tcl_Channel chan));
+ Tcl_Channel chan));
EXTERN char * TclGetCwd _ANSI_ARGS_((Tcl_Interp *interp));
EXTERN int TclGetDate _ANSI_ARGS_((char *p,
unsigned long now, long zone,
unsigned long *timePtr));
EXTERN Tcl_Channel TclGetDefaultStdChannel _ANSI_ARGS_((int type));
EXTERN Tcl_Obj * TclGetElementOfIndexedArray _ANSI_ARGS_((
- Tcl_Interp *interp, int localIndex,
+ Tcl_Interp *interp, int localIndex,
Tcl_Obj *elemPtr, int leaveErrorMsg));
EXTERN char * TclGetEnv _ANSI_ARGS_((CONST char *name));
EXTERN char * TclGetExtension _ANSI_ARGS_((char *name));
@@ -1502,7 +1502,7 @@ EXTERN int TclGetLong _ANSI_ARGS_((Tcl_Interp *interp,
char *string, long *longPtr));
EXTERN int TclGetLoadedPackages _ANSI_ARGS_((
Tcl_Interp *interp, char *targetName));
-EXTERN void TclGetNamespaceForQualName _ANSI_ARGS_((
+EXTERN int TclGetNamespaceForQualName _ANSI_ARGS_((
Tcl_Interp *interp, char *qualName,
Namespace *cxtNsPtr, int flags,
Namespace **nsPtrPtr, Namespace **altNsPtrPtr,
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index cc3469d..d3fe249 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -19,7 +19,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.9 1999/02/03 00:55:05 stanton Exp $
+ * RCS: @(#) $Id: tclNamesp.c,v 1.10 1999/02/03 21:28:01 stanton Exp $
*/
#include "tclInt.h"
@@ -1554,6 +1554,9 @@ DeleteImportedCmd(clientData)
* set to the input context namespace pointer in cxtNsPtr. If cxtNsPtr
* is NULL, it is set to the current namespace context.
*
+ * For backwards compatibility with the TclPro byte code loader,
+ * this function always returns TCL_OK.
+ *
* Side effects:
* If "flags" contains CREATE_NS_IF_UNKNOWN, new namespaces may be
* created.
@@ -1561,7 +1564,7 @@ DeleteImportedCmd(clientData)
*----------------------------------------------------------------------
*/
-void
+int
TclGetNamespaceForQualName(interp, qualName, cxtNsPtr, flags,
nsPtrPtr, altNsPtrPtr, actualCxtPtrPtr, simpleNamePtr)
Tcl_Interp *interp; /* Interpreter in which to find the
@@ -1647,7 +1650,7 @@ TclGetNamespaceForQualName(interp, qualName, cxtNsPtr, flags,
*altNsPtrPtr = NULL;
*actualCxtPtrPtr = globalNsPtr;
*simpleNamePtr = start; /* points to empty string */
- return;
+ return TCL_OK;
}
}
*actualCxtPtrPtr = nsPtr;
@@ -1706,7 +1709,7 @@ TclGetNamespaceForQualName(interp, qualName, cxtNsPtr, flags,
*altNsPtrPtr = altNsPtr;
*simpleNamePtr = start;
Tcl_DStringFree(&buffer);
- return;
+ return TCL_OK;
}
} else {
/*
@@ -1773,7 +1776,7 @@ TclGetNamespaceForQualName(interp, qualName, cxtNsPtr, flags,
*altNsPtrPtr = NULL;
*simpleNamePtr = NULL;
Tcl_DStringFree(&buffer);
- return;
+ return TCL_OK;
}
start = end;
@@ -1806,7 +1809,7 @@ TclGetNamespaceForQualName(interp, qualName, cxtNsPtr, flags,
*nsPtrPtr = nsPtr;
*altNsPtrPtr = altNsPtr;
Tcl_DStringFree(&buffer);
- return;
+ return TCL_OK;
}
/*