;;;; files for more information.
(in-package "SB!IMPL")
-
-;;; This checks to see whether the array is simple and the start and
-;;; end are in bounds. If so, it proceeds with those values.
-;;; Otherwise, it calls %WITH-ARRAY-DATA. Note that %WITH-ARRAY-DATA
-;;; may be further optimized.
-;;;
-;;; Given any ARRAY, bind DATA-VAR to the array's data vector and
-;;; START-VAR and END-VAR to the start and end of the designated
-;;; portion of the data vector. SVALUE and EVALUE are any start and
-;;; end specified to the original operation, and are factored into the
-;;; bindings of START-VAR and END-VAR. OFFSET-VAR is the cumulative
-;;; offset of all displacements encountered, and does not include
-;;; SVALUE.
-(defmacro with-array-data (((data-var array &key offset-var)
- (start-var &optional (svalue 0))
- (end-var &optional (evalue nil)))
- &body forms)
- (once-only ((n-array array)
- (n-svalue `(the index ,svalue))
- (n-evalue `(the (or index null) ,evalue)))
- `(multiple-value-bind (,data-var
- ,start-var
- ,end-var
- ,@(when offset-var `(,offset-var)))
- (if (not (array-header-p ,n-array))
- (let ((,n-array ,n-array))
- (declare (type (simple-array * (*)) ,n-array))
- ,(once-only ((n-len `(length ,n-array))
- (n-end `(or ,n-evalue ,n-len)))
- `(if (<= ,n-svalue ,n-end ,n-len)
- ;; success
- (values ,n-array ,n-svalue ,n-end 0)
- ;; failure: Make a NOTINLINE call to
- ;; %WITH-ARRAY-DATA with our bad data
- ;; to cause the error to be signalled.
- (locally
- (declare (notinline %with-array-data))
- (%with-array-data ,n-array ,n-svalue ,n-evalue)))))
- (%with-array-data ,n-array ,n-svalue ,n-evalue))
- ,@forms)))
-
-#!-gengc
+\f
(defmacro without-gcing (&rest body)
#!+sb-doc
"Executes the forms in the body without doing a garbage collection."
,@body)
(when (and *need-to-collect-garbage* (not *gc-inhibit*))
(maybe-gc nil))))
-
-#!+gengc
-(defmacro without-gcing (&rest body)
- #!+sb-doc
- "Executes the forms in the body without doing a garbage collection."
- `(without-interrupts ,@body))
\f
-;;; Eof-Or-Lose is a useful macro that handles EOF.
+;;; EOF-OR-LOSE is a useful macro that handles EOF.
(defmacro eof-or-lose (stream eof-error-p eof-value)
`(if ,eof-error-p
(error 'end-of-file :stream ,stream)
,eof-value))
-;;; These macros handle the special cases of t and nil for input and
+;;; These macros handle the special cases of T and NIL for input and
;;; output streams.
;;;
;;; FIXME: Shouldn't these be functions instead of macros?
`(let ((,svar ,stream))
(cond ((null ,svar) *standard-input*)
((eq ,svar t) *terminal-io*)
- (T ,@(if check-type `((check-type ,svar ,check-type)))
+ (T ,@(when check-type `((enforce-type ,svar ,check-type)))
#!+high-security
(unless (input-stream-p ,svar)
(error 'simple-type-error
`(let ((,svar ,stream))
(cond ((null ,svar) *standard-output*)
((eq ,svar t) *terminal-io*)
- (T ,@(if check-type `((check-type ,svar ,check-type)))
+ (T ,@(when check-type `((check-type ,svar ,check-type)))
#!+high-security
(unless (output-stream-p ,svar)
(error 'simple-type-error
:format-arguments ,(list svar)))
,svar)))))
-;;; With-Mumble-Stream calls the function in the given Slot of the
-;;; Stream with the Args for lisp-streams, or the Function with the
-;;; Args for fundamental-streams.
+;;; WITH-mumble-STREAM calls the function in the given SLOT of the
+;;; STREAM with the ARGS for ANSI-STREAMs, or the FUNCTION with the
+;;; ARGS for FUNDAMENTAL-STREAMs.
(defmacro with-in-stream (stream (slot &rest args) &optional stream-dispatch)
`(let ((stream (in-synonym-of ,stream)))
,(if stream-dispatch
- `(if (lisp-stream-p stream)
+ `(if (ansi-stream-p stream)
(funcall (,slot stream) stream ,@args)
,@(when stream-dispatch
`(,(destructuring-bind (function &rest args) stream-dispatch
(defmacro with-out-stream (stream (slot &rest args) &optional stream-dispatch)
`(let ((stream (out-synonym-of ,stream)))
,(if stream-dispatch
- `(if (lisp-stream-p stream)
+ `(if (ansi-stream-p stream)
(funcall (,slot stream) stream ,@args)
,@(when stream-dispatch
`(,(destructuring-bind (function &rest args) stream-dispatch
;;; This macro sets up some local vars for use by the
;;; FAST-READ-CHAR macro within the enclosed lexical scope. The stream
-;;; is assumed to be a LISP-STREAM.
+;;; is assumed to be a ANSI-STREAM.
(defmacro prepare-for-fast-read-char (stream &body forms)
`(let* ((%frc-stream% ,stream)
- (%frc-method% (lisp-stream-in %frc-stream%))
- (%frc-buffer% (lisp-stream-in-buffer %frc-stream%))
- (%frc-index% (lisp-stream-in-index %frc-stream%)))
+ (%frc-method% (ansi-stream-in %frc-stream%))
+ (%frc-buffer% (ansi-stream-in-buffer %frc-stream%))
+ (%frc-index% (ansi-stream-in-index %frc-stream%)))
(declare (type index %frc-index%)
- (type lisp-stream %frc-stream%))
+ (type ansi-stream %frc-stream%))
,@forms))
;;; This macro must be called after one is done with FAST-READ-CHAR
-;;; inside its scope to decache the lisp-stream-in-index.
+;;; inside its scope to decache the ANSI-STREAM-IN-INDEX.
(defmacro done-with-fast-read-char ()
- `(setf (lisp-stream-in-index %frc-stream%) %frc-index%))
+ `(setf (ansi-stream-in-index %frc-stream%) %frc-index%))
;;; a macro with the same calling convention as READ-CHAR, to be used
;;; within the scope of a PREPARE-FOR-FAST-READ-CHAR
`(cond
((not %frc-buffer%)
(funcall %frc-method% %frc-stream% ,eof-error-p ,eof-value))
- ((= %frc-index% +in-buffer-length+)
+ ((= %frc-index% +ansi-stream-in-buffer-length+)
(prog1 (fast-read-char-refill %frc-stream% ,eof-error-p ,eof-value)
- (setq %frc-index% (lisp-stream-in-index %frc-stream%))))
+ (setq %frc-index% (ansi-stream-in-index %frc-stream%))))
(t
(prog1 (code-char (aref %frc-buffer% %frc-index%))
(incf %frc-index%)))))
;;;; And these for the fasloader...
;;; Just like PREPARE-FOR-FAST-READ-CHAR except that we get the BIN
-;;; method. The stream is assumed to be a LISP-STREAM.
+;;; method. The stream is assumed to be a ANSI-STREAM.
;;;
;;; KLUDGE: It seems weird to have to remember to explicitly call
;;; DONE-WITH-FAST-READ-BYTE at the end of this, given that we're
;;; for the FAST-READ-CHAR stuff) -- WHN 19990825
(defmacro prepare-for-fast-read-byte (stream &body forms)
`(let* ((%frc-stream% ,stream)
- (%frc-method% (lisp-stream-bin %frc-stream%))
- (%frc-buffer% (lisp-stream-in-buffer %frc-stream%))
- (%frc-index% (lisp-stream-in-index %frc-stream%)))
+ (%frc-method% (ansi-stream-bin %frc-stream%))
+ (%frc-buffer% (ansi-stream-in-buffer %frc-stream%))
+ (%frc-index% (ansi-stream-in-index %frc-stream%)))
(declare (type index %frc-index%)
- (type lisp-stream %frc-stream%))
+ (type ansi-stream %frc-stream%))
,@forms))
;;; Similar to fast-read-char, but we use a different refill routine & don't
(defmacro fast-read-byte (&optional (eof-error-p t) (eof-value ()) any-type)
;; KLUDGE: should use ONCE-ONLY on EOF-ERROR-P and EOF-VALUE -- WHN 19990825
`(truly-the
- ,(if (and (eq eof-error-p 't) (not any-type)) '(unsigned-byte 8) 't)
+ ,(if (and (eq eof-error-p t) (not any-type)) '(unsigned-byte 8) t)
(cond
((not %frc-buffer%)
(funcall %frc-method% %frc-stream% ,eof-error-p ,eof-value))
- ((= %frc-index% +in-buffer-length+)
+ ((= %frc-index% +ansi-stream-in-buffer-length+)
(prog1 (fast-read-byte-refill %frc-stream% ,eof-error-p ,eof-value)
- (setq %frc-index% (lisp-stream-in-index %frc-stream%))))
+ (setq %frc-index% (ansi-stream-in-index %frc-stream%))))
(t
(prog1 (aref %frc-buffer% %frc-index%)
(incf %frc-index%))))))
projects / sbcl.git / blobdiff