From 09458af39f91e7505d8162fe5748c6eba14fc22c Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Sat, 31 Aug 2013 20:52:31 -0500 Subject: [PATCH] adjust some error messages based on new conventions --- .../gui-lib/framework/preferences.rkt | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/gui-pkgs/gui-lib/framework/preferences.rkt b/pkgs/gui-pkgs/gui-lib/framework/preferences.rkt index 4068b50f12..1a194dd6d7 100644 --- a/pkgs/gui-pkgs/gui-lib/framework/preferences.rkt +++ b/pkgs/gui-pkgs/gui-lib/framework/preferences.rkt @@ -138,16 +138,25 @@ the state transitions / contracts are: (λ (p value) (cond [(pref-default-set? p) - (let ([default (hash-ref defaults p)]) - (unless ((default-checker default) value) - (error 'preferences:set - "tried to set preference ~e to ~e but it does not meet test from `preferences:set-default'" - p value)) + (define default (hash-ref defaults p)) + (define checker? (default-checker default)) + (unless (checker? value) + (error 'preferences:set + (string-append + "new value doesn't satisfy preferences:set-default predicate\n" + " pref sym: ~e\n" + " given: ~e\n" + " predicate: ~e") + p value checker?)) (check-callbacks p value) - (hash-set! preferences p value))] + (hash-set! preferences p value)] [(not (pref-default-set? p)) (raise-unknown-preference-error - 'preferences:set "tried to set the preference ~e to ~e, but no default is set" + 'preferences:set + (string-append + "cannot set preference before setting default" + " pref sym: ~e\n" + " given: ~e") p value)])) ps values)