Skip to content
Snippets Groups Projects
Commit 769c17e5 authored by ram's avatar ram
Browse files

new structure hacks

parent a6e86e45
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/error.lisp,v 1.19 1992/12/10 02:05:18 ram Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/error.lisp,v 1.19.1.1 1993/01/15 15:27:27 ram Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -19,6 +19,9 @@ ...@@ -19,6 +19,9 @@
(in-package "CONDITIONS") (in-package "CONDITIONS")
(use-package "EXTENSIONS") (use-package "EXTENSIONS")
(in-package "KERNEL")
(export '(layout-invalid))
(in-package "LISP") (in-package "LISP")
(export '(break error warn cerror (export '(break error warn cerror
;; ;;
...@@ -706,6 +709,16 @@ The previous version is uglier, but it sets up unique run-time tags. ...@@ -706,6 +709,16 @@ The previous version is uglier, but it sets up unique run-time tags.
(:conc-name internal-simple-type-error-) (:conc-name internal-simple-type-error-)
(:report simple-condition-printer)) (:report simple-condition-printer))
(define-condition layout-invalid (type-error)
()
(:report
(lambda (condition stream)
(format stream "Layout-invalid error in ~S:~@
type test of class ~S was passed obsolete instance:~% ~S"
(type-error-function-name condition)
(class-proper-name (type-error-expected-type condition))
(type-error-datum condition)))))
(define-condition case-failure (type-error) (define-condition case-failure (type-error)
(name (name
possibilities) possibilities)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.85 1992/10/09 14:47:04 wlott Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.85.1.1 1993/01/15 15:27:40 ram Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -169,10 +169,9 @@ ...@@ -169,10 +169,9 @@
(use-package '("ALIEN-INTERNALS" "LISP" "EXTENSIONS" "SYSTEM" "BIGNUM") (use-package '("ALIEN-INTERNALS" "LISP" "EXTENSIONS" "SYSTEM" "BIGNUM")
"KERNEL") "KERNEL")
(use-package '("LISP") "NEW-ASSEM") (use-package '("LISP") "NEW-ASSEM")
(intern "TYPE-ERROR" "LISP")
(defpackage "XLIB" (defpackage "XLIB"
(:nicknames "OLD-XLIB") (:nicknames "OLD-XLIB")
(:import-from "LISP" "TYPE-ERROR")
(:export "*VERSION*" "ACCESS-CONTROL" "ACCESS-ERROR" "ACCESS-HOSTS" (:export "*VERSION*" "ACCESS-CONTROL" "ACCESS-ERROR" "ACCESS-HOSTS"
"ACTIVATE-SCREEN-SAVER" "ADD-ACCESS-HOST" "ADD-RESOURCE" "ACTIVATE-SCREEN-SAVER" "ADD-ACCESS-HOST" "ADD-RESOURCE"
"ADD-TO-SAVE-SET" "ALIST" "ALLOC-COLOR" "ALLOC-COLOR-CELLS" "ADD-TO-SAVE-SET" "ALIST" "ALLOC-COLOR" "ALLOC-COLOR-CELLS"
...@@ -348,9 +347,8 @@ ...@@ -348,9 +347,8 @@
"WM-SIZE-HINTS-WIDTH-INC" "WM-SIZE-HINTS-WIN-GRAVITY" "WM-SIZE-HINTS-WIDTH-INC" "WM-SIZE-HINTS-WIN-GRAVITY"
"WM-SIZE-HINTS-X" "WM-SIZE-HINTS-Y" "WM-ZOOM-HINTS" "WM-SIZE-HINTS-X" "WM-SIZE-HINTS-Y" "WM-ZOOM-HINTS"
"WRITE-BITMAP-FILE" "WRITE-RESOURCES" "XATOM")) "WRITE-BITMAP-FILE" "WRITE-RESOURCES" "XATOM"))
(dolist (name '("CHAR" "FLOAT")) (intern name "LISP"))
(defpackage "C-CALL" (defpackage "C-CALL"
(:import-from "LISP" "CHAR" "FLOAT")
(:export "C-STRING" "CHAR" "DOUBLE" "FLOAT" "INT" "LONG" "SHORT" (:export "C-STRING" "CHAR" "DOUBLE" "FLOAT" "INT" "LONG" "SHORT"
"UNSIGNED-CHAR" "UNSIGNED-INT" "UNSIGNED-LONG" "UNSIGNED-SHORT" "UNSIGNED-CHAR" "UNSIGNED-INT" "UNSIGNED-LONG" "UNSIGNED-SHORT"
"VOID")) "VOID"))
...@@ -482,14 +480,12 @@ ...@@ -482,14 +480,12 @@
(defpackage "COMMON-LISP" (defpackage "COMMON-LISP"
(:nicknames "CL" "LISP") (:nicknames "CL" "LISP")
(:export "&ALLOW-OTHER-KEYS" "&AUX" "&BODY" "&ENVIRONMENT" "&KEY" (:export "&ALLOW-OTHER-KEYS" "&AUX" "&BODY" "&ENVIRONMENT" "&KEY"
"&OPTIONAL" "&REST" "&WHOLE" "*" "**" "***" "*APPLYHOOK*" "&OPTIONAL" "&REST" "&WHOLE" "*" "**" "***"
"*BREAK-ON-SIGNALS*" "*BREAK-ON-WARNINGS*" "*BREAK-ON-SIGNALS*"
"*COMPILE-FILE-PATHNAME*" "*COMPILE-FILE-TRUENAME*" "*COMPILE-FILE-PATHNAME*" "*COMPILE-FILE-TRUENAME*"
"*COMPILE-PRINT*" "*COMPILE-VERBOSE*" "*DEBUG-IO*" "*COMPILE-PRINT*" "*COMPILE-VERBOSE*" "*DEBUG-IO*"
"*DEBUGGER-HOOK*" "*DEFAULT-PATHNAME-DEFAULTS*" "*DEBUGGER-HOOK*" "*DEFAULT-PATHNAME-DEFAULTS*"
"*DESCRIBE-INDENTATION*" "*DESCRIBE-LEVEL*" "*ERROR-OUTPUT*"
"*DESCRIBE-PRINT-LENGTH*" "*DESCRIBE-PRINT-LEVEL*"
"*DESCRIBE-VERBOSE*" "*ERROR-OUTPUT*" "*EVALHOOK*"
"*FEATURES*" "*GENSYM-COUNTER*" "*LOAD-PATHNAME*" "*FEATURES*" "*GENSYM-COUNTER*" "*LOAD-PATHNAME*"
"*LOAD-PRINT*" "*LOAD-TRUENAME*" "*LOAD-VERBOSE*" "*LOAD-PRINT*" "*LOAD-TRUENAME*" "*LOAD-VERBOSE*"
"*MACROEXPAND-HOOK*" "*MODULES*" "*PACKAGE*" "*PRINT-ARRAY*" "*MACROEXPAND-HOOK*" "*MODULES*" "*PACKAGE*" "*PRINT-ARRAY*"
...@@ -505,7 +501,7 @@ ...@@ -505,7 +501,7 @@
"1-" "<" "<=" "=" ">" ">=" "ABORT" "ABS" "ACONS" "ACOS" "1-" "<" "<=" "=" ">" ">=" "ABORT" "ABS" "ACONS" "ACOS"
"ACOSH" "ADJOIN" "ADJUST-ARRAY" "ADJUSTABLE-ARRAY-P" "ACOSH" "ADJOIN" "ADJUST-ARRAY" "ADJUSTABLE-ARRAY-P"
"ALPHA-CHAR-P" "ALPHANUMERICP" "AND" "APPEND" "APPLY" "ALPHA-CHAR-P" "ALPHANUMERICP" "AND" "APPEND" "APPLY"
"APPLYHOOK" "APROPOS" "APROPOS-LIST" "AREF" "ARITHMETIC-ERROR" "APROPOS" "APROPOS-LIST" "AREF" "ARITHMETIC-ERROR"
"ARITHMETIC-ERROR-OPERANDS" "ARITHMETIC-ERROR-OPERATION" "ARITHMETIC-ERROR-OPERANDS" "ARITHMETIC-ERROR-OPERATION"
"ARRAY" "ARRAY-DIMENSION" "ARRAY-DIMENSION-LIMIT" "ARRAY" "ARRAY-DIMENSION" "ARRAY-DIMENSION-LIMIT"
"ARRAY-DIMENSIONS" "ARRAY-ELEMENT-TYPE" "ARRAY-DIMENSIONS" "ARRAY-ELEMENT-TYPE"
...@@ -513,7 +509,7 @@ ...@@ -513,7 +509,7 @@
"ARRAY-RANK-LIMIT" "ARRAY-ROW-MAJOR-INDEX" "ARRAY-TOTAL-SIZE" "ARRAY-RANK-LIMIT" "ARRAY-ROW-MAJOR-INDEX" "ARRAY-TOTAL-SIZE"
"ARRAY-TOTAL-SIZE-LIMIT" "ARRAYP" "ASH" "ASIN" "ASINH" "ARRAY-TOTAL-SIZE-LIMIT" "ARRAYP" "ASH" "ASIN" "ASINH"
"ASSERT" "ASSOC" "ASSOC-IF" "ASSOC-IF-NOT" "ATAN" "ATANH" "ASSERT" "ASSOC" "ASSOC-IF" "ASSOC-IF-NOT" "ATAN" "ATANH"
"ATOM" "BASE-CHAR" "BASE-CHARACTER" "BASE-STRING" "BIGNUM" "ATOM" "BASE-CHAR" "BASE-STRING" "BIGNUM"
"BIT" "BIT-AND" "BIT-ANDC1" "BIT-ANDC2" "BIT-EQV" "BIT-IOR" "BIT" "BIT-AND" "BIT-ANDC1" "BIT-ANDC2" "BIT-EQV" "BIT-IOR"
"BIT-NAND" "BIT-NOR" "BIT-NOT" "BIT-ORC1" "BIT-ORC2" "BIT-NAND" "BIT-NOR" "BIT-NOT" "BIT-ORC1" "BIT-ORC2"
"BIT-VECTOR" "BIT-VECTOR-P" "BIT-XOR" "BLOCK" "BOOLE" "BIT-VECTOR" "BIT-VECTOR-P" "BIT-XOR" "BLOCK" "BOOLE"
...@@ -527,15 +523,13 @@ ...@@ -527,15 +523,13 @@
"CATCH" "CCASE" "CDAAAR" "CDAADR" "CDAAR" "CDADAR" "CDADDR" "CATCH" "CCASE" "CDAAAR" "CDAADR" "CDAAR" "CDADAR" "CDADDR"
"CDADR" "CDAR" "CDDAAR" "CDDADR" "CDDAR" "CDDDAR" "CDDDDR" "CDADR" "CDAR" "CDDAAR" "CDDADR" "CDDAR" "CDDDAR" "CDDDDR"
"CDDDR" "CDDR" "CDR" "CEILING" "CELL-ERROR" "CERROR" "CHAR" "CDDDR" "CDDR" "CDR" "CEILING" "CELL-ERROR" "CERROR" "CHAR"
"CHAR-BIT" "CHAR-BITS" "CHAR-BITS-LIMIT" "CHAR-CODE" "CHAR-CODE" "CHAR-CODE-LIMIT" "CHAR-DOWNCASE"
"CHAR-CODE-LIMIT" "CHAR-CONTROL-BIT" "CHAR-DOWNCASE" "CHAR-EQUAL" "CHAR-GREATERP" "CHAR-LESSP"
"CHAR-EQUAL" "CHAR-FONT" "CHAR-FONT-LIMIT" "CHAR-GREATERP"
"CHAR-HYPER-BIT" "CHAR-INT" "CHAR-LESSP" "CHAR-META-BIT"
"CHAR-NAME" "CHAR-NOT-EQUAL" "CHAR-NOT-GREATERP" "CHAR-NAME" "CHAR-NOT-EQUAL" "CHAR-NOT-GREATERP"
"CHAR-NOT-LESSP" "CHAR-SUPER-BIT" "CHAR-UPCASE" "CHAR/=" "CHAR-NOT-LESSP" "CHAR-UPCASE" "CHAR/="
"CHAR<" "CHAR<=" "CHAR=" "CHAR>" "CHAR>=" "CHARACTER" "CHAR<" "CHAR<=" "CHAR=" "CHAR>" "CHAR>=" "CHARACTER"
"CHARACTERP" "CHECK-TYPE" "CIS" "CLEAR-INPUT" "CLEAR-OUTPUT" "CHARACTERP" "CHECK-TYPE" "CIS" "CLEAR-INPUT" "CLEAR-OUTPUT"
"CLOSE" "CLRHASH" "CODE-CHAR" "COERCE" "COMMON" "COMMONP" "CLOSE" "CLRHASH" "CODE-CHAR" "COERCE"
"COMPILATION-SPEED" "COMPILE" "COMPILE-FILE" "COMPILATION-SPEED" "COMPILE" "COMPILE-FILE"
"COMPILED-FUNCTION" "COMPILED-FUNCTION-P" "COMPILER-LET" "COMPILED-FUNCTION" "COMPILED-FUNCTION-P" "COMPILER-LET"
"COMPILER-MACRO-FUNCTION" "COMPILER-MACROEXPAND" "COMPILER-MACRO-FUNCTION" "COMPILER-MACROEXPAND"
...@@ -545,7 +539,7 @@ ...@@ -545,7 +539,7 @@
"CONTROL-ERROR" "COPY-ALIST" "COPY-LIST" "CONTROL-ERROR" "COPY-ALIST" "COPY-LIST"
"COPY-PPRINT-DISPATCH" "COPY-READTABLE" "COPY-SEQ" "COPY-PPRINT-DISPATCH" "COPY-READTABLE" "COPY-SEQ"
"COPY-SYMBOL" "COPY-TREE" "COS" "COSH" "COUNT" "COUNT-IF" "COPY-SYMBOL" "COPY-TREE" "COS" "COSH" "COUNT" "COUNT-IF"
"COUNT-IF-NOT" "CTYPECASE" "DEBUG-INFO" "DECF" "DECLAIM" "COUNT-IF-NOT" "CTYPECASE" "DEBUG" "DECF" "DECLAIM"
"DECLARATION" "DECLARE" "DECODE-FLOAT" "DECODE-UNIVERSAL-TIME" "DECLARATION" "DECLARE" "DECODE-FLOAT" "DECODE-UNIVERSAL-TIME"
"DEFCONSTANT" "DEFINE-COMPILER-MACRO" "DEFINE-CONDITION" "DEFCONSTANT" "DEFINE-COMPILER-MACRO" "DEFINE-CONDITION"
"DEFINE-MODIFY-MACRO" "DEFINE-SETF-METHOD" "DEFMACRO" "DEFPACKAGE" "DEFINE-MODIFY-MACRO" "DEFINE-SETF-METHOD" "DEFMACRO" "DEFPACKAGE"
...@@ -559,7 +553,7 @@ ...@@ -559,7 +553,7 @@
"DOUBLE-FLOAT-EPSILON" "DOUBLE-FLOAT-NEGATIVE-EPSILON" "DPB" "DOUBLE-FLOAT-EPSILON" "DOUBLE-FLOAT-NEGATIVE-EPSILON" "DPB"
"DRIBBLE" "ECASE" "ED" "EIGHTH" "ELT" "ENCODE-UNIVERSAL-TIME" "DRIBBLE" "ECASE" "ED" "EIGHTH" "ELT" "ENCODE-UNIVERSAL-TIME"
"END-OF-FILE" "ENDP" "ENOUGH-NAMESTRING" "EQ" "EQL" "EQUAL" "END-OF-FILE" "ENDP" "ENOUGH-NAMESTRING" "EQ" "EQL" "EQUAL"
"EQUALP" "ERROR" "ETYPECASE" "EVAL" "EVAL-WHEN" "EVALHOOK" "EVENP" "EQUALP" "ERROR" "ETYPECASE" "EVAL" "EVAL-WHEN" "EVENP"
"EVERY" "EXP" "EXPORT" "EXPT" "EXTENDED-CHAR" "FBOUNDP" "FCEILING" "EVERY" "EXP" "EXPORT" "EXPT" "EXTENDED-CHAR" "FBOUNDP" "FCEILING"
"FDEFINITION" "FFLOOR" "FIFTH" "FILE-AUTHOR" "FILE-ERROR" "FDEFINITION" "FFLOOR" "FIFTH" "FILE-AUTHOR" "FILE-ERROR"
"FILE-ERROR-PATHNAME" "FILE-LENGTH" "FILE-NAMESTRING" "FILE-ERROR-PATHNAME" "FILE-LENGTH" "FILE-NAMESTRING"
...@@ -581,7 +575,7 @@ ...@@ -581,7 +575,7 @@
"HASH-TABLE-REHASH-SIZE" "HASH-TABLE-SIZE" "HASH-TABLE-TEST" "HASH-TABLE-REHASH-SIZE" "HASH-TABLE-SIZE" "HASH-TABLE-TEST"
"HOST-NAMESTRING" "IDENTITY" "IF" "IGNORABLE" "HOST-NAMESTRING" "IDENTITY" "IF" "IGNORABLE"
"IGNORE" "IGNORE-ERRORS" "IMAGPART" "IMPORT" "IN-PACKAGE" "INCF" "IGNORE" "IGNORE-ERRORS" "IMAGPART" "IMPORT" "IN-PACKAGE" "INCF"
"INLINE" "INPUT-STREAM-P" "INSPECT" "INT-CHAR" "INTEGER" "INLINE" "INPUT-STREAM-P" "INSPECT" "INTEGER"
"INTEGER-DECODE-FLOAT" "INTEGER-LENGTH" "INTEGERP" "INTERN" "INTEGER-DECODE-FLOAT" "INTEGER-LENGTH" "INTEGERP" "INTERN"
"INTERNAL-TIME-UNITS-PER-SECOND" "INTERSECTION" "INVOKE-DEBUGGER" "INTERNAL-TIME-UNITS-PER-SECOND" "INTERSECTION" "INVOKE-DEBUGGER"
"INVOKE-RESTART" "INVOKE-RESTART-INTERACTIVELY" "ISQRT" "KEYWORD" "INVOKE-RESTART" "INVOKE-RESTART-INTERACTIVELY" "ISQRT" "KEYWORD"
...@@ -608,7 +602,7 @@ ...@@ -608,7 +602,7 @@
"LONG-FLOAT-NEGATIVE-EPSILON" "LONG-SITE-NAME" "LOOP" "LONG-FLOAT-NEGATIVE-EPSILON" "LONG-SITE-NAME" "LOOP"
"LOOP-FINISH" "LOWER-CASE-P" "MACHINE-INSTANCE" "MACHINE-TYPE" "LOOP-FINISH" "LOWER-CASE-P" "MACHINE-INSTANCE" "MACHINE-TYPE"
"MACHINE-VERSION" "MACRO-FUNCTION" "MACROEXPAND" "MACROEXPAND-1" "MACHINE-VERSION" "MACRO-FUNCTION" "MACROEXPAND" "MACROEXPAND-1"
"MACROLET" "MAKE-ARRAY" "MAKE-BROADCAST-STREAM" "MAKE-CHAR" "MACROLET" "MAKE-ARRAY" "MAKE-BROADCAST-STREAM"
"MAKE-CONCATENATED-STREAM" "MAKE-CONDITION" "MAKE-CONCATENATED-STREAM" "MAKE-CONDITION"
"MAKE-DISPATCH-MACRO-CHARACTER" "MAKE-ECHO-STREAM" "MAKE-DISPATCH-MACRO-CHARACTER" "MAKE-ECHO-STREAM"
"MAKE-HASH-TABLE" "MAKE-LIST" "MAKE-PACKAGE" "MAKE-PATHNAME" "MAKE-HASH-TABLE" "MAKE-LIST" "MAKE-PACKAGE" "MAKE-PATHNAME"
...@@ -662,7 +656,7 @@ ...@@ -662,7 +656,7 @@
"RETURN" "RETURN-FROM" "REVAPPEND" "REVERSE" "ROOM" "ROTATEF" "RETURN" "RETURN-FROM" "REVAPPEND" "REVERSE" "ROOM" "ROTATEF"
"ROUND" "ROW-MAJOR-AREF" "RPLACA" "RPLACD" "SAFETY" "ROUND" "ROW-MAJOR-AREF" "RPLACA" "RPLACD" "SAFETY"
"SATISFIES" "SBIT" "SCALE-FLOAT" "SCHAR" "SEARCH" "SECOND" "SATISFIES" "SBIT" "SCALE-FLOAT" "SCHAR" "SEARCH" "SECOND"
"SEQUENCE" "SERIOUS-CONDITION" "SET" "SET-CHAR-BIT" "SEQUENCE" "SERIOUS-CONDITION" "SET"
"SET-DIFFERENCE" "SET-DISPATCH-MACRO-CHARACTER" "SET-DIFFERENCE" "SET-DISPATCH-MACRO-CHARACTER"
"SET-EXCLUSIVE-OR" "SET-MACRO-CHARACTER" "SET-PPRINT-DISPATCH" "SET-EXCLUSIVE-OR" "SET-MACRO-CHARACTER" "SET-PPRINT-DISPATCH"
"SET-SYNTAX-FROM-CHAR" "SETF" "SETQ" "SEVENTH" "SHADOW" "SET-SYNTAX-FROM-CHAR" "SETF" "SETQ" "SEVENTH" "SHADOW"
...@@ -679,8 +673,8 @@ ...@@ -679,8 +673,8 @@
"SINGLE-FLOAT-NEGATIVE-EPSILON" "SINH" "SIXTH" "SLEEP" "SINGLE-FLOAT-NEGATIVE-EPSILON" "SINH" "SIXTH" "SLEEP"
"SOFTWARE-TYPE" "SOFTWARE-VERSION" "SOME" "SORT" "SPACE" "SOFTWARE-TYPE" "SOFTWARE-VERSION" "SOME" "SORT" "SPACE"
"SPECIAL" "SPECIAL-FORM-P" "SPEED" "SQRT" "STABLE-SORT" "SPECIAL" "SPECIAL-FORM-P" "SPEED" "SQRT" "STABLE-SORT"
"STACK-OVERFLOW" "STANDARD-CHAR" "STANDARD-CHAR-P" "STEP" "STANDARD-CHAR" "STANDARD-CHAR-P" "STEP"
"STORAGE-CONDITION" "STORAGE-EXHAUSTED" "STORE-VALUE" "STREAM" "STORAGE-CONDITION" "STORE-VALUE" "STREAM"
"STREAM-ELEMENT-TYPE" "STREAM-ERROR" "STREAM-ERROR-STREAM" "STREAM-ELEMENT-TYPE" "STREAM-ERROR" "STREAM-ERROR-STREAM"
"STREAMP" "STRING" "STRING-CAPITALIZE" "STRING-CHAR" "STREAMP" "STRING" "STRING-CAPITALIZE" "STRING-CHAR"
"STRING-CHAR-P" "STRING-DOWNCASE" "STRING-EQUAL" "STRING-CHAR-P" "STRING-DOWNCASE" "STRING-EQUAL"
...@@ -760,12 +754,6 @@ ...@@ -760,12 +754,6 @@
"LONG-FLOAT-P" "READ-ONLY-SPACE-START" "SHORT-FLOAT-P" "LONG-FLOAT-P" "READ-ONLY-SPACE-START" "SHORT-FLOAT-P"
"STATIC-SPACE-START" "STRING/=*" "STRING<*" "STRING<=*" "STRING=*" "STATIC-SPACE-START" "STRING/=*" "STRING<*" "STRING<=*" "STRING=*"
"STRING>*" "STRING>=*") "STRING>*" "STRING>=*")
(:import-from "SYSTEM" "%PRIMITIVE" "%STANDARD-CHAR-P"
"%STRING-CHAR-P")
(:import-from "BIGNUM" "BIGNUM-TYPE")
(:import-from "KERNEL" "%SP-SET-DEFINITION" "%SP-SET-PLIST"
"ARRAY-HEADER-P" "BASE-CHAR-P" "DOUBLE-FLOAT-P" "SIMPLE-ARRAY-P"
"SINGLE-FLOAT-P")
(:export "*ASSEMBLY-UNIT-LENGTH*" "*PRIMITIVE-OBJECTS*" (:export "*ASSEMBLY-UNIT-LENGTH*" "*PRIMITIVE-OBJECTS*"
"ANY-REG-SC-NUMBER" "ARRAY-DATA-SLOT" "ARRAY-DIMENSIONS-OFFSET" "ANY-REG-SC-NUMBER" "ARRAY-DATA-SLOT" "ARRAY-DIMENSIONS-OFFSET"
"ARRAY-DISPLACED-P-SLOT" "ARRAY-DISPLACEMENT-SLOT" "ARRAY-DISPLACED-P-SLOT" "ARRAY-DISPLACEMENT-SLOT"
...@@ -916,7 +904,6 @@ ...@@ -916,7 +904,6 @@
(intern "CHAR" "LISP") (intern "CHAR" "LISP")
(defpackage "EXTENSIONS" (defpackage "EXTENSIONS"
(:nicknames "EXTENSIONS") (:nicknames "EXTENSIONS")
(:import-from "LISP" "CHAR")
(:export "*AFTER-GC-HOOKS*" "*AFTER-SAVE-INITIALIZATIONS*" (:export "*AFTER-GC-HOOKS*" "*AFTER-SAVE-INITIALIZATIONS*"
"*ALL-MODIFIER-NAMES*" "*BACKUP-EXTENSION*" "*BEFORE-GC-HOOKS*" "*ALL-MODIFIER-NAMES*" "*BACKUP-EXTENSION*" "*BEFORE-GC-HOOKS*"
"*BEFORE-SAVE-INITIALIZATIONS*" "*BLOCK-COMPILE-DEFAULT*" "*BEFORE-SAVE-INITIALIZATIONS*" "*BLOCK-COMPILE-DEFAULT*"
...@@ -1174,72 +1161,24 @@ ...@@ -1174,72 +1161,24 @@
"CODE-LOCATION-KIND" "FLUSH-FRAMES-ABOVE")) "CODE-LOCATION-KIND" "FLUSH-FRAMES-ABOVE"))
(dolist (dolist
(name (name
'("%ALIGNED-SAP" "%ARRAY-TYPEP" "%ASET" "%BITSET" "%CHARSET" "%PUT" '("%ARRAY-TYPEP" "%ASET" "%BITSET" "%CHARSET" "%PUT"
"%RPLACA" "%RPLACD" "%SBITSET" "%SCHARSET" "%SET-DOCUMENTATION" "%RPLACA" "%RPLACD" "%SBITSET" "%SCHARSET" "%SET-DOCUMENTATION"
"%SET-FDEFINITION" "%SET-FILL-POINTER" "%SET-ROW-MAJOR-AREF" "%SET-FDEFINITION" "%SET-FILL-POINTER" "%SET-ROW-MAJOR-AREF"
"%SET-SAP-REF-DESCRIPTOR" "%SETELT" "%SETNTH" "%SP-STRING-COMPARE" "%SET-SAP-REF-DESCRIPTOR" "%SETELT" "%SETNTH" "%SP-STRING-COMPARE"
"%SVSET" "%TYPEP" "LONG-FLOAT-P" "NIL" "RETURN" "SET" "SHORT-FLOAT-P" "%SVSET" "%TYPEP" "LONG-FLOAT-P" "SHORT-FLOAT-P"
"STRING/=*" "STRING<*" "STRING<=*" "STRING=*" "STRING>*" "STRING>=*" "STRING/=*" "STRING<*" "STRING<=*" "STRING=*" "STRING>*" "STRING>=*"))
"SYMBOL-FUNCTION" "SYMBOL-VALUE" "THROW" "VALUES-LIST"))
(intern name "LISP")) (intern name "LISP"))
(intern "BOOLEAN" "ALIEN")
(dolist
(name
'("%PRIMITIVE" "%STANDARD-CHAR-P" "%STRING-CHAR-P" "BITS" "BYTES"
"C-PROCEDURE" "CHECK<=" "CHECK=" "CT-A-VAL" "CT-A-VAL-OFFSET"
"CT-A-VAL-P" "CT-A-VAL-SAP" "CT-A-VAL-SIZE" "CT-A-VAL-TYPE"
"DEFENUMERATION" "DEFOPERATOR" "DEPORT-BOOLEAN" "DEPORT-INTEGER"
"ENUMERATION" "FOREIGN-SYMBOL-ADDRESS" "LONG-WORDS" "MAKE-CT-A-VAL"
"NATURALIZE-BOOLEAN" "NATURALIZE-INTEGER" "NULL-TERMINATED-STRING"
"PERQ-STRING" "POINTER" "PORT" "RECORD-SIZE" "SAP+" "SAP-REF-16"
"SAP-REF-32" "SAP-REF-8" "SAP-REF-SAP" "SIGNED-SAP-REF-16"
"SIGNED-SAP-REF-32" "SIGNED-SAP-REF-8" "SYSTEM-AREA-POINTER" "WORDS"))
(intern name "SYSTEM"))
(intern "SYMBOLICATE" "EXTENSIONS")
(dolist
(name
'("%RAW-BITS" "%SET-SAP-REF-16" "%SET-SAP-REF-32" "%SET-SAP-REF-8"
"%SET-SAP-REF-DOUBLE" "%SET-SAP-REF-SAP" "%SET-SAP-REF-SINGLE"
"%SP-SET-DEFINITION" "%SP-SET-PLIST" "ARRAY-HEADER-P" "BASE-CHAR-P"
"CODE-INSTRUCTIONS" "DOUBLE-FLOAT-P" "ODD-KEYWORD-ARGUMENTS-ERROR"
"SIMPLE-ARRAY-P" "SINGLE-FLOAT-P" "STRUCTURE-REF" "STRUCTURE-SET"
"UNKNOWN-KEYWORD-ARGUMENT-ERROR"))
(intern name "KERNEL"))
(dolist (name '("LABEL" "GEN-LABEL" "EMIT-LABEL" "LABEL-POSITION"))
(intern name "NEW-ASSEM"))
(defpackage "C" (defpackage "C"
(:nicknames "OLD-C") (:nicknames "OLD-C")
(:import-from "LISP" "%ALIGNED-SAP" "%ARRAY-TYPEP" "%ASET" (:import-from "LISP" "%ARRAY-TYPEP" "%ASET"
"%BITSET" "%CHARSET" "%PUT" "%RPLACA" "%RPLACD" "%SBITSET" "%BITSET" "%CHARSET" "%PUT" "%RPLACA" "%RPLACD" "%SBITSET"
"%SCHARSET" "%SET-DOCUMENTATION" "%SET-FDEFINITION" "%SCHARSET" "%SET-DOCUMENTATION" "%SET-FDEFINITION"
"%SET-FILL-POINTER" "%SET-ROW-MAJOR-AREF" "%SET-FILL-POINTER" "%SET-ROW-MAJOR-AREF"
"%SET-SAP-REF-DESCRIPTOR" "%SETELT" "%SETNTH" "%SP-STRING-COMPARE" "%SET-SAP-REF-DESCRIPTOR" "%SETELT" "%SETNTH" "%SP-STRING-COMPARE"
"%SVSET" "%TYPEP" "LONG-FLOAT-P" "NIL" "RETURN" "SET" "%SVSET" "%TYPEP" "LONG-FLOAT-P" "NIL" "RETURN" "SET"
"SHORT-FLOAT-P" "STRING/=*" "STRING<*" "STRING<=*" "STRING=*" "SHORT-FLOAT-P" "STRING/=*" "STRING<*" "STRING<=*" "STRING=*"
"STRING>*" "STRING>=*" "SYMBOL-FUNCTION" "SYMBOL-VALUE" "THROW" "STRING>*" "STRING>=*")
"VALUES-LIST")
(:import-from "ALIEN" "BOOLEAN")
(:import-from "SYSTEM" "%PRIMITIVE" "%STANDARD-CHAR-P"
"%STRING-CHAR-P" "BITS" "BYTES" "C-PROCEDURE" "CHECK<=" "CHECK="
"CT-A-VAL" "CT-A-VAL-OFFSET" "CT-A-VAL-P" "CT-A-VAL-SAP"
"CT-A-VAL-SIZE" "CT-A-VAL-TYPE" "DEFENUMERATION" "DEFOPERATOR"
"DEPORT-BOOLEAN" "DEPORT-INTEGER" "ENUMERATION"
"FOREIGN-SYMBOL-ADDRESS" "LONG-WORDS" "MAKE-CT-A-VAL"
"NATURALIZE-BOOLEAN" "NATURALIZE-INTEGER" "NULL-TERMINATED-STRING"
"PERQ-STRING" "POINTER" "PORT" "RECORD-SIZE" "SAP+" "SAP-REF-16"
"SAP-REF-32" "SAP-REF-8" "SAP-REF-SAP" "SIGNED-SAP-REF-16"
"SIGNED-SAP-REF-32" "SIGNED-SAP-REF-8" "SYSTEM-AREA-POINTER"
"WORDS")
(:import-from "EXTENSIONS" "SYMBOLICATE")
(:import-from "KERNEL" "%RAW-BITS" "%SET-SAP-REF-16"
"%SET-SAP-REF-32" "%SET-SAP-REF-8" "%SET-SAP-REF-DOUBLE"
"%SET-SAP-REF-SAP" "%SET-SAP-REF-SINGLE" "%SP-SET-DEFINITION"
"%SP-SET-PLIST" "ARRAY-HEADER-P" "BASE-CHAR-P" "CODE-INSTRUCTIONS"
"DOUBLE-FLOAT-P" "ODD-KEYWORD-ARGUMENTS-ERROR" "SIMPLE-ARRAY-P"
"SINGLE-FLOAT-P" "STRUCTURE-REF" "STRUCTURE-SET"
"UNKNOWN-KEYWORD-ARGUMENT-ERROR")
(:import-from "NEW-ASSEM" "LABEL" "GEN-LABEL" "EMIT-LABEL"
"LABEL-POSITION")
(:export "%ALIEN-FUNCALL" "%CATCH-BREAKUP" "%CONTINUE-UNWIND" (:export "%ALIEN-FUNCALL" "%CATCH-BREAKUP" "%CONTINUE-UNWIND"
"%LISTIFY-REST-ARGS" "%MORE-ARG" "%UNWIND-PROTECT-BREAKUP" "%LISTIFY-REST-ARGS" "%MORE-ARG" "%UNWIND-PROTECT-BREAKUP"
"*BACKEND*" "*CODE-SEGMENT*" "*COLLECT-DYNAMIC-STATISTICS*" "*BACKEND*" "*CODE-SEGMENT*" "*COLLECT-DYNAMIC-STATISTICS*"
...@@ -1353,13 +1292,10 @@ ...@@ -1353,13 +1292,10 @@
"%SP-FIND-CHARACTER-WITH-ATTRIBUTE" "%SP-FIND-CHARACTER-WITH-ATTRIBUTE"
"%SP-REVERSE-FIND-CHARACTER-WITH-ATTRIBUTE" "%STANDARD-CHAR-P" "%SP-REVERSE-FIND-CHARACTER-WITH-ATTRIBUTE" "%STANDARD-CHAR-P"
"%STRING-CHAR-P" "*BEEP-FUNCTION*" "%STRING-CHAR-P" "*BEEP-FUNCTION*"
"*IN-THE-COMPILER*" "*LONG-SITE-NAME*" "*LONG-SITE-NAME*" "*SHORT-SITE-NAME*"
"*MAXIMUM-INTERPRETER-ERROR-CHECKING*" "*NAMESERVERPORT*"
"*PORNOGRAPHY-OF-DEATH*" "*PORT-OWNERSHIP-RIGHTS-HANDLERS*"
"*PORT-RECEIVE-RIGHTS-HANDLERS*" "*SHORT-SITE-NAME*"
"*SOFTWARE-TYPE*" "*STDERR*" "*STDIN*" "*STDOUT*" "*TASK-DATA*" "*SOFTWARE-TYPE*" "*STDERR*" "*STDIN*" "*STDOUT*" "*TASK-DATA*"
"*TASK-NOTIFY*" "*TASK-SELF*" "*TTY*" "*TYPESCRIPTPORT*" "*TASK-NOTIFY*" "*TASK-SELF*" "*TTY*" "*TYPESCRIPTPORT*"
"*USERTYPESCRIPT*" "*USERWINDOW*" "*XWINDOW-TABLE*" "*XWINDOW-TABLE*"
"ADD-FD-HANDLER" "ADD-PORT-DEATH-HANDLER" "ADD-PORT-OBJECT" "ADD-FD-HANDLER" "ADD-PORT-DEATH-HANDLER" "ADD-PORT-OBJECT"
"ADD-XWINDOW-OBJECT" "ALLOCATE-SYSTEM-MEMORY" "BEEP" "BITS" "ADD-XWINDOW-OBJECT" "ALLOCATE-SYSTEM-MEMORY" "BEEP" "BITS"
"BYTES" "C-PROCEDURE" "CHECK<=" "CHECK=" "COMPILER-VERSION" "BYTES" "C-PROCEDURE" "CHECK<=" "CHECK=" "COMPILER-VERSION"
...@@ -1368,7 +1304,7 @@ ...@@ -1368,7 +1304,7 @@
"DEFAULT-INTERRUPT" "DEFENUMERATION" "DEFOPERATOR" "DEFRECORD" "DEFAULT-INTERRUPT" "DEFENUMERATION" "DEFOPERATOR" "DEFRECORD"
"DEPORT-BOOLEAN" "DEPORT-INTEGER" "DOUBLE-FLOAT-RADIX" "DEPORT-BOOLEAN" "DEPORT-INTEGER" "DOUBLE-FLOAT-RADIX"
"ENABLE-INTERRUPT" "ENUMERATION" "FD-STREAM" "FD-STREAM-FD" "ENABLE-INTERRUPT" "ENUMERATION" "FD-STREAM" "FD-STREAM-FD"
"FD-STREAM-P" "FEXPR" "FIND-IF-IN-CLOSURE" "FD-STREAM-P" "FIND-IF-IN-CLOSURE"
"FOREIGN-SYMBOL-ADDRESS" "GET-PAGE-SIZE" "GET-SYSTEM-INFO" "FOREIGN-SYMBOL-ADDRESS" "GET-PAGE-SIZE" "GET-SYSTEM-INFO"
"IGNORE-INTERRUPT" "IGNORE-INTERRUPT"
"INT-SAP" "INVALIDATE-DESCRIPTOR" "IO-TIMEOUT" "LONG-FLOAT-RADIX" "INT-SAP" "INVALIDATE-DESCRIPTOR" "IO-TIMEOUT" "LONG-FLOAT-RADIX"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/interr.lisp,v 1.25 1992/04/15 02:24:02 wlott Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/interr.lisp,v 1.25.1.1 1993/01/15 15:28:15 ram Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -279,11 +279,20 @@ ...@@ -279,11 +279,20 @@
:operands (list this that))) :operands (list this that)))
(deferr object-not-type-error (object type) (deferr object-not-type-error (object type)
(error 'type-error (error (if (and (%instancep object)
(layout-invalid (%instance-layout object)))
'layout-invalid
'type-error)
:function-name name :function-name name
:datum object :datum object
:expected-type type)) :expected-type type))
(deferr layout-invalid-error (object layout)
(error 'layout-invalid
:function-name name
:datum object
:expected-type (layout-class layout)))
(deferr odd-keyword-arguments-error () (deferr odd-keyword-arguments-error ()
(error 'simple-error (error 'simple-error
:function-name name :function-name name
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment