Index: generic/xotcl.c =================================================================== diff -u -rd46e7113b9f5ce270538786bda1eb5d9eee2618d -r75bdefce85cff349831dbca1900153fca956574c --- generic/xotcl.c (.../xotcl.c) (revision d46e7113b9f5ce270538786bda1eb5d9eee2618d) +++ generic/xotcl.c (.../xotcl.c) (revision 75bdefce85cff349831dbca1900153fca956574c) @@ -11533,13 +11533,12 @@ xotclCmd is XOTclIsCmd { {-argName "value" -required 1 -type tclobj} {-argName "constraint" -required 1 -type tclobj} - {-argName "-hasmixin" -required 0 -nrargs 1 -type tclobj} {-argName "-type" -required 0 -nrargs 1 -type tclobj} {-argName "arg" -required 0 -type tclobj} } */ static int XOTclIsCmd(Tcl_Interp *interp, Tcl_Obj *valueObj, Tcl_Obj *constraintObj, - Tcl_Obj *withHasmixin, Tcl_Obj *withType, Tcl_Obj *arg) { + Tcl_Obj *withType, Tcl_Obj *arg) { int result = TCL_OK, success; CONST char *constraintString = ObjStr(constraintObj); XOTclObject *object; @@ -11553,9 +11552,9 @@ Tcl_SetIntObj(Tcl_GetObjResult(interp), success); - } else if (withHasmixin || withType) { + } else if (withType) { if ((!isObjectString(constraintString) && !isClassString(constraintString)) || arg != NULL) { - return XOTclObjErrArgCnt(interp, NULL, NULL, "object|class ?-hasmixin cl? ?-type cl?"); + return XOTclObjErrArgCnt(interp, NULL, NULL, "object|class ?-type cl?"); } if (*constraintString == 'o') { success = (GetObjectFromObj(interp, valueObj, &object) == TCL_OK); @@ -11566,10 +11565,6 @@ success = (GetClassFromObj(interp, withType, &typeClass, NULL) == TCL_OK) && isSubType(object->cl, typeClass); } - if (success && withHasmixin) { - success = (GetClassFromObj(interp, withHasmixin, &mixinClass, NULL) == TCL_OK) - && HasMixin(interp, object, mixinClass); - } Tcl_SetIntObj(Tcl_GetObjResult(interp), success); } else if (arg != NULL) { @@ -12090,7 +12085,7 @@ /* xotclCmd objectproperty XOTclObjectpropertyCmd { {-argName "object" -required 1 -type tclobj} - {-argName "objectkind" -type "type|object|class|baseclass|metaclass|hasmixin"} + {-argName "objectkind" -type "type|object|class|baseclass|metaclass"} {-argName "value" -required 0 -type tclobj} } */ @@ -12136,16 +12131,7 @@ && XOTclObjectIsClass(object) && IsBaseClass((XOTclClass*)object); break; - - case ObjectkindHasmixinIdx: - if (valueObj == NULL) return XOTclObjErrArgCnt(interp, NULL, NULL, " hasmixin "); - success = (GetObjectFromObj(interp, obj, &object) == TCL_OK) - && (GetClassFromObj(interp, valueObj, &cl, NULL) == TCL_OK) - && HasMixin(interp, object, cl); - break; } - - Tcl_SetIntObj(Tcl_GetObjResult(interp), success); return TCL_OK; }