[gringo] 01/02: Merge tag 'upstream/4.5.4'

[Thomas Krennwallner]

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

tkren-guest pushed a commit to branch devel
in repository gringo.

commit 944123702abdb54d908d344a908271cb48e953ed
Merge: 80fd2ba cb1af23
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date:   Sat Dec 19 13:49:59 2015 +0100

    Merge tag 'upstream/4.5.4'
    
    Upstream version 4.5.4

 CHANGES                                 |   8 ++
 INSTALL                                 |  12 +-
 SConscript                              |  44 ++++----
 SConstruct                              |   6 +-
 app/clingo/src/clingo_app.cc            |   9 +-
 app/clingo/src/clingo_app.hh            |   1 +
 app/clingo/tests/lua/cover-lua.lp       | 111 ++++++++++++++++++
 app/clingo/tests/lua/cover-lua.sol      |   6 +
 app/clingo/tests/python/cover-py.lp     |  90 +++++++++++++++
 app/clingo/tests/python/cover-py.sol    |   6 +
 app/gringo/main.cc                      |   5 +-
 examples/clingo/cover/README            |   5 +
 examples/clingo/cover/control-lua.lp    |  82 ++++++++++++++
 examples/clingo/cover/control-py.lp     |  60 ++++++++++
 examples/clingo/cover/cover.lp          |   9 ++
 examples/clingo/cover/instance.lp       |   8 ++
 examples/clingo/cover/preprocess.lp     |  14 +++
 libclasp/clasp/clasp_facade.h           |   2 +-
 libclasp/clasp/cli/clifwd.h             |  32 ------
 libclasp/clasp/util/hash_map.h          |  41 -------
 libclasp/src/asp_preprocessor.cpp       |   7 +-
 libclasp/src/clasp_facade.cpp           |   8 +-
 libclasp/src/clause.cpp                 |  18 +--
 libclasp/src/heuristics.cpp             |  16 ++-
 libclasp/src/logic_program.cpp          |  36 ++++--
 libclasp/src/model_enumerators.cpp      |   2 +-
 libclasp/src/solver_strategies.cpp      |   5 +-
 libclingo/clingo/clingocontrol.hh       |   9 +-
 libclingo/src/clingocontrol.cc          |  19 ++--
 libgringo/gringo/ground/literal.hh      |   2 +-
 libgringo/gringo/ground/literals.hh     |  10 +-
 libgringo/gringo/ground/statements.hh   |  10 +-
 libgringo/gringo/input/aggregate.hh     |   1 -
 libgringo/gringo/input/aggregates.hh    |   4 -
 libgringo/gringo/output/output.hh       |   1 +
 libgringo/gringo/value.hh               |   8 +-
 libgringo/gringo/version.hh             |   4 +-
 libgringo/src/ground/literals.cc        |  24 ++--
 libgringo/src/ground/statements.cc      | 194 ++++++++++++++++++--------------
 libgringo/src/input/aggregates.cc       |  17 ---
 libgringo/src/input/statement.cc        |  40 +++----
 libgringo/src/python.cc                 |   4 -
 libgringo/tests/output/lparse.cc        |  12 ++
 libgringo/tests/output/solver_helper.hh |  10 +-
 44 files changed, 703 insertions(+), 309 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gringo.git