Fix sipify

qgis · May 20, 2021 · fc796b4 · fc796b4
1 parent ae87751
commit fc796b4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -1072,7 +1072,7 @@ sub detect_non_method_member{
                 next if ($LINE =~ m/^\s*\w+\s*\|/); # multi line declaration as sum of enums
 
                 do {no warnings 'uninitialized';
-                    my $enum_decl = $LINE =~ s/^(\s*(?<em>\w+))(\s+SIP_\w+(?:\(\s*(?<compat>[^() ]+)\s*\)\s*)?)?(?:\s*=\s*(?:[\w\s\d|+-]|::|<<)+)?(,?)(:?\s*\/\/!<\s*(?<co>.*)|.*)$/$1$5/r;
+                    my $enum_decl = $LINE =~ s/^(\s*(?<em>\w+))(\s+SIP_PYNAME(?:\(\s*(?<pyname>[^() ]+)\s*\)\s*)?)?(\s+SIP_MONKEY\w+(?:\(\s*(?<compat>[^() ]+)\s*\)\s*)?)?(?:\s*=\s*(?:[\w\s\d|+-]|::|<<)+)?(,?)(:?\s*\/\/!<\s*(?<co>.*)|.*)$/$1$3$7/r;
                     my $enum_member = $+{em};
                     my $comment = $+{co};
                     my $compat_name = $+{compat} ? $+{compat} : $enum_member;

diff --git a/tests/code_layout/sipifyheader.expected.sip b/tests/code_layout/sipifyheader.expected.sip
@@ -91,7 +91,8 @@ typedef QtClass<QVariant> QtClassQVariantBase;
       ImaginarySuccess,
       RecursiveSuccess,
       SuccessCombination,
-      PythonName,
+      PythonName /PyName=DifferentName/,
+      MonkeyName,
     };
     typedef QFlags<QgsSipifyHeader::MyEnum> Flags;
 

diff --git a/tests/code_layout/sipifyheader.h b/tests/code_layout/sipifyheader.h
@@ -115,6 +115,7 @@ class CORE_EXPORT QgsSipifyHeader : public QtClass<QVariant>, private Ui::QgsBas
       RecursiveSuccess = 1 << 4, //!< Edit operation resulted in an n-dimensional wormhole
       SuccessCombination = Success | ImaginarySuccess, //!< Holy Graal
       PythonName SIP_PYNAME( DifferentName ), //!< Different python name
+      MonkeyName SIP_MONKEYPATCH_COMPAT_NAME( MonkeyPatchName ), //!< Monkey patched compatibility name
     };
     Q_DECLARE_FLAGS( Flags, MyEnum )