/* Parse expressions for GDB.
- Copyright (C) 1986-2019 Free Software Foundation, Inc.
+ Copyright (C) 1986-2021 Free Software Foundation, Inc.
Modified from expread.y by the Department of Computer Science at the
State University of New York at Buffalo, 1991.
#include "value.h"
#include "command.h"
#include "language.h"
-#include "f-lang.h"
#include "parser-defs.h"
#include "gdbcmd.h"
#include "symfile.h" /* for overlay functions */
#include "objfiles.h"
#include "user-regs.h"
#include <algorithm>
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
/* Standard set of definitions for printing, dumping, prefixifying,
* and evaluating expressions. */
print_subexp_standard,
operator_length_standard,
operator_check_standard,
- op_name_standard,
dump_subexp_body_standard,
evaluate_subexp_standard
};
-\f
-/* Global variables declared in parser-defs.h (and commented there). */
-innermost_block_tracker innermost_block;
-static struct type_stack type_stack;
-
\f
static unsigned int expressiondebug = 0;
static void
}
-/* Non-zero if an expression parser should set yydebug. */
-int parser_debug;
+/* True if an expression parser should set yydebug. */
+bool parser_debug;
static void
show_parserdebug (struct ui_file *file, int from_tty,
static expression_up parse_exp_in_context (const char **, CORE_ADDR,
const struct block *, int,
- int, int *,
- innermost_block_tracker_types,
+ bool, int *,
+ innermost_block_tracker *,
expr_completion_state *);
static void increase_expout_size (struct expr_builder *ps, size_t lenelt);
expr_builder::expr_builder (const struct language_defn *lang,
struct gdbarch *gdbarch)
: expout_size (10),
- expout (XNEWVAR (expression,
- (sizeof (expression)
- + EXP_ELEM_TO_BYTES (expout_size)))),
+ expout (new expression (lang, gdbarch, expout_size)),
expout_ptr (0)
{
- expout->language_defn = lang;
- expout->gdbarch = gdbarch;
}
expression_up
excess elements. */
expout->nelts = expout_ptr;
- expout.reset (XRESIZEVAR (expression, expout.release (),
- (sizeof (expression)
- + EXP_ELEM_TO_BYTES (expout_ptr))));
+ expout->resize (expout_ptr);
return std::move (expout);
}
+expression::expression (const struct language_defn *lang, struct gdbarch *arch,
+ size_t n)
+ : language_defn (lang),
+ gdbarch (arch),
+ elts (nullptr)
+{
+ resize (n);
+}
+
+expression::~expression ()
+{
+ xfree (elts);
+}
+
+void
+expression::resize (size_t n)
+{
+ elts = XRESIZEVAR (union exp_element, elts, EXP_ELEM_TO_BYTES (n));
+}
+
/* This page contains the functions for adding data to the struct expression
being constructed. */
if (ps->expout_ptr >= ps->expout_size)
{
ps->expout_size *= 2;
- ps->expout.reset (XRESIZEVAR (expression, ps->expout.release (),
- (sizeof (expression)
- + EXP_ELEM_TO_BYTES (ps->expout_size))));
+ ps->expout->resize (ps->expout_size);
}
ps->expout->elts[ps->expout_ptr++] = *expelt;
}
write_exp_elt (ps, &tmp);
}
-void
+static void
write_exp_elt_msym (struct expr_builder *ps, minimal_symbol *expelt)
{
union exp_element tmp;
struct block_symbol sym;
struct bound_minimal_symbol msym;
struct internalvar *isym = NULL;
+ std::string copy;
/* Handle the tokens $digits; also $ (short for $0) and $$ (short for $$1)
and $$digits (equivalent to $<-digits> if you could type that). */
/* Any names starting with $ are probably debugger internal variables. */
- isym = lookup_only_internalvar (copy_name (str) + 1);
+ copy = copy_name (str);
+ isym = lookup_only_internalvar (copy.c_str () + 1);
if (isym)
{
write_exp_elt_opcode (ps, OP_INTERNALVAR);
/* On some systems, such as HP-UX and hppa-linux, certain system routines
have names beginning with $ or $$. Check for those, first. */
- sym = lookup_symbol (copy_name (str), NULL, VAR_DOMAIN, NULL);
+ sym = lookup_symbol (copy.c_str (), NULL, VAR_DOMAIN, NULL);
if (sym.symbol)
{
write_exp_elt_opcode (ps, OP_VAR_VALUE);
write_exp_elt_opcode (ps, OP_VAR_VALUE);
return;
}
- msym = lookup_bound_minimal_symbol (copy_name (str));
+ msym = lookup_bound_minimal_symbol (copy.c_str ());
if (msym.minsym)
{
write_exp_msymbol (ps, msym);
/* Any other names are assumed to be debugger internal variables. */
write_exp_elt_opcode (ps, OP_INTERNALVAR);
- write_exp_elt_intern (ps, create_internalvar (copy_name (str) + 1));
+ write_exp_elt_intern (ps, create_internalvar (copy.c_str () + 1));
write_exp_elt_opcode (ps, OP_INTERNALVAR);
return;
handle_last:
str.ptr++;
write_exp_string (ps, str);
write_exp_elt_opcode (ps, OP_REGISTER);
- innermost_block.update (ps->expression_context_block,
- INNERMOST_BLOCK_FOR_REGISTERS);
+ ps->block_tracker->update (ps->expression_context_block,
+ INNERMOST_BLOCK_FOR_REGISTERS);
return;
}
so they can share the storage that lexptr is parsing.
When it is necessary to pass a name to a function that expects
a null-terminated string, the substring is copied out
- into a separate block of storage.
+ into a separate block of storage. */
- N.B. A single buffer is reused on each call. */
-
-char *
+std::string
copy_name (struct stoken token)
{
- /* A temporary buffer for identifiers, so we can null-terminate them.
- We allocate this with xrealloc. parse_exp_1 used to allocate with
- alloca, using the size of the whole expression as a conservative
- estimate of the space needed. However, macro expansion can
- introduce names longer than the original expression; there's no
- practical way to know beforehand how large that might be. */
- static char *namecopy;
- static size_t namecopy_size;
-
- /* Make sure there's enough space for the token. */
- if (namecopy_size < token.length + 1)
- {
- namecopy_size = token.length + 1;
- namecopy = (char *) xrealloc (namecopy, token.length + 1);
- }
-
- memcpy (namecopy, token.ptr, token.length);
- namecopy[token.length] = 0;
-
- return namecopy;
+ return std::string (token.ptr, token.length);
}
\f
prefixify_expression (struct expression *expr, int last_struct)
{
gdb_assert (expr->nelts > 0);
- int len = sizeof (struct expression) + EXP_ELEM_TO_BYTES (expr->nelts);
- struct expression *temp;
+ int len = EXP_ELEM_TO_BYTES (expr->nelts);
+ struct expression temp (expr->language_defn, expr->gdbarch, expr->nelts);
int inpos = expr->nelts, outpos = 0;
- temp = (struct expression *) alloca (len);
-
/* Copy the original expression into temp. */
- memcpy (temp, expr, len);
+ memcpy (temp.elts, expr->elts, len);
- return prefixify_subexp (temp, expr, inpos, outpos, last_struct);
+ return prefixify_subexp (&temp, expr, inpos, outpos, last_struct);
}
/* Return the number of exp_elements in the postfix subexpression
operator_length (const struct expression *expr, int endpos, int *oplenp,
int *argsp)
{
- expr->language_defn->la_exp_desc->operator_length (expr, endpos,
- oplenp, argsp);
+ expr->language_defn->expression_ops ()->operator_length (expr, endpos,
+ oplenp, argsp);
}
/* Default value for operator_length in exp_descriptor vectors. */
{
int oplen = 1;
int args = 0;
- enum range_type range_type;
+ enum range_flag range_flag;
int i;
if (endpos < 1)
break;
case OP_FUNCALL:
- case OP_F77_UNDETERMINED_ARGLIST:
oplen = 3;
args = 1 + longest_to_int (expr->elts[endpos - 2].longconst);
break;
case UNOP_CHR:
case UNOP_FLOAT:
case UNOP_HIGH:
- case UNOP_KIND:
case UNOP_ODD:
case UNOP_ORD:
case UNOP_TRUNC:
case OP_RANGE:
oplen = 3;
- range_type = (enum range_type)
+ range_flag = (enum range_flag)
longest_to_int (expr->elts[endpos - 2].longconst);
- switch (range_type)
- {
- case LOW_BOUND_DEFAULT:
- case LOW_BOUND_DEFAULT_EXCLUSIVE:
- case HIGH_BOUND_DEFAULT:
- args = 1;
- break;
- case BOTH_BOUND_DEFAULT:
- args = 0;
- break;
- case NONE_BOUND_DEFAULT:
- case NONE_BOUND_DEFAULT_EXCLUSIVE:
- args = 2;
- break;
- }
+ /* Assume the range has 2 arguments (low bound and high bound), then
+ reduce the argument count if any bounds are set to default. */
+ args = 2;
+ if (range_flag & RANGE_HAS_STRIDE)
+ ++args;
+ if (range_flag & RANGE_LOW_BOUND_DEFAULT)
+ --args;
+ if (range_flag & RANGE_HIGH_BOUND_DEFAULT)
+ --args;
break;
expression_up
parse_exp_1 (const char **stringptr, CORE_ADDR pc, const struct block *block,
- int comma, innermost_block_tracker_types tracker_types)
+ int comma, innermost_block_tracker *tracker)
{
- return parse_exp_in_context (stringptr, pc, block, comma, 0, NULL,
- tracker_types, nullptr);
+ return parse_exp_in_context (stringptr, pc, block, comma, false, NULL,
+ tracker, nullptr);
}
/* As for parse_exp_1, except that if VOID_CONTEXT_P, then
static expression_up
parse_exp_in_context (const char **stringptr, CORE_ADDR pc,
const struct block *block,
- int comma, int void_context_p, int *out_subexp,
- innermost_block_tracker_types tracker_types,
+ int comma, bool void_context_p, int *out_subexp,
+ innermost_block_tracker *tracker,
expr_completion_state *cstate)
{
const struct language_defn *lang = NULL;
int subexp;
- type_stack.elements.clear ();
- innermost_block.reset (tracker_types);
-
if (*stringptr == 0 || **stringptr == 0)
error_no_arg (_("expression to compute"));
const struct block *expression_context_block = block;
CORE_ADDR expression_context_pc = 0;
+ innermost_block_tracker local_tracker;
+ if (tracker == nullptr)
+ tracker = &local_tracker;
+
/* If no context specified, try using the current frame, if any. */
if (!expression_context_block)
expression_context_block = get_selected_block (&expression_context_pc);
if (language_mode == language_mode_auto && block != NULL)
{
/* Find the language associated to the given context block.
- Default to the current language if it can not be determined.
-
- Note that using the language corresponding to the current frame
- can sometimes give unexpected results. For instance, this
- routine is often called several times during the inferior
- startup phase to re-parse breakpoint expressions after
- a new shared library has been loaded. The language associated
- to the current frame at this moment is not relevant for
- the breakpoint. Using it would therefore be silly, so it seems
- better to rely on the current language rather than relying on
- the current frame language to parse the expression. That's why
- we do the following language detection only if the context block
- has been specifically provided. */
+ Default to the current language if it can not be determined.
+
+ Note that using the language corresponding to the current frame
+ can sometimes give unexpected results. For instance, this
+ routine is often called several times during the inferior
+ startup phase to re-parse breakpoint expressions after
+ a new shared library has been loaded. The language associated
+ to the current frame at this moment is not relevant for
+ the breakpoint. Using it would therefore be silly, so it seems
+ better to rely on the current language rather than relying on
+ the current frame language to parse the expression. That's why
+ we do the following language detection only if the context block
+ has been specifically provided. */
struct symbol *func = block_linkage_function (block);
if (func != NULL)
- lang = language_def (SYMBOL_LANGUAGE (func));
+ lang = language_def (func->language ());
if (lang == NULL || lang->la_language == language_unknown)
- lang = current_language;
+ lang = current_language;
}
else
lang = current_language;
parser_state ps (lang, get_current_arch (), expression_context_block,
expression_context_pc, comma, *stringptr,
- cstate != nullptr);
+ cstate != nullptr, tracker, void_context_p);
scoped_restore_current_language lang_saver;
set_language (lang->la_language);
- TRY
+ try
{
- lang->la_parser (&ps);
+ lang->parser (&ps);
}
- CATCH (except, RETURN_MASK_ALL)
+ catch (const gdb_exception &except)
{
/* If parsing for completion, allow this to succeed; but if no
expression elements have been written, then there's nothing
to do, so fail. */
if (! ps.parse_completion || ps.expout_ptr == 0)
- throw_exception (except);
+ throw;
}
- END_CATCH
/* We have to operate on an "expression *", due to la_post_parser,
which explains this funny-looking double release. */
if (out_subexp)
*out_subexp = subexp;
- lang->la_post_parser (&result, void_context_p, ps.parse_completion);
+ lang->post_parser (&result, &ps);
if (expressiondebug)
dump_prefix_expression (result.get (), gdb_stdlog);
return result;
}
-/* Parse STRING as an expression, and complain if this fails
- to use up all of the contents of STRING. */
+/* Parse STRING as an expression, and complain if this fails to use up
+ all of the contents of STRING. TRACKER, if non-null, will be
+ updated by the parser. VOID_CONTEXT_P should be true to indicate
+ that the expression may be expected to return a value with void
+ type. Parsers are free to ignore this, or to use it to help with
+ overload resolution decisions. */
expression_up
-parse_expression (const char *string)
+parse_expression (const char *string, innermost_block_tracker *tracker,
+ bool void_context_p)
{
- expression_up exp = parse_exp_1 (&string, 0, 0, 0);
+ expression_up exp = parse_exp_in_context (&string, 0, nullptr, 0,
+ void_context_p, nullptr,
+ tracker, nullptr);
if (*string)
error (_("Junk after end of expression."));
return exp;
int subexp;
expr_completion_state cstate;
- TRY
+ try
{
- exp = parse_exp_in_context (&string, 0, 0, 0, 0, &subexp,
- INNERMOST_BLOCK_FOR_SYMBOLS, &cstate);
+ exp = parse_exp_in_context (&string, 0, 0, 0, false, &subexp,
+ nullptr, &cstate);
}
- CATCH (except, RETURN_MASK_ERROR)
+ catch (const gdb_exception_error &except)
{
/* Nothing, EXP remains NULL. */
}
- END_CATCH
if (exp == NULL)
return NULL;
return value_type (val);
}
-/* A post-parser that does nothing. */
-
-void
-null_post_parser (expression_up *exp, int void_context_p, int completin)
-{
-}
-
/* Parse floating point value P of length LEN.
Return false if invalid, true if valid.
The successfully parsed number is stored in DATA in
return target_float_from_string (data, type, std::string (p, len));
}
\f
-/* Stuff for maintaining a stack of types. Currently just used by C, but
- probably useful for any language which declares its types "backwards". */
-
-/* A helper function for insert_type and insert_type_address_space.
- This does work of expanding the type stack and inserting the new
- element, ELEMENT, into the stack at location SLOT. */
-
-static void
-insert_into_type_stack (int slot, union type_stack_elt element)
-{
- gdb_assert (slot <= type_stack.elements.size ());
- type_stack.elements.insert (type_stack.elements.begin () + slot, element);
-}
-
-/* Insert a new type, TP, at the bottom of the type stack. If TP is
- tp_pointer, tp_reference or tp_rvalue_reference, it is inserted at the
- bottom. If TP is a qualifier, it is inserted at slot 1 (just above a
- previous tp_pointer) if there is anything on the stack, or simply pushed
- if the stack is empty. Other values for TP are invalid. */
-
-void
-insert_type (enum type_pieces tp)
-{
- union type_stack_elt element;
- int slot;
-
- gdb_assert (tp == tp_pointer || tp == tp_reference
- || tp == tp_rvalue_reference || tp == tp_const
- || tp == tp_volatile);
-
- /* If there is anything on the stack (we know it will be a
- tp_pointer), insert the qualifier above it. Otherwise, simply
- push this on the top of the stack. */
- if (!type_stack.elements.empty () && (tp == tp_const || tp == tp_volatile))
- slot = 1;
- else
- slot = 0;
-
- element.piece = tp;
- insert_into_type_stack (slot, element);
-}
-
-void
-push_type (enum type_pieces tp)
-{
- type_stack_elt elt;
- elt.piece = tp;
- type_stack.elements.push_back (elt);
-}
-
-void
-push_type_int (int n)
-{
- type_stack_elt elt;
- elt.int_val = n;
- type_stack.elements.push_back (elt);
-}
-
-/* Insert a tp_space_identifier and the corresponding address space
- value into the stack. STRING is the name of an address space, as
- recognized by address_space_name_to_int. If the stack is empty,
- the new elements are simply pushed. If the stack is not empty,
- this function assumes that the first item on the stack is a
- tp_pointer, and the new values are inserted above the first
- item. */
-
-void
-insert_type_address_space (struct expr_builder *pstate, char *string)
-{
- union type_stack_elt element;
- int slot;
-
- /* If there is anything on the stack (we know it will be a
- tp_pointer), insert the address space qualifier above it.
- Otherwise, simply push this on the top of the stack. */
- if (!type_stack.elements.empty ())
- slot = 1;
- else
- slot = 0;
-
- element.piece = tp_space_identifier;
- insert_into_type_stack (slot, element);
- element.int_val = address_space_name_to_int (pstate->gdbarch (),
- string);
- insert_into_type_stack (slot, element);
-}
-
-enum type_pieces
-pop_type (void)
-{
- if (!type_stack.elements.empty ())
- {
- type_stack_elt elt = type_stack.elements.back ();
- type_stack.elements.pop_back ();
- return elt.piece;
- }
- return tp_end;
-}
-
-int
-pop_type_int (void)
-{
- if (!type_stack.elements.empty ())
- {
- type_stack_elt elt = type_stack.elements.back ();
- type_stack.elements.pop_back ();
- return elt.int_val;
- }
- /* "Can't happen". */
- return 0;
-}
-
-/* Pop a type list element from the global type stack. */
-
-static std::vector<struct type *> *
-pop_typelist (void)
-{
- gdb_assert (!type_stack.elements.empty ());
- type_stack_elt elt = type_stack.elements.back ();
- type_stack.elements.pop_back ();
- return elt.typelist_val;
-}
-
-/* Pop a type_stack element from the global type stack. */
-
-static struct type_stack *
-pop_type_stack (void)
-{
- gdb_assert (!type_stack.elements.empty ());
- type_stack_elt elt = type_stack.elements.back ();
- type_stack.elements.pop_back ();
- return elt.stack_val;
-}
-
-/* Append the elements of the type stack FROM to the type stack TO.
- Always returns TO. */
-
-struct type_stack *
-append_type_stack (struct type_stack *to, struct type_stack *from)
-{
- to->elements.insert (to->elements.end (), from->elements.begin (),
- from->elements.end ());
- return to;
-}
-
-/* Push the type stack STACK as an element on the global type stack. */
-
-void
-push_type_stack (struct type_stack *stack)
-{
- type_stack_elt elt;
- elt.stack_val = stack;
- type_stack.elements.push_back (elt);
- push_type (tp_type_stack);
-}
-
-/* Copy the global type stack into a newly allocated type stack and
- return it. The global stack is cleared. The returned type stack
- must be freed with delete. */
-
-struct type_stack *
-get_type_stack (void)
-{
- struct type_stack *result = new struct type_stack (std::move (type_stack));
- type_stack.elements.clear ();
- return result;
-}
-
-/* Push a function type with arguments onto the global type stack.
- LIST holds the argument types. If the final item in LIST is NULL,
- then the function will be varargs. */
-
-void
-push_typelist (std::vector<struct type *> *list)
-{
- type_stack_elt elt;
- elt.typelist_val = list;
- type_stack.elements.push_back (elt);
- push_type (tp_function_with_arguments);
-}
-
-/* Pop the type stack and return a type_instance_flags that
- corresponds the const/volatile qualifiers on the stack. This is
- called by the C++ parser when parsing methods types, and as such no
- other kind of type in the type stack is expected. */
-
-type_instance_flags
-follow_type_instance_flags ()
-{
- type_instance_flags flags = 0;
-
- for (;;)
- switch (pop_type ())
- {
- case tp_end:
- return flags;
- case tp_const:
- flags |= TYPE_INSTANCE_FLAG_CONST;
- break;
- case tp_volatile:
- flags |= TYPE_INSTANCE_FLAG_VOLATILE;
- break;
- default:
- gdb_assert_not_reached ("unrecognized tp_ value in follow_types");
- }
-}
-
-
-/* Pop the type stack and return the type which corresponds to FOLLOW_TYPE
- as modified by all the stuff on the stack. */
-struct type *
-follow_types (struct type *follow_type)
-{
- int done = 0;
- int make_const = 0;
- int make_volatile = 0;
- int make_addr_space = 0;
- int array_size;
-
- while (!done)
- switch (pop_type ())
- {
- case tp_end:
- done = 1;
- if (make_const)
- follow_type = make_cv_type (make_const,
- TYPE_VOLATILE (follow_type),
- follow_type, 0);
- if (make_volatile)
- follow_type = make_cv_type (TYPE_CONST (follow_type),
- make_volatile,
- follow_type, 0);
- if (make_addr_space)
- follow_type = make_type_with_address_space (follow_type,
- make_addr_space);
- make_const = make_volatile = 0;
- make_addr_space = 0;
- break;
- case tp_const:
- make_const = 1;
- break;
- case tp_volatile:
- make_volatile = 1;
- break;
- case tp_space_identifier:
- make_addr_space = pop_type_int ();
- break;
- case tp_pointer:
- follow_type = lookup_pointer_type (follow_type);
- if (make_const)
- follow_type = make_cv_type (make_const,
- TYPE_VOLATILE (follow_type),
- follow_type, 0);
- if (make_volatile)
- follow_type = make_cv_type (TYPE_CONST (follow_type),
- make_volatile,
- follow_type, 0);
- if (make_addr_space)
- follow_type = make_type_with_address_space (follow_type,
- make_addr_space);
- make_const = make_volatile = 0;
- make_addr_space = 0;
- break;
- case tp_reference:
- follow_type = lookup_lvalue_reference_type (follow_type);
- goto process_reference;
- case tp_rvalue_reference:
- follow_type = lookup_rvalue_reference_type (follow_type);
- process_reference:
- if (make_const)
- follow_type = make_cv_type (make_const,
- TYPE_VOLATILE (follow_type),
- follow_type, 0);
- if (make_volatile)
- follow_type = make_cv_type (TYPE_CONST (follow_type),
- make_volatile,
- follow_type, 0);
- if (make_addr_space)
- follow_type = make_type_with_address_space (follow_type,
- make_addr_space);
- make_const = make_volatile = 0;
- make_addr_space = 0;
- break;
- case tp_array:
- array_size = pop_type_int ();
- /* FIXME-type-allocation: need a way to free this type when we are
- done with it. */
- follow_type =
- lookup_array_range_type (follow_type,
- 0, array_size >= 0 ? array_size - 1 : 0);
- if (array_size < 0)
- TYPE_HIGH_BOUND_KIND (TYPE_INDEX_TYPE (follow_type))
- = PROP_UNDEFINED;
- break;
- case tp_function:
- /* FIXME-type-allocation: need a way to free this type when we are
- done with it. */
- follow_type = lookup_function_type (follow_type);
- break;
-
- case tp_function_with_arguments:
- {
- std::vector<struct type *> *args = pop_typelist ();
-
- follow_type
- = lookup_function_type_with_arguments (follow_type,
- args->size (),
- args->data ());
- }
- break;
-
- case tp_type_stack:
- {
- struct type_stack *stack = pop_type_stack ();
- /* Sort of ugly, but not really much worse than the
- alternatives. */
- struct type_stack save = type_stack;
-
- type_stack = *stack;
- follow_type = follow_types (follow_type);
- gdb_assert (type_stack.elements.empty ());
-
- type_stack = save;
- }
- break;
- default:
- gdb_assert_not_reached ("unrecognized tp_ value in follow_types");
- }
- return follow_type;
-}
-\f
/* This function avoids direct calls to fprintf
in the parser generated debug code. */
void
for (arg = 0; arg < nargs; arg++)
{
struct type *inst_type = elts[pos + 3 + arg].type;
- struct objfile *inst_objfile = TYPE_OBJFILE (inst_type);
+ struct objfile *inst_objfile = inst_type->objfile_owner ();
if (inst_objfile && (*objfile_func) (inst_objfile, data))
return 1;
return 1;
/* Check objfile where is placed the code touching the variable. */
- objfile = lookup_objfile_from_block (block);
+ objfile = block_objfile (block);
type = SYMBOL_TYPE (symbol);
}
/* Invoke callbacks for TYPE and OBJFILE if they were set as non-NULL. */
- if (type && TYPE_OBJFILE (type)
- && (*objfile_func) (TYPE_OBJFILE (type), data))
+ if (type != nullptr && type->objfile_owner () != nullptr
+ && objfile_func (type->objfile_owner (), data))
return 1;
+
if (objfile && (*objfile_func) (objfile, data))
return 1;
gdb_assert (oplen > 0);
pos = endpos - oplen;
- if (exp->language_defn->la_exp_desc->operator_check (exp, pos,
- objfile_func, data))
+ if (exp->language_defn->expression_ops ()->operator_check (exp, pos,
+ objfile_func,
+ data))
return 1;
endpos = pos;
{
ps->expout_size = std::max (ps->expout_size * 2,
ps->expout_ptr + lenelt + 10);
- ps->expout.reset (XRESIZEVAR (expression,
- ps->expout.release (),
- (sizeof (struct expression)
- + EXP_ELEM_TO_BYTES (ps->expout_size))));
+ ps->expout->resize (ps->expout_size);
}
}
+void _initialize_parse ();
void
-_initialize_parse (void)
+_initialize_parse ()
{
add_setshow_zuinteger_cmd ("expression", class_maintenance,
&expressiondebug,
projects / deliverable / binutils-gdb.git / blobdiff