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

* src/main.cc: Include <climits> for LONG_MAX. lbtt won't

Browse source 
compile with g++-4.3 otherwise.
* src/Ltl-parse.yy (matchCharactersFromStream): Declare the chars
as const to kill a g++ warning.
* src/NeverClaim-parse.yy (yyerror): Declare the error
message as const to kill a g++ warning.
This commit is contained in:
Alexandre Duret-Lutz 2008-03-13 11:28:18 +01:00
parent 5ef7084b61
commit ab1a2ae5d7
4 changed files with 38 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lbtt/src/Ltl-parse.yy
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2004, 2005
* Copyright (C) 2004, 2005, 2008
* Heikki Tauriainen <Heikki.Tauriainen@tkk.fi>
*
* This program is free software; you can redistribute it and/or
@ -372,7 +372,7 @@ infix_b_formula: formula LTLPARSE_AND formula
*****************************************************************************/
static inline size_t matchCharactersFromStream
(istream& stream, char* chars)
(istream& stream, const char* chars)
{
size_t num_matched;
for (num_matched = 0; *chars != '\0' && stream.peek() == *chars; ++chars)

14
lbtt/src/NeverClaim-parse.yy
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
* Heikki Tauriainen <Heikki.Tauriainen@tkk.fi>
*
* This program is free software; you can redistribute it and/or
@ -83,7 +83,7 @@ extern int yyleng; /* Length of the last
*****************************************************************************/
/* ========================================================================= */
void yyerror(char*)
void yyerror(const char*)
/* ----------------------------------------------------------------------------
*
* Description: Function for reporting never claim parse errors.
@ -219,12 +219,12 @@ transition: NC_DOUBLE_COLON formula NC_RIGHT_ARROW NC_GOTO NC_LABEL
;
formula: NC_PROPOSITION
{
$$ = $1;
{
$$ = $1;
}
| NC_TRUE
{
$$ = $1;
{
$$ = $1;
}
| NC_FALSE
{
@ -290,7 +290,7 @@ int parseNeverClaim(FILE* stream, NeverClaimAutomaton& a)
* a -- A reference to a NeverClaimAutomaton object in
* which the results should be stored.
*
* Returns:
* Returns:
*
* ------------------------------------------------------------------------- */
{

13
lbtt/src/main.cc
View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
* Heikki Tauriainen <Heikki.Tauriainen@tkk.fi>
*
* This program is free software; you can redistribute it and/or
@ -21,6 +21,7 @@
#include <csignal>
#include <cstdlib>
#include <ctime>
#include <climits>
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif /* HAVE_SYS_TYPES_H */
@ -366,7 +367,7 @@ bool testLoop()
round_info.error = false;
round_info.skip
= (round_info.current_round < round_info.next_round_to_run);
if (!round_info.skip)
printText(string("Round ") + toString(round_info.current_round)
+ " of " + toString(global_options.number_of_rounds) + "\n\n",
@ -395,7 +396,7 @@ bool testLoop()
configuration.global_options.statespace_random_seed
= LRAND(0, RAND_MAX);
#endif /* HAVE_RAND48 */
if (global_options.statespace_change_interval == 0)
round_info.next_round_to_change_statespace
= global_options.number_of_rounds + 1;
@ -433,7 +434,7 @@ bool testLoop()
*/
round_info.fresh_formula
= (round_info.next_round_to_change_formula
= (round_info.next_round_to_change_formula
== round_info.current_round);
if (round_info.fresh_formula)
@ -742,7 +743,7 @@ bool testLoop()
int main(int argc, char* argv[])
{
try
try
{
configuration.read(argc, argv);
}
@ -791,7 +792,7 @@ int main(int argc, char* argv[])
using_history();
#endif /* HAVE_READLINE */
try
try
{
allocateTempFilenames();
if (!testLoop())