patrick/plasp
Archived
1
0
Fork 0
Code Issues 12 Releases 8 Activity

Implemented SAS parsing directly from streams.

Browse Source
This commit is contained in:
Patrick Lühne 2016-05-20 18:02:52 +02:00
parent e899bd7aec
commit 2d3760b774
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/plasp/sas/Description.h
View File

@ -1,6 +1,7 @@
#ifndef __SAS__DESCRIPTION_H #ifndef __SAS__DESCRIPTION_H
#define __SAS__DESCRIPTION_H #define __SAS__DESCRIPTION_H
#include <iosfwd>
#include <vector> #include <vector>
#include <boost/filesystem/path.hpp> #include <boost/filesystem/path.hpp>
@ -24,6 +25,7 @@ namespace sas
class Description class Description
{ {
public: public:
static Description fromStream(std::istream &istream);
static Description fromFile(const boost::filesystem::path &path); static Description fromFile(const boost::filesystem::path &path);
public: public:

37
src/plasp/sas/Description.cpp
View File

@ -24,31 +24,36 @@ Description::Description()
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
Description Description::fromFile(const boost::filesystem::path &path) Description Description::fromStream(std::istream &istream)
{ {
Description description; Description description;
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
if (!boost::filesystem::is_regular_file(path)) istream.exceptions(std::ifstream::failbit | std::ifstream::badbit);
{
std::cerr << "Error: File does not exist: " << path.string() << std::endl; 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; 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); std::ifstream fileStream(path.string(), std::ios::in);
fileStream.exceptions(std::ifstream::failbit | std::ifstream::badbit);
description.parseVersionSection(fileStream); return Description::fromStream(fileStream);
description.parseMetricSection(fileStream);
description.parseVariablesSection(fileStream);
description.parseMutexSection(fileStream);
description.parseInitialStateSection(fileStream);
description.parseGoalSection(fileStream);
description.parseOperatorSection(fileStream);
description.parseAxiomSection(fileStream);
return description;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////