Index: generic/nsf.c
===================================================================
diff -u -rfa5f13036107660d1f326275773e36962704599e -r9c0e4571c5523fdba77cc553a21afd5af663c839
--- generic/nsf.c	(.../nsf.c)	(revision fa5f13036107660d1f326275773e36962704599e)
+++ generic/nsf.c	(.../nsf.c)	(revision 9c0e4571c5523fdba77cc553a21afd5af663c839)
@@ -100,6 +100,7 @@
   ClientData         oldDeleteData;
   Tcl_CmdDeleteProc *oldDeleteProc;
   NsfParamDefs      *paramDefs;
+  int               *colonLocalVarCache;
   unsigned int       checkAlwaysFlag;
 } NsfProcContext;
 
@@ -349,10 +350,14 @@
                           int doConfigureParameter,
                           Nsf_Param **paramPtrPtr)
   nonnull(1) nonnull(2) nonnull(3);
+
 static void ParamDefsRefCountIncr(NsfParamDefs *paramDefs) nonnull(1);
 static void ParamDefsRefCountDecr(NsfParamDefs *paramDefs) nonnull(1);
 static void ParsedParamFree(NsfParsedParam *parsedParamPtr) nonnull(1);
+NSF_INLINE static NsfParamDefs *ParamDefsGet(Tcl_Command cmdPtr, unsigned int *checkAlwaysFlagPtr) nonnull(1);
 
+static NsfProcContext *ProcContextRequire(Tcl_Command cmd) nonnull(1);
+
 static int ArgumentParse(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[],
                          NsfObject *obj, Tcl_Obj *procName,
                          Nsf_Param const *paramPtr, int nrParameters, int serial,
@@ -532,7 +537,7 @@
   Tcl_InterpState  state;
   NsfRuntimeState *rst;
   int              result, prevDoProfile;
-  unsigned int     prevPreventRecursionFlags = 0u;
+  unsigned int     prevPreventRecursionFlags;
 
   nonnull_assert(interp != NULL);
   nonnull_assert(dsPtr != NULL);
@@ -553,6 +558,8 @@
     }
     prevPreventRecursionFlags = rst->preventRecursionFlags;
     rst->preventRecursionFlags |= traceEvalFlags;
+  } else {
+    prevPreventRecursionFlags = 0u;
   }
 
   if ((traceEvalFlags & NSF_EVAL_NOPROFILE) && rst->doProfile == 1) {
@@ -1044,7 +1051,7 @@
 
 static NSF_INLINE Var *
 VarHashCreateVar(TclVarHashTable *tablePtr, const Tcl_Obj *key, int *newPtr) {
-  Var                 *varPtr = NULL;
+  Var                 *varPtr;
   const Tcl_HashEntry *hPtr;
 
   nonnull_assert(tablePtr != NULL);
@@ -1054,7 +1061,10 @@
                              (char *) key, newPtr);
   if (likely(hPtr != NULL)) {
     varPtr = TclVarHashGetValue(hPtr);
+  } else {
+    varPtr = NULL;
   }
+
   return varPtr;
 }
 
@@ -2375,7 +2385,7 @@
 
 static NsfClasses *
 NsfClassListUnlink(NsfClasses **firstPtrPtr, const void *key) {
-  NsfClasses *entryPtr = NULL;
+  NsfClasses *entryPtr;
 
   nonnull_assert(firstPtrPtr != NULL);
   nonnull_assert(key != NULL);
@@ -2401,6 +2411,8 @@
         break;
       }
     }
+  } else {
+    entryPtr = NULL;
   }
 
   return entryPtr;
@@ -2634,7 +2646,6 @@
 
 static NsfClasses *
 MergeInheritanceLists(NsfClasses *pl, NsfClass *cl) {
-
   NsfClasses *sl, *baseList, **plNext, *superClasses,
     *deletionList = NULL;
 
@@ -4366,51 +4377,294 @@
   }
 }
 
