From 9cd960d3f9513c3fa1072ff0b06a63c4b41f762e Mon Sep 17 00:00:00 2001 From: Juho Snellman Date: Mon, 6 Dec 2010 02:28:02 +0000 Subject: [PATCH] 1.0.45.2: A slightly better error message for malformed reader conditional * Modified from lp#680173 by Roman Marynchak --- src/code/early-extensions.lisp | 7 +++++-- version.lisp-expr | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/code/early-extensions.lisp b/src/code/early-extensions.lisp index d6bdf7b..c589ab9 100644 --- a/src/code/early-extensions.lisp +++ b/src/code/early-extensions.lisp @@ -963,7 +963,7 @@ ;;; If X is a symbol, see whether it is present in *FEATURES*. Also ;;; handle arbitrary combinations of atoms using NOT, AND, OR. (defun featurep (x) - (etypecase x + (typecase x (cons (case (car x) ((:not not) @@ -977,7 +977,10 @@ ((:or or) (some #'featurep (cdr x))) (t (error "unknown operator in feature expression: ~S." x)))) - (symbol (not (null (memq x *features*)))))) + (symbol (not (null (memq x *features*)))) + (t + (error "invalid feature expression: ~S" x)))) + ;;;; utilities for two-VALUES predicates diff --git a/version.lisp-expr b/version.lisp-expr index 34534e1..4043b97 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -20,4 +20,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.45.1" +"1.0.45.2" -- 1.7.10.4