Changeset 35426 in project

Timestamp:

04/22/18 04:29:44 (8 months ago)

Author:

kon

Message:

add ±[0-9]+ as std-time name (but not dst-name), any name pattern match is name, add test, reflow

Location:

release/4/locale/trunk

Files:

• locale-components.scm (modified) (4 diffs)
• locale-posix.scm (modified) (5 diffs)
• tests/locale-test.scm (modified) (1 diff)

release/4/locale/trunk/locale-components.scm

@@ -16 +16 @@
   make-locale-components
   locale-components?
-  check-locale-components
-  error-locale-components
+  check-locale-components error-locale-components
   locale-components=?
   locale-component-ref
@@ -26 +25 @@
   make-timezone-components
   timezone-components?
-  check-timezone-components
-  error-timezone-components
+  check-timezone-components error-timezone-components
   set-timezone-component!
   timezone-component-ref
@@ -33 +31 @@
   ;
   timezone-offset?
-  check-timezone-offset
-  error-timezone-offset
+  check-timezone-offset error-timezone-offset
   ;
   make-timezone-dst-rule-julian-leap
   timezone-dst-rule-julian-leap?
-  check-timezone-dst-rule-julian-leap-day
-  error-timezone-dst-rule-julian-leap-day
+  check-timezone-dst-rule-julian-leap-day error-timezone-dst-rule-julian-leap-day
   ;
   make-timezone-dst-rule-julian-noleap
   timezone-dst-rule-julian-noleap?
-  check-timezone-dst-rule-julian-noleap-day
-  error-timezone-dst-rule-julian-noleap-day
+  check-timezone-dst-rule-julian-noleap-day error-timezone-dst-rule-julian-noleap-day
   ;
   timezone-dst-rule-julian?
@@ -51 +46 @@
   make-timezone-dst-rule-mwd
   timezone-dst-rule-mwd?
-  check-timezone-dst-rule-mwd
-  error-timezone-dst-rule-mwd
-  check-timezone-dst-rule-mwd-day
-  error-timezone-dst-rule-mwd-day
-  check-timezone-dst-rule-mwd-week
-  error-timezone-dst-rule-mwd-week
-  check-timezone-dst-rule-mwd-month
-  error-timezone-dst-rule-mwd-month
+  check-timezone-dst-rule-mwd error-timezone-dst-rule-mwd
+  check-timezone-dst-rule-mwd-day error-timezone-dst-rule-mwd-day
+  check-timezone-dst-rule-mwd-week error-timezone-dst-rule-mwd-week
+  check-timezone-dst-rule-mwd-month error-timezone-dst-rule-mwd-month
   timezone-components=?
   timezone-dst-rule-day

release/4/locale/trunk/locale-posix.scm

@@ -93 +93 @@
 (define parse-posix-literal-timezone
   (let (
-    (name-re (regexp "(^[^<:][^0-9,+-]+)|^<([^>]+)>"))
+    (ext-name-re (regexp "(^[+-][0-9]+)|(^[^<:0-9,+-][^0-9,+-]*)|^<([^>]+)>"))
+    (int-name-re (regexp "(^[^<:0-9,+-][^0-9,+-]*)|^<([^>]+)>"))
     (offset-re (regexp "^(\\+|-)?([0-9]+)(:[0-9]+)?(:[0-9]+)?"))
     ;For compatibility with System V Release 3.1, a semicolon (`;') may be
@@ -205 +206 @@
               ;DST section is optional
               (let (
-                (n-m (next-match name-re)) )
+                (n-m (next-match int-name-re)) )
                 (or
                   (not n-m)
@@ -217 +218 @@
                         #; ;XXX What does "ahead" mean?
                         (fx+ (timezone-component-ref tz 'std-offset) SEC/HR))) )
-                    (set-timezone-component! tz 'dst-name (cadr n-m))
+                    (set-timezone-component! tz 'dst-name (car n-m))
                     (set-timezone-component! tz 'dst-offset off)
                     ;Rule, if present, must be complete
@@ -228 +229 @@
               ;Must have name & offset components
               (let (
-                (n-m (next-match name-re)) )
+                (n-m (next-match ext-name-re)) )
                 (cond
                   ((not n-m)
@@ -239 +240 @@
                           (fail "bad timezone STD offset") )
                         (else
-                          (set-timezone-component! tz 'std-name (cadr n-m))
+                          (set-timezone-component! tz 'std-name (car n-m))
                           (set-timezone-component! tz 'std-offset (hms->offset (cadr o-m) (cddr o-m)))
                           #t ) ) ) ) ) ) ) ) )

release/4/locale/trunk/tests/locale-test.scm

@@ -43 +43 @@
 
     ; unsupported but not an error
-    (test-assert "T1" (not (posix-timezone-string->timezone-components ":foo,bar,baz")))
+    (test-assert "T1a" (not (posix-timezone-string->timezone-components ":foo,bar,baz")))
+
+    ;
+    (test-assert "T1b" (posix-timezone-string->timezone-components "+03-3:0:0XXXX-4:0:0"))
 
     ; cannot have a name composed of digits