Differences From Artifact [e47b0cae8b]:

• File generic/tclLoad.c — part of check-in [34daa2003f] at 2012-11-19 08:30:11 on branch novem — Better solution for handling errors from Tcl 8.x compiled extensions. Works for existing ones. (user: jan.nijtmans size: 33418)

To Artifact [3e8cc6fec1]:

• File generic/tclLoad.c — part of check-in [c7d7ddfbe3] at 2012-11-20 09:01:46 on branch novem — It might be that iPtr->result points to an empty string but that iPtr->objResult contains the real error-message. So, handle that too. (user: jan.nijtmans size: 33445) [more...]

466
467
468
469
470
471
472
473
474
475
476
477
478
479
480

    /*
     * Test for whether the initialization failed. If so, transfer the error
     * from the target interpreter to the originating one.
     */

    if (code != TCL_OK) {
	Interp *iPtr = (Interp *) target;
	if (iPtr->result != NULL) {
	    /* We have an Tcl 8.x extension with incompatible stub table. */
	    Tcl_Obj *obj = Tcl_NewStringObj(iPtr->result, -1);
	    Tcl_SetObjResult(interp, obj);
	} else {
	    Tcl_TransferResult(target, code, interp);
	}
	goto done;

|

466
467
468
469
470
471
472
473
474
475
476
477
478
479
480

    /*
     * Test for whether the initialization failed. If so, transfer the error
     * from the target interpreter to the originating one.
     */

    if (code != TCL_OK) {
	Interp *iPtr = (Interp *) target;
	if (iPtr->result != NULL && iPtr->result[0] != '\0') {
	    /* We have an Tcl 8.x extension with incompatible stub table. */
	    Tcl_Obj *obj = Tcl_NewStringObj(iPtr->result, -1);
	    Tcl_SetObjResult(interp, obj);
	} else {
	    Tcl_TransferResult(target, code, interp);
	}
	goto done;