summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul N. Hilfinger <hilfinger@adacore.com>2004-10-03 08:35:57 +0000
committerPaul N. Hilfinger <hilfinger@adacore.com>2004-10-03 08:35:57 +0000
commit6bc7b090c72566e003d130cc4b570a5ea7b98a38 (patch)
tree135a5b3743f666b0752d6bbe3d8bb5bc66b2a2b1
parent076c4d38263d8cc49b4702bb8c4d3955465fd298 (diff)
downloadgdb-6bc7b090c72566e003d130cc4b570a5ea7b98a38.tar.gz
* Makefile.in (.l.c): Modify rule for compatibility with recent
versions of flex, and remove most command-line options. * ada-lex.l: Add %options line in place of -I -i and -s command-line options.
-rw-r--r--gdb/ChangeLog7
-rw-r--r--gdb/Makefile.in4
-rw-r--r--gdb/ada-lex.l5
3 files changed, 11 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9141c3d21cd..99620d3c896 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-03 Paul Hilfinger <hilfingr@nile.gnat.com>
+
+ * Makefile.in (.l.c): Modify rule for compatibility with recent
+ versions of flex, and remove most command-line options.
+ * ada-lex.l: Add %options line in place of -I -i and -s command-line
+ options.
+
2004-10-02 Paul N. Hilfinger <Hilfinger@gnat.com>
Turn on initial Ada support (mainly expression evaluation).
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index d7771756b9b..3a4bd371974 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1583,8 +1583,8 @@ po/$(PACKAGE).pot: force
mv $@.new ./$*.c
.l.c:
@if [ "$(FLEX)" ] && $(FLEX) --version >/dev/null 2>&1; then \
- echo $(FLEX) -Isit $< ">" $@; \
- $(FLEX) -Isit $< > $@; \
+ echo $(FLEX) -o$@ $<; \
+ $(FLEX) -o$@ $<; \
elif [ ! -f $@ -a ! -f $< ]; then \
echo "$< missing and flex not available."; \
false; \
diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l
index 6ecd849cdbc..10870581a61 100644
--- a/gdb/ada-lex.l
+++ b/gdb/ada-lex.l
@@ -26,9 +26,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
/* each successive token and places a semantic value into yylval */
/* (ada-lval), defined by the parser. */
-/* Run flex with (at least) the -i option (case-insensitive), and the -I */
-/* option (interactive---no unnecessary lookahead). */
-
DIG [0-9]
NUM10 ({DIG}({DIG}|_)*)
HEXDIG [0-9a-f]
@@ -89,6 +86,8 @@ static int find_dot_all (const char *);
%}
+%option case-insensitive interactive nodefault
+
%s IN_STRING BEFORE_QUAL_QUOTE
%%