Commit 4741dc02 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

* lbtt/: Merge lbtt 1.0.3.

parent f4708a01
2004-02-16 Alexandre Duret-Lutz <adl@src.lip6.fr>
* lbtt/: Merge lbtt 1.0.3.
2004-02-13 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/tgbatest/ltl2baw.pl (END): Ensure LTL2TGBA is always
......
......@@ -10,23 +10,6 @@
* src/TestOperations.cc: Include sys/wait.h.
* 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>
* doc/texinfo.tex: New upstream version.
2003-07-29 Alexandre Duret-Lutz <aduret@src.lip6.fr>
* src/TestOperations.cc (generateBuchiAutomaton): Forward SIGINT
......@@ -35,11 +18,6 @@
* src/main.cc (main): Do not intercept SIGINT in
non-interactive runs.
2003-07-13 Alexandre Duret-Lutz <aduret@src.lip6.fr>
* doc/lbtt.texi: Never use @-commands in @node names, recent Texinfo
versions are stricter on this.
2003-07-10 Alexandre Duret-Lutz <aduret@src.lip6.fr>
Spot wants `^', not `xor'.
......@@ -59,13 +37,74 @@
* src/Makefile.am (lbtt_translate_SOURCES): Add SpotWrapper.cc
and SpotWrapper.h.
* src/translate.cc (main): Add the --spot option, and build
a SpotWrapper of required.
a SpotWrapper if required.
2004-02-13 Heikki Tauriainen <heikki.tauriainen@hut.fi>
* src/BitArray.{h,cc}, src/BuchiAutomaton.{h,cc},
src/Configuration.{h,cc}, src/DispUtil.{h,cc},
src/ExternalTranslator.{h,cc}, src/FormulaRandomizer.{h,cc},
src/LtlFormula.{h,cc}, src/NeverClaimAutomaton.{h,cc},
src/PathEvaluator.{h,cc}, src/PathIterator.{h,cc},
src/ProductAutomaton.{h,cc}, src/SpinWrapper.{h,cc},
src/StatDisplay.{h,cc}, src/StateSpace.{h,cc},
src/StateSpaceRandomizer.{h,cc}, src/StringUtil.{h,cc},
src/TestOperations.{h,cc}, src/TestStatistics.{h,cc},
src/translate.{h,cc}, src/UserCommandReader.{h,cc},
src/UserCommands.{h,cc}: Remove all #pragmas.
2004-02-12 Heikki Tauriainen <heikki.tauriainen@hut.fi>
* doc/texinfo.tex: New upstream version.
* doc/lbtt.texi: Update edition to 1.0.2.
Remove node names with commands to fix dvi file generation.
Move the node about the lbtt-translate utility to correct menu.
Reformat the automata file format section to avoid overfull lines
in dvi generation.
Fix description of the Algorithm block used with lbtt-translate.
* doc/testprocedure.txt, doc/intersectioncheck.txt: Add initial
newlines.
2004-02-11 Heikki Tauriainen <heikki.tauriainen@hut.fi>
* src/UserCommandReader.cc [HAVE_ISATTY]: Include the unistd.h
header.
(executeUserCommands) Stop waiting for new commands if an EOF is
detected. [HAVE_ISATTY]: If standard input is not connected to a
terminal, echo the input line.
2004-02-10 Heikki Tauriainen <heikki.tauriainen@hut.fi>
* configure.ac: Remove duplicate checks for headers.
(GLIBC_OBSTACK_WORKAROUND): New config.h macro for checking for a
version of the obstack.h header that requires a workaround to be
compiled with g++.
Add check for the `isatty' library function.
Include the stdio.h header when testing for readline libraries.
* src/Alloc.h: Rename to LbttAlloc.h to avoid a name conflict with
system header files on Darwin.
[GLIBC_OBSTACK_WORKAROUND] (__INT_TO_PTR): Redefine macro to
work around a C++ bug in the obstack.h header file in glibc 2.3.2.
Thanks to Alexandre Duret-Lutz for the original patch.
* src/BuchiAutomaton.h, src/Configuration.h, src/DispUtil.cc,
src/ExternalTranslator.h, src/FormulaRandomizer.h, src/Graph.h.in,
src/LtlFormula.h, src/main.cc, src/Makefile.am,
src/NeverClaimAutomaton.h, src/PathEvaluator.h,
src/ProductAutomaton.h, src/SccIterator.h, src/SharedTestData.h,
src/StatDisplay.h, src/StateSpace.h, src/StateSpaceRandomizer.cc,
src/StringUtil.h, src/TestOperations.h, src/TestRoundInfo.h,
src/TestStatistics.h, src/UserCommandReader.h,
src/UserCommands.h: Adjust includes.
* Update copyright information in source files.
2003-07-04 Alexandre Duret-Lutz <aduret@src.lip6.fr>
* src/Config-parse.yy: Remove stray `,' in %token arguments.
* src/Alloc.h (__INT_TO_PTR): Redefine to work around glibc 2.3.
* doc/texinfo.tex: New upstream version.
2003-07-18 Heikki Tauriainen <heikki.tauriainen@hut.fi>
......
Makefile.in
Makefile
*.info*
\ No newline at end of file
*.info*
This diff is collapsed.
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
*
* This program is free software; you can redistribute it and/or
......@@ -20,15 +20,11 @@
#ifndef BUCHIAUTOMATON_H
#define BUCHIAUTOMATON_H
#ifdef __GNUC__
#pragma interface
#endif /* __GNUC__ */
#include <config.h>
#include <iostream>
#include <map>
#include <string>
#include "ObstackAlloc.h"
#include "LbttAlloc.h"
#include "BitArray.h"
#include "EdgeContainer.h"
#include "Exception.h"
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
*
* This program is free software; you can redistribute it and/or
......
This diff is collapsed.
This diff is collapsed.
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
*
* This program is free software; you can redistribute it and/or
......@@ -17,14 +17,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifdef __GNUC__
#pragma implementation
#endif /* __GNUC__ */
#include <config.h>
#include <deque>
#include <stack>
#include "ObstackAlloc.h"
#include "LbttAlloc.h"
#include "DispUtil.h"
/******************************************************************************
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
*
* This program is free software; you can redistribute it and/or
......@@ -74,7 +74,7 @@ public:
virtual ~UserBreakException() throw(); /* Destructor. */
UserBreakException& /* Assignment operator. */
operator=(const UserBreakException& e);
operator=(const UserBreakException& e);
/* `what' inherited from class Exception */
......@@ -289,13 +289,13 @@ public:
Exceptional_istream /* Constructor. */
(istream *istr,
ios::iostate mask = ios::goodbit);
/* default copy constructor */
~Exceptional_istream(); /* Destructor. */
/* default assignment operator */
template<class T> /* Operator for reading */
Exceptional_istream &operator>>(T &t); /* from the stream. */
......@@ -337,9 +337,9 @@ public:
Exceptional_ostream /* Constructor. */
(ostream* ostr,
ios::iostate mask = ios::goodbit);
/* default copy constructor */
~Exceptional_ostream(); /* Destructor. */
/* default assignment operator */
......@@ -353,7 +353,7 @@ public:
* aware output stream into
* a regular output stream.
*/
private:
ostream* stream; /* A pointer to the
* `regular' output stream
......@@ -482,7 +482,7 @@ inline UserBreakException& UserBreakException::operator=
(const UserBreakException& e)
/* ----------------------------------------------------------------------------
*
* Descrption: Assignment operator for class UserBreakException. Assigns the
* Descrption: Assignment operator for class UserBreakException. Assigns the
* value of another UserBreakException to `this' one.
*
* Argument: e -- A reference to a constant UserBreakException.
......@@ -808,7 +808,7 @@ inline FileWriteException::FileWriteException() :
inline FileWriteException::FileWriteException
(const string& filename, const string& details) :
IOException("error writing to " + filename
+ string(details.empty() ? "" : " " + details))
+ string(details.empty() ? "" : " " + details))
/* ----------------------------------------------------------------------------
*
* Description: Constructor for class FileWriteException. This constructor
......@@ -954,7 +954,7 @@ inline Exceptional_istream::Exceptional_istream
*
* Arguments: istr -- A pointer to an object of type istream.
* mask -- A bit mask determining when the Exceptional_istream
* should throw exceptions. The most useful constants
* should throw exceptions. The most useful constants
* for the bit mask are
* ios::badbit Throw an exception if the input
* stream (after performing an input
......@@ -1060,7 +1060,7 @@ inline Exceptional_ostream::Exceptional_ostream
*
* Arguments: ostr -- A pointer to an object of type ostream.
* mask -- A bit mask determining when the Exceptional_ostream
* should throw exceptions. The most useful constants
* should throw exceptions. The most useful constants
* for the bit mask are
* ios::badbit Throw an exception if the output
* stream (after performing an output
......
......@@ -17,10 +17,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifdef __GNUC__
#pragma implementation
#endif /* __GNUC__ */
#include <config.h>
#include <csignal>
#include <cstdio>
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
*
* This program is free software; you can redistribute it and/or
......@@ -20,10 +20,6 @@
#ifndef EXTERNALTRANSLATOR_H
#define EXTERNALTRANSLATOR_H
#ifdef __GNUC__
#pragma interface
#endif /* __GNUC__ */
#include <config.h>
#include <deque>
#include <stack>
......@@ -33,7 +29,7 @@
#else
#include <strstream>
#endif /* HAVE_SSTREAM */
#include "ObstackAlloc.h"
#include "LbttAlloc.h"
#include "Exception.h"
#include "LtlFormula.h"
#include "translate.h"
......@@ -210,8 +206,8 @@ private:
*/
stack<TempFileObject*, /* Stack for storing */
deque<TempFileObject*, /* temporary file */
ALLOC(TempFileObject*) > > /* information. */
deque<TempFileObject*, /* temporary file */
ALLOC(TempFileObject*) > > /* information. */
temporary_file_objects;
friend class KecWrapper; /* Friend declarations. */
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
*
* This program is free software; you can redistribute it and/or
......@@ -20,14 +20,10 @@
#ifndef FORMULARANDOMIZER_H
#define FORMULARANDOMIZER_H
#ifdef __GNUC__
#pragma interface
#endif /* __GNUC__ */
#include <config.h>
#include <vector>
#include <utility>
#include "ObstackAlloc.h"
#include "LbttAlloc.h"
#include "LtlFormula.h"
namespace Ltl
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
*
* This program is free software; you can redistribute it and/or
......@@ -34,7 +34,7 @@ using SLIST_NAMESPACE::slist;
#include <utility>
#include <vector>
#include "ObstackAlloc.h"
#include "LbttAlloc.h"
#include "BitArray.h"
#include "Exception.h"
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
*
* This program is free software; you can redistribute it and/or
......@@ -20,17 +20,13 @@
#ifndef LTLFORMULA_H
#define LTLFORMULA_H
#ifdef __GNUC__
#pragma interface
#endif /* __GNUC__ */
#include <config.h>
#include <deque>
#include <iostream>
#include <map>
#include <stack>
#include <string>
#include "ObstackAlloc.h"
#include "LbttAlloc.h"
#include "BitArray.h"
#include "Exception.h"
......
......@@ -16,10 +16,10 @@ lbtt_SOURCES = \
FormulaRandomizer.cc \
FormulaRandomizer.h \
FormulaWriter.h \
LbttAlloc.h \
LtlFormula.cc \
LtlFormula.h \
main.cc \
ObstackAlloc.h \
PathEvaluator.cc \
PathEvaluator.h \
PathIterator.cc \
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
*
* This program is free software; you can redistribute it and/or
......@@ -20,16 +20,12 @@
#ifndef NEVERCLAIMAUTOMATON_H
#define NEVERCLAIMAUTOMATON_H
#ifdef __GNUC__
#pragma interface
#endif /* __GNUC__ */
#include <config.h>
#include <map>
#include <string>
#include <utility>
#include <vector>
#include "ObstackAlloc.h"
#include "LbttAlloc.h"
#include "Exception.h"
using namespace std;
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef ALLOC_H
#define ALLOC_H
#include <config.h>
#ifdef HAVE_SINGLE_CLIENT_ALLOC
#define ALLOC(typename) single_client_alloc
#else
#define ALLOC(typename) allocator<typename>
#endif /* HAVE_SINGLE_CLIENT_ALLOC */
#ifdef HAVE_OBSTACK_H
/* GNU libc 2.3's copy of obstack.h uses a definition of __INT_TO_PTR
which does not compile in C++. Fortunately it will not override
an existing definition. */
#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 3
# define __INT_TO_PTR(P) ((P) + (char *) 0)
#endif
#include <obstack.h>
#include <cstdlib>
#include <new>
/******************************************************************************
*
* A wrapper class for allocating memory through an obstack.
*
*****************************************************************************/
class ObstackAllocator
{
public:
ObstackAllocator(); /* Constructor. */
~ObstackAllocator(); /* Destructor. */
void* alloc(int size); /* Allocates memory. */
void free(void* obj); /* Deallocates memory. */
static void failure(); /* Callback function for
* reporting a memory
* allocation failure.
*/
private:
ObstackAllocator(const ObstackAllocator&); /* Prevent copying and */
ObstackAllocator& operator= /* assignment of */
(const ObstackAllocator&); /* ObstackAllocator
* objects.
*/
struct obstack store; /* The obstack. */
};
#define obstack_chunk_alloc std::malloc
#define obstack_chunk_free std::free
/******************************************************************************
*
* Inline function definitions for class ObstackAllocator.
*
*****************************************************************************/
/* ========================================================================= */
inline ObstackAllocator::ObstackAllocator()
/* ----------------------------------------------------------------------------
*
* Description: Constructor for class ObstackAllocator.
*
* Arguments: None.
*
* Returns: Nothing.
*
* ------------------------------------------------------------------------- */
{
obstack_init(&store);
}
/* ========================================================================= */
inline ObstackAllocator::~ObstackAllocator()
/* ----------------------------------------------------------------------------
*
* Description: Destructor for class ObstackAllocator.
*
* Arguments: None.
*
* Returns: Nothing.
*
* ------------------------------------------------------------------------- */
{
obstack_free(&store, NULL);
}
/* ========================================================================= */
inline void* ObstackAllocator::alloc(int size)
/* ----------------------------------------------------------------------------
*
* Description: Interface to the memory allocator.
*
* Argument: size -- Number of bytes to allocate.
*
* Returns: A pointer to the beginning of the newly allocated memory.
*
* ------------------------------------------------------------------------- */
{
return obstack_alloc(&store, size);
}
/* ========================================================================= */
inline void ObstackAllocator::free(void* obj)
/* ----------------------------------------------------------------------------
*
* Description: Interface to the memory deallocation function.
*
* Argument: obj -- A pointer to the object to deallocate. (Because the
* underlying memory allocator is an obstack, freeing
* an object also releases all objects allocated after
* the given object.)
*
* Returns: Nothing.
*
* ------------------------------------------------------------------------- */
{
obstack_free(&store, obj);
}
/* ========================================================================= */
inline void ObstackAllocator::failure()
/* ----------------------------------------------------------------------------
*
* Description: Callback function for reporting memory allocation failures.
*
* Arguments: None.
*
* Returns: Nothing.
*
* ------------------------------------------------------------------------- */
{
throw std::bad_alloc();
}
#endif /* HAVE_OBSTACK_H */
#endif /* !ALLOC_H */
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
*
* This program is free software; you can redistribute it and/or
......@@ -20,13 +20,9 @@
#ifndef PATHEVALUATOR_H
#define PATHEVALUATOR_H
#ifdef __GNUC__
#pragma interface
#endif /* __GNUC__ */
#include <iostream>
#include <map>
#include "ObstackAlloc.h"
#include "LbttAlloc.h"
#include "BitArray.h"
#include "Exception.h"
#include "LtlFormula.h"
......
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
* Heikki Tauriainen <Heikki.Tauriainen@hut.fi>
*
* This program is free software; you can redistribute it and/or
......@@ -20,15 +20,11 @@
#ifndef PRODUCTAUTOMATON_H
#define PRODUCTAUTOMATON_H
#ifdef __GNUC__
#pragma interface
#endif /* __GNUC__ */
#include <config.h>
#include <deque>
#include <iostream>
#include <vector>
#include "ObstackAlloc.h"
#include "LbttAlloc.h"
#include "BitArray.h"
#include "BuchiAutomaton.h"
#include "EdgeContainer.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment