glr: eliminate last bits of unwanted locations.

[bison.git] / src / flex-scanner.h

diff --git a/src/flex-scanner.h b/src/flex-scanner.h
index bf190afd4f862551728ec79737d399ad04c2a375..23a266ac54e2683396f2bd3324551548a0cacc56 100644 (file)
--- a/src/flex-scanner.h
+++ b/src/flex-scanner.h
@@ -1,12 +1,12 @@
-/* Common parts between scan-code.l and scan-gram.l.
+/* Common parts between scan-code.l, scan-gram.l, and scan-skel.l.
 
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2012 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
-   This program is free software; you can redistribute it and/or modify
+   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 2 of the License, or
+   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,
@@ -15,10 +15,7 @@
    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, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301  USA
-*/
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef FLEX_PREFIX
 # error "FLEX_PREFIX not defined"
@@ -50,6 +47,19 @@ int   FLEX_PREFIX (lex_destroy) (void);
 # define yytext  FLEX_PREFIX (text)
 #endif
 
+/* Non-reentrant scanners generated by Flex 2.5.9 and later (and some earlier
+   versions according to the Flex manual) leak memory if yylex_destroy is not
+   invoked.  However, yylex_destroy is not defined before Flex 2.5.9, so give
+   an implementation here that at least appears to work with Flex 2.5.4.  */
+#if !defined YY_FLEX_MAJOR_VERSION || YY_FLEX_MAJOR_VERSION < 2 \
+    || (YY_FLEX_MAJOR_VERSION == 2 \
+        && (!defined YY_FLEX_MINOR_VERSION || YY_FLEX_MINOR_VERSION < 5 \
+            || (YY_FLEX_MINOR_VERSION == 5 \
+                && (!defined YY_FLEX_SUBMINOR_VERSION \
+                    || YY_FLEX_SUBMINOR_VERSION < 9))))
+# define yylex_destroy() yy_delete_buffer (YY_CURRENT_BUFFER)
+#endif
+
 /* OBSTACK_FOR_STRING -- Used to store all the characters that we need to
    keep (to construct ID, STRINGS etc.).  Use the following macros to
    use it.
@@ -59,6 +69,8 @@ int   FLEX_PREFIX (lex_destroy) (void);
    STRING_FINISH also stores this string in LAST_STRING, which can be
    used, and which is used by STRING_FREE to free the last string.  */
 
+#ifndef FLEX_NO_OBSTACK
+
 static struct obstack obstack_for_string;
 
 #define STRING_GROW   \
@@ -72,3 +84,5 @@ static struct obstack obstack_for_string;
 
 #define STRING_FREE \
   obstack_free (&obstack_for_string, last_string)
+
+#endif