src-highlite.git - src-highlite

diff --git a/ChangeLog b/ChangeLog
index 131dbb5..c3ecf21 100644
--- a/ChangeLog
+++ b/ChangeLog

@@ -1,5 +1,11 @@

2019年06月01日 Tom Tromey <tom@tromey.com>

+ * src/c.lang: Add enum and union as defining a type.

+ * src/cpp.lang: Add enum and union as defining a type.

+ * tests/c.lang.html: Update.

+

+2019年06月01日 Tom Tromey <tom@tromey.com>

+

* src/Makefile.am (LANGFILES): Add rust.lang.

* doc/index.html: Add Rust.

* src/lang.map: Add .rs.

diff --git a/src/c.lang b/src/c.lang
index fd3baef..cbd8dfe 100644
--- a/src/c.lang
+++ b/src/c.lang

@@ -4,7 +4,7 @@ include "c_comment.lang"

label = '^[[:blank:]]*[[:alnum:]]+:[[:blank:]]*\z'

(keyword,normal,classname) =

- `(\<struct)([[:blank:]]+)([[:alnum:]_]+)`

+ `(\<(?:enum|struct|union))([[:blank:]]+)([[:alnum:]_]+)`

state preproc start '^[[:blank:]]*#(?:[[:blank:]]*include)' begin

string delim "<" ">"

diff --git a/src/cpp.lang b/src/cpp.lang
index dba2468..81fe3d1 100644
--- a/src/cpp.lang
+++ b/src/cpp.lang

@@ -2,7 +2,7 @@

# most of it is shared with c.lang

(keyword,normal,classname) =

- `(\<(?:class|struct|typename))([[:blank:]]+)([[:alnum:]_]+)`

+ `(\<(?:enum|class|struct|typename|union))([[:blank:]]+)([[:alnum:]_]+)`

keyword = "class|const_cast|delete",

"dynamic_cast|explicit|false|friend",

diff --git a/tests/c.lang.html b/tests/c.lang.html
index c21b772..bdc0c5e 100644
--- a/tests/c.lang.html
+++ b/tests/c.lang.html

@@ -8,7 +8,7 @@ http://www.gnu.org/software/src-highlite -->

<font color="#009900">label</font> <font color="#990000">=</font> <font color="#FF6600">'^[[:blank:]]*[[:alnum:]]+:[[:blank:]]*\z'</font>

<font color="#990000">(</font><font color="#009900">keyword</font><font color="#990000">,</font><font color="#009900">normal</font><font color="#990000">,</font><font color="#009900">classname</font><font color="#990000">)</font> <font color="#990000">=</font>

- <font color="#FF6600">`(\&lt;struct)([[:blank:]]+)([[:alnum:]_]+)`</font>

+ <font color="#FF6600">`(\&lt;(?:enum|struct|union))([[:blank:]]+)([[:alnum:]_]+)`</font>

<b><font color="#0000FF">state</font></b> <font color="#009900">preproc</font> <b><font color="#0000FF">start</font></b> <font color="#FF6600">'^[[:blank:]]*#(?:[[:blank:]]*include)'</font> <b><font color="#0000FF">begin</font></b>

<font color="#009900">string</font> <b><font color="#0000FF">delim</font></b> <font color="#FF0000">"&lt;"</font> <font color="#FF0000">"&gt;"</font>