Bind examples/calc++ to the package.

* examples/calc++/Makefile: Remove, replaced by...
* examples/calc++/Makefile.am: ... this new file.
* examples/calc++/test: Remove input.
* examples/calc++/compile: Remove.
* examples/Makefile.am: New.
* configure.ac, Makefile.am: Adjust.
* doc/Makefile.am (clean-local): New, for more recent texi2dvis.

diff --git a/ChangeLog b/ChangeLog
index 0c4f8132d2652a1efd3967f23f33d69298e8aea4..23bdb1bfc6b849615d34936c72841ee5a58a7200 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-07-06  Akim Demaille  <akim@epita.fr>
+
+       Bind examples/calc++ to the package.
+       * examples/calc++/Makefile: Remove, replaced by...
+       * examples/calc++/Makefile.am: ... this new file.
+       * examples/calc++/test: Remove input.
+       * examples/calc++/compile: Remove.
+       * examples/Makefile.am: New.
+       * configure.ac, Makefile.am: Adjust.
+       * doc/Makefile.am (clean-local): New, for more recent texi2dvis.
+

 2005-07-05  Paul Eggert  <eggert@cs.ucla.edu>
 
        * data/glr.c (yyFail): Drastically simplify; since the format argument
 2005-07-05  Paul Eggert  <eggert@cs.ucla.edu>
 
        * data/glr.c (yyFail): Drastically simplify; since the format argument

diff --git a/Makefile.am b/Makefile.am
index a307e63129054668ff759640fa1d4b73351fefe6..3baff6fb57764eed748c213326370329f36871fd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-

-## Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005 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


@@ -18,7 +18,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
 
 ACLOCAL_AMFLAGS = -I m4
 

-SUBDIRS = config po lib data src doc tests
+SUBDIRS = config po lib data src doc tests examples

 
 EXTRA_DIST = REFERENCES OChangeLog Makefile.maint GNUmakefile Makefile.cfg
 
 
 EXTRA_DIST = REFERENCES OChangeLog Makefile.maint GNUmakefile Makefile.cfg
 

diff --git a/configure.ac b/configure.ac
index 23e99ff53ba27616ed3f0bdf4fde808c94c4fc7c..fb1a97c9c9b3be326201f92b41ce29ebea730b61 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -129,5 +129,7 @@ AC_CONFIG_FILES([Makefile
                  config/Makefile
                  po/Makefile.in
                  data/Makefile
                  config/Makefile
                  po/Makefile.in
                  data/Makefile

+                examples/Makefile
+                   examples/calc++/Makefile

                  lib/Makefile src/Makefile doc/Makefile])
 AC_OUTPUT
                  lib/Makefile src/Makefile doc/Makefile])
 AC_OUTPUT

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 567e5b780a659ec63bc8460c8ed7edf3d330805a..b7b2d4ea0326a3ce90389935d1f16ae5fb20a233 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-

-## Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2005 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


@@ -25,6 +25,9 @@ EXTRA_DIST = FAQ bison.1 refcard.tex
 
 CLEANFILES = refcard.dvi refcard.log refcard.ps bison.fns
 
 
 CLEANFILES = refcard.dvi refcard.log refcard.ps bison.fns
 

+clean-local:
+       rm -rf *.t2d
+

 refcard.dvi: refcard.tex
        tex refcard.tex
 
 refcard.dvi: refcard.tex
        tex refcard.tex
 

diff --git a/doc/bison.texinfo b/doc/bison.texinfo
index 5f7b6c388b6b4287d93788541dda86df6e0d0e0e..148573527d611c8d8dfca5a0921ac1c0daffa686 100644 (file)
--- a/doc/bison.texinfo
+++ b/doc/bison.texinfo
@@ -7360,10 +7360,12 @@ preceding tokens.  Comments would be treated equally.
 
 @comment file: calc++-scanner.ll
 @example
 
 @comment file: calc++-scanner.ll
 @example

