Skip to content
Snippets Groups Projects
Commit e5a7a7a0 authored by wlott's avatar wlott
Browse files

Added the collection built-in-classes needed by dylan.

parent 95d3c2a5
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/class.lisp,v 1.19 1993/03/14 14:35:07 ram Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/class.lisp,v 1.20 1993/04/04 10:06:09 wlott Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -404,8 +404,6 @@ ...@@ -404,8 +404,6 @@
(base-char :enumerable t :inherits (character) (base-char :enumerable t :inherits (character)
:codes (#.vm:base-char-type)) :codes (#.vm:base-char-type))
(sequence :translation (or cons (member nil) vector)
:hierarchical nil)
(symbol :codes (#.vm:symbol-header-type)) (symbol :codes (#.vm:symbol-header-type))
(instance :state :read-only) (instance :state :read-only)
...@@ -426,58 +424,122 @@ ...@@ -426,58 +424,122 @@
:state :read-only) :state :read-only)
(funcallable-instance :inherits (function) :state :read-only) (funcallable-instance :inherits (function) :state :read-only)
(array :translation array (collection :hierarchical nil)
:hierarchical nil :codes (#.vm:complex-array-type)) (explicit-key-collection :inherits (collection))
(simple-array :translation simple-array :inherits (array) (mutable-collection :inherits (collection))
:hierarchical nil :codes (#.vm:simple-array-type)) (generic-sequence :inherits (collection))
(vector :translation vector :inherits (array sequence) (mutable-explicit-key-collection
:hierarchical nil :codes (#.vm:complex-vector-type)) :inherits (explicit-key-collection mutable-collection collection))
(simple-vector :translation simple-vector (mutable-sequence
:inherits (vector simple-array array sequence) :inherits (mutable-collection generic-sequence collection))
:hierarchical nil :codes (#.vm:simple-vector-type)) (sequence
:translation (or cons (member nil) vector)
:inherits (mutable-sequence mutable-collection generic-sequence
collection))
(generic-array
:inherits (mutable-explicit-key-collection explicit-key-collection
mutable-collection collection))
(array
:translation array :codes (#.vm:complex-array-type)
:inherits (generic-array mutable-explicit-key-collection
explicit-key-collection mutable-collection collection))
(simple-array
:translation simple-array :codes (#.vm:simple-array-type)
:inherits (array generic-array mutable-explicit-key-collection
explicit-key-collection mutable-collection collection))
(generic-vector
:inherits (generic-array mutable-explicit-key-collection
explicit-key-collection mutable-sequence
mutable-collection generic-sequence collection))
(vector
:translation vector :codes (#.vm:complex-vector-type)
:inherits (generic-vector array generic-array
mutable-explicit-key-collection explicit-key-collection
sequence mutable-sequence mutable-collection
generic-sequence collection))
(simple-vector
:translation simple-vector :codes (#.vm:simple-vector-type)
:inherits (vector generic-vector sequence mutable-sequence
generic-sequence simple-array array generic-array
mutable-explicit-key-collection explicit-key-collection
mutable-collection collection))
(bit-vector (bit-vector
:translation bit-vector :inherits (vector array sequence) :translation bit-vector :codes (#.vm:complex-bit-vector-type)
:hierarchical nil :codes (#.vm:complex-bit-vector-type)) :inherits (vector generic-vector array generic-array
mutable-explicit-key-collection explicit-key-collection
sequence mutable-sequence mutable-collection
generic-sequence collection))
(simple-bit-vector (simple-bit-vector
:translation simple-bit-vector :translation simple-bit-vector :codes (#.vm:simple-bit-vector-type)
:inherits (bit-vector vector simple-array array sequence) :inherits (vector generic-vector sequence mutable-sequence
:hierarchical nil :codes (#.vm:simple-bit-vector-type)) generic-sequence simple-array array generic-array
mutable-explicit-key-collection explicit-key-collection
mutable-collection collection))
(simple-array-unsigned-byte-2 (simple-array-unsigned-byte-2
:translation (simple-array (unsigned-byte 2) (*)) :translation (simple-array (unsigned-byte 2) (*))
:inherits (vector array simple-array sequence) :codes (#.vm:simple-array-unsigned-byte-2-type)
:hierarchical nil :codes (#.vm:simple-array-unsigned-byte-2-type)) :inherits (vector generic-vector sequence mutable-sequence
generic-sequence simple-array array generic-array
mutable-explicit-key-collection explicit-key-collection
mutable-collection collection))
(simple-array-unsigned-byte-4 (simple-array-unsigned-byte-4
:translation (simple-array (unsigned-byte 4) (*)) :translation (simple-array (unsigned-byte 4) (*))
:inherits (vector array simple-array sequence) :codes (#.vm:simple-array-unsigned-byte-4-type)
:hierarchical nil :codes (#.vm:simple-array-unsigned-byte-4-type)) :inherits (vector generic-vector sequence mutable-sequence
generic-sequence simple-array array generic-array
mutable-explicit-key-collection explicit-key-collection
mutable-collection collection))
(simple-array-unsigned-byte-8 (simple-array-unsigned-byte-8
:translation (simple-array (unsigned-byte 8) (*)) :translation (simple-array (unsigned-byte 8) (*))
:inherits (vector array simple-array sequence) :codes (#.vm:simple-array-unsigned-byte-8-type)
:hierarchical nil :codes (#.vm:simple-array-unsigned-byte-8-type)) :inherits (vector generic-vector sequence mutable-sequence
generic-sequence simple-array array generic-array
mutable-explicit-key-collection explicit-key-collection
mutable-collection collection))
(simple-array-unsigned-byte-16 (simple-array-unsigned-byte-16
:translation (simple-array (unsigned-byte 16) (*)) :translation (simple-array (unsigned-byte 16) (*))
:inherits (vector array simple-array sequence) :codes (#.vm:simple-array-unsigned-byte-16-type)
:hierarchical nil :codes (#.vm:simple-array-unsigned-byte-16-type)) :inherits (vector generic-vector sequence mutable-sequence
generic-sequence simple-array array generic-array
mutable-explicit-key-collection explicit-key-collection
mutable-collection collection))
(simple-array-unsigned-byte-32 (simple-array-unsigned-byte-32
:translation (simple-array (unsigned-byte 32) (*)) :translation (simple-array (unsigned-byte 32) (*))
:inherits (vector array simple-array sequence) :codes (#.vm:simple-array-unsigned-byte-32-type)
:hierarchical nil :codes (#.vm:simple-array-unsigned-byte-32-type)) :inherits (vector generic-vector sequence mutable-sequence
generic-sequence simple-array array generic-array
mutable-explicit-key-collection explicit-key-collection
mutable-collection collection))
(simple-array-single-float (simple-array-single-float
:translation (simple-array single-float (*)) :translation (simple-array single-float (*))
:inherits (vector array simple-array sequence) :codes (#.vm:simple-array-single-float-type)
:hierarchical nil :codes (#.vm:simple-array-single-float-type)) :inherits (vector generic-vector sequence mutable-sequence
generic-sequence simple-array array generic-array
mutable-explicit-key-collection explicit-key-collection
mutable-collection collection))
(simple-array-double-float (simple-array-double-float
:translation (simple-array double-float (*)) :translation (simple-array double-float (*))
:inherits (vector array simple-array sequence) :codes (#.vm:simple-array-double-float-type)
:hierarchical nil :codes (#.vm:simple-array-double-float-type)) :inherits (vector generic-vector sequence mutable-sequence
generic-sequence simple-array array generic-array
mutable-explicit-key-collection explicit-key-collection
mutable-collection collection))
(generic-string
:inherits (mutable-sequence mutable-collection generic-sequence
collection))
(string (string
:translation string :inherits (vector array sequence) :translation string :codes (#.vm:complex-string-type)
:hierarchical nil :codes (#.vm:complex-string-type)) :inherits (generic-vector array generic-array
mutable-explicit-key-collection explicit-key-collection
sequence mutable-sequence mutable-collection
generic-sequence collection))
(simple-string (simple-string
:translation simple-string :translation simple-string :codes (#.vm:simple-string-type)
:inherits (string vector simple-array array sequence) :inherits (string generic-vector array generic-array
:hierarchical nil :codes (#.vm:simple-string-type)) mutable-explicit-key-collection explicit-key-collection
sequence mutable-sequence mutable-collection
generic-sequence collection))
(generic-number :state :read-only) (generic-number :state :read-only)
(number :translation number) (number :translation number)
(complex :translation complex :inherits (number generic-number) (complex :translation complex :inherits (number generic-number)
...@@ -506,12 +568,15 @@ ...@@ -506,12 +568,15 @@
:inherits (integer rational number generic-number) :inherits (integer rational number generic-number)
:codes (#.vm:bignum-type)) :codes (#.vm:bignum-type))
(list :translation (or cons (member nil)) :inherits (sequence) (list :translation (or cons (member nil))
:hierarchical nil) :inherits (sequence mutable-sequence mutable-collection
(cons :inherits (list sequence) :hierarchical nil generic-sequence collection))
:codes (#.vm:list-pointer-type)) (cons :codes (#.vm:list-pointer-type)
(null :translation (member nil) :inherits (symbol list sequence) :inherits (list sequence mutable-sequence mutable-collection
:hierarchical nil)))) generic-sequence collection))
(null :translation (member nil)
:inherits (list sequence mutable-sequence mutable-collection
generic-sequence collection symbol)))))
;;; See also type-init.lisp where we finish setting up the translations for ;;; See also type-init.lisp where we finish setting up the translations for
;;; built-in types. ;;; built-in types.
......
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