X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/3b8378825ea8c3d2cae8c615a9ebf1f679730895..45aab21d7764f05b57450d61599fd83fa39ed71e:/data/lalr1.cc diff --git a/data/lalr1.cc b/data/lalr1.cc index 8c91fb68..76a83504 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -1,7 +1,6 @@ # C++ skeleton for Bison -# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -# 2010 Free Software Foundation, Inc. +# Copyright (C) 2002-2012 Free Software Foundation, Inc. # 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 @@ -36,7 +35,7 @@ m4_divert_push(0)dnl b4_defines_if( [@output(b4_spec_defines_file@)@ b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++], - [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010]) + [2002-2012]) dnl FIXME: This is wrong, we want computed header guards. [ /* C++ LALR(1) parser skeleton written by Akim Demaille. */ @@ -52,6 +51,8 @@ dnl FIXME: This is wrong, we want computed header guards. ]b4_percent_define_ifdef([[location_type]], [], [[#include "location.hh"]])[ +]b4_null_define[ + /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG ]b4_debug_flag[ @@ -283,7 +284,7 @@ b4_percent_code_get([[provides]])[]dnl ])dnl @output(b4_parser_file_name@)@ b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++], - [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010]) + [2002-2012]) b4_percent_code_get([[top]])[]dnl m4_if(b4_prefix, [yy], [], [ @@ -445,6 +446,9 @@ do { \ { YYUSE (yylocationp); YYUSE (yyvaluep); + std::ostream& yyo = debug_stream (); + std::ostream& yyoutput = yyo; + YYUSE (yyoutput); switch (yytype) { ]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl @@ -932,7 +936,7 @@ b4_error_verbose_if([int yystate, int yytoken], } } - char const* yyformat = 0; + char const* yyformat = YY_NULL; switch (yycount) { #define YYCASE_(N, S) \ @@ -1140,7 +1144,7 @@ b4_error_verbose_if([int yystate, int yytoken], dnl @output(b4_dir_prefix[]stack.hh@)@ b4_copyright([Stack handling for Bison parsers in C++], - [2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010])[ + [2002-2012])[ #ifndef BISON_STACK_HH # define BISON_STACK_HH