X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=inline;f=mime-parse.el;h=ac77bffc5c9b95072da310a9db983bcb0b50144a;hb=9a66489164af2c205b587629a8efe9d175c120e9;hp=6e4beffc89840c908c7f5a91d10ed246e8efd3b5;hpb=74f839548b51f67522142be835ee4ac30b4d4484;p=elisp%2Fsemi.git

diff --git a/mime-parse.el b/mime-parse.el
index 6e4beff..ac77bff 100644
--- a/mime-parse.el
+++ b/mime-parse.el
@@ -1,12 +1,11 @@
 ;;; mime-parse.el --- MIME message parser
 
-;; Copyright (C) 1994,1995,1996,1997 Free Software Foundation, Inc.
+;; Copyright (C) 1994,1995,1996,1997,1998 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Id: mime-parse.el,v 0.18 1997-09-05 08:10:44 morioka Exp $
 ;; Keywords: parse, MIME, multimedia, mail, news
 
-;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
+;; This file is part of SEMI (Spadework for Emacs MIME Interfaces).
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -39,36 +38,6 @@ which are string or symbol."
 			      )))
 		     args "")))
 
-(defmacro define-structure (name &rest slots)
-  (let ((pred (symbol-concat name '-p)))
-    (cons 'progn
-	  (nconc
-	   (list
-	    (` (defun (, pred) (obj)
-		 (and (vectorp obj)
-		      (eq (elt obj 0) '(, name))
-		      ))
-	       )
-	    (` (defun (, (symbol-concat name '/create)) (, slots)
-		 (, (cons 'vector (cons (list 'quote name) slots)))
-		 )
-	       ))
-	   (let ((i 1))
-	     (mapcar (function
-		      (lambda (slot)
-			(prog1
-			    (` (defun (, (symbol-concat name '/ slot)) (obj)
-				 (if ((, pred) obj)
-				     (elt obj (, i))
-				   ))
-			       )
-			  (setq i (+ i 1))
-			  )
-			)) slots)
-	     )
-	   (list (list 'quote name))
-	   ))))
-
 
 ;;; @ field parser
 ;;;
@@ -76,6 +45,9 @@ which are string or symbol."
 (defsubst regexp-* (regexp)
   (concat regexp "*"))
 
+(defsubst regexp-or (&rest args)
+  (concat "\\(" (mapconcat (function identity) args "\\|") "\\)"))
+
 (defconst rfc822/quoted-pair-regexp "\\\\.")
 (defconst rfc822/qtext-regexp
   (concat "[^" (char-list-to-string std11-non-qtext-char-list) "]"))
@@ -186,27 +158,32 @@ and return parsed it. [mime-parse.el]"
 ;;; @ message parser
 ;;;
 
-(define-structure mime::content-info
-  rcnum point-min point-max type parameters encoding children)
-
-(defsubst make-mime-entity-info (rcnum
-				 point-min point-max
-				 media-type media-subtype
-				 parameters encoding children)
-  (let ((ctype (if media-type
-		   (if media-subtype
-		       (format "%s/%s" media-type media-subtype)
-		     (symbol-name media-type)))))
-    (mime::content-info/create rcnum point-min point-max
-			       ctype params encoding
-			       children)
-    ))
-
-(defsubst mime-entity-info-point-min (entity-info)
-  (mime::content-info/point-min entity-info))
-
-(defsubst mime-entity-info-point-max (entity-info)
-  (mime::content-info/point-max entity-info))
+(defsubst make-mime-entity (node-id
+			    point-min point-max
+			    media-type media-subtype parameters
+			    encoding children)
+  (vector node-id point-min point-max
+	  media-type media-subtype parameters encoding children))
+
+(defsubst mime-entity-node-id (entity-info)       (aref entity-info 0))
+(defsubst mime-entity-point-min (entity-info)     (aref entity-info 1))
+(defsubst mime-entity-point-max (entity-info)     (aref entity-info 2))
+(defsubst mime-entity-media-type (entity-info)    (aref entity-info 3))
+(defsubst mime-entity-media-subtype (entity-info) (aref entity-info 4))
+(defsubst mime-entity-parameters (entity-info)    (aref entity-info 5))
+(defsubst mime-entity-encoding (entity-info)      (aref entity-info 6))
+(defsubst mime-entity-children (entity-info)      (aref entity-info 7))
+
+(defsubst mime-type/subtype-string (type &optional subtype)
+  "Return type/subtype string from TYPE and SUBTYPE."
+  (if type
+      (if subtype
+	  (format "%s/%s" type subtype)
+	(format "%s" type))))
+
+(defsubst mime-entity-type/subtype (entity-info)
+  (mime-type/subtype-string (mime-entity-media-type entity-info)
+			    (mime-entity-media-subtype entity-info)))
 
 (defun mime-parse-multipart (boundary primtype subtype params encoding rcnum)
   (goto-char (point-min))
@@ -240,7 +217,7 @@ and return parsed it. [mime-parse.el]"
 	  (setq ret (mime-parse-message dc-ctl "7bit" (cons i rcnum)))
 	  )
 	(setq children (cons ret children))
-	(goto-char (mime-entity-info-point-max ret))
+	(goto-char (mime-entity-point-max ret))
 	(goto-char (setq cb ncb))
 	(setq i (1+ i))
 	)
@@ -251,9 +228,9 @@ and return parsed it. [mime-parse.el]"
 	)
       (setq children (cons ret children))
       )
-    (make-mime-entity-info rcnum beg (point-max)
-			   primtype subtype params encoding
-			   (nreverse children))
+    (make-mime-entity rcnum beg (point-max)
+		      primtype subtype params encoding
+		      (nreverse children))
     ))
 
 (defun mime-parse-message (&optional default-ctl default-encoding rcnum)
@@ -278,28 +255,35 @@ mime-{parse|read}-Content-Type."
 		  (memq subtype '(rfc822 news))
 		  )
 	     (goto-char (point-min))
-	     (make-mime-entity-info rcnum
-				    (point-min) (point-max)
-				    primtype subtype params encoding
-				    (save-restriction
-				      (narrow-to-region
-				       (if (re-search-forward "^$" nil t)
-					   (1+ (match-end 0))
-					 (point-min)
-					 )
-				       (point-max))
-				      (list (mime-parse-message
-					     nil nil (cons 0 rcnum)))
-				      ))
+	     (make-mime-entity rcnum (point-min) (point-max)
+			       primtype subtype params encoding
+			       (save-restriction
+				 (narrow-to-region
+				  (if (re-search-forward "^$" nil t)
+				      (1+ (match-end 0))
+				    (point-min)
+				    )
+				  (point-max))
+				 (list (mime-parse-message
+					nil nil (cons 0 rcnum)))
+				 ))
 	     )
 	    (t 
-	     (make-mime-entity-info rcnum (point-min) (point-max)
-				    primtype subtype params encoding
-				    nil)
+	     (make-mime-entity rcnum (point-min) (point-max)
+			       primtype subtype params encoding
+			       nil)
 	     ))
       )))
 
 
+;;; @ utilities
+;;;
+
+(defsubst mime-root-entity-p (entity)
+  "Return t if ENTITY is root-entity (message)."
+  (null (mime-entity-node-id entity)))
+
+
 ;;; @ end
 ;;;