From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 23 Jun 2004 03:45:50 +0000 (+0000)
Subject: Add support for fractional seconds in ISO 8601 times.
X-Git-Tag: 20090517-FFI~1636
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=e5603705a4959f7a162bac78bfd77d8d2f46e9b5;p=mit-scheme.git

Add support for fractional seconds in ISO 8601 times.
---

diff --git a/v7/src/runtime/datime.scm b/v7/src/runtime/datime.scm
index 55c59c0d0..083bb01d7 100644
--- a/v7/src/runtime/datime.scm
+++ b/v7/src/runtime/datime.scm
@@ -1,9 +1,10 @@
 #| -*-Scheme-*-
 
-$Id: datime.scm,v 14.39 2003/11/26 02:27:14 cph Exp $
+$Id: datime.scm,v 14.40 2004/06/23 03:45:50 cph Exp $
 
 Copyright 1986,1987,1988,1989,1990,1993 Massachusetts Institute of Technology
 Copyright 1995,1996,1997,1999,2000,2003 Massachusetts Institute of Technology
+Copyright 2004 Massachusetts Institute of Technology
 
 This file is part of MIT/GNU Scheme.
 
@@ -507,6 +508,16 @@ USA.
 	   (vector (vector (decoded-time/year dt)
 			   (decoded-time/month dt)
 			   (decoded-time/day dt)))))))
+
+(define parse-8601-zone
+  (*parser
+   (encapsulate (lambda (v) v)
+     (alt (transform (lambda (v) v (vector 1 0 0))
+		     (match "Z"))
+	  (seq parse-8601-sign
+	       parse-8601-zone-hour
+	       (alt (seq (? ":") parse-8601-minute)
+		    (values 0)))))))
 
 (define parse-8601-time
   (*parser
@@ -524,16 +535,6 @@ USA.
 		    (alt parse-8601-second
 			 (values 0))))))))
 
-(define parse-8601-zone
-  (*parser
-   (encapsulate (lambda (v) v)
-     (alt (transform (lambda (v) v (vector 1 0 0))
-		     (match "Z"))
-	  (seq parse-8601-sign
-	       parse-8601-zone-hour
-	       (alt (seq (? ":") parse-8601-minute)
-		    (values 0)))))))
-
 (define (8601-number-parser n-digits low high)
   (let ((parse-digits
 	 (case n-digits
@@ -576,7 +577,17 @@ USA.
 (define parse-8601-hour (8601-number-parser 2 0 24))
 (define parse-8601-zone-hour (8601-number-parser 2 0 12))
 (define parse-8601-minute (8601-number-parser 2 0 59))
-(define parse-8601-second (8601-number-parser 2 0 59))
+
+(define parse-8601-second
+  (*parser
+   (transform (lambda (v)
+		(let ((x (string->number (vector-ref v 0))))
+		  (and (<= 0 x)
+		       (< x 60)
+		       (vector (min 59 (round->exact x))))))
+	      (match (seq (char-set char-set:numeric)
+			  (char-set char-set:numeric)
+			  (? (seq "." (* (char-set char-set:numeric)))))))))
 
 (define parse-8601-sign
   (*parser