diff options
author | kate.ward <kate.ward@forestent.com> | 2009-05-10 16:59:13 +0000 |
---|---|---|
committer | kate.ward <kate.ward@forestent.com> | 2009-05-10 16:59:13 +0000 |
commit | fb0e718b51ccb9cfecbf71cda3b211a4dcd4c030 (patch) | |
tree | 75030df1f7ea5ce240a368e19f7186c51477eb67 /source | |
parent | 30b36b75ca686339a52cc9c441bf0c3195d6080b (diff) | |
download | shflags-fb0e718b51ccb9cfecbf71cda3b211a4dcd4c030.tar.gz |
removed _STR from the __FLAGS_INFO_* constants
Diffstat (limited to 'source')
-rw-r--r-- | source/1.0/src/shflags | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/source/1.0/src/shflags b/source/1.0/src/shflags index a60d32d..dbfc89c 100644 --- a/source/1.0/src/shflags +++ b/source/1.0/src/shflags @@ -140,10 +140,10 @@ __FLAGS_OPTSTR_LONG=1 __FLAGS_NULL='~' # flag info strings -__FLAGS_INFO_DEFAULT_STR='default' -__FLAGS_INFO_HELP_STR='help' -__FLAGS_INFO_SHORT_STR='short' -__FLAGS_INFO_TYPE_STR='type' +__FLAGS_INFO_DEFAULT='default' +__FLAGS_INFO_HELP='help' +__FLAGS_INFO_SHORT='short' +__FLAGS_INFO_TYPE='type' # flag lengths __FLAGS_LEN_SHORT=0 @@ -313,11 +313,11 @@ _flags_define() if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then # store flag information eval "FLAGS_${_flags_name_}='${_flags_default_}'" - eval "__flags_${_flags_name_}_${__FLAGS_INFO_TYPE_STR}=${_flags_type_}" - eval "__flags_${_flags_name_}_${__FLAGS_INFO_DEFAULT_STR}=\ + eval "__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}=${_flags_type_}" + eval "__flags_${_flags_name_}_${__FLAGS_INFO_DEFAULT}=\ \"${_flags_default_}\"" - eval "__flags_${_flags_name_}_${__FLAGS_INFO_HELP_STR}=\"${_flags_help_}\"" - eval "__flags_${_flags_name_}_${__FLAGS_INFO_SHORT_STR}='${_flags_short_}'" + eval "__flags_${_flags_name_}_${__FLAGS_INFO_HELP}=\"${_flags_help_}\"" + eval "__flags_${_flags_name_}_${__FLAGS_INFO_SHORT}='${_flags_short_}'" # append flag name(s) to list of names __flags_longNames="${__flags_longNames}${_flags_name_} " @@ -351,11 +351,11 @@ _flags_genOptStr() _flags_opts_='' for _flags_flag_ in ${__flags_longNames}; do - _flags_type_=`_flags_getFlagInfo ${_flags_flag_} ${__FLAGS_INFO_TYPE_STR}` + _flags_type_=`_flags_getFlagInfo ${_flags_flag_} ${__FLAGS_INFO_TYPE}` case ${_flags_optStrType_} in ${__FLAGS_OPTSTR_SHORT}) _flags_shortName_=`_flags_getFlagInfo \ - ${_flags_flag_} ${__FLAGS_INFO_SHORT_STR}` + ${_flags_flag_} ${__FLAGS_INFO_SHORT}` if [ "${_flags_shortName_}" != "${__FLAGS_NULL}" ]; then _flags_opts_="${_flags_opts_}${_flags_shortName_}" # getopt needs a trailing ':' to indicate a required argument @@ -406,7 +406,7 @@ _flags_getFlagInfo() # Because it doesn't (it will evaluate to an empty string) the logic will # try to find the _type variable of the _type variable, and so on. Not so # good ;-) - _flags_typeVar_="__flags_${_flags_name_}_${__FLAGS_INFO_TYPE_STR}" + _flags_typeVar_="__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}" _flags_strToEval_="_flags_type_=\"\${${_flags_typeVar_}:-}\"" eval "${_flags_strToEval_}" if [ "${_flags_type_}" = "${__FLAGS_TYPE_STRING}" ]; then @@ -700,7 +700,7 @@ _flags_parseGetopt() # set new flag value [ ${_flags_type_} -eq ${__FLAGS_TYPE_NONE} ] && \ _flags_type_=`_flags_getFlagInfo \ - "${_flags_name_}" ${__FLAGS_INFO_TYPE_STR}` + "${_flags_name_}" ${__FLAGS_INFO_TYPE}` case ${_flags_type_} in ${__FLAGS_TYPE_BOOLEAN}) if [ ${_flags_len_} -eq ${__FLAGS_LEN_LONG} ]; then @@ -711,7 +711,7 @@ _flags_parseGetopt() fi else _flags_strToEval_="_flags_val_=\ -\${__flags_${_flags_name_}_${__FLAGS_INFO_DEFAULT_STR}}" +\${__flags_${_flags_name_}_${__FLAGS_INFO_DEFAULT}}" eval "${_flags_strToEval_}" if [ ${_flags_val_} -eq ${FLAGS_FALSE} ]; then eval "FLAGS_${_flags_name_}=${FLAGS_TRUE}" @@ -913,13 +913,13 @@ flags_help() flags_boolStr_='' flags_default_=`_flags_getFlagInfo \ - "${flags_name_}" ${__FLAGS_INFO_DEFAULT_STR}` + "${flags_name_}" ${__FLAGS_INFO_DEFAULT}` flags_help_=`_flags_getFlagInfo \ - "${flags_name_}" ${__FLAGS_INFO_HELP_STR}` + "${flags_name_}" ${__FLAGS_INFO_HELP}` flags_short_=`_flags_getFlagInfo \ - "${flags_name_}" ${__FLAGS_INFO_SHORT_STR}` + "${flags_name_}" ${__FLAGS_INFO_SHORT}` flags_type_=`_flags_getFlagInfo \ - "${flags_name_}" ${__FLAGS_INFO_TYPE_STR}` + "${flags_name_}" ${__FLAGS_INFO_TYPE}` [ "${flags_short_}" != "${__FLAGS_NULL}" ] \ && flags_flagStr_="-${flags_short_}" @@ -989,9 +989,9 @@ flags_reset() for flags_name_ in ${__flags_longNames}; do flags_strToEval_="unset FLAGS_${flags_name_}" for flags_type_ in \ - ${__FLAGS_INFO_HELP_STR} \ - ${__FLAGS_INFO_SHORT_STR} \ - ${__FLAGS_INFO_TYPE_STR} + ${__FLAGS_INFO_HELP} \ + ${__FLAGS_INFO_SHORT} \ + ${__FLAGS_INFO_TYPE} do flags_strToEval_=\ "${flags_strToEval_} __flags_${flags_name_}_${flags_type_}" |