rename src/ as spot/ and use include <spot/...>
* NEWS: Mention the change. * src/: Rename as ... * spot/: ... this, adjust all headers to include <spot/...> instead of "...", and adjust all Makefile.am to search headers from the top-level directory. * HACKING: Add conventions about #include. * spot/sanity/style.test: Add a few more grep to catch cases that do not follow these conventions. * .gitignore, Makefile.am, README, bench/stutter/Makefile.am, bench/stutter/stutter_invariance_formulas.cc, bench/stutter/stutter_invariance_randomgraph.cc, configure.ac, debian/rules, doc/Doxyfile.in, doc/Makefile.am, doc/org/.dir-locals.el.in, doc/org/g++wrap.in, doc/org/init.el.in, doc/org/tut01.org, doc/org/tut02.org, doc/org/tut03.org, doc/org/tut10.org, doc/org/tut20.org, doc/org/tut21.org, doc/org/tut22.org, doc/org/tut30.org, iface/ltsmin/Makefile.am, iface/ltsmin/kripke.test, iface/ltsmin/ltsmin.cc, iface/ltsmin/ltsmin.hh, iface/ltsmin/modelcheck.cc, wrap/python/Makefile.am, wrap/python/ajax/spotcgi.in, wrap/python/spot_impl.i, wrap/python/tests/ltl2tgba.py, wrap/python/tests/randgen.py, wrap/python/tests/run.in: Adjust.
This commit is contained in:
Alexandre Duret-Lutz
parent
1fddfe60ec
commit
f120dd3206
529 changed files with 1308 additions and 1262 deletions
|
|
@ -152,7 +152,7 @@ FULL_PATH_NAMES = YES
|
|||
# will be relative from the directory where doxygen is started.
|
||||
# This tag requires that the tag FULL_PATH_NAMES is set to YES.
|
||||
|
||||
STRIP_FROM_PATH = @top_srcdir@/src/ \
|
||||
STRIP_FROM_PATH = @top_srcdir@/ \
|
||||
@top_srcdir@/iface/ \
|
||||
@srcdir@
|
||||
|
||||
|
|
@ -163,7 +163,7 @@ STRIP_FROM_PATH = @top_srcdir@/src/ \
|
|||
# specify the list of include paths that are normally passed to the compiler
|
||||
# using the -I flag.
|
||||
|
||||
STRIP_FROM_INC_PATH = @top_srcdir@/src/ \
|
||||
STRIP_FROM_INC_PATH = @top_srcdir@/ \
|
||||
@top_srcdir@/iface/
|
||||
|
||||
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
|
||||
|
|
@ -762,7 +762,7 @@ WARN_LOGFILE =
|
|||
# Note: If this tag is empty the current directory is searched.
|
||||
|
||||
INPUT = @srcdir@/mainpage.dox \
|
||||
@top_srcdir@/src \
|
||||
@top_srcdir@/spot \
|
||||
@top_srcdir@/iface
|
||||
|
||||
# This tag can be used to specify the character encoding of the source files
|
||||
|
|
@ -1992,7 +1992,7 @@ SEARCH_INCLUDES = YES
|
|||
# preprocessor.
|
||||
# This tag requires that the tag SEARCH_INCLUDES is set to YES.
|
||||
|
||||
INCLUDE_PATH = @top_srcdir@/src
|
||||
INCLUDE_PATH = @top_srcdir@
|
||||
|
||||
# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
|
||||
# patterns (like *.h and *.hpp) to filter out the header-files in the
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ org:
|
|||
|
||||
org-man:
|
||||
mkdir -p $(srcdir)/userdoc/man
|
||||
$(top_srcdir)/tools/man2html.pl $(top_srcdir)/src/bin/man $(srcdir)/userdoc/man
|
||||
$(top_srcdir)/tools/man2html.pl $(top_srcdir)/spot/bin/man $(srcdir)/userdoc/man
|
||||
|
||||
ORG_FILES = \
|
||||
org/.dir-locals.el.in \
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
(eval .
|
||||
(progn
|
||||
(setenv "PATH"
|
||||
(concat "@abs_top_builddir@/src/bin"
|
||||
(concat "@abs_top_builddir@/spot/bin"
|
||||
path-separator
|
||||
(getenv "PATH")))
|
||||
(setenv "PYTHONPATH"
|
||||
(concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/wrap/python:@abs_top_srcdir@/wrap/python:"
|
||||
(getenv "PYTHONPATH")))
|
||||
(setenv "DYLD_LIBRARY_PATH"
|
||||
(concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/src/.libs:@abs_top_builddir@/buddy/src/.libs:"
|
||||
(concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:"
|
||||
(getenv "DYLD_LIBRARY_PATH")))
|
||||
(setenv "SPOT_DOTDEFAULT" "Brf(Lato)")
|
||||
(setenv "SPOT_DOTEXTRA" "node[style=filled, fillcolor=\"#ffffa0\"] edge[arrowhead=vee, arrowsize=.7]")
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@
|
|||
# This is a wrapper around the compiler, to ensure that the code
|
||||
# example run from the org-mode file are all linked with Spot.
|
||||
exec @top_builddir@/libtool link @CXX@ -std=c++11 -Wall \
|
||||
-I@abs_top_srcdir@/src -I@abs_top_srcdir@/buddy/src \
|
||||
-I@abs_top_builddir@/src "$@" @abs_top_builddir@/src/libspot.la
|
||||
-I@abs_top_builddir@ -I@abs_top_srcdir@ -I@abs_top_srcdir@/buddy/src \
|
||||
"$@" @abs_top_builddir@/spot/libspot.la
|
||||
|
|
|
|||
|
|
@ -31,12 +31,12 @@
|
|||
(setq shell-file-name "@SHELL@")
|
||||
|
||||
(setenv "PATH"
|
||||
(concat "@abs_top_builddir@/src/bin" path-separator (getenv "PATH")))
|
||||
(concat "@abs_top_builddir@/spot/bin" path-separator (getenv "PATH")))
|
||||
(setenv "PYTHONPATH"
|
||||
(concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/wrap/python:@abs_top_srcdir@/wrap/python:"
|
||||
(getenv "PYTHONPATH")))
|
||||
(setenv "DYLD_LIBRARY_PATH"
|
||||
(concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/src/.libs:@abs_top_builddir@/buddy/src/.libs:"
|
||||
(concat "@abs_top_builddir@/wrap/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:"
|
||||
(getenv "DYLD_LIBRARY_PATH")))
|
||||
(setenv "SPOT_DOTDEFAULT" "Brf(Lato)")
|
||||
(setenv "SPOT_DOTEXTRA"
|
||||
|
|
|
|||
|
|
@ -69,8 +69,8 @@ exceptions.
|
|||
|
||||
#+BEGIN_SRC C++ :results verbatim :exports both
|
||||
#include <iostream>
|
||||
#include "tl/parse.hh"
|
||||
#include "tl/print.hh"
|
||||
#include <spot/tl/parse.hh>
|
||||
#include <spot/tl/print.hh>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
@ -110,8 +110,8 @@ Here is how to call the infix parser explicitly:
|
|||
#+BEGIN_SRC C++ :results verbatim :exports both
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include "tl/parse.hh"
|
||||
#include "tl/print.hh"
|
||||
#include <spot/tl/parse.hh>
|
||||
#include <spot/tl/print.hh>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
@ -152,8 +152,8 @@ with the "fixed" formula if you wish. Here is an example:
|
|||
#+BEGIN_SRC C++ :results verbatim :exports both
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include "tl/parse.hh"
|
||||
#include "tl/print.hh"
|
||||
#include <spot/tl/parse.hh>
|
||||
#include <spot/tl/print.hh>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
@ -193,8 +193,8 @@ of =parse_infix_psl()=.
|
|||
#+BEGIN_SRC C++ :results verbatim :exports both
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include "tl/parse.hh"
|
||||
#include "tl/print.hh"
|
||||
#include <spot/tl/parse.hh>
|
||||
#include <spot/tl/print.hh>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
@ -237,8 +237,8 @@ For instance, let's see what happens if a PSL formulas is passed to
|
|||
#+BEGIN_SRC C++ :results verbatim :exports both
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include "tl/parse.hh"
|
||||
#include "tl/print.hh"
|
||||
#include <spot/tl/parse.hh>
|
||||
#include <spot/tl/print.hh>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
@ -267,8 +267,8 @@ The first is to simply diagnose non-LTL formulas.
|
|||
#+BEGIN_SRC C++ :results verbatim :exports code
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include "tl/parse.hh"
|
||||
#include "tl/print.hh"
|
||||
#include <spot/tl/parse.hh>
|
||||
#include <spot/tl/print.hh>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
@ -296,9 +296,9 @@ prepared to reject the formula any way. In our example, we are lucky
|
|||
#+BEGIN_SRC C++ :results verbatim :exports both
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include "tl/parse.hh"
|
||||
#include "tl/print.hh"
|
||||
#include "tl/simplify.hh"
|
||||
#include <spot/tl/parse.hh>
|
||||
#include <spot/tl/print.hh>
|
||||
#include <spot/tl/simplify.hh>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -80,9 +80,9 @@ destructor.
|
|||
#+BEGIN_SRC C++ :results verbatim :exports both
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include "tl/parse.hh"
|
||||
#include "tl/print.hh"
|
||||
#include "tl/relabel.hh"
|
||||
#include <spot/tl/parse.hh>
|
||||
#include <spot/tl/print.hh>
|
||||
#include <spot/tl/relabel.hh>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -89,8 +89,8 @@ detail of the top-level oeprator in the formula.
|
|||
|
||||
#+BEGIN_SRC C++ :results verbatim :exports both
|
||||
#include <iostream>
|
||||
#include "tl/formula.hh"
|
||||
#include "tl/print.hh"
|
||||
#include <spot/tl/formula.hh>
|
||||
#include <spot/tl/print.hh>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
@ -200,9 +200,9 @@ time time by not exploring further.
|
|||
|
||||
#+BEGIN_SRC C++ :results verbatim :exports both
|
||||
#include <iostream>
|
||||
#include "tl/formula.hh"
|
||||
#include "tl/print.hh"
|
||||
#include "tl/parse.hh"
|
||||
#include <spot/tl/formula.hh>
|
||||
#include <spot/tl/print.hh>
|
||||
#include <spot/tl/parse.hh>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
@ -248,9 +248,9 @@ in a formula:
|
|||
|
||||
#+BEGIN_SRC C++ :results verbatim :exports both
|
||||
#include <iostream>
|
||||
#include "tl/formula.hh"
|
||||
#include "tl/print.hh"
|
||||
#include "tl/parse.hh"
|
||||
#include <spot/tl/formula.hh>
|
||||
#include <spot/tl/print.hh>
|
||||
#include <spot/tl/parse.hh>
|
||||
|
||||
spot::formula xchg_fg(spot::formula in)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -129,10 +129,10 @@ never claim is done via the =print_never_claim= function.
|
|||
#+BEGIN_SRC C++ :results verbatim :exports both
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include "tl/parse.hh"
|
||||
#include "tl/print.hh"
|
||||
#include "twaalgos/translate.hh"
|
||||
#include "twaalgos/neverclaim.hh"
|
||||
#include <spot/tl/parse.hh>
|
||||
#include <spot/tl/print.hh>
|
||||
#include <spot/twaalgos/translate.hh>
|
||||
#include <spot/twaalgos/neverclaim.hh>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -137,8 +137,8 @@ non-empty.
|
|||
#+BEGIN_SRC C++ :results verbatim :exports both :wrap SRC hoa
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include "parseaut/public.hh"
|
||||
#include "twaalgos/hoa.hh"
|
||||
#include <spot/parseaut/public.hh>
|
||||
#include <spot/twaalgos/hoa.hh>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -61,9 +61,9 @@ corresponding BDD variable number, and then use for instance
|
|||
#+BEGIN_SRC C++ :results verbatim :exports both
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include "parseaut/public.hh"
|
||||
#include "twaalgos/hoa.hh"
|
||||
#include "twa/bddprint.hh"
|
||||
#include <spot/parseaut/public.hh>
|
||||
#include <spot/twaalgos/hoa.hh>
|
||||
#include <spot/twa/bddprint.hh>
|
||||
|
||||
void custom_print(std::ostream& out, spot::twa_graph_ptr& aut);
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ This example demonstrates how to create an automaton in C++, and then print it.
|
|||
|
||||
#+BEGIN_SRC C++ :results verbatim :exports both :wrap SRC hoa
|
||||
#include <iostream>
|
||||
#include "twaalgos/hoa.hh"
|
||||
#include "twa/twagraph.hh"
|
||||
#include <spot/twaalgos/hoa.hh>
|
||||
#include <spot/twa/twagraph.hh>
|
||||
|
||||
int main(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -231,9 +231,9 @@ automaton to process.
|
|||
|
||||
#+BEGIN_SRC C++ :results verbatim :exports both :wrap SRC hoa
|
||||
#include <iostream>
|
||||
#include "parseaut/public.hh"
|
||||
#include "twaalgos/postproc.hh"
|
||||
#include "twaalgos/hoa.hh"
|
||||
#include <spot/parseaut/public.hh>
|
||||
#include <spot/twaalgos/postproc.hh>
|
||||
#include <spot/twaalgos/hoa.hh>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue