From 275b6177051f120e66213aa5d5e80bc95b94babb Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Thu, 15 May 2014 12:52:30 +0000 Subject: [PATCH] Improving the magic regex for C files, plus some tweaks. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4889 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 3 +++ doc/syntax/c.nanorc | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e067088..e5cc0227 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2014-05-15 Benno Schulenberg + * doc/syntax/c.nanorc: Improve the magic regex, plus tweaks. + 2014-05-14 Benno Schulenberg * src/winio.c (edit_draw): Poke a non-breaking space into the last column of every line, to startle the terminal into handling wide, diff --git a/doc/syntax/c.nanorc b/doc/syntax/c.nanorc index 39946f9e..3fc3fbb3 100644 --- a/doc/syntax/c.nanorc +++ b/doc/syntax/c.nanorc @@ -1,7 +1,8 @@ ## Here is an example for C/C++. -## + syntax "c" "\.(c(c|pp|xx|\+\+)?|C)$" "\.(h(h|pp|xx)?|H)$" "\.ii?$" -magic "ASCII C(\+\+)? program text" +magic "(ASCII|UTF-8 Unicode) C(\+\+)? program text" + color brightred "\<[A-Z_][0-9A-Z_]+\>" color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|auto|static|const|struct|union|typedef|extern|(un)?signed|inline)\>" color green "\<((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\>" @@ -12,23 +13,21 @@ color magenta "\<(goto|continue|break|return)\>" color brightcyan "^[[:space:]]*#[[:space:]]*(define|include(_next)?|(un|ifn?)def|endif|el(if|se)|if|warning|error|pragma)" color brightmagenta "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'" -## GCC builtins +# GCC builtins. color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__" -## String highlighting. You will in general want your comments and -## strings to come last, because syntax highlighting rules will be -## applied in the order they are read in. +# Strings. In general you will want your strings and comments to come last, +# because highlighting rules are applied in the order they are read in. color brightyellow "<[^= ]*>" ""(\\.|[^"])*"" - -## This string is VERY resource intensive! +# Multiline strings. This regex is VERY resource intensive! color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*"" -## Comments +# Comments. color brightblue "//.*" color brightblue start="/\*" end="\*/" -## Reminders +# Reminders. color ,yellow "(FIXME|TODO|XXX)" -## Trailing whitespace +# Trailing whitespace. color ,green "[[:space:]]+$" -- 2.39.5