From 94e19b851e5dd53b8feee126ec864b3410ef3f33 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Fri, 1 Dec 2017 22:12:29 -0800 Subject: [PATCH] farewell --- beautiful-racket-lib/br/define.rkt | 2 - .../br/private/generate-literals.rkt | 37 +------------------ 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/beautiful-racket-lib/br/define.rkt b/beautiful-racket-lib/br/define.rkt index 157ebe3..396faf8 100644 --- a/beautiful-racket-lib/br/define.rkt +++ b/beautiful-racket-lib/br/define.rkt @@ -141,8 +141,6 @@ [(_ id:id leading-pat:expr ... else-pat:else-clause trailing-pat0:expr trailing-pat:expr ...) (raise-syntax-error 'define-macro-cases "`else` clause must be last" (syntax->datum #'id))] [(_ id:id (pat:expr . result-exprs:expr) ... else-clause:else-clause) - (unless (all-...-follow-wildcards #'(pat ...)) - (raise-syntax-error 'define-macro-cases "found ellipses after non-wildcard variable" (syntax->datum stx))) (with-syntax ([(BOUND-LITS UNBOUND-LITS) (generate-bound-and-unbound-literals #'(pat ...) #:treat-as-bound #'id)]) #'(define-macro id diff --git a/beautiful-racket-lib/br/private/generate-literals.rkt b/beautiful-racket-lib/br/private/generate-literals.rkt index 3e262c4..40b3ea0 100644 --- a/beautiful-racket-lib/br/private/generate-literals.rkt +++ b/beautiful-racket-lib/br/private/generate-literals.rkt @@ -1,6 +1,6 @@ #lang racket/base (require "syntax-flatten.rkt" racket/list) -(provide all-...-follow-wildcards generate-literals generate-bound-and-unbound-literals) +(provide generate-literals generate-bound-and-unbound-literals) (define (literal-identifier? pat-datum) (and (symbol? pat-datum) @@ -9,10 +9,6 @@ (or (not (regexp-match #rx"[A-Z]" pat-str)) ; either doesn't contain at least one uppercase letter ... (not (equal? (string-upcase pat-str) pat-str)))))) ;... or doesn't contain all uppercase letters -(define (wildcard-identifier? pat-datum) - (and (symbol? pat-datum) - (not (literal-identifier? pat-datum)) - (not (memq pat-datum '(... _))))) ;; generate literals for any symbols that are not ... or _ and not IN_CAPS (define (generate-literals pats) @@ -21,6 +17,7 @@ #:when (literal-identifier? pat-datum)) pat-arg)) + (define (generate-bound-and-unbound-literals pats #:treat-as-bound [bound-id #f]) (define literals (generate-literals pats)) (define-values (bound-literals unbound-literals) @@ -30,34 +27,4 @@ ;; `syntax-parse` crabs if there are any duplicate ids, so remove them (map (λ (ids) (remove-duplicates ids bound-identifier=?)) (list bound-literals unbound-literals))) -(define (all-...-follow-wildcards pats) - (define prev-datum (box #f)) - (and - (for*/and ([pat-arg (in-list (syntax-flatten pats))] - [pat-datum (in-value (syntax->datum pat-arg))]) - ;; OK if there's no previous datum, - (and - (when (eq? pat-datum '...) - (wildcard-identifier? (unbox prev-datum))) - (set-box! prev-datum pat-datum))) - #true)) - -(module+ test - (require rackunit) - (check-equal? (map syntax->datum (generate-literals #'(foo 42 BAR _ (... ...) bar <=> 3Bar 3bar))) '(foo bar <=> 3Bar 3bar)) - - (test-case "wildcard-identifier?" - (check-true (wildcard-identifier? 'FOO)) - (check-true (wildcard-identifier? 'TOPPING)) - - (check-false (wildcard-identifier? 'piZZa)) - (check-false (wildcard-identifier? 'please))) - - (test-case "all-...-follow-wildcards" - (check-true (all-...-follow-wildcards #'())) - (check-true (all-...-follow-wildcards (datum->syntax #f '(a b)))) - (check-true (all-...-follow-wildcards (datum->syntax #f '(a b C ...)))) - (check-false (all-...-follow-wildcards (datum->syntax #f '(...)))) - (check-false (all-...-follow-wildcards (datum->syntax #f '(a ...)))) - (check-false (all-...-follow-wildcards (datum->syntax #f '(A ... b ...))))))