[Pkg-ocaml-maint-commits] [menhir] 02/06: Merge tag 'upstream/20141215.dfsg'

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository menhir.

commit 29ff27f96ca3fc15fa0768d62c64fd728987373b
Merge: eb878bb e9fad92
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Jul 19 23:54:49 2015 +0000

    Merge tag 'upstream/20141215.dfsg'
    
    Upstream version 20141215.dfsg

 CHANGES                            |  22 ++
 INSTALLATION                       |   2 +-
 LICENSE                            |   1 +
 demos/Makefile                     |   2 +-
 demos/OMakefile.shared             | 231 --------------
 demos/calc-incremental/.gitignore  |   2 +
 demos/calc-incremental/.gitignore~ |   3 +
 demos/calc-incremental/Makefile    |  28 ++
 demos/calc-incremental/README      |   2 +
 demos/calc-incremental/_tags       |   0
 demos/calc-incremental/calc.ml     |  76 +++++
 demos/calc-incremental/lexer.mll   |  62 ++++
 demos/calc-incremental/parser.mly  |  47 +++
 demos/calc-param/.gitignore        |  11 +
 demos/calc-param/Makefile          |   4 +
 demos/calc-param/OMakefile         |   7 -
 demos/calc-param/OMakeroot         |  15 -
 demos/calc-two/.gitignore          |  13 +
 demos/calc-two/Makefile            |   4 +
 demos/calc-two/OMakefile           |   9 -
 demos/calc-two/OMakeroot           |  15 -
 demos/calc/.gitignore              |   3 +
 demos/calc/Makefile                |  32 +-
 demos/calc/OMakefile               |   7 -
 demos/calc/OMakeroot               |  15 -
 demos/calc/_tags                   |   0
 demos/find-menhir.sh               |  33 ++
 src/IL.mli                         |  38 ++-
 src/IO.ml                          |  10 +-
 src/IO.mli                         |   4 +-
 src/IncrementalEngine.ml           |  77 +++++
 src/META                           |   2 +-
 src/Makefile                       |   6 +-
 src/_tags                          |   9 +-
 src/action.ml                      |   9 +-
 src/action.mli                     |   3 -
 src/checkOCamlVersion.ml           |   1 -
 src/codeBackend.ml                 | 606 +++++++++++++------------------------
 src/codeBits.ml                    |   7 +-
 src/codeBits.mli                   |   1 +
 src/codePieces.ml                  |  19 +-
 src/codePieces.mli                 |  10 +-
 src/compressedBitSet.ml            |   2 +-
 src/conflict.ml                    |   6 +-
 src/coqBackend.ml                  |  23 +-
 src/derivation.ml                  |   2 +-
 src/dot.ml                         |   2 +
 src/engine.ml                      | 413 +++++++++++++++----------
 src/engineTypes.ml                 | 127 +++++---
 src/fancy-parser.mly               |  97 +++---
 src/grammar.ml                     |  64 ++--
 src/grammar.mli                    |   9 +-
 src/infer.ml                       |   3 +-
 src/inliner.ml                     |   6 +-
 src/installation.ml                |   4 +-
 src/interface.ml                   | 106 +++++--
 src/interface.mli                  |  20 +-
 src/invariant.ml                   |  71 +----
 src/invariant.mli                  |  14 +-
 src/item.ml                        |  12 +-
 src/keyword.ml                     |   1 -
 src/keyword.mli                    |   1 -
 src/lexer.mll                      |  23 +-
 src/lr0.ml                         |   2 +-
 src/lr1.ml                         |  26 +-
 src/lr1.mli                        |   8 +
 src/lr1partial.ml                  |   2 +-
 src/menhirLib.mlpack               |   4 +-
 src/misc.ml                        |  16 +-
 src/myocamlbuild.ml                |   4 +-
 src/packedIntArray.ml              |  14 +-
 src/parameterizedGrammar.ml        |  23 +-
 src/partialGrammar.ml              |  47 +--
 src/patricia.ml                    | 138 +--------
 src/pprint.ml                      |   2 +-
 src/preFront.ml                    |  28 +-
 src/printer.ml                     |  76 ++++-
 src/referenceInterpreter.ml        | 107 ++++---
 src/settings.ml                    |   9 +-
 src/settings.mli                   |   6 -
 src/slr.ml                         |   2 +-
 src/tableBackend.ml                |  95 +++---
 src/tableFormat.ml                 |   7 +-
 src/tableInterpreter.ml            |  24 +-
 src/tarjan.ml                      |   4 +-
 src/tokenType.ml                   |  12 +-
 src/traverse.ml                    |  40 +--
 src/unparameterizedPrinter.ml      |   4 +-
 src/version.ml                     |   2 +-
 src/yacc-parser.mly                |   2 +-
 90 files changed, 1574 insertions(+), 1584 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/menhir.git