yacc.c: style changes

[bison.git] / data / stack.hh

diff --git a/data/stack.hh b/data/stack.hh
index e8ea9e4548717479ddaaffbb46483f6a20e5c1dd..4fd136fd2d55f9203aed75b2728be67665aeae9e 100644 (file)
--- a/data/stack.hh
+++ b/data/stack.hh
@@ -1,7 +1,6 @@
 # C++ skeleton for Bison
 
 # C++ skeleton for Bison
 

-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008-2009 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
 
 # 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


@@ -17,21 +16,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_pushdef([b4_copyright_years],
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 m4_pushdef([b4_copyright_years],

-           [2002, 2003, 2004, 2005, 2006, 2007, 2008-2009])
+           [2002-2012])

 
 

-# We do want M4 expansion after # for CPP macros.
-m4_changecom()
-m4_divert_push(0)dnl
-@output(b4_dir_prefix[]stack.hh@)@
-b4_copyright([Stack handling for Bison parsers in C++])[
-
-#ifndef BISON_STACK_HH
-# define BISON_STACK_HH
-
-#include <deque>
-
-]b4_namespace_open[
-  template <class T, class S = std::deque<T> >
+# b4_stack_define
+# ---------------
+m4_define([b4_stack_define],
+[[  template <class T, class S = std::deque<T> >

   class stack
   {
   public:
   class stack
   {
   public:


@@ -75,7 +65,7 @@ b4_copyright([Stack handling for Bison parsers in C++])[
     pop (unsigned int n = 1)
     {
       for (; n; --n)
     pop (unsigned int n = 1)
     {
       for (; n; --n)

-       seq_.pop_front ();
+        seq_.pop_front ();

     }
 
     inline
     }
 
     inline


@@ -110,8 +100,8 @@ b4_copyright([Stack handling for Bison parsers in C++])[
   {
   public:
     slice (const S& stack, unsigned int range)
   {
   public:
     slice (const S& stack, unsigned int range)

-      : stack_ (stack),
-        range_ (range)
+      : stack_ (stack)
+      , range_ (range)

     {
     }
 
     {
     }
 


@@ -126,10 +116,27 @@ b4_copyright([Stack handling for Bison parsers in C++])[
     const S& stack_;
     unsigned int range_;
   };
     const S& stack_;
     unsigned int range_;
   };

+]])
+
+b4_defines_if(
+[b4_output_begin([b4_dir_prefix[]stack.hh])
+b4_copyright([Stack handling for Bison parsers in C++])[
+
+/**
+ ** \file ]b4_dir_prefix[stack.hh
+ ** Define the ]b4_namespace_ref[::stack class.
+ */
+
+]b4_cpp_guard_open([b4_dir_prefix[]stack.hh])[
+
+# include <deque>
+
+]b4_namespace_open[
+]b4_stack_define[

 ]b4_namespace_close[
 
 ]b4_namespace_close[
 

-#endif // not BISON_STACK_HH[]dnl
-]
-m4_divert_pop(0)
-m4_popdef([b4_copyright_years])dnl
-m4_changecom([#])
+]b4_cpp_guard_close([b4_dir_prefix[]stack.hh])
+b4_output_end()
+])
+
+m4_popdef([b4_copyright_years])