mandb: carry optarg for "-a, --accept=LIST"

akinomyoga · Dec 11, 2021 · 23d5657 · 23d5657
1 parent 6f74021
commit 23d5657
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 38 deletions.
diff --git a/docs/ChangeLog.md b/docs/ChangeLog.md
@@ -137,6 +137,7 @@
   - mandb: support the formats of the man pages of `awk` and `sed` (reported by bbyfacekiller) `#D1687` 6932018
   - mandb: generate completions of options also for the empty word `#D1689` b90ac78
   - mandb: support the man-page formats of `wget`, `fish`, and `ping` (reported by bbyfacekiller) `#D1687` 0000000
+  - mandb: carry optarg for e.g. `-a, --accept=LIST` `#D1687` 0000000
 - edit: work around the wrong job information of Bash in trap handlers (reported by 3ximus) `#D1435` `#D1436` bc4735e
 - edit (command-help): work around the Bash bug that tempenv vanishes with `builtin eval` `#D1438` 8379d4a
 - global: suppress missing locale errors (reported by 3ximus) `#D1440` 4d3c595

diff --git a/lib/core-complete.sh b/lib/core-complete.sh
@@ -3642,54 +3642,81 @@ function ble/complete/mandb/.generate-cache-from-man {
     #--------------------------------------------------------------------------
 
     END { flush_topic(); }
-  ' | ble/complete/mandb/convert-mandoc 2>/dev/null | ble/bin/awk '
-    function process_pair(name, desc, _, sep, n, i, insert_suffix, menu_suffix, m) {
-#%    # FS (\034) は特殊文字として使用するので除外する。
-      sep = "\034";
-      if (g_name ~ /\034/) return;
-      gsub(/\034/, "\x1b[7m^\\\x1b[27m", desc);
-
-      n = split(name, names, /,[[:space:]]*/);
-      sub(/(\.  |; ).*/, ".", desc);
-      for (i = 1; i <= n; i++) {
-        name = names[i];
-        if (g_hash[name]++ > 0) continue; # uniq
-
-        insert_suffix = " ";
-        menu_suffix = "";
-        if (match(name, /[[ =]/)) {
-          m = substr(name, RSTART, 1);
-          if (m == "=") {
-            insert_suffix = "=";
-          } else if (m == "[") {
-            insert_suffix = "";
-          }
-          menu_suffix = substr(name, RSTART);
-          name = substr(name, 1, RSTART - 1);
-        }
-        printf("%s" sep "%s" sep "%s" sep "%s\n", name, menu_suffix, insert_suffix, desc);
+  ' | ble/complete/mandb/convert-mandoc 2>/dev/null | ble/bin/awk -F "$_ble_term_FS" '
+    function flush_pair(_, i) {
+      if (g_option_count) {
+        gsub(/\034/, "\x1b[7m^\\\x1b[27m", g_desc);
+        sub(/(\.  |; ).*/, ".", g_desc); # Long descriptions are truncated.
+
+        for (i = 0; i < g_option_count; i++)
+          print g_options[i] FS g_desc;
       }
-    }
-
-    function flush_pair() {
-      if (g_name == "") return;
-      process_pair(g_name, g_desc);
-      g_name = "";
+      g_option_count = 0;
       g_desc = "";
     }
 
-    function process_key(line) {
+    function process_key(line, _, n, specs, i, spec, option, optarg, suffix) {
       gsub(/\x1b\[[ -?]*[@-~]/, "", line); # CSI seq
       gsub(/\x1b[ -\/]*[0-~]/, "", line); # ESC seq
       gsub(/.\x08/, "", line); # CHAR BS
       gsub(/\x0E/, "", line); # SO
       gsub(/\x0F/, "", line); # SI
       gsub(/[\x00-\x1F]/, "", line); # Give up all the other control chars
       gsub(/^[[:space:]]*|[[:space:]]*$/, "", line);
-      #gsub(/[[:space:]]+/, " ", line);
+      gsub(/[[:space:]]+/, " ", line);
       if (line !~ /^-./) return;
-      if (g_name != "") g_name = g_name " ";
-      g_name = g_name line;
+
+      n = split(line, specs, /,[[:space:]]+/);
+      prev_optarg = "";
+      for (i = n; i > 0; i--) {
+        spec = specs[i];
+        sub(/,[[:space:]]*$/, "", spec);
+
+        # Exclude non-options.
+        # Exclude FS (\034) because it is used for separators in the cache format.
+        if (spec !~ /^-/ || spec ~ /\034/) { specs[i] = ""; continue; }
+
+        if (match(spec, /\[[:=]?|[:=[:space:]]/)) {
+          option = substr(spec, 1, RSTART - 1);
+          optarg = substr(spec, RSTART);
+          suffix = substr(spec, RSTART + RLENGTH - 1, 1);
+          if (suffix == "[") suffix = "";
+          prev_optarg = optarg;
+        } else {
+          option = spec;
+          optarg = "";
+          suffix = " ";
+
+          # Carry previous optarg
+          if (prev_optarg ~ /[A-Z]|<.+>/) {
+            optarg = prev_optarg;
+            if (option ~ /^-.$/) {
+              sub(/^\[=/, "[", optarg);
+              sub(/^=/, "", optarg);
+              sub(/^[^[:space:][]/, " &", optarg);
+            } else {
+              if (optarg ~ /^\[[^:=]/)
+                sub(/^\[/, "[=", optarg);
+              else if (optarg ~ /^[^:=[:space:][]/)
+                optarg = " " optarg;
+            }
+
+            if (match(optarg, /^\[[:=]?|^[:=[:space:]]/)) {
+              suffix = substr(optarg, RSTART + RLENGTH - 1, 1);
+              if (suffix == "[") suffix = "";
+            }
+          }
+        }
+
+        specs[i] = option FS optarg FS suffix;
+      }
+
+      for (i = 1; i <= n; i++) {
+        if (specs[i] == "") continue;
+        option = substr(specs[i], 1, index(specs[i], FS) - 1);
+        if (!g_hash[option]++)
+          g_options[g_option_count++] = specs[i];
+      }
     }
 
     function process_desc(line) {
@@ -3963,7 +3990,7 @@ function ble/complete/mandb:_parse_help/generate-cache {
   local command=$1; [[ $1 == ble*/* ]] || command=${1##*/}
   local ret; ble/string#hash-pjw "${*:2}" 64; local hash=$ret
   local lc_messages=${LC_ALL:-${LC_MESSAGES:-${LANG:-C}}}
-  local mandb_cache_dir=$_ble_base_cache/complete.mandb/$lc_messages
+  local mandb_cache_dir=$_ble_base_cache/complete.mandb/${lc_messages//'/'/%}
   local subcache; ble/util/sprintf subcache '%s.%014x' "$mandb_cache_dir/_parse_help.d/$command" "$hash"
 
   [[ -s $subcache && $subcache -nt $_ble_base/lib/core-complete.sh ]] && return 0
@@ -4000,7 +4027,7 @@ function ble/complete/mandb/get-opts {
 function ble/complete/mandb/generate-cache {
   local command=${1##*/}
   local lc_messages=${LC_ALL:-${LC_MESSAGES:-${LANG:-C}}}
-  local mandb_cache_dir=$_ble_base_cache/complete.mandb/$lc_messages
+  local mandb_cache_dir=$_ble_base_cache/complete.mandb/${lc_messages//'/'/%}
   local fcache=$mandb_cache_dir/$command
 
   local mandb_opts; ble/complete/mandb/get-opts "$command"

diff --git a/note.txt b/note.txt
@@ -5734,6 +5734,9 @@ bash_tips
 
     2021-12-08 更に "ping" もちゃんと man から抽出できていなかった。
 
+    2021-12-09 man から抜き出す時に -c, --cookies=<cookies.txt> の引数が -c の
+    側に適用されていなかった。help の方の実装を参考にして対応した。
+
     2021-12-12 "top" の抽出に失敗していると思ったら fmt4 の desc が終
     端できていなかった。空行がある場合には強制的に中断する事にした。