Commit 8e9b54a3 authored by fpottier's avatar fpottier
Browse files

Copying everything to a new trunk directory.

git-svn-id: svn+ssh:// 0f8b5475-4b4e-0410-85a8-ee3154a6bfe7

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
Franois Pottier <>
Yann Rgis-Gianas <>
"menhir --depend" was broken since someone added new whitespace in the output
of ocamldep. Fixed.
Fixed a compilation problem that would arise when a file produced
by Menhir on a 64-bit platform was compiled by ocaml on a 32-bit
Performance improvements in the computation of various information
about the automaton (module [Invariant]). The improvements will be
noticeable only for very large automata.
The option --log-grammar 3 (and above) now causes the FOLLOW sets for
*terminal* symbols to be computed and displayed.
Added the flag --canonical, which causes Menhir to produce a canonical LR(1)
automaton in the style of Knuth. This means that no merging of states takes
place during the construction of the automaton, and that no default reductions
are allowed.
Fixed a bug whereby a %nonassoc declaration was not respected. This
declaration requests that a shift/reduce conflict be reduced in favor of
neither shifting nor reducing, that is, a syntax error must occur. However,
due to an unforeseen interaction with the "default reduction" mechanism, this
declaration was sometimes ignored and reduction would take place.
Changes in the (undocumented) Coq back-end so as to match the ESOP 2012
The Makefile now tests whether Unix or Windows is used (the test is performed
by evaluating Sys.os_type under ocaml) and changes a couple settings accordingly:
- the executable file name is either menhir or menhir.exe
- the object file suffix is either .o or .obj
Added --strict, which causes many warnings about the grammar and about the
automaton to be considered errors.
The # annotations that are inserted in the generated .ml file now retain their
full path. (That is, we no longer use [Filename.basename].) This implies that
the # annotations depend on how menhir is invoked -- e.g. "menhir
foo/bar.mly" and "cd foo && menhir bar.mly" will produce different
results. Nevertheless, this seems reasonable and useful (e.g. in conjunction
with ocamlbuild and a hierarchy of files). Thanks to Daniel Weil.
With the -lg 1 switch, Menhir now indicates whether the grammar is SLR(1).
Removed the lock in ocamldep.wrapper. It is the responsibility of the user
to avoid interferences with other processes (or other instances of the script)
that create and/or remove files.
The (internal) computation of the automaton's invariant was broken and has
been fixed. Surprisingly, this does not seem to affect the generated code,
(which was correct,) so no observable bug is fixed. Hopefully no bug is
The grammar description files (.mly) are now read in up front and stored in
memory while they are parsed. This allows us to avoid the use of pos_in and
seek_in, which do not work correctly when CRLF conversion is being performed.
Fixed a bug in the type inference module (for parameterized non-terminals)
which would cause an infinite loop.
Fixed a bug that would cause an assertion failure in the generated parser
in some situations where the input stream was incorrect and the grammar
involved the error token. The fix might cause grammars that use the error
token to behave differently (hopefully more accurately) as of now.
Makefile changes: build and install only the bytecode version of menhirLib
when TARGET=byte is set.
Fixed ocamldep.wrapper to avoid quoting the name of the ocaml command.
This is hoped to fix a compilation problem under MinGW.
A Makefile fix to avoid a problem under Windows/Cygwin.
Renamed the ocaml-check-version script so as to avoid a warning.
Ocaml summer project: added --interpret, --table, and --suggest-*.
Fixed a problem that would cause the code inliner to abort when a semantic
value and a non-terminal symbol happened to have the same name.
Removed code sharing.
Removed an incorrect assertion that caused failures (, line 134).
Disabled code sharing by default, as it is currently broken. (See Yann's
message; assertion failure at runtime.)
Added an optimization to share code among states that have identical
outgoing transition tables.
Small Makefile change: create an executable file for check-ocaml-version in
order to work around the absence of dynamic loading on some platforms.
Made a fundamental change in the construction of the LR(1) automaton
in order to eliminate a bug that could lead to spurious conflicts --
thanks to Ketti for submitting a bug report.
Added --follow-construction to help understand the construction of the
LR(1) automaton (very verbose).
Code generation: more explicit qualifications with Pervasives so as
to avoid capture when the user redefines some of the built-in operators,
such as (+).
Added a new demo (calc-param) that shows how to use %parameter.
Makefile improvements (check for PREFIX; bootstrap in bytecode now
also available). Slight changes to OMakefile.shared.
Portability fix in Makefile and Makefile.shared (avoided "which").
Portability fix in Makefile.shared (replaced "&>" with "2>&1 >").
Made a slight restriction to Pager's criterion so as to never introduce
fake conflict tokens (see Lr0.compatible). This might help make conflict
explanations more accurate in the future.
Fixed bug that would cause positions to become invalid after %inlining.
Fixed --depend to be more lenient when analyzing ocamldep's output.
Added --raw-depend which transmits ocamldep's output unchanged (for
use in conjunction with omake).
Fixed bug that would cause --only-preprocess to print %token declarations
also for pseudo-tokens.
Fixed bug that caused some precedence declarations to be incorrectly
reported as useless.
Improved things so that useless pseudo-tokens now also cause warnings.
Fixed bug that would cause %type directives for terminal symbols to
be incorrectly accepted.
Fixed bug that would occur when a semantic action containing $i keywords
was %inlined.
Fixed problem that caused some end-of-stream conflicts not to be reported.
Fixed Pager's compatibility criterion to avoid creating end-of-stream conflicts.
Fixed problem that allowed generating incorrect but apparently well-typed
Objective Caml code when a semantic action was ill-typed and --infer was
Improved conflict reports by factoring out maximal common derivation contexts.
Fixed bug that could arise when explaining a conflict in a non-LALR(1) grammar.
Changed count of reduce/reduce conflicts to allow a comparison with ocamlyacc's diagnostics.
When refusing to resolve a conflict, report all diagnostics before dying.
Added display of FOLLOW sets when using --log-grammar 2.
Added --graph option.
Fixed behavior of --depend option.
Removed reversed lists from the standard library.
This diff is collapsed.
# -------------------------------------------------------------------------
# This is the development Makefile. It is used for compiling
# development versions and for creating the distributed package.
# This Makefile is not distributed.
SHELL := bash
.PHONY: test bootstrap all package check export godi clean
# -------------------------------------------------------------------------
# Compiling.
$(MAKE) $(MFLAGS) -C src -f GNUmakefile
# -------------------------------------------------------------------------
# Bootstraping.
$(MAKE) $(MFLAGS) -C src -f GNUmakefile bootstrap
# -------------------------------------------------------------------------
# Testing.
$(MAKE) -C bench
# -------------------------------------------------------------------------
# Cleaning up.
@ for i in bench demos src ; do \
$(MAKE) $(MFLAGS) -C $$i $@ ; \
$(MAKE) $(MFLAGS) -rs -C doc $@
# -------------------------------------------------------------------------
# Prevent the built-in bash cd from displaying information.
export CDPATH=
# Distribution.
# The version number is automatically set to the current date.
DATE := $(shell /bin/date +%Y%m%d)
PACKAGE := menhir-$(DATE)
CURRENT := $(shell pwd)
HEADACHE := headache
SRCHEAD := $(CURRENT)/header
LIBHEAD := $(CURRENT)/lgpl-header
# GODI settings. We assume $(GODI_HOME) is defined and points
# to the host machine's GODI installation.
GODINAME := godi/godi-menhir
GODIWORK := /home/fpottier/dev/godi-build
GODIVA := $(GODI_HOME)/bin/godiva
# A list of files to copy without changes to the package.
# This does not include the src/ and doc/ directories, which require
# special treatment.
# Some source files carry the "library" license, while others carry
# the regular "source code" license.
src/standard.mly \
src/infiniteArray.{ml,mli} \
src/packedIntArray.{ml,mli} \
src/rowDisplacement.{ml,mli} \
src/ \
src/engine.{ml,mli} \
src/ \
src/tableInterpreter.{ml,mli} \
package: clean
# Create a directory to store the distributed files temporarily.
@ rm -fr $(PACKAGE)
@ mkdir -p $(PACKAGE)/src
@ cp -fr src/*.ml{,i,y,l} src/Makefile src/META $(PACKAGE)/src
@ $(MAKE) -C $(PACKAGE)/demos clean
# Insert headers.
@ echo "-> Inserting headers."
@ cd $(PACKAGE) && find . -regex ".*\.ml\(i\|y\|l\)?" \
-exec $(HEADACHE) -h $(SRCHEAD) "{}" ";"
@ cd $(PACKAGE) && for file in $(LIBFILES) ; do \
$(HEADACHE) -h $(LIBHEAD) $$file ; \
# Set the version number into the files that mention it. These
# include, version.tex, META.
@ echo "-> Setting version to $(DATE)."
@ echo let version = \"$(DATE)\" > $(PACKAGE)/src/
@ echo version = \"$(DATE)\" >> $(PACKAGE)/src/META
# Copy and compile the documentation.
@ echo "-> Generating the documentation."
@ cp -r doc $(PACKAGE)
@ echo '\gdef\menhirversion{$(DATE)}' > $(PACKAGE)/doc/version.tex
@ make -rs -C $(PACKAGE)/doc clean pdf
@ mv $(PACKAGE)/doc/main.pdf $(PACKAGE)/manual.pdf
@ mv $(PACKAGE)/doc/menhir.1 $(PACKAGE)/
@ rm -rf $(PACKAGE)/doc
# Create the API documentation.
@ $(MAKE) -C src api
# Create the tarball.
@ echo "-> Tarball creation."
tar --exclude=.svn -cvz -f $(TARBALL) $(PACKAGE)
@ echo "-> Package $(PACKAGE).tar.gz is ready."
@ echo "-> Checking the package ..."
# Create a temporary directory; extract, build, and install the
# package into it; run the test suite using the installed binary.
@ TEMPDIR=`mktemp -d /tmp/menhir-test.XXXXXX` && { \
echo " * Extracting. " && \
(cd $$TEMPDIR && tar xfz $(TARBALL)) && \
echo " * Compiling and installing." && \
mkdir $$TEMPDIR/install && \
(cd $(PACKAGE) \
&& make PREFIX=$$TEMPDIR/install USE_OCAMLFIND=false all install \
) > $$TEMPDIR/install.log 2>&1 \
|| (cat $$TEMPDIR/install.log; exit 1) && \
echo " * Running the test suite." && \
$(MAKE) MENHIR=$$TEMPDIR/install/bin/menhir test > $$TEMPDIR/test.log 2>&1 \
|| (cat $$TEMPDIR/test.log; exit 1) && \
rm -fr $$TEMPDIR ; }
@ echo "-> Package $(PACKAGE) seems ready for distribution!"
# -------------------------------------------------------------------------
# Copying to my Web site.
RSYNC := scp -p -B -C
PAGE := /home/fpottier/dev/page
# Copier l'archive et la doc vers yquem.
$(RSYNC) $(PACKAGE)/manual.pdf $(TARGET)
# Copier l'API vers la page Web.
cd src && $(RSYNC) convert.mli.html $(TARGET)
# Mettre jour la page Web de Menhir avec le nouveau numro de version.
cd $(PAGE) && \
sed --in-place=.bak "s/menhir-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/$(PACKAGE)/" menhir.xml && \
$(MAKE) export && \
cvs commit -m "Updated Menhir's version number."
# -------------------------------------------------------------------------
# Creating a GODI package.
# This entry assumes that "make package" and "make export" have been
# run on the same day. It must have sufficient rights to write into
# the local GODI hierarchy.
@ if [ `whoami` != "root" ] ; then \
echo "make godi must be run with root privileges. Try running ./godi" ; \
exit 1 ; \
@ sed -e s/VERSION/$(DATE)/ < spec.godiva > $(GODISVN)/spec.godiva
@ cd $(GODIWORK) && svn up
@ cd $(GODISVN) && \
$(GODIVA) -refetch -localbase $(GODI_HOME) spec.godiva && \
rsync -v -r $(GODIH)/ $(GODISVN) && \
chown -R fpottier $(GODISVN)
@ echo "Do you wish to proceed and commit changes to GODI (yes or no)?"
@ read answer && if [ "$$answer" != "yes" ] ; then \
echo Aborting. ; \
exit 1 ; \
@ cd $(GODISVN) && \
svn commit -m "Changes to Menhir package." && \
export revision=`svn info Makefile | sed -n 's/^ \?: \([0-9]\+\)$$/\1/p'` && \
echo Revision is now $$revision. && \
for map in $(GODIMAP) ; do \
sed --in-place=.bak "s/^\(.*menhir[^0-9]*\)[0-9]\+$$/\1$$revision/" $$map ; \
@ echo Here are my changes to the release maps:
@ cd $(GODIPACK) && svn diff --diff-cmd diff -x "-C0"
@ echo "Do you wish to proceed and commit changes to GODI (yes or no)?"
@ read answer && if [ "$$answer" != "yes" ] ; then \
echo Aborting. ; \
exit 1 ; \
@ cd $(GODIPACK) && svn commit -m "Updated release map for Menhir."
@ echo "You may now open GODI's release tool at"
@ echo " $(GODIURL)"
@ echo "and proceed as directed. I will try to open this URL for you."
@ case $$OSTYPE in \
(linux*) \
su fpottier -c "firefox $(GODIURL)" ;; \
(*) \
open $(GODIURL) ;; \
This HOWTO is intended for new Menhir developers, and should explain how
things work.
For the moment, there is not much information in it.
There are two ways of building Menhir: either from scratch, or incrementally.
Building from scratch is performed via the public Makefile, and requires
defining the PREFIX variable, even if no installation is performed:
make PREFIX=/usr/local -f Makefile
This is a two-stage process, in which a first version of menhir is built
using ocamlyacc, and a second version of menhir is built using the menhir
executable produced by the first stage.
Building incrementally is useful when working on the code. In that case,
one wishes to recompile incrementally, without going through the bootstrap
process. This works only if a menhir executable already exists in the src/
subdirectory. This is done simply by typing:
(or, equivalently, make -f GNUmakefile).
You need Objective Caml 3.09 or later and GNU make.
If you wish to install via ocamlfind, make sure that ocamlfind is in
your PATH. (Remember that prefixing a command with sudo affects its
Run the following command:
make PREFIX=/usr/local install
If your machine does not have the native code Objective Caml compiler
(ocamlopt), but does have the bytecode compiler (ocamlc), then instead
of the above command, use:
make PREFIX=/usr/local TARGET=byte all install
The value of the PREFIX variable can be changed to control where
the software, the standard library, and the documentation should
be stored. These files are copied to the following places:
The support library, MenhirLib, is either installed via ocamlfind, if
available, or placed within $PREFIX/share/menhir. Menhir's --suggest
options help determine where and how it was installed.
The documentation includes a reference manual and a number of demos.
This diff is collapsed.
# This is the main Makefile that is shipped as part of the source package.
# Keep in mind that the hierarchy that is shipped is not identical to the
# hierarchy within the svn repository: some sub-directories are not shipped;
# the documentation is pre-built.
# The hierarchy that is shipped includes:
# demos
# menhir.1
# manual.pdf
# src
# Makefile (this one)
# ----------------------------------------------------------------------------
# By default, we attempt to use ocamlfind (if present in the PATH), but it it
# is possible to prevent that externally by setting USE_OCAMLFIND to false.
USE_OCAMLFIND = ocamlfind ocamlc -v >/dev/null 2>&1
# ----------------------------------------------------------------------------
# A few settings differ on Windows versus Unix.
include Makefile.arch
# ----------------------------------------------------------------------------
# Installation paths.
# TEMPORARY GODIVA and Linux do not agree on the standard paths...
ifndef PREFIX
$(error Please define PREFIX)
bindir := ${PREFIX}/bin
docdir := ${PREFIX}/share/doc/menhir
libdir := ${PREFIX}/share/menhir
mandir := ${PREFIX}/share/man/man1
MANS := menhir.1
DOCS := manual.pdf demos
MLYLIB := src/standard.mly
# -------------------------------------------------------------------------
# Building menhirLib.
ifeq ($(TARGET),byte)
MENHIRLIB := menhirLib.cmi menhirLib.cmo
MENHIRLIB := menhirLib.cmi menhirLib.cmo menhirLib.cmx menhirLib.$(OBJ)
# ----------------------------------------------------------------------------
# Compilation.
# Installation time settings are recorded within src/
# This file is recreated every time so as to avoid becoming stale.
.PHONY: all install uninstall
rm -f src/
echo "let libdir = \"${libdir}\"" > src/
if $(USE_OCAMLFIND) ; then \
echo "let ocamlfind = true" >> src/ ; \
else \
echo "let ocamlfind = false" >> src/ ; \
$(MAKE) $(MFLAGS) -C src -f Makefile
$(MAKE) $(MFLAGS) -C src -f Makefile $(MENHIRLIB)
# ----------------------------------------------------------------------------
# Installation.
install: all
mkdir -p $(bindir)
mkdir -p $(libdir)
mkdir -p $(docdir)
mkdir -p $(mandir)
install src/$(MENHIREXE) $(bindir)
install -m 644 $(MLYLIB) $(libdir)
cp -r $(DOCS) $(docdir)
cp -r $(MANS) $(mandir)
@cd src && if $(USE_OCAMLFIND) ; then \
echo Installing MenhirLib via ocamlfind. ; \
ocamlfind install menhirLib META $(MENHIRLIB) ; \
else \
echo Installing MenhirLib manually. ; \
install -m 644 $(MENHIRLIB) $(libdir) ; \
rm -rf $(bindir)/$(MENHIREXE)
rm -rf $(libdir)
rm -rf $(docdir)
rm -rf $(mandir)/$(MANS)
@if $(USE_OCAMLFIND) ; then \
echo Un-installing MenhirLib via ocamlfind. ; \
ocamlfind remove menhirLib ; \
# If ocaml reports that Sys.os_type is Unix, we assume Unix, otherwise
# we assume Windows.
ifeq "$(shell rm -f ./ && echo print_endline Sys.os_type > ./ && ocaml ./ && rm -f ./" "Unix"
MENHIREXE := menhir
OBJ := o
MENHIREXE := menhir.exe
OBJ := obj
* when a parse error occurs, decorate the exception with the automaton state
that was reached? this would allow some people to produce better error
messages (Pippijn van Steenhoven). Incompatible change?
* BUG: le Makefile ne fonctionne pas avec -j (email de Florent Hivert)
* projet amusant: si l'automatique est canonique et si on n'a pas trop
optimisé le contenu de la pile, alors en cas d'erreur, on doit pouvoir
analyser le contenu de la pile pour produire un suffixe de l'entrée qui
aurait conduit à une acceptation. Ça trouerait le C** comme message
* Les fichiers dans examples/ ne devraient pas être sous QPL mais libres...
* BUG: la directive $type<...> nt donne lieu à un message d'erreur bizarre
si le non-terminal nt n'existe pas. (Jacques-Henri.)
* On pourrait rendre moins restrictif le critère qui garantit la terminaison
de l'expansion des non-terminaux paramétrés. Il suffirait de vérifier que
les paramètres effectifs sont toujours des atomes (symboles terminaux ou
non-terminaux), non? (Jacques-Henri.)
* les positions fournies par menhir ne sont pas les mêmes fournies par