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
49d1ac4a
Commit
49d1ac4a
authored
31 years ago
by
ram
Browse files
Options
Downloads
Patches
Plain Diff
More simple-condition fixes.
parent
7052da8d
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
code/error.lisp
+24
-16
24 additions, 16 deletions
code/error.lisp
with
24 additions
and
16 deletions
code/error.lisp
+
24
−
16
View file @
49d1ac4a
...
...
@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;;
(
ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/error.lisp,v 1.
29
1993/07/22 0
0:23:3
2 ram Exp $"
)
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/error.lisp,v 1.
30
1993/07/22 0
1:08:0
2 ram Exp $"
)
;;;
;;; **********************************************************************
;;;
...
...
@@ -627,7 +627,6 @@
(
define-condition
warning
(
condition
)
())
(
define-condition
style-warning
(
warning
)
())
(
define-condition
simple-style-warning
(
style-warning
)
())
(
defun
warn
(
datum
&rest
arguments
)
"Warns about a situation by signalling a condition formed by datum and
...
...
@@ -656,6 +655,10 @@
(
apply
#'
format
stream
(
simple-condition-format-control
condition
)
(
simple-condition-format-arguments
condition
)))
(
deftype
simple-condition
()
'
(
or
internal-simple-condition
simple-warning
simple-type-error
simple-error
simple-style-warning
))
;;; The simple-condition is really called internal-simple-condition, so
;;; SIMPLE-CONDITION-FORMAT-CONTROL and SIMPLE-CONDITION-FORMAT-ARGUMENTS could
;;; be written to handle the simple-condition, simple-warning,
...
...
@@ -673,15 +676,12 @@
(
setf
(
symbol-plist
'simple-condition
)
(
symbol-plist
'internal-simple-condition
))
(
deftype
simple-condition
()
'
(
or
internal-simple-condition
simple-warning
simple-type-error
simple-error
simple-style-warning
))
;;; The simple-warning type has a conc-name, so SIMPLE-CONDITION-FORMAT-CONTROL
;;; and SIMPLE-CONDITION-FORMAT-ARGUMENTS could be written to handle the
;;; simple-condition, simple-warning, simple-type-error, and simple-error
types.
;;; This seems to create some kind of bogus multiple inheritance that
the user
;;; sees.
;;; simple-condition, simple-warning, simple-type-error, and simple-error
;;;
types.
This seems to create some kind of bogus multiple inheritance that
;;;
the user
sees.
;;;
(
define-condition
simple-warning
(
warning
)
(
format-control
...
...
@@ -767,21 +767,29 @@
;;;
(
defun
simple-condition-format-control
(
condition
)
(
etypecase
condition
(
simple-condition
(
internal-simple-condition-format-control
condition
))
(
simple-warning
(
internal-simple-warning-format-control
condition
))
(
internal-simple-condition
(
internal-simple-condition-format-control
condition
))
(
simple-warning
(
internal-simple-warning-format-control
condition
))
(
simple-style-warning
(
internal-simple-style-warning-format-control
condition
))
(
simple-type-error
(
internal-simple-type-error-format-control
condition
))
(
simple-error
(
internal-simple-error-format-control
condition
))))
(
simple-type-error
(
internal-simple-type-error-format-control
condition
))
(
simple-error
(
internal-simple-error-format-control
condition
))))
;;;
(
defun
simple-condition-format-arguments
(
condition
)
(
etypecase
condition
(
simple-condition
(
internal-simple-condition-format-arguments
condition
))
(
simple-warning
(
internal-simple-warning-format-arguments
condition
))
(
internal-simple-condition
(
internal-simple-condition-format-arguments
condition
))
(
simple-warning
(
internal-simple-warning-format-arguments
condition
))
(
simple-style-warning
(
internal-simple-style-warning-format-arguments
condition
))
(
simple-type-error
(
internal-simple-type-error-format-arguments
condition
))
(
simple-error
(
internal-simple-error-format-arguments
condition
))))
(
simple-type-error
(
internal-simple-type-error-format-arguments
condition
))
(
simple-error
(
internal-simple-error-format-arguments
condition
))))
(
define-condition
program-error
(
error
)
())
...
...
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