-static Tcl_Var CompiledLocalsLookup(CallFrame *varFramePtr, const char *varName) nonnull(1) nonnull(2);
-// #define NSF_CONSTANT_COMPILED_LOCAL_LOOKUP 1
+/*
+ *----------------------------------------------------------------------
+ * CompiledLocalsLookup --
+ *
+ *    Lookup variable from the compiled locals. The function performs a linear
+ *    search in an unsorted list maintained by Tcl. This function is just used
+ *    for the rather deprecated "instvar" method.
+ *
+ * Results:
+ *    Returns Tcl_Var (or NULL, when lookup is not successful)
+ *
+ * Side effects:
+ *    None.
+ *
+ *----------------------------------------------------------------------
+ */
+static Tcl_Var CompiledLocalsLookup(CallFrame *varFramePtr, const char *varName)
+  nonnull(1) nonnull(2);
+
 static Tcl_Var
 CompiledLocalsLookup(CallFrame *varFramePtr, const char *varName) {
+  Tcl_Obj  **varNameObjPtr;
+  int        i, localCt, nameLength;
 
-#if defined(NSF_CONSTANT_COMPILED_LOCAL_LOOKUP)
-  {
-      Tcl_Obj         **varNameObjPtr;
-      Tcl_Var          result;
-      TclVarHashTable *varTablePtr;
-      Tcl_Obj         *varNameObj;
+  nonnull_assert(varFramePtr != NULL);
+  nonnull_assert(varName != NULL);
 
-      nonnull_assert(varFramePtr != NULL);
-      nonnull_assert(varName != NULL);
+  localCt = varFramePtr->numCompiledLocals;
+  varNameObjPtr = &varFramePtr->localCachePtr->varName0;
+  nameLength = (int)strlen(varName);
 
-      varTablePtr = varFramePtr->varTablePtr;
-      if (unlikely(varTablePtr == NULL)) {
-        //fprintf(stderr, "CompiledLocalsLookup: creating varTablePtr\n");
-        varTablePtr = varFramePtr->varTablePtr = VarHashTableCreate();
+  //fprintf(stderr, "=== compiled local search #local vars %d for <%s> flags %.8x\n",
+  //        localCt, varName, varFramePtr->isProcCallFrame);
+
+  for (i = 0 ; i < localCt ; i++, varNameObjPtr++) {
+    Tcl_Obj *varNameObj = *varNameObjPtr;
+    int      len;
+
+    if (likely(varNameObj != NULL)) {
+      const char *localName = TclGetStringFromObj(varNameObj, &len);
+
+      //fprintf(stderr, ".. [%d] varNameObj %p %p <%s>\n",
+      //        i, (void *)varNameObj, (void *)varNameObj->typePtr, localName);
+
+      if (unlikely(varName[0] == localName[0]
+                   && varName[1] == localName[1]
+                   && len == nameLength
+                   && strcmp(varName, localName) == 0)) {
+        return (Tcl_Var) &varFramePtr->compiledLocals[i];
       }
+    }
+  }
+  return NULL;
+}
 
-      if (unlikely(((unsigned)varFramePtr->isProcCallFrame & FRAME_VAR_LOADED)
-                   == 0)) {
-        int i, localCt;
 
-        localCt = varFramePtr->numCompiledLocals;
-        varNameObjPtr = &varFramePtr->localCachePtr->varName0;
+/*
+ *----------------------------------------------------------------------
+ * CompiledColonLocalsLookupBuildCache --
+ *
+ *    Helper function for CompiledColonLocalsLookup(): build up a sorted cache
+ *    consisting only of colon prefixed variables, such that e.g.
+ *    non-successful lookup can be performed in O(n/2).  In comparison to
+ *    CompiledLocalsLookup() this function is about a factor of 4 faster.
+ *
+ * Results:
+ *    Returns Tcl_Var (or NULL, when lookup is not successful)
+ *
+ * Side effects:
+ *    None.
+ *
+ *----------------------------------------------------------------------
+ */
+static Tcl_Var CompiledColonLocalsLookupBuildCache(CallFrame     *varFramePtr,
+                                                   const char    *varName,
+                                                   int             nameLength,
+                                                   Tcl_Obj       **localNames,
+                                                   NsfProcContext *ctxPtr)
+  nonnull(1) nonnull(2) nonnull(4) nonnull(5);
 
-        for (i = 0 ; i < localCt ; i++, varNameObjPtr++) {
-          if (likely(*varNameObjPtr != NULL)) {
-            int new;
+static Tcl_Var
+CompiledColonLocalsLookupBuildCache(CallFrame *varFramePtr, const char *varName,
+                                    int nameLength, Tcl_Obj **localNames,
+                                    NsfProcContext *ctxPtr) {
+  int       nrColonVars = 0, localCt, i, j;
+  Tcl_Var   result;
+  Tcl_Obj **varNameObjPtr;
 
-            (void)VarHashCreateVar(varTablePtr, *varNameObjPtr, &new);
+  nonnull_assert(varFramePtr != NULL);
+  nonnull_assert(varName != NULL);
+  nonnull_assert(localNames != NULL);
+  nonnull_assert(ctxPtr != NULL);
+
+  assert(ctxPtr->colonLocalVarCache == NULL);
+
+  localCt = varFramePtr->numCompiledLocals;
+  varNameObjPtr = &varFramePtr->localCachePtr->varName0;
+
+  /*
+   * Count colonVars
+   */
+  for (i = 0; i < localCt; i++, varNameObjPtr++) {
+    Tcl_Obj *varNameObj = *varNameObjPtr;
+
+    if (varNameObj != NULL) {
+      const char *localName = TclGetString(varNameObj);
+
+      if (localName[0] == ':') {
+        nrColonVars ++;
+      }
+    }
+  }
+
+  /*fprintf(stderr, ".. build cache #local vars %d for <%s> flags %.8x ctxPtr %p colonvars %d\n",
+          localCt, varName, varFramePtr->isProcCallFrame,
+          (void *)ctxPtr, nrColonVars
+          );*/
+
+  /*
+   * Allocate colonLocalVarCache in the proper size (keep space for a
+   * terminating element).
+   */
+  ctxPtr->colonLocalVarCache = NEW_ARRAY(int, nrColonVars+1);
+  varNameObjPtr = &varFramePtr->localCachePtr->varName0;
+
+  /*
+   * Fill colonLocalVarCache; since we have to go through the whole list, we
+   * might find and return the variable.
+   */
+  j = 0;
+  result = NULL;
+
+  for (i = 0; i < localCt ; i++, varNameObjPtr++) {
+    Tcl_Obj *varNameObj = *varNameObjPtr;
+
+    if (varNameObj != NULL) {
+      int         len;
+      const char *localName = TclGetStringFromObj(varNameObj, &len);
+
+      if (localName[0] == ':') {
+        int     k;
+        Tcl_Var var = (Tcl_Var) &varFramePtr->compiledLocals[i];
+
+        if (varName[1] == localName[1]
+            && len == nameLength
+            && strcmp(varName, localName) == 0) {
+          result = var;
+        }
+
+        //fprintf(stderr, ".. insert %s (%d) on pos %d; check j %d entries \n", localName, i, j, j);
+        for (k = 0; k < j; k++) {
+          int         idx, cmp;
+          const char *cachedName;
+
+          idx = ctxPtr->colonLocalVarCache[k];
+          cachedName = TclGetStringFromObj(localNames[idx], &len);
+          cmp = strcmp(localName, cachedName);
+
+          //fprintf(stderr, "... [%d] cmp newVarName <%s> (%d) with cachendName <%s> (%d) => %d\n",
+          //       k, localName, i, cachedName, idx, cmp);
+          if (cmp < 0) {
+            int ii;
+
+            /*
+             * Make space on position k for inserting the new element. We
+             * might uses memmove() instead.
+             */
+            for (ii = j; ii > k; ii--) {
+              ctxPtr->colonLocalVarCache[ii] = ctxPtr->colonLocalVarCache[ii - 1];
+            }
+            break;
           }
         }
-        varFramePtr->isProcCallFrame |= FRAME_VAR_LOADED;
+        ctxPtr->colonLocalVarCache[k] = i;
+
+        j++;
+        if (j == nrColonVars) {
+          break;
+        }
       }
+    }
+  }
+  /*
+   * Terminate list of indices with -1
+   */
+  ctxPtr->colonLocalVarCache[j] = -1;
 
-      varNameObj = Tcl_NewStringObj(varName, -1);
+  //fprintf(stderr, ".. search #local vars %d varName <%s> colonvars %d found %p\n",
+  //        localCt, varName, nrColonVars, (void*)result);
 
-      INCR_REF_COUNT(varNameObj);
-      result = (Tcl_Var)VarHashCreateVar(varTablePtr, varNameObj, NULL);
-      DECR_REF_COUNT(varNameObj);
-      return result;
+  return result;
+}
+
+/*
+ *----------------------------------------------------------------------
+ * CompiledColonLocalsLookup --
+ *
+ *    Lookup single colon prefixed variables from the compiled locals. This
+ *    function uses a cache consisting of colon prefixed variables to speed up
+ *    variable access.
+ *
+ * Results:
+ *    Returns Tcl_Var (or NULL, when lookup is not successful)
+ *
+ * Side effects:
+ *    None.
+ *
+ *----------------------------------------------------------------------
+ */
+//#define NSF_OLD_COLON_COMPILED_LOCAL_LOOKUP 1
+
+static Tcl_Var CompiledColonLocalsLookup(CallFrame *varFramePtr, const char *varName) nonnull(1) nonnull(2);
+
+static Tcl_Var
+CompiledColonLocalsLookup(CallFrame *varFramePtr, const char *varName) {
+#ifndef NSF_OLD_COLON_COMPILED_LOCAL_LOOKUP
+  Tcl_Obj       **localNames;
+  int             nameLength;
+  Tcl_Command     cmd;
+  NsfProcContext *ctxPtr;
+  Tcl_Var         result;
+
+  nonnull_assert(varFramePtr != NULL);
+  nonnull_assert(varName != NULL);
+
+  localNames = &varFramePtr->localCachePtr->varName0;
+  nameLength = (int)strlen(varName);
+
+  cmd = (Tcl_Command )varFramePtr->procPtr->cmdPtr;
+  ctxPtr = ProcContextRequire(cmd);
+
+  if (unlikely(ctxPtr->colonLocalVarCache == NULL)) {
+    result = CompiledColonLocalsLookupBuildCache(varFramePtr, varName, nameLength, localNames, ctxPtr);
+
+  } else {
+    int i, j;
+
+    /*
+     * Search the colonVarCache, which is alphabetically sorted to allow e.g.
+     * termination after O(n/2) on failures.
+     */
+    result = NULL;
+    for (i = 0, j = ctxPtr->colonLocalVarCache[0]; j > -1; ++i, j = ctxPtr->colonLocalVarCache[i]) {
+      int         len;
+      const char *localName;
+
+      localName = TclGetStringFromObj(localNames[j], &len);
+
+      //fprintf(stderr, ".. [%d] varNameObj %p <%s> vs <%s>\n",
+      //        j, (void *)varNameObj, localName, varName);
+
+      /*
+       * The first char of colon varName is always a colon, so we do not need to
+       * compare.
+       */
+      if (varName[1] < localName[1]) {
+        //fprintf(stderr, "... [%d] <%s> vs <%s> cant be here, break 1\n", j, varName, localName);
+        break;
+      } else if (varName[1] == localName[1]) {
+        int cmp;
+        /*
+         * Even when the first character is identical, we call compare() only
+         * when the lengths are equal.
+         */
+        if (len != nameLength) {
+          continue;
+        }
+        cmp = strcmp(varName, localName);
+        //fprintf(stderr, "... compare <%s> > <%s> => %d\n", varName, localName, cmp);
+        if (cmp == 0) {
+          result = (Tcl_Var) &varFramePtr->compiledLocals[j];
+          break;
+
+        } else if (cmp < 0) {
+          /*
+           * We are past the place, where the variable should be, so give up.
+           */
+          //fprintf(stderr, "... can break 2 <%s> > <%s>\n", varName, localName);
+          break;
+        }
+      }
+    }
+
+    //if (result != NULL) {
+    //fprintf(stderr, "... <%s> found -> [%d] %p\n", varName, j, (void *)result);
+    //}
   }
+  return result;
 #else
   Tcl_Obj         **varNameObjPtr;
   int               i, localCt, nameLength;
@@ -4422,8 +4676,12 @@
   varNameObjPtr = &varFramePtr->localCachePtr->varName0;
   nameLength = (int)strlen(varName);
 
-  //fprintf(stderr, ".. search #local vars %d for %s flags %.8x\n",
-  //        localCt, varName, varFramePtr->isProcCallFrame);
+  /*fprintf(stderr, ".. linear search #local vars %d for <%s> flags %.8x proc %p %p paramdefs %p\n",
+          localCt, varName, varFramePtr->isProcCallFrame,
+          (void*)varFramePtr->procPtr->cmdPtr->deleteProc,
+          (void*)NsfProcDeleteProc,
+          (void *)ParamDefsGet((Tcl_Command )varFramePtr->procPtr->cmdPtr, NULL)
+          );*/
   for (i = 0 ; i < localCt ; i++, varNameObjPtr++) {
     Tcl_Obj *varNameObj = *varNameObjPtr;
     int      len;
@@ -4434,9 +4692,13 @@
       //fprintf(stderr, ".. [%d] varNameObj %p %p <%s>\n",
       //        i, (void *)varNameObj, (void *)varNameObj->typePtr, localName);
 
-      if (unlikely(varName[0] == localName[0]
+      /*
+       * The first char of varName is always a colon.
+       */
+      if (unlikely(localName[0] == ':'
                    && varName[1] == localName[1]
                    && len == nameLength
+                   //&& memcmp(varName, localName, (size_t)nameLength) == 0)) {
                    && strcmp(varName, localName) == 0)) {
         return (Tcl_Var) &varFramePtr->compiledLocals[i];
       }
@@ -4446,12 +4708,15 @@
 #endif
 }
 
+
+
+
 /*
  *----------------------------------------------------------------------
  * GetVarAndNameFromHash --
  *
  *    Convenience function to obtain variable and name from
- *    a variable hash entry
+ *    a variable hash entry.
  *
  * Results:
  *    Results are passed back in argument 2 and 3
@@ -4751,18 +5016,16 @@
  * CompiledColonVarFetch --
  *
  *    This function is the actual variable resolution handler for a
- *    colon-prefixed (":/varName/") found in a compiled script
- *    registered by the compiling var resolver (see
- *    InterpCompiledColonResolver()). When initializing a call frame,
- *    this handler is called, crawls the object's var table (creating
- *    a variable, if needed), and returns a Var structure. Based on
- *    this, a link variable ":/varName/" pointing to this object
- *    variable (i.e., "varName") is created and is stored in the
+ *    colon-prefixed (":/varName/") found in a compiled script registered by
+ *    the compiling var resolver (see InterpCompiledColonVarResolver()). When
+ *    initializing a call frame, this handler is called, crawls the object's
+ *    var table (creating a variable, if needed), and returns a Var
+ *    structure. Based on this, a link variable ":/varName/" pointing to this
+ *    object variable (i.e., "varName") is created and is stored in the
  *    compiled locals array of the call frame. Beware that these link
  *    variables interact with the family of link-creating commands
- *    ([variable], [global], [upvar]) by being subject to
- *    "retargeting" upon name conflicts (see
- *    tests/varresolutiontest.tcl for some examples).
+ *    ([variable], [global], [upvar]) by being subject to "retargeting" upon
+ *    name conflicts (see tests/varresolutiontest.tcl for some examples).
  *
  * Results:
  *    Tcl_Var containing value or NULL.
@@ -4948,9 +5211,9 @@
                                CONST84 char *name, int length, Tcl_Namespace *UNUSED(context),
                                Tcl_ResolvedVarInfo **rPtr) {
   /*
-   *  The variable handler is registered, when we have an active Next Scripting
-   *  object and the variable starts with the appropriate prefix. Note
-   *  that getting the "self" object is a weak protection against
+   *  The variable handler is registered, when we have an active Next
+   *  Scripting object and the variable starts with the appropriate
+   *  prefix. Note that getting the "self" object is a weak protection against
    *  handling of wrong vars
    */
   NsfObject *object = GetSelfObj(interp);
@@ -5036,20 +5299,18 @@
  * InterpColonVarResolver --
  *
  *    For accessing object (instance) variables using the colon-prefix
- *    notation (":/varName/"), we provide our own var resolvers. This
- *    function is the non-compiling var resolver; its services are
- *    requested in two situations: a) when evaluating non-compiled
- *    statements, b) when executing slow-path bytecode instructions,
- *    with "slow path" referring to bytecode instructions not making
- *    use of the compiled locals array (and, e.g., reverting to
- *    TclObjLookupVar*() calls).
+ *    notation (":/varName/"), we provide our own var resolvers. This function
+ *    is the non-compiling var resolver; its services are requested in two
+ *    situations: a) when evaluating non-compiled statements, b) when
+ *    executing slow-path bytecode instructions, with "slow path" referring to
+ *    bytecode instructions not making use of the compiled locals array (and,
+ *    e.g., reverting to TclObjLookupVar*() calls).
  *
- *    The Tcl var resolver protocol dictates that per-namespace,
- *    non-compiling var resolvers take precedence over this per-interp
- *    non-compiling var resolver. That is, per-namespace resolvers are
- *    processed first and can effectively out-rule per-interp resolvers
- *    by signaling TCL_OK or TCL_BREAK. See
- *    e.g. TclLookupSimpleVar().
+ *    The Tcl var resolver protocol dictates that per-namespace, non-compiling
+ *    var resolvers take precedence over this per-interp non-compiling var
+ *    resolver. That is, per-namespace resolvers are processed first and can
+ *    effectively out-rule per-interp resolvers by signaling TCL_OK or
+ *    TCL_BREAK. See e.g. TclLookupSimpleVar().
  *
  * Results:
  *    TCL_OK or TCL_CONTINUE (according to on Tcl's var resolver protocol)
@@ -5097,7 +5358,7 @@
   if (likely((frameFlags & FRAME_IS_NSF_METHOD) != 0u)) {
     //*varPtr = CompiledLocalsLookup(varFramePtr, varName);
     //fprintf(stderr, "CompiledLocalsLookup for %p %s returned %p\n", varFramePtr, varName, *varPtr);
-    if ((*varPtr = CompiledLocalsLookup(varFramePtr, varName))) {
+    if ((*varPtr = CompiledColonLocalsLookup(varFramePtr, varName))) {
       /*
        * This section is reached under notable circumstances and represents a
        * point of interaction between our resolvers for non-compiled (i.e.,
@@ -6690,7 +6951,7 @@
 static Tcl_Obj *
 AutonameIncr(Tcl_Interp *interp, Tcl_Obj *nameObj, NsfObject *object,
              int isInstanceOpt, int doResetOpt) {
-  Tcl_Obj *valueObj, *resultObj = NULL;
+  Tcl_Obj *valueObj, *resultObj;
   CallFrame frame, *framePtr = &frame;
   int flogs = TCL_LEAVE_ERR_MSG;
 
@@ -11522,21 +11783,24 @@
  *
  *----------------------------------------------------------------------
  */
-NSF_INLINE static NsfParamDefs *ParamDefsGet(Tcl_Command cmdPtr, unsigned int *checkAlwaysFlagPtr) nonnull(1);
-
 NSF_INLINE static NsfParamDefs *
 ParamDefsGet(Tcl_Command cmdPtr, unsigned int *checkAlwaysFlagPtr) {
+  NsfParamDefs *result;
 
   nonnull_assert(cmdPtr != NULL);
 
   if (likely(Tcl_Command_deleteProc(cmdPtr) == NsfProcDeleteProc)) {
     NsfProcContext *ctx = (NsfProcContext *)Tcl_Command_deleteData(cmdPtr);
 
-    if (checkAlwaysFlagPtr != NULL) { *checkAlwaysFlagPtr = ctx->checkAlwaysFlag;}
-    return ctx->paramDefs;
+    if (checkAlwaysFlagPtr != NULL) {
+      *checkAlwaysFlagPtr = ctx->checkAlwaysFlag;
+    }
+    result = ctx->paramDefs;
+  } else {
+    result = NULL;
   }
 
-  return NULL;
+  return result;
 }
 
 /*----------------------------------------------------------------------
@@ -11661,72 +11925,101 @@
     (*ctxPtr->oldDeleteProc)(ctxPtr->oldDeleteData);
   }
   if (ctxPtr->paramDefs != NULL) {
-    /*fprintf(stderr, "free ParamDefs %p\n", ctxPtr->paramDefs);*/
+    /*fprintf(stderr, "free ParamDefs %p\n", (void*)ctxPtr->paramDefs);*/
     ParamDefsRefCountDecr(ctxPtr->paramDefs);
   }
+  if (ctxPtr->colonLocalVarCache != NULL) {
+    /*fprintf(stderr, "free colonLocalVarCache %p\n", (void*)ctxPtr->colonLocalVarCache);*/
+    FREE(Tcl_Var*, ctxPtr->colonLocalVarCache);
+  }
   /*fprintf(stderr, "free %p\n", ctxPtr);*/
   FREE(NsfProcContext, ctxPtr);
 }
 
 /*
  *----------------------------------------------------------------------
- * ParamDefsStore --
+ * ProcContextRequire --
  *
- *    Store the provided parameter definitions in the provided
- *    command. It stores a new deleteProc which will call the original
- *    delete proc automatically.
+ *    Obtain a NsfProcContext for the given cmd. Create a new one, if it does
+ *    not exist, or return the existing one.
  *
  * Results:
- *    Tcl result code.
+ *    NsfProcContext *
  *
  * Side effects:
- *    None
+ *    Might allocate memory
  *
  *----------------------------------------------------------------------
  */
-static int ParamDefsStore(Tcl_Command cmd, NsfParamDefs *paramDefs, unsigned int checkAlwaysFlag)
-  nonnull(1);
 
-static int
-ParamDefsStore(Tcl_Command cmd, NsfParamDefs *paramDefs, unsigned int checkAlwaysFlag) {
-  Command *cmdPtr;
+static NsfProcContext *
+ProcContextRequire(Tcl_Command cmd) {
+  NsfProcContext *ctxPtr;
+  Command        *cmdPtr;
 
   nonnull_assert(cmd != NULL);
 
   cmdPtr = (Command *)cmd;
-  /*
-   * TODO This function might store empty paramDefs. needed?
-   */
 
   if (cmdPtr->deleteProc != NsfProcDeleteProc) {
-    NsfProcContext *ctxPtr = NEW(NsfProcContext);
+    ctxPtr = NEW(NsfProcContext);
 
     /*fprintf(stderr, "ParamDefsStore %p replace deleteProc %p by %p\n",
-            paramDefs, cmdPtr->deleteProc, NsfProcDeleteProc);*/
+      paramDefs, cmdPtr->deleteProc, NsfProcDeleteProc);*/
 
     ctxPtr->oldDeleteData   = (Proc *)cmdPtr->deleteData;
     ctxPtr->oldDeleteProc   = cmdPtr->deleteProc;
     cmdPtr->deleteProc      = NsfProcDeleteProc;
-    ctxPtr->paramDefs       = paramDefs;
-    ctxPtr->checkAlwaysFlag = checkAlwaysFlag;
     cmdPtr->deleteData      = ctxPtr;
 
-    return TCL_OK;
+    ctxPtr->paramDefs       = NULL;
+    ctxPtr->checkAlwaysFlag = 0;
+    ctxPtr->colonLocalVarCache = NULL;
   } else {
-    /*fprintf(stderr, "ParamDefsStore cmd %p has already NsfProcDeleteProc deleteData %p\n",
-      cmd, cmdPtr->deleteData);*/
-    if (cmdPtr->deleteData != NULL) {
-      NsfProcContext *ctxPtr = cmdPtr->deleteData;
-
-      assert(ctxPtr->paramDefs == NULL);
-      ctxPtr->paramDefs = paramDefs;
-    }
+    ctxPtr = (NsfProcContext *)Tcl_Command_deleteData(cmdPtr);
   }
-  return TCL_ERROR;
+  return ctxPtr;
 }
 
+
 /*
  *----------------------------------------------------------------------
+ * ParamDefsStore --
+ *
+ *    Store the provided parameter definitions in the provided
+ *    command. It stores a new deleteProc which will call the original
+ *    delete proc automatically.
+ *
+ * Results:
+ *    Tcl result code.
+ *
+ * Side effects:
+ *    None
+ *
+ *----------------------------------------------------------------------
+ */
+static void ParamDefsStore(Tcl_Command cmd, NsfParamDefs *paramDefs, unsigned int checkAlwaysFlag)
+  nonnull(1);
+
+static void
+ParamDefsStore(Tcl_Command cmd, NsfParamDefs *paramDefs, unsigned int checkAlwaysFlag) {
+  NsfProcContext *ctxPtr;
+
+  nonnull_assert(cmd != NULL);
+
+  ctxPtr = ProcContextRequire(cmd);
+
+  /*
+   * We assume, that this never called for overwriting paramDefs
+   */
+  assert(ctxPtr->paramDefs == NULL);
+
+  ctxPtr->paramDefs       = paramDefs;
+  ctxPtr->checkAlwaysFlag = checkAlwaysFlag;
+}
+
+/*
+ *----------------------------------------------------------------------
  * ParamDefsNew --
  *
  *    Allocate a new paramDefs structure and initialize it with zeros. The
@@ -15433,7 +15726,8 @@
                  size_t start, size_t optionLength,
                  unsigned int disallowedOptions, Nsf_Param *paramPtr, int unescape) {
   const char *dotdot, *option = argString + start;
-  int result = TCL_OK;
+  char        firstChar = *option;
+  int         result = TCL_OK;
 
   nonnull_assert(interp != NULL);
   nonnull_assert(argString != NULL);
@@ -15442,49 +15736,49 @@
   /*fprintf(stderr, "ParamOptionParse name %s, option '%s' (%ld) disallowed %.6x\n",
     paramPtr->name, option, start, disallowedOptions);*/
 
-  if (strncmp(option, "required", MAX(3, optionLength)) == 0) {
+  if (firstChar == 'r' && strncmp(option, "required", MAX(3, optionLength)) == 0) {
     paramPtr->flags |= NSF_ARG_REQUIRED;
 
-  } else if (strncmp(option, "optional",  MAX(3, optionLength)) == 0) {
+  } else if (firstChar == 'o' && strncmp(option, "optional",  MAX(3, optionLength)) == 0) {
     paramPtr->flags &= ~NSF_ARG_REQUIRED;
 
-  } else if (strncmp(option, "substdefault", 12) == 0) {
+  } else if (firstChar == 's' && strncmp(option, "substdefault", 12) == 0) {
     paramPtr->flags |= NSF_ARG_SUBST_DEFAULT;
 
-  } else if (strncmp(option, "convert", 7) == 0) {
+  } else if (firstChar == 'c' && strncmp(option, "convert", 7) == 0) {
     paramPtr->flags |= NSF_ARG_IS_CONVERTER;
 
-  } else if (strncmp(option, "initcmd", 7) == 0) {
+  } else if (firstChar == 'i' && strncmp(option, "initcmd", 7) == 0) {
     if (unlikely((paramPtr->flags & (NSF_ARG_CMD|NSF_ARG_ALIAS|NSF_ARG_FORWARD)) != 0u)) {
       return NsfPrintError(interp, "parameter option 'initcmd' not valid in this option combination");
     }
     paramPtr->flags |= NSF_ARG_INITCMD;
 
-  } else if (strncmp(option, "cmd", 3) == 0) {
+  } else if (firstChar == 'c' && strncmp(option, "cmd", 3) == 0) {
     if (unlikely((paramPtr->flags & (NSF_ARG_INITCMD|NSF_ARG_ALIAS|NSF_ARG_FORWARD)) != 0u)) {
       return NsfPrintError(interp, "parameter option 'cmd' not valid in this option combination");
     }
     paramPtr->flags |= NSF_ARG_CMD;
 
-  } else if (strncmp(option, "alias", 5) == 0) {
+  } else if (firstChar == 'a' && strncmp(option, "alias", 5) == 0) {
     if (unlikely((paramPtr->flags & (NSF_ARG_INITCMD|NSF_ARG_CMD|NSF_ARG_FORWARD)) != 0u)) {
       return NsfPrintError(interp, "parameter option 'alias' not valid in this option combination");
     }
     paramPtr->flags |= NSF_ARG_ALIAS;
 
-  } else if (strncmp(option, "forward", 7) == 0) {
+  } else if (firstChar == 'f' && strncmp(option, "forward", 7) == 0) {
     if (unlikely((paramPtr->flags & (NSF_ARG_INITCMD|NSF_ARG_CMD|NSF_ARG_ALIAS)) != 0u)) {
       return NsfPrintError(interp, "parameter option 'forward' not valid in this option combination");
     }
     paramPtr->flags |= NSF_ARG_FORWARD;
 
-  } else if (strncmp(option, "slotset", 7) == 0) {
+  } else if (firstChar == 's' && strncmp(option, "slotset", 7) == 0) {
     if (unlikely(paramPtr->slotObj == NULL)) {
       return NsfPrintError(interp, "parameter option 'slotset' must follow 'slot='");
     }
     paramPtr->flags |= NSF_ARG_SLOTSET;
 
-  } else if (strncmp(option, "slotinitialize", 14) == 0) {
+  } else if (firstChar == 's' && strncmp(option, "slotinitialize", 14) == 0) {
     if (unlikely(paramPtr->slotObj == NULL)) {
       return NsfPrintError(interp, "parameter option 'slotinit' must follow 'slot='");
     }
@@ -15509,32 +15803,32 @@
       return NsfPrintError(interp, "upper bound of multiplicity in %s not supported", argString);
     }
 
-  } else if (strncmp(option, "noarg", 5) == 0) {
+  } else if (firstChar == 'n' && strncmp(option, "noarg", 5) == 0) {
     if ((paramPtr->flags & NSF_ARG_ALIAS) == 0u) {
       return NsfPrintError(interp, "parameter option \"noarg\" only allowed for parameter type \"alias\"");
     }
     paramPtr->flags |= NSF_ARG_NOARG;
     paramPtr->nrArgs = 0;
 
-  } else if (strncmp(option, "nodashalnum", 11) == 0) {
+  } else if (firstChar == 'n' && strncmp(option, "nodashalnum", 11) == 0) {
     if (*paramPtr->name == '-') {
       return NsfPrintError(interp, "parameter option 'nodashalnum' only allowed for positional parameters");
     }
     paramPtr->flags |= NSF_ARG_NODASHALNUM;
 
-  } else if (strncmp(option, "noconfig", 8) == 0) {
+  } else if (firstChar == 'n' && strncmp(option, "noconfig", 8) == 0) {
     if (disallowedOptions != NSF_DISALLOWED_ARG_OBJECT_PARAMETER) {
       return NsfPrintError(interp, "parameter option 'noconfig' only allowed for object parameters");
     }
     paramPtr->flags |= NSF_ARG_NOCONFIG;
 
-  } else if (strncmp(option, "args", 4) == 0) {
+  } else if (firstChar == 'a' && strncmp(option, "args", 4) == 0) {
     if ((paramPtr->flags & NSF_ARG_ALIAS) == 0u) {
       return NsfPrintError(interp, "parameter option \"args\" only allowed for parameter type \"alias\"");
     }
     result = ParamOptionSetConverter(interp, paramPtr, "args", ConvertToNothing);
 
-  } else if (optionLength >= 4 && strncmp(option, "arg=", 4) == 0) {
+  } else if (firstChar == 'a' && optionLength >= 4 && strncmp(option, "arg=", 4) == 0) {
     if (paramPtr->converter != ConvertViaCmd) {
       return NsfPrintError(interp,
                            "parameter option 'arg=' only allowed for user-defined converter");
@@ -15551,7 +15845,7 @@
     }
     INCR_REF_COUNT(paramPtr->converterArg);
 
-  } else if (strncmp(option, "switch", 6) == 0) {
+  } else if (firstChar == 's' && strncmp(option, "switch", 6) == 0) {
     if (*paramPtr->name != '-') {
       return NsfPrintError(interp,
                           "invalid parameter type \"switch\" for argument \"%s\"; "
@@ -15567,39 +15861,39 @@
     paramPtr->defaultValue = Tcl_NewBooleanObj(0);
     INCR_REF_COUNT(paramPtr->defaultValue);
 
-  } else if (strncmp(option, "integer", MAX(3, optionLength)) == 0) {
+  } else if (firstChar == 'i' && strncmp(option, "integer", MAX(3, optionLength)) == 0) {
     result = ParamOptionSetConverter(interp, paramPtr, "integer", Nsf_ConvertToInteger);
 
-  } else if (strncmp(option, "int32", 5) == 0) {
+  } else if (firstChar == 'i' && strncmp(option, "int32", 5) == 0) {
     result = ParamOptionSetConverter(interp, paramPtr, "int32", Nsf_ConvertToInt32);
 
-  } else if (strncmp(option, "boolean", 7) == 0) {
+  } else if (firstChar == 'b' && strncmp(option, "boolean", 7) == 0) {
     result = ParamOptionSetConverter(interp, paramPtr, "boolean", Nsf_ConvertToBoolean);
 
-  } else if (strncmp(option, "object", 6) == 0) {
+  } else if (firstChar == 'o' && strncmp(option, "object", 6) == 0) {
     result = ParamOptionSetConverter(interp, paramPtr, "object", Nsf_ConvertToObject);
 
-  } else if (strncmp(option, "class", 5) == 0) {
+  } else if (firstChar == 'c' && strncmp(option, "class", 5) == 0) {
     result = ParamOptionSetConverter(interp, paramPtr, "class", Nsf_ConvertToClass);
 
-  } else if (strncmp(option, "metaclass", 9) == 0) {
+  } else if (firstChar == 'm' && strncmp(option, "metaclass", 9) == 0) {
     result = ParamOptionSetConverter(interp, paramPtr, "class", Nsf_ConvertToClass);
     paramPtr->flags |= NSF_ARG_METACLASS;
 
-  } else if (strncmp(option, "baseclass", 9) == 0) {
+  } else if (firstChar == 'b' && strncmp(option, "baseclass", 9) == 0) {
     result = ParamOptionSetConverter(interp, paramPtr, "class", Nsf_ConvertToClass);
     paramPtr->flags |= NSF_ARG_BASECLASS;
 
-  } else if (strncmp(option, "mixinreg", 8) == 0) {
+  } else if (firstChar == 'm' && strncmp(option, "mixinreg", 8) == 0) {
     result = ParamOptionSetConverter(interp, paramPtr, "mixinreg", Nsf_ConvertToMixinreg);
 
- } else if (strncmp(option, "filterreg", 9) == 0) {
+ } else if (firstChar == 'f' && strncmp(option, "filterreg", 9) == 0) {
     result = ParamOptionSetConverter(interp, paramPtr, "filterreg", Nsf_ConvertToFilterreg);
 
-  } else if (strncmp(option, "parameter", 9) == 0) {
+ } else if (firstChar == 'p' && strncmp(option, "parameter", 9) == 0) {
     result = ParamOptionSetConverter(interp, paramPtr, "parameter", Nsf_ConvertToParameter);
 
-  } else if (optionLength >= 6 && strncmp(option, "type=", 5) == 0) {
+ } else if (firstChar == 't' && optionLength >= 6 && strncmp(option, "type=", 5) == 0) {
     if (paramPtr->converter != Nsf_ConvertToObject
         && paramPtr->converter != Nsf_ConvertToClass ) {
       return NsfPrintError(interp, "parameter option 'type=' only allowed for parameter types 'object' and 'class'");
@@ -15613,15 +15907,15 @@
     }
     INCR_REF_COUNT(paramPtr->converterArg);
 
-  } else if (optionLength >= 6 && strncmp(option, "slot=", 5) == 0) {
+  } else if (firstChar == 's' && optionLength >= 6 && strncmp(option, "slot=", 5) == 0) {
     if (paramPtr->slotObj != NULL) {DECR_REF_COUNT(paramPtr->slotObj);}
     paramPtr->slotObj = Tcl_NewStringObj(option + 5,  (int)optionLength - 5);
     if (unlikely(unescape)) {
       Unescape(paramPtr->slotObj);
     }
     INCR_REF_COUNT(paramPtr->slotObj);
 
-  } else if (optionLength >= 6 && strncmp(option, "method=", 7) == 0) {
+  } else if (firstChar == 'm' && optionLength >= 6 && strncmp(option, "method=", 7) == 0) {
     if ((paramPtr->flags & (NSF_ARG_ALIAS|NSF_ARG_FORWARD|NSF_ARG_SLOTSET)) == 0u) {
       return NsfPrintError(interp, "parameter option 'method=' only allowed for parameter "
                            "types 'alias', 'forward' and 'slotset'");
@@ -15633,8 +15927,9 @@
     }
     INCR_REF_COUNT(paramPtr->method);
 
-  } else if (strncmp(option, "virtualobjectargs", 17) == 0 ||
-             strncmp(option, "virtualclassargs", 16) == 0) {
+  } else if ((firstChar == 'v') &&
+             ((strncmp(option, "virtualobjectargs", 17) == 0) ||
+              (strncmp(option, "virtualclassargs", 16) == 0))) {
     result = ParamOptionSetConverter(interp, paramPtr, option, ConvertToNothing);
   } else {
     Tcl_DString ds, *dsPtr = &ds;
@@ -15741,10 +16036,10 @@
 static int
 ParamParse(Tcl_Interp *interp, Tcl_Obj *procNameObj, Tcl_Obj *arg, unsigned int disallowedFlags,
            Nsf_Param *paramPtr, int *possibleUnknowns, int *plainParams, int *nrNonposArgs) {
-  int result, npac, isNonposArgument, parensCount;
-  size_t length, j;
-  const char *argString, *argName;
-  Tcl_Obj **npav;
+  const char  *argString, *argName;
+  int          result, npac, isNonposArgument, parensCount;
+  size_t       length, j;
+  Tcl_Obj    **npav;
 
   nonnull_assert(interp != NULL);
   nonnull_assert(arg != NULL);
@@ -15766,6 +16061,8 @@
 
   argString = ObjStr(npav[0]);
   length = strlen(argString);
+  //argString = TclGetStringFromObj(npav[0], &result);
+  //length    = (size_t) result;
 
   /*
    * Per default parameter have exactly one argument; types without arguments
@@ -21942,7 +22239,7 @@
             pPtr->name, pPtr->flags & NSF_ARG_REQUIRED, pPtr->nrArgs, pPtr,
             pcPtr->clientData[i], pcPtr->objv[i], (pPtr->defaultValue != NULL) ? ObjStr(pPtr->defaultValue) : "NONE");*/
 
-    if (pcPtr->objv[i]) {
+    if (pcPtr->objv[i] != NULL) {
       /*
        * We got an actual value, which was already checked by ArgumentParse().
        * In case the value is a switch and NSF_PC_INVERT_DEFAULT is set, we
Index: tests/varresolution.test
===================================================================
diff -u -r275da34d3d7a874a451eced58242b738c8a37d1a -r9c0e4571c5523fdba77cc553a21afd5af663c839
--- tests/varresolution.test	(.../varresolution.test)	(revision 275da34d3d7a874a451eced58242b738c8a37d1a)
+++ tests/varresolution.test	(.../varresolution.test)	(revision 9c0e4571c5523fdba77cc553a21afd5af663c839)
@@ -7,20 +7,20 @@
 
 ::nx::configure defaultMethodCallProtection false
 
-::nsf::method::alias ::nx::Object objeval -frame object ::eval 
+::nsf::method::alias ::nx::Object objeval -frame object ::eval
 ::nsf::method::alias ::nx::Object array -frame object ::array
 ::nsf::method::alias ::nx::Object lappend -frame object ::lappend
 ::nsf::method::alias ::nx::Object incr -frame object ::incr
 ::nsf::method::alias ::nx::Object set -frame object ::set
 ::nsf::method::alias ::nx::Object unset -frame object ::unset
 
 ###########################################
-# Basic tests for var resolution under 
+# Basic tests for var resolution under
 # per-object namespaces ...
 ###########################################
 nx::test case globals
 set ::globalVar 1
-nx::Object create o 
+nx::Object create o
 o require namespace
 ? {o info vars} ""
 ? {info exists ::globalVar} 1
@@ -42,7 +42,7 @@
 ###########################################
 nx::test case scopes
 
-nx::Object create o 
+nx::Object create o
 nx::Object create o2 {set :i 1}
 o objeval {
   # require an namespace within an objscoped frame; it is necessary to replace
@@ -94,7 +94,7 @@
 ? {o eval {info exists :X}} 1
 ? {o eval {info exists :Y}} 1
 ? {o set y} 2
-? {set ::g} 1 
+? {set ::g} 1
 
 o destroy
 o2 destroy
@@ -126,7 +126,7 @@
 ? {o eval {info exists :X}} 1
 ? {o eval {info exists :Y}} 1
 ? {o set y} 2
-? {set ::g} 1 
+? {set ::g} 1
 
 o destroy
 o2 destroy
@@ -138,7 +138,7 @@
 # var exists tests
 ###########################################
 nx::test case exists {
-    set y 1 
+    set y 1
 
     nx::Object create o {set :x 1}
     o object method foo {} {info exists :x}
@@ -162,7 +162,7 @@
 ###########################################
 nx::test case namespaces
 
-nx::Object create o 
+nx::Object create o
 o require namespace
 o set x 1
 ? {namespace eval ::o {set x}} 1
@@ -186,7 +186,7 @@
 ###########################################
 nx::test case namespaces-array
 
-nx::Object create o 
+nx::Object create o
 o require namespace
 
 ? {o array exists a} 0
@@ -211,9 +211,9 @@
 # tests on namespace-qualified var names
 ###########################################
 nx::test case namespaced-var-names
-nx::Object create o 
+nx::Object create o
 o require namespace
-nx::Object create o::oo 
+nx::Object create o::oo
 o::oo require namespace
 
 ? {::o set ::x 1} 1
@@ -225,7 +225,7 @@
 ? {namespace eval ::o unset x} ""
 ? {o eval {info exists x}} 0
 
-# Note, relatively qualified var names (not prefixed with ::*) 
+# Note, relatively qualified var names (not prefixed with ::*)
 # are always resolved relative to the per-object namespace
 ? {catch {::o set o::x 1} msg} 1
 ? {::o set oo::x 1} 1
@@ -265,8 +265,8 @@
 o set x 1
 ? {o foo 1} "1,2" "create var y and fetch var x"
 ? {o bar} "1,2" "fetch two instance variables"
-? {o info vars} "x y" 
-# recreate object, check var caching; 
+? {o info vars} "x y"
+# recreate object, check var caching;
 # we have to recreate bar, so no problem
 nx::Object create o
 o set x 1
@@ -282,17 +282,17 @@
 C create c1
 C method foo {x} {set :y 2; return ${:x},${:y}}
 C method bar {} {return ${:x},${:y}}
-? {c1 info vars} "x" 
+? {c1 info vars} "x"
 ? {c1 foo 1} "1,2" "create var y and fetch var x"
 ? {c1 bar} "1,2" "fetch two instance variables"
-? {c1 info vars} "x y" 
-# recreate object, check var caching; 
+? {c1 info vars} "x y"
+# recreate object, check var caching;
 # we do not have to recreate bar, compiled var persists,
 # change must be detected
 C create c1
 #puts stderr "after recreate"
 ? {catch {c1 bar}} "1" "compiled var y should not exist"
-? {c1 info vars} "x" 
+? {c1 info vars} "x"
 c1 destroy
 C destroy
 
@@ -305,7 +305,7 @@
 nx::Class create C {:property {x 1}}
 C create c1
 C method foo {x} {
-  set :y 2; 
+  set :y 2;
   eval "set :z 3"
   return ${:x},${:y},${:z}
 }
@@ -392,7 +392,7 @@
 
 ###############################################
 # refined tests for the var resolver under
-# Tcl namespaces parallelling XOTcl objects 
+# Tcl namespaces parallelling XOTcl objects
 # (! not declared through require namespace !)
 # e.g., "info has namespace" reports 0 rather
 # than 1 as under "require namespace"
@@ -422,14 +422,14 @@
 unset ::tmpArray
 
 ##################################################
-# Testing aliases for eval with and without 
+# Testing aliases for eval with and without
 # -varscope flags and with a
 # required namespace and without
 ##################################################
 nx::test case eval-variants
-::nsf::method::alias ::nx::Object objeval -frame object ::eval 
-::nsf::method::alias ::nx::Object softeval -frame method ::eval 
-::nsf::method::alias ::nx::Object softeval2 ::eval 
+::nsf::method::alias ::nx::Object objeval -frame object ::eval
+::nsf::method::alias ::nx::Object softeval -frame method ::eval
+::nsf::method::alias ::nx::Object softeval2 ::eval
 
 set G 1
 
@@ -486,7 +486,7 @@
 ? {lsort [o info vars]} "a aaa b x"
 o destroy
 
-# now with an object namespace 
+# now with an object namespace
 nx::Object create o
 o require namespace
 
@@ -557,7 +557,7 @@
 ? {lsort [o info vars]} "a aaa b x"
 o destroy
 
-# now with namespace 
+# now with namespace
 nx::Object create o
 o require namespace
 
@@ -591,9 +591,9 @@
 # Test with proc scopes
 ##################################################
 nx::test case proc-scopes
-::nsf::method::alias ::nx::Object objscoped-eval -frame object ::eval 
-::nsf::method::alias ::nx::Object nonleaf-eval -frame method ::eval 
-::nsf::method::alias ::nx::Object plain-eval ::eval 
+::nsf::method::alias ::nx::Object objscoped-eval -frame object ::eval
+::nsf::method::alias ::nx::Object nonleaf-eval -frame method ::eval
+::nsf::method::alias ::nx::Object plain-eval ::eval
 
 proc foo-via-initcmd {} {
   foreach v {x xxx} {unset -nocomplain ::$v}
@@ -609,7 +609,7 @@
 proc foo {type} {
   foreach v {x xxx} {unset -nocomplain ::$v}
   set p 1
-  nx::Object create o 
+  nx::Object create o
   o $type {
     set xxx 1
     set :x 1
@@ -690,7 +690,7 @@
   #puts stderr ===waiting
   vwait :x
   #puts stderr ===waiting-DONE
-  # 
+  #
   # vwait method
   #
   after 10 {o foo}
@@ -731,7 +731,7 @@
 
 
 ##################################################
-# test setting of instance variables for 
+# test setting of instance variables for
 # objects with namespaces in and outside
 # of an eval (one case uses compiler)
 ##################################################
@@ -779,7 +779,7 @@
   ? {o eval {
     set x 1
     expr {[info vars "x"] eq "x"}
-  }} 1 
+  }} 1
 }
 
 #
@@ -812,14 +812,14 @@
 }
 
 nx::test case interactions {
-  
+
   # SS: Adding an exemplary test destilled from the behaviour observed
   # for AOLserver vs. NaviServer when introspecting object variables
   # by means of the colon-resolver interface. It exemplifies the (by now
   # resolved for good) interactions between: (a) the compiling and
   # non-compiling var resolvers and (b) compiled and non-compiled
   # script execution
-  
+
   nx::Object create ::o {
     :public object method bar {} {
       # 1. creates a proc-local, compiled var "type"
@@ -832,14 +832,14 @@
       # CompiledLocalsLookup() receives the var name (i.e., ":type")
       # and finds the proc-local compiled var ":type" (actually a link
       # variable to the actual/real object variable).
-      eval {info exists :type}; 
+      eval {info exists :type};
       # Note! A [info exists :type] would have been optimised on the
       # bytecode fastpath (i.e., existsScalar instruction) and would
       # use the compiled-local link-var ":type" directly (without
       # visiting InterpColonVarResolver()!)
     }
   }
-  
+
   ? {o bar} 0
 
   #
@@ -862,21 +862,21 @@
   # non-prefixed, ordinary variables from the angle of
   # introspection. Also, this constitutes an observable behavioural
   # difference between compiled and non-compiled scripts ...
-  
+
   set script {
     # early probing: reflects the compiled-only, unexecuted state
     set _ [join [list {*}[lsort [info vars :*]] [info locals :*] \
-		     [info exists :u] [::nsf::var::exists [::nsf::current] u] \
-		     [info exists :v] [::nsf::var::exists [::nsf::current] v] \
-		     [info exists :x] [::nsf::var::exists [::nsf::current] x]] "-"]
+                     [info exists :u] [::nsf::var::exists [::nsf::current] u] \
+                     [info exists :v] [::nsf::var::exists [::nsf::current] v] \
+                     [info exists :x] [::nsf::var::exists [::nsf::current] x]] "-"]
     catch {set :u}
     set :v 1
     unset :x
     # late probing: reflects the (ideally) compiled, *executed* state
     append _ | [join [list {*}[lsort [info vars :*]] [info locals :*] \
-			[info exists :u] [::nsf::var::exists [::nsf::current] u] \
-			[info exists :v] [::nsf::var::exists [::nsf::current] v] \
-			[info exists :x] [::nsf::var::exists [::nsf::current] x]] "-"]
+                        [info exists :u] [::nsf::var::exists [::nsf::current] u] \
+                        [info exists :v] [::nsf::var::exists [::nsf::current] v] \
+                        [info exists :x] [::nsf::var::exists [::nsf::current] x]] "-"]
     return $_
   }
 
@@ -892,7 +892,7 @@
   #
   # testing interactions between the compile-time var resolver and ...
   #
-  
+
   # ... [variable]
   #
   # background: the [variable] statement is compiled. During
@@ -910,52 +910,52 @@
   # compiled locals (and an undefined obj var).
 
   # this has some implications ...
-  
+
   namespace eval ::ns1 {
     nx::Object create o {
       :public object method foo {} {
-	set _ [join [list {*}[lsort [info vars :*]] [info locals :*] \
-			 [info exists w] [::nsf::var::exists [::nsf::current] w] \
-			 [info exists :x] [::nsf::var::exists [::nsf::current] x]] "-"]
-	variable w; # -> intention: a variable "w" in the effective namespace (e.g., "::ns1::w")
-	variable :x; # -> intention: a variable ":x" in the effective namespace (e.g., "::ns1:::x"!).
-	append _ | [join [list {*}[lsort [info vars :*]] [info locals :*] \
-			      [info exists w] [::nsf::var::exists [::nsf::current] w] \
-			      [info exists :x] [::nsf::var::exists [::nsf::current] x]] "-"]
-	return $_
-      }    
+        set _ [join [list {*}[lsort [info vars :*]] [info locals :*] \
+                         [info exists w] [::nsf::var::exists [::nsf::current] w] \
+                         [info exists :x] [::nsf::var::exists [::nsf::current] x]] "-"]
+        variable w; # -> intention: a variable "w" in the effective namespace (e.g., "::ns1::w")
+        variable :x; # -> intention: a variable ":x" in the effective namespace (e.g., "::ns1:::x"!).
+        append _ | [join [list {*}[lsort [info vars :*]] [info locals :*] \
+                              [info exists w] [::nsf::var::exists [::nsf::current] w] \
+                              [info exists :x] [::nsf::var::exists [::nsf::current] x]] "-"]
+        return $_
+      }
     }
 
     ? {::ns1::o foo} ":x--0-0-0-0|:x--0-0-0-0"
-    
+
     o eval {
       :public object method faz {} {
-	set _ [join [list {*}[lsort [info vars :*]] [info locals :*] \
-			 [namespace which -variable [namespace current]::w] \
-			 [info exists [namespace current]::w] \
-			 [info exists w] [::nsf::var::exists [::nsf::current] w] \
-			 [namespace which -variable [namespace current]:::x] \
-			 [info exists [namespace current]:::x] \
-			 [info exists :x] [::nsf::var::exists [::nsf::current] x]] "-"]
-	variable w 1; # -> intention: a variable "w" in the effective namespace (e.g., "::ns1::w")
-	variable :x 2; # -> intention: a variable ":x" in the effective namespace (e.g., "::ns1:::x"!).
-	append _ | [join [list {*}[lsort [info vars :*]] [info locals :*] \
-			 [namespace which -variable [namespace current]::w] \
-			 [info exists [namespace current]::w] \
-			 [info exists w] [::nsf::var::exists [::nsf::current] w] \
-			 [namespace which -variable [namespace current]:::x] \
-			      [info exists [namespace current]:::x] [namespace eval  [namespace current] {info exists :x}] \
-			      [namespace eval  [namespace current] {variable :x; info exists :x}] \
-			      [info exists :x] [::nsf::var::exists [::nsf::current] x]] "-"]
+        set _ [join [list {*}[lsort [info vars :*]] [info locals :*] \
+                         [namespace which -variable [namespace current]::w] \
+                         [info exists [namespace current]::w] \
+                         [info exists w] [::nsf::var::exists [::nsf::current] w] \
+                         [namespace which -variable [namespace current]:::x] \
+                         [info exists [namespace current]:::x] \
+                         [info exists :x] [::nsf::var::exists [::nsf::current] x]] "-"]
+        variable w 1; # -> intention: a variable "w" in the effective namespace (e.g., "::ns1::w")
+        variable :x 2; # -> intention: a variable ":x" in the effective namespace (e.g., "::ns1:::x"!).
+        append _ | [join [list {*}[lsort [info vars :*]] [info locals :*] \
+                         [namespace which -variable [namespace current]::w] \
+                         [info exists [namespace current]::w] \
+                         [info exists w] [::nsf::var::exists [::nsf::current] w] \
+                         [namespace which -variable [namespace current]:::x] \
+                              [info exists [namespace current]:::x] [namespace eval  [namespace current] {info exists :x}] \
+                              [namespace eval  [namespace current] {variable :x; info exists :x}] \
+                              [info exists :x] [::nsf::var::exists [::nsf::current] x]] "-"]
 
-	append _ | [join [list [expr {$w eq [namespace eval [namespace current] {variable w; set w}]}] \
-			      [expr {${:x} eq [namespace eval [namespace current] {variable w; set :x}]}]] -]
-	return $_
-      }   
+        append _ | [join [list [expr {$w eq [namespace eval [namespace current] {variable w; set w}]}] \
+                              [expr {${:x} eq [namespace eval [namespace current] {variable w; set :x}]}]] -]
+        return $_
+      }
     }
 
     ? {::ns1::o faz} ":x--::ns1::w-0-0-0--0-0-0|:x--::ns1::w-1-1-0--0-1-1-1-0|1-1"
-    
+
     #
     # ISSUE 2: Colon-prefixed variables become represented by linked
     # variables in the compiled local arrays during
@@ -965,24 +965,24 @@
     # between object variables and [variable] links which (due to
     # executing the compile-time var resolver because of lacking
     # AVOID_RESOLVERS) emits a "replacing" link var
-    # 
+    #
     # In the example below, there won't be an error exception
     # 'variable ":aaa" already exists', because ":aaa" is resolved on
     # the fly to "::ns1::o1.aaa" in a non-compiled execution and in a
     # compiled situation, the compiled-local link variable ":aaa" is
     # simply cleared and recreated to proxy a namespace variable.
-    
+
     o eval {
       set :aaa 1
       :public object method caz {} {
-	set _ "[info exists :aaa]-${:aaa}-[set :aaa]"
-	variable :aaa
-	append _ "-[info exists :aaa]"
-	set :aaa 2
-	append _ "-${:aaa}-[set :aaa]-[namespace eval [namespace current] {variable :aaa; set :aaa}]"
-	unset :aaa
-	append _ "-[info exists :aaa]-[namespace which -variable [namespace current]:::aaa]-[::nsf::var::exists [current] aaa]-[[current] eval {set :aaa}]"
-	return $_
+        set _ "[info exists :aaa]-${:aaa}-[set :aaa]"
+        variable :aaa
+        append _ "-[info exists :aaa]"
+        set :aaa 2
+        append _ "-${:aaa}-[set :aaa]-[namespace eval [namespace current] {variable :aaa; set :aaa}]"
+        unset :aaa
+        append _ "-[info exists :aaa]-[namespace which -variable [namespace current]:::aaa]-[::nsf::var::exists [current] aaa]-[[current] eval {set :aaa}]"
+        return $_
       }
     }
 
@@ -1027,7 +1027,7 @@
     }} "1-1-1-1-2-2-2-0-0--0-1-5"
 
 
-    # ... [upvar] 
+    # ... [upvar]
     #
     # Exhibits the same interactions as [variable] due to creating
     # link variables by the compiling var resolver, namely the context
@@ -1037,50 +1037,50 @@
 
     nx::Object create p {
       :public object method foo {var} {
-	set :x XXX
-	set _ ${:x}
-	upvar $var :x
-	append _ -[join [list ${:x} [set :x] {*}[info vars :*] {*}[:info vars] \
-			     [info exists :x] \
-			     [[current] eval {info exists :x}]] "-"]
-	unset :x 
-	append _ -[join [list {*}[info vars :*] {*}[:info vars] \
-			    [info exists :x] [[current] eval {info exists :x}] \
-			    [[current] eval {set :x}]] "-"]
+        set :x XXX
+        set _ ${:x}
+        upvar $var :x
+        append _ -[join [list ${:x} [set :x] {*}[info vars :*] {*}[:info vars] \
+                             [info exists :x] \
+                             [[current] eval {info exists :x}]] "-"]
+        unset :x
+        append _ -[join [list {*}[info vars :*] {*}[:info vars] \
+                            [info exists :x] [[current] eval {info exists :x}] \
+                            [[current] eval {set :x}]] "-"]
       }
 
       :object method bar {var1 var2 var3 var4 var5 var6} {
-	upvar $var1 xx $var2 :yy $var3 :zz $var4 q $var5 :el1 $var6 :el2
-	set _ [join [list {*}[lsort [:info vars]] {*}[lsort [info vars :*]] \
-			  [info exists xx] $xx \
-			  [info exists :yy] ${:yy} \
-			  [info exists :zz] ${:zz} \
-			  [info exists q] [[current] eval {info exists :q}]] -] 
-	incr :yy
-	incr xx
-	incr :zz
-	incr q
-	incr :el1
-	incr :el2
-	return $_
+        upvar $var1 xx $var2 :yy $var3 :zz $var4 q $var5 :el1 $var6 :el2
+        set _ [join [list {*}[lsort [:info vars]] {*}[lsort [info vars :*]] \
+                          [info exists xx] $xx \
+                          [info exists :yy] ${:yy} \
+                          [info exists :zz] ${:zz} \
+                          [info exists q] [[current] eval {info exists :q}]] -]
+        incr :yy
+        incr xx
+        incr :zz
+        incr q
+        incr :el1
+        incr :el2
+        return $_
       }
 
       :public object method baz {} {
-	set :x 10
-	set y 20
-	set :z 30
-	unset -nocomplain :q
-	set :arr(a) 40
-	set _ [:bar :x y :z :q :arr(a) :arr(b)]
-	append _ -[join [list ${:x} $y ${:z} ${:q} [set :arr(a)] [set :arr(b)] [:info vars q]] -]
+        set :x 10
+        set y 20
+        set :z 30
+        unset -nocomplain :q
+        set :arr(a) 40
+        set _ [:bar :x y :z :q :arr(a) :arr(b)]
+        append _ -[join [list ${:x} $y ${:z} ${:q} [set :arr(a)] [set :arr(b)] [:info vars q]] -]
       }
     }
 
-    ? {set y 1; p foo y} "XXX-1-1-:x-x-1-1-:x-x-0-1-XXX" 
-    ? {p baz} "arr-x-z-:el1-:el2-:yy-:zz-1-10-1-20-1-30-0-0-11-21-31-1-41-1-q" 
+    ? {set y 1; p foo y} "XXX-1-1-:x-x-1-1-:x-x-0-1-XXX"
+    ? {p baz} "arr-x-z-:el1-:el2-:yy-:zz-1-10-1-20-1-30-0-0-11-21-31-1-41-1-q"
 
     #
-    # ... [namespace which] 
+    # ... [namespace which]
     #
     # Similar to the compiled, slow-path [variable] instructions,
     # [namespace which] as implemented by NamespaceWhichCmd() in
@@ -1091,19 +1091,19 @@
     # this would defeat its purpose. Anywyays, our resolver is
     # therefore completely blind when handling calls from [namespace
     # which].
-    # 
+    #
     # This leads to the unexpected behaviour in the test below:
     # [namespace which -variable :XXX] != [namespace which -variable
     # [namespace current]:::XXX]
-    
+
     o eval {
       :public object method bar {} {
-	set :XXX 1
-	return [join [list ${:XXX} [set :XXX] [namespace which -variable :XXX] \
-			  [namespace which -variable [namespace current]:::XXX]] -]
+        set :XXX 1
+        return [join [list ${:XXX} [set :XXX] [namespace which -variable :XXX] \
+                          [namespace which -variable [namespace current]:::XXX]] -]
       }
     }
-    
+
     ? {::ns1::o bar} "1-1-:XXX-"
   }
 }
@@ -1130,7 +1130,7 @@
 
     FormPage mixins add WorkflowPage
     FormPage create p1 -package_id 123
-    
+
     ? {p1 initialize_loaded_object} 123
   }
 }
@@ -1147,7 +1147,7 @@
 }
 
 #
-# Test variable resolver in respect to uplevel and apply 
+# Test variable resolver in respect to uplevel and apply
 # (lambda frames)
 #
 
@@ -1232,6 +1232,53 @@
   ? {o3 foo-a-r-u} "o3.a"
 }
 
+
+nx::test case compiled_colon_lookup {
+
+    nx::Object create p {
+
+        :object method bar {var3 var4 var5 var6} {
+            upvar $var3 :zz $var4 q $var5 :el1
+            return ${:zz}
+        }
+
+        :public object method baz {} {
+            set :z 30
+            unset -nocomplain :q
+            set :arr(a) 40
+            return [:bar :z :q :arr(a) :arr(b)]
+        }
+    }
+    #
+    # the upvar construct causes a "slow" access path via the colon
+    # var resolver. The first call will cause the creation of the
+    # sorted lookup cache.
+    #
+    ? {p baz} 30
+    #
+    # later calls use this cache
+    #
+    ? {p baz} 30
+
+    #
+    # Now redefine the method containing the compiled locals with
+    # an additional variable on the first position. In case the cache
+    # would not be refreshed appropriately, the index would point to a
+    # different variable and we would see wrong results here.
+    #
+    #puts stderr "=====redefine with an additional variable on the first position"
+    p public object method baz {} {
+        set :a 123
+        set :z 30
+        unset -nocomplain :q
+        set :arr(a) 40
+        return [:bar :z :q :arr(a) :arr(b)]
+    }
+    ? {p baz} 30
+    ? {p baz} 30
+
+}
+
 #
 # Local variables:
 #    mode: tcl