Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
cmucl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Carl Shapiro
cmucl
Commits
3e49db8b
Commit
3e49db8b
authored
32 years ago
by
ram
Browse files
Options
Downloads
Patches
Plain Diff
*** empty log message ***
parent
089dd0b7
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
code/pred.lisp
+34
-54
34 additions, 54 deletions
code/pred.lisp
compiler/globaldb.lisp
+22
-5
22 additions, 5 deletions
compiler/globaldb.lisp
with
56 additions
and
59 deletions
code/pred.lisp
+
34
−
54
View file @
3e49db8b
...
...
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;;
(
ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pred.lisp,v 1.28.1.
2
1993/0
1/23 14:16:16
ram Exp $"
)
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/pred.lisp,v 1.28.1.
3
1993/0
2/04 22:36:28
ram Exp $"
)
;;;
;;; **********************************************************************
;;;
...
...
@@ -17,7 +17,8 @@
;;;
(
in-package
"KERNEL"
)
(
export
'
(
%instancep
instance
fixnump
bignump
bitp
ratiop
weak-pointer-p
))
(
export
'
(
%instancep
instance
fixnump
bignump
bitp
ratiop
weak-pointer-p
%typep
))
(
in-package
"SYSTEM"
)
(
export
'
(
system-area-pointer
system-area-pointer-p
))
...
...
@@ -114,60 +115,27 @@
;;;
;;; Return the specifier for the type of object. This is not simply
;;; (type-specifier (ctype-of object)) because ctype-of has different goals
;;; than type-of.
;;; than type-of. In particular, speed is more important than precision, and
;;; it is not permitted to return member types.
;;;
#-
reload
(
defun
type-of
(
object
)
"Return the type of OBJECT."
(
typecase
object
;; First the ones that we can tell by testing the lowtag
(
fixnum
'fixnum
)
(
function
(
type-specifier
(
ctype-of
object
)))
(
null
'null
)
(
list
'cons
)
(
if
(
typep
object
'
(
or
function
array
))
(
type-specifier
(
ctype-of
object
))
(
let*
((
class
(
layout-class
(
layout-of
object
)))
(
name
(
class-name
class
)))
(
if
#-
ns-boot
(
%instancep
object
)
#+
ns-boot
(
structurep
object
)
(
case
name
(
alien-internals:alien-value
`
(
alien:alien
,
(
alien-internals:unparse-alien-type
(
alien-internals:alien-value-type
object
))))
(
t
(
class-proper-name
class
)))
name
))))
;; Any other immediates.
(
character
(
typecase
object
(
standard-char
'standard-char
)
(
base-char
'base-char
)
(
t
'character
)))
;; And now for the complicated ones.
(
number
(
etypecase
object
(
fixnum
'fixnum
)
(
bignum
'bignum
)
(
float
(
etypecase
object
(
double-float
'double-float
)
(
single-float
'single-float
)
(
short-float
'short-float
)
(
long-float
'long-float
)))
(
ratio
'ratio
)
(
complex
'complex
)))
(
symbol
(
if
(
eq
(
symbol-package
object
)
(
symbol-package
:foo
))
'keyword
'symbol
))
(
instance
(
let
((
name
(
class-proper-name
(
layout-class
(
%instance-layout
object
))))
(
case
name
(
alien-internals:alien-value
`
(
alien:alien
,
(
alien-internals:unparse-alien-type
(
alien-internals:alien-value-type
object
))))
(
t
name
)))))
(
array
(
type-specifier
(
ctype-of
object
)))
(
system-area-pointer
'system-area-pointer
)
(
weak-pointer
'weak-pointer
)
(
code-component
'code-component
)
(
lra
'lra
)
(
fdefn
'fdefn
)
(
scavenger-hook
'scavenger-hook
)
(
t
(
warn
"Can't figure out the type of ~S"
object
)
t
)))
;;;; UPGRADED-ARRAY-ELEMENT-TYPE -- public
;;;
...
...
@@ -276,7 +244,7 @@
(
member-type
(
if
(
member
object
(
member-type-members
type
))
t
))
(
class
(
%instance
-typep
(
layout-of
object
)
type
))
(
class
-typep
(
layout-of
object
)
type
))
(
union-type
(
dolist
(
type
(
union-type-types
type
))
(
when
(
%%typep
object
type
)
...
...
@@ -332,7 +300,7 @@
(
error
"TYPEP on obsolete object (was class ~S)."
(
class-proper-name
(
layout-class
obj-layout
))))
(
let*
((
layout
(
class-layout
class
))
(
subclasses
(
class-subclasses
la
yout
)))
(
subclasses
(
class-subclasses
c
la
ss
)))
(
when
(
layout-invalid
layout
)
(
error
"Class is currently invalid: ~S"
class
))
(
if
(
or
(
eq
obj-layout
layout
)
...
...
@@ -400,6 +368,7 @@
(
equalp
(
cdr
x
)
(
cdr
y
))))
((
pathnamep
x
)
(
and
(
pathnamep
y
)
(
pathname=
x
y
)))
#-
ns-boot
((
%instancep
x
)
(
let*
((
layout-x
(
%instance-layout
x
))
(
length
(
layout-length
layout-x
)))
...
...
@@ -414,6 +383,17 @@
(
unless
(
or
(
eq
x-el
y-el
)
(
equalp
x-el
y-el
))
(
return
nil
)))))))
#+
ns-boot
((
structurep
x
)
(
let
((
length
(
structure-length
x
)))
(
and
(
structurep
y
)
(
=
length
(
structure-length
y
))
(
dotimes
(
i
length
t
)
(
let
((
x-el
(
structure-ref
x
i
))
(
y-el
(
structure-ref
y
i
)))
(
unless
(
or
(
eq
x-el
y-el
)
(
equalp
x-el
y-el
))
(
return
nil
)))))))
((
vectorp
x
)
(
let
((
length
(
length
x
)))
(
and
(
vectorp
y
)
...
...
This diff is collapsed.
Click to expand it.
compiler/globaldb.lisp
+
22
−
5
View file @
3e49db8b
...
...
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;;
(
ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/globaldb.lisp,v 1.26.1.
2
1993/0
1/27 12:56:25
ram Exp $"
)
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/globaldb.lisp,v 1.26.1.
3
1993/0
2/04 22:39:17
ram Exp $"
)
;;;
;;; **********************************************************************
;;;
...
...
@@ -1038,9 +1038,12 @@
;;; function.
(
define-info-type
function
ir1-transform
(
or
function
null
))
;;; If a function is a defstruct slot accessor or setter, then this is the
;;; defstruct-definition for the structure that it belongs to.
(
define-info-type
function
accessor-for
(
or
kernel:defstruct-description
null
)
;;; If a function is a slot accessor or setter, then this is the class that it
;;; accesses slots of.
;;;
(
define-info-type
function
accessor-for
#+
ns-boot
(
or
c::defstruct-description
class
null
)
#-
ns-boot
(
or
class
null
)
nil
)
;;; If a function is "known" to the compiler, then this is FUNCTION-INFO
...
...
@@ -1094,7 +1097,10 @@
;;; The kind of type described. We return :Instance for standard types that
;;; are implemented as structures.
;;;
(
define-info-type
type
kind
(
member
:primitive
:defined
:instance
nil
)
nil
)
(
define-info-type
type
kind
(
member
:primitive
:defined
:instance
#+
ns-boot
:structure
nil
)
nil
)
;;; Expander function for a defined type.
(
define-info-type
type
expander
(
or
function
null
)
nil
)
...
...
@@ -1122,6 +1128,17 @@
;;;
(
define-info-type
type
class
(
or
class
null
)
nil
)
#+
ns-boot
(
define-info-type
type
printer
(
or
function
symbol
null
)
nil
)
#+
ns-boot
(
define-info-type
type
load-form-maker
(
or
function
symbol
null
)
nil
)
#+
ns-boot
(
define-info-type
type
structure-info
(
or
defstruct-description
null
)
nil
)
#+
ns-boot
(
define-info-type
type
defined-structure-info
(
or
defstruct-description
null
)
nil
)
(
define-info-class
typed-structure
)
(
define-info-type
typed-structure
info
t
nil
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment