Enum and tags

Author: AnFunctionArray

faster.regex

@@ -9,7 +9,14 @@
 (?<qualifonly>((?&identifierpure))(?(?{checkqualifonly()})|(*F)))
 
 (?<fasterdecls>(?(?=(?{push2 \@matches, {}})(?<declbod>((?(<tagend>)(*F))(\s*+(?&typeorqualifortypdf)\s*+
-    |\s*+\b(?<tagtype>struct|union|enum)\b\s*+(?<identtag>((?&identifierpure))(?{eval {$matches[-1]{strc}=$^N}}))?+\s*+((?&brackets)(?{register_taggable()}))?+\s*+((?<tagend>;)(?{dispatch_file_scope_stm(pos(),$minlen)}))?+))*+
+    |(\s*+\b(?<tagtype>struct|union)\b\s*+(?<identtag>((?&identifierpure)?+))(?{eval {$matches[-1]{strc}=$^N}})\s*+
+    ((?&brackets)(?{register_taggable()}))?+\s*+
+    |\s*+\benum\b\s*+(?<ident_enum>((?&identifierpure)?+))(?{eval {$matches[-1]{strc}=$^N}})\s*+
+    (\{\s*+(?{push2 \@matches, {}})
+        (((?&normal_rec)(?&init_q)?+,)*+
+        (?&normal_rec)(?&init_q)?+,?+)?+
+    (?{pop2 \@matches})\s*+\}\s*+)?+)((?<tagend>;)(?{dispatch_file_scope_stm(pos(),$minlen)}))?+
+    ))*+
     (?(<tagend>)|(?&identoutter)
     (\s*+(?&parens)\s*+)*+(?&init_q)?+((,(?&identoutter)(\s*+(?&parens)\s*+)*+(?<init_q>=((?&parens)|(?&brackets)|(?&strunus)|[^\[\]\(\)\{\}'";,])*+)?+)*+
     (;(?{dispatch_file_scope_stm(pos(),$minlen)}))
@@ -20,5 +27,5 @@
 (?<rndbrcksdecl>\s*\((?<inparen>(?<inparenin>\s*+(?&ptr)*+\s*+((?<identinside>(?&identifierpure))(?{register_normal_decl($+{identinside})})|(?&rndbrcksdecl))(\s*+(?&parens)\s*+)*+\s*)*+
     ((?&inparenin)(?&inparen))?+)\)\s*)
 
-(?<identoutter>\s*+(?&ptr)*+((?&rndbrcksdecl)|(?<identnormal>(?&identifierpure))(?{register_normal_decl($+{identnormal})}))\s*+)
+(?<identoutter>\s*+(?&ptr)*+((?&rndbrcksdecl)|(?<normal_rec>\s*+(?<identnormal>(?&identifierpure))(?{register_normal_decl($+{identnormal})})\s*+))\s*+)
 

faster.regex.pl

@@ -20,7 +20,7 @@ sub dispatch_file_scope_stm {
 }
 
 sub register_taggable {
-    push_decl($lastcurpos, $+{tagtype} . " " . $+{identtag})
+    push_decl($lastcurpos, $+{tagtype} . " " . $+{identtag}) if ($+{identtag})
 }
 
 sub register_normal_decl {