Skip to content

Commit

Permalink
improve error message for a particular malformed redex-check
Browse files Browse the repository at this point in the history
  • Loading branch information
rfindler committed Nov 19, 2024
1 parent c21e7f3 commit fb259b6
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions redex-lib/redex/private/generate-term.rkt
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,20 @@
(define bad-kws (set-intersect used-kws satisfying-disallowed-kws))
(syntax-case stx (=)
[(form lang #:satisfying (mf-id . args) = res property . kw-args)
(unless (set-empty? bad-kws)
(raise-syntax-error 'redex-check (format "~s cannot be used with #:satisfying" (car (set->list bad-kws))) stx))
(redex-check/mf stx #'form #'lang #'mf-id #'args #'res #'property #'kw-args)]
(begin
(unless (set-empty? bad-kws)
(raise-syntax-error 'redex-check (format "~s cannot be used with #:satisfying" (car (set->list bad-kws))) stx))
(redex-check/mf stx #'form #'lang #'mf-id #'args #'res #'property #'kw-args))]
[(form lang #:satisfying (jform-id . pats) property . kw-args)
(unless (set-empty? bad-kws)
(raise-syntax-error 'redex-check (format "~s cannot be used with #:satisfying" (car (set->list bad-kws))) stx))
(syntax-property
(redex-check/jf stx #'form #'lang #'jform-id #'pats #'property #'kw-args)
'disappeared-use
(syntax-local-introduce #'jform-id))]
(begin
(unless (set-empty? bad-kws)
(raise-syntax-error 'redex-check (format "~s cannot be used with #:satisfying" (car (set->list bad-kws))) stx))
(when (keyword? (syntax-e #'property))
(raise-syntax-error 'redex-check "expected a property" stx #'property))
(syntax-property
(redex-check/jf stx #'form #'lang #'jform-id #'pats #'property #'kw-args)
'disappeared-use
(syntax-local-introduce #'jform-id)))]
[(form lang #:satisfying . rest)
(raise-syntax-error 'redex-check "#:satisfying expected judgment form or metafunction syntax followed by a property" stx #'rest)]
[(form lang pat #:enum biggest-e property . kw-args)
Expand Down

0 comments on commit fb259b6

Please sign in to comment.