c++: fix several issues with locations

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

diff --git a/src/flex-scanner.h b/src/flex-scanner.h
index 5d08dec6a7bffa0b0d81b5089317dd239ae5b282..d72986e8126664d0b4efde3fa836294cd4cc8d45 100644 (file)
--- a/src/flex-scanner.h
+++ b/src/flex-scanner.h
@@ -1,12 +1,12 @@
 /* Common parts between scan-code.l, scan-gram.l, and scan-skel.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-2013 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    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
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,16 +15,20 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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"
 #endif
 
 
 #ifndef FLEX_PREFIX
 # error "FLEX_PREFIX not defined"
 #endif
 

+/* Flex full version as a number.  */
+#define FLEX_VERSION                    \
+  ((YY_FLEX_MAJOR_VERSION) * 1000000    \
+   + (YY_FLEX_MINOR_VERSION) * 1000     \
+   + (YY_FLEX_SUBMINOR_VERSION))
+

 /* Pacify "gcc -Wmissing-prototypes" when flex 2.5.31 is used.  */
 /* Pacify "gcc -Wmissing-prototypes" when flex 2.5.31 is used.  */

+#if FLEX_VERSION <= 2005031

 int   FLEX_PREFIX (get_lineno) (void);
 FILE *FLEX_PREFIX (get_in) (void);
 FILE *FLEX_PREFIX (get_out) (void);
 int   FLEX_PREFIX (get_lineno) (void);
 FILE *FLEX_PREFIX (get_in) (void);
 FILE *FLEX_PREFIX (get_out) (void);


@@ -36,6 +40,7 @@ void  FLEX_PREFIX (set_out) (FILE *);
 int   FLEX_PREFIX (get_debug) (void);
 void  FLEX_PREFIX (set_debug) (int);
 int   FLEX_PREFIX (lex_destroy) (void);
 int   FLEX_PREFIX (get_debug) (void);
 void  FLEX_PREFIX (set_debug) (int);
 int   FLEX_PREFIX (lex_destroy) (void);

+#endif

 
 #define last_string    FLEX_PREFIX (last_string)
 
 
 #define last_string    FLEX_PREFIX (last_string)
 


@@ -54,12 +59,7 @@ int   FLEX_PREFIX (lex_destroy) (void);
    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.  */
    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))))
+#if FLEX_VERSION <= 2005009

 # define yylex_destroy() yy_delete_buffer (YY_CURRENT_BUFFER)
 #endif
 
 # define yylex_destroy() yy_delete_buffer (YY_CURRENT_BUFFER)
 #endif
 


@@ -76,16 +76,13 @@ int   FLEX_PREFIX (lex_destroy) (void);
 
 static struct obstack obstack_for_string;
 
 
 static struct obstack obstack_for_string;
 

-#define STRING_GROW   \
+# define STRING_GROW                                    \

   obstack_grow (&obstack_for_string, yytext, yyleng)
 
   obstack_grow (&obstack_for_string, yytext, yyleng)
 

-#define STRING_FINISH                                  \
-  do {                                                 \
-    obstack_1grow (&obstack_for_string, '\0');         \
-    last_string = obstack_finish (&obstack_for_string);        \
-  } while (0)
+# define STRING_FINISH                                  \
+  (last_string = obstack_finish0 (&obstack_for_string))

 
 

-#define STRING_FREE \
+# define STRING_FREE                                    \

   obstack_free (&obstack_for_string, last_string)
 
 #endif
   obstack_free (&obstack_for_string, last_string)
 
 #endif