Use correct parent for date* in makeexn

Please merge to 5.3.2
frenchy64 · Jan 12, 2013 · 2ac6615 · 2ac6615
1 parent d95be2e
commit 2ac6615
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/collects/racket/private/kernstruct.rkt b/collects/racket/private/kernstruct.rkt
@@ -537,7 +537,7 @@
            (quote-syntax date-minute)
            (quote-syntax date-second))
           '(#f #f #f #f #f #f #f #f #f #f #f #f)
-          #t))
+          (quote-syntax date)))
        (λ () (quote-syntax kernel:date*)))))
   (begin
     (#%require (rename '#%kernel kernel:srcloc srcloc))

diff --git a/collects/tests/racket/date.rktl b/collects/tests/racket/date.rktl
@@ -99,4 +99,9 @@
 (test "JD 12" julian/scalinger->string 12)
 (test "JD 123" julian/scalinger->string 123)
 
+;; make sure that date* has the correct parent info
+(test #t date*?
+  (struct-copy date* (seconds->date (current-seconds))
+               [hour #:parent date 5]))
+
 (report-errs)
diff --git a/src/racket/src/makeexn b/src/racket/src/makeexn
@@ -253,7 +253,7 @@ Not an exception in the above sense:
                                  date-month date-day date-hour date-minute date-second) #t)
                          (date* (date*-time-zone-name date*-nanosecond
                                  date-time-zone-offset date-dst? date-year-day date-week-day date-year 
-                                 date-month date-day date-hour date-minute date-second) #t)
+                                 date-month date-day date-hour date-minute date-second) date)
                          (srcloc (srcloc-span srcloc-position srcloc-column srcloc-line srcloc-source) #t))))
 
   (with-output-to-file filename #:exists 'replace