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

* src/ltlvisit/tostring.cc (is_bare_word): New function.

Browse source 
(to_string_visitor::visitor(const atomic_prop*)): Use is_bare_word
to better check which atomic proposition need to be quoted.
* src/ltlparse/ltlscan.ll: Do not allow identifiers starting with F_
or G_.
* src/ltltest/equals.test, src/ltltest/tostring.test: More tests.
This commit is contained in:
Alexandre Duret-Lutz 2004-06-23 11:36:03 +00:00
parent 3802528bfd
commit e9fd27e892
5 changed files with 39 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/ltlvisit/tostring.cc
View file

@ -21,6 +21,7 @@
#include <cassert>
#include <sstream>
#include <ctype.h>
#include "tostring.hh"
#include "ltlast/visitor.hh"
#include "ltlast/allnodes.hh"
@ -31,6 +32,27 @@ namespace spot
namespace ltl
{
static bool
is_bare_word(const char* str)
{
// Bare words cannot be empty, start with the letter of a unary
// operator, or be the name of an existing constant. Also they
// should start with an letter.
if (!*str
|| *str == 'F'
|| *str == 'G'
|| *str == 'X'
|| !(isalpha(*str) || *str == '_')
|| !strcasecmp(str, "true")
|| !strcasecmp(str, "false"))
return false;
// The remaining of the word must be alphanumeric.
while (*++str)
if (!(isalnum(*str) || *str == '_'))
return false;
return true;
}
class to_string_visitor : public const_visitor
{
public:
@ -48,9 +70,7 @@ namespace spot
visit(const atomic_prop* ap)
{
std::string str = ap->name();
if (str[0] == 'F' || str[0] == 'G' || str[0] == 'X'
|| !strcasecmp(str.c_str(), "true")
|| !strcasecmp(str.c_str(), "false"))
if (!is_bare_word(str.c_str()))
{
os_ << '"' << str << '"';
}