projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename common to gdbsupport
[deliverable/binutils-gdb.git]
/
gdb
/
linespec.c
diff --git
a/gdb/linespec.c
b/gdb/linespec.c
index f418e03b774531a8af0b0c16090f378b4fad3e81..ac7d34dfe96f898e74a534fad79324a3a6004932 100644
(file)
--- a/
gdb/linespec.c
+++ b/
gdb/linespec.c
@@
-44,8
+44,8
@@
#include "ada-lang.h"
#include "stack.h"
#include "location.h"
#include "ada-lang.h"
#include "stack.h"
#include "location.h"
-#include "
common
/function-view.h"
-#include "
common
/def-vector.h"
+#include "
gdbsupport
/function-view.h"
+#include "
gdbsupport
/def-vector.h"
#include <algorithm>
/* An enumeration of the various things a user might attempt to
#include <algorithm>
/* An enumeration of the various things a user might attempt to
@@
-555,7
+555,7
@@
copy_token_string (linespec_token token)
const char *str, *s;
if (token.type == LSTOKEN_KEYWORD)
const char *str, *s;
if (token.type == LSTOKEN_KEYWORD)
- return
gdb::unique_xmalloc_ptr<char> (xstrdup (LS_TOKEN_KEYWORD (token)
));
+ return
make_unique_xstrdup (LS_TOKEN_KEYWORD (token
));
str = LS_TOKEN_STOKEN (token).ptr;
s = remove_trailing_whitespace (str, str + LS_TOKEN_STOKEN (token).length);
str = LS_TOKEN_STOKEN (token).ptr;
s = remove_trailing_whitespace (str, str + LS_TOKEN_STOKEN (token).length);
@@
-760,7
+760,9
@@
linespec_lexer_lex_string (linespec_parser *parser)
/* Do not tokenize ABI tags such as "[abi:cxx11]". */
else if (PARSER_STREAM (parser) - start > 4
&& startswith (PARSER_STREAM (parser) - 4, "[abi"))
/* Do not tokenize ABI tags such as "[abi:cxx11]". */
else if (PARSER_STREAM (parser) - start > 4
&& startswith (PARSER_STREAM (parser) - 4, "[abi"))
- ++(PARSER_STREAM (parser));
+ {
+ /* Nothing. */
+ }
/* Do not tokenify if the input length so far is one
(i.e, a single-letter drive name) and the next character
/* Do not tokenify if the input length so far is one
(i.e, a single-letter drive name) and the next character
@@
-861,6
+863,7
@@
linespec_lexer_lex_string (linespec_parser *parser)
}
/* Advance the stream. */
}
/* Advance the stream. */
+ gdb_assert (*(PARSER_STREAM (parser)) != '\0');
++(PARSER_STREAM (parser));
}
}
++(PARSER_STREAM (parser));
}
}
@@
-3318,8
+3321,7
@@
decode_line_with_last_displayed (const char *string, int flags)
? decode_line_1 (location.get (), flags, NULL,
get_last_displayed_symtab (),
get_last_displayed_line ())
? decode_line_1 (location.get (), flags, NULL,
get_last_displayed_symtab (),
get_last_displayed_line ())
- : decode_line_1 (location.get (), flags, NULL,
- (struct symtab *) NULL, 0));
+ : decode_line_1 (location.get (), flags, NULL, NULL, 0));
if (*string)
error (_("Junk at end of line specification: %s"), string);
if (*string)
error (_("Junk at end of line specification: %s"), string);
@@
-4099,7
+4101,7
@@
decode_digits_list_mode (struct linespec_state *self,
val.symtab = elt;
val.pspace = SYMTAB_PSPACE (elt);
val.pc = 0;
val.symtab = elt;
val.pspace = SYMTAB_PSPACE (elt);
val.pc = 0;
- val.explicit_line =
1
;
+ val.explicit_line =
true
;
add_sal_to_sals (self, &values, &val, NULL, 0);
}
add_sal_to_sals (self, &values, &val, NULL, 0);
}
@@
-4133,6
+4135,7
@@
decode_digits_ordinary (struct linespec_state *self,
sal.pspace = SYMTAB_PSPACE (elt);
sal.symtab = elt;
sal.line = line;
sal.pspace = SYMTAB_PSPACE (elt);
sal.symtab = elt;
sal.line = line;
+ sal.explicit_line = true;
sal.pc = pc;
sals.push_back (std::move (sal));
}
sal.pc = pc;
sals.push_back (std::move (sal));
}
This page took
0.027562 seconds
and
4
git commands to generate.