Skip to content

Commit

Permalink
0.7.13.22:
Browse files Browse the repository at this point in the history
        Minor error fix, from Paul Dietz' suite
        ... if GETF and GET-PROPERTIES signal a error on malformed
		property lists, then make it a type-error, not just a
		simple-error
  • Loading branch information
csrhodes committed Mar 10, 2003
1 parent 2db3b6b commit 2d5aa6c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
2 changes: 2 additions & 0 deletions NEWS
Expand Up @@ -1596,6 +1596,8 @@ changes in sbcl-0.7.14 relative to sbcl-0.7.13:
** APPEND checks its arguments for being proper lists;
** An array specialized to be unable to hold elements has been
implemented (as required -- yes, really) by ANSI;
** GETF and GET-PROPERTIES throw a TYPE-ERROR, not a SIMPLE-ERROR,
on malformed property lists;

planned incompatible changes in 0.7.x:
* (not done yet, but planned:) When the profiling interface settles
Expand Down
14 changes: 10 additions & 4 deletions src/code/symbol.lisp
Expand Up @@ -156,8 +156,11 @@
(do ((plist place (cddr plist)))
((null plist) default)
(cond ((atom (cdr plist))
(error "~S is a malformed property list."
place))
(error 'simple-type-error
:format-control "malformed property list: ~S."
:format-arguments (list place)
:datum (cdr plist)
:expected-type 'cons))
((eq (car plist) indicator)
(return (cadr plist))))))

Expand All @@ -178,8 +181,11 @@
(do ((plist place (cddr plist)))
((null plist) (values nil nil nil))
(cond ((atom (cdr plist))
(error "~S is a malformed proprty list."
place))
(error 'simple-type-error
:format-control "malformed property list: ~S."
:format-arguments (list place)
:datum (cdr plist)
:expected-type 'cons))
((memq (car plist) indicator-list)
(return (values (car plist) (cadr plist) plist))))))

Expand Down
2 changes: 1 addition & 1 deletion version.lisp-expr
Expand Up @@ -18,4 +18,4 @@
;;; versions, especially for internal versions off the main CVS
;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)

"0.7.13.21"
"0.7.13.22"

0 comments on commit 2d5aa6c

Please sign in to comment.