Support comma in annotations when merging inline

qgis · Jan 31, 2018 · cbd0ece · cbd0ece
1 parent 28ff28a
commit cbd0ece
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -343,9 +343,9 @@ sub fix_annotations {
     $line =~ s/SIP_VIRTUALERRORHANDLER\(\s*(\w+)\s*\)/\/VirtualErrorHandler=$1\//;
 
     # combine multiple annotations
-    # https://regex101.com/r/uvCt4M/3
+    # https://regex101.com/r/uvCt4M/4
     do {no warnings 'uninitialized';
-        $line =~ s/\/(\w+(=\w+)?)\/\s*\/(\w+(=\w+)?)\//\/$1,$3\//;
+        $line =~ s/\/([\w,]+(=\w+)?)\/\s*\/([\w,]+(=\w+)?)\//\/$1,$3\//;
         (! $3) or dbg_info("combine multiple annotations -- works only for 2");
     };