Parser were moved to std11-parse.el and renamed to `std11-*'.

(rfc822/parse-address): New aliases for `std11-parse-address'.
(rfc822/parse-addresses): New aliases for `std11-parse-addresses'.

diff --git a/tl-822.el b/tl-822.el
index 12412e2..0a52c08 100644 (file)
--- a/tl-822.el
+++ b/tl-822.el
@@ -30,7 +30,7 @@
 
 
 (defconst rfc822/RCS-ID
-  "$Id: tl-822.el,v 7.55 1996-08-28 18:15:17 morioka Exp $")
+  "$Id: tl-822.el,v 7.56 1996-08-28 20:32:07 morioka Exp $")
 (defconst rfc822/version (get-version-string rfc822/RCS-ID))
 
 
@@ -117,305 +117,14 @@
 ;;; @ lexical analyze
 ;;;
 
-(defalias 'rfc822/lexical-analyze      'std11-lexical-analyze)
+(defalias 'rfc822/lexical-analyze 'std11-lexical-analyze)
 
 
 ;;; @ parser
 ;;;
 
-(defun rfc822/ignored-token-p (token)
-  (let ((type (car token)))
-    (or (eq type 'spaces)(eq type 'comment))
-    ))
-
-(defun rfc822/parse-token (lal)
-  (let (token itl)
-    (while (and lal
-               (progn
-                 (setq token (car lal))
-                 (rfc822/ignored-token-p token)
-                 ))
-      (setq lal (cdr lal))
-      (setq itl (cons token itl))
-      )
-    (cons (nreverse (cons token itl))
-         (cdr lal))
-    ))
-
-(defun rfc822/parse-ascii-token (lal)
-  (let (token itl parsed token-value)
-    (while (and lal
-               (setq token (car lal))
-               (if (and (setq token-value (cdr token))
-                        (find-charset-string token-value)
-                        )
-                   (setq token nil)
-                 (rfc822/ignored-token-p token)
-                 ))
-      (setq lal (cdr lal))
-      (setq itl (cons token itl))
-      )
-    (if (and token
-            (setq parsed (nreverse (cons token itl)))
-            )
-       (cons parsed (cdr lal))
-      )))
-
-(defun rfc822/parse-token-or-comment (lal)
-  (let (token itl)
-    (while (and lal
-               (progn
-                 (setq token (car lal))
-                 (eq (car token) 'spaces)
-                 ))
-      (setq lal (cdr lal))
-      (setq itl (cons token itl))
-      )
-    (cons (nreverse (cons token itl))
-         (cdr lal))
-    ))
-
-(defun rfc822/parse-word (lal)
-  (let ((ret (rfc822/parse-ascii-token lal)))
-    (if ret
-       (let ((elt (car ret))
-             (rest (cdr ret))
-             )
-         (if (or (assq 'atom elt)
-                 (assq 'quoted-string elt))
-             (cons (cons 'word elt) rest)
-           )))))
-
-(defun rfc822/parse-word-or-comment (lal)
-  (let ((ret (rfc822/parse-token-or-comment lal)))
-    (if ret
-       (let ((elt (car ret))
-             (rest (cdr ret))
-             )
-         (cond ((or (assq 'atom elt)
-                    (assq 'quoted-string elt))
-                (cons (cons 'word elt) rest)
-                )
-               ((assq 'comment elt)
-                (cons (cons 'comment-word elt) rest)
-                ))
-         ))))
-
-(defun rfc822/parse-phrase (lal)
-  (let (ret phrase)
-    (while (setq ret (rfc822/parse-word-or-comment lal))
-      (setq phrase (append phrase (cdr (car ret))))
-      (setq lal (cdr ret))
-      )
-    (if phrase
-       (cons (cons 'phrase phrase) lal)
-      )))
-
-(defun rfc822/parse-local-part (lal)
-  (let ((ret (rfc822/parse-word lal)))
-    (if ret
-       (let ((local-part (cdr (car ret))) dot)
-         (setq lal (cdr ret))
-         (while (and (setq ret (rfc822/parse-ascii-token lal))
-                     (setq dot (car ret))
-                     (string-equal (cdr (assq 'specials dot)) ".")
-                     (setq ret (rfc822/parse-word (cdr ret)))
-                     (setq local-part
-                           (append local-part dot (cdr (car ret)))
-                           )
-                     (setq lal (cdr ret))
-                     ))
-         (cons (cons 'local-part local-part) lal)
-         ))))
-
-(defun rfc822/parse-sub-domain (lal)
-  (let ((ret (rfc822/parse-ascii-token lal)))
-    (if ret
-       (let ((sub-domain (car ret)))
-         (if (or (assq 'atom sub-domain)
-                 (assq 'domain-literal sub-domain)
-                 )
-             (cons (cons 'sub-domain sub-domain)
-                   (cdr ret)
-                   )
-           )))))
-
-(defun rfc822/parse-domain (lal)
-  (let ((ret (rfc822/parse-sub-domain lal)))
-    (if ret
-       (let ((domain (cdr (car ret))) dot)
-         (setq lal (cdr ret))
-         (while (and (setq ret (rfc822/parse-ascii-token lal))
-                     (setq dot (car ret))
-                     (string-equal (cdr (assq 'specials dot)) ".")
-                     (setq ret (rfc822/parse-sub-domain (cdr ret)))
-                     (setq domain
-                           (append domain dot (cdr (car ret)))
-                           )
-                     (setq lal (cdr ret))
-                     ))
-         (cons (cons 'domain domain) lal)
-         ))))
-
-(defun rfc822/parse-at-domain (lal)
-  (let ((ret (rfc822/parse-ascii-token lal)) at-sign)
-    (if (and ret
-            (setq at-sign (car ret))
-            (string-equal (cdr (assq 'specials at-sign)) "@")
-            (setq ret (rfc822/parse-domain (cdr ret)))
-            )
-       (cons (cons 'at-domain (append at-sign (cdr (car ret))))
-             (cdr ret))
-      )))
-
-(defun rfc822/parse-addr-spec (lal)
-  (let ((ret (rfc822/parse-local-part lal))
-       addr)
-    (if (and ret
-            (prog1
-                (setq addr (cdr (car ret)))
-              (setq lal (cdr ret))
-              (and (setq ret (rfc822/parse-at-domain lal))
-                   (setq addr (append addr (cdr (car ret))))
-                   (setq lal (cdr ret))
-                   )))
-       (cons (cons 'addr-spec addr) lal)
-      )))
-
-(defun rfc822/parse-route (lal)
-  (let ((ret (rfc822/parse-at-domain lal))
-       route comma colon)
-    (if (and ret
-            (progn
-              (setq route (cdr (car ret)))
-              (setq lal (cdr ret))
-              (while (and (setq ret (rfc822/parse-ascii-token lal))
-                          (setq comma (car ret))
-                          (string-equal (cdr (assq 'specials comma)) ",")
-                          (setq ret (rfc822/parse-at-domain (cdr ret)))
-                          )
-                (setq route (append route comma (cdr (car ret))))
-                (setq lal (cdr ret))
-                )
-              (and (setq ret (rfc822/parse-ascii-token lal))
-                   (setq colon (car ret))
-                   (string-equal (cdr (assq 'specials colon)) ":")
-                   (setq route (append route colon))
-                   )
-              ))
-       (cons (cons 'route route)
-             (cdr ret)
-             )
-      )))
-
-(defun rfc822/parse-route-addr (lal)
-  (let ((ret (rfc822/parse-ascii-token lal))
-       < route addr-spec >)
-    (if (and ret
-            (setq < (car ret))
-            (string-equal (cdr (assq 'specials <)) "<")
-            (setq lal (cdr ret))
-            (progn (and (setq ret (rfc822/parse-route lal))
-                        (setq route (cdr (car ret)))
-                        (setq lal (cdr ret))
-                        )
-                   (setq ret (rfc822/parse-addr-spec lal))
-                   )
-            (setq addr-spec (cdr (car ret)))
-            (setq lal (cdr ret))
-            (setq ret (rfc822/parse-ascii-token lal))
-            (setq > (car ret))
-            (string-equal (cdr (assq 'specials >)) ">")
-            )
-       (cons (cons 'route-addr (append route addr-spec))
-             (cdr ret)
-             )
-      )))
-
-(defun rfc822/parse-phrase-route-addr (lal)
-  (let ((ret (rfc822/parse-phrase lal)) phrase)
-    (if ret
-       (progn
-         (setq phrase (cdr (car ret)))
-         (setq lal (cdr ret))
-         ))
-    (if (setq ret (rfc822/parse-route-addr lal))
-       (cons (list 'phrase-route-addr
-                   phrase
-                   (cdr (car ret)))
-             (cdr ret))
-      )))
-
-(defun rfc822/parse-mailbox (lal)
-  (let ((ret (or (rfc822/parse-phrase-route-addr lal)
-                (rfc822/parse-addr-spec lal)))
-       mbox comment)
-    (if (and ret
-            (prog1
-                (setq mbox (car ret))
-              (setq lal (cdr ret))
-              (if (and (setq ret (rfc822/parse-token-or-comment lal))
-                       (setq comment (cdr (assq 'comment (car ret))))
-                       )
-                  (setq lal (cdr ret))
-                )))
-       (cons (list 'mailbox mbox comment)
-             lal)
-      )))
-
-(defun rfc822/parse-group (lal)
-  (let ((ret (rfc822/parse-phrase lal))
-       phrase colon comma mbox semicolon)
-    (if (and ret
-            (setq phrase (cdr (car ret)))
-            (setq lal (cdr ret))
-            (setq ret (rfc822/parse-ascii-token lal))
-            (setq colon (car ret))
-            (string-equal (cdr (assq 'specials colon)) ":")
-            (setq lal (cdr ret))
-            (progn
-              (and (setq ret (rfc822/parse-mailbox lal))
-                   (setq mbox (list (car ret)))
-                   (setq lal (cdr ret))
-                   (progn
-                     (while (and (setq ret (rfc822/parse-ascii-token lal))
-                                 (setq comma (car ret))
-                                 (string-equal
-                                  (cdr (assq 'specials comma)) ",")
-                                 (setq lal (cdr ret))
-                                 (setq ret (rfc822/parse-mailbox lal))
-                                 (setq mbox (cons (car ret) mbox))
-                                 (setq lal (cdr ret))
-                                 )
-                       )))
-              (and (setq ret (rfc822/parse-ascii-token lal))
-                   (setq semicolon (car ret))
-                   (string-equal (cdr (assq 'specials semicolon)) ";")
-                   )))
-       (cons (list 'group phrase (nreverse mbox))
-             (cdr ret)
-             )
-      )))
-
-(defun rfc822/parse-address (lal)
-  (or (rfc822/parse-group lal)
-      (rfc822/parse-mailbox lal)
-      ))
-
-(defun rfc822/parse-addresses (lal)
-  (let ((ret (rfc822/parse-address lal)))
-    (if ret
-       (let ((dest (list (car ret))))
-         (setq lal (cdr ret))
-         (while (and (setq ret (rfc822/parse-ascii-token lal))
-                     (string-equal (cdr (assq 'specials (car ret))) ",")
-                     (setq ret (rfc822/parse-address (cdr ret)))
-                     )
-           (setq dest (cons (car ret) dest))
-           (setq lal (cdr ret))
-           )
-         (nreverse dest)
-         ))))
+(defalias 'rfc822/parse-address                'std11-parse-address)
+(defalias 'rfc822/parse-addresses      'std11-parse-addresses)
 
 (defun rfc822/addr-to-string (seq)
   (mapconcat (function