[sifpiy] handle multiline body

qgis · Apr 24, 2017 · 085803d · 085803d
1 parent 46310d4
commit 085803d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -434,12 +434,19 @@ sub processDoxygenLine
             if ($line !~ m/\{.*?\}$/){
                 $line = $lines[$line_idx];
                 $line_idx++;
+                my $nesting_index = 1;
                 if ( $line =~ m/^\s*\{\s*$/ ){
                     while ($line_idx < $line_count){
                         $line = $lines[$line_idx];
                         $line_idx++;
-                        if ( $line =~ m/\}\s*$/ ){
-                            last;
+                        if ( $line =~ m/^\s*{/ ){
+                            $nesting_index++;
+                        }
+                        elsif ( $line =~ m/\}\s*$/ ){
+                            $nesting_index--;
+                            if ($nesting_index == 0){
+                                last;
+                            }
                         }
                     }
                 }

diff --git a/tests/scripts/sipifyheader.expected.sip b/tests/scripts/sipifyheader.expected.sip
@@ -206,6 +206,12 @@ Removing function body with virtual const reference
  :rtype: QgsLayerMetadata
 %End
 
+    bool myMultiLineBody();
+%Docstring
+Mulitline body
+ :rtype: bool
+%End
+
 
     virtual int overriddenProperty();
     virtual int overrideWithoutVirtual();

diff --git a/tests/scripts/sipifyheader.h b/tests/scripts/sipifyheader.h
@@ -230,6 +230,19 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
     //! Removing function body with virtual const reference
     virtual const QgsLayerMetadata &metadata() const { return mMetadata; }
 
+    //! Mulitline body
+    bool myMultiLineBody()
+    {
+      if (isTrue())
+      {
+        return false;
+      }
+      else
+      {
+        return true;
+      }
+    }
+
     bool deletedFunction() = delete; // some comments
 
     virtual int overriddenProperty() override { return 42; } // if in doubt, comment it out