[sipify] fix oneliner constructor and destructor

qgis · Apr 30, 2017 · c2b1272 · c2b1272
1 parent 39d8724
commit c2b1272
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -495,7 +495,8 @@ sub dbg_info
         $line =~ s/\s*=\s*default\b//g;
 
         # remove constructor definition, function bodies, member initializing list
-        if ( $SIP_RUN != 1 && $line =~  m/^(\s*)?(explicit )?(virtual )?(static |const )*(([\w:]+(<.*?>)?\s+(\*|&)?)?(\w+|operator.{1,2})\([\w=()\/ ,&*<>:-]*\)( (?:const|SIP_[A-Z_]*?))*)\s*(\{.*\})?(?!;)(\s*\/\/.*)?$/ ){
+        # https://regex101.com/r/ZaP3tC/1
+        if ( $SIP_RUN != 1 && $line =~  m/^(\s*)?(explicit )?(virtual )?(static |const )*(([\w:]+(<.*?>)?\s+(\*|&)?)?(~?\w+|operator.{1,2})\(([\w=()\/ ,&*<>-]|::)*\)( (?:const|SIP_[A-Z_]*?))*)\s*((\s*[:,]\s+\w+\(.*\))*\s*\{.*\};?|(?!;))(\s*\/\/.*)?$/ ){
             dbg_info("remove constructor definition, function bodies, member initializing list");
             my $newline = "$1$2$3$4$5;";
             if ($line !~ m/\{.*?\}\s*(\/\/.*)?$/){

diff --git a/tests/scripts/sipifyheader.expected.sip b/tests/scripts/sipifyheader.expected.sip
@@ -101,9 +101,12 @@ A constructor with no empty `()`
 A constructor with some special character types
 %End
 
-    Parameter( const QString &name,
-               bool optional = false,
-               const QVariant &defaultValue = QVariant() );
+    Constructor();
+    virtual ~Destructor();
+
+    Constructor( const QString &name,
+                 bool optional = false,
+                 const QVariant &defaultValue = QVariant() );
 
     QgsSipifyHeader();
 %Docstring

diff --git a/tests/scripts/sipifyheader.h b/tests/scripts/sipifyheader.h
@@ -145,9 +145,12 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
       : mMember( nullptr )
     {}
 
-    Parameter( const QString &name,
-               bool optional = false,
-               const QVariant &defaultValue = QVariant() )
+    Constructor() : mHasNamedNodes( false ) {}
+    virtual ~Destructor() { qDeleteAll( mList ); }
+
+    Constructor( const QString &name,
+                 bool optional = false,
+                 const QVariant &defaultValue = QVariant() )
       : mName( name )
       , mOptional( optional )
       , mDefaultValue( defaultValue )