Index: TODO =================================================================== diff -u -r92c1ac38cd3d93c59f2924a1d0eb79caa47f60b3 -r9cce0c196888b84a26c5cb5477ed23582a543fd3 --- TODO (.../TODO) (revision 92c1ac38cd3d93c59f2924a1d0eb79caa47f60b3) +++ TODO (.../TODO) (revision 9cce0c196888b84a26c5cb5477ed23582a543fd3) @@ -5856,9 +5856,10 @@ catch {={*}[list foo 1 2 3 4 5 6]} msg; puts msg=$msg - Added Rosetta example: https://rosettacode.org/wiki/Polymorphic_copy#Tcl - - Added Rosetta example: https://rosettacode.org/wiki/Inheritance/Multiple#Tcl +- make nsf compilable with "-DTCL_NO_DEPRECATED" + ======================================================================== TODO: Index: generic/nsf.c =================================================================== diff -u -r8a106d953a732662bfce44e54dbd7801a5a5a9f0 -r9cce0c196888b84a26c5cb5477ed23582a543fd3 --- generic/nsf.c (.../nsf.c) (revision 8a106d953a732662bfce44e54dbd7801a5a5a9f0) +++ generic/nsf.c (.../nsf.c) (revision 9cce0c196888b84a26c5cb5477ed23582a543fd3) @@ -364,8 +364,8 @@ NsfParsedParam *parsedParamPtr) nonnull(1) nonnull(2) nonnull(5); -typedef Tcl_Obj *(NsfFormatFunction) _ANSI_ARGS_((Tcl_Interp *interp, Nsf_Param const *paramsPtr, - NsfObject *contextObject, const char *pattern)); +typedef Tcl_Obj *(NsfFormatFunction)(Tcl_Interp *interp, Nsf_Param const *paramsPtr, + NsfObject *contextObject, const char *pattern); static Tcl_Obj *NsfParamDefsVirtualFormat(Tcl_Interp *interp, Nsf_Param const *pPtr, NsfObject *contextObject, const char *pattern, @@ -10881,8 +10881,7 @@ if ((flags & NSF_VAR_TRIGGER_TRACE) != 0u) { varPtr = TclVarTraceExists(interp, name1); } else { - unsigned int flags = (name2 == NULL) ? TCL_PARSE_PART1 : 0u; - varPtr = TclLookupVar(interp, name1, name2, flags, "access", + varPtr = TclLookupVar(interp, name1, name2, 0, "access", /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr); } /* @@ -20194,7 +20193,7 @@ if (likely(valueObj == NULL)) { - varPtr = TclLookupVar(interp, ObjStr(nameObj), NULL, TCL_LEAVE_ERR_MSG|TCL_PARSE_PART1, "access", + varPtr = TclLookupVar(interp, ObjStr(nameObj), NULL, TCL_LEAVE_ERR_MSG, "access", /*createPart1*/ 0, /*createPart2*/ 0, &arrayPtr); if (likely(varPtr != NULL)) { resultObj = varPtr->value.objPtr; @@ -20205,7 +20204,7 @@ } else { Tcl_Obj *oldValuePtr; - varPtr = TclLookupVar(interp, ObjStr(nameObj), NULL, TCL_LEAVE_ERR_MSG|TCL_PARSE_PART1, "access", + varPtr = TclLookupVar(interp, ObjStr(nameObj), NULL, TCL_LEAVE_ERR_MSG, "access", /*createPart1*/ 1, /*createPart2*/ 0, &arrayPtr); oldValuePtr = varPtr->value.objPtr; INCR_REF_COUNT2("SetInstVar", valueObj); @@ -25362,7 +25361,7 @@ if (valueObj != NsfGlobalObjs[NSF___UNKNOWN__]) { /*fprintf(stderr, "param %s -> <%s>\n", paramPtr->name, ObjStr(valueObj));*/ - resultObj = Tcl_ObjSetVar2(interp, paramPtr->nameObj, NULL, valueObj, TCL_LEAVE_ERR_MSG|TCL_PARSE_PART1); + resultObj = Tcl_ObjSetVar2(interp, paramPtr->nameObj, NULL, valueObj, TCL_LEAVE_ERR_MSG); if (resultObj == NULL) { result = TCL_ERROR; break; @@ -26765,7 +26764,7 @@ if (varname != NULL) { Tcl_Obj *resultObj = Tcl_ObjSetVar2(interp, varname, NULL, paramsPtr->defaultValue, - TCL_LEAVE_ERR_MSG|TCL_PARSE_PART1); + TCL_LEAVE_ERR_MSG); if (unlikely(resultObj == NULL)) { ParamDefsRefCountDecr(parsedParam.paramDefs); return TCL_ERROR; @@ -28414,7 +28413,7 @@ * we do not have to check for existing variables. */ if ((paramPtr->flags & NSF_ARG_METHOD_INVOCATION) == 0u) { - Tcl_Obj *varObj = Tcl_ObjGetVar2(interp, paramPtr->nameObj, NULL, TCL_PARSE_PART1); + Tcl_Obj *varObj = Tcl_ObjGetVar2(interp, paramPtr->nameObj, NULL, 0); if (varObj != NULL) { /* @@ -28451,7 +28450,7 @@ * parameter states. */ - Tcl_Obj *varObj = Tcl_ObjGetVar2(interp, paramPtr->nameObj, NULL, TCL_PARSE_PART1); + Tcl_Obj *varObj = Tcl_ObjGetVar2(interp, paramPtr->nameObj, NULL, 0); if (unlikely(varObj == NULL)) { Tcl_Obj *paramDefsObj = NsfParamDefsSyntax(interp, paramDefs->paramsPtr, object, NULL); @@ -28628,7 +28627,7 @@ /* * Plain set of the variable. */ - resultObj = Tcl_ObjSetVar2(interp, paramPtr->nameObj, NULL, newValue, TCL_LEAVE_ERR_MSG|TCL_PARSE_PART1); + resultObj = Tcl_ObjSetVar2(interp, paramPtr->nameObj, NULL, newValue, TCL_LEAVE_ERR_MSG); if (unlikely(resultObj == NULL)) { /* * When the setting of the variable failed (e.g. caused by variable Index: generic/nsf.h =================================================================== diff -u -r8e079b542dd68c7975117266efba2b4701909ce9 -r9cce0c196888b84a26c5cb5477ed23582a543fd3 --- generic/nsf.h (.../nsf.h) (revision 8e079b542dd68c7975117266efba2b4701909ce9) +++ generic/nsf.h (.../nsf.h) (revision 9cce0c196888b84a26c5cb5477ed23582a543fd3) @@ -500,7 +500,7 @@ EXTERN "C" # endif CONST char * -Nsf_InitStubs _ANSI_ARGS_((Tcl_Interp *interp, CONST char *version, int exact)); +Nsf_InitStubs(Tcl_Interp *interp, CONST char *version, int exact); #else # define Nsf_InitStubs(interp, version, exact) \ Tcl_PkgRequire(interp, "nx", version, exact)