OSCL/CXML
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated mlisp-patch.diff

Browse Source
This commit is contained in:
dlichteblau
2005-04-06 19:25:18 +00:00
parent 013867cf4e
commit 8806c62695
1 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
mlisp-patch.diff
View File

@ -1,37 +1,6 @@
--- orig/xml/xml-name-rune-p.lisp --- xml/xml-parse.lisp
+++ mod/xml/xml-name-rune-p.lisp +++ xml/xml-parse.lisp
@@ -206,13 +206,15 @@ @@ -2497,20 +2497,20 @@
(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 @@
(let ((input-var (gensym)) (let ((input-var (gensym))
(collect (gensym)) (collect (gensym))
(c (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)))))))) ))))