From 227467adb9c01da3bd78780b247b3b4cba17ba02 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Tue, 21 Apr 2020 12:47:08 +0200 Subject: [PATCH] syntaxes: remove some superfluous outer parentheses from regexes Also, standardize some comments, condense a few regexes, add some word-edge anchors, and remove some superfluous backslashes. --- syntax/autoconf.nanorc | 2 +- syntax/awk.nanorc | 2 +- syntax/changelog.nanorc | 2 +- syntax/extra/debian.nanorc | 2 +- syntax/extra/gentoo.nanorc | 4 ++-- syntax/extra/haskell.nanorc | 6 +++--- syntax/extra/povray.nanorc | 2 +- syntax/groff.nanorc | 10 +++++----- syntax/json.nanorc | 2 +- syntax/po.nanorc | 6 +++--- syntax/python.nanorc | 2 +- syntax/ruby.nanorc | 2 +- syntax/rust.nanorc | 2 +- syntax/tcl.nanorc | 4 ++-- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/syntax/autoconf.nanorc b/syntax/autoconf.nanorc index 6c80d0c9..bdd392d9 100644 --- a/syntax/autoconf.nanorc +++ b/syntax/autoconf.nanorc @@ -5,7 +5,7 @@ comment "#" # Keywords: color yellow "\<(if|test|then|elif|else|fi|for|in|do|done)\>" -color yellow "(=|!=|&&|\|\|)" +color yellow "=|!=|&&|\|\|" # Macros: color cyan "\<[[:upper:]_[:digit:]]+\>" diff --git a/syntax/awk.nanorc b/syntax/awk.nanorc index b9771bfd..9d5a5cb9 100644 --- a/syntax/awk.nanorc +++ b/syntax/awk.nanorc @@ -14,7 +14,7 @@ color red "\<(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\>" # Function declarations and special patterns. color brightgreen "\<(function|extension|BEGIN|END)\>" # Operators. -color green "(\{|\}|\(|\)|\;|\]|\[|\\|<|>|!|=|&|\+|-|\*|%|/|\?:|\^|\|)" +color green "\{|\}|\(|\)|\;|\[|\]|\\|<|>|!|=|&|\+|-|\*|%|/|\?:|\^|\|" # Flow control. color brightyellow "\<(for|if|while|do|else|in|delete|exit)\>" color brightyellow "\<(break|continue|return)\>" diff --git a/syntax/changelog.nanorc b/syntax/changelog.nanorc index 268479e0..003b37f6 100644 --- a/syntax/changelog.nanorc +++ b/syntax/changelog.nanorc @@ -12,7 +12,7 @@ color yellow "<[^>]*@[^>]*>" # Command-line options. color cyan "[[:space:]]-[a-zA-Z\$]" "--[8a-z-]+" # Bug and patch numbers. -color cyan "(BZ|bug|patch) #[0-9]+" "PR [[:alnum:]]+/[0-9]+" +color cyan "(BZ|bug|patch)[ ]#[0-9]+" "PR [[:alnum:]]+/[0-9]+" # Probable constants, for variety. color brightred "\<[A-Z_][0-9A-Z_]+\>" # Key sequences. diff --git a/syntax/extra/debian.nanorc b/syntax/extra/debian.nanorc index 3ec1393a..db770b12 100644 --- a/syntax/extra/debian.nanorc +++ b/syntax/extra/debian.nanorc @@ -1,4 +1,4 @@ -## Here is an example for apt's sources.list. +## Syntax highlighting for apt's sources.list. syntax sources.list "sources\.list(\.d/.*\.list)?(~|\.old|\.save)?$" comment "#" diff --git a/syntax/extra/gentoo.nanorc b/syntax/extra/gentoo.nanorc index dd4d8ae7..9b4c5097 100644 --- a/syntax/extra/gentoo.nanorc +++ b/syntax/extra/gentoo.nanorc @@ -1,5 +1,5 @@ -## Here is an example for Gentoo ebuilds/eclasses, -## and (further down) one for Portage control files. +## Syntax highlighting for Gentoo ebuilds/eclasses, +## and (further down) for Portage control files. syntax ebuild "\.e(build|class|blit)$" comment "#" diff --git a/syntax/extra/haskell.nanorc b/syntax/extra/haskell.nanorc index 037e7fa4..7acf35c4 100644 --- a/syntax/extra/haskell.nanorc +++ b/syntax/extra/haskell.nanorc @@ -10,13 +10,13 @@ comment "--" color red "\<(as|case|of|class|data|default|deriving|do|forall|foreign|hiding|if|then|else|import|infix(l|r)?|instance|let|in|mdo|module|newtype|qualified|type|where)\>" # Various symbols -color cyan "(\||@|!|:|_|~|=|\\|;|\(\)|,|\[|\]|\{|\})" +color cyan "\||@|!|:|_|~|=|\\|;|\(\)|,|\[|\]|\{|\}" # Operators -color magenta "(==|/=|&&|\|\||<|>|<=|>=)" +color magenta "==|/=|&&|\|\||<|>|<=|>=" # More symbols -color cyan "(->|<-|=>)" +color cyan "->|<-|=>" color magenta "\.|\$" # Data constructors diff --git a/syntax/extra/povray.nanorc b/syntax/extra/povray.nanorc index dbf99d2f..db0a1c44 100644 --- a/syntax/extra/povray.nanorc +++ b/syntax/extra/povray.nanorc @@ -8,7 +8,7 @@ color brightyellow "\<(sphere|cylinder|translate|matrix|rotate|scale)\>" color brightyellow "\<(orthographic|location|up|right|direction|clipped_by)\>" color brightyellow "\<(fog_type|fog_offset|fog_alt|rgb|distance|transform)\>" color brightred "\<(background|camera|fog|light_source|object|texture)\>" -color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)" +color green "\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|" color brightmagenta "\<(union|group|subgroup)\>" # Comments. diff --git a/syntax/groff.nanorc b/syntax/groff.nanorc index 59bd7c32..3559ac30 100644 --- a/syntax/groff.nanorc +++ b/syntax/groff.nanorc @@ -8,17 +8,17 @@ color cyan "^\.(ds|nr) [^[:space:]]*" # Single-character escapes color brightmagenta "\\." # The argument of \f or \s in the same color -color brightmagenta "\\f." "\\f\(.." "\\s(\+|\-)?[0-9]" +color brightmagenta "\\f(.|\(..)" "\\s(\+|\-)?[0-9]" # Newlines -color cyan "(\\|\\\\)n(.|\(..)" -color cyan start="(\\|\\\\)n\[" end="]" +color cyan "\\(\\)?n(.|\(..)" +color cyan start="\\(\\)?n\[" end="]" # Requests color brightgreen "^\.[[:space:]]*[^[:space:]]*" # Comments color yellow "^\.\\".*" # Strings -color green "(\\|\\\\)\*(.|\(..)" -color green start="(\\|\\\\)\*\[" end="]" +color green "\\(\\)?\*(.|\(..)" +color green start="\\(\\)?\*\[" end="]" # Characters color brightred "\\\(.." color brightred start="\\\[" end="]" diff --git a/syntax/json.nanorc b/syntax/json.nanorc index d25a788e..14dc57cf 100644 --- a/syntax/json.nanorc +++ b/syntax/json.nanorc @@ -16,7 +16,7 @@ color green ":[[:space:]]*\"#[0-9abcdefABCDEF]+\"" # Escapes. color green "\\\\" "\\\"" "\\[bfnrt]" "\\u[0-9abcdefABCDEF]{4})" # Special words. -color green "(true|false|null)" +color green "\<(true|false|null)\>" # Names (very unlikely to contain a quote). color brightblue "\"[^"]+\"[[:space:]]*:" diff --git a/syntax/po.nanorc b/syntax/po.nanorc index 19000959..b286d6bd 100644 --- a/syntax/po.nanorc +++ b/syntax/po.nanorc @@ -8,8 +8,8 @@ color green "^#.*$" color yellow "Copyright|\(C\)" # Header fields. color brightred "^\"X-Bugs:.*\"$" -color brightmagenta "\<(Project\-Id\-Version|Report\-Msgid\-Bugs\-To|Last\-Translator|Language(\-Team)?|X-Bugs|X-Generator|Plural\-Forms)\>" -color cyan "\<(POT\-Creation\-Date|PO\-Revision\-Date|MIME\-Version|Content\-Type|Content\-Transfer\-Encoding)\>" +color brightmagenta "\<(Project-Id-Version|Report-Msgid-Bugs-To|Last-Translator|Language(-Team)?|X-Bugs|X-Generator|Plural-Forms)\>" +color cyan "\<(POT-Creation-Date|PO-Revision-Date|MIME-Version|Content-Type|Content-Transfer-Encoding)\>" # Encodings and numbers. color yellow "\<(UTF|ISO|Windows|Mac|IBM)-[0-9]+" color yellow "\<((pre|rc)?[0-9]+|[0-9]bit)\>" @@ -24,6 +24,6 @@ color brightmagenta "%([1-9]\$)?[a-z]*" color yellow "\"" color cyan "\\([abcefnrtv"\]|x[0-9abcdefABCDEF]{2}|[0-7]{3})" # Reminders. -color brightwhite,yellow "(FIXME|TODO|XXX)" +color brightwhite,yellow "\<(FIXME|TODO|XXX)\>" # Obsolete strings. color red "#~.*" diff --git a/syntax/python.nanorc b/syntax/python.nanorc index 10147456..8fbac146 100644 --- a/syntax/python.nanorc +++ b/syntax/python.nanorc @@ -34,7 +34,7 @@ color brightgreen start="'''([^'),]|$)" end="(^|[^(\])'''" color brightgreen start=""""([^"),]|$)" end="(^|[^(\])"""" # Reminders. -color brightwhite,yellow "(FIXME|TODO|XXX)" +color brightwhite,yellow "\<(FIXME|TODO|XXX)\>" # Trailing whitespace. color ,green "[[:space:]]+$" diff --git a/syntax/ruby.nanorc b/syntax/ruby.nanorc index 2b742c6c..9398b1dd 100644 --- a/syntax/ruby.nanorc +++ b/syntax/ruby.nanorc @@ -34,4 +34,4 @@ color brightcyan "##[^{].*" "##$" # "Here" docs. color green start="<<-?'?EOT'?" end="^EOT" # Some common markers. -color brightcyan "(XXX|TODO|FIXME|\?\?\?)" +color brightcyan "XXX|TODO|FIXME|\?\?\?" diff --git a/syntax/rust.nanorc b/syntax/rust.nanorc index a1fef8f0..5a79624b 100644 --- a/syntax/rust.nanorc +++ b/syntax/rust.nanorc @@ -35,4 +35,4 @@ color blue start="/\*" end="\*/" color magenta start="#!\[" end="\]" # Some common markers -color brightcyan "(XXX|TODO|FIXME|\?\?\?)" +color brightcyan "XXX|TODO|FIXME|\?\?\?" diff --git a/syntax/tcl.nanorc b/syntax/tcl.nanorc index 958b5975..b9a8c611 100644 --- a/syntax/tcl.nanorc +++ b/syntax/tcl.nanorc @@ -12,8 +12,8 @@ color green "\" # Syntax: -color brightblue "proc[[:space:]]" "(\{|\})" -color green "(\(|\)|\;|`|\\|\$|<|>|!|=|&|\|)" +color brightblue "\|!|=|&|\|" color brightyellow ""(\\.|[^"])*"" "'(\\.|[^'])*'" color brightred "\$\{?[0-9A-Za-z_!@#$*?-]+\}?" # Trailing whitespace: