Commit graph

1400 commits

Author SHA1 Message Date
Guillaume Sadegh
bbbc1acc14 Minor fixes to compile with GCC 4.4.
2009-04-09  Guillaume SADEGH  <sadegh@lrde.epita.fr>

	* src/eltlparse/eltlparse.yy (subformula): Avoid a comparaison
	between a signed and an unsigned value.
	* src/ltlast/automatop.hh, src/ltlast/automatop.cc (nfa): Avoid
	a name clash with the `nfa' class.
2009-04-09 18:30:51 +02:00
Damien Lefortier
7643c49cbd Correct LaCIM for ELTL and make it work with LBTT.
* src/eltlparse/eltlparse.yy: Adjust.
* src/ltlast/automatop.cc, src/ltlast/automatop.hh,
src/ltlvisit/clone.cc, src/ltlvisit/nenoform.cc: Clean the way we
handle the negation of automaton operators.
* src/ltlvisit/tostring.cc, src/ltlvisit/tostring.hh: Add an
optional argument to output a fully parenthesized string.
* src/tgbaalgos/eltl2tgba_lacim.cc: Fix it.
* src/tgbatest/eltl2tgba.cc: Add a new option (-L) to read formulae
from an LBTT-compatible file.
* src/tgbatest/eltl2tgba.test: A new tests.
* src/tgbatest/spotlbtt.test: Add LaCIM for ELTL.
2009-04-08 20:19:42 +02:00
Damien Lefortier
355461ae99 Extend the ELTL parser to support basic aliases of automaton
operators such as F=U(true,$0) or R=!U(!$0,!$1), and infix
notation for binary automaton operators.

* README: Document the ELTL directories.
* src/eltlparse/eltlparse.yy, src/eltlparse/eltlscan.ll: Add
support for aliases and infix notation.
* src/eltlparse/public.hh, src/ltlast/nfa.cc, src/ltlast/nfa.hh:
Clean them.
* src/eltltest/acc.test, src/tgbatest/eltl2tgba.test: Add tests
for the ELTL parser's extensions.
* src/tgbatest/eltl2tgba.cc: Adjust.
2009-04-04 22:35:23 +02:00
Damien Lefortier
2fbcd7e52f Add support for ELTL (AST & parser), and an adaptation of LaCIM
for ELTL.  This is a new version of the work started in 2008 with
LTL and ELTL formulae now sharing the same class hierarchy.

* configure.ac: Adjust for src/eltlparse/ and src/eltltest/
directories, and call AX_BOOST_BASE.
* m4/boost.m4: New file defining AX_BOOST_BASE([MINIMUM-VERSION]).
* src/Makefile.am: Add eltlparse and eltltest.
* src/eltlparse/: New directory.  Contains the ELTL parser.
* src/eltltest/: New directory.  Contains tests related to
ELTL (parser and AST).
* src/ltlast/Makefile.am: Adjust for ELTL AST files.
* src/ltlast/automatop.cc, src/ltlast/automatop.hh: New files.
Represent automaton operators nodes used in ELTL ASTs.
* src/ltlast/nfa.cc, src/ltlast/nfa.hh: New files.  Represent
simple NFAs used internally by automatop nodes.
* src/ltlast/allnode.hh, src/ltlast/predecl.hh,
src/ltlast/visitor.hh: Adjust for automatop.
* src/ltlvisit/basicreduce.cc, src/ltlvisit/clone.cc,
src/ltlvisit/clone.hh, src/ltlvisit/contain.cc,
src/ltlvisit/dotty.cc, src/ltlvisit/nenoform.cc,
src/ltlvisit/postfix.cc, src/ltlvisit/postfix.hh,
src/ltlvisit/reduce.cc, src/ltlvisit/syntimpl.cc,
src/ltlvisit/tostring.cc: Because LTL and ELTL formulae share the
same class hierarchy, LTL visitors need to handle automatop nodes
to compile.  When it's meaningful the visitor applies on automatop
nodes or simply assert(0) otherwise.
* src/tgba/tgbabddconcretefactory.cc (create_anonymous_state),
src/tgba/tgbabddconcretefactory.hh (create_anonymous_state): New
function used by the LaCIM translation algorithm for ELTL.
* src/tgbaalgos/Makefile.am: Adjust for eltl2tgba_lacim* files.
* src/tgbaalgos/eltl2tgba_lacim.cc,
src/tgbaalgos/eltl2tgba_lacim.hh: New files.  Implementation of
the LaCIM translation algorithm for ELTL.
* src/tgbaalgos/ltl2tgba_fm.cc, src/tgbaalgos/ltl2tgba_lacim.cc:
Handle automatop nodes in the translation by an assert(0).
* src/tgbatest/Makefile.am: Adjust for eltl2tgba.* files.
* src/src/tgbatest/eltl2tgba.cc, src/tgbatest/eltl2tgba.test: New
files
2009-03-26 12:05:08 +01:00
Alexandre Duret-Lutz
90332d8d77 * src/evtgbaparse/evtgbaparse.yy: Stay on 80 columns. 2009-03-25 17:43:55 +01:00
Alexandre Duret-Lutz
efbdc08d9f Update parsers to work with Bison 2.4.1.
* HACKING: Mention that we require Bison >= 2.4 for developers.
* src/evtgbaparse/evtgbaparse.yy, src/tgbaparse/tgbaparse.yy,
src/ltlparse/ltlparse.yy: The sections "%{ ... %}" should now be
renamed "%code requires { ... }" or "%code { ... }" depending on
whether they should end up in the parser's header file or its cc
file.  Also use %language, %locations, %defines, instead of
command-line arguments.
* src/evtgbaparse/Makefile.am, src/tgbaparse/Makefile.am,
src/ltlparse/Makefile.am: Remove the --locations, --defines
and --languages in the call to bison.  Add -Wall -Werror to
catch more errors.
Thanks to Akim Demaille <akim@lrde.epita.fr> for the help.
2009-03-25 17:26:44 +01:00
Alexandre Duret-Lutz
1f6087953b Also revert b28d7ba804 as it was a follow-up to Damien's work. 2009-03-25 17:26:44 +01:00
Alexandre Duret-Lutz
70b6bcf8eb * src/tgbaalgos/scc.hh: Add missing misc/hash.hh inclusion. 2009-03-25 16:44:47 +01:00
Alexandre Duret-Lutz
b1bfdee870 Revert everything related to Damien's work in 2008 (he will commit a new version soon).
Here are the reverted patches:
8c0d1003b0,
25a3114287,
9afbaf6342,
dc0005f4e1,
543190f2bc.
2009-03-25 16:44:05 +01:00
Alexandre Duret-Lutz
3d278663cd typo 2009-02-23 19:06:46 +01:00
Alexandre Duret-Lutz
ab8b2cbceb typos 2009-02-23 15:05:52 +01:00
Alexandre Duret-Lutz
6e4110fabb Typos 2009-02-18 10:03:49 +01:00
Guillaume Sadegh
33652acd62 Update to compile with GCC 4.4.0 (trunk). 2008-12-19 00:15:40 +01:00
Guillaume SADEGH
1d58493be3 Update to compile with the Intel compiler. 2008-12-18 23:41:10 +01:00
Alexandre Duret-Lutz
7998fff056 Compute more statistics about SCCs. 2008-12-11 13:06:58 +01:00
Alexandre Duret-Lutz
b2f7c2d76d Fix tracking of SCCs on the search stack 2008-12-11 13:06:32 +01:00
Alexandre Duret-Lutz
c44d6277f2 Introduce scc.cc to compute SCC stats and map. 2008-12-10 18:14:44 +01:00
Alexandre Duret-Lutz
d5235c6901 Add option -k to ltl2tgba 2008-12-10 18:14:34 +01:00
Alexandre Duret-Lutz
6a2cfc43d5 Fix and simplify the generation of the gspn-ssp Makefile 2008-08-29 17:06:05 +02:00
Alexandre Duret-Lutz
e6904d0a4c Use the TMPDIR variable in the gspn-ssp benchmark 2008-08-29 17:02:24 +02:00
Alexandre Duret-Lutz
0b1f869891 minor gspn-ssp/tools/sum tweaks 2008-08-29 16:28:24 +02:00
Alexandre Duret-Lutz
111b408da4 Add bench/gspn-ssp/README 2008-08-27 17:15:48 +02:00
Alexandre Duret-Lutz
360a5729be Have bench/gspn-ssp/tools/sum working directly from the *.log files, and improve its output. 2008-08-27 16:04:34 +02:00
Alexandre Duret-Lutz
56d1dbc610 Build the benchmark in bench/gspn-ssp/ using makefiles 2008-08-26 14:44:14 +02:00
Alexandre Duret-Lutz
40c4476ce4 Keep track of the number of inclusions detected in ssp_semi 2008-08-26 14:19:59 +02:00
Alexandre Duret-Lutz
35bf9b5345 bench/gspn-ssp/: New directory. 2008-08-08 10:41:47 +02:00
Alexandre Duret-Lutz
d3b5e5bdad Add option -e54 to ltlgspn-ssp 2008-08-07 14:10:28 +02:00
Damien Lefortier
8c0d1003b0 Start the ELTL translation (LACIM).
Merge all eltlast/ files into formula.hh (except automatop.hh).
2008-06-20 00:27:06 +02:00
Alexandre Duret-Lutz
862302590c Prefix bytecode filenames with $srcdir so the tests work in VPATH builds. 2008-06-12 17:23:22 +02:00
Alexandre Duret-Lutz
b28d7ba804 adjust #includes in python/ 2008-06-12 16:56:40 +02:00
Alexandre Duret-Lutz
25a3114287 Merge all ltlast/ files into formula.hh. The forward declaration of visitor was causing error messages too cryptic for users. 2008-06-12 16:33:03 +02:00
Alexandre Duret-Lutz
9afbaf6342 Delete useless *.cc files in ltlast/ 2008-06-12 14:28:29 +02:00
Alexandre Duret-Lutz
994482ed2c dottynips.cc, emptiness_check.cc: Include ctsdlib for exit() 2008-06-11 17:14:44 +02:00
Alexandre Duret-Lutz
dc0005f4e1 src/eltlparse/eltlparse.yy: Include limits.h for INT_MIN and INT_MAX. 2008-06-11 17:01:42 +02:00
Alexandre Duret-Lutz
34d81cd807 src/sanity/includes.test: Remove empty line at beginning of file. 2008-06-11 16:58:44 +02:00
Alexandre Duret-Lutz
9cadc24173 Remove the const qualifier from the return type of formula::hash(), GCC complains. 2008-06-11 16:57:35 +02:00
Guillaume Sadegh
a33c1894c3 Test suite for the NipsVM front-end.
2008-06-02  Guillaume SADEGH  <sadegh@lrde.epita.fr>

        * iface/nips/nipstest/Makefile.am, iface/nips/Makefile.am,
        configure.ac, iface/nips/nipstest/emptiness.test,
        iface/nips/nipstest/dotty.test: Test suite for the NipsVM
        front-end.
        * iface/nips/emptiness_check.cc, iface/nips/dottynips.cc:
        `catch'
        don't throw anymore an exception, but exit with 1.
        * iface/nips/common.cc, iface/nips/nips.cc (nips_interface):
        Change messages of nips_exception.
