[sipify] fix body detection*

qgis · Jun 7, 2017 · 154c8f5d70baeb0a93d3a1c167a6018e2a673858 · 154c8f5
1 parent 7435d34
commit 154c8f5d70baeb0a93d3a1c167a6018e2a673858
Unified Split

Showing with 2 additions and 2 deletions.

+2 −2 scripts/sipify.pl
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -130,9 +130,9 @@ sub processDoxygenLine {
 }
 
 sub detect_and_remove_following_body_or_initializerlist {
-    # https://regex101.com/r/ZaP3tC/7
+    # https://regex101.com/r/ZaP3tC/8
     do {no warnings 'uninitialized';
-        if ( $LINE =~  m/^(\s*)?((?:(?:explicit|static|const|unsigned|virtual)\s+)*)(([\w:]+(<.*?>)?\s+[*&]?)?(~?\w+|(\w+::)?operator.{1,2})\s*\(([\w=()\/ ,&*<>."-]|::)*\)( +(?:const|SIP_[A-Z_]*?))*)\s*((\s*[:,]\s+\w+\(.*\))*\s*\{.*\};?|(?!;))(\s*\/\/.*)?$/
+        if ( $LINE =~  m/^(\s*)?((?:(?:explicit|static|const|unsigned|virtual)\s+)*)(([\w:]+(<.*?>)?\s+[*&]?)?(~?\w+|(\w+::)?operator.{1,2})\s*\(([\w=()\/ ,&*<>."-]|::)*\)( +(?:const|SIP_[\w_]+?))*)\s*((\s*[:,]\s+\w+\(.*\))*\s*\{.*\}\s*(?:SIP_[\w_]+)?;?|(?!;))(\s*\/\/.*)?$/
              || $LINE =~ m/SIP_SKIP\s*(?!;)\s*(\/\/.*)?$/
              || $LINE =~ m/^\s*class.*SIP_SKIP/ ){
             dbg_info("remove constructor definition, function bodies, member initializing list");