[sipify] fix annotations in multiline virtual methods

3nids · nyalldawson · commit 05f35f2e1978 · 2018-09-14T16:35:30.000+10:00
diff --git a/python/core/auto_generated/qgsvectorlayer.sip.in b/python/core/auto_generated/qgsvectorlayer.sip.in
@@ -831,7 +831,7 @@ Load a named style from file/local db/datasource db
 :param categories: the style categories to be loaded.
 %End
 
-     virtual QString loadNamedStyle( const QString &theURI, bool &resultFlag SIP_OUT,
+     virtual QString loadNamedStyle( const QString &theURI, bool &resultFlag /Out/,
                             QgsMapLayer::StyleCategories categories = QgsMapLayer::AllStyleCategories );
 %Docstring
 Calls loadNamedStyle( theURI, resultFlag, false );
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -1042,7 +1042,7 @@ sub detect_non_method_member{
                 if ( $virtual_line !~ m/^(\s*)virtual\b(.*)$/ ){
                     my $idx = $#OUTPUT-$LINE_IDX+$virtual_line_idx+2;
                     #print "len: $#OUTPUT line_idx: $LINE_IDX virt: $virtual_line_idx\n"idx: $idx\n$OUTPUT[$idx]\n";
-                    $OUTPUT[$idx] = $virtual_line =~ s/^(\s*?)\b(.*)$/$1 virtual $2\n/r;
+                    $OUTPUT[$idx] = fix_annotations($virtual_line =~ s/^(\s*?)\b(.*)$/$1 virtual $2\n/r);
                 }
             }
             elsif ( $LINE !~ m/^(\s*)virtual\b(.*)$/ ){
@@ -1148,7 +1148,7 @@ sub detect_non_method_member{
         }
     }
     elsif ( $LINE =~ m/^[^()]+\([^()]*([^()]*\([^()]*\)[^()]*)*[^)]*$/ ){
-      dbg_info("Mulitline detected");
+      dbg_info("Multiline detected:: $LINE");
       if ( $LINE =~ m/^\s*((else )?if|while|for) *\(/ ){
           $MULTILINE_DEFINITION = MULTILINE_CONDITIONAL_STATEMENT;
       }

Original file line number	Diff line number	Diff line change
`@@ -1042,7 +1042,7 @@ sub detect_non_method_member{`
`1042`	`1042`	`if ( $virtual_line !~ m/^(\s)virtual\b(.)$/ ){`
`1043`	`1043`	`my $idx = $#OUTPUT-$LINE_IDX+$virtual_line_idx+2;`
`1044`	`1044`	`#print "len: $#OUTPUT line_idx: $LINE_IDX virt: $virtual_line_idx\n"idx: $idx\n$OUTPUT[$idx]\n";`
`1045`		`- $OUTPUT[$idx] = $virtual_line =~ s/^(\s?)\b(.)$/$1 virtual $2\n/r;`
	`1045`	`+ $OUTPUT[$idx] = fix_annotations($virtual_line =~ s/^(\s?)\b(.)$/$1 virtual $2\n/r);`
`1046`	`1046`	`}`
`1047`	`1047`	`}`
`1048`	`1048`	`elsif ( $LINE !~ m/^(\s)virtual\b(.)$/ ){`
`@@ -1148,7 +1148,7 @@ sub detect_non_method_member{`
`1148`	`1148`	`}`
`1149`	`1149`	`}`
`1150`	`1150`	`elsif ( $LINE =~ m/^[^()]+\([^()]([^()]\([^()]\)[^()])[^)]$/ ){`
`1151`		`- dbg_info("Mulitline detected");`
	`1151`	`+ dbg_info("Multiline detected:: $LINE");`
`1152`	`1152`	`if ( $LINE =~ m/^\s((else )?if\|while\|for) \(/ ){`
`1153`	`1153`	`$MULTILINE_DEFINITION = MULTILINE_CONDITIONAL_STATEMENT;`
`1154`	`1154`	`}`