Match top-level C definitions as IdentifierTag

1 files changed, 15 insertions, 0 deletions

diff --git a/bin/hilex/c.l b/bin/hilex/c.l
index c5dc31ff..c8f4ba65 100644
--- a/bin/hilex/c.l
+++ b/bin/hilex/c.l
@@ -30,6 +30,7 @@ width "*"|[0-9]+
 
 %%
 	static int pop = INITIAL;
+	static int braces = 0;
 
 [[:blank:]]+ { return Normal; }
 
@@ -102,6 +103,11 @@ register|restrict|return|static|struct|switch|typedef|union|volatile|while |
 <MacroLine>{ident} { return Macro; }
 {ident} { return Identifier; }
 
+{ident}/("["[^]]*"]")*[[:space:]]*"=" |
+{ident}/"("[^)]*")"[[:space:]]*"{" {
+	return (!braces ? IdentifierTag : Identifier);
+}
+
 "//"([^\n]|"\\\n")* |
 "/*"([^*]|"*"[^/])*"*"+"/" {
 	return Comment;
@@ -147,6 +153,15 @@ register|restrict|return|static|struct|switch|typedef|union|volatile|while |
 	[^%\\""]+|. { return String; }
 }
 
+"{" {
+	braces++;
+	REJECT;
+}
+"}" {
+	braces--;
+	REJECT;
+}
+
 <MacroLine,MacroInclude,MacroDefine>. { return Macro; }
 
 .|\n { return Normal; }