X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5362ed19b6e8a8091345d979eefb4e11087b728f..9b33de72cd2469bedac2b5f0a48a8782571ea9db:/src/scan-gram.l?ds=sidebyside

diff --git a/src/scan-gram.l b/src/scan-gram.l
index 9429c5f1..fb22e588 100644
--- a/src/scan-gram.l
+++ b/src/scan-gram.l
@@ -1,6 +1,7 @@
 /* Bison Grammar Scanner                             -*- C -*-
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation,
+   Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -58,7 +59,7 @@ static size_t no_cr_read (FILE *, char *, size_t);
 #define YY_INPUT(buf, result, size) ((result) = no_cr_read (yyin, buf, size))
 
 /* A string representing the most recently saved token.  */
-char *last_string;
+static char *last_string;
 
 void
 gram_scanner_last_string_free (void)
@@ -156,16 +157,14 @@ splice	 (\\[ \f\t\v]*\n)*
   `----------------------------*/
 <INITIAL>
 {
-  "%after-header"                   return PERCENT_AFTER_HEADER;
-  "%before-header"                  return PERCENT_BEFORE_HEADER;
   "%binary"               	    return PERCENT_NONASSOC;
+  "%code"                           return PERCENT_CODE;
   "%debug"                	    return PERCENT_DEBUG;
   "%default"[-_]"prec"    	    return PERCENT_DEFAULT_PREC;
   "%define"               	    return PERCENT_DEFINE;
   "%defines"              	    return PERCENT_DEFINES;
   "%destructor"		  	    return PERCENT_DESTRUCTOR;
   "%dprec"		  	    return PERCENT_DPREC;
-  "%end-header"                     return PERCENT_END_HEADER;
   "%error"[-_]"verbose"   	    return PERCENT_ERROR_VERBOSE;
   "%expect"               	    return PERCENT_EXPECT;
   "%expect"[-_]"rr"	  	    return PERCENT_EXPECT_RR;
@@ -173,6 +172,7 @@ splice	 (\\[ \f\t\v]*\n)*
   "%fixed"[-_]"output"[-_]"files"   return PERCENT_YACC;
   "%initial-action"       	    return PERCENT_INITIAL_ACTION;
   "%glr-parser"           	    return PERCENT_GLR_PARSER;
+  "%language"                 	    return PERCENT_LANGUAGE;
   "%left"                 	    return PERCENT_LEFT;
   "%lex-param"		  	    return PERCENT_LEX_PARAM;
   "%locations"            	    return PERCENT_LOCATIONS;
@@ -188,11 +188,12 @@ splice	 (\\[ \f\t\v]*\n)*
   "%prec"                 	    return PERCENT_PREC;
   "%printer"              	    return PERCENT_PRINTER;
   "%pure"[-_]"parser"     	    return PERCENT_PURE_PARSER;
+  "%push-parser"		    return PERCENT_PUSH_PARSER;
+  "%push-pull-parser"		    return PERCENT_PUSH_PULL_PARSER;
   "%require"              	    return PERCENT_REQUIRE;
   "%right"                	    return PERCENT_RIGHT;
   "%skeleton"             	    return PERCENT_SKELETON;
   "%start"                	    return PERCENT_START;
-  "%start-header"                   return PERCENT_START_HEADER;
   "%term"                 	    return PERCENT_TOKEN;
   "%token"                	    return PERCENT_TOKEN;
   "%token"[-_]"table"     	    return PERCENT_TOKEN_TABLE;
@@ -208,6 +209,8 @@ splice	 (\\[ \f\t\v]*\n)*
   "="                     return EQUAL;
   "|"                     return PIPE;
   ";"                     return SEMICOLON;
+  "<*>"                   return TYPE_TAG_ANY;
+  "<>"                    return TYPE_TAG_NONE;
 
   {id} {
     val->uniqstr = uniqstr_new (yytext);
@@ -520,7 +523,7 @@ splice	 (\\[ \f\t\v]*\n)*
       {
 	STRING_FINISH;
 	loc->start = code_start;
-	val->chars = last_string;
+	val->code = last_string;
 	BEGIN INITIAL;
 	return BRACED_CODE;
       }
@@ -534,7 +537,7 @@ splice	 (\\[ \f\t\v]*\n)*
     unexpected_eof (code_start, "}");
     STRING_FINISH;
     loc->start = code_start;
-    val->chars = last_string;
+    val->code = last_string;
     BEGIN INITIAL;
     return BRACED_CODE;
   }
@@ -797,5 +800,5 @@ gram_scanner_free (void)
 {
   obstack_free (&obstack_for_string, 0);
   /* Reclaim Flex's buffers.  */
-  yy_delete_buffer (YY_CURRENT_BUFFER);
+  yylex_destroy ();
 }