* Makefile.in (SFILES): Remove objc-exp.y.
(YYFILES): Remove objc-exp.c.
(YYOBJ): Remove objc-exp.o.
(local-maintainer-clean): Don't mention objc-exp.c.
* c-exp.y: Include objc-lang.h.
(%union) <class>: New field.
(NSSTRING, SELECTOR, CLASSNAME, OBJC_LBRAC): New tokens.
(exp): Clone subscript production for OBJC_LBRAC. Add various
Objective C productions.
(msglist, msgarglist, msgarg): New productions.
(array_mod, func_mod, operator): Clone productions for
OBJC_LBRAC.
(parse_string_or_char): Handle '@' strings.
(lex_one_token): Return OBJC_LBRAC. Recognize @selector.
(classify_name): Check la_name_of_this. Recognize ObjC class
names.
* objc-exp.y: Remove.
* objc-lang.c (objc_language_defn): Use c_parse, c_error.
* objc-lang.h (objc_parse, objc_error): Don't declare.
gdb/testsuite
* gdb.objc/print.exp (test_float_accepted): Remove kfails.
This commit is contained in:
Tom Tromey
parent
f66713d24a
commit
f2e8016f41
8 changed files with 180 additions and 1809 deletions
|
|
@ -1,3 +1,25 @@
|
|||
2012-07-26 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* Makefile.in (SFILES): Remove objc-exp.y.
|
||||
(YYFILES): Remove objc-exp.c.
|
||||
(YYOBJ): Remove objc-exp.o.
|
||||
(local-maintainer-clean): Don't mention objc-exp.c.
|
||||
* c-exp.y: Include objc-lang.h.
|
||||
(%union) <class>: New field.
|
||||
(NSSTRING, SELECTOR, CLASSNAME, OBJC_LBRAC): New tokens.
|
||||
(exp): Clone subscript production for OBJC_LBRAC. Add various
|
||||
Objective C productions.
|
||||
(msglist, msgarglist, msgarg): New productions.
|
||||
(array_mod, func_mod, operator): Clone productions for
|
||||
OBJC_LBRAC.
|
||||
(parse_string_or_char): Handle '@' strings.
|
||||
(lex_one_token): Return OBJC_LBRAC. Recognize @selector.
|
||||
(classify_name): Check la_name_of_this. Recognize ObjC class
|
||||
names.
|
||||
* objc-exp.y: Remove.
|
||||
* objc-lang.c (objc_language_defn): Use c_parse, c_error.
|
||||
* objc-lang.h (objc_parse, objc_error): Don't declare.
|
||||
|
||||
2012-07-26 Markus Metzger <markus.t.metzger@intel.com>
|
||||
|
||||
* python/py-inferior.c (infpy_threads): Call update_thread_list ().
|
||||
|
|
|
|||
|
|
@ -717,7 +717,7 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c ada-tasks.c \
|
|||
macrotab.c macroexp.c macrocmd.c macroscope.c main.c maint.c \
|
||||
mdebugread.c memattr.c mem-break.c minsyms.c mipsread.c memory-map.c \
|
||||
memrange.c mi/mi-common.c \
|
||||
objc-exp.y objc-lang.c \
|
||||
objc-lang.c \
|
||||
objfiles.c osabi.c observer.c osdata.c \
|
||||
opencl-lang.c \
|
||||
p-exp.y p-lang.c p-typeprint.c p-valprint.c parse.c printcmd.c \
|
||||
|
|
@ -935,14 +935,12 @@ REQUIRED_SUBDIRS = doc | testsuite | $(GNULIB_BUILDDIR) | data-directory
|
|||
# For now, shortcut the "configure GDB for fewer languages" stuff.
|
||||
YYFILES = c-exp.c \
|
||||
cp-name-parser.c \
|
||||
objc-exp.c \
|
||||
ada-lex.c \
|
||||
ada-exp.c \
|
||||
jv-exp.c \
|
||||
f-exp.c go-exp.c m2-exp.c p-exp.c
|
||||
YYOBJ = c-exp.o \
|
||||
cp-name-parser.o \
|
||||
objc-exp.o \
|
||||
ada-exp.o \
|
||||
jv-exp.o \
|
||||
f-exp.o go-exp.o m2-exp.o p-exp.o
|
||||
|
|
@ -1245,7 +1243,6 @@ local-maintainer-clean:
|
|||
rm -f c-exp.c \
|
||||
cp-name-parser.c \
|
||||
ada-lex.c ada-exp.c \
|
||||
objc-exp.c \
|
||||
jv-exp.tab \
|
||||
f-exp.c go-exp.c m2-exp.c p-exp.c
|
||||
rm -f TAGS $(INFOFILES)
|
||||
|
|
|
|||
154
gdb/c-exp.y
154
gdb/c-exp.y
|
|
@ -53,6 +53,7 @@
|
|||
#include "dfp.h"
|
||||
#include "gdb_assert.h"
|
||||
#include "macroscope.h"
|
||||
#include "objc-lang.h"
|
||||
|
||||
#define parse_type builtin_type (parse_gdbarch)
|
||||
|
||||
|
|
@ -159,6 +160,8 @@ void yyerror (char *);
|
|||
int *ivec;
|
||||
|
||||
struct type_stack *type_stack;
|
||||
|
||||
struct objc_class_str class;
|
||||
}
|
||||
|
||||
%{
|
||||
|
|
@ -194,16 +197,24 @@ static void check_parameter_typelist (VEC (type_ptr) *);
|
|||
nonterminal "name", which matches either NAME or TYPENAME. */
|
||||
|
||||
%token <tsval> STRING
|
||||
%token <sval> NSSTRING /* ObjC Foundation "NSString" literal */
|
||||
%token SELECTOR /* ObjC "@selector" pseudo-operator */
|
||||
%token <tsval> CHAR
|
||||
%token <ssym> NAME /* BLOCKNAME defined below to give it higher precedence. */
|
||||
%token <ssym> UNKNOWN_CPP_NAME
|
||||
%token <voidval> COMPLETE
|
||||
%token <tsym> TYPENAME
|
||||
%token <class> CLASSNAME /* ObjC Class name */
|
||||
%type <sval> name
|
||||
%type <svec> string_exp
|
||||
%type <ssym> name_not_typename
|
||||
%type <tsym> typename
|
||||
|
||||
/* This is like a '[' token, but is only generated when parsing
|
||||
Objective C. This lets us reuse the same parser without
|
||||
erroneously parsing ObjC-specific expressions in C. */
|
||||
%token OBJC_LBRAC
|
||||
|
||||
/* 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
|
||||
|
|
@ -251,7 +262,7 @@ static void check_parameter_typelist (VEC (type_ptr) *);
|
|||
%left '+' '-'
|
||||
%left '*' '/' '%'
|
||||
%right UNARY INCREMENT DECREMENT
|
||||
%right ARROW ARROW_STAR '.' DOT_STAR '[' '('
|
||||
%right ARROW ARROW_STAR '.' DOT_STAR '[' OBJC_LBRAC '('
|
||||
%token <ssym> BLOCKNAME
|
||||
%token <bval> FILENAME
|
||||
%type <bval> block
|
||||
|
|
@ -411,6 +422,78 @@ exp : exp '[' exp1 ']'
|
|||
{ write_exp_elt_opcode (BINOP_SUBSCRIPT); }
|
||||
;
|
||||
|
||||
exp : exp OBJC_LBRAC exp1 ']'
|
||||
{ write_exp_elt_opcode (BINOP_SUBSCRIPT); }
|
||||
;
|
||||
|
||||
/*
|
||||
* The rules below parse ObjC message calls of the form:
|
||||
* '[' target selector {':' argument}* ']'
|
||||
*/
|
||||
|
||||
exp : OBJC_LBRAC TYPENAME
|
||||
{
|
||||
CORE_ADDR class;
|
||||
|
||||
class = lookup_objc_class (parse_gdbarch,
|
||||
copy_name ($2.stoken));
|
||||
if (class == 0)
|
||||
error (_("%s is not an ObjC Class"),
|
||||
copy_name ($2.stoken));
|
||||
write_exp_elt_opcode (OP_LONG);
|
||||
write_exp_elt_type (parse_type->builtin_int);
|
||||
write_exp_elt_longcst ((LONGEST) class);
|
||||
write_exp_elt_opcode (OP_LONG);
|
||||
start_msglist();
|
||||
}
|
||||
msglist ']'
|
||||
{ write_exp_elt_opcode (OP_OBJC_MSGCALL);
|
||||
end_msglist();
|
||||
write_exp_elt_opcode (OP_OBJC_MSGCALL);
|
||||
}
|
||||
;
|
||||
|
||||
exp : OBJC_LBRAC CLASSNAME
|
||||
{
|
||||
write_exp_elt_opcode (OP_LONG);
|
||||
write_exp_elt_type (parse_type->builtin_int);
|
||||
write_exp_elt_longcst ((LONGEST) $2.class);
|
||||
write_exp_elt_opcode (OP_LONG);
|
||||
start_msglist();
|
||||
}
|
||||
msglist ']'
|
||||
{ write_exp_elt_opcode (OP_OBJC_MSGCALL);
|
||||
end_msglist();
|
||||
write_exp_elt_opcode (OP_OBJC_MSGCALL);
|
||||
}
|
||||
;
|
||||
|
||||
exp : OBJC_LBRAC exp
|
||||
{ start_msglist(); }
|
||||
msglist ']'
|
||||
{ write_exp_elt_opcode (OP_OBJC_MSGCALL);
|
||||
end_msglist();
|
||||
write_exp_elt_opcode (OP_OBJC_MSGCALL);
|
||||
}
|
||||
;
|
||||
|
||||
msglist : name
|
||||
{ add_msglist(&$1, 0); }
|
||||
| msgarglist
|
||||
;
|
||||
|
||||
msgarglist : msgarg
|
||||
| msgarglist msgarg
|
||||
;
|
||||
|
||||
msgarg : name ':' exp
|
||||
{ add_msglist(&$1, 1); }
|
||||
| ':' exp /* Unnamed arg. */
|
||||
{ add_msglist(0, 1); }
|
||||
| ',' exp /* Variable number of args. */
|
||||
{ add_msglist(0, 0); }
|
||||
;
|
||||
|
||||
exp : exp '('
|
||||
/* This is to save the value of arglist_len
|
||||
being accumulated by an outer function call. */
|
||||
|
|
@ -641,6 +724,13 @@ exp : VARIABLE
|
|||
}
|
||||
;
|
||||
|
||||
exp : SELECTOR '(' name ')'
|
||||
{
|
||||
write_exp_elt_opcode (OP_OBJC_SELECTOR);
|
||||
write_exp_string ($3);
|
||||
write_exp_elt_opcode (OP_OBJC_SELECTOR); }
|
||||
;
|
||||
|
||||
exp : SIZEOF '(' type ')' %prec UNARY
|
||||
{ write_exp_elt_opcode (OP_LONG);
|
||||
write_exp_elt_type (lookup_signed_typename
|
||||
|
|
@ -738,6 +828,14 @@ exp : string_exp
|
|||
}
|
||||
;
|
||||
|
||||
exp : NSSTRING /* ObjC NextStep NSString constant
|
||||
* of the form '@' '"' string '"'.
|
||||
*/
|
||||
{ write_exp_elt_opcode (OP_OBJC_NSSTRING);
|
||||
write_exp_string ($1);
|
||||
write_exp_elt_opcode (OP_OBJC_NSSTRING); }
|
||||
;
|
||||
|
||||
/* C++. */
|
||||
exp : TRUEKEYWORD
|
||||
{ write_exp_elt_opcode (OP_LONG);
|
||||
|
|
@ -1026,8 +1124,12 @@ direct_abs_decl: '(' abs_decl ')'
|
|||
|
||||
array_mod: '[' ']'
|
||||
{ $$ = -1; }
|
||||
| OBJC_LBRAC ']'
|
||||
{ $$ = -1; }
|
||||
| '[' INT ']'
|
||||
{ $$ = $2.val; }
|
||||
| OBJC_LBRAC INT ']'
|
||||
{ $$ = $2.val; }
|
||||
;
|
||||
|
||||
func_mod: '(' ')'
|
||||
|
|
@ -1293,6 +1395,10 @@ operator: OPERATOR NEW
|
|||
{ $$ = operator_stoken (" new[]"); }
|
||||
| OPERATOR DELETE '[' ']'
|
||||
{ $$ = operator_stoken (" delete[]"); }
|
||||
| OPERATOR NEW OBJC_LBRAC ']'
|
||||
{ $$ = operator_stoken (" new[]"); }
|
||||
| OPERATOR DELETE OBJC_LBRAC ']'
|
||||
{ $$ = operator_stoken (" delete[]"); }
|
||||
| OPERATOR '+'
|
||||
{ $$ = operator_stoken ("+"); }
|
||||
| OPERATOR '-'
|
||||
|
|
@ -1389,6 +1495,8 @@ operator: OPERATOR NEW
|
|||
{ $$ = operator_stoken ("()"); }
|
||||
| OPERATOR '[' ']'
|
||||
{ $$ = operator_stoken ("[]"); }
|
||||
| OPERATOR OBJC_LBRAC ']'
|
||||
{ $$ = operator_stoken ("[]"); }
|
||||
| OPERATOR conversion_type_id
|
||||
{ char *name;
|
||||
long length;
|
||||
|
|
@ -1897,6 +2005,7 @@ parse_string_or_char (char *tokptr, char **outptr, struct typed_stoken *value,
|
|||
{
|
||||
int quote;
|
||||
enum c_string_type type;
|
||||
int is_objc = 0;
|
||||
|
||||
/* Build the gdb internal form of the input string in tempbuf. Note
|
||||
that the buffer is null byte terminated *only* for the
|
||||
|
|
@ -1929,6 +2038,13 @@ parse_string_or_char (char *tokptr, char **outptr, struct typed_stoken *value,
|
|||
type = C_STRING_32;
|
||||
++tokptr;
|
||||
}
|
||||
else if (*tokptr == '@')
|
||||
{
|
||||
/* An Objective C string. */
|
||||
is_objc = 1;
|
||||
type = C_STRING;
|
||||
++tokptr;
|
||||
}
|
||||
else
|
||||
type = C_STRING;
|
||||
|
||||
|
|
@ -1976,7 +2092,7 @@ parse_string_or_char (char *tokptr, char **outptr, struct typed_stoken *value,
|
|||
|
||||
*outptr = tokptr;
|
||||
|
||||
return quote == '"' ? STRING : CHAR;
|
||||
return quote == '"' ? (is_objc ? NSSTRING : STRING) : CHAR;
|
||||
}
|
||||
|
||||
/* This is used to associate some attributes with a token. */
|
||||
|
|
@ -2275,6 +2391,8 @@ lex_one_token (void)
|
|||
case '(':
|
||||
paren_depth++;
|
||||
lexptr++;
|
||||
if (parse_language->la_language == language_objc && c == '[')
|
||||
return OBJC_LBRAC;
|
||||
return c;
|
||||
|
||||
case ']':
|
||||
|
|
@ -2371,6 +2489,20 @@ lex_one_token (void)
|
|||
char *p = &tokstart[1];
|
||||
size_t len = strlen ("entry");
|
||||
|
||||
if (parse_language->la_language == language_objc)
|
||||
{
|
||||
size_t len = strlen ("selector");
|
||||
|
||||
if (strncmp (p, "selector", len) == 0
|
||||
&& (p[len] == '\0' || isspace (p[len])))
|
||||
{
|
||||
lexptr = p + len;
|
||||
return SELECTOR;
|
||||
}
|
||||
else if (*p == '"')
|
||||
goto parse_string;
|
||||
}
|
||||
|
||||
while (isspace (*p))
|
||||
p++;
|
||||
if (strncmp (p, "entry", len) == 0 && !isalnum (p[len])
|
||||
|
|
@ -2410,6 +2542,8 @@ lex_one_token (void)
|
|||
/* Fall through. */
|
||||
case '\'':
|
||||
case '"':
|
||||
|
||||
parse_string:
|
||||
{
|
||||
int host_len;
|
||||
int result = parse_string_or_char (tokstart, &lexptr, &yylval.tsval,
|
||||
|
|
@ -2572,7 +2706,7 @@ classify_name (struct block *block)
|
|||
copy = copy_name (yylval.sval);
|
||||
|
||||
sym = lookup_symbol (copy, block, VAR_DOMAIN,
|
||||
parse_language->la_language == language_cplus
|
||||
parse_language->la_name_of_this
|
||||
? &is_a_field_of_this : (int *) NULL);
|
||||
|
||||
if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
|
||||
|
|
@ -2606,6 +2740,20 @@ classify_name (struct block *block)
|
|||
if (yylval.tsym.type != NULL)
|
||||
return TYPENAME;
|
||||
|
||||
/* See if it's an ObjC classname. */
|
||||
if (parse_language->la_language == language_objc && !sym)
|
||||
{
|
||||
CORE_ADDR Class = lookup_objc_class (parse_gdbarch, copy);
|
||||
if (Class)
|
||||
{
|
||||
yylval.class.class = Class;
|
||||
if ((sym = lookup_struct_typedef (copy, expression_context_block,
|
||||
1)))
|
||||
yylval.class.type = SYMBOL_TYPE (sym);
|
||||
return CLASSNAME;
|
||||
}
|
||||
}
|
||||
|
||||
/* 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. */
|
||||
|
|
|
|||
1792
gdb/objc-exp.y
1792
gdb/objc-exp.y
File diff suppressed because it is too large
Load diff
|
|
@ -514,8 +514,8 @@ const struct language_defn objc_language_defn = {
|
|||
array_row_major,
|
||||
macro_expansion_c,
|
||||
&exp_descriptor_standard,
|
||||
objc_parse,
|
||||
objc_error,
|
||||
c_parse,
|
||||
c_error,
|
||||
null_post_parser,
|
||||
objc_printchar, /* Print a character constant */
|
||||
objc_printstr, /* Function to print string constant */
|
||||
|
|
|
|||
|
|
@ -27,10 +27,6 @@ struct stoken;
|
|||
struct value;
|
||||
struct block;
|
||||
|
||||
extern int objc_parse (void); /* Defined in c-exp.y */
|
||||
|
||||
extern void objc_error (char *); /* Defined in c-exp.y */
|
||||
|
||||
extern CORE_ADDR lookup_objc_class (struct gdbarch *gdbarch,
|
||||
char *classname);
|
||||
extern CORE_ADDR lookup_child_selector (struct gdbarch *gdbarch,
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2012-07-26 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* gdb.objc/print.exp (test_float_accepted): Remove kfails.
|
||||
|
||||
2012-07-26 Markus Metzger <markus.t.metzger@intel.com>
|
||||
|
||||
* gdb.python/py-inferior.c (thread): New function.
|
||||
|
|
|
|||
|
|
@ -32,13 +32,9 @@ proc test_float_accepted {} {
|
|||
# Test all the suffixes (including no suffix).
|
||||
gdb_test "p 1." " = 1"
|
||||
gdb_test "p 1.5" " = 1.5"
|
||||
setup_kfail gdb/11925 "*-*-*"
|
||||
gdb_test "p 1.f" " = 1"
|
||||
setup_kfail gdb/11925 "*-*-*"
|
||||
gdb_test "p 1.5f" " = 1.5"
|
||||
setup_kfail gdb/11925 "*-*-*"
|
||||
gdb_test "p 1.l" " = 1"
|
||||
setup_kfail gdb/11925 "*-*-*"
|
||||
gdb_test "p 1.5l" " = 1.5"
|
||||
|
||||
# Test hexadecimal floating point.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue