summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--generic/tcl.h42
-rw-r--r--generic/tclAssembly.c2
-rw-r--r--generic/tclBinary.c2
-rw-r--r--generic/tclCompile.c4
-rw-r--r--generic/tclDisassemble.c2
-rw-r--r--generic/tclEncoding.c2
-rw-r--r--generic/tclEnsemble.c2
-rw-r--r--generic/tclExecute.c4
-rw-r--r--generic/tclIO.c2
-rw-r--r--generic/tclIndexObj.c2
-rw-r--r--generic/tclInt.h2
-rw-r--r--generic/tclLink.c2
-rw-r--r--generic/tclListObj.c2
-rw-r--r--generic/tclNamesp.c2
-rw-r--r--generic/tclOOCall.c2
-rw-r--r--generic/tclObj.c10
-rw-r--r--generic/tclPathObj.c2
-rw-r--r--generic/tclProc.c6
-rw-r--r--generic/tclRegexp.c2
-rw-r--r--generic/tclStringObj.c2
-rw-r--r--generic/tclUtil.c2
-rw-r--r--generic/tclVar.c4
22 files changed, 38 insertions, 64 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index 16dbd6d..f342d07 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -365,7 +365,6 @@ typedef int Tcl_Size;
typedef struct Tcl_AsyncHandler_ *Tcl_AsyncHandler;
typedef struct Tcl_Channel_ *Tcl_Channel;
typedef struct Tcl_ChannelTypeVersion_ *Tcl_ChannelTypeVersion;
-typedef struct Tcl_ObjTypeVersion_ *Tcl_ObjTypeVersion;
typedef struct Tcl_Command_ *Tcl_Command;
typedef struct Tcl_Condition_ *Tcl_Condition;
typedef struct Tcl_Dict_ *Tcl_Dict;
@@ -678,20 +677,16 @@ typedef struct Tcl_ObjType {
Tcl_ALReplaceProc *replaceProc; /* Replace subset with subset */
} Tcl_ObjType;
-#define TCL_OBJTYPE_V0 0 /* Pre-Tcl 9. Set to 0 so compiler will auto-init
- * when existing code that does not init this
- * field is compiled with Tcl9 headers */
+#define TCL_OBJTYPE_V0 0, /* Pre-Tcl 9 */ \
+ NULL, \
+ NULL, \
+ NULL, \
+ NULL, \
+ NULL, \
+ NULL, \
+ NULL
#define TCL_OBJTYPE_V1 (1) /* Tcl 9 - AbstractLists */
#define TCL_OBJTYPE_CURRENT TCL_OBJTYPE_V1
-#define TCL_OBJTYPE_V0_INIT \
- TCL_OBJTYPE_V0, \
- NULL, \
- NULL, \
- NULL, \
- NULL, \
- NULL, \
- NULL, \
- NULL
/*
* The following structure stores an internal representation (internalrep) for
@@ -798,27 +793,6 @@ static inline void* Tcl_ObjGetConcreteRep(
return objPtr->internalRep.twoPtrValue.ptr1;
}
-
-
-/*
- *----------------------------------------------------------------------------
- * The following structure contains the state needed by Tcl_SaveResult. No-one
- * outside of Tcl should access any of these fields. This structure is
- * typically allocated on the stack.
- */
-
-#ifndef TCL_NO_DEPRECATED
-typedef struct Tcl_SavedResult {
- char *result;
- Tcl_FreeProc *freeProc;
- Tcl_Obj *objResultPtr;
- char *appendResult;
- int appendAvl;
- int appendUsed;
- char resultSpace[200+1];
-} Tcl_SavedResult;
-#endif
-
/*
*----------------------------------------------------------------------------
* The following definitions support Tcl's namespace facility. Note: the first
diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c
index af5912a..9448162 100644
--- a/generic/tclAssembly.c
+++ b/generic/tclAssembly.c
@@ -326,7 +326,7 @@ static const Tcl_ObjType assembleCodeType = {
DupAssembleCodeInternalRep, /* dupIntRepProc */
NULL, /* updateStringProc */
NULL, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
/*
diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 12a3aa9..28cf31d 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -163,7 +163,7 @@ static const Tcl_ObjType properByteArrayType = {
DupProperByteArrayInternalRep,
UpdateStringOfByteArray,
NULL,
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
/*
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index 287d5d8..9708255 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -716,7 +716,7 @@ const Tcl_ObjType tclByteCodeType = {
DupByteCodeInternalRep, /* dupIntRepProc */
NULL, /* updateStringProc */
SetByteCodeFromAny, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT /* Extended type for AbstractLists */
+ TCL_OBJTYPE_V0
};
/*
@@ -730,7 +730,7 @@ static const Tcl_ObjType substCodeType = {
DupByteCodeInternalRep, /* dupIntRepProc - shared with bytecode */
NULL, /* updateStringProc */
NULL, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
#define SubstFlags(objPtr) (objPtr)->internalRep.twoPtrValue.ptr2
diff --git a/generic/tclDisassemble.c b/generic/tclDisassemble.c
index 257c30a..57adcf0 100644
--- a/generic/tclDisassemble.c
+++ b/generic/tclDisassemble.c
@@ -42,7 +42,7 @@ static const Tcl_ObjType instNameType = {
NULL, /* dupIntRepProc */
UpdateStringOfInstName, /* updateStringProc */
NULL, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
#define InstNameSetInternalRep(objPtr, inst) \
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c
index a624fe1..073566b 100644
--- a/generic/tclEncoding.c
+++ b/generic/tclEncoding.c
@@ -237,7 +237,7 @@ static Tcl_EncodingConvertProc Iso88591ToUtfProc;
static const Tcl_ObjType encodingType = {
"encoding", FreeEncodingInternalRep, DupEncodingInternalRep, NULL, NULL,
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
#define EncodingSetInternalRep(objPtr, encoding) \
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 567d6ab..6a9dc9e 100644
--- a/generic/tclEnsemble.c
+++ b/generic/tclEnsemble.c
@@ -82,7 +82,7 @@ static const Tcl_ObjType ensembleCmdType = {
DupEnsembleCmdRep, /* dupIntRepProc */
NULL, /* updateStringProc */
NULL, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
#define ECRSetInternalRep(objPtr, ecRepPtr) \
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 6ac2f94..b0a58ea 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -663,7 +663,7 @@ static const Tcl_ObjType exprCodeType = {
DupExprCodeInternalRep, /* dupIntRepProc */
NULL, /* updateStringProc */
NULL, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
/*
@@ -675,7 +675,7 @@ static const Tcl_ObjType dictIteratorType = {
"dictIterator",
ReleaseDictIterator,
NULL, NULL, NULL,
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
/*
diff --git a/generic/tclIO.c b/generic/tclIO.c
index 61a15d1..cf10f20 100644
--- a/generic/tclIO.c
+++ b/generic/tclIO.c
@@ -333,7 +333,7 @@ static const Tcl_ObjType chanObjType = {
DupChannelInternalRep, /* dupIntRepProc */
NULL, /* updateStringProc */
NULL, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
#define ChanSetInternalRep(objPtr, resPtr) \
diff --git a/generic/tclIndexObj.c b/generic/tclIndexObj.c
index c203c07..a2e515a 100644
--- a/generic/tclIndexObj.c
+++ b/generic/tclIndexObj.c
@@ -42,7 +42,7 @@ static const Tcl_ObjType indexType = {
DupIndex, /* dupIntRepProc */
UpdateStringOfIndex, /* updateStringProc */
NULL, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
/*
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 9a798a9..1acf0c0 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -4682,7 +4682,7 @@ TclObjTypeHasProc(Tcl_Obj* objPtr, Tcl_ObjProcType ptype)
return 0;
}
switch ((size_t)typePtr->version) {
- case (size_t)TCL_OBJTYPE_V0:
+ case 0:
switch (ptype) {
case TCL_OBJ_DUPREP:
return (typePtr->dupIntRepProc != NULL);
diff --git a/generic/tclLink.c b/generic/tclLink.c
index 44755ce..23e758c 100644
--- a/generic/tclLink.c
+++ b/generic/tclLink.c
@@ -115,7 +115,7 @@ static Tcl_ObjType invalidRealType = {
NULL, /* dupIntRepProc */
NULL, /* updateStringProc */
NULL, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
/*
diff --git a/generic/tclListObj.c b/generic/tclListObj.c
index 3556074..928727b 100644
--- a/generic/tclListObj.c
+++ b/generic/tclListObj.c
@@ -155,7 +155,7 @@ const Tcl_ObjType tclListType = {
DupListInternalRep, /* dupIntRepProc */
UpdateStringOfList, /* updateStringProc */
SetListFromAny, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT /* Extended type for AbstractLists */
+ TCL_OBJTYPE_V0
};
/* Macros to manipulate the List internal rep */
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 09b042a..1882e0a 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -131,7 +131,7 @@ static const Tcl_ObjType nsNameType = {
DupNsNameInternalRep, /* dupIntRepProc */
NULL, /* updateStringProc */
SetNsNameFromAny, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
#define NsNameSetInternalRep(objPtr, nnPtr) \
diff --git a/generic/tclOOCall.c b/generic/tclOOCall.c
index 9ba7e12..450fc9f 100644
--- a/generic/tclOOCall.c
+++ b/generic/tclOOCall.c
@@ -151,7 +151,7 @@ static const Tcl_ObjType methodNameType = {
DupMethodNameRep,
NULL,
NULL,
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 7d91dac..9d8463e 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -231,7 +231,7 @@ const Tcl_ObjType tclBooleanType = {
NULL, /* dupIntRepProc */
NULL, /* updateStringProc */
TclSetBooleanFromAny, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
const Tcl_ObjType tclDoubleType = {
"double", /* name */
@@ -239,7 +239,7 @@ const Tcl_ObjType tclDoubleType = {
NULL, /* dupIntRepProc */
UpdateStringOfDouble, /* updateStringProc */
SetDoubleFromAny, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
const Tcl_ObjType tclIntType = {
"int", /* name */
@@ -247,7 +247,7 @@ const Tcl_ObjType tclIntType = {
NULL, /* dupIntRepProc */
UpdateStringOfInt, /* updateStringProc */
SetIntFromAny, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
const Tcl_ObjType tclBignumType = {
"bignum", /* name */
@@ -255,7 +255,7 @@ const Tcl_ObjType tclBignumType = {
DupBignum, /* dupIntRepProc */
UpdateStringOfBignum, /* updateStringProc */
NULL, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
/*
@@ -300,7 +300,7 @@ Tcl_ObjType tclCmdNameType = {
DupCmdNameInternalRep, /* dupIntRepProc */
NULL, /* updateStringProc */
SetCmdNameFromAny, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
/*
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 4e30923..d0826b7 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -42,7 +42,7 @@ static const Tcl_ObjType fsPathType = {
DupFsPathInternalRep, /* dupIntRepProc */
UpdateStringOfFsPath, /* updateStringProc */
SetFsPathFromAny, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
/*
diff --git a/generic/tclProc.c b/generic/tclProc.c
index d641ba5..a798d11 100644
--- a/generic/tclProc.c
+++ b/generic/tclProc.c
@@ -65,7 +65,7 @@ const Tcl_ObjType tclProcBodyType = {
* instead. */
NULL, /* SetFromAny function; Tcl_ConvertToType
* should panic instead. */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
#define ProcSetInternalRep(objPtr, procPtr) \
@@ -94,7 +94,7 @@ const Tcl_ObjType tclProcBodyType = {
static const Tcl_ObjType levelReferenceType = {
"levelReference",
- NULL, NULL, NULL, NULL, TCL_OBJTYPE_V0_INIT
+ NULL, NULL, NULL, NULL, TCL_OBJTYPE_V0
};
/*
@@ -112,7 +112,7 @@ static const Tcl_ObjType lambdaType = {
DupLambdaInternalRep, /* dupIntRepProc */
NULL, /* updateStringProc */
SetLambdaFromAny, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
#define LambdaSetInternalRep(objPtr, procPtr, nsObjPtr) \
diff --git a/generic/tclRegexp.c b/generic/tclRegexp.c
index 878d890..4e3c6c5 100644
--- a/generic/tclRegexp.c
+++ b/generic/tclRegexp.c
@@ -108,7 +108,7 @@ const Tcl_ObjType tclRegexpType = {
DupRegexpInternalRep, /* dupIntRepProc */
NULL, /* updateStringProc */
SetRegexpFromAny, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
#define RegexpSetInternalRep(objPtr, rePtr) \
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index 30e9099..545a1e0 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -90,7 +90,7 @@ const Tcl_ObjType tclStringType = {
DupStringInternalRep, /* dupIntRepProc */
UpdateStringOfString, /* updateStringProc */
SetStringFromAny, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
/*
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index d6a80f2..0b898f1 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -128,7 +128,7 @@ static const Tcl_ObjType endOffsetType = {
NULL, /* dupIntRepProc */
NULL, /* updateStringProc */
NULL, /* setFromAnyProc */
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
/*
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 97191ca..c95e3de 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -246,7 +246,7 @@ static Tcl_DupInternalRepProc DupParsedVarName;
static const Tcl_ObjType localVarNameType = {
"localVarName",
FreeLocalVarName, DupLocalVarName, NULL, NULL,
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
#define LocalSetInternalRep(objPtr, index, namePtr) \
@@ -270,7 +270,7 @@ static const Tcl_ObjType localVarNameType = {
static const Tcl_ObjType parsedVarNameType = {
"parsedVarName",
FreeParsedVarName, DupParsedVarName, NULL, NULL,
- TCL_OBJTYPE_V0_INIT
+ TCL_OBJTYPE_V0
};
#define ParsedSetInternalRep(objPtr, arrayPtr, elem) \
generated by cgit v0.12 at 2025-12-13 06:40:58 (GMT)