2017-07-17 Pedro Alves <palves@redhat.com>
+ * c-exp.y (operator_stoken): Use CP_OPERATOR_LEN and
+ CP_OPERATOR_STR.
+ * c-typeprint.c (is_type_conversion_operator): Use
+ CP_OPERATOR_STR.
+ * cp-support.c (LENGTH_OF_OPERATOR): Delete.
+ (cp_find_first_component_aux): Use CP_OPERATOR_STR and
+ CP_OPERATOR_LEN.
+ * cp-support.h (CP_OPERATOR_STR, CP_OPERATOR_LEN): New.
+ * gnu-v2-abi.c (gnuv2_is_operator_name): Use CP_OPERATOR_STR.
+ * gnu-v3-abi.c (gnuv3_is_operator_name): Use CP_OPERATOR_STR.
+ * linespec.c (linespec_lexer_lex_string): Use CP_OPERATOR_LEN and
+ CP_OPERATOR_STR.
+ * location.c: Include "cp-support.h".
+ (explicit_location_lex_one): Use CP_OPERATOR_LEN and
+ CP_OPERATOR_STR.
+ * symtab.c (operator_chars): Use CP_OPERATOR_STR and
+ CP_OPERATOR_LEN.
+
+2017-07-17 Pedro Alves <palves@redhat.com>
+
* cli/cli-cmds.c (complete_command): Use a completion tracker
along with completion_find_completion_word for handle_brkchars
phase.
static struct stoken
operator_stoken (const char *op)
{
- static const char *operator_string = "operator";
struct stoken st = { NULL, 0 };
char *buf;
- st.length = strlen (operator_string) + strlen (op);
+ st.length = CP_OPERATOR_LEN + strlen (op);
buf = (char *) malloc (st.length + 1);
- strcpy (buf, operator_string);
+ strcpy (buf, CP_OPERATOR_STR);
strcat (buf, op);
st.ptr = buf;
some other way, feel free to rewrite this function. */
const char *name = TYPE_FN_FIELDLIST_NAME (type, i);
- if (!startswith (name, "operator"))
+ if (!startswith (name, CP_OPERATOR_STR))
return 0;
name += 8;
the recursion easier, it also stops if it reaches an unexpected ')'
or '>' if the value of PERMISSIVE is nonzero. */
-/* Let's optimize away calls to strlen("operator"). */
-
-#define LENGTH_OF_OPERATOR 8
-
static unsigned int
cp_find_first_component_aux (const char *name, int permissive)
{
case 'o':
/* Operator names can screw up the recursion. */
if (operator_possible
- && strncmp (name + index, "operator",
- LENGTH_OF_OPERATOR) == 0)
+ && startswith (name + index, CP_OPERATOR_STR))
{
- index += LENGTH_OF_OPERATOR;
+ index += CP_OPERATOR_LEN;
while (ISSPACE(name[index]))
++index;
switch (name[index])
#define CP_ANONYMOUS_NAMESPACE_LEN 21
+/* A string representing the start of an operator name. */
+
+#define CP_OPERATOR_STR "operator"
+
+/* The length of CP_OPERATOR_STR. */
+
+#define CP_OPERATOR_LEN 8
+
/* The result of parsing a name. */
struct demangle_parse_info
static int
gnuv2_is_operator_name (const char *name)
{
- return startswith (name, "operator");
+ return startswith (name, CP_OPERATOR_STR);
}
\f
static int
gnuv3_is_operator_name (const char *name)
{
- return startswith (name, "operator");
+ return startswith (name, CP_OPERATOR_STR);
}
{
if ((PARSER_STATE (parser)->language->la_language
== language_cplus)
- && (PARSER_STREAM (parser) - start) > 8
- /* strlen ("operator") */)
+ && (PARSER_STREAM (parser) - start) > CP_OPERATOR_LEN)
{
- const char *p = strstr (start, "operator");
+ const char *p = strstr (start, CP_OPERATOR_STR);
if (p != NULL && is_operator_name (p))
{
#include "linespec.h"
#include "cli/cli-utils.h"
#include "probe.h"
+#include "cp-support.h"
#include <ctype.h>
#include <string.h>
{
/* Special case: C++ operator,. */
if (language->la_language == language_cplus
- && strncmp (*inp, "operator", 8) == 0)
- (*inp) += 8;
+ && startswith (*inp, CP_OPERATOR_STR))
+ (*inp) += CP_OPERATOR_LEN;
++(*inp);
}
}
operator_chars (const char *p, const char **end)
{
*end = "";
- if (!startswith (p, "operator"))
+ if (!startswith (p, CP_OPERATOR_STR))
return *end;
- p += 8;
+ p += CP_OPERATOR_LEN;
/* Don't get faked out by `operator' being part of a longer
identifier. */