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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4820ebfbf479cf9c049d5565ef6cdc640962525f..6fdbf675f3e5b17a2a304e5cf74b49ea8ff0a341 100644 (file)
--- 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 efad85b19ad358c3acbf5001be5add7bb20cde0f..eb71f124848a52fd3707be96b65684a61a01f23d 100644 (file)
--- 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 f7fac27410edf683594e528252a91dbe603dd73c..8ce7c3a99a9cb061d2a0e411074f242b95d5a3c7 100644 (file)
--- 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[] =