[Libreoffice-commits] core.git: solenv/bin

[Michael Stahl]

 solenv/bin/create-tags |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit f0ef7d06a0953afaa9627f0a1ff08c9f2b412b74
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Aug 16 18:19:16 2017 +0200

    tdf#70280 crete-tags: tweak the UNOIDL regexes
    
    To more precisely get definitions of top-level entities;
    particularly nice for interfaces where we don't want to find the
    ubiqitous forward declarations.
    
    Change-Id: I8e0e67506d5c67bfff351c4129c3e7eeda6e67a5

diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags
index 0556742f4c13..216d6b623d03 100755
--- a/solenv/bin/create-tags
+++ b/solenv/bin/create-tags
@@ -19,13 +19,14 @@ $ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $saloptions $omnicppoption
       --languages=-HTML,Java,JavaScript \
       --langdef=UNOIDL \
       --langmap=UNOIDL:.idl \
-      --regex-UNOIDL="/^[ \t]*published[ \t]*interface[ \t]*([a-zA-Z0-9]*)/\1/i,interface/" \
+      --regex-UNOIDL="/^[ \t]*(published)?[ \t]*interface[ \t]*([a-zA-Z0-9_]+[ \t]*::[ \t]*)*([a-zA-Z0-9_]+)[ \t]*(:[^:]|\{|$)/\3/i,interface/" \
       --regex-UNOIDL="/^[ \t]*([a-zA-Z0-9:]+)[ \t]+([a-zA-Z0-9]+)\(.*\)/\2/f,function/" \
-      --regex-UNOIDL="/^[ \t]*\[.*property.*\][ \t]+([a-zA-Z0-9]+)[ \t]+([a-zA-Z0-9]+);/\2/p,property/" \
-      --regex-UNOIDL="/^[ \t]*.*[ \t]+service[ \t]+([a-zA-Z0-9]+)$/\1/g,service/" \
-      --regex-UNOIDL="/^[ \t]*.*[ \t]+struct[ \t]+([a-zA-Z0-9]+)$/\1/s,struct/" \
-      --regex-UNOIDL="/^[ \t]*.*[ \t]+enum[ \t]+([a-zA-Z0-9]+)$/\1/e,enum/" \
-      --regex-UNOIDL="/^[ \t]*([a-zA-Z0-9]+)[ \t]+([a-zA-Z0-9]+);/\2/m,member/" \
+      --regex-UNOIDL="/^[ \t]*\[.*property.*\][ \t]+([a-zA-Z0-9_]+)[ \t]+([a-zA-Z0-9]+);/\2/p,property/" \
+      --regex-UNOIDL="/^[ \t]*(published)?[ \t]*service[ \t]+([a-zA-Z0-9_]+)[ \t]*(:[^:]|\{|$)/\2/g,service/" \
+      --regex-UNOIDL="/^[ \t]*(published)?[ \t]*singleton[ \t]+([a-zA-Z0-9_]+)[ \t]*(:[^:]|\{|$)/\2/g,singleton/" \
+      --regex-UNOIDL="/^[ \t]*(published)?[ \t]*struct[ \t]+([a-zA-Z0-9_]+)[ \t]*(:[^:]|\{|\<|$)/\2/s,struct/" \
+      --regex-UNOIDL="/^[ \t]*(published)?[ \t]*enum[ \t]+([a-zA-Z0-9_]+)[ \t]*(\{|$)/\2/e,enum/" \
+      --regex-UNOIDL="/^[ \t]*([a-zA-Z0-9_]+)[ \t]+([a-zA-Z0-9_]+);/\2/m,member/" \
       -R --exclude=instdir --exclude=instdir_for_build --exclude=workdir --exclude=workdir_for_build \
       --exclude=external --totals=yes ${SRCDIR:-*}