|
24 | 24 | resyntax |
25 | 25 | resyntax/base |
26 | 26 | resyntax/default-recommendations |
27 | | - resyntax/private/file-group |
| 27 | + resyntax/grimoire/source-group |
28 | 28 | resyntax/private/github |
29 | 29 | resyntax/private/refactoring-result |
30 | 30 | resyntax/grimoire/source |
|
71 | 71 | ("--file" |
72 | 72 | filepath |
73 | 73 | "A file to analyze." |
74 | | - (vector-builder-add targets (single-file-group filepath all-lines))) |
| 74 | + (vector-builder-add targets (single-source-group filepath all-lines))) |
75 | 75 |
|
76 | 76 | ("--directory" |
77 | 77 | dirpath |
78 | 78 | "A directory to analyze, including subdirectories." |
79 | | - (vector-builder-add targets (directory-file-group dirpath))) |
| 79 | + (vector-builder-add targets (directory-source-group dirpath))) |
80 | 80 |
|
81 | 81 | ("--package" |
82 | 82 | pkgname |
83 | 83 | "An installed package to analyze." |
84 | | - (vector-builder-add targets (package-file-group pkgname))) |
| 84 | + (vector-builder-add targets (package-source-group pkgname))) |
85 | 85 |
|
86 | 86 | ("--local-git-repository" |
87 | 87 | repopath baseref |
88 | 88 | "A Git repository to search for modified files to analyze. The repopath argument is a directory |
89 | 89 | path to the root of a Git repository, and the baseref argument is a Git reference (in the form \ |
90 | 90 | \"remotename/branchname\") to use as the base state of the repository. Any files that have been \ |
91 | 91 | changed relative to baseref are analyzed." |
92 | | - (vector-builder-add targets (git-repository-file-group repopath baseref))) |
| 92 | + (vector-builder-add targets (git-repository-source-group repopath baseref))) |
93 | 93 |
|
94 | 94 | #:once-each |
95 | 95 |
|
@@ -158,25 +158,25 @@ determined by the GITHUB_REPOSITORY and GITHUB_REF environment variables." |
158 | 158 |
|
159 | 159 | #:multi |
160 | 160 |
|
161 | | - ("--file" filepath "A file to fix." (add-target! (single-file-group filepath all-lines))) |
| 161 | + ("--file" filepath "A file to fix." (add-target! (single-source-group filepath all-lines))) |
162 | 162 |
|
163 | 163 | ("--directory" |
164 | 164 | dirpath |
165 | 165 | "A directory to fix, including subdirectories." |
166 | | - (add-target! (directory-file-group dirpath))) |
| 166 | + (add-target! (directory-source-group dirpath))) |
167 | 167 |
|
168 | 168 | ("--package" |
169 | 169 | pkgname |
170 | 170 | "An installed package to fix." |
171 | | - (add-target! (package-file-group pkgname))) |
| 171 | + (add-target! (package-source-group pkgname))) |
172 | 172 |
|
173 | 173 | ("--local-git-repository" |
174 | 174 | repopath baseref |
175 | 175 | "A Git repository to search for modified files to fix. The repopath argument is a directory |
176 | 176 | path to the root of a Git repository, and the baseref argument is a Git reference (in the form \ |
177 | 177 | \"remotename/branchname\") to use as the base state of the repository. Any files that have been \ |
178 | 178 | changed relative to baseref are analyzed and fixed." |
179 | | - (add-target! (git-repository-file-group repopath baseref))) |
| 179 | + (add-target! (git-repository-source-group repopath baseref))) |
180 | 180 |
|
181 | 181 | #:once-each |
182 | 182 |
|
@@ -284,7 +284,8 @@ For help on these, use 'analyze --help' or 'fix --help'." |
284 | 284 |
|
285 | 285 | (define (resyntax-analyze-run) |
286 | 286 | (define options (resyntax-analyze-parse-command-line)) |
287 | | - (define sources (file-groups-resolve (resyntax-analyze-options-targets options))) |
| 287 | + (define target-group (source-group-union-all (resyntax-analyze-options-targets options))) |
| 288 | + (define sources (source-group-resolve target-group)) |
288 | 289 | (define analysis |
289 | 290 | (resyntax-analyze-all sources |
290 | 291 | #:suite (resyntax-analyze-options-suite options) |
@@ -329,7 +330,8 @@ For help on these, use 'analyze --help' or 'fix --help'." |
329 | 330 | (define options (resyntax-fix-parse-command-line)) |
330 | 331 | (define fix-method (resyntax-fix-options-fix-method options)) |
331 | 332 | (define output-format (resyntax-fix-options-output-format options)) |
332 | | - (define sources (file-groups-resolve (resyntax-fix-options-targets options))) |
| 333 | + (define target-group (source-group-union-all (resyntax-fix-options-targets options))) |
| 334 | + (define sources (source-group-resolve target-group)) |
333 | 335 | (define max-modified-files (resyntax-fix-options-max-modified-files options)) |
334 | 336 | (define max-modified-lines (resyntax-fix-options-max-modified-lines options)) |
335 | 337 | (define analysis |
|
0 commit comments