X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fsysmacs.lisp;h=34bcb94385311dce7332c77419fb53c25b2bd031;hb=fbe6e22af842835f7c70309f4d48064ca3984ad0;hp=9f7fc9d5c983d1976c1fad0d502ff5e1ce7528e2;hpb=2d195da5e29feadce7190ea1a68a2efa83a5e1c0;p=sbcl.git diff --git a/src/code/sysmacs.lisp b/src/code/sysmacs.lisp index 9f7fc9d..34bcb94 100644 --- a/src/code/sysmacs.lisp +++ b/src/code/sysmacs.lisp @@ -23,24 +23,32 @@ ;;; 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 (gensym))) +(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 ,offset-var) + `(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) - (%with-array-data ,n-array ,n-svalue ,n-evalue)))) + ;; 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)) - (declare (ignorable ,offset-var)) ,@forms))) #!-gengc @@ -59,13 +67,13 @@ "Executes the forms in the body without doing a garbage collection." `(without-interrupts ,@body)) -;;; 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? @@ -74,7 +82,7 @@ `(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 @@ -88,7 +96,7 @@ `(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 @@ -98,9 +106,9 @@ :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 LISP-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 @@ -124,8 +132,8 @@ ;;;; These are hacks to make the reader win. ;;; 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. +;;; FAST-READ-CHAR macro within the enclosed lexical scope. The stream +;;; is assumed to be a LISP-STREAM. (defmacro prepare-for-fast-read-char (stream &body forms) `(let* ((%frc-stream% ,stream) (%frc-method% (lisp-stream-in %frc-stream%)) @@ -135,18 +143,18 @@ (type lisp-stream %frc-stream%)) ,@forms)) -;;; This macro must be called after one is done with fast-read-char +;;; This macro must be called after one is done with FAST-READ-CHAR ;;; inside its scope to decache the lisp-stream-in-index. (defmacro done-with-fast-read-char () `(setf (lisp-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 +;;; a macro with the same calling convention as READ-CHAR, to be used +;;; within the scope of a PREPARE-FOR-FAST-READ-CHAR (defmacro fast-read-char (&optional (eof-error-p t) (eof-value ())) `(cond ((not %frc-buffer%) (funcall %frc-method% %frc-stream% ,eof-error-p ,eof-value)) - ((= %frc-index% in-buffer-length) + ((= %frc-index% +in-buffer-length+) (prog1 (fast-read-char-refill %frc-stream% ,eof-error-p ,eof-value) (setq %frc-index% (lisp-stream-in-index %frc-stream%)))) (t @@ -155,8 +163,8 @@ ;;;; 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. +;;; Just like PREPARE-FOR-FAST-READ-CHAR except that we get the BIN +;;; method. The stream is assumed to be a LISP-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 @@ -180,11 +188,11 @@ (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% +in-buffer-length+) (prog1 (fast-read-byte-refill %frc-stream% ,eof-error-p ,eof-value) (setq %frc-index% (lisp-stream-in-index %frc-stream%)))) (t