[gentoo-commits] proj/emacs-tools:ebuild-mode commit in: /

["Ulrich Müller" <ulm@gentoo.org>]

commit:     3e54f804c49b2ebba08f06556ccfad1a3d4bc682
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 14:13:32 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 25 14:13:32 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=3e54f804

Exclude internal eclass functions.

* keyword-generation.sh: Exclude functions that are marked as
internal in eclass documentation.

---
 ChangeLog             |  5 +++++
 keyword-generation.sh | 13 ++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 396c7e5..c70c030 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-25  Ulrich Müller  <ulm@gentoo.org>
+
+	* keyword-generation.sh: Exclude functions that are marked as
+	internal in eclass documentation.
+
 2014-01-23  Ulrich Müller  <ulm@gentoo.org>
 
 	* Version 1.25 released.

diff --git a/keyword-generation.sh b/keyword-generation.sh
index 09f028d..8a70abe 100755
--- a/keyword-generation.sh
+++ b/keyword-generation.sh
@@ -35,13 +35,20 @@ for (( i = 0; i < ${#ECLASSES[@]}; i++ )); do
     file=${ECLASSFILES[i]}
     grep -q "^# @DEAD$" "${file}" && continue
 
-    functions=$(env -i bash -c ". ${file}; declare -F" 2>/dev/null \
-        | sed 's/.*[[:space:]]//;/^_/d;s/.*/"&"/')
+    # Get list of functions defined in eclass
+    fn_all=$(env -i bash -c ". ${file}; declare -F" 2>/dev/null \
+        | sed 's/.*[[:space:]]//')
+
+    # Parse eclass documentation for internal functions
+    fn_internal=$(sed -n '/^# @FUNCTION:/{h;:x;n;/^# @INTERNAL/{g;
+        s/^# @[^:]*:[[:space:]]*//;p};/^# @/bx}' "${file}")
+
+    functions=$(echo "${fn_all}" | grep -v '^_' | grep -Fvx "${fn_internal}")
     [[ -z ${functions} ]] && continue
 
     {
         echo "(defvar ebuild-mode-keywords-${eclass%.eclass}"
-        echo "  '(("${functions}")"
+        echo "  '(("$(echo "${functions}" | sed 's/.*/"&"/')")"
         echo "    font-lock-type-face))"
         echo
     } >>"${TMPFILE}"