Update of /project/cxml/cvsroot/cxml/runes In directory common-lisp.net:/tmp/cvs-serv9430/runes Modified Files: characters.lisp dep-acl.lisp dep-acl5.lisp dep-clisp.lisp dep-cmucl-dtc.lisp dep-cmucl.lisp dep-openmcl.lisp dep-sbcl.lisp package.lisp runes.lisp xstream.lisp Removed Files: util.lisp Log Message: - Moved utility functions from the "runes" package to the "cxml" package to avoid name conflicts with functions from "glisp" of the same name. - Renamed defsubst to definline for the same reason. (This is a commit to the cxml repository, not the main closure repository. If you don't want cxml commit messages on the closure list, please complain to me and I'll change it.) Date: Fri Mar 25 19:16:57 2005 Author: dlichteblau Index: cxml/runes/characters.lisp diff -u cxml/runes/characters.lisp:1.1.1.3 cxml/runes/characters.lisp:1.2 --- cxml/runes/characters.lisp:1.1.1.3 Sun Mar 13 19:02:56 2005 +++ cxml/runes/characters.lisp Fri Mar 25 19:16:56 2005 @@ -28,31 +28,31 @@ (deftype rod () '(vector character)) (deftype simple-rod () '(simple-array character)) -(defsubst rune (rod index) +(definline rune (rod index) (char rod index)) (defun (setf rune) (new rod index) (setf (char rod index) new)) -(defsubst %rune (rod index) +(definline %rune (rod index) (aref (the simple-string rod) (the fixnum index))) -(defsubst (setf %rune) (new rod index) +(definline (setf %rune) (new rod index) (setf (aref (the simple-string rod) (the fixnum index)) new)) (defun rod-capitalize (rod) (string-upcase rod)) -(defsubst code-rune (x) (code-char x)) -(defsubst rune-code (x) (char-code x)) +(definline code-rune (x) (code-char x)) +(definline rune-code (x) (char-code x)) -(defsubst rune= (x y) +(definline rune= (x y) (char= x y)) (defun rune-downcase (rune) (char-downcase rune)) -(defsubst rune-upcase (rune) +(definline rune-upcase (rune) (char-upcase rune)) (defun rune-upper-case-letter-p (rune) @@ -70,13 +70,13 @@ (defun rod-upcase (rod) (string-upcase rod)) -(defsubst white-space-rune-p (char) +(definline white-space-rune-p (char) (or (char= char #\tab) (char= char #.(code-char 10)) ;Linefeed (char= char #.(code-char 13)) ;Carriage Return (char= char #\space))) -(defsubst digit-rune-p (char &optional (radix 10)) +(definline digit-rune-p (char &optional (radix 10)) (digit-char-p char radix)) (defun rod (x) @@ -100,7 +100,7 @@ (defun rod-equal (x y) (string-equal x y)) -(defsubst make-rod (size) +(definline make-rod (size) (make-string size)) (defun char-rune (char) Index: cxml/runes/dep-acl.lisp diff -u cxml/runes/dep-acl.lisp:1.1.1.1 cxml/runes/dep-acl.lisp:1.2 --- cxml/runes/dep-acl.lisp:1.1.1.1 Sun Mar 13 19:02:27 2005 +++ cxml/runes/dep-acl.lisp Fri Mar 25 19:16:56 2005 @@ -28,13 +28,13 @@ ;; Unfortunately it is also incapable to declaim such functions inline. ;; So we revoke the DEFUN hack from dep-gcl here. -(defmacro runes::defsubst (fun args &body body) +(defmacro runes::definline (fun args &body body) (if (and (consp fun) (eq (car fun) 'setf)) (let ((fnam (intern (concatenate 'string "(SETF " (symbol-name (cadr fun)) ")") (symbol-package (cadr fun))))) `(progn (defsetf ,(cadr fun) (&rest ap) (new-value) (list* ',fnam new-value ap)) - (runes::defsubst ,fnam ,args .,body))) + (runes::definline ,fnam ,args .,body))) `(progn (defun ,fun ,args .,body) (define-compiler-macro ,fun (&rest .args.) Index: cxml/runes/dep-acl5.lisp diff -u cxml/runes/dep-acl5.lisp:1.1.1.1 cxml/runes/dep-acl5.lisp:1.2 --- cxml/runes/dep-acl5.lisp:1.1.1.1 Sun Mar 13 19:02:27 2005 +++ cxml/runes/dep-acl5.lisp Fri Mar 25 19:16:56 2005 @@ -40,13 +40,13 @@ ;; Unfortunately it is also incapable to declaim such functions inline. ;; So we revoke the DEFUN hack from dep-gcl here. -(defmacro runes::defsubst (fun args &body body) +(defmacro runes::definline (fun args &body body) (if (and (consp fun) (eq (car fun) 'setf)) (let ((fnam (intern (concatenate 'string "(SETF " (symbol-name (cadr fun)) ")") (symbol-package (cadr fun))))) `(progn (defsetf ,(cadr fun) (&rest ap) (new-value) (list* ',fnam new-value ap)) - (runes::defsubst ,fnam ,args .,body))) + (runes::definline ,fnam ,args .,body))) (labels ((declp (x) (and (consp x) (eq (car x) 'declare)))) `(progn Index: cxml/runes/dep-clisp.lisp diff -u cxml/runes/dep-clisp.lisp:1.1.1.2 cxml/runes/dep-clisp.lisp:1.2 --- cxml/runes/dep-clisp.lisp:1.1.1.2 Sun Mar 13 19:02:30 2005 +++ cxml/runes/dep-clisp.lisp Fri Mar 25 19:16:56 2005 @@ -53,7 +53,7 @@ ;;; `(progn ;;; ',name))) -(defmacro runes::defsubst (name args &body body) +(defmacro runes::definline (name args &body body) `(progn (declaim (inline ,name)) (defun ,name ,args .,body))) Index: cxml/runes/dep-cmucl-dtc.lisp diff -u cxml/runes/dep-cmucl-dtc.lisp:1.1.1.1 cxml/runes/dep-cmucl-dtc.lisp:1.2 --- cxml/runes/dep-cmucl-dtc.lisp:1.1.1.1 Sun Mar 13 19:02:27 2005 +++ cxml/runes/dep-cmucl-dtc.lisp Fri Mar 25 19:16:56 2005 @@ -24,7 +24,7 @@ ;;; superseded by a newer version) or write to the Free Software ;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -(defmacro runes::defsubst (name args &body body) +(defmacro runes::definline (name args &body body) `(progn (declaim (inline ,name)) (defun ,name ,args .,body))) Index: cxml/runes/dep-cmucl.lisp diff -u cxml/runes/dep-cmucl.lisp:1.1.1.1 cxml/runes/dep-cmucl.lisp:1.2 --- cxml/runes/dep-cmucl.lisp:1.1.1.1 Sun Mar 13 19:02:27 2005 +++ cxml/runes/dep-cmucl.lisp Fri Mar 25 19:16:56 2005 @@ -24,7 +24,7 @@ ;;; superseded by a newer version) or write to the Free Software ;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -(defmacro runes::defsubst (name args &body body) +(defmacro runes::definline (name args &body body) `(progn (declaim (inline ,name)) (defun ,name ,args .,body))) Index: cxml/runes/dep-openmcl.lisp diff -u cxml/runes/dep-openmcl.lisp:1.1.1.1 cxml/runes/dep-openmcl.lisp:1.2 --- cxml/runes/dep-openmcl.lisp:1.1.1.1 Sun Mar 13 19:02:58 2005 +++ cxml/runes/dep-openmcl.lisp Fri Mar 25 19:16:56 2005 @@ -5,7 +5,7 @@ ;;;; ;;;; (c) copyright 1999 by Gilbert Baumann -(defmacro runes::defsubst (fun args &body body) +(defmacro runes::definline (fun args &body body) (if (consp fun) `(defun ,fun ,args ,@body) Index: cxml/runes/dep-sbcl.lisp diff -u cxml/runes/dep-sbcl.lisp:1.1.1.1 cxml/runes/dep-sbcl.lisp:1.2 --- cxml/runes/dep-sbcl.lisp:1.1.1.1 Sun Mar 13 19:02:27 2005 +++ cxml/runes/dep-sbcl.lisp Fri Mar 25 19:16:56 2005 @@ -24,7 +24,7 @@ ;;; superseded by a newer version) or write to the Free Software ;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -(defmacro runes::defsubst (name args &body body) +(defmacro runes::definline (name args &body body) `(progn (declaim (inline ,name)) (defun ,name ,args .,body))) Index: cxml/runes/package.lisp diff -u cxml/runes/package.lisp:1.1.1.2 cxml/runes/package.lisp:1.2 --- cxml/runes/package.lisp:1.1.1.2 Sun Mar 13 19:02:27 2005 +++ cxml/runes/package.lisp Fri Mar 25 19:16:56 2005 @@ -10,15 +10,8 @@ (defpackage :runes (:use :cl) - (:export #:defsubst + (:export #:definline - ;; util.lisp : - #:compose - #:curry - #:rcurry - #:until - #:while - ;; runes.lisp #:rune #:rod Index: cxml/runes/runes.lisp diff -u cxml/runes/runes.lisp:1.1.1.4 cxml/runes/runes.lisp:1.2 --- cxml/runes/runes.lisp:1.1.1.4 Sun Mar 13 19:02:44 2005 +++ cxml/runes/runes.lisp Fri Mar 25 19:16:56 2005 @@ -42,26 +42,26 @@ (deftype rod () '(array rune (*))) (deftype simple-rod () '(simple-array rune (*))) -(defsubst rune (rod index) +(definline rune (rod index) (aref rod index)) (defun (setf rune) (new rod index) (setf (aref rod index) new)) -(defsubst %rune (rod index) +(definline %rune (rod index) (aref (the (simple-array (unsigned-byte 16) (*)) rod) (the fixnum index))) -(defsubst (setf %rune) (new rod index) +(definline (setf %rune) (new rod index) (setf (aref (the (simple-array (unsigned-byte 16) (*)) rod) (the fixnum index)) new)) (defun rod-capitalize (rod) (warn "~S is not implemented." 'rod-capitalize) rod) -(defsubst code-rune (x) x) -(defsubst rune-code (x) x) +(definline code-rune (x) x) +(definline rune-code (x) x) -(defsubst rune= (x y) +(definline rune= (x y) (= x y)) (defun rune-downcase (rune) @@ -70,7 +70,7 @@ ((<= #x00c0 rune #x00de) (+ rune #x20)) (t rune))) -(defsubst rune-upcase (rune) +(definline rune-upcase (rune) (cond ((<= #x0061 rune #x007a) (- rune #x20)) ((= rune #x00f7) rune) ((<= #x00e0 rune #x00fe) (- rune #x20)) @@ -95,13 +95,13 @@ ;; FIXME (map '(simple-array (unsigned-byte 16) (*)) #'rune-upcase rod)) -(defsubst white-space-rune-p (char) +(definline white-space-rune-p (char) (or (= char 9) ;TAB (= char 10) ;Linefeed (= char 13) ;Carriage Return (= char 32))) ;Space -(defsubst digit-rune-p (char &optional (radix 10)) +(definline digit-rune-p (char &optional (radix 10)) (cond ((<= #.(char-code #\0) char #.(char-code #\9)) (and (< (- char #.(char-code #\0)) radix) (- char #.(char-code #\0)))) @@ -141,7 +141,7 @@ (unless (rune-equal (rune x i) (rune y i)) (return nil))))) -(defsubst make-rod (size) +(definline make-rod (size) (make-array size :element-type 'rune)) (defun char-rune (char) Index: cxml/runes/xstream.lisp diff -u cxml/runes/xstream.lisp:1.1.1.5 cxml/runes/xstream.lisp:1.2 --- cxml/runes/xstream.lisp:1.1.1.5 Sun Mar 13 19:02:51 2005 +++ cxml/runes/xstream.lisp Fri Mar 25 19:16:56 2005 @@ -217,7 +217,7 @@ nil) ,input)) -(defsubst unread-rune (rune input) +(definline unread-rune (rune input) "Unread the last recently read rune; if there wasn't such a rune, you deserve to lose." (declare (ignore rune))