diff options
Diffstat (limited to 'generic/tclVar.c')
| -rw-r--r-- | generic/tclVar.c | 79 |
1 files changed, 1 insertions, 78 deletions
diff --git a/generic/tclVar.c b/generic/tclVar.c index 3c1b01f..be035f7 100644 --- a/generic/tclVar.c +++ b/generic/tclVar.c @@ -206,9 +206,6 @@ static Tcl_UpdateStringProc PanicOnUpdateVarName; static Tcl_FreeInternalRepProc FreeParsedVarName; static Tcl_DupInternalRepProc DupParsedVarName; -#if 0 -static Tcl_UpdateStringProc UpdateParsedVarName; -#endif static Tcl_UpdateStringProc PanicOnUpdateVarName; static Tcl_SetFromAnyProc PanicOnSetVarName; @@ -239,13 +236,7 @@ static const Tcl_ObjType localVarNameType = { static const Tcl_ObjType tclParsedVarNameType = { "parsedVarName", - FreeParsedVarName, DupParsedVarName, -#if 0 -UpdateParsedVarName, -#else -PanicOnUpdateVarName, -#endif - PanicOnSetVarName + FreeParsedVarName, DupParsedVarName, PanicOnUpdateVarName, PanicOnSetVarName }; /* @@ -544,9 +535,6 @@ TclObjLookupVarEx( const char *errMsg = NULL; CallFrame *varFramePtr = iPtr->varFramePtr; const char *part2 = part2Ptr? TclGetString(part2Ptr):NULL; -#if 0 - char *newPart2 = NULL; -#endif *arrayPtrPtr = NULL; if (typePtr == &localVarNameType) { @@ -593,13 +581,7 @@ TclObjLookupVarEx( } return NULL; } -#if 0 - part2 = newPart2 = part1Ptr->internalRep.twoPtrValue.ptr2; - if (newPart2) { - part2Ptr = Tcl_NewStringObj(newPart2, -1); -#else if ((part2Ptr = part1Ptr->internalRep.twoPtrValue.ptr2)) { -#endif if (createPart2) { Tcl_IncrRefCount(part2Ptr); } @@ -643,15 +625,7 @@ TclObjLookupVarEx( len2 = len1 - i - 2; len1 = i; -#if 0 - newPart2 = ckalloc(len2 + 1); - memcpy(newPart2, part2, (unsigned) len2); - *(newPart2+len2) = '\0'; - part2 = newPart2; - part2Ptr = Tcl_NewStringObj(newPart2, -1); -#else part2Ptr = Tcl_NewStringObj(part2, len2); -#endif if (createPart2) { Tcl_IncrRefCount(part2Ptr); } @@ -676,12 +650,8 @@ TclObjLookupVarEx( Tcl_IncrRefCount(part1Ptr); objPtr->internalRep.twoPtrValue.ptr1 = part1Ptr; -#if 0 - objPtr->internalRep.twoPtrValue.ptr2 = (void *) part2; -#else Tcl_IncrRefCount(part2Ptr); objPtr->internalRep.twoPtrValue.ptr2 = part2Ptr; -#endif typePtr = part1Ptr->typePtr; part1 = TclGetString(part1Ptr); @@ -706,11 +676,6 @@ TclObjLookupVarEx( Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "VARNAME", TclGetString(part1Ptr), NULL); } -#if 0 - if (newPart2) { - Tcl_DecrRefCount(part2Ptr); - } -#endif return NULL; } @@ -759,11 +724,6 @@ TclObjLookupVarEx( *arrayPtrPtr = varPtr; varPtr = TclLookupArrayElement(interp, part1Ptr, part2Ptr, flags, msg, createPart1, createPart2, varPtr, -1); -#if 0 - if (newPart2) { - Tcl_DecrRefCount(part2Ptr); - } -#endif } return varPtr; } @@ -5645,43 +5605,6 @@ DupParsedVarName( dupPtr->internalRep.twoPtrValue.ptr2 = elem; dupPtr->typePtr = &tclParsedVarNameType; } - -#if 0 -static void -UpdateParsedVarName( - Tcl_Obj *objPtr) -{ - Tcl_Obj *arrayPtr = objPtr->internalRep.twoPtrValue.ptr1; - char *part2 = objPtr->internalRep.twoPtrValue.ptr2; - const char *part1; - char *p; - int len1, len2, totalLen; - - if (arrayPtr == NULL) { - /* - * This is a parsed scalar name: what is it doing here? - */ - - Tcl_Panic("scalar parsedVarName without a string rep"); - } - - part1 = TclGetStringFromObj(arrayPtr, &len1); - len2 = strlen(part2); - - totalLen = len1 + len2 + 2; - p = ckalloc(totalLen + 1); - objPtr->bytes = p; - objPtr->length = totalLen; - - memcpy(p, part1, (unsigned) len1); - p += len1; - *p++ = '('; - memcpy(p, part2, (unsigned) len2); - p += len2; - *p++ = ')'; - *p = '\0'; -} -#endif /* *---------------------------------------------------------------------- |