diff --git a/NEWS b/NEWS index 4e401787a2b8e6e51f3e5c4f356ae24f87fdd7aa..1c92839bda5165b6671906dd94fe24470a609a86 100644 --- a/NEWS +++ b/NEWS @@ -38,6 +38,8 @@ New in spot 1.1a (not yet released): - genltl --gh-r generated the wrong formulas due to a typo. - ltlfilt --eventual and --universal were not handled properly. - ltlfilt --stutter-invariant would trigger an assert on PSL formulas. + - ltl2tgba, ltl2tgta, ltlcross, and ltlfilt, would all choke on empty + lines in a file of formulas. They now ignore empty lines. New in spot 1.1 (2013-04-28): diff --git a/src/bin/common_finput.cc b/src/bin/common_finput.cc index 711bcd57f5f2bd08a0938bfa92b38ba427539920..decf96fff4014ecb0ea25c1ee323e2dfea257123 100644 --- a/src/bin/common_finput.cc +++ b/src/bin/common_finput.cc @@ -1,6 +1,6 @@ // -*- coding: utf-8 -*- -// Copyright (C) 2012 Laboratoire de Recherche et Développement de -// l'Epita (LRDE). +// Copyright (C) 2012, 2013 Laboratoire de Recherche et Développement +// de l'Epita (LRDE). // // This file is part of Spot, a model checking library. // @@ -114,7 +114,8 @@ job_processor::process_stream(std::istream& is, int linenum = 0; std::string line; while (!abort_run && std::getline(is, line)) - error |= process_string(line, filename, ++linenum); + if (!line.empty()) + error |= process_string(line, filename, ++linenum); return error; } diff --git a/src/ltltest/ltlfilt.test b/src/ltltest/ltlfilt.test index a3b346c1eeaf989d77e160d147e2d797562a3794..5e5ad3e95ccfd0711c5f5a9fa5bda2fbece922ab 100755 --- a/src/ltltest/ltlfilt.test +++ b/src/ltltest/ltlfilt.test @@ -31,10 +31,12 @@ checkopt() diff exp out } - +# The empty lines in the file are meant, we want to make sure that +# they are ignored. cat >formulas <