command_util: replace dump_xxx() by make_xxx().

[paraslash.git] / command_util.sh

diff --git a/command_util.sh b/command_util.sh
index 86e0125865fdb24ceb1b42189430e7f5d31416c5..563ab1a25ebe80e6e7bd837fa5e613d8ba3e880c 100755 (executable)
--- a/command_util.sh
+++ b/command_util.sh
@@ -10,12 +10,6 @@ read_header()
                ---)
                        break
                        ;;
-               HC:)
-                       header_comment="$value"
-                       ;;
-               CC:)
-                       c_file_comment="$value"
-                       ;;
                OF:)
                        output_file="$value"
                        array_name=${value%command_list}cmds
@@ -47,8 +41,7 @@ read_header()
                        template_members="$value"
                esac
        done
-       if test -z "$header_comment" -o -z "$c_file_comment" \
-                       -o -z "$output_file"; then
+       if test -z "$output_file"; then
                echo "header error" 1&>2
                exit 1
        fi
@@ -193,49 +186,51 @@ com_man()
        done
 }
 
-dump_proto()
+make_proto()
 {
-       local source_file match=""
-
-       echo '/**'
-       echo " * $desc_txt"
-       echo ' *'
-       echo " * Usage: $usage_txt"
-       echo ' * '
-       echo "$help_txt" | sed -e 's/^/ * /g'
-       echo ' */'
+       local source_file match="" CR='
+'
        if test -n "$prototype"; then
-               echo "$prototype"
-               echo
+               result="$prototype$CR"
                return
        fi
+       result=
        for source_file in $source_files; do
                match=$(grep "^\(__noreturn \)*int com_$name_txt(" $source_file | head -n 1 | sed -e 's/$/;/1')
                if test -n "$match"; then
-                       echo "$match"
+                       result="$result $match$CR"
                        break
                fi
        done
        echo
 }
 
-dump_array_member()
+make_array_member()
 {
        local TAB='     '
-       echo '{'
-       echo ".name = \"$name_txt\","
-       echo ".handler = com_$name_txt,"
+       local tmp
+
+       result="
+       {
+       .name = \"$name_txt\",
+       .handler = com_$name_txt,
+       "
        if test -n "$perms_txt"; then
-               echo ".perms = $perms_txt,"
+               result="$result .perms = $perms_txt,"
        fi
-       echo ".description = \"$desc_txt\","
-       echo ".usage = \"$usage_txt\","
-       echo ".help = "
-       printf "%s\n" "$help_txt" | sed -e 's/^/\"/g' -e 's/$/\\n\"/g' \
-               -e "s/$TAB/\\\t/g"
-       echo '},'
+       result="$result
+       .description = \"$desc_txt\",
+       .usage = \"$usage_txt\",
+       .help = "
+       tmp="$(printf "%s\n" "$help_txt" | sed -e 's/^/\"/g' -e 's/$/\\n\"/g' \
+               -e "s/$TAB/\\\t/g")"
+       result="$result $tmp },"
 }
 
+make_completion()
+{
+       result="  {.name = \"$name_txt\", .completer = ${name_txt}_completer}, \\"
+}
 
 template_loop()
 {
@@ -256,14 +251,15 @@ template_loop()
                usage_txt=$(echo "$t_usage" | $sed_cmd)
                help_txt=$(printf "%s\n" "$t_help" | $sed_cmd)
                prototype=$(echo "$template_prototype" | $sed_cmd)
+               result=
                $1
+               echo "$result"
        done
 
 }
 
 com_c_file()
 {
-       echo "/** \file $output_file.c $c_file_comment */"
        echo "$system_includes"
        echo "$includes"
        echo "struct $array_type $array_name[] = {"
@@ -276,18 +272,17 @@ com_c_file()
                        break
                fi
                if test $template -eq 0; then
-                       dump_array_member
+                       make_array_member
+                       echo "$result"
                        continue
                fi
-               template_loop dump_array_member
+               template_loop make_array_member
        done
        echo '{.name = NULL}};'
 }
 
 com_header()
 {
-       echo "/** \file $output_file.h $header_comment */"
-       echo
        echo "extern struct $array_type $array_name[];"
        while : ; do
                read_one_command
@@ -298,11 +293,34 @@ com_header()
                        break
                fi
                if test $template -eq 0; then
-                       dump_proto
+                       make_proto
+                       echo "$result"
+                       continue
+               fi
+               template_loop make_proto
+       done
+}
+
+com_completion()
+{
+
+       echo "#define $1 \\"
+       while : ; do
+               read_one_command
+               if test $ret -lt 0; then
+                       exit 1
+               fi
+               if test $ret -eq 0; then
+                       break
+               fi
+               if test $template -eq 0; then
+                       make_completion
+                       echo "$result"
                        continue
                fi
-               template_loop dump_proto
+               template_loop make_completion
        done
+       echo
 }
 
 read_header
@@ -318,4 +336,7 @@ case "$arg" in
        "man")
                com_man $*
                ;;
+       "compl")
+               com_completion $*
+               ;;
 esac