+%@{
+# define YY_USER_ACTION  yylloc->columns (yyleng);
+%@}

 %%
 %@{
   yylloc->step ();
 %%
 %@{
   yylloc->step ();

-# define YY_USER_ACTION  yylloc->columns (yyleng);

 %@}
 @{blank@}+   yylloc->step ();
 [\n]+      yylloc->lines (yyleng); yylloc->step ();
 %@}
 @{blank@}+   yylloc->step ();
 [\n]+      yylloc->lines (yyleng); yylloc->step ();

diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644 (file)
index 0000000..c997eb2
--- /dev/null
+++ b/examples/Makefile.am
@@ -0,0 +1,21 @@
+## Process this file with automake to produce Makefile.in -*-Makefile-*-
+## Copyright (C) 2005 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
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## 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
+
+SUBDIRS = calc++
+
+dist_noinst_SCRIPTS = extexi

diff --git a/examples/calc++/Makefile b/examples/calc++/Makefile
deleted file mode 100644 (file)
index 5a56f3d..0000000
--- a/examples/calc++/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-all: calc++
-
-calc++:
-       flex -ocalc++-scanner.cc calc++-scanner.ll
-       bison -o calc++-parser.cc calc++-parser.yy
-       $(CC) -o calc++ calc++.cc calc++-driver.cc calc++-parser.cc calc++-scanner.cc
-
-check: all
-       ./test
-
-clean:
-       rm -f *~ *.o *.tab.* input position.hh location.hh stack.hh \
-             calc++-parser.cc calc++-parser.hh \
-             calc++-scanner.cc \
-             calc++
-
-## ------------ ##
-## Extracting.  ##
-## ------------ ##
-
-EXTRACTED = \
-calc++-driver.hh calc++-driver.cc \
-calc++-parser.yy \
-calc++-scanner.ll \
-calc++.cc
-
-doc = ../../doc/bison.texinfo
-extexi = gawk -f ../extexi
-
-RECURSIVE_TARGETS += extract
-
-$(EXTRACTED): $(doc) ../extexi
-       $(extexi) $(doc) -- $(EXTRACTED)
-
-extract extract-am: $(EXTRACTED)

diff --git a/examples/calc++/Makefile.am b/examples/calc++/Makefile.am
new file mode 100644 (file)
index 0000000..0894483
--- /dev/null
+++ b/examples/calc++/Makefile.am
@@ -0,0 +1,86 @@
+## Process this file with automake to produce Makefile.in -*-Makefile-*-
+## Copyright (C) 2005 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
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## 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
+
+## ------------------------------------- ##
+## Running the bison from this tarball.  ##
+## ------------------------------------- ##
+
+BISON = $(top_builddir)/tests/bison
+BISON_IN = $(top_srcdir)/tests/bison.in
+
+$(BISON): $(BISON_IN)
+       cd $(top_builddir)/tests && $(MAKE) $(AM_MAKEFLAGS) bison
+
+## ------------ ##
+## Extracting.  ##
+## ------------ ##
+
+doc = $(top_srcdir)/doc/bison.texinfo
+extexi = $(top_srcdir)/examples/extexi
+run_extexi = gawk -f $(extexi)
+$(calc_sources_extracted): $(doc) $(extexi)
+# Extract in src.
+       cd $(srcdir) && \
+          gawk -f ../extexi ../../doc/bison.texinfo -- \
+            calc++-scanner.ll calc++.cc calc++-driver.hh calc++-driver.cc
+
+
+## ------------------- ##
+## Parser generation.  ##
+## ------------------- ##
+
+# We do not use Automake features here.
+BUILT_SOURCES = $(calc_sources_generated)
+MAINTAINERCLEANFILES = $(calc_sources_generated)
+
+# Compile the parser and save cycles.
+# This code comes from "Handling Tools that Produce Many Outputs",
+# from the Automake documentation.
+EXTRA_DIST = $(srcdir)/calc++-parser.stamp $(srcdir)/calc++-parser.yy
+# Don't depend on $(BISON) otherwise we would rebuild these files
+# in srcdir, including during distcheck, which is forbidden.
+$(srcdir)/calc++-parser.stamp: $(srcdir)/calc++-parser.yy $(BISON_IN)
+       @rm -f calc++-parser.tmp
+       @touch calc++-parser.tmp
+       $(BISON) -S lalr1.cc $(srcdir)/calc++-parser.yy -o $(srcdir)/calc++-parser.cc -d -ra
+       @mv -f calc++-parser.tmp $@
+
+$(calc_sources_generated): $(srcdir)/calc++-parser.stamp
+       @if test -f $@; then :; else x\
+         rm -f $(srcdir)/calc++-parser.stamp; \
+         $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/calc++-parser.stamp; \
+       fi
+
+
+## --------------------------- ##
+## Building & testing calc++.  ##
+## --------------------------- ##
+
+noinst_PROGRAMS = calc++
+
+calc_sources_extracted = $(srcdir)/calc++-scanner.ll $(srcdir)/calc++.cc \
+$(srcdir)/calc++-driver.hh $(srcdir)/calc++-driver.cc
+calc_extracted = $(calc_sources_extracted) calc++-parser.yy
+calc_sources_generated = \
+       $(srcdir)/stack.hh $(srcdir)/position.hh $(srcdir)/location.hh \
+       $(srcdir)/calc++-parser.hh $(srcdir)/calc++-parser.cc
+
+calc___SOURCES = $(calc_sources_extracted) $(calc_sources_generated)
+
+TESTS = test
+EXTRA_DIST += $(TESTS)

