branch: elpa/flymake-collection commit 9d9d455f53c6d4850be9621830d52317ece7b60a Author: Mohsin Kaleem <mohk...@kisara.moe> Commit: Mohsin Kaleem <mohk...@kisara.moe>
(misc): Include parse name in flymake-rest-rx and flymake-rest-enumerate Makes the fact that they have a shared purpose clearer. --- checkers/flymake-rest-awk-gawk.el | 2 +- checkers/flymake-rest-clang.el | 2 +- checkers/flymake-rest-eslint.el | 2 +- checkers/flymake-rest-gcc.el | 2 +- checkers/flymake-rest-html-tidy.el | 2 +- checkers/flymake-rest-jq.el | 2 +- checkers/flymake-rest-jsonlint.el | 2 +- checkers/flymake-rest-less.el | 2 +- checkers/flymake-rest-markdownlint.el | 2 +- checkers/flymake-rest-mypy.el | 2 +- checkers/flymake-rest-proselint.el | 2 +- checkers/flymake-rest-pycodestyle.el | 2 +- checkers/flymake-rest-pylint.el | 2 +- checkers/flymake-rest-rubocop.el | 2 +- checkers/flymake-rest-shellcheck.el | 2 +- checkers/flymake-rest-yamllint.el | 2 +- flymake-rest-enumerate.el => flymake-rest-parse-enumerate.el | 2 +- flymake-rest-rx.el => flymake-rest-parse-rx.el | 6 +++--- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/checkers/flymake-rest-awk-gawk.el b/checkers/flymake-rest-awk-gawk.el index 9052cfe017..f988eb0af9 100644 --- a/checkers/flymake-rest-awk-gawk.el +++ b/checkers/flymake-rest-awk-gawk.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-rx)) + (require 'flymake-rest-parse-rx)) ;;;###autoload (autoload 'flymake-rest-awk-gawk "flymake-rest-awk-gawk") (flymake-rest-define flymake-rest-awk-gawk diff --git a/checkers/flymake-rest-clang.el b/checkers/flymake-rest-clang.el index 864888f1c1..6bb3d9988c 100644 --- a/checkers/flymake-rest-clang.el +++ b/checkers/flymake-rest-clang.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-rx)) + (require 'flymake-rest-parse-rx)) (defvar flymake-rest-clang-args '("-pedantic" "-pedantic-errors") diff --git a/checkers/flymake-rest-eslint.el b/checkers/flymake-rest-eslint.el index f9c7f25dba..288ddce0ee 100644 --- a/checkers/flymake-rest-eslint.el +++ b/checkers/flymake-rest-eslint.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-enumerate)) + (require 'flymake-rest-parse-enumerate)) ;;;###autoload (autoload 'flymake-rest-eslint "flymake-rest-eslint") (flymake-rest-define flymake-rest-eslint diff --git a/checkers/flymake-rest-gcc.el b/checkers/flymake-rest-gcc.el index 4237f38c12..f17f39004b 100644 --- a/checkers/flymake-rest-gcc.el +++ b/checkers/flymake-rest-gcc.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-rx)) + (require 'flymake-rest-parse-rx)) (defcustom flymake-rest-gcc-args '("-pedantic" "-pedantic-errors") diff --git a/checkers/flymake-rest-html-tidy.el b/checkers/flymake-rest-html-tidy.el index e7a8152e0f..29df9fff66 100644 --- a/checkers/flymake-rest-html-tidy.el +++ b/checkers/flymake-rest-html-tidy.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-rx)) + (require 'flymake-rest-parse-rx)) ;;;###autoload (autoload 'flymake-rest-html-tidy "flymake-rest-html-tidy") (flymake-rest-define flymake-rest-html-tidy diff --git a/checkers/flymake-rest-jq.el b/checkers/flymake-rest-jq.el index de194b6d7e..0309675630 100644 --- a/checkers/flymake-rest-jq.el +++ b/checkers/flymake-rest-jq.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-rx)) + (require 'flymake-rest-parse-rx)) ;;;###autoload (autoload 'flymake-rest-jq "flymake-rest-jq") (flymake-rest-define flymake-rest-jq diff --git a/checkers/flymake-rest-jsonlint.el b/checkers/flymake-rest-jsonlint.el index 6b9daecfa0..66e568f3b8 100644 --- a/checkers/flymake-rest-jsonlint.el +++ b/checkers/flymake-rest-jsonlint.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-rx)) + (require 'flymake-rest-parse-rx)) ;;;###autoload (autoload 'flymake-rest-jsonlint "flymake-rest-jsonlint") (flymake-rest-define flymake-rest-jsonlint diff --git a/checkers/flymake-rest-less.el b/checkers/flymake-rest-less.el index 6a7136699d..1ccea79d11 100644 --- a/checkers/flymake-rest-less.el +++ b/checkers/flymake-rest-less.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-rx)) + (require 'flymake-rest-parse-rx)) ;;;###autoload (autoload 'flymake-rest-less "flymake-rest-less") (flymake-rest-define flymake-rest-less diff --git a/checkers/flymake-rest-markdownlint.el b/checkers/flymake-rest-markdownlint.el index 3cdf2cf2cc..92bab1789f 100644 --- a/checkers/flymake-rest-markdownlint.el +++ b/checkers/flymake-rest-markdownlint.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-rx)) + (require 'flymake-rest-parse-rx)) (defcustom flymake-rest-markdownlint-style nil "Path to the style config for markdownlint." diff --git a/checkers/flymake-rest-mypy.el b/checkers/flymake-rest-mypy.el index 5ef6e1bb01..67ad0b8060 100644 --- a/checkers/flymake-rest-mypy.el +++ b/checkers/flymake-rest-mypy.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-rx)) + (require 'flymake-rest-parse-rx)) ;;;###autoload (autoload 'flymake-rest-mypy "flymake-rest-mypy") (flymake-rest-define flymake-rest-mypy diff --git a/checkers/flymake-rest-proselint.el b/checkers/flymake-rest-proselint.el index cc0f60fbde..be92b14745 100644 --- a/checkers/flymake-rest-proselint.el +++ b/checkers/flymake-rest-proselint.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-enumerate)) + (require 'flymake-rest-parse-enumerate)) ;;;###autoload (autoload 'flymake-rest-proselint "flymake-rest-proselint") (flymake-rest-define flymake-rest-proselint diff --git a/checkers/flymake-rest-pycodestyle.el b/checkers/flymake-rest-pycodestyle.el index 332997c461..9c11426fc9 100644 --- a/checkers/flymake-rest-pycodestyle.el +++ b/checkers/flymake-rest-pycodestyle.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-rx)) + (require 'flymake-rest-parse-rx)) ;;;###autoload (autoload 'flymake-rest-pycodestyle "flymake-rest-pycodestyle") (flymake-rest-define flymake-rest-pycodestyle diff --git a/checkers/flymake-rest-pylint.el b/checkers/flymake-rest-pylint.el index f82aa15d4f..27ddded359 100644 --- a/checkers/flymake-rest-pylint.el +++ b/checkers/flymake-rest-pylint.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-enumerate)) + (require 'flymake-rest-parse-enumerate)) ;;;###autoload (autoload 'flymake-rest-pylint "flymake-rest-pylint") (flymake-rest-define flymake-rest-pylint diff --git a/checkers/flymake-rest-rubocop.el b/checkers/flymake-rest-rubocop.el index 75b958aed6..91722e8502 100644 --- a/checkers/flymake-rest-rubocop.el +++ b/checkers/flymake-rest-rubocop.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-rx)) + (require 'flymake-rest-parse-rx)) (defcustom flymake-rest-rubocop-use-bundler t :type 'boolean) diff --git a/checkers/flymake-rest-shellcheck.el b/checkers/flymake-rest-shellcheck.el index 16f7d172ab..c1c58c07f1 100644 --- a/checkers/flymake-rest-shellcheck.el +++ b/checkers/flymake-rest-shellcheck.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-enumerate)) + (require 'flymake-rest-parse-enumerate)) ;;;###autoload (autoload 'flymake-rest-shellcheck "flymake-rest-shellcheck") (flymake-rest-define flymake-rest-shellcheck diff --git a/checkers/flymake-rest-yamllint.el b/checkers/flymake-rest-yamllint.el index c04b5327f3..7540913867 100644 --- a/checkers/flymake-rest-yamllint.el +++ b/checkers/flymake-rest-yamllint.el @@ -6,7 +6,7 @@ (require 'flymake-rest-define) (eval-when-compile - (require 'flymake-rest-rx)) + (require 'flymake-rest-parse-rx)) ;;;###autoload (autoload 'flymake-rest-yamllint "flymake-rest-yamllint") (flymake-rest-define flymake-rest-yamllint diff --git a/flymake-rest-enumerate.el b/flymake-rest-parse-enumerate.el similarity index 96% rename from flymake-rest-enumerate.el rename to flymake-rest-parse-enumerate.el index 964fac8447..642e711c6c 100644 --- a/flymake-rest-enumerate.el +++ b/flymake-rest-parse-enumerate.el @@ -28,4 +28,4 @@ The value of the current entry from GEN in BODY will be set to the variable (setq res ,@body)) res)))) -(provide 'flymake-rest-enumerate) +(provide 'flymake-rest-parse-enumerate) diff --git a/flymake-rest-rx.el b/flymake-rest-parse-rx.el similarity index 96% rename from flymake-rest-rx.el rename to flymake-rest-parse-rx.el index 7f14291432..ea079cd95b 100644 --- a/flymake-rest-rx.el +++ b/flymake-rest-parse-rx.el @@ -6,7 +6,7 @@ ;;; Code: -(defconst flymake-rest-rx-constituents +(defconst flymake-rest-parse-rx-constituents `((file-name ,(lambda (body) (rx-to-string `(group-n 1 ,@(or (cdr body) @@ -54,7 +54,7 @@ TODO: describe arguments. (intern (concat ":" (symbol-name severity)))))) (let ((combined-regex - (let ((rx-constituents (append flymake-rest-rx-constituents + (let ((rx-constituents (append flymake-rest-parse-rx-constituents rx-constituents nil))) (rx-to-string `(or ,@(mapcar #'car regexps)) 'no-group))) @@ -112,4 +112,4 @@ TODO: describe arguments. message))))))))) res))) -(provide 'flymake-rest-rx) +(provide 'flymake-rest-parse-rx)