branch: externals/bnf-mode
commit 387b4c33f34c444549246c21c4da39844f39cb73
Author: Serghei Iakovlev <serg...@phalconphp.com>
Commit: Serghei Iakovlev <serg...@phalconphp.com>
Minor code cleanup, improved tests report
---
.travis.yml | 2 +-
Makefile | 2 +-
bnf-mode.el | 17 +++++++----------
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index eb8b1f0..623e8a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,7 +73,7 @@ script:
- make init
# The 'checkdoc-file' present on Emacs >= 25.1
- '[[ "$EMACS_MAJOR_VERSION" = "24" ]] || make checkdoc'
- - TESTFLAGS="--reporter ert+duration" make test
+ - make test
notifications:
email: false
diff --git a/Makefile b/Makefile
index 5bba2c5..6ff1a65 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ CASK = cask
PANDOC ?= pandoc
EMACSFLAGS ?=
-TESTFLAGS ?=
+TESTFLAGS ?= --reporter ert+duration
PANDOCLAGS ?= --fail-if-warnings \
--reference-links \
--atx-headers
diff --git a/bnf-mode.el b/bnf-mode.el
index d70f503..89e4b17 100644
--- a/bnf-mode.el
+++ b/bnf-mode.el
@@ -89,16 +89,14 @@
(eval-when-compile
(defconst bnf-rx-constituents
- `(
- (bnf-rule-name . ,(rx
- (and
- (1+ (or alnum digit))
- (0+ (or alnum digit
- (in "!\"\#$%&'()*+,\-./:;=?@\[\\\]^_`{|}~")
- (in " \t"))))))
+ `((bnf-rule-name . ,(rx (and
+ (1+ (or alnum digit))
+ (0+ (or alnum digit
+ (in
"!\"\#$%&'()*+,\-./:;=?@\[\\\]^_`{|}~")
+ (in " \t"))))))
"Additional special sexps for `bnf-rx'."))
- (defmacro bnf-rx (&rest sexps)
+ (cl-defmacro bnf-rx (&rest sexps)
"BNF-specific replacement for `rx'.
In addition to the standard forms of `rx', the following forms
@@ -209,8 +207,7 @@ See `rx' documentation for more information about REGEXPS
param."
;; all refer to the same rule. As far as is known, this doesn't
;; conflict with original BNF version
;; (see URL `https://tools.ietf.org/html/rfc5234')
- t
- )))
+ t)))
;; Invoke bnf-mode when appropriate
