Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | merge core-8-6-branch (resolves warnings) |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
4713424a883f260bccacc515927fe7cf |
User & Date: | sebres 2017-05-30 08:49:24 |
Context
2017-05-31
| ||
05:39 | Fully remove SunOS-4* from tcl.m4. check-in: 6616258500 user: stu tags: trunk | |
04:43 | Bring up-to-date. check-in: 358066f84b user: stu tags: stwo-dev86 | |
2017-05-30
| ||
08:49 | merge core-8-6-branch (resolves warnings) check-in: 4713424a88 user: sebres tags: trunk | |
08:46 | small code review: resolves several warning on some compilers check-in: 7303c86999 user: sebres tags: sebres-8-6-clock-speedup-cr1 | |
2017-05-29
| ||
21:13 | 3-way merge sebres-trunk-clock-speedup / core-8-6-branch (clock speed-up / flightaware Tcl-bounties#... check-in: fd30c76c7a user: sebres tags: trunk | |
Changes
Changes to generic/tclClock.c.
︙ | ︙ | |||
602 603 604 605 606 607 608 | if ( !(opts->flags & CLF_LOCALE_USED) ) { opts->localeObj = NormLocaleObj(opts->clientData, opts->interp, opts->localeObj, &opts->mcDictObj); if (opts->localeObj == NULL) { Tcl_SetResult(opts->interp, | | | 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 | if ( !(opts->flags & CLF_LOCALE_USED) ) { opts->localeObj = NormLocaleObj(opts->clientData, opts->interp, opts->localeObj, &opts->mcDictObj); if (opts->localeObj == NULL) { Tcl_SetResult(opts->interp, (char*)"locale not specified and no default locale set", TCL_STATIC); Tcl_SetErrorCode(opts->interp, "CLOCK", "badOption", NULL); return NULL; } opts->flags |= CLF_LOCALE_USED; /* check locale literals already available (on demand creation) */ if (dataPtr->mcLiterals == NULL) { |
︙ | ︙ | |||
3076 3077 3078 3079 3080 3081 3082 | /* * Check options. */ if ((saw & (1 << CLC_ARGS_GMT)) && (saw & (1 << CLC_ARGS_TIMEZONE))) { | | | 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 | /* * Check options. */ if ((saw & (1 << CLC_ARGS_GMT)) && (saw & (1 << CLC_ARGS_TIMEZONE))) { Tcl_SetResult(interp, (char*)"cannot use -gmt and -timezone in same call", TCL_STATIC); Tcl_SetErrorCode(interp, "CLOCK", "gmtWithTimezone", NULL); return TCL_ERROR; } if (gmtFlag) { opts->timezoneObj = dataPtr->literals[LIT_GMT]; } |
︙ | ︙ | |||
3331 3332 3333 3334 3335 3336 3337 | /* If free scan */ if (opts.formatObj == NULL) { /* Use compiled version of FreeScan - */ /* [SB] TODO: Perhaps someday we'll localize the legacy code. Right now, it's not localized. */ if (opts.localeObj != NULL) { Tcl_SetResult(interp, | | | 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 | /* If free scan */ if (opts.formatObj == NULL) { /* Use compiled version of FreeScan - */ /* [SB] TODO: Perhaps someday we'll localize the legacy code. Right now, it's not localized. */ if (opts.localeObj != NULL) { Tcl_SetResult(interp, (char*)"legacy [clock scan] does not support -locale", TCL_STATIC); Tcl_SetErrorCode(interp, "CLOCK", "flagWithLegacyFormat", NULL); return TCL_ERROR; } ret = ClockFreeScan(&yy, objv[1], &opts); } else { /* Use compiled version of Scan - */ |
︙ | ︙ |
Changes to generic/tclClockFmt.c.
︙ | ︙ | |||
603 604 605 606 607 608 609 | return TCL_OK; }; static void ClockFmtObj_UpdateString(objPtr) Tcl_Obj *objPtr; { | | | 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 | return TCL_OK; }; static void ClockFmtObj_UpdateString(objPtr) Tcl_Obj *objPtr; { const char *name = "UNKNOWN"; int len; ClockFmtScnStorage *fss = ObjClockFmtScn(objPtr); if (fss != NULL) { Tcl_HashEntry *hPtr = HashEntry4FmtScn(fss); name = hPtr->key.string; } |
︙ | ︙ | |||
1446 1447 1448 1449 1450 1451 1452 | } if (val != -1) { if (val == 0) { val = 7; } if (val > 7) { | | | 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 | } if (val != -1) { if (val == 0) { val = 7; } if (val > 7) { Tcl_SetResult(opts->interp, (char*)"day of week is greater than 7", TCL_STATIC); Tcl_SetErrorCode(opts->interp, "CLOCK", "badDayOfWeek", NULL); return TCL_ERROR; } info->date.dayOfWeek = val; yyInput++; return TCL_OK; |
︙ | ︙ | |||
2396 2397 2398 2399 2400 2401 2402 | info->flags |= flags; ret = TCL_OK; goto done; overflow: | | | | 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 | info->flags |= flags; ret = TCL_OK; goto done; overflow: Tcl_SetResult(opts->interp, (char*)"requested date too large to represent", TCL_STATIC); Tcl_SetErrorCode(opts->interp, "CLOCK", "dateTooLarge", NULL); goto done; not_match: Tcl_SetResult(opts->interp, (char*)"input string does not match supplied format", TCL_STATIC); Tcl_SetErrorCode(opts->interp, "CLOCK", "badInputString", NULL); done: return ret; } |
︙ | ︙ |
Changes to generic/tclDate.h.
︙ | ︙ | |||
366 367 368 369 370 371 372 | unsigned short int type; unsigned short int flags; unsigned short int clearFlags; unsigned short int minSize; unsigned short int maxSize; unsigned short int offs; ClockScanTokenProc *parser; | | | 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 | unsigned short int type; unsigned short int flags; unsigned short int clearFlags; unsigned short int minSize; unsigned short int maxSize; unsigned short int offs; ClockScanTokenProc *parser; const void *data; } ClockScanTokenMap; typedef struct ClockScanToken { ClockScanTokenMap *map; struct { const char *start; const char *end; |
︙ | ︙ |
Changes to generic/tclStrIdxTree.c.
︙ | ︙ | |||
465 466 467 468 469 470 471 | }; enum optionInd { O_INDEX, O_PUTS_INDEX, O_FINDEQUAL }; int optionIndex; if (objc < 2) { | | | | 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 | }; enum optionInd { O_INDEX, O_PUTS_INDEX, O_FINDEQUAL }; int optionIndex; if (objc < 2) { Tcl_SetResult(interp, (char*)"wrong # args", TCL_STATIC); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[1], options, "option", 0, &optionIndex) != TCL_OK) { Tcl_SetErrorCode(interp, "CLOCK", "badOption", Tcl_GetString(objv[1]), NULL); return TCL_ERROR; } switch (optionIndex) { case O_FINDEQUAL: if (objc < 4) { Tcl_SetResult(interp, (char*)"wrong # args", TCL_STATIC); return TCL_ERROR; } cs = TclGetString(objv[2]); cin = TclGetString(objv[3]); ret = TclUtfFindEqual( cs, cs + objv[1]->length, cin, cin + objv[2]->length); Tcl_SetObjResult(interp, Tcl_NewIntObj(ret - cs)); |
︙ | ︙ |