Skip to content

Commit

Permalink
Run Resyntax over Resyntax (#305)
Browse files Browse the repository at this point in the history 
Time to get meta
  • Loading branch information
@jackfirth
jackfirth authored Sep 18, 2024
1 parent d6ef3c9 commit 1675e0a
Show file tree
Hide file tree
Showing 38 changed files with 168 additions and 174 deletions.
14 changes: 6 additions & 8 deletions base.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
define-refactoring-rule
define-definition-context-refactoring-rule
(contract-out
[refactoring-rule? predicate/c]
[refactoring-rule? (-> any/c boolean?)]
[refactoring-rule-description (-> refactoring-rule? immutable-string?)]
[refactoring-suite? predicate/c]
[refactoring-suite? (-> any/c boolean?)]
[refactoring-suite
(->* ()
(#:rules (sequence/c refactoring-rule?) #:name (or/c interned-symbol? #false))
Expand All @@ -29,21 +29,19 @@
(-> refactoring-rule? syntax? source? (option/c syntax-replacement?))])))


(require (for-syntax racket/base
racket/syntax
resyntax/private/more-syntax-parse-classes)
(require (for-syntax racket/base racket/syntax resyntax/private/more-syntax-parse-classes)
racket/sequence
rebellion/base/immutable-string
rebellion/base/option
rebellion/base/symbol
rebellion/type/object
resyntax/default-recommendations/private/definition-context
resyntax/private/source
resyntax/private/syntax-replacement
resyntax/private/syntax-neighbors
resyntax/private/syntax-replacement
syntax/parse
syntax/parse/experimental/template
syntax/parse/define)
syntax/parse/define
syntax/parse/experimental/template)


;@----------------------------------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions cli.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
racket/cmdline
racket/format
racket/hash
(only-in racket/list shuffle)
racket/logging
racket/match
racket/path
Expand All @@ -26,10 +25,11 @@
resyntax/private/file-group
resyntax/private/github
resyntax/private/logger
resyntax/private/refactoring-result
resyntax/private/source
resyntax/private/string-indent
resyntax/private/syntax-replacement
resyntax/private/refactoring-result
resyntax/private/source)
(only-in racket/list shuffle))


;@----------------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions default-recommendations.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@


(require rebellion/private/static-name
resyntax/base
resyntax/default-recommendations/boolean-shortcuts
resyntax/default-recommendations/comparison-shortcuts
resyntax/default-recommendations/conditional-shortcuts
Expand All @@ -55,10 +56,9 @@
resyntax/default-recommendations/numeric-shortcuts
resyntax/default-recommendations/require-and-provide-suggestions
resyntax/default-recommendations/string-shortcuts
resyntax/default-recommendations/syntax-shortcuts
resyntax/default-recommendations/syntax-parse-shortcuts
resyntax/default-recommendations/syntax-rules-shortcuts
resyntax/base)
resyntax/default-recommendations/syntax-shortcuts)


;@----------------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion default-recommendations/boolean-shortcuts.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

(require (for-syntax racket/base)
rebellion/private/static-name
resyntax/base
resyntax/default-recommendations/private/boolean
resyntax/default-recommendations/private/syntax-lines
resyntax/default-recommendations/private/syntax-tree
resyntax/base
syntax/parse)


Expand Down
2 changes: 1 addition & 1 deletion default-recommendations/conditional-shortcuts.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@


(require (for-syntax racket/base)
resyntax/base
resyntax/default-recommendations/private/boolean
resyntax/default-recommendations/private/exception
resyntax/default-recommendations/private/let-binding
resyntax/default-recommendations/private/metafunction
resyntax/base
syntax/parse)


Expand Down
2 changes: 1 addition & 1 deletion default-recommendations/contract-shortcuts.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

(require (for-syntax racket/base)
rebellion/private/static-name
resyntax/base
resyntax/default-recommendations/private/syntax-lines
resyntax/default-recommendations/private/syntax-tree
resyntax/private/syntax-replacement
resyntax/base
syntax/parse)


