alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

* src/Alloc.h: Rename as ...

Browse source 
* src/ObstackAlloc.h: ... this.  The problem is that alloc.h is a
system header in g++ < 3.0, and Darwin has a case-insensitive
filesystem.  System headers that include alloc.h pick the local
Alloc.h version.
* BuchiAutomaton.h, Configuration.h, DispUtil.cc,
ExternalTranslator.h, FormulaRandomizer.h, Graph.h.in,
LtlFormula.h, Makefile.am, NeverClaimAutomaton.h, PathEvaluator.h,
ProductAutomaton.h, SccIterator.h, SharedTestData.h,
StatDisplay.h, StateSpace.h, StateSpaceRandomizer.cc,
StringUtil.h, TestOperations.h, TestRoundInfo.h, TestStatistics.h,
UserCommandReader.h, UserCommands.h, main.cc: Adjust includes.
This commit is contained in:
Alexandre Duret-Lutz 2004-01-16 13:30:42 +00:00
parent b9b365e731
commit 7c1ac7bb67
25 changed files with 107 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lbtt/ChangeLog
View file

@ -1,3 +1,18 @@
2004-01-16 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/Alloc.h: Rename as ...
* src/ObstackAlloc.h: ... this. The problem is that alloc.h is a
system header in g++ < 3.0, and Darwin has a case-insensitive
filesystem. System headers that include alloc.h pick the local
Alloc.h version.
* BuchiAutomaton.h, Configuration.h, DispUtil.cc,
ExternalTranslator.h, FormulaRandomizer.h, Graph.h.in,
LtlFormula.h, Makefile.am, NeverClaimAutomaton.h, PathEvaluator.h,
ProductAutomaton.h, SccIterator.h, SharedTestData.h,
StatDisplay.h, StateSpace.h, StateSpaceRandomizer.cc,
StringUtil.h, TestOperations.h, TestRoundInfo.h, TestStatistics.h,
UserCommandReader.h, UserCommands.h, main.cc: Adjust includes.
2003-12-29 Alexandre Duret-Lutz <adl@src.lip6.fr> 2003-12-29 Alexandre Duret-Lutz <adl@src.lip6.fr>
* doc/texinfo.tex: New upstream version. * doc/texinfo.tex: New upstream version.

4
lbtt/src/BuchiAutomaton.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -28,7 +28,7 @@
#include <iostream> #include <iostream>
#include <map> #include <map>
#include <string> #include <string>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "BitArray.h" #include "BitArray.h"
#include "EdgeContainer.h" #include "EdgeContainer.h"
#include "Exception.h" #include "Exception.h"

2
lbtt/src/Configuration.h
View file

@ -31,7 +31,7 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "Exception.h" #include "Exception.h"
#include "FormulaRandomizer.h" #include "FormulaRandomizer.h"
#include "StateSpaceRandomizer.h" #include "StateSpaceRandomizer.h"

4
lbtt/src/DispUtil.cc
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -24,7 +24,7 @@
#include <config.h> #include <config.h>
#include <deque> #include <deque>
#include <stack> #include <stack>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "DispUtil.h" #include "DispUtil.h"
/****************************************************************************** /******************************************************************************

2
lbtt/src/ExternalTranslator.h
View file

@ -33,7 +33,7 @@
#else #else
#include <strstream> #include <strstream>
#endif /* HAVE_SSTREAM */ #endif /* HAVE_SSTREAM */
#include "Alloc.h" #include "ObstackAlloc.h"
#include "Exception.h" #include "Exception.h"
#include "LtlFormula.h" #include "LtlFormula.h"
#include "translate.h" #include "translate.h"

4
lbtt/src/FormulaRandomizer.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -27,7 +27,7 @@
#include <config.h> #include <config.h>
#include <vector> #include <vector>
#include <utility> #include <utility>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "LtlFormula.h" #include "LtlFormula.h"
namespace Ltl namespace Ltl

4
lbtt/src/Graph.h.in
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -34,7 +34,7 @@ using SLIST_NAMESPACE::slist;
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "BitArray.h" #include "BitArray.h"
#include "Exception.h" #include "Exception.h"

