[sipify] Combine multiple argument annotations

nyalldawson · nyalldawson · commit ac54a3f83fa9 · 2017-05-04T08:29:54.000+10:00
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -579,6 +579,10 @@ sub remove_constructor_or_body {
         $line =~ s/\/(\w+(=\w+)?)\/\s*\/(\w+(=\w+)?)\/\s*;(\s*(\/\/.*)?)$/\/$1,$3\/$5;/;
         (! $3) or dbg_info("combine multiple annotations -- works only for 2");
     };
+    # combine multiple argument annotations
+    do {no warnings 'uninitialized';
+        $line =~ s/\/(\w+(=\w+)?)\/\s*\/(\w+(=\w+)?)\//\/$1,$3\//;
+    };
 
     # unprinted annotations
     $line =~ s/(\w+)(\<(?>[^<>]|(?2))*\>)?\s+SIP_PYTYPE\(\s*\'?([^()']+)(\(\s*(?:[^()]++|(?2))*\s*\))?\'?\s*\)/$3/g;
diff --git a/tests/scripts/sipifyheader.expected.sip b/tests/scripts/sipifyheader.expected.sip
@@ -208,6 +208,8 @@ complex default value and type (i.e. containing commas) should be given as a str
 
     void removeProxyFactory( QNetworkProxyFactory *factory /TransferBack/ );
 
+    void multiAnnotationArg( SomeClass** object /Out,TransferBack/, int& another /Out/ );
+
     bool removeFunctionBody( const QList<int, QString> &list, QgsVectorLayer *vl, Some::Thing _part = -1 /*default =-1*/ );
 %Docstring
  :rtype: bool
diff --git a/tests/scripts/sipifyheader.h b/tests/scripts/sipifyheader.h
@@ -240,6 +240,8 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
 
     void removeProxyFactory( QNetworkProxyFactory *factory SIP_TRANSFERBACK );
 
+    void multiAnnotationArg( SomeClass **object SIP_OUT SIP_TRANSFERBACK, int &another SIP_OUT );
+
     bool removeFunctionBody( const QList<int, QString> &list, QgsVectorLayer *vl, Some::Thing _part = -1 /*default =-1*/ ) { doSomething; return true; }   // some comments
 
     static inline QgsMapLayer *skippedMethodWithBody() SIP_SKIP

-Original file line number
+Diff line change
         $line =~ s/\/(\w+(=\w+)?)\/\s*\/(\w+(=\w+)?)\/\s*;(\s*(\/\/.*)?)$/\/$1,$3\/$5;/;
         (! $3) or dbg_info("combine multiple annotations -- works only for 2");
     };
 +    # combine multiple argument annotationsCollapse commentComment on line R582
nyalldawson commented on May 4, 2017 
nyalldawson
on May 4, 2017
CollaboratorAuthor
@3nids the line above only works for annotations at the end of a definition - it wasn't working for me for multiple annotations for a single argument
3nids replied on May 4, 2017 
3nids
on May 4, 2017
Member
yep, sorry, realized that afterwards. I simplified a bit the code to do a single replace.
Code has comments. Press enter to view.
 +    do {no warnings 'uninitialized';
 +        $line =~ s/\/(\w+(=\w+)?)\/\s*\/(\w+(=\w+)?)\//\/$1,$3\//;
 +    };
     # unprinted annotations
     $line =~ s/(\w+)(\<(?>[^<>]|(?2))*\>)?\s+SIP_PYTYPE\(\s*\'?([^()']+)(\(\s*(?:[^()]++|(?2))*\s*\))?\'?\s*\)/$3/g;