projects
/
kmrcl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
23502ca
)
r4824: Auto commit for Debian build
author
Kevin M. Rosenberg
<kevin@rosenberg.net>
Tue, 6 May 2003 01:50:04 +0000
(
01:50
+0000)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Tue, 6 May 2003 01:50:04 +0000
(
01:50
+0000)
buff-input.lisp
patch
|
blob
|
history
diff --git
a/buff-input.lisp
b/buff-input.lisp
index 3d678431776039b30db330cb0588bc26c85496da..36ff2276527c3faa6ec0616937e76f3b1f7ff8d2 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.
7 2003/05/06 01:45:4
4 kevin Exp $
+;;;; $Id: buff-input.lisp,v 1.
8 2003/05/06 01:50:0
4 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
;;;;
@@
-48,10
+48,10
@@
(setf (fill-pointer fields) 0)
(do ((ifield 0 (1+ ifield))
(linedone nil)
(setf (fill-pointer fields) 0)
(do ((ifield 0 (1+ ifield))
(linedone nil)
- (eof nil))
- (linedone (if eof eof fields))
+ (
is-
eof nil))
+ (linedone (if
is-
eof eof fields))
(declare (type fixnum ifield)
(declare (type fixnum ifield)
- (type boolean linedone eof))
+ (type boolean linedone
is-
eof))
(let ((field (aref fields ifield)))
(declare (type base-string field))
(do ((ipos 0)
(let ((field (aref fields ifield)))
(declare (type base-string field))
(do ((ipos 0)
@@
-76,7
+76,7
@@
(setf (fill-pointer fields) ifield)
(setq fielddone t)
(setq linedone t)
(setf (fill-pointer fields) ifield)
(setq fielddone t)
(setq linedone t)
- (setq eof t))
+ (setq
is-
eof t))
(t
(setf (char field ipos) rc)
(incf ipos)))))))
(t
(setf (char field ipos) rc)
(incf ipos)))))))
@@
-102,16
+102,17
@@
bufstruct))
bufstruct))
-(defun read-buffered-fields2 (fields strm &optional (field-delim +field-delim+))
+(defun read-buffered-fields2 (fields strm &optional (field-delim +field-delim+)
+ (eof 'eof))
"Read a line from a stream into a field buffers"
(declare (character field-delim))
(setf (field-buffers-nfields fields) 0)
(do ((ifield 0 (1+ ifield))
(linedone nil)
"Read a line from a stream into a field buffers"
(declare (character field-delim))
(setf (field-buffers-nfields fields) 0)
(do ((ifield 0 (1+ ifield))
(linedone nil)
- (eof nil))
- (linedone (if
eof '
eof fields))
+ (
is-
eof nil))
+ (linedone (if
is-eof
eof fields))
(declare (fixnum ifield)
(declare (fixnum ifield)
- (t linedone eof))
+ (t linedone
is-
eof))
(let ((field (aref (field-buffers-buffers fields) ifield)))
(declare (simple-string field))
(do ((ipos 0)
(let ((field (aref (field-buffers-buffers fields) ifield)))
(declare (simple-string field))
(do ((ipos 0)
@@
-136,7
+137,7
@@
(setf (field-buffers-nfields fields) ifield)
(setq fielddone t)
(setq linedone t)
(setf (field-buffers-nfields fields) ifield)
(setq fielddone t)
(setq linedone t)
- (setq eof t))
+ (setq
is-
eof t))
(t
(setf (char field ipos) rc)
(incf ipos)))))))
(t
(setf (char field ipos) rc)
(incf ipos)))))))
@@
-152,17
+153,18
@@
(let ((linebuffer (make-array +max-line+
:element-type 'character
:fill-pointer 0)))
(let ((linebuffer (make-array +max-line+
:element-type 'character
:fill-pointer 0)))
- (defun read-buffered-line (strm)
+ (defun read-buffered-line (strm
eof
)
"Read a line from astream into a vector buffer"
"Read a line from astream into a vector buffer"
+ (declare (optimize (speed 3) (space 0) (safety 0)))
(let ((pos 0)
(done nil))
(let ((pos 0)
(done nil))
- (declare (fixnum pos) (
t
done))
+ (declare (fixnum pos) (
boolean
done))
(setf (fill-pointer linebuffer) 0)
(do ((c (read-char strm nil +eof-char+)
(read-char strm nil +eof-char+)))
(done (progn
(unless (eql c +eof-char+) (unread-char c strm))
(setf (fill-pointer linebuffer) 0)
(do ((c (read-char strm nil +eof-char+)
(read-char strm nil +eof-char+)))
(done (progn
(unless (eql c +eof-char+) (unread-char c strm))
- (if (eql c +eof-char+)
'
eof linebuffer)))
+ (if (eql c +eof-char+) eof linebuffer)))
(declare (character c))
(cond
((char= c #\Newline)
(declare (character c))
(cond
((char= c #\Newline)