4
lbtt/src/LtlFormula.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -30,7 +30,7 @@
#include <map> #include <map>
#include <stack> #include <stack>
#include <string> #include <string>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "BitArray.h" #include "BitArray.h"
#include "Exception.h" #include "Exception.h"

65
lbtt/src/Makefile.am
View file

@ -1,20 +1,57 @@
bin_PROGRAMS = lbtt lbtt-translate bin_PROGRAMS = lbtt lbtt-translate
lbtt_SOURCES = Alloc.h BitArray.h Bitset.h BitArray.cc BuchiAutomaton.h \ lbtt_SOURCES = \
BuchiAutomaton.cc Config-parse.yy Config-lex.ll Configuration.h \ BitArray.cc \
Configuration.cc DispUtil.h DispUtil.cc EdgeContainer.h Exception.h \ BitArray.h \
FormulaRandomizer.h FormulaRandomizer.cc FormulaWriter.h LtlFormula.h \ Bitset.h \
LtlFormula.cc main.cc PathEvaluator.h PathEvaluator.cc PathIterator.h \ BuchiAutomaton.cc \
PathIterator.cc ProductAutomaton.h ProductAutomaton.cc Random.h SccIterator.h \ BuchiAutomaton.h \
SharedTestData.h StatDisplay.h StatDisplay.cc StateSpace.h StateSpace.cc \ Config-lex.ll \
StateSpaceRandomizer.h StateSpaceRandomizer.cc StringUtil.h StringUtil.cc \ Config-parse.yy \
TestOperations.h TestOperations.cc TestRoundInfo.h TestStatistics.h \ Configuration.cc \
TestStatistics.cc UserCommandReader.h UserCommandReader.cc UserCommands.h \ Configuration.h \
UserCommands.cc DispUtil.cc \
DispUtil.h \
EdgeContainer.h \
Exception.h \
FormulaRandomizer.cc \
FormulaRandomizer.h \
FormulaWriter.h \
LtlFormula.cc \
LtlFormula.h \
main.cc \
ObstackAlloc.h \
PathEvaluator.cc \
PathEvaluator.h \
PathIterator.cc \
PathIterator.h \
ProductAutomaton.cc \
ProductAutomaton.h \
Random.h \
SccIterator.h \
SharedTestData.h \
StatDisplay.cc \
StatDisplay.h \
StateSpace.cc \
StateSpace.h \
StateSpaceRandomizer.cc \
StateSpaceRandomizer.h \
StringUtil.cc \
StringUtil.h \
TestOperations.cc \
TestOperations.h \
TestRoundInfo.h \
TestStatistics.cc \
TestStatistics.h \
UserCommandReader.cc \
UserCommandReader.h \
UserCommands.cc \
UserCommands.h
EXTRA_lbtt_SOURCES = gnu-getopt.h Config-parse.h EXTRA_lbtt_SOURCES = gnu-getopt.h Config-parse.h
lbtt_LDADD = @LIBOBJS@ @READLINELIBS@ lbtt_LDADD = $(LIBOBJS) $(READLINELIBS)
lbtt_translate_SOURCES = \ lbtt_translate_SOURCES = \
Alloc.h \ ObstackAlloc.h \
BitArray.h \ BitArray.h \
BitArray.cc \ BitArray.cc \
Exception.h \ Exception.h \
@ -39,4 +76,4 @@ lbtt_translate_SOURCES = \
TranslatorInterface.h TranslatorInterface.h
EXTRA_lbtt_translate_SOURCES = gnu-getopt.h NeverClaim-parse.h EXTRA_lbtt_translate_SOURCES = gnu-getopt.h NeverClaim-parse.h
lbtt_translate_LDADD = @LIBOBJS@ lbtt_translate_LDADD = $(LIBOBJS)

4
lbtt/src/NeverClaimAutomaton.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -29,7 +29,7 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "Exception.h" #include "Exception.h"
using namespace std; using namespace std;

0
lbtt/src/Alloc.h → lbtt/src/ObstackAlloc.h
View file

4
lbtt/src/PathEvaluator.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -26,7 +26,7 @@
#include <iostream> #include <iostream>
#include <map> #include <map>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "BitArray.h" #include "BitArray.h"
#include "Exception.h" #include "Exception.h"
#include "LtlFormula.h" #include "LtlFormula.h"

