projects
/
kmrcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r5036: *** empty log message ***
[kmrcl.git]
/
strings.lisp
diff --git
a/strings.lisp
b/strings.lisp
index bfd7c984541a5e4a8abcb268ef37bec740cea132..9d8620e1a426ebf8daa916a616ba30f7e837cc85 100644
(file)
--- a/
strings.lisp
+++ b/
strings.lisp
@@
-1,4
+1,4
@@
-
<
;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
@@
-7,7
+7,7
@@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: strings.lisp,v 1.3
0 2003/05/16 08:37:20
kevin Exp $
+;;;; $Id: strings.lisp,v 1.3
4 2003/05/26 21:43:05
kevin Exp $
;;;;
;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
;;;;
;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
@@
-30,19
+30,19
@@
(defun count-string-words (str)
(declare (simple-string str)
(defun count-string-words (str)
(declare (simple-string str)
- (optimize (speed 3) (safety 0)))
+ (optimize (speed 3) (safety 0)
(space 0)
))
(let ((n-words 0)
(in-word nil))
(declare (fixnum n-words))
(let ((n-words 0)
(in-word nil))
(declare (fixnum n-words))
- (do
times (i
(length str))
-
(let ((ch (char str
i)))
- (
declare (character ch)
)
-
(if (alphanumericp ch
)
- (unless in-word
- (incf n-words)
-
(setq in-word t)
)
-
(setq in-word nil))
))
-
n-words
))
+ (do
* ((len
(length str))
+
(i 0 (1+
i)))
+ (
(= i len) n-words
)
+
(declare (fixnum i)
)
+ (if (alphanumericp (schar str i))
+ (unless in-word
+
(incf n-words
)
+
(setq in-word t
))
+
(setq in-word nil)))
))
;; From Larry Hunter with modifications
(defun position-char (char string start max)
;; From Larry Hunter with modifications
(defun position-char (char string start max)
@@
-201,9
+201,7
@@
list of characters and replacement strings."
(defun escape-xml-string (string)
"Escape invalid XML characters"
(defun escape-xml-string (string)
"Escape invalid XML characters"
- (substitute-chars-strings
- string '((#\& . "&") (#\> . ">") (#\< . "<") (#\" . """))))
-
+ (substitute-chars-strings string '((#\& . "&") (#\< . "<"))))
(defun make-usb8-array (len)
(make-array len :adjustable nil
(defun make-usb8-array (len)
(make-array len :adjustable nil