updated mlisp-patch.diff

svenemtell · Apr 6, 2005 · 8806c62 · 8806c62
1 parent 013867c
commit 8806c62
Showing 1 changed file with 34 additions and 34 deletions.
diff --git a/mlisp-patch.diff b/mlisp-patch.diff
@@ -1,37 +1,6 @@
---- orig/xml/xml-name-rune-p.lisp
-+++ mod/xml/xml-name-rune-p.lisp
-@@ -206,13 +206,15 @@
-                      (setf (aref r i) 1))))) )
-
-           `(progn
--             (DEFSUBST NAME-RUNE-P (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)
--               (AND (<= 0 RUNE ,*MAX*)
--                    (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3)))
--                             (= 1 (SBIT ',(predicate-to-bv #'name-start-rune-p)
--                                        (THE FIXNUM RUNE)))))))) ))))
-\ No newline at end of file
-+             (defsubst name-rune-p (rune)
-+               (let ((code (rune-code rune)))
-+                 (and (<= 0 code ,*max*)
-+                      (locally (declare (optimize (safety 0) (speed 3)))
-+                        (= 1 (sbit ',(predicate-to-bv #'name-rune-p)
-+                                   (the fixnum code)))))))
-+             (defsubst name-start-rune-p (rune)
-+               (let ((code (rune-code rune)))
-+                 (and (<= 0 code ,*max*)
-+                      (locally (declare (optimize (safety 0) (speed 3)))
-+                        (= 1 (sbit ',(predicate-to-bv #'name-start-rune-p)
-+                                   (the fixnum code))))))))) ))))
-
-
---- orig/xml/xml-parse.lisp
-+++ mod/xml/xml-parse.lisp
-@@ -2470,20 +2469,20 @@
+--- xml/xml-parse.lisp
++++ xml/xml-parse.lisp
+@@ -2497,20 +2497,20 @@
    (let ((input-var (gensym))
          (collect (gensym))
          (c (gensym)))
@@ -66,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)))))))) ))))