Speed up --check-pkg-deps

.travis.yml

@@ -50,6 +50,7 @@ before_script:
 # packages without it getting stuck on a confirmation prompt.
 script:
  - raco test -x -p extensible-parser-specifications
+ - raco setup --check-pkg-deps --no-zo --no-launcher --no-install --no-post-install --no-docs --pkgs extensible-parser-specifications
 
 after_success:
  - raco setup --check-pkg-deps --pkgs extensible-parser-specifications

private/define-syntax+simple-api.rkt

@@ -8,22 +8,36 @@
          (for-syntax racket/base
                      syntax/parse
                      racket/stxparam
-                     racket/syntax)
-         (for-meta 2
-                   racket/base
-                   syntax/parse
                      racket/syntax
-                   phc-toolkit/untyped
-                   (prefix-in syntax/parse: syntax/parse/private/residual-ct)))
+                     phc-toolkit/untyped)
+         (for-meta 2 (prefix-in syntax/parse: syntax/parse/private/residual-ct))
+         (for-meta 2 racket/base)
+         (for-meta 2 syntax/parse)
+         (for-meta 2 racket/syntax)
+         (for-meta 2 phc-toolkit/untyped))
 
-(define-simple-macro (define-syntax/parse+simple [name . args] . body)
-  #:with name-forward (format-id #'name "~a-forward-attributes" #'name)
-  #:with tmp-forward (format-id #'tmp "~a-forward-attributes" #'tmp)
-  (begin
+#;(define-syntax/case (define-syntax/parse+simple [name . args] . body) ()
+  (with-format-ids/inject-binders
+   ([name-forward #'name "~a-forward-attributes" #'name]
+    [tmp-forward  #'tmp  "~a-forward-attributes" #'tmp])
+   #'(begin
        (begin-for-syntax
+         (inject-sub-range-binders ...
           (define/syntax-parse+simple [tmp . args] . body)
-      (define-syntax name-forward (make-rename-transformer #'tmp-forward)))
-    (define-syntax name tmp)))
+          (define-syntax name-forward (make-rename-transformer #'tmp-forward))))
+       (define-syntax name tmp))))
+
+(define-syntax/parse (define-syntax/parse+simple (~optional (~and two #:2))
+                       [name . args] . body)
+  (with-format-ids/inject-binders
+   ([name-forward #'name "~a-forward-attributes" #'name]
+    [tmp-forward  #'tmp  "~a-forward-attributes" #'tmp])
+   #'(begin
+       (begin-for-syntax
+         (inject-sub-range-binders ...
+          (define/syntax-parse+simple [tmp . args] . body)
+          (define-syntax name-forward (make-rename-transformer #'tmp-forward))))
+       (define-syntax name tmp))))
 
 (begin-for-syntax
   (define-syntax (define/syntax-parse+simple stx)
@@ -47,9 +61,9 @@
       [(_ [name (~var cls (static syntax/parse:stxclass? "a syntax class"))]
           . body)
        #:with colon-stxclass (format-id #'cls ":~a" #'cls)
-       #:with name-forward (format-id #'name "~a-forward-attributes" #'name)
-       (with-disappeared-uses
-        (let ()
+       (with-arrows
+        (define/with-syntax name-forward
+          (format-id/record #'name "~a-forward-attributes" #'name))
         (define c (syntax-local-value/record #'cls syntax/parse:stxclass?))
         (define attrs (syntax/parse:stxclass-attrs c))
         (define/with-syntax (attr-name …) (map syntax/parse:attr-name attrs))
@@ -82,4 +96,4 @@
                     (attribute #,(format-id stx3 "~a.~a"
                                             #'forward-args-prefix
                                             'attr-name))
-                      …)])))))])))
+                    …)]))))])))