/[cxml]/cxml/mlisp-patch.diff
ViewVC logotype

Contents of /cxml/mlisp-patch.diff

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations)
Wed Apr 6 19:25:18 2005 UTC (9 years ago) by dlichteblau
Branch: MAIN
CVS Tags: rel-2005-06-25, HEAD
Changes since 1.1: +34 -34 lines
updated mlisp-patch.diff
1 --- xml/xml-parse.lisp
2 +++ xml/xml-parse.lisp
3 @@ -2497,20 +2497,20 @@
4 (let ((input-var (gensym))
5 (collect (gensym))
6 (c (gensym)))
7 - `(LET ((,input-var ,input))
8 - (MULTIPLE-VALUE-BIND (,res ,res-start ,res-end)
9 - (WITH-RUNE-COLLECTOR/RAW (,collect)
10 - (LOOP
11 - (LET ((,c (PEEK-RUNE ,input-var)))
12 - (COND ((EQ ,c :EOF)
13 + `(let ((,input-var ,input))
14 + (multiple-value-bind (,res ,res-start ,res-end)
15 + (with-rune-collector/raw (,collect)
16 + (loop
17 + (let ((,c (peek-rune ,input-var)))
18 + (cond ((eq ,c :eof)
19 ;; xxx error message
20 - (RETURN))
21 - ((FUNCALL ,predicate ,c)
22 - (RETURN))
23 + (return))
24 + ((funcall ,predicate ,c)
25 + (return))
26 (t
27 (,collect ,c)
28 - (CONSUME-RUNE ,input-var))))))
29 - (LOCALLY
30 + (consume-rune ,input-var))))))
31 + (locally
32 ,@body)))))
33
34 (defun read-name-token (input)
35
36
37
38 Index: xml/xml-name-rune-p.lisp
39 ===================================================================
40 RCS file: /project/cxml/cvsroot/cxml/xml/xml-name-rune-p.lisp,v
41 retrieving revision 1.2
42 diff -r1.2 xml-name-rune-p.lisp
43 214,225c214,225
44 < (DEFINLINE NAME-RUNE-P (RUNE)
45 < (SETF RUNE (RUNE-CODE RUNE))
46 < (AND (<= 0 RUNE ,*max*)
47 < (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3)))
48 < (= 1 (SBIT ',(predicate-to-bv #'name-rune-p)
49 < (THE FIXNUM RUNE))))))
50 < (DEFINLINE NAME-START-RUNE-P (RUNE)
51 < (SETF RUNE (RUNE-CODE RUNE))
52 < (AND (<= 0 RUNE ,*MAX*)
53 < (LOCALLY (DECLARE (OPTIMIZE (SAFETY 0) (SPEED 3)))
54 < (= 1 (SBIT ',(predicate-to-bv #'name-start-rune-p)
55 < (THE FIXNUM RUNE)))))))) ))))
56 ---
57 > (definline name-rune-p (rune)
58 > (setf rune (rune-code rune))
59 > (and (<= 0 rune ,*max*)
60 > (locally (declare (optimize (safety 0) (speed 3)))
61 > (= 1 (sbit ',(predicate-to-bv #'name-rune-p)
62 > (the fixnum rune))))))
63 > (definline name-start-rune-p (rune)
64 > (setf rune (rune-code rune))
65 > (and (<= 0 rune ,*max*)
66 > (locally (declare (optimize (safety 0) (speed 3)))
67 > (= 1 (sbit ',(predicate-to-bv #'name-start-rune-p)
68 > (the fixnum rune)))))))) ))))

  ViewVC Help
Powered by ViewVC 1.1.5