diff --git a/collects/mzlib/private/match-helper.ss b/collects/mzlib/private/match-helper.ss index bb8936ac5e..fd689cbdf7 100644 --- a/collects/mzlib/private/match-helper.ss +++ b/collects/mzlib/private/match-helper.ss @@ -25,6 +25,13 @@ (let-syntax ([id (syntax-rules () [(id arg) (syntax/loc stx arg)])]) e)])) + (define (constant-data? v) + (or + (string? v) + (boolean? v) + (char? v) + (number? v) + (keyword? v))) ;;!(function symbol-append diff --git a/collects/mzlib/private/parse-quasi.scm b/collects/mzlib/private/parse-quasi.scm index 964ac0eb2e..6d94713ec2 100644 --- a/collects/mzlib/private/parse-quasi.scm +++ b/collects/mzlib/private/parse-quasi.scm @@ -30,10 +30,7 @@ (syntax-case phrase (quasiquote unquote unquote-splicing) (p (let ((pat (syntax-object->datum (syntax p)))) - (or (string? pat) - (boolean? pat) - (char? pat) - (number? pat) + (or (constant-data? pat) (dot-dot-k? pat))) (syntax p)) (p diff --git a/collects/mzlib/private/render-test-list-impl.ss b/collects/mzlib/private/render-test-list-impl.ss index f300453895..133ae065a3 100644 --- a/collects/mzlib/private/render-test-list-impl.ss +++ b/collects/mzlib/private/render-test-list-impl.ss @@ -200,11 +200,7 @@ ;; This recognizes constants such strings [pt - (let ([pt (syntax-e #'pt)]) - (or (string? pt) - (boolean? pt) - (char? pt) - (number? pt))) + (constant-data? (syntax-e #'pt)) (list (reg-test `(equal? ,(syntax-object->datum ae)