mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-30 09:00:31 -08:00
Code Issues Projects Releases Wiki Activity

(parse-time-elt): Var renamed from `elt'.

Browse source 
(parse-time-val): Var renamed from `val'.  All uses changed.
This commit is contained in:
Richard M. Stallman 2002-11-18 04:58:53 +00:00
parent fecddd0d16
commit 183ca06edb
1 changed files with 43 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

81
lisp/calendar/parse-time.el
View file

@ -32,7 +32,7 @@
;; `parse-time-string' parses a time in a string and returns a list of 9 ;; `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 ;; values, just like `decode-time', where unspecified elements in the
;; string are returned as nil. `encode-time' may be applied on these ;; string are returned as nil. `encode-time' may be applied on these
;; valuse to obtain an internal time value. ;; values to obtain an internal time value.
;;; Code: ;;; Code:
@ -42,8 +42,8 @@
(defvar parse-time-digits (make-vector 256 nil)) (defvar parse-time-digits (make-vector 256 nil))
;; Byte-compiler warnings ;; Byte-compiler warnings
(defvar elt) (defvar parse-time-elt)
(defvar val) (defvar parse-time-val)
(unless (aref parse-time-digits ?0) (unless (aref parse-time-digits ?0)
(loop for i from ?0 to ?9 (loop for i from ?0 to ?9
@ -132,43 +132,46 @@
((4) parse-time-months) ((4) parse-time-months)
((5) (100 4038)) ((5) (100 4038))
((2 1 0) ((2 1 0)
,#'(lambda () (and (stringp elt) ,#'(lambda () (and (stringp parse-time-elt)
(= (length elt) 8) (= (length parse-time-elt) 8)
(= (aref elt 2) ?:) (= (aref parse-time-elt 2) ?:)
(= (aref elt 5) ?:))) (= (aref parse-time-elt 5) ?:)))
[0 2] [3 5] [6 8]) [0 2] [3 5] [6 8])
((8 7) parse-time-zoneinfo ((8 7) parse-time-zoneinfo
,#'(lambda () (car val)) ,#'(lambda () (car parse-time-val))
,#'(lambda () (cadr val))) ,#'(lambda () (cadr parse-time-val)))
((8) ((8)
,#'(lambda () ,#'(lambda ()
(and (stringp elt) (and (stringp parse-time-elt)
(= 5 (length elt)) (= 5 (length parse-time-elt))
(or (= (aref elt 0) ?+) (= (aref elt 0) ?-)))) (or (= (aref parse-time-elt 0) ?+)
,#'(lambda () (* 60 (+ (parse-integer elt 3 5) (= (aref parse-time-elt 0) ?-))))
(* 60 (parse-integer elt 1 3))) ,#'(lambda () (* 60 (+ (parse-integer parse-time-elt 3 5)
(if (= (aref elt 0) ?-) -1 1)))) (* 60 (parse-integer parse-time-elt 1 3)))
(if (= (aref parse-time-elt 0) ?-) -1 1))))
((5 4 3) ((5 4 3)
,#'(lambda () (and (stringp elt) ,#'(lambda () (and (stringp parse-time-elt)
(= (length elt) 10) (= (length parse-time-elt) 10)
(= (aref elt 4) ?-) (= (aref parse-time-elt 4) ?-)
(= (aref elt 7) ?-))) (= (aref parse-time-elt 7) ?-)))
[0 4] [5 7] [8 10]) [0 4] [5 7] [8 10])
((2 1 0) ((2 1 0)
,#'(lambda () (and (stringp elt) (= (length elt) 5) (= (aref elt 2) ?:))) ,#'(lambda () (and (stringp parse-time-elt)
(= (length parse-time-elt) 5)
(= (aref parse-time-elt 2) ?:)))
[0 2] [3 5] ,#'(lambda () 0)) [0 2] [3 5] ,#'(lambda () 0))
((2 1 0) ((2 1 0)
,#'(lambda () (and (stringp elt) ,#'(lambda () (and (stringp parse-time-elt)
(= (length elt) 4) (= (length parse-time-elt) 4)
(= (aref elt 1) ?:))) (= (aref parse-time-elt 1) ?:)))
[0 1] [2 4] ,#'(lambda () 0)) [0 1] [2 4] ,#'(lambda () 0))
((2 1 0) ((2 1 0)
,#'(lambda () (and (stringp elt) ,#'(lambda () (and (stringp parse-time-elt)
(= (length elt) 7) (= (length parse-time-elt) 7)
(= (aref elt 1) ?:))) (= (aref parse-time-elt 1) ?:)))
[0 1] [2 4] [5 7]) [0 1] [2 4] [5 7])
((5) (50 110) ,#'(lambda () (+ 1900 elt))) ((5) (50 110) ,#'(lambda () (+ 1900 parse-time-elt)))
((5) (0 49) ,#'(lambda () (+ 2000 elt)))) ((5) (0 49) ,#'(lambda () (+ 2000 parse-time-elt))))
"(slots predicate extractor...)") "(slots predicate extractor...)")
(defun parse-time-string (string) (defun parse-time-string (string)
@ -178,24 +181,24 @@ unknown are returned as nil."
(let ((time (list nil nil nil nil nil nil nil nil nil)) (let ((time (list nil nil nil nil nil nil nil nil nil))
(temp (parse-time-tokenize (downcase string)))) (temp (parse-time-tokenize (downcase string))))
(while temp (while temp
(let ((elt (pop temp)) (let ((parse-time-elt (pop temp))
(rules parse-time-rules) (rules parse-time-rules)
(exit nil)) (exit nil))
(while (and (not (null rules)) (not exit)) (while (and (not (null rules)) (not exit))
(let* ((rule (pop rules)) (let* ((rule (pop rules))
(slots (pop rule)) (slots (pop rule))
(predicate (pop rule)) (predicate (pop rule))
(val)) (parse-time-val))
(when (and (not (nth (car slots) time)) ;not already set (when (and (not (nth (car slots) time)) ;not already set
(setq val (cond ((and (consp predicate) (setq parse-time-val (cond ((and (consp predicate)
(not (eq (car predicate) (not (eq (car predicate)
'lambda))) 'lambda)))
(and (numberp elt) (and (numberp parse-time-elt)
(<= (car predicate) elt) (<= (car predicate) parse-time-elt)
(<= elt (cadr predicate)) (<= parse-time-elt (cadr predicate))
elt)) parse-time-elt))
((symbolp predicate) ((symbolp predicate)
(cdr (assoc elt (cdr (assoc parse-time-elt
(symbol-value predicate)))) (symbol-value predicate))))
((funcall predicate))))) ((funcall predicate)))))
(setq exit t) (setq exit t)
@ -204,9 +207,11 @@ unknown are returned as nil."
(let ((this (pop rule))) (let ((this (pop rule)))
(if (vectorp this) (if (vectorp this)
(parse-integer (parse-integer
elt (aref this 0) (aref this 1)) parse-time-elt
(aref this 0) (aref this 1))
(funcall this)))))) (funcall this))))))
(rplaca (nthcdr (pop slots) time) (or new-val val))))))))) (rplaca (nthcdr (pop slots) time)
(or new-val parse-time-val)))))))))
time)) time))
(provide 'parse-time) (provide 'parse-time)