From 2f8207e7c95a9edc56afa6bf995b3afa005a7e9a Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Tue, 22 Oct 2019 11:12:17 -0400 Subject: [PATCH] Revert "scalinger -> scaliger" This reverts commit de0fbf26482bceb4e5968a2476fdfa24c2a29642. --- pkgs/racket-doc/scribblings/reference/time.scrbl | 8 ++++---- pkgs/racket-test-core/tests/racket/date.rktl | 13 ++----------- racket/collects/racket/date.rkt | 8 +------- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/pkgs/racket-doc/scribblings/reference/time.scrbl b/pkgs/racket-doc/scribblings/reference/time.scrbl index ae1025a1cd..5ab0ffa051 100644 --- a/pkgs/racket-doc/scribblings/reference/time.scrbl +++ b/pkgs/racket-doc/scribblings/reference/time.scrbl @@ -226,16 +226,16 @@ local time by default or UTC if @racket[local-time?] is error is signaled, otherwise an integer is returned.} -@defproc[(date->julian/scaliger [date date?]) exact-integer?]{ +@defproc[(date->julian/scalinger [date date?]) exact-integer?]{ Converts a date structure (up to 2099 BCE Gregorian) into a Julian date number. The returned value is not a strict Julian number, but -rather Scaliger's version, which is off by one for easier +rather Scalinger's version, which is off by one for easier calculations.} -@defproc[(julian/scaliger->string [date-number exact-integer?]) +@defproc[(julian/scalinger->string [date-number exact-integer?]) string?]{ -Converts a Julian number (Scaliger's off-by-one version) into a +Converts a Julian number (Scalinger's off-by-one version) into a string.} diff --git a/pkgs/racket-test-core/tests/racket/date.rktl b/pkgs/racket-test-core/tests/racket/date.rktl index d5687a6944..5acc49889f 100644 --- a/pkgs/racket-test-core/tests/racket/date.rktl +++ b/pkgs/racket-test-core/tests/racket/date.rktl @@ -72,13 +72,9 @@ (test-string 'rfc2822 #t "Thu, 4 May 2006 03:02:01 -0600") (test-string 'julian #f "JD 2 453 860") (test-string 'julian #t "JD 2 453 860, 03:02:01") - - ;; In the off chance that one of these changes and not the other, - ;; both are provided for tests. + (test 2453860 date->julian/scalinger d) - (test 2453860 date->julian/scaliger d) - (test "JD 2 453 860" julian/scalinger->string 2453860) - (test "JD 2 453 860" julian/scaliger->string 2453860)) + (test "JD 2 453 860" julian/scalinger->string 2453860)) ;; Bad dates (err/rt-test (find-seconds 0 0 0 0 0 1990) exn:fail?) @@ -110,14 +106,9 @@ ;; one of the two possible values, though: (test-find 0 30 1 7 11 2010)))) - -;; In the off chance that one of these changes and not the other, -;; both are provided for tests. ;; bug fixes (test "JD 12" julian/scalinger->string 12) -(test "JD 12" julian/scaliger->string 12) (test "JD 123" julian/scalinger->string 123) -(test "JD 123" julian/scaliger->string 123) ;; make sure that date* has the correct parent info (test #t date*? diff --git a/racket/collects/racket/date.rkt b/racket/collects/racket/date.rkt index d27539ce9f..b78cff4514 100644 --- a/racket/collects/racket/date.rkt +++ b/racket/collects/racket/date.rkt @@ -18,9 +18,7 @@ . ->* . exact-integer?)] [date->julian/scalinger (date? . -> . exact-integer?)] - [date->julian/scaliger (date? . -> . exact-integer?)] - [julian/scalinger->string (exact-integer? . -> . string?)] - [julian/scaliger->string (exact-integer? . -> . string?)]) + [julian/scalinger->string (exact-integer? . -> . string?)]) (define (current-date) (seconds->date (* #i1/1000 (current-inexact-milliseconds)))) @@ -350,8 +348,6 @@ gregorian-adjustment)) final-date) -(define date->julian/scaliger date->julian/scalinger) - ;; julian/scalinger->string : ;; number [julian-day] -> string [julian-day-format] @@ -376,5 +372,3 @@ (cadr reversed-digits) (car reversed-digits))) (loop (cdr (cdr (cdr reversed-digits)))))))))))) - -(define julian/scaliger->string julian/scalinger->string)