aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDilyan Palauzov <dilyan.palauzov@aegee.org>2019-05-03 13:42:11 -0600
committerTom Tromey <tromey@adacore.com>2019-05-03 17:03:56 -0600
commitfcd60b848ed7619461b0b0e316201e7745cdb61d (patch)
tree978cd3daee6d6d603ca72dbe772b5e411c045a46
parent0fdfd794d22b3b516c3031e76afecaa0ed813931 (diff)
downloadgdb-fcd60b848ed7619461b0b0e316201e7745cdb61d.zip
gdb-fcd60b848ed7619461b0b0e316201e7745cdb61d.tar.gz
gdb-fcd60b848ed7619461b0b0e316201e7745cdb61d.tar.bz2
Add noyywrap to ada-lex.l
This patch comes from PR ada/21406. It adds the noyywrap option to ada-lex.l. This was already done (by the same author) for other .l files in the binutils-gdb tree, so it seems reasonably safe. Tested on x86-64 Fedora 29. gdb/ChangeLog 2019-05-03 Dilyan Palauzov <dilyan.palauzov@aegee.org> PR ada/21406: * ada-exp.y (yywrap): Don't define. * ada-lex.l (%option): Add noyywrap (yywrap): Remove.
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/ada-exp.y1
-rw-r--r--gdb/ada-lex.l8
3 files changed, 8 insertions, 8 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4820ebf..6fdbf67 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2019-05-03 Dilyan Palauzov <dilyan.palauzov@aegee.org>
+
+ PR ada/21406:
+ * ada-exp.y (yywrap): Don't define.
+ * ada-lex.l (%option): Add noyywrap
+ (yywrap): Remove.
+
2019-05-03 Eli Zaretskii <eliz@gnu.org>
* common/common-defs.h [__MINGW32__ || __CYGWIN__]: Define
diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y
index efad85b..eb71f12 100644
--- a/gdb/ada-exp.y
+++ b/gdb/ada-exp.y
@@ -717,7 +717,6 @@ primary : '*' primary %prec '.'
#define yy_switch_to_buffer ada_yy_switch_to_buffer
#define yyrestart ada_yyrestart
#define yytext ada_yytext
-#define yywrap ada_yywrap
static struct obstack temp_parse_space;
diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l
index f7fac27..8ce7c3a 100644
--- a/gdb/ada-lex.l
+++ b/gdb/ada-lex.l
@@ -89,7 +89,7 @@ static int paren_depth;
%}
-%option case-insensitive interactive nodefault
+%option case-insensitive interactive nodefault noyywrap
%s BEFORE_QUAL_QUOTE
@@ -634,12 +634,6 @@ rewind_to_char (int ch)
yyrestart (NULL);
}
-int
-yywrap(void)
-{
- return 1;
-}
-
/* Dummy definition to suppress warnings about unused static definitions. */
typedef void (*dummy_function) ();
dummy_function ada_flex_use[] =