r4811: Auto commit for Debian build

diff --git a/buff-input.lisp b/buff-input.lisp
index 2e7f370842d32687712ab710d72d798b7193dbae..f0802bc0bff2b141479a24a27668c0c7ab7fbf57 100644 (file)
--- a/buff-input.lisp
+++ b/buff-input.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;

-;;;; $Id: buff-input.lisp,v 1.4 2003/05/02 07:28:17 kevin Exp $
+;;;; $Id: buff-input.lisp,v 1.5 2003/05/05 19:54:14 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
 ;;;;


@@ -18,7 +18,8 @@
 
 (in-package :kmrcl)
 
 
 (in-package :kmrcl)
 

-(declaim (optimize (speed 3) (safety 0) (space 0) (debug 0)))
+(eval-when (:compile-toplevel)
+  (declaim (optimize (speed 3) (safety 0) (space 0) (debug 0))))

 
 (defconstant +max-field+ 10000)
 (defconstant +max-fields-per-line+ 20)
 
 (defconstant +max-field+ 10000)
 (defconstant +max-fields-per-line+ 20)

diff --git a/strings.lisp b/strings.lisp
index 028d97870c2fa4aacc96f5955f9fa1cabed95e8f..a6db99b655ddde6af58900eab8b8d289167a3bcf 100644 (file)
--- a/strings.lisp
+++ b/strings.lisp
@@ -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.17 2003/05/04 14:52:10 kevin Exp $
+;;;; $Id: strings.lisp,v 1.18 2003/05/05 19:54:14 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
 ;;;;


@@ -44,41 +44,50 @@
          (setq in-word nil))))
     n-words))
 
          (setq in-word nil))))
     n-words))
 

-#+excl
-(defun delimited-string-to-list (string &optional (separator #\space))
+#+allegro
+(defun delimited-string-to-list (string &optional (separator #\space) skip-terminal)
+  "Uses allegro's internal function since that benchmarks faster than
+my algorithm. Does allegro use assembly?"
+  (declare (string string) (character separator))
+  (when skip-terminal
+    (let ((len (length string)))
+      (when (and (plusp len) (char= separator (char string (1- len))))
+       (setq string (subseq string 0 (1- len))))))

   (excl:delimited-string-to-list string separator))
 
   (excl:delimited-string-to-list string separator))
 

-#-excl
-(defun delimited-string-to-list (sequence &optional (separator #\space))
-  "Split a string by a delimitor"
-  (loop
-      with start = 0
-      for end = (position separator sequence :start start)
-      collect (subseq sequence start end)
-      until (null end)
-      do
-    (setf start (1+ end))))
-
-(defun ndelimited-string-to-list (sequence &optional (separator #\space))
-  "Split a string by a delimitor"
-  (loop
-      with start = 0
-      for end = (position separator sequence :start start)
-      collect (nsubseq sequence start end)
-      until (null end)
-      do
-    (setf start (1+ end))))
-
-#+excl
-(defun list-to-delimited-string (list &optional (separator #\space))
-  (excl:list-to-delimited-string list separator))
+(defun #-allegro  delimited-string-to-list
+       #+allegro my-delimited-string-to-list
+       (string &optional (separator #\space) skip-terminal)
+  "split a string with delimiter"
+  (declare (optimize (speed 3) (safety 0) (space 0) (compilation-speed 0))
+          (type string string)
+          (type character separator))
+  (do* ((len (length string))
+       (output '())
+       (pos 0)
+       (end (position separator string :start pos :end len)
+            (position separator string :start pos :end len))
+       (previous nil))
+       ((null end)
+       (cond
+         ((null previous)
+          (list string))
+         (t
+          (incf previous)
+          (if (< previous len)
+              (push (subseq string previous) output)
+              (unless skip-terminal
+                (push "" output)))
+          (nreverse output))))
+    (declare (type fixnum pos len)
+            (type (or null fixnum) end previous))
+    (push (subseq string pos end) output)
+    (setq previous end)
+    (setq pos (1+ end))))
+

 
 

-#-excl

 (defun list-to-delimited-string (list &optional (separator #\space))
 (defun list-to-delimited-string (list &optional (separator #\space))

-  (if (consp list)
-      (let ((fmt (format nil "~~A~~{~A~~A~~}" separator)))
-       (format nil fmt (first list) (rest list)))
-      ""))
+  (format nil (format nil "~~{~~A~~^~A~~}" separator) list))

 
 (defun string-invert (str)
   "Invert case of a string"
 
 (defun string-invert (str)
   "Invert case of a string"