Expand Down
6 changes: 3 additions & 3 deletions default-recommendations/for-loop-shortcuts.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,9 @@ return just that result."
#:when (free-identifier=? #'vs #'vs2)
#:when (free-identifier=? #'vs #'vs3)
#:when (for*/and ([body-stx (in-list (cons #'loop-element (attribute loop-body)))]
[vs-usage (in-list (syntax-directly-enclosing-expressions body-stx #'vs))])
(or (syntax-free-identifier=? vs-usage #'(car vs))
(syntax-free-identifier=? vs-usage #'(first vs))))
[vs-usage (in-list (syntax-directly-enclosing-expressions body-stx #'vs))]
#:unless (syntax-free-identifier=? vs-usage #'(car vs)))
(syntax-free-identifier=? vs-usage #'(first vs)))
#:cut

#:with element-id (depluralize-id #'vs)
Expand Down
2 changes: 1 addition & 1 deletion default-recommendations/function-definition-shortcuts.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
guard
racket/list
rebellion/private/static-name
resyntax/base
resyntax/default-recommendations/private/lambda-by-any-name
resyntax/default-recommendations/private/syntax-lines
resyntax/base
resyntax/private/syntax-replacement
syntax/parse)

Expand Down
2 changes: 1 addition & 1 deletion default-recommendations/function-shortcuts.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

(require (for-syntax racket/base)
rebellion/private/static-name
resyntax/default-recommendations/private/literal-constant
resyntax/base
resyntax/default-recommendations/private/literal-constant
resyntax/private/syntax-replacement
syntax/parse)

Expand Down
2 changes: 1 addition & 1 deletion default-recommendations/hash-shortcuts.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
(require (for-syntax racket/base)
racket/set
rebellion/private/static-name
resyntax/base
resyntax/default-recommendations/private/lambda-by-any-name
resyntax/default-recommendations/private/literal-constant
resyntax/default-recommendations/private/pure-expression
resyntax/default-recommendations/private/syntax-equivalence
resyntax/default-recommendations/private/syntax-identifier-sets
resyntax/base
resyntax/private/syntax-neighbors
syntax/parse)

Expand Down
26 changes: 13 additions & 13 deletions default-recommendations/let-binding-suggestions.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,18 @@


(require (for-syntax racket/base)
racket/set
rebellion/private/static-name
resyntax/base
resyntax/default-recommendations/private/definition-context
resyntax/default-recommendations/private/lambda-by-any-name
resyntax/default-recommendations/private/let-binding
resyntax/default-recommendations/private/syntax-equivalence
resyntax/default-recommendations/private/syntax-identifier-sets
resyntax/private/syntax-neighbors
resyntax/private/syntax-replacement
syntax/id-set
syntax/parse
(only-in racket/class
define/augment
define/augment-final
Expand All @@ -20,19 +32,7 @@
define/public
define/public-final
define/pubment
define/private)
racket/set
rebellion/private/static-name
resyntax/default-recommendations/private/definition-context
resyntax/default-recommendations/private/lambda-by-any-name
resyntax/default-recommendations/private/let-binding
resyntax/default-recommendations/private/syntax-equivalence
resyntax/default-recommendations/private/syntax-identifier-sets
resyntax/base
resyntax/private/syntax-replacement
resyntax/private/syntax-neighbors
syntax/id-set
syntax/parse)
define/private))


;@----------------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion default-recommendations/list-shortcuts.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
racket/list
racket/set
rebellion/private/static-name
resyntax/base
resyntax/default-recommendations/private/lambda-by-any-name
resyntax/default-recommendations/private/literal-constant
resyntax/default-recommendations/private/syntax-identifier-sets
resyntax/private/syntax-neighbors
resyntax/base
syntax/parse)


Expand Down
4 changes: 2 additions & 2 deletions default-recommendations/match-shortcuts.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
racket/match
racket/set
rebellion/private/static-name
resyntax/base
resyntax/default-recommendations/private/definition-context
resyntax/default-recommendations/private/syntax-identifier-sets
resyntax/default-recommendations/private/syntax-lines
resyntax/default-recommendations/private/syntax-tree
resyntax/default-recommendations/private/syntax-identifier-sets
resyntax/base
resyntax/private/syntax-neighbors
syntax/parse)

Expand Down
2 changes: 1 addition & 1 deletion default-recommendations/numeric-shortcuts.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@


(require rebellion/private/static-name
resyntax/default-recommendations/private/lambda-by-any-name
resyntax/base
resyntax/default-recommendations/private/lambda-by-any-name
syntax/parse)


Expand Down
14 changes: 7 additions & 7 deletions default-recommendations/private/definition-context.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@

(require (for-syntax racket/base)
racket/block
racket/match
rebellion/private/static-name
resyntax/default-recommendations/private/lambda-by-any-name
resyntax/private/syntax-replacement
syntax/parse
syntax/parse/lib/function-header
(only-in racket/class
define/augment
define/augment-final
Expand All @@ -17,13 +23,7 @@
define/public
define/public-final
define/pubment
define/private)
racket/match
rebellion/private/static-name
resyntax/default-recommendations/private/lambda-by-any-name
resyntax/private/syntax-replacement
syntax/parse
syntax/parse/lib/function-header)
define/private))


;@----------------------------------------------------------------------------------------------------
Expand Down
10 changes: 5 additions & 5 deletions default-recommendations/private/graph.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

(provide
(contract-out
[graph? predicate/c]
[graph? (-> any/c boolean?)]
[graph (->* () (#:vertex-count (or/c natural? #false)) #:rest (listof entry?) graph?)]
[graph-reverse (-> graph? graph?)]
[graph-vertex-count (-> graph? natural?)]
Expand All @@ -28,13 +28,13 @@
rebellion/collection/entry
rebellion/collection/list
rebellion/private/static-name
rebellion/streaming/transducer
rebellion/streaming/reducer)
rebellion/streaming/reducer
rebellion/streaming/transducer)


(module+ test
(require (submod "..")
rackunit))
(require rackunit
(submod "..")))


;@----------------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion default-recommendations/private/let-binding.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
(require racket/list
racket/match
resyntax/base
resyntax/default-recommendations/private/syntax-identifier-sets
resyntax/default-recommendations/private/lambda-by-any-name
resyntax/default-recommendations/private/syntax-identifier-sets
resyntax/private/logger
syntax/id-set
syntax/parse
Expand Down
6 changes: 3 additions & 3 deletions default-recommendations/private/metafunction.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@


(module+ test
(require (submod "..")
racket/syntax
(require racket/syntax
rackunit
rebellion/private/static-name))
rebellion/private/static-name
(submod "..")))


;@----------------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions default-recommendations/private/syntax-equivalence.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@


(module+ test
(require (submod "..")
rackunit))
(require rackunit
(submod "..")))


;@----------------------------------------------------------------------------------------------------
Expand Down
10 changes: 5 additions & 5 deletions default-recommendations/private/syntax-lines.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

(provide
(contract-out
[oneline-syntax? predicate/c]
[multiline-syntax? predicate/c]))
[oneline-syntax? (-> any/c boolean?)]
[multiline-syntax? (-> any/c boolean?)]))


(require rebellion/streaming/reducer
Expand All @@ -16,9 +16,9 @@


(module+ test
(require (submod "..")
rackunit
rebellion/private/static-name))
(require rackunit
rebellion/private/static-name
(submod "..")))


;@----------------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions default-recommendations/private/syntax-tree.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@


(module+ test
(require (submod "..")
rackunit))
(require rackunit
(submod "..")))


;@----------------------------------------------------------------------------------------------------
Expand Down
10 changes: 5 additions & 5 deletions default-recommendations/require-and-provide-suggestions.rkt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@

(require guard
racket/list
racket/symbol
racket/match
racket/symbol
rebellion/base/comparator
rebellion/base/option
rebellion/collection/entry
rebellion/collection/list
rebellion/private/static-name
rebellion/streaming/transducer
resyntax/private/logger
resyntax/base
resyntax/private/logger
syntax/parse)


(module+ test
(require (submod "..")
rackunit
rebellion/collection/list))
(require rackunit
rebellion/collection/list
(submod "..")))


;@----------------------------------------------------------------------------------------------------
Expand Down
Loading

0 comments on commit 1675e0a

Please sign in to comment.