diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2019-01-07 09:27:52 -0500 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2019-01-07 09:27:52 -0500 |
| commit | d233b485e83c3a784b803fb894280773f16f2deb (patch) | |
| tree | 16d51f3ccca2d4ad2d8f2da564d68ca848de595b /arrayfunc.h | |
| parent | 64447609994bfddeef1061948022c074093e9a9f (diff) | |
| download | bash-d233b485e83c3a784b803fb894280773f16f2deb.tar.gz | |
bash-5.0 distribution sources and documentationbash-5.0
Diffstat (limited to 'arrayfunc.h')
| -rw-r--r-- | arrayfunc.h | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/arrayfunc.h b/arrayfunc.h index 5ee27591..cd51ee07 100644 --- a/arrayfunc.h +++ b/arrayfunc.h @@ -25,12 +25,24 @@ #if defined (ARRAY_VARS) +/* This variable means to not expand associative array subscripts more than + once, when performing variable expansion. */ +extern int assoc_expand_once; + +/* The analog for indexed array subscripts */ +extern int array_expand_once; + /* Flags for array_value_internal and callers array_value/get_array_value */ #define AV_ALLOWALL 0x001 #define AV_QUOTED 0x002 #define AV_USEIND 0x004 #define AV_USEVAL 0x008 /* XXX - should move this */ #define AV_ASSIGNRHS 0x010 /* no splitting, special case ${a[@]} */ +#define AV_NOEXPAND 0x020 /* don't run assoc subscripts through word expansion */ + +/* Flags for valid_array_reference. Value 1 is reserved for skipsubscript() */ +#define VA_NOEXPAND 0x001 +#define VA_ONEWORD 0x002 extern SHELL_VAR *convert_var_to_array __P((SHELL_VAR *)); extern SHELL_VAR *convert_var_to_assoc __P((SHELL_VAR *)); @@ -52,21 +64,21 @@ extern WORD_LIST *expand_compound_array_assignment __P((SHELL_VAR *, char *, int extern void assign_compound_array_list __P((SHELL_VAR *, WORD_LIST *, int)); extern SHELL_VAR *assign_array_var_from_string __P((SHELL_VAR *, char *, int)); -extern int unbind_array_element __P((SHELL_VAR *, char *)); +extern int unbind_array_element __P((SHELL_VAR *, char *, int)); extern int skipsubscript __P((const char *, int, int)); extern void print_array_assignment __P((SHELL_VAR *, int)); extern void print_assoc_assignment __P((SHELL_VAR *, int)); -extern arrayind_t array_expand_index __P((SHELL_VAR *, char *, int)); +extern arrayind_t array_expand_index __P((SHELL_VAR *, char *, int, int)); extern int valid_array_reference __P((const char *, int)); extern char *array_value __P((const char *, int, int, int *, arrayind_t *)); extern char *get_array_value __P((const char *, int, int *, arrayind_t *)); extern char *array_keys __P((char *, int)); -extern char *array_variable_name __P((const char *, char **, int *)); -extern SHELL_VAR *array_variable_part __P((const char *, char **, int *)); +extern char *array_variable_name __P((const char *, int, char **, int *)); +extern SHELL_VAR *array_variable_part __P((const char *, int, char **, int *)); #else @@ -75,6 +87,8 @@ extern SHELL_VAR *array_variable_part __P((const char *, char **, int *)); #define AV_USEIND 0 #define AV_ASSIGNRHS 0 +#define VA_ONEWORD 0 + #endif #endif /* !_ARRAYFUNC_H_ */ |