grepc: Fix some corner cases

Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/bin/grepc b/bin/grepc
index 0c73696..427a416 100755
--- a/bin/grepc
+++ b/bin/grepc
@@ -49,7 +49,7 @@ function grepc_enum_constant()
 	grepc_helper '\.[ch]$' \
 	  "^enum\s" \
 	  "^\s*$1\s*[,=]" \
-	  "(?s)\benum\b\s*[\w\s[\]]*{[^}]*^\s*$1\s*[=,].*?^}.*?;";
+	  "(?s)\benum\b\s*([\w\s[\]]|::)*\s*{[^}]*^\s*$1\s*[=,].*?^}.*?;";
 }
 
 
@@ -58,7 +58,7 @@ function grepc_func_decl()
 	grepc_helper '\.[ch]$' \
 	  "\b$1\s*\(" \
 	  "." \
-	  "(?s)^[\w[][\w\s(,)[:\]*]+\s+\**$1\s*\([\w\s(,)[\]*]+?(...)?\)[\w\s(,)[:\]]*;";
+	  "(?s)^[\w[]([\w\s\(,\)[\]*]|::)+[\w\s\)*\]]\s+\**$1\s*\([\w\s\(,\)[\]*]+?(...)?\)[\w\s\(,\)[:\]]*;";
 }
 
 
@@ -67,7 +67,7 @@ function grepc_func_def()
 	grepc_helper '\.[ch]$' \
 	  "\b$1\s*\(" \
 	  "." \
-	  "(?s)^[\w[][\w\s(,)[:\]*]+\s+\**$1\s*\([\w\s(,)[\]*]+?(...)?\)\s*{.*?^}";
+	  "(?s)^[\w[]([\w\s\(,\)[\]*]|::)*[\w\s\)*\]]\s+\**$1\s*\([\w\s\(,\)[\]*]+?(...)?\)\s*{.*?^}";
 }
 
 
@@ -120,7 +120,7 @@ function grepc_type_struct_union_enum()
 	grepc_helper '\.[ch]$' \
 	  "\b(struct|union|enum)\s+$1\b" \
 	  "." \
-	  "(?s)^(?!^\s*typedef\b)([\w[][\w\s(,)[:\]*]+\s+)?\b(struct|union|enum)\s+$1\b\s*[\w\s[\]]*{.*?^}.*?;";
+	  "(?s)^(?!^\s*typedef\b)([\w[]([\w\s\(,\)[\]*]|::)*[\w\s\)*\]]\s+)?\b(struct|union|enum)\s+$1\b\s*[\w\s[\]]*{.*?^}.*?;";
 }