Tcl Source Code

Check-in [9ac9ca33b6]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:* generic/tclExecute.c (TclCompEvalObj): earlier return if Tip280 gymnastics not needed
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | core-8-5-branch
Files: files | file ages | folders
SHA1: 9ac9ca33b6a314707d7219ef9d50cfc0b2993c5c
User & Date: mig 2011-04-07 02:53:55
Context
2011-04-07
15:26
restore exec perms on unix/ldAix, accidentally cleared check-in: ef9aacc2da user: mig tags: core-8-5-branch
02:56
* generic/tclExecute.c (TclCompileObj): earlier return if Tip280 gymnastics not needed. check-in: 63b453f584 user: mig tags: trunk
02:53
* generic/tclExecute.c (TclCompEvalObj): earlier return if Tip280 gymnastics not needed check-in: 9ac9ca33b6 user: mig tags: core-8-5-branch
2011-04-05
20:05
Import Olson's tzdata2011e. check-in: d9f4537543 user: venkat tags: core-8-5-branch
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ChangeLog.






1
2
3
4
5
6
7





2011-04-05  Venkat Iyer <[email protected]>

	* library/tzdata/Africa/Casablanca: Update to Olson's tzdata2011e
	* library/tzdata/America/Santiago:
	* library/tzdata/Pacific/Easter:
	* library/tzdata/America/Metlakatla: (new)
	* library/tzdata/America/North_Dakota/Beulah: (new)
>
>
>
>
>







1
2
3
4
5
6
7
8
9
10
11
12
2011-04-06  Miguel Sofer  <[email protected]>

	* generic/tclExecute.c (TclCompEvalObj): earlier return if Tip280 
	gymnastics not needed.

2011-04-05  Venkat Iyer <[email protected]>

	* library/tzdata/Africa/Casablanca: Update to Olson's tzdata2011e
	* library/tzdata/America/Santiago:
	* library/tzdata/Pacific/Easter:
	* library/tzdata/America/Metlakatla: (new)
	* library/tzdata/America/North_Dakota/Beulah: (new)

Changes to generic/tclExecute.c.

1469
1470
1471
1472
1473
1474
1475
1476

1477
1478
1479
1480
1481
1482
1483
1484
1485

1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
	 *     offset between saved starting line and actual one. Then modify
	 *     the users to adjust the locations they have by this offset.
	 *
	 * (3) Alternative 2: Do not fully recompile, adjust just the location
	 *     information.
	 */

	{

	    Tcl_HashEntry *hePtr =
		    Tcl_FindHashEntry(iPtr->lineBCPtr, (char *) codePtr);

	    if (hePtr) {
		ExtCmdLoc *eclPtr = Tcl_GetHashValue(hePtr);
		int redo = 0;

		if (invoker) {
		    CmdFrame *ctxPtr = TclStackAlloc(interp,sizeof(CmdFrame));

		    *ctxPtr = *invoker;

		    if (invoker->type == TCL_LOCATION_BC) {
			/*
			 * Note: Type BC => ctx.data.eval.path    is not used.
			 *		    ctx.data.tebc.codePtr used instead
			 */

			TclGetSrcInfoForPc(ctxPtr);
			if (ctxPtr->type == TCL_LOCATION_SOURCE) {
			    /*
			     * The reference made by 'TclGetSrcInfoForPc' is
			     * dead.
			     */

			    Tcl_DecrRefCount(ctxPtr->data.eval.path);
			    ctxPtr->data.eval.path = NULL;
			}
		    }

		    if (word < ctxPtr->nline) {
			/*
			 * Note: We do not care if the line[word] is -1. This
			 * is a difference and requires a recompile (location
			 * changed from absolute to relative, literal is used
			 * fixed and through variable)
			 *
			 * Example:
			 * test info-32.0 using literal of info-24.8
			 *     (dict with ... vs           set body ...).
			 */

			redo = ((eclPtr->type == TCL_LOCATION_SOURCE)
				    && (eclPtr->start != ctxPtr->line[word]))
				|| ((eclPtr->type == TCL_LOCATION_BC)
				    && (ctxPtr->type == TCL_LOCATION_SOURCE));
		    }

		    TclStackFree(interp, ctxPtr);
		}

		if (redo) {
		    goto recompileObj;
		}
	    }
	}

	/*







<
>






<
<
|
>
|

|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<







1469
1470
1471
1472
1473
1474
1475

1476
1477
1478
1479
1480
1481
1482


1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524

1525
1526
1527
1528
1529
1530
1531
	 *     offset between saved starting line and actual one. Then modify
	 *     the users to adjust the locations they have by this offset.
	 *
	 * (3) Alternative 2: Do not fully recompile, adjust just the location
	 *     information.
	 */


	if (invoker) {
	    Tcl_HashEntry *hePtr =
		    Tcl_FindHashEntry(iPtr->lineBCPtr, (char *) codePtr);

	    if (hePtr) {
		ExtCmdLoc *eclPtr = Tcl_GetHashValue(hePtr);
		int redo = 0;


		CmdFrame *ctxPtr = TclStackAlloc(interp,sizeof(CmdFrame));

		*ctxPtr = *invoker;

		if (invoker->type == TCL_LOCATION_BC) {
		    /*
		     * Note: Type BC => ctx.data.eval.path    is not used.
		     *		    ctx.data.tebc.codePtr used instead
		     */
		    
		    TclGetSrcInfoForPc(ctxPtr);
		    if (ctxPtr->type == TCL_LOCATION_SOURCE) {
			/*
			 * The reference made by 'TclGetSrcInfoForPc' is
			 * dead.
			 */
			
			Tcl_DecrRefCount(ctxPtr->data.eval.path);
			ctxPtr->data.eval.path = NULL;
		    }
		}
		
		if (word < ctxPtr->nline) {
		    /*
		     * Note: We do not care if the line[word] is -1. This
		     * is a difference and requires a recompile (location
		     * changed from absolute to relative, literal is used
		     * fixed and through variable)
		     *
		     * Example:
		     * test info-32.0 using literal of info-24.8
		     *     (dict with ... vs           set body ...).
		     */
		    
		    redo = ((eclPtr->type == TCL_LOCATION_SOURCE)
			    && (eclPtr->start != ctxPtr->line[word]))
			|| ((eclPtr->type == TCL_LOCATION_BC)
				&& (ctxPtr->type == TCL_LOCATION_SOURCE));
		}
		
		TclStackFree(interp, ctxPtr);
	    

		if (redo) {
		    goto recompileObj;
		}
	    }
	}

	/*

unix/ldAix became a regular file.