aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2013-08-27 19:45:40 +0200
committerMattias Andrée <maandree@operamail.com>2013-08-27 19:45:40 +0200
commit76281ad2d2ec1882a129137a45791a6cd3418f0e (patch)
tree71b0b77e7e4a4ab3cfd1576b7096815ddd7b7380 /src
parentissue 7, python version (diff)
downloadargparser-76281ad2d2ec1882a129137a45791a6cd3418f0e.tar.gz
argparser-76281ad2d2ec1882a129137a45791a6cd3418f0e.tar.bz2
argparser-76281ad2d2ec1882a129137a45791a6cd3418f0e.tar.xz
issue 7, bash version
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src')
-rw-r--r--src/argparser.bash78
-rwxr-xr-xsrc/test.bash2
2 files changed, 71 insertions, 9 deletions
diff --git a/src/argparser.bash b/src/argparser.bash
index 75a2f59..e7d65cd 100644
--- a/src/argparser.bash
+++ b/src/argparser.bash
@@ -48,6 +48,7 @@ args_VARIADIC=3
# @param $4:str The name of the program, empty for automatic
# @param $5:str Output channel, by fd
# @param $6:int Set to 1 to use single dash/plus for long options
+# @param $7:str Abbreviation expander function, empty for none, args_standard_abbreviations for standard
function args_init
{
test "$TERM" = linux
@@ -73,6 +74,54 @@ function args_init
args_out="/proc/$$/fd/${args_out}"
args_files=()
args_alternative="$6"
+ args_abbreviations="$7"
+ if [ "$args_abbreviations" = "" ]; then
+ args_abbreviations=args_noop
+ fi
+}
+
+
+# Standard abbreviation expander
+#
+# @param $1:str The option to expand
+# @param ...:(str) Recognised options
+# @return :str? The only alternative, otherwise nothing and exit with 1
+# @exit 0 if there is exactly one alternative, otherwise 1
+function args_standard_abbreviations
+{
+ local c=0 n=${#1} arg="$1" rc=""
+ shift 1
+ for candidate in "$@"; do
+ if [ "${candidate::$n}" = "$arg" ]; then
+ (( c++ ))
+ if [ $c = 2 ]; then
+ return 1
+ fi
+ rc="$candidate"
+ fi
+ done
+ if [ $c = 1 ]; then
+ echo "$rc"
+ else
+ return 1
+ fi
+}
+
+
+# Help invoker for abbreviation expansion
+#
+# @param $1:str The argument
+function args__abbreviations
+{
+ if [ "$args_abbreviations" = "" ]; then
+ return 1
+ fi
+ local opt opts=()
+ while read opt; do
+ opts+=( "$opt" )
+ done < <(ls -1 -- "${args_optmap}") ## Stupid forking, clone for the love of Celestia
+ "$args_abbreviations" "$1" "${opts[@]}"
+ return $?
}
@@ -671,18 +720,31 @@ function args_parse
"$trigger" "${_arg}" "${std}" "${arg#*=}"
fi
else
+ arg="${_arg}"
+ _arg="$(args__abbreviations "${arg}")"
+ if [ $? = 0 ]; then
+ arg=( "${_arg}" "$@" )
+ set -- "${arg[@]}"
+ else
+ (( args_unrecognised_count++ ))
+ if (( args_unrecognised_count <= 5 )); then
+ echo "${args_program}: warning: unrecognised option ${arg}" >> "${args_out}"
+ fi
+ rc=1
+ fi
+ fi
+ else
+ _arg="$(args__abbreviations "${arg}")"
+ if [ $? = 0 ]; then
+ arg=( "${_arg}" "$@" )
+ set -- "${arg[@]}"
+ else
(( args_unrecognised_count++ ))
if (( args_unrecognised_count <= 5 )); then
- echo "${args_program}: warning: unrecognised option ${_arg}" >> "${args_out}"
+ echo "${args_program}: warning: unrecognised option ${arg}" >> "${args_out}"
fi
rc=1
fi
- else
- (( args_unrecognised_count++ ))
- if (( args_unrecognised_count <= 5 )); then
- echo "${args_program}: warning: unrecognised option ${arg}" >> "${args_out}"
- fi
- rc=1
fi
else
sign="${_arg::1}"
@@ -733,7 +795,7 @@ function args_parse
args_files+=( "$arg" )
fi
done
- set "${queue[@]}" > /dev/null
+ set -- "${queue[@]}" > /dev/null
queue=()
done
diff --git a/src/test.bash b/src/test.bash
index 3f45bae..fc44eec 100755
--- a/src/test.bash
+++ b/src/test.bash
@@ -43,7 +43,7 @@ along with this library. If not, see <http://www.gnu.org/licenses/>.
)
-args_init 'A test for argparser' 'test [options] [files]' "$long" '' 1
+args_init 'A test for argparser' 'test [options] [files]' "$long" '' 1 0 args_standard_abbreviations
args_add_argumentless '' 0 'Prints this help message\n(and exits)' -h -? --help
args_add_argumentless '' 0 'Prints the text: hello world' --hello