4
lbtt/src/ProductAutomaton.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -28,7 +28,7 @@
#include <deque> #include <deque>
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "BitArray.h" #include "BitArray.h"
#include "BuchiAutomaton.h" #include "BuchiAutomaton.h"
#include "EdgeContainer.h" #include "EdgeContainer.h"

4
lbtt/src/SccIterator.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -25,7 +25,7 @@
#include <set> #include <set>
#include <stack> #include <stack>
#include <vector> #include <vector>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "Graph.h" #include "Graph.h"
using namespace std; using namespace std;

4
lbtt/src/SharedTestData.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -21,7 +21,7 @@
#define SHAREDTESTDATA_H #define SHAREDTESTDATA_H
#include <vector> #include <vector>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "Exception.h" #include "Exception.h"
#include "TestRoundInfo.h" #include "TestRoundInfo.h"
#include "TestStatistics.h" #include "TestStatistics.h"

4
lbtt/src/StatDisplay.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -27,7 +27,7 @@
#include <config.h> #include <config.h>
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "Configuration.h" #include "Configuration.h"
#include "TestStatistics.h" #include "TestStatistics.h"

4
lbtt/src/StateSpace.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -25,7 +25,7 @@
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#include <config.h> #include <config.h>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "BitArray.h" #include "BitArray.h"
#include "EdgeContainer.h" #include "EdgeContainer.h"
#include "Graph.h" #include "Graph.h"

4
lbtt/src/StateSpaceRandomizer.cc
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -24,7 +24,7 @@
#include <climits> #include <climits>
#include <config.h> #include <config.h>
#include <map> #include <map>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "BitArray.h" #include "BitArray.h"
#include "Exception.h" #include "Exception.h"
#include "StateSpaceRandomizer.h" #include "StateSpaceRandomizer.h"

4
lbtt/src/StringUtil.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -33,7 +33,7 @@
#include <strstream> #include <strstream>
#endif /* HAVE_SSTREAM */ #endif /* HAVE_SSTREAM */
#include <vector> #include <vector>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "Exception.h" #include "Exception.h"
using namespace std; using namespace std;

4
lbtt/src/TestOperations.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -29,7 +29,7 @@
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <vector> #include <vector>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "Configuration.h" #include "Configuration.h"
#include "Exception.h" #include "Exception.h"
#include "StateSpace.h" #include "StateSpace.h"

4
lbtt/src/TestRoundInfo.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -25,7 +25,7 @@
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "Exception.h" #include "Exception.h"
#include "LtlFormula.h" #include "LtlFormula.h"
#include "ProductAutomaton.h" #include "ProductAutomaton.h"

4
lbtt/src/TestStatistics.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -27,7 +27,7 @@
#include <config.h> #include <config.h>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "BuchiAutomaton.h" #include "BuchiAutomaton.h"
#include "Configuration.h" #include "Configuration.h"
#include "ProductAutomaton.h" #include "ProductAutomaton.h"

4
lbtt/src/UserCommandReader.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -28,7 +28,7 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "Configuration.h" #include "Configuration.h"
#include "Exception.h" #include "Exception.h"

4
lbtt/src/UserCommands.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 1999, 2000, 2001, 2002 * Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi> * Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -30,7 +30,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <utility> #include <utility>
#include "Alloc.h" #include "ObstackAlloc.h"
#include "BuchiAutomaton.h" #include "BuchiAutomaton.h"
#include "Configuration.h" #include "Configuration.h"
#include "ProductAutomaton.h" #include "ProductAutomaton.h"

2
lbtt/src/main.cc
View file

@ -28,7 +28,7 @@
#include <readline/readline.h> #include <readline/readline.h>
#include <readline/history.h> #include <readline/history.h>
#endif /* HAVE_READLINE */ #endif /* HAVE_READLINE */
#include "Alloc.h" #include "ObstackAlloc.h"
#include "Configuration.h" #include "Configuration.h"
#include "DispUtil.h" #include "DispUtil.h"
#include "Exception.h" #include "Exception.h"