diff --git a/examples/calc++/calc++-scanner.ll b/examples/calc++/calc++-scanner.ll
index 7b1e4ef790eef8081cb40735a8a3ffdd6285d2eb..750e6ca7db310670472f9115035bd088cf59bce0 100644 (file)
--- a/examples/calc++/calc++-scanner.ll
+++ b/examples/calc++/calc++-scanner.ll
@@ -10,10 +10,12 @@ id    [a-zA-Z][a-zA-Z_0-9]*
 int   [0-9]+
 blank [ \t]
 
 int   [0-9]+
 blank [ \t]
 

+%{
+# define YY_USER_ACTION  yylloc->columns (yyleng);
+%}

 %%
 %{
   yylloc->step ();
 %%
 %{
   yylloc->step ();

-# define YY_USER_ACTION  yylloc->columns (yyleng);

 %}
 {blank}+   yylloc->step ();
 [\n]+      yylloc->lines (yyleng); yylloc->step ();
 %}
 {blank}+   yylloc->step ();
 [\n]+      yylloc->lines (yyleng); yylloc->step ();

diff --git a/examples/calc++/calc++.cc b/examples/calc++/calc++.cc
index 92163968b228641af1a79a8300f1cf1adb5fde10..5a59d741892142a1152dbf138b5d25147250f6f9 100644 (file)
--- a/examples/calc++/calc++.cc
+++ b/examples/calc++/calc++.cc
@@ -1,4 +1,4 @@
-#line 7414 "../../doc/bison.texinfo"
+#line 7416 "../../doc/bison.texinfo"

 #include <iostream>
 #include "calc++-driver.hh"
 
 #include <iostream>
 #include "calc++-driver.hh"
 

diff --git a/examples/calc++/compile b/examples/calc++/compile
deleted file mode 100755 (executable)
index fac1036..0000000
--- a/examples/calc++/compile
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-set -ex
-BISON_PKGDATADIR=$HOME/src/bison/data
-export BISON_PKGDATADIR
-
-flex -ocalc++-scanner.cc calc++-scanner.ll
-bison -o calc++-parser.cc calc++-parser.yy
-g++ -o calc++ calc++.cc calc++-driver.cc calc++-parser.cc calc++-scanner.cc

diff --git a/examples/calc++/test b/examples/calc++/test
index b4f0d258ad7ca36b2d282703af5f4b94fb1c827f..d44a4789cffb4282142e66fead5305fc5eb09a91 100755 (executable)
--- a/examples/calc++/test
+++ b/examples/calc++/test
@@ -1,4 +1,5 @@
 #! /bin/sh
 #! /bin/sh

+

 set +e
 cat >input <<EOF
 a := 1
 set +e
 cat >input <<EOF
 a := 1


@@ -24,3 +25,5 @@ toto := 1
 toto
 EOF
 ./calc++ -s input
 toto
 EOF
 ./calc++ -s input

+
+rm input