[sipify] finer detection of enum lines

qgis · Sep 10, 2018 · 10fc175 · 10fc175
1 parent 64bb3ef
commit 10fc175
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -935,11 +935,11 @@ sub detect_non_method_member{
                 if (detect_comment_block()){
                     next;
                 }
-                if ($LINE =~ m/\};/){
-                    last;
-                }
+                last if ($LINE =~ m/\};/);
+                next if ($LINE =~ m/^\s*\w+\s*\|/); # multi line declaration as sum of enums
+
                 do {no warnings 'uninitialized';
-                    my $enum_decl = $LINE =~ s/(\s*\w+)(\s+SIP_\w+(?:\([^()]+\))?)?(?:\s*=\s*(?:[\w\s\d|+-]|::|<<)+.*?)?(,?).*$/$1$2$3/r;
+                    my $enum_decl = $LINE =~ s/^(\s*\w+)(\s+SIP_\w+(?:\([^()]+\))?)?(?:\s*=\s*(?:[\w\s\d|+-]|::|<<)+)?(,?).*$/$1$2$3/r;
                     $enum_decl = fix_annotations($enum_decl);
                     write_output("ENU3", "$enum_decl\n");
                 };