tweaks: fold some regexes into one another, for conciseness

The anchored "^texture" appears to have been a mistake.

Inspired-by: Tom Levy <tomlevy93@gmail.com>
master
Benno Schulenberg 2018-01-01 15:33:18 +01:00
parent a794c3318b
commit 5965e80a38
2 changed files with 3 additions and 9 deletions

View File

@ -24,13 +24,9 @@ color brightcyan "\<(package|import)\>"
color brightcyan "//[[:space:]]*\+build[[:space:]]+(([a-zA-Z_0-9]+[[:space:]]*)+,[[:space:]]*)*[a-zA-Z_0-9]+" color brightcyan "//[[:space:]]*\+build[[:space:]]+(([a-zA-Z_0-9]+[[:space:]]*)+,[[:space:]]*)*[a-zA-Z_0-9]+"
# Literals. # Literals.
color red "\<[0-9]+\.[0-9]*([Ee][+-]?[0-9]+)?i?\>" color red "\<[0-9]+(\.[0-9]*)?([Ee][+-]?[0-9]+)?i?\>"
color red "\<[0-9]+[Ee][+-]?[0-9]+i?\>"
color red "\B\.[0-9]+([Ee][+-]?[0-9]+)?i?\>" color red "\B\.[0-9]+([Ee][+-]?[0-9]+)?i?\>"
color red "\<[0-9]+i\>" color red "\<(0[0-7]*|[1-9][0-9]*|0[xX][0-9a-fA-F]+)\>"
color red "\<[1-9][0-9]*\>"
color red "\<0[0-7]*\>"
icolor red "\<0x[0-9a-f]+\>"
# Strings and characters; slightly fuzzy. # Strings and characters; slightly fuzzy.
color red "\<(true|false|nil|iota|_)\>" color red "\<(true|false|nil|iota|_)\>"

View File

@ -7,9 +7,7 @@ color brightcyan "^[[:space:]]*#[[:space:]]*(declare)"
color brightyellow "\<(sphere|cylinder|translate|matrix|rotate|scale)\>" color brightyellow "\<(sphere|cylinder|translate|matrix|rotate|scale)\>"
color brightyellow "\<(orthographic|location|up|right|direction|clipped_by)\>" color brightyellow "\<(orthographic|location|up|right|direction|clipped_by)\>"
color brightyellow "\<(fog_type|fog_offset|fog_alt|rgb|distance|transform)\>" color brightyellow "\<(fog_type|fog_offset|fog_alt|rgb|distance|transform)\>"
color brightred "^texture\>" color brightred "\<(background|camera|fog|light_source|object|texture)\>"
color brightred "\<(light_source|background)\>"
color brightred "\<(fog|object|camera)\>"
color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)" color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
color brightmagenta "\<(union|group|subgroup)\>" color brightmagenta "\<(union|group|subgroup)\>"