Implemented SAS parsing directly from streams.
This commit is contained in:
parent
e899bd7aec
commit
2d3760b774
@ -1,6 +1,7 @@
|
||||
#ifndef __SAS__DESCRIPTION_H
|
||||
#define __SAS__DESCRIPTION_H
|
||||
|
||||
#include <iosfwd>
|
||||
#include <vector>
|
||||
|
||||
#include <boost/filesystem/path.hpp>
|
||||
@ -24,6 +25,7 @@ namespace sas
|
||||
class Description
|
||||
{
|
||||
public:
|
||||
static Description fromStream(std::istream &istream);
|
||||
static Description fromFile(const boost::filesystem::path &path);
|
||||
|
||||
public:
|
||||
|
@ -24,31 +24,36 @@ Description::Description()
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Description Description::fromFile(const boost::filesystem::path &path)
|
||||
Description Description::fromStream(std::istream &istream)
|
||||
{
|
||||
Description description;
|
||||
|
||||
setlocale(LC_NUMERIC, "C");
|
||||
|
||||
if (!boost::filesystem::is_regular_file(path))
|
||||
{
|
||||
std::cerr << "Error: File does not exist: " << path.string() << std::endl;
|
||||
istream.exceptions(std::ifstream::failbit | std::ifstream::badbit);
|
||||
|
||||
description.parseVersionSection(istream);
|
||||
description.parseMetricSection(istream);
|
||||
description.parseVariablesSection(istream);
|
||||
description.parseMutexSection(istream);
|
||||
description.parseInitialStateSection(istream);
|
||||
description.parseGoalSection(istream);
|
||||
description.parseOperatorSection(istream);
|
||||
description.parseAxiomSection(istream);
|
||||
|
||||
return description;
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Description Description::fromFile(const boost::filesystem::path &path)
|
||||
{
|
||||
if (!boost::filesystem::is_regular_file(path))
|
||||
throw std::runtime_error("File does not exist: \"" + path.string() + "\"");
|
||||
|
||||
std::ifstream fileStream(path.string(), std::ios::in);
|
||||
fileStream.exceptions(std::ifstream::failbit | std::ifstream::badbit);
|
||||
|
||||
description.parseVersionSection(fileStream);
|
||||
description.parseMetricSection(fileStream);
|
||||
description.parseVariablesSection(fileStream);
|
||||
description.parseMutexSection(fileStream);
|
||||
description.parseInitialStateSection(fileStream);
|
||||
description.parseGoalSection(fileStream);
|
||||
description.parseOperatorSection(fileStream);
|
||||
description.parseAxiomSection(fileStream);
|
||||
|
||||
return description;
|
||||
return Description::fromStream(fileStream);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
Reference in New Issue
Block a user