From 5b49e64f37f148c6557a15b9ad674509a46f971a Mon Sep 17 00:00:00 2001 From: morioka Date: Fri, 5 Sep 1997 12:10:48 +0000 Subject: [PATCH] Abolish macro `define-structure'. (make-mime-entity-info, mime-entity-info-rnum, mime-entity-info-point-min, mime-entity-info-point-max, mime-entity-info-parameters, mime-entity-info-encoding, mime-entity-info-children): New implementation. (mime-entity-info-media-type, mime-entity-info-media-subtype): New inline function. --- mime-parse.el | 83 ++++++++++++++------------------------------------------- 1 file changed, 20 insertions(+), 63 deletions(-) diff --git a/mime-parse.el b/mime-parse.el index 3fee0a9..61b7e92 100644 --- a/mime-parse.el +++ b/mime-parse.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1994,1995,1996,1997 Free Software Foundation, Inc. ;; Author: MORIOKA Tomohiko -;; Version: $Id: mime-parse.el,v 0.23 1997-09-05 11:48:08 morioka Exp $ +;; Version: $Id: mime-parse.el,v 0.24 1997-09-05 12:10:48 morioka Exp $ ;; Keywords: parse, MIME, multimedia, mail, news ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces). @@ -39,36 +39,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 ;;; @@ -186,42 +156,29 @@ 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-rnum (entity-info) - (mime::content-info/rcnum entity-info)) - -(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)) + media-type media-subtype parameters + encoding children) + (vector rcnum point-min point-max + media-type media-subtype parameters encoding children)) + +(defsubst mime-entity-info-rnum (entity-info) (aref entity-info 0)) +(defsubst mime-entity-info-point-min (entity-info) (aref entity-info 1)) +(defsubst mime-entity-info-point-max (entity-info) (aref entity-info 2)) +(defsubst mime-entity-info-media-type (entity-info) (aref entity-info 3)) +(defsubst mime-entity-info-media-subtype (entity-info) (aref entity-info 4)) +(defsubst mime-entity-info-parameters (entity-info) (aref entity-info 5)) +(defsubst mime-entity-info-encoding (entity-info) (aref entity-info 6)) +(defsubst mime-entity-info-children (entity-info) (aref entity-info 7)) (defsubst mime-entity-info-type/subtype (entity-info) - (mime::content-info/type entity-info)) - -(defsubst mime-entity-info-parameters (entity-info) - (mime::content-info/parameters entity-info)) - -(defsubst mime-entity-info-encoding (entity-info) - (mime::content-info/encoding entity-info)) - -(defsubst mime-entity-info-children (entity-info) - (mime::content-info/children entity-info)) + (let ((type (mime-entity-info-media-type entity-info))) + (if type + (let ((subtype (mime-entity-info-media-subtype entity-info))) + (if subtype + (format "%s/%s" type subtype) + (symbol-name type)))))) (defun mime-parse-multipart (boundary primtype subtype params encoding rcnum) (goto-char (point-min)) -- 1.7.10.4