This helps working around missing C functions like strcasecmp that do not exist everywhere (e.g. on Cygwin), and for which lib/ supplies a replacement. Unfortunately we do not have such build in our current continuous integration suite, so we cannot easily detect files where such config.h inclusion would be useful. Therefore this patch simply makes it mandatory to include config.h in *.cc files. Including this in public *.hh file is currently forbidden. * spot/gen/automata.cc, spot/gen/formulas.cc, spot/kripke/fairkripke.cc, spot/kripke/kripke.cc, spot/ltsmin/ltsmin.cc, spot/misc/game.cc, spot/parseaut/fmterror.cc, spot/parsetl/fmterror.cc, spot/parsetl/parsetl.yy, spot/priv/bddalloc.cc, spot/priv/freelist.cc, spot/priv/satcommon.cc, spot/priv/trim.cc, spot/priv/weight.cc, spot/ta/ta.cc, spot/ta/taexplicit.cc, spot/ta/taproduct.cc, spot/ta/tgtaexplicit.cc, spot/ta/tgtaproduct.cc, spot/taalgos/dot.cc, spot/taalgos/emptinessta.cc, spot/taalgos/minimize.cc, spot/taalgos/reachiter.cc, spot/taalgos/statessetbuilder.cc, spot/taalgos/stats.cc, spot/taalgos/tgba2ta.cc, spot/tl/apcollect.cc, spot/tl/contain.cc, spot/tl/declenv.cc, spot/tl/defaultenv.cc, spot/tl/dot.cc, spot/tl/exclusive.cc, spot/tl/hierarchy.cc, spot/tl/length.cc, spot/tl/ltlf.cc, spot/tl/mark.cc, spot/tl/mutation.cc, spot/tl/nenoform.cc, spot/tl/print.cc, spot/tl/randomltl.cc, spot/tl/relabel.cc, spot/tl/remove_x.cc, spot/tl/simplify.cc, spot/tl/snf.cc, spot/tl/unabbrev.cc, spot/twa/acc.cc, spot/twa/bdddict.cc, spot/twa/bddprint.cc, spot/twa/formula2bdd.cc, spot/twa/taatgba.cc, spot/twa/twa.cc, spot/twa/twagraph.cc, spot/twa/twaproduct.cc, spot/twaalgos/aiger.cc, spot/twaalgos/alternation.cc, spot/twaalgos/are_isomorphic.cc, spot/twaalgos/bfssteps.cc, spot/twaalgos/canonicalize.cc, spot/twaalgos/cleanacc.cc, spot/twaalgos/cobuchi.cc, spot/twaalgos/complement.cc, spot/twaalgos/complete.cc, spot/twaalgos/compsusp.cc, spot/twaalgos/couvreurnew.cc, spot/twaalgos/cycles.cc, spot/twaalgos/degen.cc, spot/twaalgos/determinize.cc, spot/twaalgos/dot.cc, spot/twaalgos/dtbasat.cc, spot/twaalgos/dtwasat.cc, spot/twaalgos/dualize.cc, spot/twaalgos/emptiness.cc, spot/twaalgos/gtec/ce.cc, spot/twaalgos/gtec/gtec.cc, spot/twaalgos/gtec/sccstack.cc, spot/twaalgos/gtec/status.cc, spot/twaalgos/gv04.cc, spot/twaalgos/hoa.cc, spot/twaalgos/iscolored.cc, spot/twaalgos/isdet.cc, spot/twaalgos/isunamb.cc, spot/twaalgos/isweakscc.cc, spot/twaalgos/langmap.cc, spot/twaalgos/lbtt.cc, spot/twaalgos/ltl2taa.cc, spot/twaalgos/ltl2tgba_fm.cc, spot/twaalgos/magic.cc, spot/twaalgos/mask.cc, spot/twaalgos/minimize.cc, spot/twaalgos/neverclaim.cc, spot/twaalgos/parity.cc, spot/twaalgos/postproc.cc, spot/twaalgos/powerset.cc, spot/twaalgos/product.cc, spot/twaalgos/rabin2parity.cc, spot/twaalgos/randomgraph.cc, spot/twaalgos/randomize.cc, spot/twaalgos/reachiter.cc, spot/twaalgos/relabel.cc, spot/twaalgos/remfin.cc, spot/twaalgos/remprop.cc, spot/twaalgos/sbacc.cc, spot/twaalgos/sccfilter.cc, spot/twaalgos/sccinfo.cc, spot/twaalgos/se05.cc, spot/twaalgos/sepsets.cc, spot/twaalgos/simulation.cc, spot/twaalgos/split.cc, spot/twaalgos/stats.cc, spot/twaalgos/strength.cc, spot/twaalgos/stripacc.cc, spot/twaalgos/stutter.cc, spot/twaalgos/sum.cc, spot/twaalgos/tau03.cc, spot/twaalgos/tau03opt.cc, spot/twaalgos/totgba.cc, spot/twaalgos/toweak.cc, spot/twaalgos/translate.cc, spot/twaalgos/word.cc, tests/core/acc.cc, tests/core/bitvect.cc, tests/core/checkpsl.cc, tests/core/checkta.cc, tests/core/consterm.cc, tests/core/emptchk.cc, tests/core/equalsf.cc, tests/core/graph.cc, tests/core/ikwiad.cc, tests/core/intvcmp2.cc, tests/core/intvcomp.cc, tests/core/kind.cc, tests/core/kripkecat.cc, tests/core/length.cc, tests/core/ltlrel.cc, tests/core/ngraph.cc, tests/core/parity.cc, tests/core/randtgba.cc, tests/core/readltl.cc, tests/core/reduc.cc, tests/core/safra.cc, tests/core/sccif.cc, tests/core/syntimpl.cc, tests/core/taatgba.cc, tests/core/tostring.cc, tests/core/trival.cc, tests/core/twagraph.cc, tests/ltsmin/modelcheck.cc, spot/parseaut/scanaut.ll, spot/parsetl/scantl.ll: Include config.h. * spot/gen/Makefile.am, spot/graph/Makefile.am, spot/kripke/Makefile.am, spot/ltsmin/Makefile.am, spot/parseaut/Makefile.am, spot/parsetl/Makefile.am, spot/priv/Makefile.am, spot/ta/Makefile.am, spot/taalgos/Makefile.am, spot/tl/Makefile.am, spot/twa/Makefile.am, spot/twaalgos/Makefile.am, spot/twaalgos/gtec/Makefile.am, tests/Makefile.am: Add the -I lib/ flags. * tests/sanity/includes.test: Catch missing config.h in *.cc, and diagnose config.h in *.hh. * tests/sanity/style.test: Better diagnostics.
122 lines
3.6 KiB
C++
122 lines
3.6 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2010, 2012-2013, 2015-2016, 2018 Laboratoire de
|
|
// Recherche et Développement de l'Epita (LRDE).
|
|
// Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de Paris
|
|
// 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
|
|
// Université Pierre et Marie Curie.
|
|
//
|
|
// This file is part of Spot, a model checking library.
|
|
//
|
|
// Spot 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 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// Spot 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, see <http://www.gnu.org/licenses/>.
|
|
|
|
#include "config.h"
|
|
#include <spot/tl/parse.hh>
|
|
#include <ostream>
|
|
#include <iterator>
|
|
#include <vector>
|
|
#include "utf8/utf8.h"
|
|
|
|
namespace spot
|
|
{
|
|
void
|
|
fix_utf8_locations(const std::string& ltl_string,
|
|
parse_error_list& error_list)
|
|
{
|
|
// LUT to convert byte positions to utf8 positions.
|
|
// (The +2 is to account for position 0, not used,
|
|
// and position ltl_string.size()+1 denoting EOS.)
|
|
std::vector<unsigned> b2u(ltl_string.size() + 2);
|
|
|
|
// i will iterate over all utf8 characters between b and e
|
|
std::string::const_iterator b = ltl_string.begin();
|
|
std::string::const_iterator i = b;
|
|
std::string::const_iterator e = ltl_string.end();
|
|
|
|
unsigned n = 0; // number of current utf8 character
|
|
unsigned prev = 0; // last byte of previous utf8 character
|
|
while (i != e)
|
|
{
|
|
utf8::next(i, e);
|
|
++n;
|
|
unsigned d = std::distance(b, i);
|
|
while (prev < d)
|
|
b2u[++prev] = n;
|
|
}
|
|
b2u[++prev] = ++n;
|
|
|
|
// use b2u to update error_list
|
|
parse_error_list::iterator it;
|
|
for (it = error_list.begin(); it != error_list.end(); ++it)
|
|
{
|
|
location& l = it->first;
|
|
l.begin.column = b2u[l.begin.column];
|
|
l.end.column = b2u[l.end.column];
|
|
}
|
|
}
|
|
|
|
namespace
|
|
{
|
|
static bool
|
|
format_parse_errors_aux(std::ostream& os,
|
|
const std::string& ltl_string,
|
|
const parse_error_list& error_list,
|
|
unsigned shift)
|
|
{
|
|
bool printed = false;
|
|
for (auto it: error_list)
|
|
{
|
|
os << ">>> " << ltl_string << '\n';
|
|
const location& l = it.first;
|
|
|
|
unsigned n = 1;
|
|
for (; n < 4 + l.begin.column + shift; ++n)
|
|
os << ' ';
|
|
// Write at least one '^', even if begin==end.
|
|
os << '^';
|
|
++n;
|
|
for (; n < 4 + l.end.column + shift; ++n)
|
|
os << '^';
|
|
os << '\n' << it.second << "\n\n";
|
|
printed = true;
|
|
}
|
|
os.flush();
|
|
return printed;
|
|
}
|
|
}
|
|
|
|
bool
|
|
parsed_formula::format_errors(std::ostream& os,
|
|
const std::string& real_input,
|
|
unsigned shift)
|
|
{
|
|
if (utf8::is_valid(input.begin(), input.end()))
|
|
{
|
|
parse_error_list fixed = errors;
|
|
fix_utf8_locations(input, fixed);
|
|
return format_parse_errors_aux(os, real_input, fixed, shift);
|
|
}
|
|
else
|
|
{
|
|
return format_parse_errors_aux(os, real_input, errors, shift);
|
|
}
|
|
}
|
|
|
|
bool
|
|
parsed_formula::format_errors(std::ostream& os)
|
|
{
|
|
return format_errors(os, input, 0);
|
|
}
|
|
|
|
|
|
}
|