amend after cherry-pick from core-tcl (dataPtr vs. clientData); regenerate tclDate.c by yacc (bison)

Author: sebres

generic/tclClock.c

@@ -4261,12 +4261,13 @@ ClockCalcRelTime(
 
     /* If relative time is there, adjust it in UTC as mentioned above. */
     if (yyRelSeconds) {
+	ClockClientData *dataPtr = opts->clientData;
 	/*
 	 * If timezone is not GMT/UTC (due to DST-hole, local time offset),
 	 * we shall do in-between conversion to UTC to append seconds there
 	 * and hereafter convert back to TZ, otherwise apply it direct here.
 	 */
-	if (opts->timezoneObj != opts->dataPtr->literals[LIT_GMT]) {
+	if (opts->timezoneObj != dataPtr->literals[LIT_GMT]) {
 	    /* 
 	     * Convert date info structure into UTC seconds and add relative
 	     * seconds (happens in commit).
@@ -4276,7 +4277,7 @@ ClockCalcRelTime(
 	    }
 	    yyRelSeconds = 0;
 	    /* Convert it back */
-	    if (ClockGetDateFields(opts->dataPtr, opts->interp, &yydate,
+	    if (ClockGetDateFields(dataPtr, opts->interp, &yydate,
 		  opts->timezoneObj, GREGORIAN_CHANGE_DATE) != TCL_OK) {
 		/* TODO - GREGORIAN_CHANGE_DATE should be locale-dependent */
 		return TCL_ERROR;

generic/tclDate.c

@@ -716,14 +716,14 @@ static const yytype_int8 yytranslate[] =
 /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline[] =
 {
-       0,   171,   171,   172,   176,   179,   182,   185,   188,   191,
-     194,   197,   201,   204,   209,   215,   221,   226,   230,   234,
-     238,   242,   246,   252,   253,   256,   260,   264,   268,   272,
-     276,   282,   288,   292,   297,   298,   303,   307,   312,   316,
-     321,   328,   332,   338,   338,   340,   345,   350,   352,   357,
-     359,   360,   368,   379,   393,   398,   401,   404,   407,   410,
-     413,   416,   421,   424,   429,   433,   437,   443,   446,   449,
-     454,   472,   475
+       0,   171,   171,   172,   176,   179,   182,   185,   189,   193,
+     196,   199,   203,   206,   211,   217,   223,   228,   232,   236,
+     240,   244,   248,   254,   255,   258,   262,   266,   270,   274,
+     278,   284,   290,   294,   299,   300,   305,   309,   314,   318,
+     323,   330,   334,   340,   340,   342,   347,   352,   354,   359,
+     361,   362,   370,   381,   396,   401,   404,   407,   410,   413,
+     416,   419,   424,   427,   432,   437,   442,   449,   452,   455,
+     460,   478,   481
 };
 #endif