2008-06-11 15:37:26 +02:00
Alexandre Duret-Lutz
f56721107b src/sanity/includes.test (INCDIR): Remove any trailing slash. 2008-06-03 12:46:19 +02:00
Alexandre Duret-Lutz
40dc725116 Install interfaces' headers in the spot/iface/ directory, not directly in the spot/ directory.
* iface/gspn/Makefile.am (gspndir): Install in spot/iface/gspn/.
	* iface/nips/Makefile.am (nipsdir): Install in spot/iface/nips/.
2008-06-03 12:44:30 +02:00
Alexandre Duret-Lutz
664f84796f do not install nips VM 2008-06-02 15:32:12 +02:00
Alexandre Duret-Lutz
73b286cfcb factorize linking of libnipsvm.la 2008-06-02 15:31:37 +02:00
Guillaume Sadegh
bc5f13bb4e NIPS VM added to the SPOT distribution.
2008-05-29  Guillaume SADEGH  <sadegh@lrde.epita.fr>

	* iface/nips/nips.cc, iface/nips/nips.hh, iface/nips/common.cc,
	iface/nips/common.hh, iface/nips/Makefile.am: TGBA implementation
	with the NIPS library.
	* iface/nips/emptiness_check.cc: Emptiness check on a Promela
	interface.
	* iface/nips/dottynips.cc: Dot printer on the NIPS interface.
	* iface/nips/compile.sh: Add. Wrapper around nips compiler to
	compile Promela to NIPS bytecode.
	* iface/nips/nips_vm,iface/nips/nips_vm/bytecode.h,
	iface/nips/nips_vm/ChangeLog, iface/nips/nips_vm/COPYING,
	iface/nips/nips_vm/hashtab.c, iface/nips/nips_vm/hashtab.h,
	iface/nips/nips_vm/INSTALL, iface/nips/nips_vm/instr.c,
	iface/nips/nips_vm/instr.h, iface/nips/nips_vm/instr_step.c,
	iface/nips/nips_vm/instr_step.h,
	iface/nips/nips_vm/instr_tools.c,
	iface/nips/nips_vm/instr_tools.h,
	iface/nips/nips_vm/instr_wrap.c,
	iface/nips/nips_vm/instr_wrap.h,
	iface/nips/nips_vm/interactive.c,
	iface/nips/nips_vm/interactive.h, iface/nips/nips_vm/main.c,
	iface/nips/nips_vm/Makefile, iface/nips/nips_vm/Makefile.am,
	iface/nips/nips_vm/nips_asm_help.pl,
	iface/nips/nips_vm/nips_asm_instr.pl,
	iface/nips/nips_vm/nips_asm.pl,
	iface/nips/nips_vm/nips_disasm.pl, iface/nips/nips_vm/nipsvm.c,
	iface/nips/nips_vm/nipsvm.h, iface/nips/nips_vm/README,
	iface/nips/nips_vm/rt_err.c, iface/nips/nips_vm/rt_err.h,
	iface/nips/nips_vm/search.c, iface/nips/nips_vm/search.h,
	iface/nips/nips_vm/split.c, iface/nips/nips_vm/split.h,
	iface/nips/nips_vm/state.c, iface/nips/nips_vm/state.h,
	iface/nips/nips_vm/state_inline.h,
	iface/nips/nips_vm/state_parts.c,
	iface/nips/nips_vm/state_parts.h, iface/nips/nips_vm/timeval.h,
	iface/nips/nips_vm/tools.h: NIPS VM added to the SPOT
	distribution.
	* configure.ac, iface/Makefile.am: Build system updated for the
	NIPS front-end.
