Tcl Source Code: Diff

Differences From Artifact [9b54054935]:

File generic/tclOOInfo.c — part of check-in [ba65f6c8c4] at 2024-04-11 08:55:01 on branch main — Use Tcl_NewBooleanObj for booleans; we should say what we mean (user: dkf size: 46731) [more...]

To Artifact [e6cad38efc]:

File generic/tclOOInfo.c — part of check-in [93e55377dc] at 2024-04-11 14:09:52 on branch main — Merge 8.7 (user: jan.nijtmans size: 46731) [more...]

︙
154 155 156 157 158 159 160 ~~161~~ 162 163 164 165 166 167 168	154 155 156 157 158 159 160 161 162 163 164 165 166 167 168	- +	if (oPtr == NULL) { return NULL; } if (oPtr->classPtr == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "\"%s\" is not a class", TclGetString(objPtr))); Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "CLASS", ~~TclGetString(objPtr), (~~void~~ )NULL);~~ TclGetString(objPtr), (char )NULL); return NULL; } return oPtr->classPtr; } /* * ----------------------------------------------------------------------
︙
259 260 261 262 263 264 265 ~~266~~ 267 268 269 270 271 272 273 ~~274~~ 275 276 277 278 279 280 281	259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281	- + - +	} hPtr = Tcl_FindHashEntry(oPtr->methodsPtr, objv[2]); if (hPtr == NULL) { unknownMethod: Tcl_SetObjResult(interp, Tcl_ObjPrintf( "unknown method \"%s\"", TclGetString(objv[2]))); Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD", ~~TclGetString(objv[2]), (~~void~~ )NULL);~~ TclGetString(objv[2]), (char )NULL); return TCL_ERROR; } procPtr = TclOOGetProcFromMethod((Method )Tcl_GetHashValue(hPtr)); if (procPtr == NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "definition not available for this kind of method", -1)); Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD", ~~TclGetString(objv[2]), (~~void~~ )NULL);~~ TclGetString(objv[2]), (char *)NULL); return TCL_ERROR; } TclNewObj(resultObjs[0]); for (localPtr=procPtr->firstLocalPtr; localPtr!=NULL; localPtr=localPtr->nextPtr) { if (TclIsVarArgument(localPtr)) {
︙
370 371 372 373 374 375 376 ~~377~~ 378 379 380 381 382 383 384 385 ~~386~~ 387 388 389 390 391 392 393	370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393	- + - +	} hPtr = Tcl_FindHashEntry(oPtr->methodsPtr, objv[2]); if (hPtr == NULL) { unknownMethod: Tcl_SetObjResult(interp, Tcl_ObjPrintf( "unknown method \"%s\"", TclGetString(objv[2]))); Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD", ~~TclGetString(objv[2]), (~~void~~ )NULL);~~ TclGetString(objv[2]), (char )NULL); return TCL_ERROR; } prefixObj = TclOOGetFwdFromMethod((Method )Tcl_GetHashValue(hPtr)); if (prefixObj == NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "prefix argument list not available for this kind of method", -1)); Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD", ~~TclGetString(objv[2]), (~~void~~ )NULL);~~ TclGetString(objv[2]), (char *)NULL); return TCL_ERROR; } Tcl_SetObjResult(interp, prefixObj); return TCL_OK; }
︙
574 575 576 577 578 579 580 ~~581~~ 582 583 584 585 586 587 588	574 575 576 577 578 579 580 581 582 583 584 585 586 587 588	- +	flag = 0; break; case OPT_SCOPE: if (++i >= objc) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "missing option for -scope")); Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", ~~(~~void~~ )NULL);~~ (char )NULL); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[i], scopes, "scope", 0, &scope) != TCL_OK) { return TCL_ERROR; } break;
︙
667 668 669 670 671 672 673 ~~674~~ 675 676 677 678 679 680 681	667 668 669 670 671 672 673 674 675 676 677 678 679 680 681	- +	} hPtr = Tcl_FindHashEntry(oPtr->methodsPtr, objv[2]); if (hPtr == NULL) { unknownMethod: Tcl_SetObjResult(interp, Tcl_ObjPrintf( "unknown method \"%s\"", TclGetString(objv[2]))); Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD", ~~TclGetString(objv[2]), (~~void~~ )NULL);~~ TclGetString(objv[2]), (char )NULL); return TCL_ERROR; } mPtr = (Method )Tcl_GetHashValue(hPtr); if (mPtr->typePtr == NULL) { / * Special entry for visibility control: pretend the method doesnt * exist.
︙
945 946 947 948 949 950 951 ~~952~~ 953 954 955 956 957 958 959	945 946 947 948 949 950 951 952 953 954 955 956 957 958 959	- +	if (clsPtr->constructorPtr == NULL) { return TCL_OK; } procPtr = TclOOGetProcFromMethod(clsPtr->constructorPtr); if (procPtr == NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "definition not available for this kind of method", -1)); ~~Tcl_SetErrorCode(interp, "TCL", "OO", "METHOD_TYPE", (~~void~~ )NULL);~~ Tcl_SetErrorCode(interp, "TCL", "OO", "METHOD_TYPE", (char )NULL); return TCL_ERROR; } TclNewObj(resultObjs[0]); for (localPtr=procPtr->firstLocalPtr; localPtr!=NULL; localPtr=localPtr->nextPtr) { if (TclIsVarArgument(localPtr)) {
︙
1005 1006 1007 1008 1009 1010 1011 ~~1012~~ 1013 1014 1015 1016 1017 1018 1019 ~~1020~~ 1021 1022 1023 1024 1025 1026 1027	1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027	- + - +	return TCL_ERROR; } hPtr = Tcl_FindHashEntry(&clsPtr->classMethods, objv[2]); if (hPtr == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "unknown method \"%s\"", TclGetString(objv[2]))); Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD", ~~TclGetString(objv[2]), (~~void~~ )NULL);~~ TclGetString(objv[2]), (char )NULL); return TCL_ERROR; } procPtr = TclOOGetProcFromMethod((Method )Tcl_GetHashValue(hPtr)); if (procPtr == NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "definition not available for this kind of method", -1)); Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD", ~~TclGetString(objv[2]), (~~void~~ )NULL);~~ TclGetString(objv[2]), (char *)NULL); return TCL_ERROR; } TclNewObj(resultObjs[0]); for (localPtr=procPtr->firstLocalPtr; localPtr!=NULL; localPtr=localPtr->nextPtr) { if (TclIsVarArgument(localPtr)) {
︙
1123 1124 1125 1126 1127 1128 1129 ~~1130~~ 1131 1132 1133 1134 1135 1136 1137	1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137	- +	if (clsPtr->destructorPtr == NULL) { return TCL_OK; } procPtr = TclOOGetProcFromMethod(clsPtr->destructorPtr); if (procPtr == NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "definition not available for this kind of method", -1)); ~~Tcl_SetErrorCode(interp, "TCL", "OO", "METHOD_TYPE", (~~void~~ )NULL);~~ Tcl_SetErrorCode(interp, "TCL", "OO", "METHOD_TYPE", (char )NULL); return TCL_ERROR; } Tcl_SetObjResult(interp, TclOOGetMethodBody(clsPtr->destructorPtr)); return TCL_OK; }
︙
1203 1204 1205 1206 1207 1208 1209 ~~1210~~ 1211 1212 1213 1214 1215 1216 1217 1218 ~~1219~~ 1220 1221 1222 1223 1224 1225 1226	1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226	- + - +	return TCL_ERROR; } hPtr = Tcl_FindHashEntry(&clsPtr->classMethods, objv[2]); if (hPtr == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "unknown method \"%s\"", TclGetString(objv[2]))); Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD", ~~TclGetString(objv[2]), (~~void~~ )NULL);~~ TclGetString(objv[2]), (char )NULL); return TCL_ERROR; } prefixObj = TclOOGetFwdFromMethod((Method )Tcl_GetHashValue(hPtr)); if (prefixObj == NULL) { Tcl_SetObjResult(interp, Tcl_NewStringObj( "prefix argument list not available for this kind of method", -1)); Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD", ~~TclGetString(objv[2]), (~~void~~ )NULL);~~ TclGetString(objv[2]), (char *)NULL); return TCL_ERROR; } Tcl_SetObjResult(interp, prefixObj); return TCL_OK; }
︙
1333 1334 1335 1336 1337 1338 1339 ~~1340~~ 1341 1342 1343 1344 1345 1346 1347	1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347	- +	flag = 0; break; case OPT_SCOPE: if (++i >= objc) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( "missing option for -scope")); Tcl_SetErrorCode(interp, "TCL", "ARGUMENT", "MISSING", ~~(~~void~~ )NULL);~~ (char )NULL); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[i], scopes, "scope", 0, &scope) != TCL_OK) { return TCL_ERROR; } break;
︙
1420 1421 1422 1423 1424 1425 1426 ~~1427~~ 1428 1429 1430 1431 1432 1433 1434	1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434	- +	hPtr = Tcl_FindHashEntry(&clsPtr->classMethods, objv[2]); if (hPtr == NULL) { unknownMethod: Tcl_SetObjResult(interp, Tcl_ObjPrintf( "unknown method \"%s\"", TclGetString(objv[2]))); Tcl_SetErrorCode(interp, "TCL", "LOOKUP", "METHOD", ~~TclGetString(objv[2]), (~~void~~ )NULL);~~ TclGetString(objv[2]), (char )NULL); return TCL_ERROR; } mPtr = (Method )Tcl_GetHashValue(hPtr); if (mPtr->typePtr == NULL) { / * Special entry for visibility control: pretend the method doesnt * exist.
︙