[sipify] Catch **ALL** SIP_OUT arguments when generating docstrings a…

…nd move them to :returns: directives
qgis · Oct 9, 2020 · 0e36265 · 0e36265
1 parent 2141593
commit 0e36265
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -422,12 +422,18 @@ sub fix_annotations {
 
     # get removed params to be able to drop them out of the API doc
     if ( $line =~ m/(\w+)\s+SIP_PYARGREMOVE/ ){
-      push @SKIPPED_PARAMS_REMOVE, $1;
-      dbg_info("caught removed param: $SKIPPED_PARAMS_REMOVE[$#SKIPPED_PARAMS_REMOVE]");
+      my @removed_params = $line =~ m/(\w+)\s+SIP_PYARGREMOVE/g;
+      foreach ( @removed_params ) {
+        push @SKIPPED_PARAMS_REMOVE, $_;
+        dbg_info("caught removed param: $SKIPPED_PARAMS_REMOVE[$#SKIPPED_PARAMS_REMOVE]");
+      }
     }
     if ( $line =~ m/(\w+)\s+SIP_OUT/ ){
-      push @SKIPPED_PARAMS_OUT, $1;
-      dbg_info("caught removed param: $SKIPPED_PARAMS_OUT[$#SKIPPED_PARAMS_OUT]");
+      my @out_params = $line =~ m/(\w+)\s+SIP_OUT/g;
+      foreach ( @out_params ) {
+        push @SKIPPED_PARAMS_OUT, $_;
+        dbg_info("caught removed param: $SKIPPED_PARAMS_OUT[$#SKIPPED_PARAMS_OUT]");
+      }
     }
 
     # printed annotations