From 6c078f0bfe67dd59427986eda110444bbaf29f1f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 21 Nov 2020 08:49:10 -0700 Subject: [PATCH] Move enum noside earlier in expression.h For the expression rewrite series, I needed to move enum noside earlier in expression.h. Because this is a pure move, and because it seems harmless and uncontroversial to move an enum definition earlier in a file, I'm pushing it in early, to reduce the size of that series. Tested by rebuilding. gdb/ChangeLog 2020-12-21 Tom Tromey * expression.h (enum noside): Move earlier. --- gdb/ChangeLog | 4 ++++ gdb/expression.h | 44 ++++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a3aabb5068..142278a349 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2020-12-21 Tom Tromey + + * expression.h (enum noside): Move earlier. + 2020-12-21 Peter Waller * interps.c (interpreter_exec_cmd): Restore streams pointers. diff --git a/gdb/expression.h b/gdb/expression.h index c07111c316..f30c79309a 100644 --- a/gdb/expression.h +++ b/gdb/expression.h @@ -67,6 +67,28 @@ enum exp_opcode : uint8_t OP_UNUSED_LAST }; +/* Values of NOSIDE argument to eval_subexp. */ + +enum noside + { + EVAL_NORMAL, + EVAL_SKIP, /* Only effect is to increment pos. + Return type information where + possible. */ + EVAL_AVOID_SIDE_EFFECTS /* Don't modify any variables or + call any functions. The value + returned will have the correct + type, and will have an + approximately correct lvalue + type (inaccuracy: anything that is + listed as being in a register in + the function in which it was + declared will be lval_register). + Ideally this would not even read + target memory, but currently it + does in many situations. */ + }; + union exp_element { enum exp_opcode opcode; @@ -135,28 +157,6 @@ extern expression_up parse_exp_1 (const char **, CORE_ADDR pc, /* From eval.c */ -/* Values of NOSIDE argument to eval_subexp. */ - -enum noside - { - EVAL_NORMAL, - EVAL_SKIP, /* Only effect is to increment pos. - Return type information where - possible. */ - EVAL_AVOID_SIDE_EFFECTS /* Don't modify any variables or - call any functions. The value - returned will have the correct - type, and will have an - approximately correct lvalue - type (inaccuracy: anything that is - listed as being in a register in - the function in which it was - declared will be lval_register). - Ideally this would not even read - target memory, but currently it - does in many situations. */ - }; - extern struct value *evaluate_subexp_standard (struct type *, struct expression *, int *, enum noside); -- 2.34.1