@@ -1205,34 +1205,31 @@ RenderDeclarerName(
1205
1205
1206
1206
#define LIMIT 60
1207
1207
#define ELLIPSIFY (str ,len ) \
1208
- ((len) > LIMIT ? LIMIT : (int)(len)), (str), ((len) > LIMIT ? "..." : "")
1208
+ ((len) > LIMIT ? LIMIT : (int)(len)), (str), ((len) > LIMIT ? "..." : "")
1209
1209
1210
1210
static void
1211
1211
CommonMethErrorHandler (
1212
1212
Tcl_Interp * interp ,
1213
1213
const char * special )
1214
-
1215
1214
{
1216
1215
Tcl_Size objectNameLen ;
1217
- CallContext * contextPtr = (CallContext * )((Interp * ) interp )-> varFramePtr -> clientData ;
1216
+ CallContext * contextPtr = (CallContext * )((Interp * )
1217
+ interp )-> varFramePtr -> clientData ;
1218
1218
Method * mPtr = contextPtr -> callPtr -> chain [contextPtr -> index ].mPtr ;
1219
1219
const char * objectName , * kindName = "instance" ;
1220
1220
Object * declarerPtr = NULL ;
1221
1221
1222
1222
if (mPtr -> declaringObjectPtr != NULL ) {
1223
1223
declarerPtr = mPtr -> declaringObjectPtr ;
1224
1224
kindName = "object" ;
1225
-
1226
1225
} else if (mPtr -> declaringClassPtr != NULL ) {
1227
-
1228
-
1229
1226
declarerPtr = mPtr -> declaringClassPtr -> thisPtr ;
1230
1227
kindName = "class" ;
1231
1228
}
1232
1229
1233
1230
if (declarerPtr ) {
1234
1231
objectName = TclGetStringFromObj (TclOOObjectName (interp , declarerPtr ),
1235
- & objectNameLen );
1232
+ & objectNameLen );
1236
1233
} else {
1237
1234
objectName = "unknown or deleted" ;
1238
1235
objectNameLen = 18 ;
@@ -1241,85 +1238,44 @@ CommonMethErrorHandler(
1241
1238
Tcl_Size nameLen ;
1242
1239
const char * methodName = TclGetStringFromObj (mPtr -> namePtr , & nameLen );
1243
1240
Tcl_AppendObjToErrorInfo (interp , Tcl_ObjPrintf (
1244
- "\n (%s \"%.*s%s\" method \"%.*s%s\" line %d)" ,
1245
- kindName , ELLIPSIFY (objectName , objectNameLen ),
1246
- ELLIPSIFY (methodName , nameLen ), Tcl_GetErrorLine (interp )));
1241
+ "\n (%s \"%.*s%s\" method \"%.*s%s\" line %d)" ,
1242
+ kindName , ELLIPSIFY (objectName , objectNameLen ),
1243
+ ELLIPSIFY (methodName , nameLen ), Tcl_GetErrorLine (interp )));
1247
1244
} else {
1248
1245
Tcl_AppendObjToErrorInfo (interp , Tcl_ObjPrintf (
1249
- "\n (%s \"%.*s%s\" %s line %d)" , kindName ,
1250
- ELLIPSIFY (objectName , objectNameLen ), special , Tcl_GetErrorLine (interp )));
1246
+ "\n (%s \"%.*s%s\" %s line %d)" ,
1247
+ kindName , ELLIPSIFY (objectName , objectNameLen ), special ,
1248
+ Tcl_GetErrorLine (interp )));
1251
1249
}
1252
1250
}
1253
1251
1254
1252
static void
1255
1253
MethodErrorHandler (
1256
1254
Tcl_Interp * interp ,
1257
1255
TCL_UNUSED (Tcl_Obj * ) /*methodNameObj*/ )
1258
- /* We pull the method name out of context instead of from argument */
1259
1256
{
1257
+ /* We pull the method name out of context instead of from argument. */
1260
1258
CommonMethErrorHandler (interp , NULL );
1261
1259
}
1262
1260
1263
1261
static void
1264
1262
ConstructorErrorHandler (
1265
1263
Tcl_Interp * interp ,
1266
1264
TCL_UNUSED (Tcl_Obj * ) /*methodNameObj*/ )
1267
- /* Ignore. We know it is the constructor. */
1268
1265
{
1269
-
1270
-
1271
-
1272
-
1273
-
1266
+ /* We know this is for the constructor. */
1274
1267
CommonMethErrorHandler (interp , "constructor" );
1275
-
1276
-
1277
-
1278
-
1279
-
1280
-
1281
1268
}
1282
1269
1283
-
1284
-
1285
-
1286
-
1287
-
1288
-
1289
-
1290
-
1291
-
1292
-
1293
1270
static void
1294
1271
DestructorErrorHandler (
1295
1272
Tcl_Interp * interp ,
1296
1273
TCL_UNUSED (Tcl_Obj * ) /*methodNameObj*/ )
1297
- /* Ignore. We know it is the destructor. */
1298
1274
{
1299
-
1300
-
1301
-
1302
-
1303
-
1275
+ /* We know this is for the destructor. */
1304
1276
CommonMethErrorHandler (interp , "destructor" );
1305
-
1306
-
1307
-
1308
-
1309
-
1310
-
1311
-
1312
-
1313
-
1314
-
1315
-
1316
-
1317
-
1318
-
1319
-
1320
-
1321
1277
}
1322
-
1278
+
1323
1279
/*
1324
1280
* ----------------------------------------------------------------------
1325
1281
*
0 commit comments