/* CLI utilities.
- Copyright (c) 2011 Free Software Foundation, Inc.
+ Copyright (C) 2011-2014 Free Software Foundation, Inc.
This file is part of GDB.
#include "defs.h"
#include "cli/cli-utils.h"
-#include "gdb_string.h"
#include "value.h"
-#include "gdb_assert.h"
#include <ctype.h>
commonly this is `-'. If you don't want a trailer, use \0. */
static int
-get_number_trailer (char **pp, int trailer)
+get_number_trailer (const char **pp, int trailer)
{
int retval = 0; /* default */
- char *p = *pp;
+ const char *p = *pp;
if (*p == '$')
{
retval = value_as_long (val);
else
{
- printf_filtered (_("History value must have integer type."));
+ printf_filtered (_("History value must have integer type.\n"));
retval = 0;
}
}
/* Internal variable. Make a copy of the name, so we can
null-terminate it to pass to lookup_internalvar(). */
char *varname;
- char *start = ++p;
+ const char *start = ++p;
LONGEST val;
while (isalnum (*p) || *p == '_')
++p;
retval = 0;
}
- p = skip_spaces (p);
+ p = skip_spaces_const (p);
*pp = p;
return retval;
}
/* See documentation in cli-utils.h. */
int
-get_number (char **pp)
+get_number_const (const char **pp)
{
return get_number_trailer (pp, '\0');
}
/* See documentation in cli-utils.h. */
int
-get_number_or_range (char **pp)
+get_number (char **pp)
+{
+ int result;
+ const char *p = *pp;
+
+ result = get_number_trailer (&p, '\0');
+ *pp = (char *) p;
+ return result;
+}
+
+/* See documentation in cli-utils.h. */
+
+void
+init_number_or_range (struct get_number_or_range_state *state,
+ const char *string)
{
- static int last_retval, end_value;
- static char *end_ptr;
- static int in_range = 0;
+ memset (state, 0, sizeof (*state));
+ state->string = string;
+}
+
+/* See documentation in cli-utils.h. */
- if (**pp != '-')
+int
+get_number_or_range (struct get_number_or_range_state *state)
+{
+ if (*state->string != '-')
{
- /* Default case: pp is pointing either to a solo number,
- or to the first number of a range. */
- last_retval = get_number_trailer (pp, '-');
- if (**pp == '-')
+ /* Default case: state->string is pointing either to a solo
+ number, or to the first number of a range. */
+ state->last_retval = get_number_trailer (&state->string, '-');
+ if (*state->string == '-')
{
- char **temp;
+ const char **temp;
/* This is the start of a range (<number1> - <number2>).
Skip the '-', parse and remember the second number,
and also remember the end of the final token. */
- temp = &end_ptr;
- end_ptr = *pp + 1;
- while (isspace ((int) *end_ptr))
- end_ptr++; /* skip white space */
- end_value = get_number (temp);
- if (end_value < last_retval)
+ temp = &state->end_ptr;
+ state->end_ptr = skip_spaces_const (state->string + 1);
+ state->end_value = get_number_const (temp);
+ if (state->end_value < state->last_retval)
{
error (_("inverted range"));
}
- else if (end_value == last_retval)
+ else if (state->end_value == state->last_retval)
{
/* Degenerate range (number1 == number2). Advance the
token pointer so that the range will be treated as a
single number. */
- *pp = end_ptr;
+ state->string = state->end_ptr;
}
else
- in_range = 1;
+ state->in_range = 1;
}
}
- else if (! in_range)
+ else if (! state->in_range)
error (_("negative value"));
else
{
- /* pp points to the '-' that betokens a range. All
+ /* state->string points to the '-' that betokens a range. All
number-parsing has already been done. Return the next
integer value (one greater than the saved previous value).
- Do not advance the token pointer 'pp' until the end of range
+ Do not advance the token pointer until the end of range
is reached. */
- if (++last_retval == end_value)
+ if (++state->last_retval == state->end_value)
{
/* End of range reached; advance token pointer. */
- *pp = end_ptr;
- in_range = 0;
+ state->string = state->end_ptr;
+ state->in_range = 0;
}
}
- return last_retval;
+ state->finished = *state->string == '\0';
+ return state->last_retval;
}
/* Accept a number and a string-form list of numbers such as is
no arguments. */
int
-number_is_in_list (char *list, int number)
+number_is_in_list (const char *list, int number)
{
+ struct get_number_or_range_state state;
+
if (list == NULL || *list == '\0')
return 1;
- while (*list != '\0')
+ init_number_or_range (&state, list);
+ while (!state.finished)
{
- int gotnum = get_number_or_range (&list);
+ int gotnum = get_number_or_range (&state);
if (gotnum == 0)
error (_("Args must be numbers or '$' variables."));
return chp;
}
+/* A const-correct version of the above. */
+
+const char *
+skip_spaces_const (const char *chp)
+{
+ if (chp == NULL)
+ return NULL;
+ while (*chp && isspace (*chp))
+ chp++;
+ return chp;
+}
+
/* See documentation in cli-utils.h. */
-char *
-skip_to_space (char *chp)
+const char *
+skip_to_space_const (const char *chp)
{
if (chp == NULL)
return NULL;
chp++;
return chp;
}
+
+/* See documentation in cli-utils.h. */
+
+char *
+remove_trailing_whitespace (const char *start, char *s)
+{
+ while (s > start && isspace (*(s - 1)))
+ --s;
+
+ return s;
+}
+
+/* See documentation in cli-utils.h. */
+
+char *
+extract_arg_const (const char **arg)
+{
+ const char *result;
+
+ if (!*arg)
+ return NULL;
+
+ /* Find the start of the argument. */
+ *arg = skip_spaces_const (*arg);
+ if (!**arg)
+ return NULL;
+ result = *arg;
+
+ /* Find the end of the argument. */
+ *arg = skip_to_space_const (*arg + 1);
+
+ if (result == *arg)
+ return NULL;
+
+ return savestring (result, *arg - result);
+}
+
+/* See documentation in cli-utils.h. */
+
+char *
+extract_arg (char **arg)
+{
+ const char *arg_const = *arg;
+ char *result;
+
+ result = extract_arg_const (&arg_const);
+ *arg += arg_const - *arg;
+ return result;
+}
+
+/* See documentation in cli-utils.h. */
+
+int
+check_for_argument (char **str, char *arg, int arg_len)
+{
+ if (strncmp (*str, arg, arg_len) == 0
+ && ((*str)[arg_len] == '\0' || isspace ((*str)[arg_len])))
+ {
+ *str += arg_len;
+ return 1;
+ }
+ return 0;
+}
projects / platform / upstream / binutils.git / blobdiff