2008-05-30 13:22:00 +02:00
Damien Lefortier
543190f2bc Template ltlast/ & ltlenv/ classes in internal/ & Add ELTL parser. 2008-04-17 11:41:41 +02:00
Alexandre Duret-Lutz
21c98c0a01 Kill some FIXMEs.
* src/ltlenv/environment.hh, src/ltlvisit/basicreduce.cc: Remove
useless FIXMEs.
* src/ltlvisit/reduce.cc (reduce_visitor::visit(binop)): Compute
syntactic implications only when needed.
* src/tgbaalgos/reductgba_sim_del.cc
(build_recurse_successor_spoiler): Remplace the FIXME by an assert.
* src/tgba/tgbareduc.cc: Reword some comments, discard old
commented code.
2008-04-14 11:35:57 +02:00
Alexandre Duret-Lutz
43c9c6faaa * src/evtgbaparse/Makefile.am (AM_CXXFLAGS): Remove -Werror
so we tolerate more flex versions.
* src/ltlparse/Makefile.am (AM_CXXFLAGS): Likewise.
* src/tgbaparse/Makefile.am (AM_CXXFLAGS): Likewise.
2008-03-28 17:22:23 +01:00
Alexandre Duret-Lutz
323e326c7d Second thinko in #if/#else. 2008-03-25 16:26:50 +01:00
Alexandre Duret-Lutz
07fd0377e6 Thinko in #if/#else. 2008-03-25 15:43:51 +01:00
Alexandre Duret-Lutz
b1ee7c64e7 typo 2008-03-25 15:41:51 +01:00
Damien Lefortier
b71360ae44 Avoid <iostream> in headers, better use <iosfwd>. 2008-03-21 21:59:34 +01:00
Alexandre Duret-Lutz
c764b2021d * src/tgbatest/ltl2tgba.cc, src/misc/hash.hh: Reformat the header
using 80 columns.
2008-03-21 17:02:57 +01:00