[sipify] detect multiple variable declarations oneliners

3nids · 3nids · commit d93d0a80660b · 2017-05-22T10:17:51.000+02:00
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -579,10 +579,10 @@ sub detect_comment_block{
     }
 
     # skip non-method member declaration in non-public sections
-    # https://regex101.com/r/gUBZUk/8
+    # https://regex101.com/r/gUBZUk/9
     if ( $SIP_RUN != 1 &&
          $ACCESS[$#ACCESS] != PUBLIC &&
-         $line =~ m/^\s*(?:template<\w+>\s+)?(?:(const|mutable|static|friend|unsigned)\s+)*\w+(::\w+)?(<([\w<> *&,()]|::)+>)? \*?\w+( = (-?\d+(\.\d+)?|\w+(\([^()]+\))?)|\[\d+\])?;/){
+         $line =~ m/^\s*(?:template<\w+>\s+)?(?:(const|mutable|static|friend|unsigned)\s+)*\w+(::\w+)?(<([\w<> *&,()]|::)+>)?(,?\s+\*?\w+( = (-?\d+(\.\d+)?|\w+(\([^()]+\))?)|\[\d+\])?)+;/){
         dbg_info("skip non-method member declaration in non-public sections");
         next;
     }

Original file line number	Diff line number	Diff line change
`@@ -579,10 +579,10 @@ sub detect_comment_block{`
`579`	`579`	`}`
`580`	`580`
`581`	`581`	`# skip non-method member declaration in non-public sections`
`582`		`- # https://regex101.com/r/gUBZUk/8`
	`582`	`+ # https://regex101.com/r/gUBZUk/9`
`583`	`583`	`if ( $SIP_RUN != 1 &&`
`584`	`584`	`$ACCESS[$#ACCESS] != PUBLIC &&`
`585`		`- $line =~ m/^\s(?:template<\w+>\s+)?(?:(const\|mutable\|static\|friend\|unsigned)\s+)\w+(::\w+)?(<([\w<> &,()]\|::)+>)? \?\w+( = (-?\d+(\.\d+)?\|\w+(\([^()]+\))?)\|\[\d+\])?;/){`
	`585`	`+ $line =~ m/^\s(?:template<\w+>\s+)?(?:(const\|mutable\|static\|friend\|unsigned)\s+)\w+(::\w+)?(<([\w<> &,()]\|::)+>)?(,?\s+\?\w+( = (-?\d+(\.\d+)?\|\w+(\([^()]+\))?)\|\[\d+\])?)+;/){`
`586`	`586`	`dbg_info("skip non-method member declaration in non-public sections");`
`587`	`587`	`next;`
`588`	`588`	`}`