Mercurial > emacs

changeset 43048:ebb4fa093863

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moved parse-time.el from lisp/gnus to lisp/calendar. For versions before 1.6, look in lisp/gnus.
author Eli Zaretskii <eliz@gnu.org>
date Fri, 01 Feb 2002 18:13:49 +0000
parents 94af2c31f342
children d94124a8eddf
files lisp/calendar/parse-time.el lisp/gnus/parse-time.el
diffstat 2 files changed, 214 insertions(+), 214 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/calendar/parse-time.el	Fri Feb 01 18:13:49 2002 +0000
@@ -0,0 +1,214 @@
+;;; parse-time.el --- parsing time strings
+
+;; Copyright (C) 1996, 2000 by Free Software Foundation, Inc.
+
+;; Author: Erik Naggum <erik@naggum.no>
+;; Keywords: util
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; With the introduction of the `encode-time', `decode-time', and
+;; `format-time-string' functions, dealing with time became simpler in
+;; Emacs.  However, parsing time strings is still largely a matter of
+;; heuristics and no common interface has been designed.
+
+;; `parse-time-string' parses a time in a string and returns a list of 9
+;; values, just like `decode-time', where unspecified elements in the
+;; string are returned as nil.  `encode-time' may be applied on these
+;; valuse to obtain an internal time value.
+
+;;; Code:
+
+(eval-when-compile (require 'cl))	;and ah ain't kiddin' 'bout it
+
+(defvar parse-time-syntax (make-vector 256 nil))
+(defvar parse-time-digits (make-vector 256 nil))
+
+;; Byte-compiler warnings
+(defvar elt)
+(defvar val)
+
+(unless (aref parse-time-digits ?0)
+  (loop for i from ?0 to ?9
+    do (aset parse-time-digits i (- i ?0))))
+
+(unless (aref parse-time-syntax ?0)
+  (loop for i from ?0 to ?9
+    do (aset parse-time-syntax i ?0))
+  (loop for i from ?A to ?Z
+    do (aset parse-time-syntax i ?A))
+  (loop for i from ?a to ?z
+    do (aset parse-time-syntax i ?a))
+  (aset parse-time-syntax ?+ 1)
+  (aset parse-time-syntax ?- -1)
+  (aset parse-time-syntax ?: ?d)
+  )
+
+(defsubst digit-char-p (char)
+  (aref parse-time-digits char))
+
+(defsubst parse-time-string-chars (char)
+  (aref parse-time-syntax char))
+
+(put 'parse-error 'error-conditions '(parse-error error))
+(put 'parse-error 'error-message "Parsing error")
+
+(defsubst parse-integer (string &optional start end)
+  "[CL] Parse and return the integer in STRING, or nil if none."
+  (let ((integer 0)
+	(digit 0)
+	(index (or start 0))
+	(end (or end (length string))))
+    (when (< index end)
+      (let ((sign (aref string index)))
+	(if (or (eq sign ?+) (eq sign ?-))
+	    (setq sign (parse-time-string-chars sign)
+		  index (1+ index))
+	  (setq sign 1))
+	(while (and (< index end)
+		    (setq digit (digit-char-p (aref string index))))
+	  (setq integer (+ (* integer 10) digit)
+		index (1+ index)))
+	(if (/= index end)
+	    (signal 'parse-error `("not an integer"
+				   ,(substring string (or start 0) end)))
+	  (* sign integer))))))
+
+(defun parse-time-tokenize (string)
+  "Tokenize STRING into substrings."
+  (let ((start nil)
+	(end (length string))
+	(all-digits nil)
+	(list ())
+	(index 0)
+	(c nil))
+    (while (< index end)
+      (while (and (< index end)		;skip invalid characters
+		  (not (setq c (parse-time-string-chars (aref string index)))))
+	(incf index))
+      (setq start index all-digits (eq c ?0))
+      (while (and (< (incf index) end)	;scan valid characters
+		  (setq c (parse-time-string-chars (aref string index))))
+	(setq all-digits (and all-digits (eq c ?0))))
+      (if (<= index end)
+	  (push (if all-digits (parse-integer string start index)
+		  (substring string start index))
+		list)))
+    (nreverse list)))
+
+(defvar parse-time-months '(("jan" . 1) ("feb" . 2) ("mar" . 3)
+			    ("apr" . 4) ("may" . 5) ("jun" . 6)
+			    ("jul" . 7) ("aug" . 8) ("sep" . 9)
+			    ("oct" . 10) ("nov" . 11) ("dec" . 12)))
+(defvar parse-time-weekdays '(("sun" . 0) ("mon" . 1) ("tue" . 2)
+			      ("wed" . 3) ("thu" . 4) ("fri" . 5) ("sat" . 6)))
+(defvar parse-time-zoneinfo `(("z" 0) ("ut" 0) ("gmt" 0)
+			      ("pst" ,(* -8 3600)) ("pdt" ,(* -7 3600) t)
+			      ("mst" ,(* -7 3600)) ("mdt" ,(* -6 3600) t)
+			      ("cst" ,(* -6 3600)) ("cdt" ,(* -5 3600) t)
+			      ("est" ,(* -5 3600)) ("edt" ,(* -4 3600) t))
+  "(zoneinfo seconds-off daylight-savings-time-p)")
+
+(defvar parse-time-rules
+  `(((6) parse-time-weekdays)
+    ((3) (1 31))
+    ((4) parse-time-months)
+    ((5) (100 4038))
+    ((2 1 0)
+     ,#'(lambda () (and (stringp elt)
+			(= (length elt) 8)
+			(= (aref elt 2) ?:)
+			(= (aref elt 5) ?:)))
+     [0 2] [3 5] [6 8])
+    ((8 7) parse-time-zoneinfo
+     ,#'(lambda () (car val))
+     ,#'(lambda () (cadr val)))
+    ((8)
+     ,#'(lambda ()
+	  (and (stringp elt)
+	       (= 5 (length elt))
+	       (or (= (aref elt 0) ?+) (= (aref elt 0) ?-))))
+     ,#'(lambda () (* 60 (+ (parse-integer elt 3 5)
+			    (* 60 (parse-integer elt 1 3)))
+		      (if (= (aref elt 0) ?-) -1 1))))
+    ((5 4 3)
+     ,#'(lambda () (and (stringp elt)
+			(= (length elt) 10)
+			(= (aref elt 4) ?-)
+			(= (aref elt 7) ?-)))
+     [0 4] [5 7] [8 10])
+    ((2 1 0)
+     ,#'(lambda () (and (stringp elt) (= (length elt) 5) (= (aref elt 2) ?:)))
+     [0 2] [3 5] ,#'(lambda () 0))
+    ((2 1 0)
+     ,#'(lambda () (and (stringp elt)
+			(= (length elt) 4)
+			(= (aref elt 1) ?:)))
+     [0 1] [2 4] ,#'(lambda () 0))
+    ((2 1 0)
+     ,#'(lambda () (and (stringp elt)
+			(= (length elt) 7)
+			(= (aref elt 1) ?:)))
+     [0 1] [2 4] [5 7])
+    ((5) (50 110) ,#'(lambda () (+ 1900 elt)))
+    ((5) (0 49) ,#'(lambda () (+ 2000 elt))))
+  "(slots predicate extractor...)")
+
+(defun parse-time-string (string)
+  "Parse the time-string STRING into (SEC MIN HOUR DAY MON YEAR DOW DST TZ).
+The values are identical to those of `decode-time', but any values that are
+unknown are returned as nil."
+  (let ((time (list nil nil nil nil nil nil nil nil nil))
+	(temp (parse-time-tokenize (downcase string))))
+    (while temp
+      (let ((elt (pop temp))
+	    (rules parse-time-rules)
+	    (exit nil))
+	(while (and (not (null rules)) (not exit))
+	  (let* ((rule (pop rules))
+		 (slots (pop rule))
+		 (predicate (pop rule))
+		 (val))
+	    (when (and (not (nth (car slots) time)) ;not already set
+		       (setq val (cond ((and (consp predicate)
+					     (not (eq (car predicate)
+						      'lambda)))
+					(and (numberp elt)
+					     (<= (car predicate) elt)
+					     (<= elt (cadr predicate))
+					     elt))
+				       ((symbolp predicate)
+					(cdr (assoc elt
+						    (symbol-value predicate))))
+				       ((funcall predicate)))))
+	      (setq exit t)
+	      (while slots
+		(let ((new-val (and rule
+				    (let ((this (pop rule)))
+				      (if (vectorp this)
+					  (parse-integer
+					   elt (aref this 0) (aref this 1))
+					(funcall this))))))
+		  (rplaca (nthcdr (pop slots) time) (or new-val val)))))))))
+    time))
+
+(provide 'parse-time)
+
+;;; parse-time.el ends here
--- a/lisp/gnus/parse-time.el	Fri Feb 01 17:59:36 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,214 +0,0 @@
-;;; parse-time.el --- parsing time strings
-
-;; Copyright (C) 1996, 2000 by Free Software Foundation, Inc.
-
-;; Author: Erik Naggum <erik@naggum.no>
-;; Keywords: util
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
-
-;;; Commentary:
-
-;; With the introduction of the `encode-time', `decode-time', and
-;; `format-time-string' functions, dealing with time became simpler in
-;; Emacs.  However, parsing time strings is still largely a matter of
-;; heuristics and no common interface has been designed.
-
-;; `parse-time-string' parses a time in a string and returns a list of 9
-;; values, just like `decode-time', where unspecified elements in the
-;; string are returned as nil.  `encode-time' may be applied on these
-;; valuse to obtain an internal time value.
-
-;;; Code:
-
-(eval-when-compile (require 'cl))	;and ah ain't kiddin' 'bout it
-
-(defvar parse-time-syntax (make-vector 256 nil))
-(defvar parse-time-digits (make-vector 256 nil))
-
-;; Byte-compiler warnings
-(defvar elt)
-(defvar val)
-
-(unless (aref parse-time-digits ?0)
-  (loop for i from ?0 to ?9
-    do (aset parse-time-digits i (- i ?0))))
-
-(unless (aref parse-time-syntax ?0)
-  (loop for i from ?0 to ?9
-    do (aset parse-time-syntax i ?0))
-  (loop for i from ?A to ?Z
-    do (aset parse-time-syntax i ?A))
-  (loop for i from ?a to ?z
-    do (aset parse-time-syntax i ?a))
-  (aset parse-time-syntax ?+ 1)
-  (aset parse-time-syntax ?- -1)
-  (aset parse-time-syntax ?: ?d)
-  )
-
-(defsubst digit-char-p (char)
-  (aref parse-time-digits char))
-
-(defsubst parse-time-string-chars (char)
-  (aref parse-time-syntax char))
-
-(put 'parse-error 'error-conditions '(parse-error error))
-(put 'parse-error 'error-message "Parsing error")
-
-(defsubst parse-integer (string &optional start end)
-  "[CL] Parse and return the integer in STRING, or nil if none."
-  (let ((integer 0)
-	(digit 0)
-	(index (or start 0))
-	(end (or end (length string))))
-    (when (< index end)
-      (let ((sign (aref string index)))
-	(if (or (eq sign ?+) (eq sign ?-))
-	    (setq sign (parse-time-string-chars sign)
-		  index (1+ index))
-	  (setq sign 1))
-	(while (and (< index end)
-		    (setq digit (digit-char-p (aref string index))))
-	  (setq integer (+ (* integer 10) digit)
-		index (1+ index)))
-	(if (/= index end)
-	    (signal 'parse-error `("not an integer"
-				   ,(substring string (or start 0) end)))
-	  (* sign integer))))))
-
-(defun parse-time-tokenize (string)
-  "Tokenize STRING into substrings."
-  (let ((start nil)
-	(end (length string))
-	(all-digits nil)
-	(list ())
-	(index 0)
-	(c nil))
-    (while (< index end)
-      (while (and (< index end)		;skip invalid characters
-		  (not (setq c (parse-time-string-chars (aref string index)))))
-	(incf index))
-      (setq start index all-digits (eq c ?0))
-      (while (and (< (incf index) end)	;scan valid characters
-		  (setq c (parse-time-string-chars (aref string index))))
-	(setq all-digits (and all-digits (eq c ?0))))
-      (if (<= index end)
-	  (push (if all-digits (parse-integer string start index)
-		  (substring string start index))
-		list)))
-    (nreverse list)))
-
-(defvar parse-time-months '(("jan" . 1) ("feb" . 2) ("mar" . 3)
-			    ("apr" . 4) ("may" . 5) ("jun" . 6)
-			    ("jul" . 7) ("aug" . 8) ("sep" . 9)
-			    ("oct" . 10) ("nov" . 11) ("dec" . 12)))
-(defvar parse-time-weekdays '(("sun" . 0) ("mon" . 1) ("tue" . 2)
-			      ("wed" . 3) ("thu" . 4) ("fri" . 5) ("sat" . 6)))
-(defvar parse-time-zoneinfo `(("z" 0) ("ut" 0) ("gmt" 0)
-			      ("pst" ,(* -8 3600)) ("pdt" ,(* -7 3600) t)
-			      ("mst" ,(* -7 3600)) ("mdt" ,(* -6 3600) t)
-			      ("cst" ,(* -6 3600)) ("cdt" ,(* -5 3600) t)
-			      ("est" ,(* -5 3600)) ("edt" ,(* -4 3600) t))
-  "(zoneinfo seconds-off daylight-savings-time-p)")
-
-(defvar parse-time-rules
-  `(((6) parse-time-weekdays)
-    ((3) (1 31))
-    ((4) parse-time-months)
-    ((5) (100 4038))
-    ((2 1 0)
-     ,#'(lambda () (and (stringp elt)
-			(= (length elt) 8)
-			(= (aref elt 2) ?:)
-			(= (aref elt 5) ?:)))
-     [0 2] [3 5] [6 8])
-    ((8 7) parse-time-zoneinfo
-     ,#'(lambda () (car val))
-     ,#'(lambda () (cadr val)))
-    ((8)
-     ,#'(lambda ()
-	  (and (stringp elt)
-	       (= 5 (length elt))
-	       (or (= (aref elt 0) ?+) (= (aref elt 0) ?-))))
-     ,#'(lambda () (* 60 (+ (parse-integer elt 3 5)
-			    (* 60 (parse-integer elt 1 3)))
-		      (if (= (aref elt 0) ?-) -1 1))))
-    ((5 4 3)
-     ,#'(lambda () (and (stringp elt)
-			(= (length elt) 10)
-			(= (aref elt 4) ?-)
-			(= (aref elt 7) ?-)))
-     [0 4] [5 7] [8 10])
-    ((2 1 0)
-     ,#'(lambda () (and (stringp elt) (= (length elt) 5) (= (aref elt 2) ?:)))
-     [0 2] [3 5] ,#'(lambda () 0))
-    ((2 1 0)
-     ,#'(lambda () (and (stringp elt)
-			(= (length elt) 4)
-			(= (aref elt 1) ?:)))
-     [0 1] [2 4] ,#'(lambda () 0))
-    ((2 1 0)
-     ,#'(lambda () (and (stringp elt)
-			(= (length elt) 7)
-			(= (aref elt 1) ?:)))
-     [0 1] [2 4] [5 7])
-    ((5) (50 110) ,#'(lambda () (+ 1900 elt)))
-    ((5) (0 49) ,#'(lambda () (+ 2000 elt))))
-  "(slots predicate extractor...)")
-
-(defun parse-time-string (string)
-  "Parse the time-string STRING into (SEC MIN HOUR DAY MON YEAR DOW DST TZ).
-The values are identical to those of `decode-time', but any values that are
-unknown are returned as nil."
-  (let ((time (list nil nil nil nil nil nil nil nil nil))
-	(temp (parse-time-tokenize (downcase string))))
-    (while temp
-      (let ((elt (pop temp))
-	    (rules parse-time-rules)
-	    (exit nil))
-	(while (and (not (null rules)) (not exit))
-	  (let* ((rule (pop rules))
-		 (slots (pop rule))
-		 (predicate (pop rule))
-		 (val))
-	    (when (and (not (nth (car slots) time)) ;not already set
-		       (setq val (cond ((and (consp predicate)
-					     (not (eq (car predicate)
-						      'lambda)))
-					(and (numberp elt)
-					     (<= (car predicate) elt)
-					     (<= elt (cadr predicate))
-					     elt))
-				       ((symbolp predicate)
-					(cdr (assoc elt
-						    (symbol-value predicate))))
-				       ((funcall predicate)))))
-	      (setq exit t)
-	      (while slots
-		(let ((new-val (and rule
-				    (let ((this (pop rule)))
-				      (if (vectorp this)
-					  (parse-integer
-					   elt (aref this 0) (aref this 1))
-					(funcall this))))))
-		  (rplaca (nthcdr (pop slots) time) (or new-val val)))))))))
-    time))
-
-(provide 'parse-time)
-
-;;; parse-time.el ends here