From e5faa1eb5d11ca5c26ee3f28f5377a1dbdaad23e Mon Sep 17 00:00:00 2001 From: Steve Bennett Date: Wed, 28 Aug 2024 14:41:13 +1000 Subject: core: remove unused fields and bump ABI Now various fields in Jim_Interp and Jim_CallFrame are unused so remove them and bump the ABI version to prevent loading of incompatible extensions. Signed-off-by: Steve Bennett --- jim.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'jim.h') diff --git a/jim.h b/jim.h index f9acd35..083cb0f 100644 --- a/jim.h +++ b/jim.h @@ -125,7 +125,7 @@ extern "C" { * ---------------------------------------------------------------------------*/ /* Increment this every time the public ABI changes */ -#define JIM_ABI_VERSION 101 +#define JIM_ABI_VERSION 102 #define JIM_OK 0 #define JIM_ERR 1 @@ -439,8 +439,6 @@ typedef struct Jim_CallFrame { Jim_Obj *procBodyObjPtr; /* body object of the running procedure */ struct Jim_CallFrame *next; /* Callframes are in a linked list */ Jim_Obj *nsObj; /* Namespace for this proc call frame */ - Jim_Obj *unused_fileNameObj; - int unused_line; Jim_Stack *localCommands; /* commands to be destroyed when the call frame is destroyed */ struct Jim_Obj *tailcallObj; /* Pending tailcall invocation */ struct Jim_Cmd *tailcallCmd; /* Resolved command for pending tailcall invocation */ @@ -540,7 +538,6 @@ typedef struct Jim_PrngState { * ---------------------------------------------------------------------------*/ typedef struct Jim_Interp { Jim_Obj *result; /* object returned by the last command called. */ - int unused_errorLine; /* Error line where an error occurred. */ Jim_Obj *currentFilenameObj; /* filename of current Jim_EvalFile() */ int break_level; /* break/continue level */ int maxCallFrameDepth; /* Used for infinite loop detection. */ @@ -568,11 +565,9 @@ typedef struct Jim_Interp { int safeexpr; /* Set when evaluating a "safe" expression, no var subst or command eval */ Jim_Obj *liveList; /* Linked list of all the live objects. */ Jim_Obj *freeList; /* Linked list of all the unused objects. */ - Jim_Obj *unused_currentScriptObj; /* Script currently in execution. */ Jim_EvalFrame topEvalFrame; /* dummy top evaluation frame */ Jim_EvalFrame *evalFrame; /* evaluation stack */ int procLevel; - Jim_Obj * const *unused_argv; Jim_Obj *nullScriptObj; /* script representation of an empty string */ Jim_Obj *emptyObj; /* Shared empty string object. */ Jim_Obj *trueObj; /* Shared true int object. */ @@ -591,7 +586,7 @@ typedef struct Jim_Interp { Jim_Obj *defer; /* "jim::defer" */ Jim_Obj *traceCmdObj; /* If non-null, execution trace command to invoke */ int unknown_called; /* The unknown command has been invoked */ - int errorFlag; /* Set if an error occurred during execution. */ + int hasErrorStackTrace; /* If a stack trace has been set due to an error during execution. */ void *cmdPrivData; /* Used to pass the private data pointer to a command. It is set to what the user specified via Jim_CreateCommand(). */ -- cgit v1.1