[sipify] handle SIP_SKIP on several lines

qgis · Apr 20, 2017 · f022858 · f022858
1 parent 1ab5a62
commit f022858
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -189,6 +189,15 @@ sub processDoxygenLine
     # SIP_SKIP
     if ( $line =~ m/SIP_SKIP/ ){
       $comment = '';
+      # if multiline definition, remove previous lines
+      if ( $MULTILINE_DEFINITION == 1){
+        my $opening_line = '';
+        while ( $opening_line !~ m/^[^()]*\(([^()]*\([^()]*\)[^()]*)*[^()]*$/){
+            $opening_line = pop(@output);
+            $#output >= 0 or die 'could not reach opening definition';
+        }
+        $MULTILINE_DEFINITION = 0;
+      }
       next;
     }
 

diff --git a/tests/scripts/sipifyheader.expected.sip b/tests/scripts/sipifyheader.expected.sip
@@ -120,6 +120,7 @@ A multiline method signature
 
     void nonAnnotatedMethodFollowingSkip();
 
+
     virtual QgsMapLayerRenderer *createMapRenderer( QgsRenderContext &rendererContext ) /Factory/;
 %Docstring
 Factory annotation

diff --git a/tests/scripts/sipifyheader.h b/tests/scripts/sipifyheader.h
@@ -163,6 +163,10 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
 
     void nonAnnotatedMethodFollowingSkip();
 
+    bool myMultiLineSkipped( const QList<int, QString> &list1,
+                             const QList<int, QString> &list2,
+                             const QList<int, QString> &list3 ) SIP_SKIP;
+
     //! Factory annotation
     virtual QgsMapLayerRenderer *createMapRenderer( QgsRenderContext &rendererContext ) override SIP_FACTORY;