Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv9227

Modified Files: mlisp-patch.diff Log Message: updated mlisp-patch.diff

Date: Wed Apr 6 21:25:18 2005 Author: dlichteblau

Index: cxml/mlisp-patch.diff diff -u cxml/mlisp-patch.diff:1.1.1.4 cxml/mlisp-patch.diff:1.2 --- cxml/mlisp-patch.diff:1.1.1.4 Sun Mar 13 19:02:31 2005 +++ cxml/mlisp-patch.diff Wed Apr 6 21:25:18 2005 @@ -1,44 +1,5 @@ -* looking for david@knowledgetools.de--cxml/cxml--devel--1.0--patch-194 to compare with -* comparing to david@knowledgetools.de--cxml/cxml--devel--1.0--patch-194 -M xml/xml-name-rune-p.lisp -M xml/xml-parse.lisp - -* modified files - ---- orig/xml/xml-name-rune-p.lisp -+++ mod/xml/xml-name-rune-p.lisp -@@ -206,15 +206,15 @@ - (setf (aref r i) 1))))) ) - - `(progn -- (DEFSUBST NAME-RUNE-P (RUNE) -- (SETF RUNE (RUNE-CODE RUNE)) -- (AND (<= 0 RUNE ,*max*) -- (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3))) -- (= 1 (SBIT ',(predicate-to-bv #'name-rune-p) -- (THE FIXNUM RUNE)))))) -- (DEFSUBST NAME-START-RUNE-P (RUNE) -- (SETF RUNE (RUNE-CODE RUNE)) -- (AND (<= 0 RUNE ,*MAX*) -- (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3))) -- (= 1 (SBIT ',(predicate-to-bv #'name-start-rune-p) -- (THE FIXNUM RUNE)))))))) )))) -+ (defsubst name-rune-p (rune) -+ (setf rune (rune-code rune)) -+ (and (<= 0 rune ,*max*) -+ (locally (declare (optimize (safety 0) (speed 3))) -+ (= 1 (sbit ',(predicate-to-bv #'name-rune-p) -+ (the fixnum rune)))))) -+ (defsubst name-start-rune-p (rune) -+ (setf rune (rune-code rune)) -+ (and (<= 0 rune ,*max*) -+ (locally (declare (optimize (safety 0) (speed 3))) -+ (= 1 (sbit ',(predicate-to-bv #'name-start-rune-p) -+ (the fixnum rune)))))))) )))) - - ---- orig/xml/xml-parse.lisp -+++ mod/xml/xml-parse.lisp +--- xml/xml-parse.lisp ++++ xml/xml-parse.lisp @@ -2497,20 +2497,20 @@ (let ((input-var (gensym)) (collect (gensym)) @@ -74,3 +35,34 @@

+Index: xml/xml-name-rune-p.lisp +=================================================================== +RCS file: /project/cxml/cvsroot/cxml/xml/xml-name-rune-p.lisp,v +retrieving revision 1.2 +diff -r1.2 xml-name-rune-p.lisp +214,225c214,225 +< (DEFINLINE NAME-RUNE-P (RUNE) +< (SETF RUNE (RUNE-CODE RUNE)) +< (AND (<= 0 RUNE ,*max*) +< (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3))) +< (= 1 (SBIT ',(predicate-to-bv #'name-rune-p) +< (THE FIXNUM RUNE)))))) +< (DEFINLINE NAME-START-RUNE-P (RUNE) +< (SETF RUNE (RUNE-CODE RUNE)) +< (AND (<= 0 RUNE ,*MAX*) +< (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3))) +< (= 1 (SBIT ',(predicate-to-bv #'name-start-rune-p) +< (THE FIXNUM RUNE)))))))) )))) +--- +> (definline name-rune-p (rune) +> (setf rune (rune-code rune)) +> (and (<= 0 rune ,*max*) +> (locally (declare (optimize (safety 0) (speed 3))) +> (= 1 (sbit ',(predicate-to-bv #'name-rune-p) +> (the fixnum rune)))))) +> (definline name-start-rune-p (rune) +> (setf rune (rune-code rune)) +> (and (<= 0 rune ,*max*) +> (locally (declare (optimize (safety 0) (speed 3))) +> (= 1 (sbit ',(predicate-to-bv #'name-start-rune-p) +> (the fixnum rune)))))))) ))))