2014-06-20 02:29:26 +08:00
|
|
|
|
/* YACC parser for D expressions, for GDB.
|
|
|
|
|
|
2020-01-01 14:20:01 +08:00
|
|
|
|
Copyright (C) 2014-2020 Free Software Foundation, Inc.
|
2014-06-20 02:29:26 +08:00
|
|
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
|
|
|
|
/* This file is derived from c-exp.y, jv-exp.y. */
|
|
|
|
|
|
|
|
|
|
/* Parse a D expression from text in a string,
|
|
|
|
|
and return the result as a struct expression pointer.
|
|
|
|
|
That structure contains arithmetic operations in reverse polish,
|
|
|
|
|
with constants represented by operations that are followed by special data.
|
|
|
|
|
See expression.h for the details of the format.
|
|
|
|
|
What is important here is that it can be built up sequentially
|
|
|
|
|
during the process of parsing; the lower levels of the tree always
|
|
|
|
|
come first in the result.
|
|
|
|
|
|
|
|
|
|
Note that malloc's and realloc's in this file are transformed to
|
|
|
|
|
xmalloc and xrealloc respectively by the same sed command in the
|
|
|
|
|
makefile that remaps any other malloc/realloc inserted by the parser
|
|
|
|
|
generator. Doing this with #defines and trying to control the interaction
|
|
|
|
|
with include files (<malloc.h> and <stdlib.h> for example) just became
|
|
|
|
|
too messy, particularly when such includes can be inserted at random
|
|
|
|
|
times by the parser generator. */
|
|
|
|
|
|
|
|
|
|
%{
|
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include "expression.h"
|
|
|
|
|
#include "value.h"
|
|
|
|
|
#include "parser-defs.h"
|
|
|
|
|
#include "language.h"
|
|
|
|
|
#include "c-lang.h"
|
|
|
|
|
#include "d-lang.h"
|
|
|
|
|
#include "bfd.h" /* Required by objfiles.h. */
|
|
|
|
|
#include "symfile.h" /* Required by objfiles.h. */
|
|
|
|
|
#include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
|
|
|
|
|
#include "charset.h"
|
|
|
|
|
#include "block.h"
|
Move type stack handling to a new class
This introduces a new "type_stack" class, and moves all the parser
type stack handling to this class. Parsers that wish to use this
facility must now instantiate this class somehow. I chose this
approach because a minority of the existing parsers require this.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* type-stack.h: New file.
* type-stack.c: New file.
* parser-defs.h (enum type_pieces, union type_stack_elt): Move to
type-stack.h.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Don't declare.
* parse.c (type_stack): Remove global.
(parse_exp_in_context): Update.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Remove (moved to
type-stack.c).
* f-exp.y (type_stack): New global.
Update rules.
(push_kind_type, f_parse): Update.
* d-exp.y (type_stack): New global.
Update rules.
(d_parse): Update.
* c-exp.y (struct c_parse_state) <type_stack>: New member.
Update rules.
* Makefile.in (COMMON_SFILES): Add type-stack.c.
(HFILES_NO_SRCDIR): Add type-stack.h.
2019-04-01 03:43:54 +08:00
|
|
|
|
#include "type-stack.h"
|
2014-06-20 02:29:26 +08:00
|
|
|
|
|
Turn parse_gdbarch into a method
This changes parse_gdbarch into a method of parser_state. This patch
was written by a script.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y: Replace "parse_gdbarch" with method call.
* parse.c (write_dollar_variable, insert_type_address_space):
Replace "parse_gdbarch" with method call.
* p-exp.y (parse_type, yylex): Replace "parse_gdbarch" with method
call.
* objc-lang.c (end_msglist): Replace "parse_gdbarch" with method
call.
* m2-exp.y (parse_type, parse_m2_type, yylex): Replace
"parse_gdbarch" with method call.
* go-exp.y (parse_type, classify_name): Replace "parse_gdbarch"
with method call.
* f-exp.y (parse_type, parse_f_type, yylex): Replace
"parse_gdbarch" with method call.
* d-exp.y (parse_type, parse_d_type, lex_one_token): Replace
"parse_gdbarch" with method call.
* c-exp.y (parse_type, parse_number, classify_name): Replace
"parse_gdbarch" with method call.
* ada-lex.l: Replace "parse_gdbarch" with method call.
* ada-exp.y (parse_type, find_primitive_type, type_char)
(type_system_address): Replace "parse_gdbarch" with method call.
2019-03-24 22:56:33 +08:00
|
|
|
|
#define parse_type(ps) builtin_type (ps->gdbarch ())
|
|
|
|
|
#define parse_d_type(ps) builtin_d_type (ps->gdbarch ())
|
2014-06-20 02:29:26 +08:00
|
|
|
|
|
Centralize yacc interface names remapping (yyparse, yylex, yyerror, etc)
This factors out all the yy-variables remapping to a single file,
instead of each parser having to do the same, with different prefixes.
With this, a parser just needs to define the prefix they want and
include yy-remap.h, which does the dirty job.
Note this renames the c_error, ada_error, etc. functions. Writing the
remapping pattern as:
#define yyerror GDB_YY_REMAP (error)
instead of:
#define yyerror GDB_YY_REMAP (yyerror)
would have avoided the renaming. However, that would be problematic
if we have a macro 'foo' in scope, when we write:
#define yyfoo GDB_YY_REMAP (foo)
as that would expand 'foo'.
The c_yyerror etc. naming end ups indicating that this is a yacc
related function more clearly, so feels like a good change, anyway.
gdb/ChangeLog:
2016-04-22 Pedro Alves <palves@redhat.com>
* ada-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* ada-lang.c (ada_language_defn): Adjust.
* ada-lang.h (ada_error): Rename to ...
(ada_yyerror): ... this.
* c-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* c-lang.c (c_language_defn, cplus_language_defn)
(asm_language_defn, minimal_language_defn): Adjust.
* c-lang.h (c_error): Rename to ...
(c_yyerror): ... this.
* d-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* d-lang.c (d_language_defn): Adjust.
* d-lang.h (d_error): Rename to ...
(d_yyerror): ... this.
* f-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* f-lang.c (f_language_defn): Adjust.
* f-lang.h (f_error): Rename to ...
(f_yyerror): ... this.
* go-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* go-lang.c (go_language_defn): Adjust.
* go-lang.h (go_error): Rename to ...
(go_yyerror): ... this.
* jv-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* jv-lang.c (java_language_defn): Adjust.
* jv-lang.h (java_error): Rename to ...
(java_yyerror): ... this.
* m2-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* m2-lang.c (m2_language_defn): Adjust.
* m2-lang.h (m2_error): Rename to ...
(m2_yyerror): ... this.
* objc-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* objc-lang.c (objc_language_defn): Adjust.
* opencl-lang.c (opencl_language_defn): Adjust.
* p-exp.y: Remove all yy symbol remappings.
(GDB_YY_REMAP_PREFIX): Define.
Include "yy-remap.h".
* p-lang.c (pascal_language_defn): Adjust.
* p-lang.h (pascal_error): Rename to ...
(pascal_yyerror): ... this.
* yy-remap.h: New file.
2016-04-22 23:40:33 +08:00
|
|
|
|
/* Remap normal yacc parser interface names (yyparse, yylex, yyerror,
|
|
|
|
|
etc). */
|
|
|
|
|
#define GDB_YY_REMAP_PREFIX d_
|
|
|
|
|
#include "yy-remap.h"
|
2014-06-20 02:29:26 +08:00
|
|
|
|
|
|
|
|
|
/* The state of the parser, used internally when we are parsing the
|
|
|
|
|
expression. */
|
|
|
|
|
|
|
|
|
|
static struct parser_state *pstate = NULL;
|
|
|
|
|
|
Move type stack handling to a new class
This introduces a new "type_stack" class, and moves all the parser
type stack handling to this class. Parsers that wish to use this
facility must now instantiate this class somehow. I chose this
approach because a minority of the existing parsers require this.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* type-stack.h: New file.
* type-stack.c: New file.
* parser-defs.h (enum type_pieces, union type_stack_elt): Move to
type-stack.h.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Don't declare.
* parse.c (type_stack): Remove global.
(parse_exp_in_context): Update.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Remove (moved to
type-stack.c).
* f-exp.y (type_stack): New global.
Update rules.
(push_kind_type, f_parse): Update.
* d-exp.y (type_stack): New global.
Update rules.
(d_parse): Update.
* c-exp.y (struct c_parse_state) <type_stack>: New member.
Update rules.
* Makefile.in (COMMON_SFILES): Add type-stack.c.
(HFILES_NO_SRCDIR): Add type-stack.h.
2019-04-01 03:43:54 +08:00
|
|
|
|
/* The current type stack. */
|
|
|
|
|
static struct type_stack *type_stack;
|
|
|
|
|
|
2014-06-20 02:29:26 +08:00
|
|
|
|
int yyparse (void);
|
|
|
|
|
|
|
|
|
|
static int yylex (void);
|
|
|
|
|
|
2018-06-02 13:02:37 +08:00
|
|
|
|
static void yyerror (const char *);
|
2014-06-20 02:29:26 +08:00
|
|
|
|
|
2015-08-18 03:45:42 +08:00
|
|
|
|
static int type_aggregate_p (struct type *);
|
|
|
|
|
|
2014-06-20 02:29:26 +08:00
|
|
|
|
%}
|
|
|
|
|
|
|
|
|
|
/* Although the yacc "value" of an expression is not used,
|
|
|
|
|
since the result is stored in the structure being created,
|
|
|
|
|
other node types do have values. */
|
|
|
|
|
|
|
|
|
|
%union
|
|
|
|
|
{
|
|
|
|
|
struct {
|
|
|
|
|
LONGEST val;
|
|
|
|
|
struct type *type;
|
|
|
|
|
} typed_val_int;
|
|
|
|
|
struct {
|
Target FP: Use target format throughout expression parsing
When parsing floating-point literals, the language parsers currently
use parse_float or some equivalent routine to parse the input string
into a DOUBLEST, which is then stored within a OP_DOUBLE expression
node. When evaluating the expression, the OP_DOUBLE is finally
converted into a value in target format.
On the other hand, *decimal* floating-point literals are parsed
directly into target format and stored that way in a OP_DECFLOAT
expression node. In order to eliminate the DOUBLEST, this patch
therefore unifies the handling of binary and decimal floating-
point literals and stores them both in target format within a
new OP_FLOAT expression node, replacing both OP_DOUBLE and
OP_DECFLOAT.
In order to store literals in target format, the parse_float
routine needs to know the type of the literal. All parsers
therefore need to be changed to determine the appropriate type
(e.g. by detecting suffixes) *before* calling parse_float,
instead of after it as today. However, this change is mostly
straightforward -- again, this is already done for decimal FP
today.
The core of the literal parsing is moved into a new routine
floatformat_from_string, mirroring floatformat_to_string.
The parse_float routine now calls either floatformat_from_string
or decimal_from_sting, allowing it to handle any type of FP
literal.
All language parsers need to be updated. Some notes on
specific changes to the various languages:
- C: Decimal FP is now handled in parse_float, and no longer
needs to be handled specially.
- D: Straightforward.
- Fortran: Still used a hard-coded "atof", also replaced by
parse_float now. Continues to always use builtin_real_s8
as the type of literal, even though this is probably wrong.
- Go: This used to handle "f" and "l" suffixes, even though
the Go language actually doesn't support those. I kept this
support for now -- maybe revisit later. Note the the GDB
test suite for some reason actually *verifies* that GDB supports
those unsupported suffixes ...
- Pascal: Likewise -- this handles suffixes that are not
supported in the language standard.
- Modula-2: Like Fortran, used to use "atof".
- Rust: Mostly straightforward, except for a unit-testing hitch.
The code use to set a special "unit_testing" flag which would
cause "rust_type" to always return NULL. This makes it not
possible to encode a literal into target format (which type?).
The reason for this flag appears to have been that during
unit testing, there is no "rust_parser" context set up, which
means no "gdbarch" is available to use its types. To fix this,
I removed the unit_testing flag, and instead simply just set up
a dummy rust_parser context during unit testing.
- Ada: This used to check sizeof (DOUBLEST) to determine which
type to use for floating-point literal. This seems questionable
to begin with (since DOUBLEST is quite unrelated to target formats),
and in any case we need to get rid of DOUBLEST. I'm now simply
always using the largest type (builtin_long_double).
gdb/ChangeLog:
2017-10-25 Ulrich Weigand <uweigand@de.ibm.com>
* doublest.c (floatformat_from_string): New function.
* doublest.h (floatformat_from_string): Add prototype.
* std-operator.def (OP_DOUBLE, OP_DECFLOAT): Remove, replace by ...
(OP_FLOAT): ... this.
* expression.h: Do not include "doublest.h".
(union exp_element): Replace doubleconst and decfloatconst by
new element floatconst.
* ada-lang.c (resolve_subexp): Handle OP_FLOAT instead of OP_DOUBLE.
(ada_evaluate_subexp): Likewise.
* eval.c (evaluate_subexp_standard): Handle OP_FLOAT instead of
OP_DOUBLE and OP_DECFLOAT.
* expprint.c (print_subexp_standard): Likewise.
(dump_subexp_body_standard): Likewise.
* breakpoint.c (watchpoint_exp_is_const): Likewise.
* parse.c: Include "dfp.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): New function.
(operator_length_standard): Handle OP_FLOAT instead of OP_DOUBLE
and OP_DECFLOAT.
(operator_check_standard): Likewise.
(parse_float): Do not accept suffix. Take type as input. Return bool.
Return target format buffer instead of host DOUBLEST.
Use floatformat_from_string and decimal_from_string to parse
either binary or decimal floating-point types.
(parse_c_float): Remove.
* parser-defs.h: Do not include "doublest.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): Add prototype.
(parse_float): Update prototype.
(parse_c_float): Remove.
* c-exp.y: Do not include "dfp.h".
(typed_val_float): Use byte buffer instead of DOUBLEST.
(typed_val_decfloat): Remove.
(DECFLOAT): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
Handle decimal and binary FP types the same way.
* d-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT_LITERAL): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* f-exp.y: Replace dval by typed_val_float.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Use parse_float instead of atof.
* go-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(parse_go_float): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of parse_go_float.
Parse suffixes and determine type before calling parse_float.
* p-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* m2-exp.y: Replace dval by byte buffer val.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of atof.
* rust-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(lex_number): Call parse_float instead of strtod.
(ast_dliteral): Use OP_FLOAT instead of OP_DOUBLE.
(convert_ast_to_expression): Handle OP_FLOAT instead of OP_DOUBLE.
Use write_exp_elt_floatcst.
(unit_testing): Remove static variable.
(rust_type): Do not check unit_testing.
(rust_lex_tests): Do not set uint_testing. Set up dummy rust_parser.
* ada-exp.y (type_float, type_double): Remove.
(typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
* ada-lex.l (processReal): Use parse_float instead of sscanf.
2017-10-25 21:32:23 +08:00
|
|
|
|
gdb_byte val[16];
|
2014-06-20 02:29:26 +08:00
|
|
|
|
struct type *type;
|
|
|
|
|
} typed_val_float;
|
|
|
|
|
struct symbol *sym;
|
|
|
|
|
struct type *tval;
|
|
|
|
|
struct typed_stoken tsval;
|
|
|
|
|
struct stoken sval;
|
|
|
|
|
struct ttype tsym;
|
|
|
|
|
struct symtoken ssym;
|
|
|
|
|
int ival;
|
2015-08-14 03:35:09 +08:00
|
|
|
|
int voidval;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
enum exp_opcode opcode;
|
|
|
|
|
struct stoken_vector svec;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
%{
|
|
|
|
|
/* YYSTYPE gets defined by %union */
|
|
|
|
|
static int parse_number (struct parser_state *, const char *,
|
|
|
|
|
int, int, YYSTYPE *);
|
|
|
|
|
%}
|
|
|
|
|
|
2015-08-14 03:35:09 +08:00
|
|
|
|
%token <sval> IDENTIFIER UNKNOWN_NAME
|
2014-06-20 02:29:26 +08:00
|
|
|
|
%token <tsym> TYPENAME
|
|
|
|
|
%token <voidval> COMPLETE
|
|
|
|
|
|
|
|
|
|
/* A NAME_OR_INT is a symbol which is not known in the symbol table,
|
|
|
|
|
but which would parse as a valid number in the current input radix.
|
|
|
|
|
E.g. "c" when input_radix==16. Depending on the parse, it will be
|
|
|
|
|
turned into a name or into a number. */
|
|
|
|
|
|
|
|
|
|
%token <sval> NAME_OR_INT
|
|
|
|
|
|
|
|
|
|
%token <typed_val_int> INTEGER_LITERAL
|
|
|
|
|
%token <typed_val_float> FLOAT_LITERAL
|
|
|
|
|
%token <tsval> CHARACTER_LITERAL
|
|
|
|
|
%token <tsval> STRING_LITERAL
|
|
|
|
|
|
|
|
|
|
%type <svec> StringExp
|
|
|
|
|
%type <tval> BasicType TypeExp
|
|
|
|
|
%type <sval> IdentifierExp
|
|
|
|
|
%type <ival> ArrayLiteral
|
|
|
|
|
|
|
|
|
|
%token ENTRY
|
|
|
|
|
%token ERROR
|
|
|
|
|
|
|
|
|
|
/* Keywords that have a constant value. */
|
|
|
|
|
%token TRUE_KEYWORD FALSE_KEYWORD NULL_KEYWORD
|
|
|
|
|
/* Class 'super' accessor. */
|
|
|
|
|
%token SUPER_KEYWORD
|
|
|
|
|
/* Properties. */
|
|
|
|
|
%token CAST_KEYWORD SIZEOF_KEYWORD
|
|
|
|
|
%token TYPEOF_KEYWORD TYPEID_KEYWORD
|
|
|
|
|
%token INIT_KEYWORD
|
|
|
|
|
/* Comparison keywords. */
|
|
|
|
|
/* Type storage classes. */
|
|
|
|
|
%token IMMUTABLE_KEYWORD CONST_KEYWORD SHARED_KEYWORD
|
|
|
|
|
/* Non-scalar type keywords. */
|
|
|
|
|
%token STRUCT_KEYWORD UNION_KEYWORD
|
|
|
|
|
%token CLASS_KEYWORD INTERFACE_KEYWORD
|
|
|
|
|
%token ENUM_KEYWORD TEMPLATE_KEYWORD
|
|
|
|
|
%token DELEGATE_KEYWORD FUNCTION_KEYWORD
|
|
|
|
|
|
|
|
|
|
%token <sval> DOLLAR_VARIABLE
|
|
|
|
|
|
|
|
|
|
%token <opcode> ASSIGN_MODIFY
|
|
|
|
|
|
|
|
|
|
%left ','
|
|
|
|
|
%right '=' ASSIGN_MODIFY
|
|
|
|
|
%right '?'
|
|
|
|
|
%left OROR
|
|
|
|
|
%left ANDAND
|
|
|
|
|
%left '|'
|
|
|
|
|
%left '^'
|
|
|
|
|
%left '&'
|
|
|
|
|
%left EQUAL NOTEQUAL '<' '>' LEQ GEQ
|
|
|
|
|
%right LSH RSH
|
|
|
|
|
%left '+' '-'
|
|
|
|
|
%left '*' '/' '%'
|
|
|
|
|
%right HATHAT
|
|
|
|
|
%left IDENTITY NOTIDENTITY
|
|
|
|
|
%right INCREMENT DECREMENT
|
|
|
|
|
%right '.' '[' '('
|
|
|
|
|
%token DOTDOT
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%%
|
|
|
|
|
|
|
|
|
|
start :
|
|
|
|
|
Expression
|
|
|
|
|
| TypeExp
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
/* Expressions, including the comma operator. */
|
|
|
|
|
|
|
|
|
|
Expression:
|
|
|
|
|
CommaExpression
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
CommaExpression:
|
|
|
|
|
AssignExpression
|
|
|
|
|
| AssignExpression ',' CommaExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_COMMA); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
AssignExpression:
|
|
|
|
|
ConditionalExpression
|
|
|
|
|
| ConditionalExpression '=' AssignExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_ASSIGN); }
|
|
|
|
|
| ConditionalExpression ASSIGN_MODIFY AssignExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_ASSIGN_MODIFY);
|
|
|
|
|
write_exp_elt_opcode (pstate, $2);
|
|
|
|
|
write_exp_elt_opcode (pstate, BINOP_ASSIGN_MODIFY); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
ConditionalExpression:
|
|
|
|
|
OrOrExpression
|
|
|
|
|
| OrOrExpression '?' Expression ':' ConditionalExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, TERNOP_COND); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
OrOrExpression:
|
|
|
|
|
AndAndExpression
|
|
|
|
|
| OrOrExpression OROR AndAndExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_LOGICAL_OR); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
AndAndExpression:
|
|
|
|
|
OrExpression
|
|
|
|
|
| AndAndExpression ANDAND OrExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_LOGICAL_AND); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
OrExpression:
|
|
|
|
|
XorExpression
|
|
|
|
|
| OrExpression '|' XorExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_BITWISE_IOR); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
XorExpression:
|
|
|
|
|
AndExpression
|
|
|
|
|
| XorExpression '^' AndExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_BITWISE_XOR); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
AndExpression:
|
|
|
|
|
CmpExpression
|
|
|
|
|
| AndExpression '&' CmpExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_BITWISE_AND); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
CmpExpression:
|
|
|
|
|
ShiftExpression
|
|
|
|
|
| EqualExpression
|
|
|
|
|
| IdentityExpression
|
|
|
|
|
| RelExpression
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
EqualExpression:
|
|
|
|
|
ShiftExpression EQUAL ShiftExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_EQUAL); }
|
|
|
|
|
| ShiftExpression NOTEQUAL ShiftExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_NOTEQUAL); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
IdentityExpression:
|
|
|
|
|
ShiftExpression IDENTITY ShiftExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_EQUAL); }
|
|
|
|
|
| ShiftExpression NOTIDENTITY ShiftExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_NOTEQUAL); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
RelExpression:
|
|
|
|
|
ShiftExpression '<' ShiftExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_LESS); }
|
|
|
|
|
| ShiftExpression LEQ ShiftExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_LEQ); }
|
|
|
|
|
| ShiftExpression '>' ShiftExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_GTR); }
|
|
|
|
|
| ShiftExpression GEQ ShiftExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_GEQ); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
ShiftExpression:
|
|
|
|
|
AddExpression
|
|
|
|
|
| ShiftExpression LSH AddExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_LSH); }
|
|
|
|
|
| ShiftExpression RSH AddExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_RSH); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
AddExpression:
|
|
|
|
|
MulExpression
|
|
|
|
|
| AddExpression '+' MulExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_ADD); }
|
|
|
|
|
| AddExpression '-' MulExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_SUB); }
|
|
|
|
|
| AddExpression '~' MulExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_CONCAT); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
MulExpression:
|
|
|
|
|
UnaryExpression
|
|
|
|
|
| MulExpression '*' UnaryExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_MUL); }
|
|
|
|
|
| MulExpression '/' UnaryExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_DIV); }
|
|
|
|
|
| MulExpression '%' UnaryExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_REM); }
|
|
|
|
|
|
|
|
|
|
UnaryExpression:
|
|
|
|
|
'&' UnaryExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, UNOP_ADDR); }
|
|
|
|
|
| INCREMENT UnaryExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, UNOP_PREINCREMENT); }
|
|
|
|
|
| DECREMENT UnaryExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, UNOP_PREDECREMENT); }
|
|
|
|
|
| '*' UnaryExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, UNOP_IND); }
|
|
|
|
|
| '-' UnaryExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, UNOP_NEG); }
|
|
|
|
|
| '+' UnaryExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, UNOP_PLUS); }
|
|
|
|
|
| '!' UnaryExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, UNOP_LOGICAL_NOT); }
|
|
|
|
|
| '~' UnaryExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, UNOP_COMPLEMENT); }
|
2015-10-09 03:38:05 +08:00
|
|
|
|
| TypeExp '.' SIZEOF_KEYWORD
|
|
|
|
|
{ write_exp_elt_opcode (pstate, UNOP_SIZEOF); }
|
2014-06-20 02:29:26 +08:00
|
|
|
|
| CastExpression
|
|
|
|
|
| PowExpression
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
CastExpression:
|
|
|
|
|
CAST_KEYWORD '(' TypeExp ')' UnaryExpression
|
2017-01-08 18:17:54 +08:00
|
|
|
|
{ write_exp_elt_opcode (pstate, UNOP_CAST_TYPE); }
|
2014-06-20 02:29:26 +08:00
|
|
|
|
/* C style cast is illegal D, but is still recognised in
|
|
|
|
|
the grammar, so we keep this around for convenience. */
|
|
|
|
|
| '(' TypeExp ')' UnaryExpression
|
2017-01-08 18:17:54 +08:00
|
|
|
|
{ write_exp_elt_opcode (pstate, UNOP_CAST_TYPE); }
|
|
|
|
|
|
2014-06-20 02:29:26 +08:00
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
PowExpression:
|
|
|
|
|
PostfixExpression
|
|
|
|
|
| PostfixExpression HATHAT UnaryExpression
|
|
|
|
|
{ write_exp_elt_opcode (pstate, BINOP_EXP); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
PostfixExpression:
|
|
|
|
|
PrimaryExpression
|
2015-08-14 03:35:09 +08:00
|
|
|
|
| PostfixExpression '.' COMPLETE
|
|
|
|
|
{ struct stoken s;
|
2019-03-25 12:50:14 +08:00
|
|
|
|
pstate->mark_struct_expression ();
|
2015-08-14 03:35:09 +08:00
|
|
|
|
write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
|
|
|
|
|
s.ptr = "";
|
|
|
|
|
s.length = 0;
|
|
|
|
|
write_exp_string (pstate, s);
|
|
|
|
|
write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
|
|
|
|
|
| PostfixExpression '.' IDENTIFIER
|
|
|
|
|
{ write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
|
|
|
|
|
write_exp_string (pstate, $3);
|
|
|
|
|
write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
|
|
|
|
|
| PostfixExpression '.' IDENTIFIER COMPLETE
|
2019-03-25 12:50:14 +08:00
|
|
|
|
{ pstate->mark_struct_expression ();
|
2015-08-14 03:35:09 +08:00
|
|
|
|
write_exp_elt_opcode (pstate, STRUCTOP_STRUCT);
|
|
|
|
|
write_exp_string (pstate, $3);
|
|
|
|
|
write_exp_elt_opcode (pstate, STRUCTOP_STRUCT); }
|
2015-10-09 03:38:05 +08:00
|
|
|
|
| PostfixExpression '.' SIZEOF_KEYWORD
|
|
|
|
|
{ write_exp_elt_opcode (pstate, UNOP_SIZEOF); }
|
2014-06-20 02:29:26 +08:00
|
|
|
|
| PostfixExpression INCREMENT
|
|
|
|
|
{ write_exp_elt_opcode (pstate, UNOP_POSTINCREMENT); }
|
|
|
|
|
| PostfixExpression DECREMENT
|
|
|
|
|
{ write_exp_elt_opcode (pstate, UNOP_POSTDECREMENT); }
|
|
|
|
|
| CallExpression
|
|
|
|
|
| IndexExpression
|
|
|
|
|
| SliceExpression
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
ArgumentList:
|
|
|
|
|
AssignExpression
|
2019-03-25 11:38:40 +08:00
|
|
|
|
{ pstate->arglist_len = 1; }
|
2014-06-20 02:29:26 +08:00
|
|
|
|
| ArgumentList ',' AssignExpression
|
2019-03-25 11:38:40 +08:00
|
|
|
|
{ pstate->arglist_len++; }
|
2014-06-20 02:29:26 +08:00
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
ArgumentList_opt:
|
|
|
|
|
/* EMPTY */
|
2019-03-25 11:38:40 +08:00
|
|
|
|
{ pstate->arglist_len = 0; }
|
2014-06-20 02:29:26 +08:00
|
|
|
|
| ArgumentList
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
CallExpression:
|
|
|
|
|
PostfixExpression '('
|
2019-03-25 11:38:40 +08:00
|
|
|
|
{ pstate->start_arglist (); }
|
2014-06-20 02:29:26 +08:00
|
|
|
|
ArgumentList_opt ')'
|
|
|
|
|
{ write_exp_elt_opcode (pstate, OP_FUNCALL);
|
2019-03-25 11:38:40 +08:00
|
|
|
|
write_exp_elt_longcst (pstate, pstate->end_arglist ());
|
2014-06-20 02:29:26 +08:00
|
|
|
|
write_exp_elt_opcode (pstate, OP_FUNCALL); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
IndexExpression:
|
|
|
|
|
PostfixExpression '[' ArgumentList ']'
|
2019-03-25 11:38:40 +08:00
|
|
|
|
{ if (pstate->arglist_len > 0)
|
2014-06-20 02:29:26 +08:00
|
|
|
|
{
|
|
|
|
|
write_exp_elt_opcode (pstate, MULTI_SUBSCRIPT);
|
2019-03-25 11:38:40 +08:00
|
|
|
|
write_exp_elt_longcst (pstate, pstate->arglist_len);
|
2014-06-20 02:29:26 +08:00
|
|
|
|
write_exp_elt_opcode (pstate, MULTI_SUBSCRIPT);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
write_exp_elt_opcode (pstate, BINOP_SUBSCRIPT);
|
|
|
|
|
}
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
SliceExpression:
|
|
|
|
|
PostfixExpression '[' ']'
|
|
|
|
|
{ /* Do nothing. */ }
|
|
|
|
|
| PostfixExpression '[' AssignExpression DOTDOT AssignExpression ']'
|
|
|
|
|
{ write_exp_elt_opcode (pstate, TERNOP_SLICE); }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
PrimaryExpression:
|
|
|
|
|
'(' Expression ')'
|
|
|
|
|
{ /* Do nothing. */ }
|
|
|
|
|
| IdentifierExp
|
2015-08-14 03:35:09 +08:00
|
|
|
|
{ struct bound_minimal_symbol msymbol;
|
2019-04-08 05:29:58 +08:00
|
|
|
|
std::string copy = copy_name ($1);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
struct field_of_this_result is_a_field_of_this;
|
|
|
|
|
struct block_symbol sym;
|
|
|
|
|
|
|
|
|
|
/* Handle VAR, which could be local or global. */
|
2019-04-08 05:29:58 +08:00
|
|
|
|
sym = lookup_symbol (copy.c_str (),
|
|
|
|
|
pstate->expression_context_block,
|
2019-03-25 01:20:05 +08:00
|
|
|
|
VAR_DOMAIN, &is_a_field_of_this);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
if (sym.symbol && SYMBOL_CLASS (sym.symbol) != LOC_TYPEDEF)
|
|
|
|
|
{
|
|
|
|
|
if (symbol_read_needs_frame (sym.symbol))
|
2019-04-01 07:20:24 +08:00
|
|
|
|
pstate->block_tracker->update (sym);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
write_exp_elt_opcode (pstate, OP_VAR_VALUE);
|
2015-10-25 16:17:24 +08:00
|
|
|
|
write_exp_elt_block (pstate, sym.block);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
write_exp_elt_sym (pstate, sym.symbol);
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_VAR_VALUE);
|
|
|
|
|
}
|
|
|
|
|
else if (is_a_field_of_this.type != NULL)
|
|
|
|
|
{
|
|
|
|
|
/* It hangs off of `this'. Must not inadvertently convert from a
|
|
|
|
|
method call to data ref. */
|
2019-04-01 07:20:24 +08:00
|
|
|
|
pstate->block_tracker->update (sym);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
write_exp_elt_opcode (pstate, OP_THIS);
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_THIS);
|
|
|
|
|
write_exp_elt_opcode (pstate, STRUCTOP_PTR);
|
|
|
|
|
write_exp_string (pstate, $1);
|
|
|
|
|
write_exp_elt_opcode (pstate, STRUCTOP_PTR);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Lookup foreign name in global static symbols. */
|
2019-04-08 05:29:58 +08:00
|
|
|
|
msymbol = lookup_bound_minimal_symbol (copy.c_str ());
|
2015-08-14 03:35:09 +08:00
|
|
|
|
if (msymbol.minsym != NULL)
|
|
|
|
|
write_exp_msymbol (pstate, msymbol);
|
|
|
|
|
else if (!have_full_symbols () && !have_partial_symbols ())
|
|
|
|
|
error (_("No symbol table is loaded. Use the \"file\" command"));
|
|
|
|
|
else
|
2019-04-08 05:29:58 +08:00
|
|
|
|
error (_("No symbol \"%s\" in current context."),
|
|
|
|
|
copy.c_str ());
|
2015-08-14 03:35:09 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
| TypeExp '.' IdentifierExp
|
|
|
|
|
{ struct type *type = check_typedef ($1);
|
|
|
|
|
|
|
|
|
|
/* Check if the qualified name is in the global
|
|
|
|
|
context. However if the symbol has not already
|
|
|
|
|
been resolved, it's not likely to be found. */
|
|
|
|
|
if (TYPE_CODE (type) == TYPE_CODE_MODULE)
|
|
|
|
|
{
|
|
|
|
|
struct bound_minimal_symbol msymbol;
|
|
|
|
|
struct block_symbol sym;
|
2015-08-15 08:28:11 +08:00
|
|
|
|
const char *type_name = TYPE_SAFE_NAME (type);
|
|
|
|
|
int type_name_len = strlen (type_name);
|
2017-08-14 00:38:53 +08:00
|
|
|
|
std::string name
|
|
|
|
|
= string_printf ("%.*s.%.*s",
|
2015-08-15 08:28:11 +08:00
|
|
|
|
type_name_len, type_name,
|
2015-08-15 03:25:17 +08:00
|
|
|
|
$3.length, $3.ptr);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
|
|
|
|
|
sym =
|
2017-08-14 00:38:53 +08:00
|
|
|
|
lookup_symbol (name.c_str (),
|
|
|
|
|
(const struct block *) NULL,
|
2015-08-14 03:35:09 +08:00
|
|
|
|
VAR_DOMAIN, NULL);
|
|
|
|
|
if (sym.symbol)
|
|
|
|
|
{
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_VAR_VALUE);
|
|
|
|
|
write_exp_elt_block (pstate, sym.block);
|
|
|
|
|
write_exp_elt_sym (pstate, sym.symbol);
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_VAR_VALUE);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2017-08-14 00:38:53 +08:00
|
|
|
|
msymbol = lookup_bound_minimal_symbol (name.c_str ());
|
2015-08-14 03:35:09 +08:00
|
|
|
|
if (msymbol.minsym != NULL)
|
|
|
|
|
write_exp_msymbol (pstate, msymbol);
|
|
|
|
|
else if (!have_full_symbols () && !have_partial_symbols ())
|
|
|
|
|
error (_("No symbol table is loaded. Use the \"file\" command."));
|
|
|
|
|
else
|
2017-08-14 00:38:53 +08:00
|
|
|
|
error (_("No symbol \"%s\" in current context."),
|
|
|
|
|
name.c_str ());
|
2015-08-14 03:35:09 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check if the qualified name resolves as a member
|
|
|
|
|
of an aggregate or an enum type. */
|
2015-08-18 03:45:42 +08:00
|
|
|
|
if (!type_aggregate_p (type))
|
2015-08-14 03:35:09 +08:00
|
|
|
|
error (_("`%s' is not defined as an aggregate type."),
|
|
|
|
|
TYPE_SAFE_NAME (type));
|
|
|
|
|
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_SCOPE);
|
|
|
|
|
write_exp_elt_type (pstate, type);
|
|
|
|
|
write_exp_string (pstate, $3);
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_SCOPE);
|
|
|
|
|
}
|
2014-06-20 02:29:26 +08:00
|
|
|
|
| DOLLAR_VARIABLE
|
|
|
|
|
{ write_dollar_variable (pstate, $1); }
|
|
|
|
|
| NAME_OR_INT
|
|
|
|
|
{ YYSTYPE val;
|
|
|
|
|
parse_number (pstate, $1.ptr, $1.length, 0, &val);
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_LONG);
|
|
|
|
|
write_exp_elt_type (pstate, val.typed_val_int.type);
|
|
|
|
|
write_exp_elt_longcst (pstate,
|
|
|
|
|
(LONGEST) val.typed_val_int.val);
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_LONG); }
|
|
|
|
|
| NULL_KEYWORD
|
|
|
|
|
{ struct type *type = parse_d_type (pstate)->builtin_void;
|
|
|
|
|
type = lookup_pointer_type (type);
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_LONG);
|
|
|
|
|
write_exp_elt_type (pstate, type);
|
|
|
|
|
write_exp_elt_longcst (pstate, (LONGEST) 0);
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_LONG); }
|
|
|
|
|
| TRUE_KEYWORD
|
|
|
|
|
{ write_exp_elt_opcode (pstate, OP_BOOL);
|
|
|
|
|
write_exp_elt_longcst (pstate, (LONGEST) 1);
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_BOOL); }
|
|
|
|
|
| FALSE_KEYWORD
|
|
|
|
|
{ write_exp_elt_opcode (pstate, OP_BOOL);
|
|
|
|
|
write_exp_elt_longcst (pstate, (LONGEST) 0);
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_BOOL); }
|
|
|
|
|
| INTEGER_LITERAL
|
|
|
|
|
{ write_exp_elt_opcode (pstate, OP_LONG);
|
|
|
|
|
write_exp_elt_type (pstate, $1.type);
|
|
|
|
|
write_exp_elt_longcst (pstate, (LONGEST)($1.val));
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_LONG); }
|
|
|
|
|
| FLOAT_LITERAL
|
Target FP: Use target format throughout expression parsing
When parsing floating-point literals, the language parsers currently
use parse_float or some equivalent routine to parse the input string
into a DOUBLEST, which is then stored within a OP_DOUBLE expression
node. When evaluating the expression, the OP_DOUBLE is finally
converted into a value in target format.
On the other hand, *decimal* floating-point literals are parsed
directly into target format and stored that way in a OP_DECFLOAT
expression node. In order to eliminate the DOUBLEST, this patch
therefore unifies the handling of binary and decimal floating-
point literals and stores them both in target format within a
new OP_FLOAT expression node, replacing both OP_DOUBLE and
OP_DECFLOAT.
In order to store literals in target format, the parse_float
routine needs to know the type of the literal. All parsers
therefore need to be changed to determine the appropriate type
(e.g. by detecting suffixes) *before* calling parse_float,
instead of after it as today. However, this change is mostly
straightforward -- again, this is already done for decimal FP
today.
The core of the literal parsing is moved into a new routine
floatformat_from_string, mirroring floatformat_to_string.
The parse_float routine now calls either floatformat_from_string
or decimal_from_sting, allowing it to handle any type of FP
literal.
All language parsers need to be updated. Some notes on
specific changes to the various languages:
- C: Decimal FP is now handled in parse_float, and no longer
needs to be handled specially.
- D: Straightforward.
- Fortran: Still used a hard-coded "atof", also replaced by
parse_float now. Continues to always use builtin_real_s8
as the type of literal, even though this is probably wrong.
- Go: This used to handle "f" and "l" suffixes, even though
the Go language actually doesn't support those. I kept this
support for now -- maybe revisit later. Note the the GDB
test suite for some reason actually *verifies* that GDB supports
those unsupported suffixes ...
- Pascal: Likewise -- this handles suffixes that are not
supported in the language standard.
- Modula-2: Like Fortran, used to use "atof".
- Rust: Mostly straightforward, except for a unit-testing hitch.
The code use to set a special "unit_testing" flag which would
cause "rust_type" to always return NULL. This makes it not
possible to encode a literal into target format (which type?).
The reason for this flag appears to have been that during
unit testing, there is no "rust_parser" context set up, which
means no "gdbarch" is available to use its types. To fix this,
I removed the unit_testing flag, and instead simply just set up
a dummy rust_parser context during unit testing.
- Ada: This used to check sizeof (DOUBLEST) to determine which
type to use for floating-point literal. This seems questionable
to begin with (since DOUBLEST is quite unrelated to target formats),
and in any case we need to get rid of DOUBLEST. I'm now simply
always using the largest type (builtin_long_double).
gdb/ChangeLog:
2017-10-25 Ulrich Weigand <uweigand@de.ibm.com>
* doublest.c (floatformat_from_string): New function.
* doublest.h (floatformat_from_string): Add prototype.
* std-operator.def (OP_DOUBLE, OP_DECFLOAT): Remove, replace by ...
(OP_FLOAT): ... this.
* expression.h: Do not include "doublest.h".
(union exp_element): Replace doubleconst and decfloatconst by
new element floatconst.
* ada-lang.c (resolve_subexp): Handle OP_FLOAT instead of OP_DOUBLE.
(ada_evaluate_subexp): Likewise.
* eval.c (evaluate_subexp_standard): Handle OP_FLOAT instead of
OP_DOUBLE and OP_DECFLOAT.
* expprint.c (print_subexp_standard): Likewise.
(dump_subexp_body_standard): Likewise.
* breakpoint.c (watchpoint_exp_is_const): Likewise.
* parse.c: Include "dfp.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): New function.
(operator_length_standard): Handle OP_FLOAT instead of OP_DOUBLE
and OP_DECFLOAT.
(operator_check_standard): Likewise.
(parse_float): Do not accept suffix. Take type as input. Return bool.
Return target format buffer instead of host DOUBLEST.
Use floatformat_from_string and decimal_from_string to parse
either binary or decimal floating-point types.
(parse_c_float): Remove.
* parser-defs.h: Do not include "doublest.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): Add prototype.
(parse_float): Update prototype.
(parse_c_float): Remove.
* c-exp.y: Do not include "dfp.h".
(typed_val_float): Use byte buffer instead of DOUBLEST.
(typed_val_decfloat): Remove.
(DECFLOAT): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
Handle decimal and binary FP types the same way.
* d-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT_LITERAL): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* f-exp.y: Replace dval by typed_val_float.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Use parse_float instead of atof.
* go-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(parse_go_float): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of parse_go_float.
Parse suffixes and determine type before calling parse_float.
* p-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* m2-exp.y: Replace dval by byte buffer val.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of atof.
* rust-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(lex_number): Call parse_float instead of strtod.
(ast_dliteral): Use OP_FLOAT instead of OP_DOUBLE.
(convert_ast_to_expression): Handle OP_FLOAT instead of OP_DOUBLE.
Use write_exp_elt_floatcst.
(unit_testing): Remove static variable.
(rust_type): Do not check unit_testing.
(rust_lex_tests): Do not set uint_testing. Set up dummy rust_parser.
* ada-exp.y (type_float, type_double): Remove.
(typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
* ada-lex.l (processReal): Use parse_float instead of sscanf.
2017-10-25 21:32:23 +08:00
|
|
|
|
{ write_exp_elt_opcode (pstate, OP_FLOAT);
|
2014-06-20 02:29:26 +08:00
|
|
|
|
write_exp_elt_type (pstate, $1.type);
|
Target FP: Use target format throughout expression parsing
When parsing floating-point literals, the language parsers currently
use parse_float or some equivalent routine to parse the input string
into a DOUBLEST, which is then stored within a OP_DOUBLE expression
node. When evaluating the expression, the OP_DOUBLE is finally
converted into a value in target format.
On the other hand, *decimal* floating-point literals are parsed
directly into target format and stored that way in a OP_DECFLOAT
expression node. In order to eliminate the DOUBLEST, this patch
therefore unifies the handling of binary and decimal floating-
point literals and stores them both in target format within a
new OP_FLOAT expression node, replacing both OP_DOUBLE and
OP_DECFLOAT.
In order to store literals in target format, the parse_float
routine needs to know the type of the literal. All parsers
therefore need to be changed to determine the appropriate type
(e.g. by detecting suffixes) *before* calling parse_float,
instead of after it as today. However, this change is mostly
straightforward -- again, this is already done for decimal FP
today.
The core of the literal parsing is moved into a new routine
floatformat_from_string, mirroring floatformat_to_string.
The parse_float routine now calls either floatformat_from_string
or decimal_from_sting, allowing it to handle any type of FP
literal.
All language parsers need to be updated. Some notes on
specific changes to the various languages:
- C: Decimal FP is now handled in parse_float, and no longer
needs to be handled specially.
- D: Straightforward.
- Fortran: Still used a hard-coded "atof", also replaced by
parse_float now. Continues to always use builtin_real_s8
as the type of literal, even though this is probably wrong.
- Go: This used to handle "f" and "l" suffixes, even though
the Go language actually doesn't support those. I kept this
support for now -- maybe revisit later. Note the the GDB
test suite for some reason actually *verifies* that GDB supports
those unsupported suffixes ...
- Pascal: Likewise -- this handles suffixes that are not
supported in the language standard.
- Modula-2: Like Fortran, used to use "atof".
- Rust: Mostly straightforward, except for a unit-testing hitch.
The code use to set a special "unit_testing" flag which would
cause "rust_type" to always return NULL. This makes it not
possible to encode a literal into target format (which type?).
The reason for this flag appears to have been that during
unit testing, there is no "rust_parser" context set up, which
means no "gdbarch" is available to use its types. To fix this,
I removed the unit_testing flag, and instead simply just set up
a dummy rust_parser context during unit testing.
- Ada: This used to check sizeof (DOUBLEST) to determine which
type to use for floating-point literal. This seems questionable
to begin with (since DOUBLEST is quite unrelated to target formats),
and in any case we need to get rid of DOUBLEST. I'm now simply
always using the largest type (builtin_long_double).
gdb/ChangeLog:
2017-10-25 Ulrich Weigand <uweigand@de.ibm.com>
* doublest.c (floatformat_from_string): New function.
* doublest.h (floatformat_from_string): Add prototype.
* std-operator.def (OP_DOUBLE, OP_DECFLOAT): Remove, replace by ...
(OP_FLOAT): ... this.
* expression.h: Do not include "doublest.h".
(union exp_element): Replace doubleconst and decfloatconst by
new element floatconst.
* ada-lang.c (resolve_subexp): Handle OP_FLOAT instead of OP_DOUBLE.
(ada_evaluate_subexp): Likewise.
* eval.c (evaluate_subexp_standard): Handle OP_FLOAT instead of
OP_DOUBLE and OP_DECFLOAT.
* expprint.c (print_subexp_standard): Likewise.
(dump_subexp_body_standard): Likewise.
* breakpoint.c (watchpoint_exp_is_const): Likewise.
* parse.c: Include "dfp.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): New function.
(operator_length_standard): Handle OP_FLOAT instead of OP_DOUBLE
and OP_DECFLOAT.
(operator_check_standard): Likewise.
(parse_float): Do not accept suffix. Take type as input. Return bool.
Return target format buffer instead of host DOUBLEST.
Use floatformat_from_string and decimal_from_string to parse
either binary or decimal floating-point types.
(parse_c_float): Remove.
* parser-defs.h: Do not include "doublest.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): Add prototype.
(parse_float): Update prototype.
(parse_c_float): Remove.
* c-exp.y: Do not include "dfp.h".
(typed_val_float): Use byte buffer instead of DOUBLEST.
(typed_val_decfloat): Remove.
(DECFLOAT): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
Handle decimal and binary FP types the same way.
* d-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT_LITERAL): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* f-exp.y: Replace dval by typed_val_float.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Use parse_float instead of atof.
* go-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(parse_go_float): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of parse_go_float.
Parse suffixes and determine type before calling parse_float.
* p-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* m2-exp.y: Replace dval by byte buffer val.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of atof.
* rust-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(lex_number): Call parse_float instead of strtod.
(ast_dliteral): Use OP_FLOAT instead of OP_DOUBLE.
(convert_ast_to_expression): Handle OP_FLOAT instead of OP_DOUBLE.
Use write_exp_elt_floatcst.
(unit_testing): Remove static variable.
(rust_type): Do not check unit_testing.
(rust_lex_tests): Do not set uint_testing. Set up dummy rust_parser.
* ada-exp.y (type_float, type_double): Remove.
(typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
* ada-lex.l (processReal): Use parse_float instead of sscanf.
2017-10-25 21:32:23 +08:00
|
|
|
|
write_exp_elt_floatcst (pstate, $1.val);
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_FLOAT); }
|
2014-06-20 02:29:26 +08:00
|
|
|
|
| CHARACTER_LITERAL
|
|
|
|
|
{ struct stoken_vector vec;
|
|
|
|
|
vec.len = 1;
|
|
|
|
|
vec.tokens = &$1;
|
|
|
|
|
write_exp_string_vector (pstate, $1.type, &vec); }
|
|
|
|
|
| StringExp
|
|
|
|
|
{ int i;
|
|
|
|
|
write_exp_string_vector (pstate, 0, &$1);
|
|
|
|
|
for (i = 0; i < $1.len; ++i)
|
|
|
|
|
free ($1.tokens[i].ptr);
|
|
|
|
|
free ($1.tokens); }
|
|
|
|
|
| ArrayLiteral
|
|
|
|
|
{ write_exp_elt_opcode (pstate, OP_ARRAY);
|
|
|
|
|
write_exp_elt_longcst (pstate, (LONGEST) 0);
|
|
|
|
|
write_exp_elt_longcst (pstate, (LONGEST) $1 - 1);
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_ARRAY); }
|
2015-10-09 03:38:05 +08:00
|
|
|
|
| TYPEOF_KEYWORD '(' Expression ')'
|
|
|
|
|
{ write_exp_elt_opcode (pstate, OP_TYPEOF); }
|
2014-06-20 02:29:26 +08:00
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
ArrayLiteral:
|
|
|
|
|
'[' ArgumentList_opt ']'
|
2019-03-25 11:38:40 +08:00
|
|
|
|
{ $$ = pstate->arglist_len; }
|
2014-06-20 02:29:26 +08:00
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
IdentifierExp:
|
|
|
|
|
IDENTIFIER
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
StringExp:
|
|
|
|
|
STRING_LITERAL
|
|
|
|
|
{ /* We copy the string here, and not in the
|
|
|
|
|
lexer, to guarantee that we do not leak a
|
|
|
|
|
string. Note that we follow the
|
|
|
|
|
NUL-termination convention of the
|
|
|
|
|
lexer. */
|
|
|
|
|
struct typed_stoken *vec = XNEW (struct typed_stoken);
|
|
|
|
|
$$.len = 1;
|
|
|
|
|
$$.tokens = vec;
|
|
|
|
|
|
|
|
|
|
vec->type = $1.type;
|
|
|
|
|
vec->length = $1.length;
|
2015-09-26 02:08:06 +08:00
|
|
|
|
vec->ptr = (char *) malloc ($1.length + 1);
|
2014-06-20 02:29:26 +08:00
|
|
|
|
memcpy (vec->ptr, $1.ptr, $1.length + 1);
|
|
|
|
|
}
|
|
|
|
|
| StringExp STRING_LITERAL
|
|
|
|
|
{ /* Note that we NUL-terminate here, but just
|
|
|
|
|
for convenience. */
|
|
|
|
|
char *p;
|
|
|
|
|
++$$.len;
|
2015-09-26 02:08:06 +08:00
|
|
|
|
$$.tokens
|
|
|
|
|
= XRESIZEVEC (struct typed_stoken, $$.tokens, $$.len);
|
2014-06-20 02:29:26 +08:00
|
|
|
|
|
2015-09-26 02:08:06 +08:00
|
|
|
|
p = (char *) malloc ($2.length + 1);
|
2014-06-20 02:29:26 +08:00
|
|
|
|
memcpy (p, $2.ptr, $2.length + 1);
|
|
|
|
|
|
|
|
|
|
$$.tokens[$$.len - 1].type = $2.type;
|
|
|
|
|
$$.tokens[$$.len - 1].length = $2.length;
|
|
|
|
|
$$.tokens[$$.len - 1].ptr = p;
|
|
|
|
|
}
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
TypeExp:
|
2015-08-14 03:35:09 +08:00
|
|
|
|
'(' TypeExp ')'
|
|
|
|
|
{ /* Do nothing. */ }
|
|
|
|
|
| BasicType
|
2014-06-20 02:29:26 +08:00
|
|
|
|
{ write_exp_elt_opcode (pstate, OP_TYPE);
|
|
|
|
|
write_exp_elt_type (pstate, $1);
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_TYPE); }
|
|
|
|
|
| BasicType BasicType2
|
Move type stack handling to a new class
This introduces a new "type_stack" class, and moves all the parser
type stack handling to this class. Parsers that wish to use this
facility must now instantiate this class somehow. I chose this
approach because a minority of the existing parsers require this.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* type-stack.h: New file.
* type-stack.c: New file.
* parser-defs.h (enum type_pieces, union type_stack_elt): Move to
type-stack.h.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Don't declare.
* parse.c (type_stack): Remove global.
(parse_exp_in_context): Update.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Remove (moved to
type-stack.c).
* f-exp.y (type_stack): New global.
Update rules.
(push_kind_type, f_parse): Update.
* d-exp.y (type_stack): New global.
Update rules.
(d_parse): Update.
* c-exp.y (struct c_parse_state) <type_stack>: New member.
Update rules.
* Makefile.in (COMMON_SFILES): Add type-stack.c.
(HFILES_NO_SRCDIR): Add type-stack.h.
2019-04-01 03:43:54 +08:00
|
|
|
|
{ $$ = type_stack->follow_types ($1);
|
2014-06-20 02:29:26 +08:00
|
|
|
|
write_exp_elt_opcode (pstate, OP_TYPE);
|
|
|
|
|
write_exp_elt_type (pstate, $$);
|
|
|
|
|
write_exp_elt_opcode (pstate, OP_TYPE);
|
|
|
|
|
}
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
BasicType2:
|
|
|
|
|
'*'
|
Move type stack handling to a new class
This introduces a new "type_stack" class, and moves all the parser
type stack handling to this class. Parsers that wish to use this
facility must now instantiate this class somehow. I chose this
approach because a minority of the existing parsers require this.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* type-stack.h: New file.
* type-stack.c: New file.
* parser-defs.h (enum type_pieces, union type_stack_elt): Move to
type-stack.h.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Don't declare.
* parse.c (type_stack): Remove global.
(parse_exp_in_context): Update.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Remove (moved to
type-stack.c).
* f-exp.y (type_stack): New global.
Update rules.
(push_kind_type, f_parse): Update.
* d-exp.y (type_stack): New global.
Update rules.
(d_parse): Update.
* c-exp.y (struct c_parse_state) <type_stack>: New member.
Update rules.
* Makefile.in (COMMON_SFILES): Add type-stack.c.
(HFILES_NO_SRCDIR): Add type-stack.h.
2019-04-01 03:43:54 +08:00
|
|
|
|
{ type_stack->push (tp_pointer); }
|
2014-06-20 02:29:26 +08:00
|
|
|
|
| '*' BasicType2
|
Move type stack handling to a new class
This introduces a new "type_stack" class, and moves all the parser
type stack handling to this class. Parsers that wish to use this
facility must now instantiate this class somehow. I chose this
approach because a minority of the existing parsers require this.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* type-stack.h: New file.
* type-stack.c: New file.
* parser-defs.h (enum type_pieces, union type_stack_elt): Move to
type-stack.h.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Don't declare.
* parse.c (type_stack): Remove global.
(parse_exp_in_context): Update.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Remove (moved to
type-stack.c).
* f-exp.y (type_stack): New global.
Update rules.
(push_kind_type, f_parse): Update.
* d-exp.y (type_stack): New global.
Update rules.
(d_parse): Update.
* c-exp.y (struct c_parse_state) <type_stack>: New member.
Update rules.
* Makefile.in (COMMON_SFILES): Add type-stack.c.
(HFILES_NO_SRCDIR): Add type-stack.h.
2019-04-01 03:43:54 +08:00
|
|
|
|
{ type_stack->push (tp_pointer); }
|
2014-06-20 02:29:26 +08:00
|
|
|
|
| '[' INTEGER_LITERAL ']'
|
Move type stack handling to a new class
This introduces a new "type_stack" class, and moves all the parser
type stack handling to this class. Parsers that wish to use this
facility must now instantiate this class somehow. I chose this
approach because a minority of the existing parsers require this.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* type-stack.h: New file.
* type-stack.c: New file.
* parser-defs.h (enum type_pieces, union type_stack_elt): Move to
type-stack.h.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Don't declare.
* parse.c (type_stack): Remove global.
(parse_exp_in_context): Update.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Remove (moved to
type-stack.c).
* f-exp.y (type_stack): New global.
Update rules.
(push_kind_type, f_parse): Update.
* d-exp.y (type_stack): New global.
Update rules.
(d_parse): Update.
* c-exp.y (struct c_parse_state) <type_stack>: New member.
Update rules.
* Makefile.in (COMMON_SFILES): Add type-stack.c.
(HFILES_NO_SRCDIR): Add type-stack.h.
2019-04-01 03:43:54 +08:00
|
|
|
|
{ type_stack->push ($2.val);
|
|
|
|
|
type_stack->push (tp_array); }
|
2014-06-20 02:29:26 +08:00
|
|
|
|
| '[' INTEGER_LITERAL ']' BasicType2
|
Move type stack handling to a new class
This introduces a new "type_stack" class, and moves all the parser
type stack handling to this class. Parsers that wish to use this
facility must now instantiate this class somehow. I chose this
approach because a minority of the existing parsers require this.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* type-stack.h: New file.
* type-stack.c: New file.
* parser-defs.h (enum type_pieces, union type_stack_elt): Move to
type-stack.h.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Don't declare.
* parse.c (type_stack): Remove global.
(parse_exp_in_context): Update.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Remove (moved to
type-stack.c).
* f-exp.y (type_stack): New global.
Update rules.
(push_kind_type, f_parse): Update.
* d-exp.y (type_stack): New global.
Update rules.
(d_parse): Update.
* c-exp.y (struct c_parse_state) <type_stack>: New member.
Update rules.
* Makefile.in (COMMON_SFILES): Add type-stack.c.
(HFILES_NO_SRCDIR): Add type-stack.h.
2019-04-01 03:43:54 +08:00
|
|
|
|
{ type_stack->push ($2.val);
|
|
|
|
|
type_stack->push (tp_array); }
|
2014-06-20 02:29:26 +08:00
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
BasicType:
|
|
|
|
|
TYPENAME
|
|
|
|
|
{ $$ = $1.type; }
|
|
|
|
|
;
|
|
|
|
|
|
|
|
|
|
%%
|
|
|
|
|
|
2015-08-18 03:45:42 +08:00
|
|
|
|
/* Return true if the type is aggregate-like. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
type_aggregate_p (struct type *type)
|
|
|
|
|
{
|
|
|
|
|
return (TYPE_CODE (type) == TYPE_CODE_STRUCT
|
|
|
|
|
|| TYPE_CODE (type) == TYPE_CODE_UNION
|
2017-03-30 16:43:03 +08:00
|
|
|
|
|| TYPE_CODE (type) == TYPE_CODE_MODULE
|
2015-08-18 03:45:42 +08:00
|
|
|
|
|| (TYPE_CODE (type) == TYPE_CODE_ENUM
|
|
|
|
|
&& TYPE_DECLARED_CLASS (type)));
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-20 02:29:26 +08:00
|
|
|
|
/* Take care of parsing a number (anything that starts with a digit).
|
|
|
|
|
Set yylval and return the token type; update lexptr.
|
|
|
|
|
LEN is the number of characters in it. */
|
|
|
|
|
|
|
|
|
|
/*** Needs some error checking for the float case ***/
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
parse_number (struct parser_state *ps, const char *p,
|
|
|
|
|
int len, int parsed_float, YYSTYPE *putithere)
|
|
|
|
|
{
|
|
|
|
|
ULONGEST n = 0;
|
|
|
|
|
ULONGEST prevn = 0;
|
|
|
|
|
ULONGEST un;
|
|
|
|
|
|
|
|
|
|
int i = 0;
|
|
|
|
|
int c;
|
|
|
|
|
int base = input_radix;
|
|
|
|
|
int unsigned_p = 0;
|
|
|
|
|
int long_p = 0;
|
|
|
|
|
|
|
|
|
|
/* We have found a "L" or "U" suffix. */
|
|
|
|
|
int found_suffix = 0;
|
|
|
|
|
|
|
|
|
|
ULONGEST high_bit;
|
|
|
|
|
struct type *signed_type;
|
|
|
|
|
struct type *unsigned_type;
|
|
|
|
|
|
|
|
|
|
if (parsed_float)
|
|
|
|
|
{
|
|
|
|
|
char *s, *sp;
|
|
|
|
|
|
|
|
|
|
/* Strip out all embedded '_' before passing to parse_float. */
|
|
|
|
|
s = (char *) alloca (len + 1);
|
|
|
|
|
sp = s;
|
|
|
|
|
while (len-- > 0)
|
|
|
|
|
{
|
|
|
|
|
if (*p != '_')
|
|
|
|
|
*sp++ = *p;
|
|
|
|
|
p++;
|
|
|
|
|
}
|
|
|
|
|
*sp = '\0';
|
|
|
|
|
len = strlen (s);
|
|
|
|
|
|
Target FP: Use target format throughout expression parsing
When parsing floating-point literals, the language parsers currently
use parse_float or some equivalent routine to parse the input string
into a DOUBLEST, which is then stored within a OP_DOUBLE expression
node. When evaluating the expression, the OP_DOUBLE is finally
converted into a value in target format.
On the other hand, *decimal* floating-point literals are parsed
directly into target format and stored that way in a OP_DECFLOAT
expression node. In order to eliminate the DOUBLEST, this patch
therefore unifies the handling of binary and decimal floating-
point literals and stores them both in target format within a
new OP_FLOAT expression node, replacing both OP_DOUBLE and
OP_DECFLOAT.
In order to store literals in target format, the parse_float
routine needs to know the type of the literal. All parsers
therefore need to be changed to determine the appropriate type
(e.g. by detecting suffixes) *before* calling parse_float,
instead of after it as today. However, this change is mostly
straightforward -- again, this is already done for decimal FP
today.
The core of the literal parsing is moved into a new routine
floatformat_from_string, mirroring floatformat_to_string.
The parse_float routine now calls either floatformat_from_string
or decimal_from_sting, allowing it to handle any type of FP
literal.
All language parsers need to be updated. Some notes on
specific changes to the various languages:
- C: Decimal FP is now handled in parse_float, and no longer
needs to be handled specially.
- D: Straightforward.
- Fortran: Still used a hard-coded "atof", also replaced by
parse_float now. Continues to always use builtin_real_s8
as the type of literal, even though this is probably wrong.
- Go: This used to handle "f" and "l" suffixes, even though
the Go language actually doesn't support those. I kept this
support for now -- maybe revisit later. Note the the GDB
test suite for some reason actually *verifies* that GDB supports
those unsupported suffixes ...
- Pascal: Likewise -- this handles suffixes that are not
supported in the language standard.
- Modula-2: Like Fortran, used to use "atof".
- Rust: Mostly straightforward, except for a unit-testing hitch.
The code use to set a special "unit_testing" flag which would
cause "rust_type" to always return NULL. This makes it not
possible to encode a literal into target format (which type?).
The reason for this flag appears to have been that during
unit testing, there is no "rust_parser" context set up, which
means no "gdbarch" is available to use its types. To fix this,
I removed the unit_testing flag, and instead simply just set up
a dummy rust_parser context during unit testing.
- Ada: This used to check sizeof (DOUBLEST) to determine which
type to use for floating-point literal. This seems questionable
to begin with (since DOUBLEST is quite unrelated to target formats),
and in any case we need to get rid of DOUBLEST. I'm now simply
always using the largest type (builtin_long_double).
gdb/ChangeLog:
2017-10-25 Ulrich Weigand <uweigand@de.ibm.com>
* doublest.c (floatformat_from_string): New function.
* doublest.h (floatformat_from_string): Add prototype.
* std-operator.def (OP_DOUBLE, OP_DECFLOAT): Remove, replace by ...
(OP_FLOAT): ... this.
* expression.h: Do not include "doublest.h".
(union exp_element): Replace doubleconst and decfloatconst by
new element floatconst.
* ada-lang.c (resolve_subexp): Handle OP_FLOAT instead of OP_DOUBLE.
(ada_evaluate_subexp): Likewise.
* eval.c (evaluate_subexp_standard): Handle OP_FLOAT instead of
OP_DOUBLE and OP_DECFLOAT.
* expprint.c (print_subexp_standard): Likewise.
(dump_subexp_body_standard): Likewise.
* breakpoint.c (watchpoint_exp_is_const): Likewise.
* parse.c: Include "dfp.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): New function.
(operator_length_standard): Handle OP_FLOAT instead of OP_DOUBLE
and OP_DECFLOAT.
(operator_check_standard): Likewise.
(parse_float): Do not accept suffix. Take type as input. Return bool.
Return target format buffer instead of host DOUBLEST.
Use floatformat_from_string and decimal_from_string to parse
either binary or decimal floating-point types.
(parse_c_float): Remove.
* parser-defs.h: Do not include "doublest.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): Add prototype.
(parse_float): Update prototype.
(parse_c_float): Remove.
* c-exp.y: Do not include "dfp.h".
(typed_val_float): Use byte buffer instead of DOUBLEST.
(typed_val_decfloat): Remove.
(DECFLOAT): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
Handle decimal and binary FP types the same way.
* d-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT_LITERAL): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* f-exp.y: Replace dval by typed_val_float.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Use parse_float instead of atof.
* go-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(parse_go_float): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of parse_go_float.
Parse suffixes and determine type before calling parse_float.
* p-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* m2-exp.y: Replace dval by byte buffer val.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of atof.
* rust-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(lex_number): Call parse_float instead of strtod.
(ast_dliteral): Use OP_FLOAT instead of OP_DOUBLE.
(convert_ast_to_expression): Handle OP_FLOAT instead of OP_DOUBLE.
Use write_exp_elt_floatcst.
(unit_testing): Remove static variable.
(rust_type): Do not check unit_testing.
(rust_lex_tests): Do not set uint_testing. Set up dummy rust_parser.
* ada-exp.y (type_float, type_double): Remove.
(typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
* ada-lex.l (processReal): Use parse_float instead of sscanf.
2017-10-25 21:32:23 +08:00
|
|
|
|
/* Check suffix for `i' , `fi' or `li' (idouble, ifloat or ireal). */
|
|
|
|
|
if (len >= 1 && tolower (s[len - 1]) == 'i')
|
2014-06-20 02:29:26 +08:00
|
|
|
|
{
|
Target FP: Use target format throughout expression parsing
When parsing floating-point literals, the language parsers currently
use parse_float or some equivalent routine to parse the input string
into a DOUBLEST, which is then stored within a OP_DOUBLE expression
node. When evaluating the expression, the OP_DOUBLE is finally
converted into a value in target format.
On the other hand, *decimal* floating-point literals are parsed
directly into target format and stored that way in a OP_DECFLOAT
expression node. In order to eliminate the DOUBLEST, this patch
therefore unifies the handling of binary and decimal floating-
point literals and stores them both in target format within a
new OP_FLOAT expression node, replacing both OP_DOUBLE and
OP_DECFLOAT.
In order to store literals in target format, the parse_float
routine needs to know the type of the literal. All parsers
therefore need to be changed to determine the appropriate type
(e.g. by detecting suffixes) *before* calling parse_float,
instead of after it as today. However, this change is mostly
straightforward -- again, this is already done for decimal FP
today.
The core of the literal parsing is moved into a new routine
floatformat_from_string, mirroring floatformat_to_string.
The parse_float routine now calls either floatformat_from_string
or decimal_from_sting, allowing it to handle any type of FP
literal.
All language parsers need to be updated. Some notes on
specific changes to the various languages:
- C: Decimal FP is now handled in parse_float, and no longer
needs to be handled specially.
- D: Straightforward.
- Fortran: Still used a hard-coded "atof", also replaced by
parse_float now. Continues to always use builtin_real_s8
as the type of literal, even though this is probably wrong.
- Go: This used to handle "f" and "l" suffixes, even though
the Go language actually doesn't support those. I kept this
support for now -- maybe revisit later. Note the the GDB
test suite for some reason actually *verifies* that GDB supports
those unsupported suffixes ...
- Pascal: Likewise -- this handles suffixes that are not
supported in the language standard.
- Modula-2: Like Fortran, used to use "atof".
- Rust: Mostly straightforward, except for a unit-testing hitch.
The code use to set a special "unit_testing" flag which would
cause "rust_type" to always return NULL. This makes it not
possible to encode a literal into target format (which type?).
The reason for this flag appears to have been that during
unit testing, there is no "rust_parser" context set up, which
means no "gdbarch" is available to use its types. To fix this,
I removed the unit_testing flag, and instead simply just set up
a dummy rust_parser context during unit testing.
- Ada: This used to check sizeof (DOUBLEST) to determine which
type to use for floating-point literal. This seems questionable
to begin with (since DOUBLEST is quite unrelated to target formats),
and in any case we need to get rid of DOUBLEST. I'm now simply
always using the largest type (builtin_long_double).
gdb/ChangeLog:
2017-10-25 Ulrich Weigand <uweigand@de.ibm.com>
* doublest.c (floatformat_from_string): New function.
* doublest.h (floatformat_from_string): Add prototype.
* std-operator.def (OP_DOUBLE, OP_DECFLOAT): Remove, replace by ...
(OP_FLOAT): ... this.
* expression.h: Do not include "doublest.h".
(union exp_element): Replace doubleconst and decfloatconst by
new element floatconst.
* ada-lang.c (resolve_subexp): Handle OP_FLOAT instead of OP_DOUBLE.
(ada_evaluate_subexp): Likewise.
* eval.c (evaluate_subexp_standard): Handle OP_FLOAT instead of
OP_DOUBLE and OP_DECFLOAT.
* expprint.c (print_subexp_standard): Likewise.
(dump_subexp_body_standard): Likewise.
* breakpoint.c (watchpoint_exp_is_const): Likewise.
* parse.c: Include "dfp.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): New function.
(operator_length_standard): Handle OP_FLOAT instead of OP_DOUBLE
and OP_DECFLOAT.
(operator_check_standard): Likewise.
(parse_float): Do not accept suffix. Take type as input. Return bool.
Return target format buffer instead of host DOUBLEST.
Use floatformat_from_string and decimal_from_string to parse
either binary or decimal floating-point types.
(parse_c_float): Remove.
* parser-defs.h: Do not include "doublest.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): Add prototype.
(parse_float): Update prototype.
(parse_c_float): Remove.
* c-exp.y: Do not include "dfp.h".
(typed_val_float): Use byte buffer instead of DOUBLEST.
(typed_val_decfloat): Remove.
(DECFLOAT): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
Handle decimal and binary FP types the same way.
* d-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT_LITERAL): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* f-exp.y: Replace dval by typed_val_float.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Use parse_float instead of atof.
* go-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(parse_go_float): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of parse_go_float.
Parse suffixes and determine type before calling parse_float.
* p-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* m2-exp.y: Replace dval by byte buffer val.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of atof.
* rust-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(lex_number): Call parse_float instead of strtod.
(ast_dliteral): Use OP_FLOAT instead of OP_DOUBLE.
(convert_ast_to_expression): Handle OP_FLOAT instead of OP_DOUBLE.
Use write_exp_elt_floatcst.
(unit_testing): Remove static variable.
(rust_type): Do not check unit_testing.
(rust_lex_tests): Do not set uint_testing. Set up dummy rust_parser.
* ada-exp.y (type_float, type_double): Remove.
(typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
* ada-lex.l (processReal): Use parse_float instead of sscanf.
2017-10-25 21:32:23 +08:00
|
|
|
|
if (len >= 2 && tolower (s[len - 2]) == 'f')
|
2014-06-20 02:29:26 +08:00
|
|
|
|
{
|
|
|
|
|
putithere->typed_val_float.type
|
Target FP: Use target format throughout expression parsing
When parsing floating-point literals, the language parsers currently
use parse_float or some equivalent routine to parse the input string
into a DOUBLEST, which is then stored within a OP_DOUBLE expression
node. When evaluating the expression, the OP_DOUBLE is finally
converted into a value in target format.
On the other hand, *decimal* floating-point literals are parsed
directly into target format and stored that way in a OP_DECFLOAT
expression node. In order to eliminate the DOUBLEST, this patch
therefore unifies the handling of binary and decimal floating-
point literals and stores them both in target format within a
new OP_FLOAT expression node, replacing both OP_DOUBLE and
OP_DECFLOAT.
In order to store literals in target format, the parse_float
routine needs to know the type of the literal. All parsers
therefore need to be changed to determine the appropriate type
(e.g. by detecting suffixes) *before* calling parse_float,
instead of after it as today. However, this change is mostly
straightforward -- again, this is already done for decimal FP
today.
The core of the literal parsing is moved into a new routine
floatformat_from_string, mirroring floatformat_to_string.
The parse_float routine now calls either floatformat_from_string
or decimal_from_sting, allowing it to handle any type of FP
literal.
All language parsers need to be updated. Some notes on
specific changes to the various languages:
- C: Decimal FP is now handled in parse_float, and no longer
needs to be handled specially.
- D: Straightforward.
- Fortran: Still used a hard-coded "atof", also replaced by
parse_float now. Continues to always use builtin_real_s8
as the type of literal, even though this is probably wrong.
- Go: This used to handle "f" and "l" suffixes, even though
the Go language actually doesn't support those. I kept this
support for now -- maybe revisit later. Note the the GDB
test suite for some reason actually *verifies* that GDB supports
those unsupported suffixes ...
- Pascal: Likewise -- this handles suffixes that are not
supported in the language standard.
- Modula-2: Like Fortran, used to use "atof".
- Rust: Mostly straightforward, except for a unit-testing hitch.
The code use to set a special "unit_testing" flag which would
cause "rust_type" to always return NULL. This makes it not
possible to encode a literal into target format (which type?).
The reason for this flag appears to have been that during
unit testing, there is no "rust_parser" context set up, which
means no "gdbarch" is available to use its types. To fix this,
I removed the unit_testing flag, and instead simply just set up
a dummy rust_parser context during unit testing.
- Ada: This used to check sizeof (DOUBLEST) to determine which
type to use for floating-point literal. This seems questionable
to begin with (since DOUBLEST is quite unrelated to target formats),
and in any case we need to get rid of DOUBLEST. I'm now simply
always using the largest type (builtin_long_double).
gdb/ChangeLog:
2017-10-25 Ulrich Weigand <uweigand@de.ibm.com>
* doublest.c (floatformat_from_string): New function.
* doublest.h (floatformat_from_string): Add prototype.
* std-operator.def (OP_DOUBLE, OP_DECFLOAT): Remove, replace by ...
(OP_FLOAT): ... this.
* expression.h: Do not include "doublest.h".
(union exp_element): Replace doubleconst and decfloatconst by
new element floatconst.
* ada-lang.c (resolve_subexp): Handle OP_FLOAT instead of OP_DOUBLE.
(ada_evaluate_subexp): Likewise.
* eval.c (evaluate_subexp_standard): Handle OP_FLOAT instead of
OP_DOUBLE and OP_DECFLOAT.
* expprint.c (print_subexp_standard): Likewise.
(dump_subexp_body_standard): Likewise.
* breakpoint.c (watchpoint_exp_is_const): Likewise.
* parse.c: Include "dfp.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): New function.
(operator_length_standard): Handle OP_FLOAT instead of OP_DOUBLE
and OP_DECFLOAT.
(operator_check_standard): Likewise.
(parse_float): Do not accept suffix. Take type as input. Return bool.
Return target format buffer instead of host DOUBLEST.
Use floatformat_from_string and decimal_from_string to parse
either binary or decimal floating-point types.
(parse_c_float): Remove.
* parser-defs.h: Do not include "doublest.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): Add prototype.
(parse_float): Update prototype.
(parse_c_float): Remove.
* c-exp.y: Do not include "dfp.h".
(typed_val_float): Use byte buffer instead of DOUBLEST.
(typed_val_decfloat): Remove.
(DECFLOAT): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
Handle decimal and binary FP types the same way.
* d-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT_LITERAL): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* f-exp.y: Replace dval by typed_val_float.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Use parse_float instead of atof.
* go-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(parse_go_float): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of parse_go_float.
Parse suffixes and determine type before calling parse_float.
* p-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* m2-exp.y: Replace dval by byte buffer val.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of atof.
* rust-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(lex_number): Call parse_float instead of strtod.
(ast_dliteral): Use OP_FLOAT instead of OP_DOUBLE.
(convert_ast_to_expression): Handle OP_FLOAT instead of OP_DOUBLE.
Use write_exp_elt_floatcst.
(unit_testing): Remove static variable.
(rust_type): Do not check unit_testing.
(rust_lex_tests): Do not set uint_testing. Set up dummy rust_parser.
* ada-exp.y (type_float, type_double): Remove.
(typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
* ada-lex.l (processReal): Use parse_float instead of sscanf.
2017-10-25 21:32:23 +08:00
|
|
|
|
= parse_d_type (ps)->builtin_ifloat;
|
|
|
|
|
len -= 2;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
}
|
Target FP: Use target format throughout expression parsing
When parsing floating-point literals, the language parsers currently
use parse_float or some equivalent routine to parse the input string
into a DOUBLEST, which is then stored within a OP_DOUBLE expression
node. When evaluating the expression, the OP_DOUBLE is finally
converted into a value in target format.
On the other hand, *decimal* floating-point literals are parsed
directly into target format and stored that way in a OP_DECFLOAT
expression node. In order to eliminate the DOUBLEST, this patch
therefore unifies the handling of binary and decimal floating-
point literals and stores them both in target format within a
new OP_FLOAT expression node, replacing both OP_DOUBLE and
OP_DECFLOAT.
In order to store literals in target format, the parse_float
routine needs to know the type of the literal. All parsers
therefore need to be changed to determine the appropriate type
(e.g. by detecting suffixes) *before* calling parse_float,
instead of after it as today. However, this change is mostly
straightforward -- again, this is already done for decimal FP
today.
The core of the literal parsing is moved into a new routine
floatformat_from_string, mirroring floatformat_to_string.
The parse_float routine now calls either floatformat_from_string
or decimal_from_sting, allowing it to handle any type of FP
literal.
All language parsers need to be updated. Some notes on
specific changes to the various languages:
- C: Decimal FP is now handled in parse_float, and no longer
needs to be handled specially.
- D: Straightforward.
- Fortran: Still used a hard-coded "atof", also replaced by
parse_float now. Continues to always use builtin_real_s8
as the type of literal, even though this is probably wrong.
- Go: This used to handle "f" and "l" suffixes, even though
the Go language actually doesn't support those. I kept this
support for now -- maybe revisit later. Note the the GDB
test suite for some reason actually *verifies* that GDB supports
those unsupported suffixes ...
- Pascal: Likewise -- this handles suffixes that are not
supported in the language standard.
- Modula-2: Like Fortran, used to use "atof".
- Rust: Mostly straightforward, except for a unit-testing hitch.
The code use to set a special "unit_testing" flag which would
cause "rust_type" to always return NULL. This makes it not
possible to encode a literal into target format (which type?).
The reason for this flag appears to have been that during
unit testing, there is no "rust_parser" context set up, which
means no "gdbarch" is available to use its types. To fix this,
I removed the unit_testing flag, and instead simply just set up
a dummy rust_parser context during unit testing.
- Ada: This used to check sizeof (DOUBLEST) to determine which
type to use for floating-point literal. This seems questionable
to begin with (since DOUBLEST is quite unrelated to target formats),
and in any case we need to get rid of DOUBLEST. I'm now simply
always using the largest type (builtin_long_double).
gdb/ChangeLog:
2017-10-25 Ulrich Weigand <uweigand@de.ibm.com>
* doublest.c (floatformat_from_string): New function.
* doublest.h (floatformat_from_string): Add prototype.
* std-operator.def (OP_DOUBLE, OP_DECFLOAT): Remove, replace by ...
(OP_FLOAT): ... this.
* expression.h: Do not include "doublest.h".
(union exp_element): Replace doubleconst and decfloatconst by
new element floatconst.
* ada-lang.c (resolve_subexp): Handle OP_FLOAT instead of OP_DOUBLE.
(ada_evaluate_subexp): Likewise.
* eval.c (evaluate_subexp_standard): Handle OP_FLOAT instead of
OP_DOUBLE and OP_DECFLOAT.
* expprint.c (print_subexp_standard): Likewise.
(dump_subexp_body_standard): Likewise.
* breakpoint.c (watchpoint_exp_is_const): Likewise.
* parse.c: Include "dfp.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): New function.
(operator_length_standard): Handle OP_FLOAT instead of OP_DOUBLE
and OP_DECFLOAT.
(operator_check_standard): Likewise.
(parse_float): Do not accept suffix. Take type as input. Return bool.
Return target format buffer instead of host DOUBLEST.
Use floatformat_from_string and decimal_from_string to parse
either binary or decimal floating-point types.
(parse_c_float): Remove.
* parser-defs.h: Do not include "doublest.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): Add prototype.
(parse_float): Update prototype.
(parse_c_float): Remove.
* c-exp.y: Do not include "dfp.h".
(typed_val_float): Use byte buffer instead of DOUBLEST.
(typed_val_decfloat): Remove.
(DECFLOAT): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
Handle decimal and binary FP types the same way.
* d-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT_LITERAL): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* f-exp.y: Replace dval by typed_val_float.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Use parse_float instead of atof.
* go-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(parse_go_float): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of parse_go_float.
Parse suffixes and determine type before calling parse_float.
* p-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* m2-exp.y: Replace dval by byte buffer val.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of atof.
* rust-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(lex_number): Call parse_float instead of strtod.
(ast_dliteral): Use OP_FLOAT instead of OP_DOUBLE.
(convert_ast_to_expression): Handle OP_FLOAT instead of OP_DOUBLE.
Use write_exp_elt_floatcst.
(unit_testing): Remove static variable.
(rust_type): Do not check unit_testing.
(rust_lex_tests): Do not set uint_testing. Set up dummy rust_parser.
* ada-exp.y (type_float, type_double): Remove.
(typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
* ada-lex.l (processReal): Use parse_float instead of sscanf.
2017-10-25 21:32:23 +08:00
|
|
|
|
else if (len >= 2 && tolower (s[len - 2]) == 'l')
|
2014-06-20 02:29:26 +08:00
|
|
|
|
{
|
|
|
|
|
putithere->typed_val_float.type
|
Target FP: Use target format throughout expression parsing
When parsing floating-point literals, the language parsers currently
use parse_float or some equivalent routine to parse the input string
into a DOUBLEST, which is then stored within a OP_DOUBLE expression
node. When evaluating the expression, the OP_DOUBLE is finally
converted into a value in target format.
On the other hand, *decimal* floating-point literals are parsed
directly into target format and stored that way in a OP_DECFLOAT
expression node. In order to eliminate the DOUBLEST, this patch
therefore unifies the handling of binary and decimal floating-
point literals and stores them both in target format within a
new OP_FLOAT expression node, replacing both OP_DOUBLE and
OP_DECFLOAT.
In order to store literals in target format, the parse_float
routine needs to know the type of the literal. All parsers
therefore need to be changed to determine the appropriate type
(e.g. by detecting suffixes) *before* calling parse_float,
instead of after it as today. However, this change is mostly
straightforward -- again, this is already done for decimal FP
today.
The core of the literal parsing is moved into a new routine
floatformat_from_string, mirroring floatformat_to_string.
The parse_float routine now calls either floatformat_from_string
or decimal_from_sting, allowing it to handle any type of FP
literal.
All language parsers need to be updated. Some notes on
specific changes to the various languages:
- C: Decimal FP is now handled in parse_float, and no longer
needs to be handled specially.
- D: Straightforward.
- Fortran: Still used a hard-coded "atof", also replaced by
parse_float now. Continues to always use builtin_real_s8
as the type of literal, even though this is probably wrong.
- Go: This used to handle "f" and "l" suffixes, even though
the Go language actually doesn't support those. I kept this
support for now -- maybe revisit later. Note the the GDB
test suite for some reason actually *verifies* that GDB supports
those unsupported suffixes ...
- Pascal: Likewise -- this handles suffixes that are not
supported in the language standard.
- Modula-2: Like Fortran, used to use "atof".
- Rust: Mostly straightforward, except for a unit-testing hitch.
The code use to set a special "unit_testing" flag which would
cause "rust_type" to always return NULL. This makes it not
possible to encode a literal into target format (which type?).
The reason for this flag appears to have been that during
unit testing, there is no "rust_parser" context set up, which
means no "gdbarch" is available to use its types. To fix this,
I removed the unit_testing flag, and instead simply just set up
a dummy rust_parser context during unit testing.
- Ada: This used to check sizeof (DOUBLEST) to determine which
type to use for floating-point literal. This seems questionable
to begin with (since DOUBLEST is quite unrelated to target formats),
and in any case we need to get rid of DOUBLEST. I'm now simply
always using the largest type (builtin_long_double).
gdb/ChangeLog:
2017-10-25 Ulrich Weigand <uweigand@de.ibm.com>
* doublest.c (floatformat_from_string): New function.
* doublest.h (floatformat_from_string): Add prototype.
* std-operator.def (OP_DOUBLE, OP_DECFLOAT): Remove, replace by ...
(OP_FLOAT): ... this.
* expression.h: Do not include "doublest.h".
(union exp_element): Replace doubleconst and decfloatconst by
new element floatconst.
* ada-lang.c (resolve_subexp): Handle OP_FLOAT instead of OP_DOUBLE.
(ada_evaluate_subexp): Likewise.
* eval.c (evaluate_subexp_standard): Handle OP_FLOAT instead of
OP_DOUBLE and OP_DECFLOAT.
* expprint.c (print_subexp_standard): Likewise.
(dump_subexp_body_standard): Likewise.
* breakpoint.c (watchpoint_exp_is_const): Likewise.
* parse.c: Include "dfp.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): New function.
(operator_length_standard): Handle OP_FLOAT instead of OP_DOUBLE
and OP_DECFLOAT.
(operator_check_standard): Likewise.
(parse_float): Do not accept suffix. Take type as input. Return bool.
Return target format buffer instead of host DOUBLEST.
Use floatformat_from_string and decimal_from_string to parse
either binary or decimal floating-point types.
(parse_c_float): Remove.
* parser-defs.h: Do not include "doublest.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): Add prototype.
(parse_float): Update prototype.
(parse_c_float): Remove.
* c-exp.y: Do not include "dfp.h".
(typed_val_float): Use byte buffer instead of DOUBLEST.
(typed_val_decfloat): Remove.
(DECFLOAT): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
Handle decimal and binary FP types the same way.
* d-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT_LITERAL): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* f-exp.y: Replace dval by typed_val_float.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Use parse_float instead of atof.
* go-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(parse_go_float): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of parse_go_float.
Parse suffixes and determine type before calling parse_float.
* p-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* m2-exp.y: Replace dval by byte buffer val.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of atof.
* rust-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(lex_number): Call parse_float instead of strtod.
(ast_dliteral): Use OP_FLOAT instead of OP_DOUBLE.
(convert_ast_to_expression): Handle OP_FLOAT instead of OP_DOUBLE.
Use write_exp_elt_floatcst.
(unit_testing): Remove static variable.
(rust_type): Do not check unit_testing.
(rust_lex_tests): Do not set uint_testing. Set up dummy rust_parser.
* ada-exp.y (type_float, type_double): Remove.
(typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
* ada-lex.l (processReal): Use parse_float instead of sscanf.
2017-10-25 21:32:23 +08:00
|
|
|
|
= parse_d_type (ps)->builtin_ireal;
|
|
|
|
|
len -= 2;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
}
|
Target FP: Use target format throughout expression parsing
When parsing floating-point literals, the language parsers currently
use parse_float or some equivalent routine to parse the input string
into a DOUBLEST, which is then stored within a OP_DOUBLE expression
node. When evaluating the expression, the OP_DOUBLE is finally
converted into a value in target format.
On the other hand, *decimal* floating-point literals are parsed
directly into target format and stored that way in a OP_DECFLOAT
expression node. In order to eliminate the DOUBLEST, this patch
therefore unifies the handling of binary and decimal floating-
point literals and stores them both in target format within a
new OP_FLOAT expression node, replacing both OP_DOUBLE and
OP_DECFLOAT.
In order to store literals in target format, the parse_float
routine needs to know the type of the literal. All parsers
therefore need to be changed to determine the appropriate type
(e.g. by detecting suffixes) *before* calling parse_float,
instead of after it as today. However, this change is mostly
straightforward -- again, this is already done for decimal FP
today.
The core of the literal parsing is moved into a new routine
floatformat_from_string, mirroring floatformat_to_string.
The parse_float routine now calls either floatformat_from_string
or decimal_from_sting, allowing it to handle any type of FP
literal.
All language parsers need to be updated. Some notes on
specific changes to the various languages:
- C: Decimal FP is now handled in parse_float, and no longer
needs to be handled specially.
- D: Straightforward.
- Fortran: Still used a hard-coded "atof", also replaced by
parse_float now. Continues to always use builtin_real_s8
as the type of literal, even though this is probably wrong.
- Go: This used to handle "f" and "l" suffixes, even though
the Go language actually doesn't support those. I kept this
support for now -- maybe revisit later. Note the the GDB
test suite for some reason actually *verifies* that GDB supports
those unsupported suffixes ...
- Pascal: Likewise -- this handles suffixes that are not
supported in the language standard.
- Modula-2: Like Fortran, used to use "atof".
- Rust: Mostly straightforward, except for a unit-testing hitch.
The code use to set a special "unit_testing" flag which would
cause "rust_type" to always return NULL. This makes it not
possible to encode a literal into target format (which type?).
The reason for this flag appears to have been that during
unit testing, there is no "rust_parser" context set up, which
means no "gdbarch" is available to use its types. To fix this,
I removed the unit_testing flag, and instead simply just set up
a dummy rust_parser context during unit testing.
- Ada: This used to check sizeof (DOUBLEST) to determine which
type to use for floating-point literal. This seems questionable
to begin with (since DOUBLEST is quite unrelated to target formats),
and in any case we need to get rid of DOUBLEST. I'm now simply
always using the largest type (builtin_long_double).
gdb/ChangeLog:
2017-10-25 Ulrich Weigand <uweigand@de.ibm.com>
* doublest.c (floatformat_from_string): New function.
* doublest.h (floatformat_from_string): Add prototype.
* std-operator.def (OP_DOUBLE, OP_DECFLOAT): Remove, replace by ...
(OP_FLOAT): ... this.
* expression.h: Do not include "doublest.h".
(union exp_element): Replace doubleconst and decfloatconst by
new element floatconst.
* ada-lang.c (resolve_subexp): Handle OP_FLOAT instead of OP_DOUBLE.
(ada_evaluate_subexp): Likewise.
* eval.c (evaluate_subexp_standard): Handle OP_FLOAT instead of
OP_DOUBLE and OP_DECFLOAT.
* expprint.c (print_subexp_standard): Likewise.
(dump_subexp_body_standard): Likewise.
* breakpoint.c (watchpoint_exp_is_const): Likewise.
* parse.c: Include "dfp.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): New function.
(operator_length_standard): Handle OP_FLOAT instead of OP_DOUBLE
and OP_DECFLOAT.
(operator_check_standard): Likewise.
(parse_float): Do not accept suffix. Take type as input. Return bool.
Return target format buffer instead of host DOUBLEST.
Use floatformat_from_string and decimal_from_string to parse
either binary or decimal floating-point types.
(parse_c_float): Remove.
* parser-defs.h: Do not include "doublest.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): Add prototype.
(parse_float): Update prototype.
(parse_c_float): Remove.
* c-exp.y: Do not include "dfp.h".
(typed_val_float): Use byte buffer instead of DOUBLEST.
(typed_val_decfloat): Remove.
(DECFLOAT): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
Handle decimal and binary FP types the same way.
* d-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT_LITERAL): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* f-exp.y: Replace dval by typed_val_float.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Use parse_float instead of atof.
* go-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(parse_go_float): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of parse_go_float.
Parse suffixes and determine type before calling parse_float.
* p-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* m2-exp.y: Replace dval by byte buffer val.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of atof.
* rust-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(lex_number): Call parse_float instead of strtod.
(ast_dliteral): Use OP_FLOAT instead of OP_DOUBLE.
(convert_ast_to_expression): Handle OP_FLOAT instead of OP_DOUBLE.
Use write_exp_elt_floatcst.
(unit_testing): Remove static variable.
(rust_type): Do not check unit_testing.
(rust_lex_tests): Do not set uint_testing. Set up dummy rust_parser.
* ada-exp.y (type_float, type_double): Remove.
(typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
* ada-lex.l (processReal): Use parse_float instead of sscanf.
2017-10-25 21:32:23 +08:00
|
|
|
|
else
|
2014-06-20 02:29:26 +08:00
|
|
|
|
{
|
|
|
|
|
putithere->typed_val_float.type
|
|
|
|
|
= parse_d_type (ps)->builtin_idouble;
|
Target FP: Use target format throughout expression parsing
When parsing floating-point literals, the language parsers currently
use parse_float or some equivalent routine to parse the input string
into a DOUBLEST, which is then stored within a OP_DOUBLE expression
node. When evaluating the expression, the OP_DOUBLE is finally
converted into a value in target format.
On the other hand, *decimal* floating-point literals are parsed
directly into target format and stored that way in a OP_DECFLOAT
expression node. In order to eliminate the DOUBLEST, this patch
therefore unifies the handling of binary and decimal floating-
point literals and stores them both in target format within a
new OP_FLOAT expression node, replacing both OP_DOUBLE and
OP_DECFLOAT.
In order to store literals in target format, the parse_float
routine needs to know the type of the literal. All parsers
therefore need to be changed to determine the appropriate type
(e.g. by detecting suffixes) *before* calling parse_float,
instead of after it as today. However, this change is mostly
straightforward -- again, this is already done for decimal FP
today.
The core of the literal parsing is moved into a new routine
floatformat_from_string, mirroring floatformat_to_string.
The parse_float routine now calls either floatformat_from_string
or decimal_from_sting, allowing it to handle any type of FP
literal.
All language parsers need to be updated. Some notes on
specific changes to the various languages:
- C: Decimal FP is now handled in parse_float, and no longer
needs to be handled specially.
- D: Straightforward.
- Fortran: Still used a hard-coded "atof", also replaced by
parse_float now. Continues to always use builtin_real_s8
as the type of literal, even though this is probably wrong.
- Go: This used to handle "f" and "l" suffixes, even though
the Go language actually doesn't support those. I kept this
support for now -- maybe revisit later. Note the the GDB
test suite for some reason actually *verifies* that GDB supports
those unsupported suffixes ...
- Pascal: Likewise -- this handles suffixes that are not
supported in the language standard.
- Modula-2: Like Fortran, used to use "atof".
- Rust: Mostly straightforward, except for a unit-testing hitch.
The code use to set a special "unit_testing" flag which would
cause "rust_type" to always return NULL. This makes it not
possible to encode a literal into target format (which type?).
The reason for this flag appears to have been that during
unit testing, there is no "rust_parser" context set up, which
means no "gdbarch" is available to use its types. To fix this,
I removed the unit_testing flag, and instead simply just set up
a dummy rust_parser context during unit testing.
- Ada: This used to check sizeof (DOUBLEST) to determine which
type to use for floating-point literal. This seems questionable
to begin with (since DOUBLEST is quite unrelated to target formats),
and in any case we need to get rid of DOUBLEST. I'm now simply
always using the largest type (builtin_long_double).
gdb/ChangeLog:
2017-10-25 Ulrich Weigand <uweigand@de.ibm.com>
* doublest.c (floatformat_from_string): New function.
* doublest.h (floatformat_from_string): Add prototype.
* std-operator.def (OP_DOUBLE, OP_DECFLOAT): Remove, replace by ...
(OP_FLOAT): ... this.
* expression.h: Do not include "doublest.h".
(union exp_element): Replace doubleconst and decfloatconst by
new element floatconst.
* ada-lang.c (resolve_subexp): Handle OP_FLOAT instead of OP_DOUBLE.
(ada_evaluate_subexp): Likewise.
* eval.c (evaluate_subexp_standard): Handle OP_FLOAT instead of
OP_DOUBLE and OP_DECFLOAT.
* expprint.c (print_subexp_standard): Likewise.
(dump_subexp_body_standard): Likewise.
* breakpoint.c (watchpoint_exp_is_const): Likewise.
* parse.c: Include "dfp.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): New function.
(operator_length_standard): Handle OP_FLOAT instead of OP_DOUBLE
and OP_DECFLOAT.
(operator_check_standard): Likewise.
(parse_float): Do not accept suffix. Take type as input. Return bool.
Return target format buffer instead of host DOUBLEST.
Use floatformat_from_string and decimal_from_string to parse
either binary or decimal floating-point types.
(parse_c_float): Remove.
* parser-defs.h: Do not include "doublest.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): Add prototype.
(parse_float): Update prototype.
(parse_c_float): Remove.
* c-exp.y: Do not include "dfp.h".
(typed_val_float): Use byte buffer instead of DOUBLEST.
(typed_val_decfloat): Remove.
(DECFLOAT): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
Handle decimal and binary FP types the same way.
* d-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT_LITERAL): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* f-exp.y: Replace dval by typed_val_float.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Use parse_float instead of atof.
* go-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(parse_go_float): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of parse_go_float.
Parse suffixes and determine type before calling parse_float.
* p-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* m2-exp.y: Replace dval by byte buffer val.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of atof.
* rust-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(lex_number): Call parse_float instead of strtod.
(ast_dliteral): Use OP_FLOAT instead of OP_DOUBLE.
(convert_ast_to_expression): Handle OP_FLOAT instead of OP_DOUBLE.
Use write_exp_elt_floatcst.
(unit_testing): Remove static variable.
(rust_type): Do not check unit_testing.
(rust_lex_tests): Do not set uint_testing. Set up dummy rust_parser.
* ada-exp.y (type_float, type_double): Remove.
(typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
* ada-lex.l (processReal): Use parse_float instead of sscanf.
2017-10-25 21:32:23 +08:00
|
|
|
|
len -= 1;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
Target FP: Use target format throughout expression parsing
When parsing floating-point literals, the language parsers currently
use parse_float or some equivalent routine to parse the input string
into a DOUBLEST, which is then stored within a OP_DOUBLE expression
node. When evaluating the expression, the OP_DOUBLE is finally
converted into a value in target format.
On the other hand, *decimal* floating-point literals are parsed
directly into target format and stored that way in a OP_DECFLOAT
expression node. In order to eliminate the DOUBLEST, this patch
therefore unifies the handling of binary and decimal floating-
point literals and stores them both in target format within a
new OP_FLOAT expression node, replacing both OP_DOUBLE and
OP_DECFLOAT.
In order to store literals in target format, the parse_float
routine needs to know the type of the literal. All parsers
therefore need to be changed to determine the appropriate type
(e.g. by detecting suffixes) *before* calling parse_float,
instead of after it as today. However, this change is mostly
straightforward -- again, this is already done for decimal FP
today.
The core of the literal parsing is moved into a new routine
floatformat_from_string, mirroring floatformat_to_string.
The parse_float routine now calls either floatformat_from_string
or decimal_from_sting, allowing it to handle any type of FP
literal.
All language parsers need to be updated. Some notes on
specific changes to the various languages:
- C: Decimal FP is now handled in parse_float, and no longer
needs to be handled specially.
- D: Straightforward.
- Fortran: Still used a hard-coded "atof", also replaced by
parse_float now. Continues to always use builtin_real_s8
as the type of literal, even though this is probably wrong.
- Go: This used to handle "f" and "l" suffixes, even though
the Go language actually doesn't support those. I kept this
support for now -- maybe revisit later. Note the the GDB
test suite for some reason actually *verifies* that GDB supports
those unsupported suffixes ...
- Pascal: Likewise -- this handles suffixes that are not
supported in the language standard.
- Modula-2: Like Fortran, used to use "atof".
- Rust: Mostly straightforward, except for a unit-testing hitch.
The code use to set a special "unit_testing" flag which would
cause "rust_type" to always return NULL. This makes it not
possible to encode a literal into target format (which type?).
The reason for this flag appears to have been that during
unit testing, there is no "rust_parser" context set up, which
means no "gdbarch" is available to use its types. To fix this,
I removed the unit_testing flag, and instead simply just set up
a dummy rust_parser context during unit testing.
- Ada: This used to check sizeof (DOUBLEST) to determine which
type to use for floating-point literal. This seems questionable
to begin with (since DOUBLEST is quite unrelated to target formats),
and in any case we need to get rid of DOUBLEST. I'm now simply
always using the largest type (builtin_long_double).
gdb/ChangeLog:
2017-10-25 Ulrich Weigand <uweigand@de.ibm.com>
* doublest.c (floatformat_from_string): New function.
* doublest.h (floatformat_from_string): Add prototype.
* std-operator.def (OP_DOUBLE, OP_DECFLOAT): Remove, replace by ...
(OP_FLOAT): ... this.
* expression.h: Do not include "doublest.h".
(union exp_element): Replace doubleconst and decfloatconst by
new element floatconst.
* ada-lang.c (resolve_subexp): Handle OP_FLOAT instead of OP_DOUBLE.
(ada_evaluate_subexp): Likewise.
* eval.c (evaluate_subexp_standard): Handle OP_FLOAT instead of
OP_DOUBLE and OP_DECFLOAT.
* expprint.c (print_subexp_standard): Likewise.
(dump_subexp_body_standard): Likewise.
* breakpoint.c (watchpoint_exp_is_const): Likewise.
* parse.c: Include "dfp.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): New function.
(operator_length_standard): Handle OP_FLOAT instead of OP_DOUBLE
and OP_DECFLOAT.
(operator_check_standard): Likewise.
(parse_float): Do not accept suffix. Take type as input. Return bool.
Return target format buffer instead of host DOUBLEST.
Use floatformat_from_string and decimal_from_string to parse
either binary or decimal floating-point types.
(parse_c_float): Remove.
* parser-defs.h: Do not include "doublest.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): Add prototype.
(parse_float): Update prototype.
(parse_c_float): Remove.
* c-exp.y: Do not include "dfp.h".
(typed_val_float): Use byte buffer instead of DOUBLEST.
(typed_val_decfloat): Remove.
(DECFLOAT): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
Handle decimal and binary FP types the same way.
* d-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT_LITERAL): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* f-exp.y: Replace dval by typed_val_float.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Use parse_float instead of atof.
* go-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(parse_go_float): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of parse_go_float.
Parse suffixes and determine type before calling parse_float.
* p-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* m2-exp.y: Replace dval by byte buffer val.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of atof.
* rust-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(lex_number): Call parse_float instead of strtod.
(ast_dliteral): Use OP_FLOAT instead of OP_DOUBLE.
(convert_ast_to_expression): Handle OP_FLOAT instead of OP_DOUBLE.
Use write_exp_elt_floatcst.
(unit_testing): Remove static variable.
(rust_type): Do not check unit_testing.
(rust_lex_tests): Do not set uint_testing. Set up dummy rust_parser.
* ada-exp.y (type_float, type_double): Remove.
(typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
* ada-lex.l (processReal): Use parse_float instead of sscanf.
2017-10-25 21:32:23 +08:00
|
|
|
|
/* Check suffix for `f' or `l'' (float or real). */
|
|
|
|
|
else if (len >= 1 && tolower (s[len - 1]) == 'f')
|
2014-06-20 02:29:26 +08:00
|
|
|
|
{
|
Target FP: Use target format throughout expression parsing
When parsing floating-point literals, the language parsers currently
use parse_float or some equivalent routine to parse the input string
into a DOUBLEST, which is then stored within a OP_DOUBLE expression
node. When evaluating the expression, the OP_DOUBLE is finally
converted into a value in target format.
On the other hand, *decimal* floating-point literals are parsed
directly into target format and stored that way in a OP_DECFLOAT
expression node. In order to eliminate the DOUBLEST, this patch
therefore unifies the handling of binary and decimal floating-
point literals and stores them both in target format within a
new OP_FLOAT expression node, replacing both OP_DOUBLE and
OP_DECFLOAT.
In order to store literals in target format, the parse_float
routine needs to know the type of the literal. All parsers
therefore need to be changed to determine the appropriate type
(e.g. by detecting suffixes) *before* calling parse_float,
instead of after it as today. However, this change is mostly
straightforward -- again, this is already done for decimal FP
today.
The core of the literal parsing is moved into a new routine
floatformat_from_string, mirroring floatformat_to_string.
The parse_float routine now calls either floatformat_from_string
or decimal_from_sting, allowing it to handle any type of FP
literal.
All language parsers need to be updated. Some notes on
specific changes to the various languages:
- C: Decimal FP is now handled in parse_float, and no longer
needs to be handled specially.
- D: Straightforward.
- Fortran: Still used a hard-coded "atof", also replaced by
parse_float now. Continues to always use builtin_real_s8
as the type of literal, even though this is probably wrong.
- Go: This used to handle "f" and "l" suffixes, even though
the Go language actually doesn't support those. I kept this
support for now -- maybe revisit later. Note the the GDB
test suite for some reason actually *verifies* that GDB supports
those unsupported suffixes ...
- Pascal: Likewise -- this handles suffixes that are not
supported in the language standard.
- Modula-2: Like Fortran, used to use "atof".
- Rust: Mostly straightforward, except for a unit-testing hitch.
The code use to set a special "unit_testing" flag which would
cause "rust_type" to always return NULL. This makes it not
possible to encode a literal into target format (which type?).
The reason for this flag appears to have been that during
unit testing, there is no "rust_parser" context set up, which
means no "gdbarch" is available to use its types. To fix this,
I removed the unit_testing flag, and instead simply just set up
a dummy rust_parser context during unit testing.
- Ada: This used to check sizeof (DOUBLEST) to determine which
type to use for floating-point literal. This seems questionable
to begin with (since DOUBLEST is quite unrelated to target formats),
and in any case we need to get rid of DOUBLEST. I'm now simply
always using the largest type (builtin_long_double).
gdb/ChangeLog:
2017-10-25 Ulrich Weigand <uweigand@de.ibm.com>
* doublest.c (floatformat_from_string): New function.
* doublest.h (floatformat_from_string): Add prototype.
* std-operator.def (OP_DOUBLE, OP_DECFLOAT): Remove, replace by ...
(OP_FLOAT): ... this.
* expression.h: Do not include "doublest.h".
(union exp_element): Replace doubleconst and decfloatconst by
new element floatconst.
* ada-lang.c (resolve_subexp): Handle OP_FLOAT instead of OP_DOUBLE.
(ada_evaluate_subexp): Likewise.
* eval.c (evaluate_subexp_standard): Handle OP_FLOAT instead of
OP_DOUBLE and OP_DECFLOAT.
* expprint.c (print_subexp_standard): Likewise.
(dump_subexp_body_standard): Likewise.
* breakpoint.c (watchpoint_exp_is_const): Likewise.
* parse.c: Include "dfp.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): New function.
(operator_length_standard): Handle OP_FLOAT instead of OP_DOUBLE
and OP_DECFLOAT.
(operator_check_standard): Likewise.
(parse_float): Do not accept suffix. Take type as input. Return bool.
Return target format buffer instead of host DOUBLEST.
Use floatformat_from_string and decimal_from_string to parse
either binary or decimal floating-point types.
(parse_c_float): Remove.
* parser-defs.h: Do not include "doublest.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): Add prototype.
(parse_float): Update prototype.
(parse_c_float): Remove.
* c-exp.y: Do not include "dfp.h".
(typed_val_float): Use byte buffer instead of DOUBLEST.
(typed_val_decfloat): Remove.
(DECFLOAT): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
Handle decimal and binary FP types the same way.
* d-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT_LITERAL): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* f-exp.y: Replace dval by typed_val_float.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Use parse_float instead of atof.
* go-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(parse_go_float): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of parse_go_float.
Parse suffixes and determine type before calling parse_float.
* p-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* m2-exp.y: Replace dval by byte buffer val.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of atof.
* rust-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(lex_number): Call parse_float instead of strtod.
(ast_dliteral): Use OP_FLOAT instead of OP_DOUBLE.
(convert_ast_to_expression): Handle OP_FLOAT instead of OP_DOUBLE.
Use write_exp_elt_floatcst.
(unit_testing): Remove static variable.
(rust_type): Do not check unit_testing.
(rust_lex_tests): Do not set uint_testing. Set up dummy rust_parser.
* ada-exp.y (type_float, type_double): Remove.
(typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
* ada-lex.l (processReal): Use parse_float instead of sscanf.
2017-10-25 21:32:23 +08:00
|
|
|
|
putithere->typed_val_float.type
|
|
|
|
|
= parse_d_type (ps)->builtin_float;
|
|
|
|
|
len -= 1;
|
|
|
|
|
}
|
|
|
|
|
else if (len >= 1 && tolower (s[len - 1]) == 'l')
|
|
|
|
|
{
|
|
|
|
|
putithere->typed_val_float.type
|
|
|
|
|
= parse_d_type (ps)->builtin_real;
|
|
|
|
|
len -= 1;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
}
|
Target FP: Use target format throughout expression parsing
When parsing floating-point literals, the language parsers currently
use parse_float or some equivalent routine to parse the input string
into a DOUBLEST, which is then stored within a OP_DOUBLE expression
node. When evaluating the expression, the OP_DOUBLE is finally
converted into a value in target format.
On the other hand, *decimal* floating-point literals are parsed
directly into target format and stored that way in a OP_DECFLOAT
expression node. In order to eliminate the DOUBLEST, this patch
therefore unifies the handling of binary and decimal floating-
point literals and stores them both in target format within a
new OP_FLOAT expression node, replacing both OP_DOUBLE and
OP_DECFLOAT.
In order to store literals in target format, the parse_float
routine needs to know the type of the literal. All parsers
therefore need to be changed to determine the appropriate type
(e.g. by detecting suffixes) *before* calling parse_float,
instead of after it as today. However, this change is mostly
straightforward -- again, this is already done for decimal FP
today.
The core of the literal parsing is moved into a new routine
floatformat_from_string, mirroring floatformat_to_string.
The parse_float routine now calls either floatformat_from_string
or decimal_from_sting, allowing it to handle any type of FP
literal.
All language parsers need to be updated. Some notes on
specific changes to the various languages:
- C: Decimal FP is now handled in parse_float, and no longer
needs to be handled specially.
- D: Straightforward.
- Fortran: Still used a hard-coded "atof", also replaced by
parse_float now. Continues to always use builtin_real_s8
as the type of literal, even though this is probably wrong.
- Go: This used to handle "f" and "l" suffixes, even though
the Go language actually doesn't support those. I kept this
support for now -- maybe revisit later. Note the the GDB
test suite for some reason actually *verifies* that GDB supports
those unsupported suffixes ...
- Pascal: Likewise -- this handles suffixes that are not
supported in the language standard.
- Modula-2: Like Fortran, used to use "atof".
- Rust: Mostly straightforward, except for a unit-testing hitch.
The code use to set a special "unit_testing" flag which would
cause "rust_type" to always return NULL. This makes it not
possible to encode a literal into target format (which type?).
The reason for this flag appears to have been that during
unit testing, there is no "rust_parser" context set up, which
means no "gdbarch" is available to use its types. To fix this,
I removed the unit_testing flag, and instead simply just set up
a dummy rust_parser context during unit testing.
- Ada: This used to check sizeof (DOUBLEST) to determine which
type to use for floating-point literal. This seems questionable
to begin with (since DOUBLEST is quite unrelated to target formats),
and in any case we need to get rid of DOUBLEST. I'm now simply
always using the largest type (builtin_long_double).
gdb/ChangeLog:
2017-10-25 Ulrich Weigand <uweigand@de.ibm.com>
* doublest.c (floatformat_from_string): New function.
* doublest.h (floatformat_from_string): Add prototype.
* std-operator.def (OP_DOUBLE, OP_DECFLOAT): Remove, replace by ...
(OP_FLOAT): ... this.
* expression.h: Do not include "doublest.h".
(union exp_element): Replace doubleconst and decfloatconst by
new element floatconst.
* ada-lang.c (resolve_subexp): Handle OP_FLOAT instead of OP_DOUBLE.
(ada_evaluate_subexp): Likewise.
* eval.c (evaluate_subexp_standard): Handle OP_FLOAT instead of
OP_DOUBLE and OP_DECFLOAT.
* expprint.c (print_subexp_standard): Likewise.
(dump_subexp_body_standard): Likewise.
* breakpoint.c (watchpoint_exp_is_const): Likewise.
* parse.c: Include "dfp.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): New function.
(operator_length_standard): Handle OP_FLOAT instead of OP_DOUBLE
and OP_DECFLOAT.
(operator_check_standard): Likewise.
(parse_float): Do not accept suffix. Take type as input. Return bool.
Return target format buffer instead of host DOUBLEST.
Use floatformat_from_string and decimal_from_string to parse
either binary or decimal floating-point types.
(parse_c_float): Remove.
* parser-defs.h: Do not include "doublest.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): Add prototype.
(parse_float): Update prototype.
(parse_c_float): Remove.
* c-exp.y: Do not include "dfp.h".
(typed_val_float): Use byte buffer instead of DOUBLEST.
(typed_val_decfloat): Remove.
(DECFLOAT): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
Handle decimal and binary FP types the same way.
* d-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT_LITERAL): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* f-exp.y: Replace dval by typed_val_float.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Use parse_float instead of atof.
* go-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(parse_go_float): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of parse_go_float.
Parse suffixes and determine type before calling parse_float.
* p-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* m2-exp.y: Replace dval by byte buffer val.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of atof.
* rust-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(lex_number): Call parse_float instead of strtod.
(ast_dliteral): Use OP_FLOAT instead of OP_DOUBLE.
(convert_ast_to_expression): Handle OP_FLOAT instead of OP_DOUBLE.
Use write_exp_elt_floatcst.
(unit_testing): Remove static variable.
(rust_type): Do not check unit_testing.
(rust_lex_tests): Do not set uint_testing. Set up dummy rust_parser.
* ada-exp.y (type_float, type_double): Remove.
(typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
* ada-lex.l (processReal): Use parse_float instead of sscanf.
2017-10-25 21:32:23 +08:00
|
|
|
|
/* Default type if no suffix. */
|
2014-06-20 02:29:26 +08:00
|
|
|
|
else
|
Target FP: Use target format throughout expression parsing
When parsing floating-point literals, the language parsers currently
use parse_float or some equivalent routine to parse the input string
into a DOUBLEST, which is then stored within a OP_DOUBLE expression
node. When evaluating the expression, the OP_DOUBLE is finally
converted into a value in target format.
On the other hand, *decimal* floating-point literals are parsed
directly into target format and stored that way in a OP_DECFLOAT
expression node. In order to eliminate the DOUBLEST, this patch
therefore unifies the handling of binary and decimal floating-
point literals and stores them both in target format within a
new OP_FLOAT expression node, replacing both OP_DOUBLE and
OP_DECFLOAT.
In order to store literals in target format, the parse_float
routine needs to know the type of the literal. All parsers
therefore need to be changed to determine the appropriate type
(e.g. by detecting suffixes) *before* calling parse_float,
instead of after it as today. However, this change is mostly
straightforward -- again, this is already done for decimal FP
today.
The core of the literal parsing is moved into a new routine
floatformat_from_string, mirroring floatformat_to_string.
The parse_float routine now calls either floatformat_from_string
or decimal_from_sting, allowing it to handle any type of FP
literal.
All language parsers need to be updated. Some notes on
specific changes to the various languages:
- C: Decimal FP is now handled in parse_float, and no longer
needs to be handled specially.
- D: Straightforward.
- Fortran: Still used a hard-coded "atof", also replaced by
parse_float now. Continues to always use builtin_real_s8
as the type of literal, even though this is probably wrong.
- Go: This used to handle "f" and "l" suffixes, even though
the Go language actually doesn't support those. I kept this
support for now -- maybe revisit later. Note the the GDB
test suite for some reason actually *verifies* that GDB supports
those unsupported suffixes ...
- Pascal: Likewise -- this handles suffixes that are not
supported in the language standard.
- Modula-2: Like Fortran, used to use "atof".
- Rust: Mostly straightforward, except for a unit-testing hitch.
The code use to set a special "unit_testing" flag which would
cause "rust_type" to always return NULL. This makes it not
possible to encode a literal into target format (which type?).
The reason for this flag appears to have been that during
unit testing, there is no "rust_parser" context set up, which
means no "gdbarch" is available to use its types. To fix this,
I removed the unit_testing flag, and instead simply just set up
a dummy rust_parser context during unit testing.
- Ada: This used to check sizeof (DOUBLEST) to determine which
type to use for floating-point literal. This seems questionable
to begin with (since DOUBLEST is quite unrelated to target formats),
and in any case we need to get rid of DOUBLEST. I'm now simply
always using the largest type (builtin_long_double).
gdb/ChangeLog:
2017-10-25 Ulrich Weigand <uweigand@de.ibm.com>
* doublest.c (floatformat_from_string): New function.
* doublest.h (floatformat_from_string): Add prototype.
* std-operator.def (OP_DOUBLE, OP_DECFLOAT): Remove, replace by ...
(OP_FLOAT): ... this.
* expression.h: Do not include "doublest.h".
(union exp_element): Replace doubleconst and decfloatconst by
new element floatconst.
* ada-lang.c (resolve_subexp): Handle OP_FLOAT instead of OP_DOUBLE.
(ada_evaluate_subexp): Likewise.
* eval.c (evaluate_subexp_standard): Handle OP_FLOAT instead of
OP_DOUBLE and OP_DECFLOAT.
* expprint.c (print_subexp_standard): Likewise.
(dump_subexp_body_standard): Likewise.
* breakpoint.c (watchpoint_exp_is_const): Likewise.
* parse.c: Include "dfp.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): New function.
(operator_length_standard): Handle OP_FLOAT instead of OP_DOUBLE
and OP_DECFLOAT.
(operator_check_standard): Likewise.
(parse_float): Do not accept suffix. Take type as input. Return bool.
Return target format buffer instead of host DOUBLEST.
Use floatformat_from_string and decimal_from_string to parse
either binary or decimal floating-point types.
(parse_c_float): Remove.
* parser-defs.h: Do not include "doublest.h".
(write_exp_elt_dblcst, write_exp_elt_decfloatcst): Remove.
(write_exp_elt_floatcst): Add prototype.
(parse_float): Update prototype.
(parse_c_float): Remove.
* c-exp.y: Do not include "dfp.h".
(typed_val_float): Use byte buffer instead of DOUBLEST.
(typed_val_decfloat): Remove.
(DECFLOAT): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
Handle decimal and binary FP types the same way.
* d-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT_LITERAL): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* f-exp.y: Replace dval by typed_val_float.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Use parse_float instead of atof.
* go-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(parse_go_float): Remove.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of parse_go_float.
Parse suffixes and determine type before calling parse_float.
* p-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Update to new parse_float interface.
Parse suffixes and determine type before calling parse_float.
* m2-exp.y: Replace dval by byte buffer val.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
(parse_number): Call parse_float instead of atof.
* rust-exp.y (typed_val_float): Use byte buffer instead of DOUBLEST.
(lex_number): Call parse_float instead of strtod.
(ast_dliteral): Use OP_FLOAT instead of OP_DOUBLE.
(convert_ast_to_expression): Handle OP_FLOAT instead of OP_DOUBLE.
Use write_exp_elt_floatcst.
(unit_testing): Remove static variable.
(rust_type): Do not check unit_testing.
(rust_lex_tests): Do not set uint_testing. Set up dummy rust_parser.
* ada-exp.y (type_float, type_double): Remove.
(typed_val_float): Use byte buffer instead of DOUBLEST.
(FLOAT): Use OP_FLOAT and write_exp_elt_floatcst.
* ada-lex.l (processReal): Use parse_float instead of sscanf.
2017-10-25 21:32:23 +08:00
|
|
|
|
{
|
|
|
|
|
putithere->typed_val_float.type
|
|
|
|
|
= parse_d_type (ps)->builtin_double;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!parse_float (s, len,
|
|
|
|
|
putithere->typed_val_float.type,
|
|
|
|
|
putithere->typed_val_float.val))
|
2014-06-20 02:29:26 +08:00
|
|
|
|
return ERROR;
|
|
|
|
|
|
|
|
|
|
return FLOAT_LITERAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle base-switching prefixes 0x, 0b, 0 */
|
|
|
|
|
if (p[0] == '0')
|
|
|
|
|
switch (p[1])
|
|
|
|
|
{
|
|
|
|
|
case 'x':
|
|
|
|
|
case 'X':
|
|
|
|
|
if (len >= 3)
|
|
|
|
|
{
|
|
|
|
|
p += 2;
|
|
|
|
|
base = 16;
|
|
|
|
|
len -= 2;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 'b':
|
|
|
|
|
case 'B':
|
|
|
|
|
if (len >= 3)
|
|
|
|
|
{
|
|
|
|
|
p += 2;
|
|
|
|
|
base = 2;
|
|
|
|
|
len -= 2;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
base = 8;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while (len-- > 0)
|
|
|
|
|
{
|
|
|
|
|
c = *p++;
|
|
|
|
|
if (c == '_')
|
|
|
|
|
continue; /* Ignore embedded '_'. */
|
|
|
|
|
if (c >= 'A' && c <= 'Z')
|
|
|
|
|
c += 'a' - 'A';
|
|
|
|
|
if (c != 'l' && c != 'u')
|
|
|
|
|
n *= base;
|
|
|
|
|
if (c >= '0' && c <= '9')
|
|
|
|
|
{
|
|
|
|
|
if (found_suffix)
|
|
|
|
|
return ERROR;
|
|
|
|
|
n += i = c - '0';
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (base > 10 && c >= 'a' && c <= 'f')
|
|
|
|
|
{
|
|
|
|
|
if (found_suffix)
|
|
|
|
|
return ERROR;
|
|
|
|
|
n += i = c - 'a' + 10;
|
|
|
|
|
}
|
|
|
|
|
else if (c == 'l' && long_p == 0)
|
|
|
|
|
{
|
|
|
|
|
long_p = 1;
|
|
|
|
|
found_suffix = 1;
|
|
|
|
|
}
|
|
|
|
|
else if (c == 'u' && unsigned_p == 0)
|
|
|
|
|
{
|
|
|
|
|
unsigned_p = 1;
|
|
|
|
|
found_suffix = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return ERROR; /* Char not a digit */
|
|
|
|
|
}
|
|
|
|
|
if (i >= base)
|
|
|
|
|
return ERROR; /* Invalid digit in this base. */
|
|
|
|
|
/* Portably test for integer overflow. */
|
|
|
|
|
if (c != 'l' && c != 'u')
|
|
|
|
|
{
|
|
|
|
|
ULONGEST n2 = prevn * base;
|
|
|
|
|
if ((n2 / base != prevn) || (n2 + i < prevn))
|
|
|
|
|
error (_("Numeric constant too large."));
|
|
|
|
|
}
|
|
|
|
|
prevn = n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* An integer constant is an int or a long. An L suffix forces it to
|
|
|
|
|
be long, and a U suffix forces it to be unsigned. To figure out
|
|
|
|
|
whether it fits, we shift it right and see whether anything remains.
|
|
|
|
|
Note that we can't shift sizeof (LONGEST) * HOST_CHAR_BIT bits or
|
|
|
|
|
more in one operation, because many compilers will warn about such a
|
|
|
|
|
shift (which always produces a zero result). To deal with the case
|
|
|
|
|
where it is we just always shift the value more than once, with fewer
|
|
|
|
|
bits each time. */
|
|
|
|
|
un = (ULONGEST) n >> 2;
|
|
|
|
|
if (long_p == 0 && (un >> 30) == 0)
|
|
|
|
|
{
|
|
|
|
|
high_bit = ((ULONGEST) 1) << 31;
|
|
|
|
|
signed_type = parse_d_type (ps)->builtin_int;
|
|
|
|
|
/* For decimal notation, keep the sign of the worked out type. */
|
|
|
|
|
if (base == 10 && !unsigned_p)
|
|
|
|
|
unsigned_type = parse_d_type (ps)->builtin_long;
|
|
|
|
|
else
|
|
|
|
|
unsigned_type = parse_d_type (ps)->builtin_uint;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
int shift;
|
|
|
|
|
if (sizeof (ULONGEST) * HOST_CHAR_BIT < 64)
|
|
|
|
|
/* A long long does not fit in a LONGEST. */
|
|
|
|
|
shift = (sizeof (ULONGEST) * HOST_CHAR_BIT - 1);
|
|
|
|
|
else
|
|
|
|
|
shift = 63;
|
|
|
|
|
high_bit = (ULONGEST) 1 << shift;
|
|
|
|
|
signed_type = parse_d_type (ps)->builtin_long;
|
|
|
|
|
unsigned_type = parse_d_type (ps)->builtin_ulong;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
putithere->typed_val_int.val = n;
|
|
|
|
|
|
|
|
|
|
/* If the high bit of the worked out type is set then this number
|
|
|
|
|
has to be unsigned_type. */
|
|
|
|
|
if (unsigned_p || (n & high_bit))
|
|
|
|
|
putithere->typed_val_int.type = unsigned_type;
|
|
|
|
|
else
|
|
|
|
|
putithere->typed_val_int.type = signed_type;
|
|
|
|
|
|
|
|
|
|
return INTEGER_LITERAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Temporary obstack used for holding strings. */
|
|
|
|
|
static struct obstack tempbuf;
|
|
|
|
|
static int tempbuf_init;
|
|
|
|
|
|
|
|
|
|
/* Parse a string or character literal from TOKPTR. The string or
|
|
|
|
|
character may be wide or unicode. *OUTPTR is set to just after the
|
|
|
|
|
end of the literal in the input string. The resulting token is
|
|
|
|
|
stored in VALUE. This returns a token value, either STRING or
|
|
|
|
|
CHAR, depending on what was parsed. *HOST_CHARS is set to the
|
|
|
|
|
number of host characters in the literal. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
parse_string_or_char (const char *tokptr, const char **outptr,
|
|
|
|
|
struct typed_stoken *value, int *host_chars)
|
|
|
|
|
{
|
|
|
|
|
int quote;
|
|
|
|
|
|
|
|
|
|
/* Build the gdb internal form of the input string in tempbuf. Note
|
|
|
|
|
that the buffer is null byte terminated *only* for the
|
|
|
|
|
convenience of debugging gdb itself and printing the buffer
|
|
|
|
|
contents when the buffer contains no embedded nulls. Gdb does
|
|
|
|
|
not depend upon the buffer being null byte terminated, it uses
|
|
|
|
|
the length string instead. This allows gdb to handle C strings
|
|
|
|
|
(as well as strings in other languages) with embedded null
|
|
|
|
|
bytes */
|
|
|
|
|
|
|
|
|
|
if (!tempbuf_init)
|
|
|
|
|
tempbuf_init = 1;
|
|
|
|
|
else
|
|
|
|
|
obstack_free (&tempbuf, NULL);
|
|
|
|
|
obstack_init (&tempbuf);
|
|
|
|
|
|
|
|
|
|
/* Skip the quote. */
|
|
|
|
|
quote = *tokptr;
|
|
|
|
|
++tokptr;
|
|
|
|
|
|
|
|
|
|
*host_chars = 0;
|
|
|
|
|
|
|
|
|
|
while (*tokptr)
|
|
|
|
|
{
|
|
|
|
|
char c = *tokptr;
|
|
|
|
|
if (c == '\\')
|
|
|
|
|
{
|
|
|
|
|
++tokptr;
|
|
|
|
|
*host_chars += c_parse_escape (&tokptr, &tempbuf);
|
|
|
|
|
}
|
|
|
|
|
else if (c == quote)
|
|
|
|
|
break;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
obstack_1grow (&tempbuf, c);
|
|
|
|
|
++tokptr;
|
|
|
|
|
/* FIXME: this does the wrong thing with multi-byte host
|
|
|
|
|
characters. We could use mbrlen here, but that would
|
|
|
|
|
make "set host-charset" a bit less useful. */
|
|
|
|
|
++*host_chars;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (*tokptr != quote)
|
|
|
|
|
{
|
|
|
|
|
if (quote == '"' || quote == '`')
|
|
|
|
|
error (_("Unterminated string in expression."));
|
|
|
|
|
else
|
|
|
|
|
error (_("Unmatched single quote."));
|
|
|
|
|
}
|
|
|
|
|
++tokptr;
|
|
|
|
|
|
|
|
|
|
/* FIXME: should instead use own language string_type enum
|
|
|
|
|
and handle D-specific string suffixes here. */
|
|
|
|
|
if (quote == '\'')
|
|
|
|
|
value->type = C_CHAR;
|
|
|
|
|
else
|
|
|
|
|
value->type = C_STRING;
|
|
|
|
|
|
2015-11-17 21:07:24 +08:00
|
|
|
|
value->ptr = (char *) obstack_base (&tempbuf);
|
2014-06-20 02:29:26 +08:00
|
|
|
|
value->length = obstack_object_size (&tempbuf);
|
|
|
|
|
|
|
|
|
|
*outptr = tokptr;
|
|
|
|
|
|
|
|
|
|
return quote == '\'' ? CHARACTER_LITERAL : STRING_LITERAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct token
|
|
|
|
|
{
|
-Wwrite-strings: The Rest
This is the remainder boring constification that all looks more of less
borderline obvious IMO.
gdb/ChangeLog:
2017-04-05 Pedro Alves <palves@redhat.com>
* ada-exp.y (yyerror): Constify.
* ada-lang.c (bound_name, get_selections)
(ada_variant_discrim_type)
(ada_variant_discrim_name, ada_value_struct_elt)
(ada_lookup_struct_elt_type, is_unchecked_variant)
(ada_which_variant_applies, standard_exc, ada_get_next_arg)
(catch_ada_exception_command_split)
(catch_ada_assert_command_split, catch_assert_command)
(ada_op_name): Constify.
* ada-lang.h (ada_yyerror, get_selections)
(ada_variant_discrim_name, ada_value_struct_elt): Constify.
* arc-tdep.c (arc_print_frame_cache): Constify.
* arm-tdep.c (arm_skip_stub): Constify.
* ax-gdb.c (gen_binop, gen_struct_ref_recursive, gen_struct_ref)
(gen_aggregate_elt_ref): Constify.
* bcache.c (print_bcache_statistics): Constify.
* bcache.h (print_bcache_statistics): Constify.
* break-catch-throw.c (catch_exception_command_1):
* breakpoint.c (struct ep_type_description::description):
Constify.
(add_solib_catchpoint): Constify.
(catch_fork_command_1): Add cast.
(add_catch_command): Constify.
* breakpoint.h (add_catch_command, add_solib_catchpoint):
Constify.
* bsd-uthread.c (bsd_uthread_state): Constify.
* buildsym.c (patch_subfile_names): Constify.
* buildsym.h (next_symbol_text_func, patch_subfile_names):
Constify.
* c-exp.y (yyerror): Constify.
(token::oper): Constify.
* c-lang.h (c_yyerror, cp_print_class_member): Constify.
* c-varobj.c (cplus_describe_child): Constify.
* charset.c (find_charset_names): Add cast.
(find_charset_names): Constify array and add const_cast.
* cli/cli-cmds.c (complete_command, cd_command): Constify.
(edit_command): Constify.
* cli/cli-decode.c (lookup_cmd): Constify.
* cli/cli-dump.c (dump_memory_command, dump_value_command):
Constify.
(struct dump_context): Constify.
(add_dump_command, restore_command): Constify.
* cli/cli-script.c (get_command_line): Constify.
* cli/cli-script.h (get_command_line): Constify.
* cli/cli-utils.c (check_for_argument): Constify.
* cli/cli-utils.h (check_for_argument): Constify.
* coff-pe-read.c (struct read_pe_section_data): Constify.
* command.h (lookup_cmd): Constify.
* common/print-utils.c (decimal2str): Constify.
* completer.c (gdb_print_filename): Constify.
* corefile.c (set_gnutarget): Constify.
* cp-name-parser.y (yyerror): Constify.
* cp-valprint.c (cp_print_class_member): Constify.
* cris-tdep.c (cris_register_name, crisv32_register_name):
Constify.
* d-exp.y (yyerror): Constify.
(struct token::oper): Constify.
* d-lang.h (d_yyerror): Constify.
* dbxread.c (struct header_file_location::name): Constify.
(add_old_header_file, add_new_header_file, last_function_name)
(dbx_next_symbol_text, add_bincl_to_list)
(find_corresponding_bincl_psymtab, set_namestring)
(find_stab_function_addr, read_dbx_symtab, start_psymtab)
(dbx_end_psymtab, read_ofile_symtab, process_one_symbol):
* defs.h (command_line_input, print_address_symbolic)
(deprecated_readline_begin_hook): Constify.
* dwarf2read.c (anonymous_struct_prefix, dwarf_bool_name):
Constify.
* event-top.c (handle_line_of_input): Constify and add cast.
* exceptions.c (catch_errors): Constify.
* exceptions.h (catch_errors): Constify.
* expprint.c (print_subexp_standard, op_string, op_name)
(op_name_standard, dump_raw_expression, dump_raw_expression):
* expression.h (op_name, op_string, dump_raw_expression):
Constify.
* f-exp.y (yyerror): Constify.
(struct token::oper): Constify.
(struct f77_boolean_val::name): Constify.
* f-lang.c (f_word_break_characters): Constify.
* f-lang.h (f_yyerror): Constify.
* fork-child.c (fork_inferior): Add cast.
* frv-tdep.c (struct gdbarch_tdep::register_names): Constify.
(new_variant): Constify.
* gdbarch.sh (pstring_ptr, pstring_list): Constify.
* gdbarch.c: Regenerate.
* gdbcore.h (set_gnutarget): Constify.
* go-exp.y (yyerror): Constify.
(token::oper): Constify.
* go-lang.h (go_yyerror): Constify.
* go32-nat.c (go32_sysinfo): Constify.
* guile/scm-breakpoint.c (gdbscm_breakpoint_expression): Constify.
* guile/scm-cmd.c (cmdscm_function): Constify.
* guile/scm-param.c (pascm_param_value): Constify.
* h8300-tdep.c (h8300_register_name, h8300s_register_name)
(h8300sx_register_name): Constify.
* hppa-tdep.c (hppa32_register_name, hppa64_register_name):
Constify.
* ia64-tdep.c (ia64_register_names): Constify.
* infcmd.c (construct_inferior_arguments): Constify.
(path_command, attach_post_wait): Constify.
* language.c (show_range_command, show_case_command)
(unk_lang_error): Constify.
* language.h (language_defn::la_error)
(language_defn::la_name_of_this): Constify.
* linespec.c (decode_line_2): Constify.
* linux-thread-db.c (thread_db_err_str): Constify.
* lm32-tdep.c (lm32_register_name): Constify.
* m2-exp.y (yyerror): Constify.
* m2-lang.h (m2_yyerror): Constify.
* m32r-tdep.c (m32r_register_names): Constify and make static.
* m68hc11-tdep.c (m68hc11_register_names): Constify.
* m88k-tdep.c (m88k_register_name): Constify.
* macroexp.c (appendmem): Constify.
* mdebugread.c (fdr_name, add_data_symbol, parse_type)
(upgrade_type, parse_external, parse_partial_symbols)
(mdebug_next_symbol_text, cross_ref, mylookup_symbol, new_psymtab)
(new_symbol): Constify.
* memattr.c (mem_info_command): Constify.
* mep-tdep.c (register_name_from_keyword): Constify.
* mi/mi-cmd-env.c (mi_cmd_env_path, _initialize_mi_cmd_env):
Constify.
* mi/mi-cmd-stack.c (list_args_or_locals): Constify.
* mi/mi-cmd-var.c (mi_cmd_var_show_attributes): Constify.
* mi/mi-main.c (captured_mi_execute_command): Constify and add
cast.
(mi_execute_async_cli_command): Constify.
* mips-tdep.c (mips_register_name): Constify.
* mn10300-tdep.c (register_name, mn10300_generic_register_name)
(am33_register_name, am33_2_register_name)
* moxie-tdep.c (moxie_register_names): Constify.
* nat/linux-osdata.c (osdata_type): Constify fields.
* nto-tdep.c (nto_parse_redirection): Constify.
* objc-lang.c (lookup_struct_typedef, lookup_objc_class)
(lookup_child_selector): Constify.
(objc_methcall::name): Constify.
* objc-lang.h (lookup_objc_class, lookup_child_selector)
(lookup_struct_typedef): Constify.
* objfiles.c (pc_in_section): Constify.
* objfiles.h (pc_in_section): Constify.
* p-exp.y (struct token::oper): Constify.
(yyerror): Constify.
* p-lang.h (pascal_yyerror): Constify.
* parser-defs.h (op_name_standard): Constify.
(op_print::string): Constify.
(exp_descriptor::op_name): Constify.
* printcmd.c (print_address_symbolic): Constify.
* psymtab.c (print_partial_symbols): Constify.
* python/py-breakpoint.c (stop_func): Constify.
(bppy_get_expression): Constify.
* python/py-cmd.c (cmdpy_completer::name): Constify.
(cmdpy_function): Constify.
* python/py-event.c (evpy_add_attribute)
(gdbpy_initialize_event_generic): Constify.
* python/py-event.h (evpy_add_attribute)
(gdbpy_initialize_event_generic): Constify.
* python/py-evts.c (add_new_registry): Constify.
* python/py-finishbreakpoint.c (outofscope_func): Constify.
* python/py-framefilter.c (get_py_iter_from_func): Constify.
* python/py-inferior.c (get_buffer): Add cast.
* python/py-param.c (parm_constant::name): Constify.
* python/py-unwind.c (fprint_frame_id): Constify.
* python/python.c (gdbpy_parameter_value): Constify.
* remote-fileio.c (remote_fio_func_map): Make 'name' const.
* remote.c (memory_packet_config::name): Constify.
(show_packet_config_cmd, remote_write_bytes)
(remote_buffer_add_string):
* reverse.c (exec_reverse_once): Constify.
* rs6000-tdep.c (variant::name, variant::description): Constify.
* rust-exp.y (rustyyerror): Constify.
* rust-lang.c (rust_op_name): Constify.
* rust-lang.h (rustyyerror): Constify.
* serial.h (serial_ops::name): Constify.
* sh-tdep.c (sh_sh_register_name, sh_sh3_register_name)
(sh_sh3e_register_name, sh_sh2e_register_name)
(sh_sh2a_register_name, sh_sh2a_nofpu_register_name)
(sh_sh_dsp_register_name, sh_sh3_dsp_register_name)
(sh_sh4_register_name, sh_sh4_nofpu_register_name)
(sh_sh4al_dsp_register_name): Constify.
* sh64-tdep.c (sh64_register_name): Constify.
* solib-darwin.c (lookup_symbol_from_bfd): Constify.
* spu-tdep.c (spu_register_name, info_spu_dma_cmdlist): Constify.
* stabsread.c (patch_block_stabs, read_type_number)
(ref_map::stabs, ref_add, process_reference)
(symbol_reference_defined, define_symbol, define_symbol)
(error_type, read_type, read_member_functions, read_cpp_abbrev)
(read_one_struct_field, read_struct_fields, read_baseclasses)
(read_tilde_fields, read_struct_type, read_array_type)
(read_enum_type, read_sun_builtin_type, read_sun_floating_type)
(read_huge_number, read_range_type, read_args, common_block_start)
(find_name_end): Constify.
* stabsread.h (common_block_start, define_symbol)
(process_one_symbol, symbol_reference_defined, ref_add):
* symfile.c (get_section_index, add_symbol_file_command):
* symfile.h (get_section_index): Constify.
* target-descriptions.c (tdesc_type::name): Constify.
(tdesc_free_type): Add cast.
* target.c (find_default_run_target):
(add_deprecated_target_alias, find_default_run_target)
(target_announce_detach): Constify.
(do_option): Constify.
* target.h (add_deprecated_target_alias): Constify.
* thread.c (print_thread_info_1): Constify.
* top.c (deprecated_readline_begin_hook, command_line_input):
Constify.
(init_main): Add casts.
* top.h (handle_line_of_input): Constify.
* tracefile-tfile.c (tfile_write_uploaded_tsv): Constify.
* tracepoint.c (tvariables_info_1, trace_status_mi): Constify.
(tfind_command): Rename to ...
(tfind_command_1): ... this and constify.
(tfind_command): New function.
(tfind_end_command, tfind_start_command): Adjust.
(encode_source_string): Constify.
* tracepoint.h (encode_source_string): Constify.
* tui/tui-data.c (tui_partial_win_by_name): Constify.
* tui/tui-data.h (tui_partial_win_by_name): Constify.
* tui/tui-source.c (tui_set_source_content_nil): Constify.
* tui/tui-source.h (tui_set_source_content_nil): Constify.
* tui/tui-win.c (parse_scrolling_args): Constify.
* tui/tui-windata.c (tui_erase_data_content): Constify.
* tui/tui-windata.h (tui_erase_data_content): Constify.
* tui/tui-winsource.c (tui_erase_source_content): Constify.
* tui/tui.c (tui_enable): Add cast.
* utils.c (defaulted_query): Constify.
(init_page_info): Add cast.
(puts_debug, subset_compare): Constify.
* utils.h (subset_compare): Constify.
* varobj.c (varobj_format_string): Constify.
* varobj.h (varobj_format_string): Constify.
* vax-tdep.c (vax_register_name): Constify.
* windows-nat.c (windows_detach): Constify.
* xcoffread.c (process_linenos, xcoff_next_symbol_text): Constify.
* xml-support.c (gdb_xml_end_element): Constify.
* xml-tdesc.c (tdesc_start_reg): Constify.
* xstormy16-tdep.c (xstormy16_register_name): Constify.
* xtensa-tdep.c (xtensa_find_register_by_name): Constify.
* xtensa-tdep.h (xtensa_register_t::name): Constify.
gdb/gdbserver/ChangeLog:
2017-04-05 Pedro Alves <palves@redhat.com>
* gdbreplay.c (sync_error): Constify.
* linux-x86-low.c (push_opcode): Constify.
2017-04-06 02:21:37 +08:00
|
|
|
|
const char *oper;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
int token;
|
|
|
|
|
enum exp_opcode opcode;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct token tokentab3[] =
|
|
|
|
|
{
|
|
|
|
|
{"^^=", ASSIGN_MODIFY, BINOP_EXP},
|
|
|
|
|
{"<<=", ASSIGN_MODIFY, BINOP_LSH},
|
|
|
|
|
{">>=", ASSIGN_MODIFY, BINOP_RSH},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static const struct token tokentab2[] =
|
|
|
|
|
{
|
|
|
|
|
{"+=", ASSIGN_MODIFY, BINOP_ADD},
|
|
|
|
|
{"-=", ASSIGN_MODIFY, BINOP_SUB},
|
|
|
|
|
{"*=", ASSIGN_MODIFY, BINOP_MUL},
|
|
|
|
|
{"/=", ASSIGN_MODIFY, BINOP_DIV},
|
|
|
|
|
{"%=", ASSIGN_MODIFY, BINOP_REM},
|
|
|
|
|
{"|=", ASSIGN_MODIFY, BINOP_BITWISE_IOR},
|
|
|
|
|
{"&=", ASSIGN_MODIFY, BINOP_BITWISE_AND},
|
|
|
|
|
{"^=", ASSIGN_MODIFY, BINOP_BITWISE_XOR},
|
|
|
|
|
{"++", INCREMENT, BINOP_END},
|
|
|
|
|
{"--", DECREMENT, BINOP_END},
|
|
|
|
|
{"&&", ANDAND, BINOP_END},
|
|
|
|
|
{"||", OROR, BINOP_END},
|
|
|
|
|
{"^^", HATHAT, BINOP_END},
|
|
|
|
|
{"<<", LSH, BINOP_END},
|
|
|
|
|
{">>", RSH, BINOP_END},
|
|
|
|
|
{"==", EQUAL, BINOP_END},
|
|
|
|
|
{"!=", NOTEQUAL, BINOP_END},
|
|
|
|
|
{"<=", LEQ, BINOP_END},
|
|
|
|
|
{">=", GEQ, BINOP_END},
|
|
|
|
|
{"..", DOTDOT, BINOP_END},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* Identifier-like tokens. */
|
|
|
|
|
static const struct token ident_tokens[] =
|
|
|
|
|
{
|
|
|
|
|
{"is", IDENTITY, BINOP_END},
|
|
|
|
|
{"!is", NOTIDENTITY, BINOP_END},
|
|
|
|
|
|
|
|
|
|
{"cast", CAST_KEYWORD, OP_NULL},
|
|
|
|
|
{"const", CONST_KEYWORD, OP_NULL},
|
|
|
|
|
{"immutable", IMMUTABLE_KEYWORD, OP_NULL},
|
|
|
|
|
{"shared", SHARED_KEYWORD, OP_NULL},
|
|
|
|
|
{"super", SUPER_KEYWORD, OP_NULL},
|
|
|
|
|
|
|
|
|
|
{"null", NULL_KEYWORD, OP_NULL},
|
|
|
|
|
{"true", TRUE_KEYWORD, OP_NULL},
|
|
|
|
|
{"false", FALSE_KEYWORD, OP_NULL},
|
|
|
|
|
|
|
|
|
|
{"init", INIT_KEYWORD, OP_NULL},
|
|
|
|
|
{"sizeof", SIZEOF_KEYWORD, OP_NULL},
|
|
|
|
|
{"typeof", TYPEOF_KEYWORD, OP_NULL},
|
|
|
|
|
{"typeid", TYPEID_KEYWORD, OP_NULL},
|
|
|
|
|
|
|
|
|
|
{"delegate", DELEGATE_KEYWORD, OP_NULL},
|
|
|
|
|
{"function", FUNCTION_KEYWORD, OP_NULL},
|
|
|
|
|
{"struct", STRUCT_KEYWORD, OP_NULL},
|
|
|
|
|
{"union", UNION_KEYWORD, OP_NULL},
|
|
|
|
|
{"class", CLASS_KEYWORD, OP_NULL},
|
|
|
|
|
{"interface", INTERFACE_KEYWORD, OP_NULL},
|
|
|
|
|
{"enum", ENUM_KEYWORD, OP_NULL},
|
|
|
|
|
{"template", TEMPLATE_KEYWORD, OP_NULL},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* This is set if a NAME token appeared at the very end of the input
|
|
|
|
|
string, with no whitespace separating the name from the EOF. This
|
|
|
|
|
is used only when parsing to do field name completion. */
|
|
|
|
|
static int saw_name_at_eof;
|
|
|
|
|
|
|
|
|
|
/* This is set if the previously-returned token was a structure operator.
|
|
|
|
|
This is used only when parsing to do field name completion. */
|
|
|
|
|
static int last_was_structop;
|
|
|
|
|
|
2019-03-25 01:33:10 +08:00
|
|
|
|
/* Depth of parentheses. */
|
|
|
|
|
static int paren_depth;
|
|
|
|
|
|
2014-06-20 02:29:26 +08:00
|
|
|
|
/* Read one token, getting characters through lexptr. */
|
|
|
|
|
|
|
|
|
|
static int
|
2015-08-14 03:35:09 +08:00
|
|
|
|
lex_one_token (struct parser_state *par_state)
|
2014-06-20 02:29:26 +08:00
|
|
|
|
{
|
|
|
|
|
int c;
|
|
|
|
|
int namelen;
|
|
|
|
|
unsigned int i;
|
|
|
|
|
const char *tokstart;
|
|
|
|
|
int saw_structop = last_was_structop;
|
|
|
|
|
|
|
|
|
|
last_was_structop = 0;
|
|
|
|
|
|
|
|
|
|
retry:
|
|
|
|
|
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
pstate->prev_lexptr = pstate->lexptr;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
tokstart = pstate->lexptr;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
/* See if it is a special token of length 3. */
|
|
|
|
|
for (i = 0; i < sizeof tokentab3 / sizeof tokentab3[0]; i++)
|
2015-02-28 00:33:07 +08:00
|
|
|
|
if (strncmp (tokstart, tokentab3[i].oper, 3) == 0)
|
2014-06-20 02:29:26 +08:00
|
|
|
|
{
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
pstate->lexptr += 3;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
yylval.opcode = tokentab3[i].opcode;
|
|
|
|
|
return tokentab3[i].token;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* See if it is a special token of length 2. */
|
|
|
|
|
for (i = 0; i < sizeof tokentab2 / sizeof tokentab2[0]; i++)
|
2015-02-28 00:33:07 +08:00
|
|
|
|
if (strncmp (tokstart, tokentab2[i].oper, 2) == 0)
|
2014-06-20 02:29:26 +08:00
|
|
|
|
{
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
pstate->lexptr += 2;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
yylval.opcode = tokentab2[i].opcode;
|
|
|
|
|
return tokentab2[i].token;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (c = *tokstart)
|
|
|
|
|
{
|
|
|
|
|
case 0:
|
|
|
|
|
/* If we're parsing for field name completion, and the previous
|
|
|
|
|
token allows such completion, return a COMPLETE token.
|
|
|
|
|
Otherwise, we were already scanning the original text, and
|
|
|
|
|
we're really done. */
|
|
|
|
|
if (saw_name_at_eof)
|
|
|
|
|
{
|
|
|
|
|
saw_name_at_eof = 0;
|
|
|
|
|
return COMPLETE;
|
|
|
|
|
}
|
|
|
|
|
else if (saw_structop)
|
|
|
|
|
return COMPLETE;
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
case ' ':
|
|
|
|
|
case '\t':
|
|
|
|
|
case '\n':
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
pstate->lexptr++;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
goto retry;
|
|
|
|
|
|
|
|
|
|
case '[':
|
|
|
|
|
case '(':
|
|
|
|
|
paren_depth++;
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
pstate->lexptr++;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
return c;
|
|
|
|
|
|
|
|
|
|
case ']':
|
|
|
|
|
case ')':
|
|
|
|
|
if (paren_depth == 0)
|
|
|
|
|
return 0;
|
|
|
|
|
paren_depth--;
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
pstate->lexptr++;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
return c;
|
|
|
|
|
|
|
|
|
|
case ',':
|
2019-03-25 08:07:00 +08:00
|
|
|
|
if (pstate->comma_terminates && paren_depth == 0)
|
2014-06-20 02:29:26 +08:00
|
|
|
|
return 0;
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
pstate->lexptr++;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
return c;
|
|
|
|
|
|
|
|
|
|
case '.':
|
|
|
|
|
/* Might be a floating point number. */
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
if (pstate->lexptr[1] < '0' || pstate->lexptr[1] > '9')
|
2014-06-20 02:29:26 +08:00
|
|
|
|
{
|
2019-03-25 12:50:14 +08:00
|
|
|
|
if (pstate->parse_completion)
|
2014-06-20 02:29:26 +08:00
|
|
|
|
last_was_structop = 1;
|
|
|
|
|
goto symbol; /* Nope, must be a symbol. */
|
|
|
|
|
}
|
2016-09-28 01:18:04 +08:00
|
|
|
|
/* FALL THRU. */
|
2014-06-20 02:29:26 +08:00
|
|
|
|
|
|
|
|
|
case '0':
|
|
|
|
|
case '1':
|
|
|
|
|
case '2':
|
|
|
|
|
case '3':
|
|
|
|
|
case '4':
|
|
|
|
|
case '5':
|
|
|
|
|
case '6':
|
|
|
|
|
case '7':
|
|
|
|
|
case '8':
|
|
|
|
|
case '9':
|
|
|
|
|
{
|
|
|
|
|
/* It's a number. */
|
|
|
|
|
int got_dot = 0, got_e = 0, toktype;
|
|
|
|
|
const char *p = tokstart;
|
|
|
|
|
int hex = input_radix > 10;
|
|
|
|
|
|
|
|
|
|
if (c == '0' && (p[1] == 'x' || p[1] == 'X'))
|
|
|
|
|
{
|
|
|
|
|
p += 2;
|
|
|
|
|
hex = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (;; ++p)
|
|
|
|
|
{
|
|
|
|
|
/* Hex exponents start with 'p', because 'e' is a valid hex
|
|
|
|
|
digit and thus does not indicate a floating point number
|
|
|
|
|
when the radix is hex. */
|
|
|
|
|
if ((!hex && !got_e && tolower (p[0]) == 'e')
|
|
|
|
|
|| (hex && !got_e && tolower (p[0] == 'p')))
|
|
|
|
|
got_dot = got_e = 1;
|
|
|
|
|
/* A '.' always indicates a decimal floating point number
|
|
|
|
|
regardless of the radix. If we have a '..' then its the
|
|
|
|
|
end of the number and the beginning of a slice. */
|
|
|
|
|
else if (!got_dot && (p[0] == '.' && p[1] != '.'))
|
|
|
|
|
got_dot = 1;
|
|
|
|
|
/* This is the sign of the exponent, not the end of the number. */
|
|
|
|
|
else if (got_e && (tolower (p[-1]) == 'e' || tolower (p[-1]) == 'p')
|
|
|
|
|
&& (*p == '-' || *p == '+'))
|
|
|
|
|
continue;
|
|
|
|
|
/* We will take any letters or digits, ignoring any embedded '_'.
|
|
|
|
|
parse_number will complain if past the radix, or if L or U are
|
|
|
|
|
not final. */
|
2015-08-15 03:25:17 +08:00
|
|
|
|
else if ((*p < '0' || *p > '9') && (*p != '_')
|
|
|
|
|
&& ((*p < 'a' || *p > 'z') && (*p < 'A' || *p > 'Z')))
|
2014-06-20 02:29:26 +08:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-14 03:35:09 +08:00
|
|
|
|
toktype = parse_number (par_state, tokstart, p - tokstart,
|
2014-06-20 02:29:26 +08:00
|
|
|
|
got_dot|got_e, &yylval);
|
|
|
|
|
if (toktype == ERROR)
|
|
|
|
|
{
|
|
|
|
|
char *err_copy = (char *) alloca (p - tokstart + 1);
|
|
|
|
|
|
|
|
|
|
memcpy (err_copy, tokstart, p - tokstart);
|
|
|
|
|
err_copy[p - tokstart] = 0;
|
|
|
|
|
error (_("Invalid number \"%s\"."), err_copy);
|
|
|
|
|
}
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
pstate->lexptr = p;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
return toktype;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case '@':
|
|
|
|
|
{
|
|
|
|
|
const char *p = &tokstart[1];
|
|
|
|
|
size_t len = strlen ("entry");
|
|
|
|
|
|
|
|
|
|
while (isspace (*p))
|
|
|
|
|
p++;
|
|
|
|
|
if (strncmp (p, "entry", len) == 0 && !isalnum (p[len])
|
|
|
|
|
&& p[len] != '_')
|
|
|
|
|
{
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
pstate->lexptr = &p[len];
|
2014-06-20 02:29:26 +08:00
|
|
|
|
return ENTRY;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* FALLTHRU */
|
|
|
|
|
case '+':
|
|
|
|
|
case '-':
|
|
|
|
|
case '*':
|
|
|
|
|
case '/':
|
|
|
|
|
case '%':
|
|
|
|
|
case '|':
|
|
|
|
|
case '&':
|
|
|
|
|
case '^':
|
|
|
|
|
case '~':
|
|
|
|
|
case '!':
|
|
|
|
|
case '<':
|
|
|
|
|
case '>':
|
|
|
|
|
case '?':
|
|
|
|
|
case ':':
|
|
|
|
|
case '=':
|
|
|
|
|
case '{':
|
|
|
|
|
case '}':
|
|
|
|
|
symbol:
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
pstate->lexptr++;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
return c;
|
|
|
|
|
|
|
|
|
|
case '\'':
|
|
|
|
|
case '"':
|
|
|
|
|
case '`':
|
|
|
|
|
{
|
|
|
|
|
int host_len;
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
int result = parse_string_or_char (tokstart, &pstate->lexptr,
|
|
|
|
|
&yylval.tsval, &host_len);
|
2014-06-20 02:29:26 +08:00
|
|
|
|
if (result == CHARACTER_LITERAL)
|
|
|
|
|
{
|
|
|
|
|
if (host_len == 0)
|
|
|
|
|
error (_("Empty character constant."));
|
|
|
|
|
else if (host_len > 2 && c == '\'')
|
|
|
|
|
{
|
|
|
|
|
++tokstart;
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
namelen = pstate->lexptr - tokstart - 1;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
goto tryname;
|
|
|
|
|
}
|
|
|
|
|
else if (host_len > 1)
|
|
|
|
|
error (_("Invalid character constant."));
|
|
|
|
|
}
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!(c == '_' || c == '$'
|
|
|
|
|
|| (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')))
|
|
|
|
|
/* We must have come across a bad character (e.g. ';'). */
|
|
|
|
|
error (_("Invalid character '%c' in expression"), c);
|
|
|
|
|
|
|
|
|
|
/* It's a name. See how long it is. */
|
|
|
|
|
namelen = 0;
|
|
|
|
|
for (c = tokstart[namelen];
|
|
|
|
|
(c == '_' || c == '$' || (c >= '0' && c <= '9')
|
|
|
|
|
|| (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'));)
|
|
|
|
|
c = tokstart[++namelen];
|
|
|
|
|
|
|
|
|
|
/* The token "if" terminates the expression and is NOT
|
|
|
|
|
removed from the input stream. */
|
|
|
|
|
if (namelen == 2 && tokstart[0] == 'i' && tokstart[1] == 'f')
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* For the same reason (breakpoint conditions), "thread N"
|
|
|
|
|
terminates the expression. "thread" could be an identifier, but
|
|
|
|
|
an identifier is never followed by a number without intervening
|
|
|
|
|
punctuation. "task" is similar. Handle abbreviations of these,
|
|
|
|
|
similarly to breakpoint.c:find_condition_and_thread. */
|
|
|
|
|
if (namelen >= 1
|
|
|
|
|
&& (strncmp (tokstart, "thread", namelen) == 0
|
|
|
|
|
|| strncmp (tokstart, "task", namelen) == 0)
|
|
|
|
|
&& (tokstart[namelen] == ' ' || tokstart[namelen] == '\t'))
|
|
|
|
|
{
|
|
|
|
|
const char *p = tokstart + namelen + 1;
|
|
|
|
|
|
|
|
|
|
while (*p == ' ' || *p == '\t')
|
|
|
|
|
p++;
|
|
|
|
|
if (*p >= '0' && *p <= '9')
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
pstate->lexptr += namelen;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
|
|
|
|
|
tryname:
|
|
|
|
|
|
|
|
|
|
yylval.sval.ptr = tokstart;
|
|
|
|
|
yylval.sval.length = namelen;
|
|
|
|
|
|
|
|
|
|
/* Catch specific keywords. */
|
2019-04-08 05:29:58 +08:00
|
|
|
|
std::string copy = copy_name (yylval.sval);
|
2014-06-20 02:29:26 +08:00
|
|
|
|
for (i = 0; i < sizeof ident_tokens / sizeof ident_tokens[0]; i++)
|
2019-04-08 05:29:58 +08:00
|
|
|
|
if (copy == ident_tokens[i].oper)
|
2014-06-20 02:29:26 +08:00
|
|
|
|
{
|
|
|
|
|
/* It is ok to always set this, even though we don't always
|
|
|
|
|
strictly need to. */
|
|
|
|
|
yylval.opcode = ident_tokens[i].opcode;
|
|
|
|
|
return ident_tokens[i].token;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (*tokstart == '$')
|
|
|
|
|
return DOLLAR_VARIABLE;
|
|
|
|
|
|
|
|
|
|
yylval.tsym.type
|
2019-03-24 23:01:18 +08:00
|
|
|
|
= language_lookup_primitive_type (par_state->language (),
|
2019-04-08 05:29:58 +08:00
|
|
|
|
par_state->gdbarch (), copy.c_str ());
|
2014-06-20 02:29:26 +08:00
|
|
|
|
if (yylval.tsym.type != NULL)
|
|
|
|
|
return TYPENAME;
|
|
|
|
|
|
|
|
|
|
/* Input names that aren't symbols but ARE valid hex numbers,
|
|
|
|
|
when the input radix permits them, can be names or numbers
|
|
|
|
|
depending on the parse. Note we support radixes > 16 here. */
|
|
|
|
|
if ((tokstart[0] >= 'a' && tokstart[0] < 'a' + input_radix - 10)
|
|
|
|
|
|| (tokstart[0] >= 'A' && tokstart[0] < 'A' + input_radix - 10))
|
|
|
|
|
{
|
|
|
|
|
YYSTYPE newlval; /* Its value is ignored. */
|
2015-08-14 03:35:09 +08:00
|
|
|
|
int hextype = parse_number (par_state, tokstart, namelen, 0, &newlval);
|
2014-06-20 02:29:26 +08:00
|
|
|
|
if (hextype == INTEGER_LITERAL)
|
|
|
|
|
return NAME_OR_INT;
|
|
|
|
|
}
|
|
|
|
|
|
2019-03-25 12:50:14 +08:00
|
|
|
|
if (pstate->parse_completion && *pstate->lexptr == '\0')
|
2014-06-20 02:29:26 +08:00
|
|
|
|
saw_name_at_eof = 1;
|
|
|
|
|
|
|
|
|
|
return IDENTIFIER;
|
|
|
|
|
}
|
|
|
|
|
|
2015-08-14 03:35:09 +08:00
|
|
|
|
/* An object of this type is pushed on a FIFO by the "outer" lexer. */
|
2018-07-23 00:05:14 +08:00
|
|
|
|
struct token_and_value
|
2015-08-14 03:35:09 +08:00
|
|
|
|
{
|
|
|
|
|
int token;
|
|
|
|
|
YYSTYPE value;
|
2018-07-23 00:05:14 +08:00
|
|
|
|
};
|
2015-08-14 03:35:09 +08:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* A FIFO of tokens that have been read but not yet returned to the
|
|
|
|
|
parser. */
|
2018-07-23 00:05:14 +08:00
|
|
|
|
static std::vector<token_and_value> token_fifo;
|
2015-08-14 03:35:09 +08:00
|
|
|
|
|
|
|
|
|
/* Non-zero if the lexer should return tokens from the FIFO. */
|
|
|
|
|
static int popping;
|
|
|
|
|
|
|
|
|
|
/* Temporary storage for yylex; this holds symbol names as they are
|
|
|
|
|
built up. */
|
Eliminate make_cleanup_obstack_free, introduce auto_obstack
This commit eliminates make_cleanup_obstack_free, replacing it with a
new auto_obstack type that inherits obstack to add cdtors.
These changes in the parsers may not be obvious:
- obstack_init (&name_obstack);
- make_cleanup_obstack_free (&name_obstack);
+ name_obstack.clear ();
Here, the 'name_obstack' variable is a global. The change means that
the obstack's contents from a previous parse will stay around until
the next parsing starts. I.e., memory won't be reclaimed until then.
I don't think that's a problem, these objects don't really grow much
at all.
The other option I tried was to add a separate type that is like
auto_obstack but manages an external obstack, just for those cases. I
like the current approach better as that other approach adds more
boilerplate and yet another type to learn.
gdb/ChangeLog:
2017-06-27 Pedro Alves <palves@redhat.com>
* c-exp.y (name_obstack): Now an auto_obstack.
(yylex): Use auto_obstack::clear.
(c_parse): Use auto_obstack::clear instead of reinitializing and
freeing the obstack.
* c-lang.c (evaluate_subexp_c): Use auto_obstack.
* d-exp.y (name_obstack): Now an auto_obstack.
(yylex): Use auto_obstack::clear.
(d_parse): Use auto_obstack::clear instead of reinitializing and
freeing the obstack.
* dwarf2loc.c (fetch_const_value_from_synthetic_pointer): Use
auto_obstack.
* dwarf2read.c (create_addrmap_from_index)
(dwarf2_build_psymtabs_hard)
(update_enumeration_type_from_children): Likewise.
* gdb_obstack.h (auto_obstack): New type.
* go-exp.y (name_obstack): Now an auto_obstack.
(build_packaged_name): Use auto_obstack::clear.
(go_parse): Use auto_obstack::clear instead of reinitializing and
freeing the obstack.
* linux-tdep.c (linux_make_mappings_corefile_notes): Use
auto_obstack.
* printcmd.c (printf_wide_c_string, ui_printf): Use auto_obstack.
* rust-exp.y (work_obstack): Now an auto_obstack.
(rust_parse, rust_lex_tests): Use auto_obstack::clear instead of
reinitializing and freeing the obstack.
* utils.c (do_obstack_free, make_cleanup_obstack_free): Delete.
(host_char_to_target): Use auto_obstack.
* utils.h (make_cleanup_obstack_free): Delete declaration.
* valprint.c (generic_emit_char, generic_printstr): Use
auto_obstack.
2017-06-27 18:07:14 +08:00
|
|
|
|
static auto_obstack name_obstack;
|
2015-08-14 03:35:09 +08:00
|
|
|
|
|
|
|
|
|
/* Classify an IDENTIFIER token. The contents of the token are in `yylval'.
|
|
|
|
|
Updates yylval and returns the new token type. BLOCK is the block
|
|
|
|
|
in which lookups start; this can be NULL to mean the global scope. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
classify_name (struct parser_state *par_state, const struct block *block)
|
|
|
|
|
{
|
|
|
|
|
struct block_symbol sym;
|
|
|
|
|
struct field_of_this_result is_a_field_of_this;
|
|
|
|
|
|
2019-04-08 05:29:58 +08:00
|
|
|
|
std::string copy = copy_name (yylval.sval);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
|
2019-04-08 05:29:58 +08:00
|
|
|
|
sym = lookup_symbol (copy.c_str (), block, VAR_DOMAIN, &is_a_field_of_this);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
if (sym.symbol && SYMBOL_CLASS (sym.symbol) == LOC_TYPEDEF)
|
|
|
|
|
{
|
|
|
|
|
yylval.tsym.type = SYMBOL_TYPE (sym.symbol);
|
|
|
|
|
return TYPENAME;
|
|
|
|
|
}
|
|
|
|
|
else if (sym.symbol == NULL)
|
|
|
|
|
{
|
|
|
|
|
/* Look-up first for a module name, then a type. */
|
2019-04-08 05:29:58 +08:00
|
|
|
|
sym = lookup_symbol (copy.c_str (), block, MODULE_DOMAIN, NULL);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
if (sym.symbol == NULL)
|
2019-04-08 05:29:58 +08:00
|
|
|
|
sym = lookup_symbol (copy.c_str (), block, STRUCT_DOMAIN, NULL);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
|
|
|
|
|
if (sym.symbol != NULL)
|
|
|
|
|
{
|
|
|
|
|
yylval.tsym.type = SYMBOL_TYPE (sym.symbol);
|
|
|
|
|
return TYPENAME;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return UNKNOWN_NAME;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return IDENTIFIER;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Like classify_name, but used by the inner loop of the lexer, when a
|
|
|
|
|
name might have already been seen. CONTEXT is the context type, or
|
|
|
|
|
NULL if this is the first component of a name. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
classify_inner_name (struct parser_state *par_state,
|
|
|
|
|
const struct block *block, struct type *context)
|
|
|
|
|
{
|
|
|
|
|
struct type *type;
|
|
|
|
|
|
|
|
|
|
if (context == NULL)
|
|
|
|
|
return classify_name (par_state, block);
|
|
|
|
|
|
|
|
|
|
type = check_typedef (context);
|
2015-08-18 03:45:42 +08:00
|
|
|
|
if (!type_aggregate_p (type))
|
|
|
|
|
return ERROR;
|
2015-08-14 03:35:09 +08:00
|
|
|
|
|
2019-04-08 05:29:58 +08:00
|
|
|
|
std::string copy = copy_name (yylval.ssym.stoken);
|
|
|
|
|
yylval.ssym.sym = d_lookup_nested_symbol (type, copy.c_str (), block);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
|
|
|
|
|
if (yylval.ssym.sym.symbol == NULL)
|
|
|
|
|
return ERROR;
|
|
|
|
|
|
|
|
|
|
if (SYMBOL_CLASS (yylval.ssym.sym.symbol) == LOC_TYPEDEF)
|
|
|
|
|
{
|
|
|
|
|
yylval.tsym.type = SYMBOL_TYPE (yylval.ssym.sym.symbol);
|
|
|
|
|
return TYPENAME;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return IDENTIFIER;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The outer level of a two-level lexer. This calls the inner lexer
|
|
|
|
|
to return tokens. It then either returns these tokens, or
|
|
|
|
|
aggregates them into a larger token. This lets us work around a
|
|
|
|
|
problem in our parsing approach, where the parser could not
|
|
|
|
|
distinguish between qualified names and qualified types at the
|
|
|
|
|
right point. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
yylex (void)
|
|
|
|
|
{
|
|
|
|
|
token_and_value current;
|
|
|
|
|
int last_was_dot;
|
|
|
|
|
struct type *context_type = NULL;
|
|
|
|
|
int last_to_examine, next_to_examine, checkpoint;
|
|
|
|
|
const struct block *search_block;
|
|
|
|
|
|
2018-07-23 00:05:14 +08:00
|
|
|
|
if (popping && !token_fifo.empty ())
|
2015-08-14 03:35:09 +08:00
|
|
|
|
goto do_pop;
|
|
|
|
|
popping = 0;
|
|
|
|
|
|
|
|
|
|
/* Read the first token and decide what to do. */
|
|
|
|
|
current.token = lex_one_token (pstate);
|
|
|
|
|
if (current.token != IDENTIFIER && current.token != '.')
|
|
|
|
|
return current.token;
|
|
|
|
|
|
|
|
|
|
/* Read any sequence of alternating "." and identifier tokens into
|
|
|
|
|
the token FIFO. */
|
|
|
|
|
current.value = yylval;
|
2018-07-23 00:05:14 +08:00
|
|
|
|
token_fifo.push_back (current);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
last_was_dot = current.token == '.';
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
current.token = lex_one_token (pstate);
|
|
|
|
|
current.value = yylval;
|
2018-07-23 00:05:14 +08:00
|
|
|
|
token_fifo.push_back (current);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
|
|
|
|
|
if ((last_was_dot && current.token != IDENTIFIER)
|
|
|
|
|
|| (!last_was_dot && current.token != '.'))
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
last_was_dot = !last_was_dot;
|
|
|
|
|
}
|
|
|
|
|
popping = 1;
|
|
|
|
|
|
|
|
|
|
/* We always read one extra token, so compute the number of tokens
|
|
|
|
|
to examine accordingly. */
|
2018-07-23 00:05:14 +08:00
|
|
|
|
last_to_examine = token_fifo.size () - 2;
|
2015-08-14 03:35:09 +08:00
|
|
|
|
next_to_examine = 0;
|
|
|
|
|
|
2018-07-23 00:05:14 +08:00
|
|
|
|
current = token_fifo[next_to_examine];
|
2015-08-14 03:35:09 +08:00
|
|
|
|
++next_to_examine;
|
|
|
|
|
|
|
|
|
|
/* If we are not dealing with a typename, now is the time to find out. */
|
|
|
|
|
if (current.token == IDENTIFIER)
|
|
|
|
|
{
|
|
|
|
|
yylval = current.value;
|
2019-03-25 01:20:05 +08:00
|
|
|
|
current.token = classify_name (pstate, pstate->expression_context_block);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
current.value = yylval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If the IDENTIFIER is not known, it could be a package symbol,
|
|
|
|
|
first try building up a name until we find the qualified module. */
|
|
|
|
|
if (current.token == UNKNOWN_NAME)
|
|
|
|
|
{
|
Eliminate make_cleanup_obstack_free, introduce auto_obstack
This commit eliminates make_cleanup_obstack_free, replacing it with a
new auto_obstack type that inherits obstack to add cdtors.
These changes in the parsers may not be obvious:
- obstack_init (&name_obstack);
- make_cleanup_obstack_free (&name_obstack);
+ name_obstack.clear ();
Here, the 'name_obstack' variable is a global. The change means that
the obstack's contents from a previous parse will stay around until
the next parsing starts. I.e., memory won't be reclaimed until then.
I don't think that's a problem, these objects don't really grow much
at all.
The other option I tried was to add a separate type that is like
auto_obstack but manages an external obstack, just for those cases. I
like the current approach better as that other approach adds more
boilerplate and yet another type to learn.
gdb/ChangeLog:
2017-06-27 Pedro Alves <palves@redhat.com>
* c-exp.y (name_obstack): Now an auto_obstack.
(yylex): Use auto_obstack::clear.
(c_parse): Use auto_obstack::clear instead of reinitializing and
freeing the obstack.
* c-lang.c (evaluate_subexp_c): Use auto_obstack.
* d-exp.y (name_obstack): Now an auto_obstack.
(yylex): Use auto_obstack::clear.
(d_parse): Use auto_obstack::clear instead of reinitializing and
freeing the obstack.
* dwarf2loc.c (fetch_const_value_from_synthetic_pointer): Use
auto_obstack.
* dwarf2read.c (create_addrmap_from_index)
(dwarf2_build_psymtabs_hard)
(update_enumeration_type_from_children): Likewise.
* gdb_obstack.h (auto_obstack): New type.
* go-exp.y (name_obstack): Now an auto_obstack.
(build_packaged_name): Use auto_obstack::clear.
(go_parse): Use auto_obstack::clear instead of reinitializing and
freeing the obstack.
* linux-tdep.c (linux_make_mappings_corefile_notes): Use
auto_obstack.
* printcmd.c (printf_wide_c_string, ui_printf): Use auto_obstack.
* rust-exp.y (work_obstack): Now an auto_obstack.
(rust_parse, rust_lex_tests): Use auto_obstack::clear instead of
reinitializing and freeing the obstack.
* utils.c (do_obstack_free, make_cleanup_obstack_free): Delete.
(host_char_to_target): Use auto_obstack.
* utils.h (make_cleanup_obstack_free): Delete declaration.
* valprint.c (generic_emit_char, generic_printstr): Use
auto_obstack.
2017-06-27 18:07:14 +08:00
|
|
|
|
name_obstack.clear ();
|
2015-08-14 03:35:09 +08:00
|
|
|
|
obstack_grow (&name_obstack, current.value.sval.ptr,
|
|
|
|
|
current.value.sval.length);
|
|
|
|
|
|
|
|
|
|
last_was_dot = 0;
|
|
|
|
|
|
|
|
|
|
while (next_to_examine <= last_to_examine)
|
|
|
|
|
{
|
2018-07-23 00:05:14 +08:00
|
|
|
|
token_and_value next;
|
2015-08-14 03:35:09 +08:00
|
|
|
|
|
2018-07-23 00:05:14 +08:00
|
|
|
|
next = token_fifo[next_to_examine];
|
2015-08-14 03:35:09 +08:00
|
|
|
|
++next_to_examine;
|
|
|
|
|
|
2018-07-23 00:05:14 +08:00
|
|
|
|
if (next.token == IDENTIFIER && last_was_dot)
|
2015-08-14 03:35:09 +08:00
|
|
|
|
{
|
|
|
|
|
/* Update the partial name we are constructing. */
|
|
|
|
|
obstack_grow_str (&name_obstack, ".");
|
2018-07-23 00:05:14 +08:00
|
|
|
|
obstack_grow (&name_obstack, next.value.sval.ptr,
|
|
|
|
|
next.value.sval.length);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
|
2015-11-17 21:07:24 +08:00
|
|
|
|
yylval.sval.ptr = (char *) obstack_base (&name_obstack);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
yylval.sval.length = obstack_object_size (&name_obstack);
|
|
|
|
|
|
2019-03-25 01:20:05 +08:00
|
|
|
|
current.token = classify_name (pstate,
|
|
|
|
|
pstate->expression_context_block);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
current.value = yylval;
|
|
|
|
|
|
|
|
|
|
/* We keep going until we find a TYPENAME. */
|
|
|
|
|
if (current.token == TYPENAME)
|
|
|
|
|
{
|
|
|
|
|
/* Install it as the first token in the FIFO. */
|
2018-07-23 00:05:14 +08:00
|
|
|
|
token_fifo[0] = current;
|
|
|
|
|
token_fifo.erase (token_fifo.begin () + 1,
|
|
|
|
|
token_fifo.begin () + next_to_examine);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
2018-07-23 00:05:14 +08:00
|
|
|
|
else if (next.token == '.' && !last_was_dot)
|
2015-08-14 03:35:09 +08:00
|
|
|
|
last_was_dot = 1;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* We've reached the end of the name. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Reset our current token back to the start, if we found nothing
|
|
|
|
|
this means that we will just jump to do pop. */
|
2018-07-23 00:05:14 +08:00
|
|
|
|
current = token_fifo[0];
|
2015-08-14 03:35:09 +08:00
|
|
|
|
next_to_examine = 1;
|
|
|
|
|
}
|
|
|
|
|
if (current.token != TYPENAME && current.token != '.')
|
|
|
|
|
goto do_pop;
|
|
|
|
|
|
Eliminate make_cleanup_obstack_free, introduce auto_obstack
This commit eliminates make_cleanup_obstack_free, replacing it with a
new auto_obstack type that inherits obstack to add cdtors.
These changes in the parsers may not be obvious:
- obstack_init (&name_obstack);
- make_cleanup_obstack_free (&name_obstack);
+ name_obstack.clear ();
Here, the 'name_obstack' variable is a global. The change means that
the obstack's contents from a previous parse will stay around until
the next parsing starts. I.e., memory won't be reclaimed until then.
I don't think that's a problem, these objects don't really grow much
at all.
The other option I tried was to add a separate type that is like
auto_obstack but manages an external obstack, just for those cases. I
like the current approach better as that other approach adds more
boilerplate and yet another type to learn.
gdb/ChangeLog:
2017-06-27 Pedro Alves <palves@redhat.com>
* c-exp.y (name_obstack): Now an auto_obstack.
(yylex): Use auto_obstack::clear.
(c_parse): Use auto_obstack::clear instead of reinitializing and
freeing the obstack.
* c-lang.c (evaluate_subexp_c): Use auto_obstack.
* d-exp.y (name_obstack): Now an auto_obstack.
(yylex): Use auto_obstack::clear.
(d_parse): Use auto_obstack::clear instead of reinitializing and
freeing the obstack.
* dwarf2loc.c (fetch_const_value_from_synthetic_pointer): Use
auto_obstack.
* dwarf2read.c (create_addrmap_from_index)
(dwarf2_build_psymtabs_hard)
(update_enumeration_type_from_children): Likewise.
* gdb_obstack.h (auto_obstack): New type.
* go-exp.y (name_obstack): Now an auto_obstack.
(build_packaged_name): Use auto_obstack::clear.
(go_parse): Use auto_obstack::clear instead of reinitializing and
freeing the obstack.
* linux-tdep.c (linux_make_mappings_corefile_notes): Use
auto_obstack.
* printcmd.c (printf_wide_c_string, ui_printf): Use auto_obstack.
* rust-exp.y (work_obstack): Now an auto_obstack.
(rust_parse, rust_lex_tests): Use auto_obstack::clear instead of
reinitializing and freeing the obstack.
* utils.c (do_obstack_free, make_cleanup_obstack_free): Delete.
(host_char_to_target): Use auto_obstack.
* utils.h (make_cleanup_obstack_free): Delete declaration.
* valprint.c (generic_emit_char, generic_printstr): Use
auto_obstack.
2017-06-27 18:07:14 +08:00
|
|
|
|
name_obstack.clear ();
|
2015-08-14 03:35:09 +08:00
|
|
|
|
checkpoint = 0;
|
|
|
|
|
if (current.token == '.')
|
|
|
|
|
search_block = NULL;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
gdb_assert (current.token == TYPENAME);
|
2019-03-25 01:20:05 +08:00
|
|
|
|
search_block = pstate->expression_context_block;
|
2015-08-14 03:35:09 +08:00
|
|
|
|
obstack_grow (&name_obstack, current.value.sval.ptr,
|
|
|
|
|
current.value.sval.length);
|
|
|
|
|
context_type = current.value.tsym.type;
|
|
|
|
|
checkpoint = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
last_was_dot = current.token == '.';
|
|
|
|
|
|
|
|
|
|
while (next_to_examine <= last_to_examine)
|
|
|
|
|
{
|
2018-07-23 00:05:14 +08:00
|
|
|
|
token_and_value next;
|
2015-08-14 03:35:09 +08:00
|
|
|
|
|
2018-07-23 00:05:14 +08:00
|
|
|
|
next = token_fifo[next_to_examine];
|
2015-08-14 03:35:09 +08:00
|
|
|
|
++next_to_examine;
|
|
|
|
|
|
2018-07-23 00:05:14 +08:00
|
|
|
|
if (next.token == IDENTIFIER && last_was_dot)
|
2015-08-14 03:35:09 +08:00
|
|
|
|
{
|
|
|
|
|
int classification;
|
|
|
|
|
|
2018-07-23 00:05:14 +08:00
|
|
|
|
yylval = next.value;
|
2015-08-14 03:35:09 +08:00
|
|
|
|
classification = classify_inner_name (pstate, search_block,
|
|
|
|
|
context_type);
|
|
|
|
|
/* We keep going until we either run out of names, or until
|
|
|
|
|
we have a qualified name which is not a type. */
|
|
|
|
|
if (classification != TYPENAME && classification != IDENTIFIER)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Accept up to this token. */
|
|
|
|
|
checkpoint = next_to_examine;
|
|
|
|
|
|
|
|
|
|
/* Update the partial name we are constructing. */
|
|
|
|
|
if (context_type != NULL)
|
|
|
|
|
{
|
|
|
|
|
/* We don't want to put a leading "." into the name. */
|
|
|
|
|
obstack_grow_str (&name_obstack, ".");
|
|
|
|
|
}
|
2018-07-23 00:05:14 +08:00
|
|
|
|
obstack_grow (&name_obstack, next.value.sval.ptr,
|
|
|
|
|
next.value.sval.length);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
|
2015-11-17 21:07:24 +08:00
|
|
|
|
yylval.sval.ptr = (char *) obstack_base (&name_obstack);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
yylval.sval.length = obstack_object_size (&name_obstack);
|
|
|
|
|
current.value = yylval;
|
|
|
|
|
current.token = classification;
|
|
|
|
|
|
|
|
|
|
last_was_dot = 0;
|
|
|
|
|
|
|
|
|
|
if (classification == IDENTIFIER)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
context_type = yylval.tsym.type;
|
|
|
|
|
}
|
2018-07-23 00:05:14 +08:00
|
|
|
|
else if (next.token == '.' && !last_was_dot)
|
2015-08-14 03:35:09 +08:00
|
|
|
|
last_was_dot = 1;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* We've reached the end of the name. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If we have a replacement token, install it as the first token in
|
|
|
|
|
the FIFO, and delete the other constituent tokens. */
|
|
|
|
|
if (checkpoint > 0)
|
|
|
|
|
{
|
2018-07-23 00:05:14 +08:00
|
|
|
|
token_fifo[0] = current;
|
2015-08-14 03:35:09 +08:00
|
|
|
|
if (checkpoint > 1)
|
2018-07-23 00:05:14 +08:00
|
|
|
|
token_fifo.erase (token_fifo.begin () + 1,
|
|
|
|
|
token_fifo.begin () + checkpoint);
|
2015-08-14 03:35:09 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do_pop:
|
2018-07-23 00:05:14 +08:00
|
|
|
|
current = token_fifo[0];
|
|
|
|
|
token_fifo.erase (token_fifo.begin ());
|
2015-08-14 03:35:09 +08:00
|
|
|
|
yylval = current.value;
|
|
|
|
|
return current.token;
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-20 02:29:26 +08:00
|
|
|
|
int
|
|
|
|
|
d_parse (struct parser_state *par_state)
|
|
|
|
|
{
|
|
|
|
|
/* Setting up the parser state. */
|
2017-08-14 00:37:13 +08:00
|
|
|
|
scoped_restore pstate_restore = make_scoped_restore (&pstate);
|
2014-06-20 02:29:26 +08:00
|
|
|
|
gdb_assert (par_state != NULL);
|
|
|
|
|
pstate = par_state;
|
|
|
|
|
|
2017-04-08 05:37:25 +08:00
|
|
|
|
scoped_restore restore_yydebug = make_scoped_restore (&yydebug,
|
|
|
|
|
parser_debug);
|
2014-06-20 02:29:26 +08:00
|
|
|
|
|
Move type stack handling to a new class
This introduces a new "type_stack" class, and moves all the parser
type stack handling to this class. Parsers that wish to use this
facility must now instantiate this class somehow. I chose this
approach because a minority of the existing parsers require this.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* type-stack.h: New file.
* type-stack.c: New file.
* parser-defs.h (enum type_pieces, union type_stack_elt): Move to
type-stack.h.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Don't declare.
* parse.c (type_stack): Remove global.
(parse_exp_in_context): Update.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Remove (moved to
type-stack.c).
* f-exp.y (type_stack): New global.
Update rules.
(push_kind_type, f_parse): Update.
* d-exp.y (type_stack): New global.
Update rules.
(d_parse): Update.
* c-exp.y (struct c_parse_state) <type_stack>: New member.
Update rules.
* Makefile.in (COMMON_SFILES): Add type-stack.c.
(HFILES_NO_SRCDIR): Add type-stack.h.
2019-04-01 03:43:54 +08:00
|
|
|
|
struct type_stack stack;
|
|
|
|
|
scoped_restore restore_type_stack = make_scoped_restore (&type_stack,
|
|
|
|
|
&stack);
|
|
|
|
|
|
2014-06-20 02:29:26 +08:00
|
|
|
|
/* Initialize some state used by the lexer. */
|
|
|
|
|
last_was_structop = 0;
|
|
|
|
|
saw_name_at_eof = 0;
|
2019-03-25 01:33:10 +08:00
|
|
|
|
paren_depth = 0;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
|
2018-07-23 00:05:14 +08:00
|
|
|
|
token_fifo.clear ();
|
2015-08-14 03:35:09 +08:00
|
|
|
|
popping = 0;
|
Eliminate make_cleanup_obstack_free, introduce auto_obstack
This commit eliminates make_cleanup_obstack_free, replacing it with a
new auto_obstack type that inherits obstack to add cdtors.
These changes in the parsers may not be obvious:
- obstack_init (&name_obstack);
- make_cleanup_obstack_free (&name_obstack);
+ name_obstack.clear ();
Here, the 'name_obstack' variable is a global. The change means that
the obstack's contents from a previous parse will stay around until
the next parsing starts. I.e., memory won't be reclaimed until then.
I don't think that's a problem, these objects don't really grow much
at all.
The other option I tried was to add a separate type that is like
auto_obstack but manages an external obstack, just for those cases. I
like the current approach better as that other approach adds more
boilerplate and yet another type to learn.
gdb/ChangeLog:
2017-06-27 Pedro Alves <palves@redhat.com>
* c-exp.y (name_obstack): Now an auto_obstack.
(yylex): Use auto_obstack::clear.
(c_parse): Use auto_obstack::clear instead of reinitializing and
freeing the obstack.
* c-lang.c (evaluate_subexp_c): Use auto_obstack.
* d-exp.y (name_obstack): Now an auto_obstack.
(yylex): Use auto_obstack::clear.
(d_parse): Use auto_obstack::clear instead of reinitializing and
freeing the obstack.
* dwarf2loc.c (fetch_const_value_from_synthetic_pointer): Use
auto_obstack.
* dwarf2read.c (create_addrmap_from_index)
(dwarf2_build_psymtabs_hard)
(update_enumeration_type_from_children): Likewise.
* gdb_obstack.h (auto_obstack): New type.
* go-exp.y (name_obstack): Now an auto_obstack.
(build_packaged_name): Use auto_obstack::clear.
(go_parse): Use auto_obstack::clear instead of reinitializing and
freeing the obstack.
* linux-tdep.c (linux_make_mappings_corefile_notes): Use
auto_obstack.
* printcmd.c (printf_wide_c_string, ui_printf): Use auto_obstack.
* rust-exp.y (work_obstack): Now an auto_obstack.
(rust_parse, rust_lex_tests): Use auto_obstack::clear instead of
reinitializing and freeing the obstack.
* utils.c (do_obstack_free, make_cleanup_obstack_free): Delete.
(host_char_to_target): Use auto_obstack.
* utils.h (make_cleanup_obstack_free): Delete declaration.
* valprint.c (generic_emit_char, generic_printstr): Use
auto_obstack.
2017-06-27 18:07:14 +08:00
|
|
|
|
name_obstack.clear ();
|
2015-08-14 03:35:09 +08:00
|
|
|
|
|
2017-08-14 00:38:53 +08:00
|
|
|
|
return yyparse ();
|
2014-06-20 02:29:26 +08:00
|
|
|
|
}
|
|
|
|
|
|
2018-06-02 13:02:37 +08:00
|
|
|
|
static void
|
-Wwrite-strings: The Rest
This is the remainder boring constification that all looks more of less
borderline obvious IMO.
gdb/ChangeLog:
2017-04-05 Pedro Alves <palves@redhat.com>
* ada-exp.y (yyerror): Constify.
* ada-lang.c (bound_name, get_selections)
(ada_variant_discrim_type)
(ada_variant_discrim_name, ada_value_struct_elt)
(ada_lookup_struct_elt_type, is_unchecked_variant)
(ada_which_variant_applies, standard_exc, ada_get_next_arg)
(catch_ada_exception_command_split)
(catch_ada_assert_command_split, catch_assert_command)
(ada_op_name): Constify.
* ada-lang.h (ada_yyerror, get_selections)
(ada_variant_discrim_name, ada_value_struct_elt): Constify.
* arc-tdep.c (arc_print_frame_cache): Constify.
* arm-tdep.c (arm_skip_stub): Constify.
* ax-gdb.c (gen_binop, gen_struct_ref_recursive, gen_struct_ref)
(gen_aggregate_elt_ref): Constify.
* bcache.c (print_bcache_statistics): Constify.
* bcache.h (print_bcache_statistics): Constify.
* break-catch-throw.c (catch_exception_command_1):
* breakpoint.c (struct ep_type_description::description):
Constify.
(add_solib_catchpoint): Constify.
(catch_fork_command_1): Add cast.
(add_catch_command): Constify.
* breakpoint.h (add_catch_command, add_solib_catchpoint):
Constify.
* bsd-uthread.c (bsd_uthread_state): Constify.
* buildsym.c (patch_subfile_names): Constify.
* buildsym.h (next_symbol_text_func, patch_subfile_names):
Constify.
* c-exp.y (yyerror): Constify.
(token::oper): Constify.
* c-lang.h (c_yyerror, cp_print_class_member): Constify.
* c-varobj.c (cplus_describe_child): Constify.
* charset.c (find_charset_names): Add cast.
(find_charset_names): Constify array and add const_cast.
* cli/cli-cmds.c (complete_command, cd_command): Constify.
(edit_command): Constify.
* cli/cli-decode.c (lookup_cmd): Constify.
* cli/cli-dump.c (dump_memory_command, dump_value_command):
Constify.
(struct dump_context): Constify.
(add_dump_command, restore_command): Constify.
* cli/cli-script.c (get_command_line): Constify.
* cli/cli-script.h (get_command_line): Constify.
* cli/cli-utils.c (check_for_argument): Constify.
* cli/cli-utils.h (check_for_argument): Constify.
* coff-pe-read.c (struct read_pe_section_data): Constify.
* command.h (lookup_cmd): Constify.
* common/print-utils.c (decimal2str): Constify.
* completer.c (gdb_print_filename): Constify.
* corefile.c (set_gnutarget): Constify.
* cp-name-parser.y (yyerror): Constify.
* cp-valprint.c (cp_print_class_member): Constify.
* cris-tdep.c (cris_register_name, crisv32_register_name):
Constify.
* d-exp.y (yyerror): Constify.
(struct token::oper): Constify.
* d-lang.h (d_yyerror): Constify.
* dbxread.c (struct header_file_location::name): Constify.
(add_old_header_file, add_new_header_file, last_function_name)
(dbx_next_symbol_text, add_bincl_to_list)
(find_corresponding_bincl_psymtab, set_namestring)
(find_stab_function_addr, read_dbx_symtab, start_psymtab)
(dbx_end_psymtab, read_ofile_symtab, process_one_symbol):
* defs.h (command_line_input, print_address_symbolic)
(deprecated_readline_begin_hook): Constify.
* dwarf2read.c (anonymous_struct_prefix, dwarf_bool_name):
Constify.
* event-top.c (handle_line_of_input): Constify and add cast.
* exceptions.c (catch_errors): Constify.
* exceptions.h (catch_errors): Constify.
* expprint.c (print_subexp_standard, op_string, op_name)
(op_name_standard, dump_raw_expression, dump_raw_expression):
* expression.h (op_name, op_string, dump_raw_expression):
Constify.
* f-exp.y (yyerror): Constify.
(struct token::oper): Constify.
(struct f77_boolean_val::name): Constify.
* f-lang.c (f_word_break_characters): Constify.
* f-lang.h (f_yyerror): Constify.
* fork-child.c (fork_inferior): Add cast.
* frv-tdep.c (struct gdbarch_tdep::register_names): Constify.
(new_variant): Constify.
* gdbarch.sh (pstring_ptr, pstring_list): Constify.
* gdbarch.c: Regenerate.
* gdbcore.h (set_gnutarget): Constify.
* go-exp.y (yyerror): Constify.
(token::oper): Constify.
* go-lang.h (go_yyerror): Constify.
* go32-nat.c (go32_sysinfo): Constify.
* guile/scm-breakpoint.c (gdbscm_breakpoint_expression): Constify.
* guile/scm-cmd.c (cmdscm_function): Constify.
* guile/scm-param.c (pascm_param_value): Constify.
* h8300-tdep.c (h8300_register_name, h8300s_register_name)
(h8300sx_register_name): Constify.
* hppa-tdep.c (hppa32_register_name, hppa64_register_name):
Constify.
* ia64-tdep.c (ia64_register_names): Constify.
* infcmd.c (construct_inferior_arguments): Constify.
(path_command, attach_post_wait): Constify.
* language.c (show_range_command, show_case_command)
(unk_lang_error): Constify.
* language.h (language_defn::la_error)
(language_defn::la_name_of_this): Constify.
* linespec.c (decode_line_2): Constify.
* linux-thread-db.c (thread_db_err_str): Constify.
* lm32-tdep.c (lm32_register_name): Constify.
* m2-exp.y (yyerror): Constify.
* m2-lang.h (m2_yyerror): Constify.
* m32r-tdep.c (m32r_register_names): Constify and make static.
* m68hc11-tdep.c (m68hc11_register_names): Constify.
* m88k-tdep.c (m88k_register_name): Constify.
* macroexp.c (appendmem): Constify.
* mdebugread.c (fdr_name, add_data_symbol, parse_type)
(upgrade_type, parse_external, parse_partial_symbols)
(mdebug_next_symbol_text, cross_ref, mylookup_symbol, new_psymtab)
(new_symbol): Constify.
* memattr.c (mem_info_command): Constify.
* mep-tdep.c (register_name_from_keyword): Constify.
* mi/mi-cmd-env.c (mi_cmd_env_path, _initialize_mi_cmd_env):
Constify.
* mi/mi-cmd-stack.c (list_args_or_locals): Constify.
* mi/mi-cmd-var.c (mi_cmd_var_show_attributes): Constify.
* mi/mi-main.c (captured_mi_execute_command): Constify and add
cast.
(mi_execute_async_cli_command): Constify.
* mips-tdep.c (mips_register_name): Constify.
* mn10300-tdep.c (register_name, mn10300_generic_register_name)
(am33_register_name, am33_2_register_name)
* moxie-tdep.c (moxie_register_names): Constify.
* nat/linux-osdata.c (osdata_type): Constify fields.
* nto-tdep.c (nto_parse_redirection): Constify.
* objc-lang.c (lookup_struct_typedef, lookup_objc_class)
(lookup_child_selector): Constify.
(objc_methcall::name): Constify.
* objc-lang.h (lookup_objc_class, lookup_child_selector)
(lookup_struct_typedef): Constify.
* objfiles.c (pc_in_section): Constify.
* objfiles.h (pc_in_section): Constify.
* p-exp.y (struct token::oper): Constify.
(yyerror): Constify.
* p-lang.h (pascal_yyerror): Constify.
* parser-defs.h (op_name_standard): Constify.
(op_print::string): Constify.
(exp_descriptor::op_name): Constify.
* printcmd.c (print_address_symbolic): Constify.
* psymtab.c (print_partial_symbols): Constify.
* python/py-breakpoint.c (stop_func): Constify.
(bppy_get_expression): Constify.
* python/py-cmd.c (cmdpy_completer::name): Constify.
(cmdpy_function): Constify.
* python/py-event.c (evpy_add_attribute)
(gdbpy_initialize_event_generic): Constify.
* python/py-event.h (evpy_add_attribute)
(gdbpy_initialize_event_generic): Constify.
* python/py-evts.c (add_new_registry): Constify.
* python/py-finishbreakpoint.c (outofscope_func): Constify.
* python/py-framefilter.c (get_py_iter_from_func): Constify.
* python/py-inferior.c (get_buffer): Add cast.
* python/py-param.c (parm_constant::name): Constify.
* python/py-unwind.c (fprint_frame_id): Constify.
* python/python.c (gdbpy_parameter_value): Constify.
* remote-fileio.c (remote_fio_func_map): Make 'name' const.
* remote.c (memory_packet_config::name): Constify.
(show_packet_config_cmd, remote_write_bytes)
(remote_buffer_add_string):
* reverse.c (exec_reverse_once): Constify.
* rs6000-tdep.c (variant::name, variant::description): Constify.
* rust-exp.y (rustyyerror): Constify.
* rust-lang.c (rust_op_name): Constify.
* rust-lang.h (rustyyerror): Constify.
* serial.h (serial_ops::name): Constify.
* sh-tdep.c (sh_sh_register_name, sh_sh3_register_name)
(sh_sh3e_register_name, sh_sh2e_register_name)
(sh_sh2a_register_name, sh_sh2a_nofpu_register_name)
(sh_sh_dsp_register_name, sh_sh3_dsp_register_name)
(sh_sh4_register_name, sh_sh4_nofpu_register_name)
(sh_sh4al_dsp_register_name): Constify.
* sh64-tdep.c (sh64_register_name): Constify.
* solib-darwin.c (lookup_symbol_from_bfd): Constify.
* spu-tdep.c (spu_register_name, info_spu_dma_cmdlist): Constify.
* stabsread.c (patch_block_stabs, read_type_number)
(ref_map::stabs, ref_add, process_reference)
(symbol_reference_defined, define_symbol, define_symbol)
(error_type, read_type, read_member_functions, read_cpp_abbrev)
(read_one_struct_field, read_struct_fields, read_baseclasses)
(read_tilde_fields, read_struct_type, read_array_type)
(read_enum_type, read_sun_builtin_type, read_sun_floating_type)
(read_huge_number, read_range_type, read_args, common_block_start)
(find_name_end): Constify.
* stabsread.h (common_block_start, define_symbol)
(process_one_symbol, symbol_reference_defined, ref_add):
* symfile.c (get_section_index, add_symbol_file_command):
* symfile.h (get_section_index): Constify.
* target-descriptions.c (tdesc_type::name): Constify.
(tdesc_free_type): Add cast.
* target.c (find_default_run_target):
(add_deprecated_target_alias, find_default_run_target)
(target_announce_detach): Constify.
(do_option): Constify.
* target.h (add_deprecated_target_alias): Constify.
* thread.c (print_thread_info_1): Constify.
* top.c (deprecated_readline_begin_hook, command_line_input):
Constify.
(init_main): Add casts.
* top.h (handle_line_of_input): Constify.
* tracefile-tfile.c (tfile_write_uploaded_tsv): Constify.
* tracepoint.c (tvariables_info_1, trace_status_mi): Constify.
(tfind_command): Rename to ...
(tfind_command_1): ... this and constify.
(tfind_command): New function.
(tfind_end_command, tfind_start_command): Adjust.
(encode_source_string): Constify.
* tracepoint.h (encode_source_string): Constify.
* tui/tui-data.c (tui_partial_win_by_name): Constify.
* tui/tui-data.h (tui_partial_win_by_name): Constify.
* tui/tui-source.c (tui_set_source_content_nil): Constify.
* tui/tui-source.h (tui_set_source_content_nil): Constify.
* tui/tui-win.c (parse_scrolling_args): Constify.
* tui/tui-windata.c (tui_erase_data_content): Constify.
* tui/tui-windata.h (tui_erase_data_content): Constify.
* tui/tui-winsource.c (tui_erase_source_content): Constify.
* tui/tui.c (tui_enable): Add cast.
* utils.c (defaulted_query): Constify.
(init_page_info): Add cast.
(puts_debug, subset_compare): Constify.
* utils.h (subset_compare): Constify.
* varobj.c (varobj_format_string): Constify.
* varobj.h (varobj_format_string): Constify.
* vax-tdep.c (vax_register_name): Constify.
* windows-nat.c (windows_detach): Constify.
* xcoffread.c (process_linenos, xcoff_next_symbol_text): Constify.
* xml-support.c (gdb_xml_end_element): Constify.
* xml-tdesc.c (tdesc_start_reg): Constify.
* xstormy16-tdep.c (xstormy16_register_name): Constify.
* xtensa-tdep.c (xtensa_find_register_by_name): Constify.
* xtensa-tdep.h (xtensa_register_t::name): Constify.
gdb/gdbserver/ChangeLog:
2017-04-05 Pedro Alves <palves@redhat.com>
* gdbreplay.c (sync_error): Constify.
* linux-x86-low.c (push_opcode): Constify.
2017-04-06 02:21:37 +08:00
|
|
|
|
yyerror (const char *msg)
|
2014-06-20 02:29:26 +08:00
|
|
|
|
{
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
if (pstate->prev_lexptr)
|
|
|
|
|
pstate->lexptr = pstate->prev_lexptr;
|
2014-06-20 02:29:26 +08:00
|
|
|
|
|
Move lexptr and prev_lexptr to parser_state
This removes the lexptr and prev_lexptr globals, in favor of members
of parser_state. prev_lexptr could be isolated to each parser, but
since every parser uses it, that did not seem necessary.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* rust-exp.y (struct rust_parser) <lex_hex, lex_escape,
lex_operator, push_back>: New methods.
Update all rules.
(rust_parser::lex_hex, lex_escape): Rename and update.
(rust_parser::lex_string, rust_parser::lex_identifier): Update.
(rust_parser::lex_operator): Rename and update.
(rust_parser::lex_number, rustyylex, rustyyerror)
(rust_lex_test_init, rust_lex_test_sequence)
(rust_lex_test_push_back, rust_lex_tests): Update.
* parser-defs.h (struct parser_state) <parser_state>: Add "input"
parameter.
<lexptr, prev_lexptr>: New members.
(lexptr, prev_lexptr): Don't declare.
* parse.c (lexptr, prev_lexptr): Remove globals.
(parse_exp_in_context): Update.
* p-exp.y (yylex, yyerror): Update.
* m2-exp.y (parse_number, yylex, yyerror): Update.
* go-exp.y (lex_one_token, yyerror): Update.
* f-exp.y (match_string_literal, yylex, yyerror): Update.
* d-exp.y (lex_one_token, yyerror): Update.
* c-exp.y (scan_macro_expansion, finished_macro_expansion)
(lex_one_token, yyerror): Update.
* ada-lex.l (YY_INPUT): Update.
(rewind_to_char): Update.
* ada-exp.y (yyerror): Update.
2019-03-25 11:30:56 +08:00
|
|
|
|
error (_("A %s in expression, near `%s'."), msg, pstate->lexptr);
|
2014-06-20 02:29:26 +08:00
|
|
|
|
}
|
|
|
|
|
|