lorina update. (lsils#420)

lib/lorina/lorina/aiger.hpp

@@ -32,9 +32,9 @@
 
 #pragma once
 
-#include <lorina/common.hpp>
-#include <lorina/diagnostics.hpp>
-#include <lorina/detail/utils.hpp>
+#include "common.hpp"
+#include "diagnostics.hpp"
+#include "detail/utils.hpp"
 #include <fstream>
 #include <iostream>
 #include <regex>
@@ -444,7 +444,7 @@ static std::regex fairness( R"(^f(\d+) (.*)$)" );
  * \param in Input stream
  * \param reader An AIGER reader with callback methods invoked for parsed primitives
  * \param diag An optional diagnostic engine with callback methods for parse errors
- * \return Success if parsing have been successful, or parse error if parsing have failed
+ * \return Success if parsing has been successful, or parse error if parsing has failed
  */
 inline return_code read_ascii_aiger( std::istream& in, const aiger_reader& reader, diagnostic_engine* diag = nullptr )
 {
@@ -666,12 +666,26 @@ inline return_code read_ascii_aiger( std::istream& in, const aiger_reader& reade
  * \param filename Name of the file
  * \param reader An AIGER reader with callback methods invoked for parsed primitives
  * \param diag An optional diagnostic engine with callback methods for parse errors
- * \return Success if parsing have been successful, or parse error if parsing have failed
+ * \return Success if parsing has been successful, or parse error if parsing has failed
  */
 inline return_code read_ascii_aiger( const std::string& filename, const aiger_reader& reader, diagnostic_engine* diag = nullptr )
 {
  std::ifstream in( detail::word_exp_filename( filename ), std::ifstream::in );
- return read_ascii_aiger( in, reader, diag );
+ if ( !in.is_open() )
+ {
+ if ( diag )
+ {
+ diag->report( diagnostic_level::fatal,
+ fmt::format( "could not open file `{0}`", filename ) );
+ }
+ return return_code::parse_error;
+ }
+ else
+ {
+ auto const ret = read_ascii_aiger( in, reader, diag );
+ in.close();
+ return ret;
+ }
 }
 
 /*! \brief Reader function for binary AIGER format.
@@ -682,7 +696,7 @@ inline return_code read_ascii_aiger( const std::string& filename, const aiger_re
  * \param in Input stream
  * \param reader An AIGER reader with callback methods invoked for parsed primitives
  * \param diag An optional diagnostic engine with callback methods for parse errors
- * \return Success if parsing have been successful, or parse error if parsing have failed
+ * \return Success if parsing has been successful, or parse error if parsing has failed
  */
 inline return_code read_aiger( std::istream& in, const aiger_reader& reader, diagnostic_engine* diag = nullptr )
 {
@@ -887,12 +901,26 @@ inline return_code read_aiger( std::istream& in, const aiger_reader& reader, dia
  * \param filename Name of the file
  * \param reader An AIGER reader with callback methods invoked for parsed primitives
  * \param diag An optional diagnostic engine with callback methods for parse errors
- * \return Success if parsing have been successful, or parse error if parsing have failed
+ * \return Success if parsing has been successful, or parse error if parsing has failed
  */
 inline return_code read_aiger( const std::string& filename, const aiger_reader& reader, diagnostic_engine* diag = nullptr )
 {
  std::ifstream in( detail::word_exp_filename( filename ), std::ifstream::binary );
- return read_aiger( in, reader, diag );
+ if ( !in.is_open() )
+ {
+ if ( diag )
+ {
+ diag->report( diagnostic_level::fatal,
+ fmt::format( "could not open file `{0}`", filename ) );
+ }
+ return return_code::parse_error;
+ }
+ else
+ {
+ auto const ret = read_aiger( in, reader, diag );
+ in.close();
+ return ret;
+ }
 }
 
 } // namespace lorina

lib/lorina/lorina/bench.hpp

@@ -32,9 +32,9 @@
 
 #pragma once
 
-#include <lorina/common.hpp>
-#include <lorina/diagnostics.hpp>
-#include <lorina/detail/utils.hpp>
+#include "common.hpp"
+#include "diagnostics.hpp"
+#include "detail/utils.hpp"
 #include <fstream>
 #include <regex>
 #include <iostream>
@@ -170,7 +170,7 @@ static std::regex gate_asgn( R"((.*)\s+=\s+(.*))" );
  * \param in Input stream
  * \param reader A BENCH reader with callback methods invoked for parsed primitives
  * \param diag An optional diagnostic engine with callback methods for parse errors
- * \return Success if parsing have been successful, or parse error if parsing have failed
+ * \return Success if parsing has been successful, or parse error if parsing has failed
  */
 inline return_code read_bench( std::istream& in, const bench_reader& reader, diagnostic_engine* diag = nullptr )
 {
@@ -294,12 +294,26 @@ inline return_code read_bench( std::istream& in, const bench_reader& reader, dia
  * \param filename Name of the file
  * \param reader A BENCH reader with callback methods invoked for parsed primitives
  * \param diag An optional diagnostic engine with callback methods for parse errors
- * \return Success if parsing have been successful, or parse error if parsing have failed
+ * \return Success if parsing has been successful, or parse error if parsing has failed
  */
 inline return_code read_bench( const std::string& filename, const bench_reader& reader, diagnostic_engine* diag = nullptr )
 {
  std::ifstream in( detail::word_exp_filename( filename ), std::ifstream::in );
- return read_bench( in, reader, diag );
+ if ( !in.is_open() )
+ {
+ if ( diag )
+ {
+ diag->report( diagnostic_level::fatal,
+ fmt::format( "could not open file `{0}`", filename ) );
+ }
+ return return_code::parse_error;
+ }
+ else
+ {
+ auto const ret = read_bench( in, reader, diag );
+ in.close();
+ return ret;
+ }
 }
 
 } // namespace lorina

lib/lorina/lorina/blif.hpp

@@ -32,9 +32,9 @@
 
 #pragma once
 
-#include <lorina/common.hpp>
-#include <lorina/diagnostics.hpp>
-#include <lorina/detail/utils.hpp>
+#include "common.hpp"
+#include "diagnostics.hpp"
+#include "detail/utils.hpp"
 #include <regex>
 #include <iostream>
 #include <optional>
@@ -271,7 +271,7 @@ static std::regex end( R"(.end)" );
  * \param in Input stream
  * \param reader A BLIF reader with callback methods invoked for parsed primitives
  * \param diag An optional diagnostic engine with callback methods for parse errors
- * \return Success if parsing have been successful, or parse error if parsing have failed
+ * \return Success if parsing has been successful, or parse error if parsing has failed
  */
 inline return_code read_blif( std::istream& in, const blif_reader& reader, diagnostic_engine* diag = nullptr )
 {
@@ -457,12 +457,26 @@ inline return_code read_blif( std::istream& in, const blif_reader& reader, diagn
  * \param filename Name of the file
  * \param reader A BLIF reader with callback methods invoked for parsed primitives
  * \param diag An optional diagnostic engine with callback methods for parse errors
- * \return Success if parsing have been successful, or parse error if parsing have failed
+ * \return Success if parsing has been successful, or parse error if parsing has failed
  */
 inline return_code read_blif( const std::string& filename, const blif_reader& reader, diagnostic_engine* diag = nullptr )
 {
  std::ifstream in( detail::word_exp_filename( filename ), std::ifstream::in );
- return read_blif( in, reader, diag );
+ if ( !in.is_open() )
+ {
+ if ( diag )
+ {
+ diag->report( diagnostic_level::fatal,
+ fmt::format( "could not open file `{0}`", filename ) );
+ }
+ return return_code::parse_error;
+ }
+ else
+ {
+ auto const ret = read_blif( in, reader, diag );
+ in.close();
+ return ret;
+ }
 }
 
 } // namespace lorina

lib/lorina/lorina/bristol.hpp

@@ -35,6 +35,7 @@
 #pragma once
 
 #include "common.hpp"
+#include "diagnostics.hpp"
 #include "detail/utils.hpp"
 
 #include <algorithm>
@@ -168,8 +169,13 @@ class bristol_parser
  *
  * A callback method of the reader visitor is invoked for each
  * primitive object matched in the specification.
+ *
+ * \param in Input stream
+ * \param reader A BRISTOL reader with callback methods invoked for parsed primitives
+ * \param diag An optional diagnostic engine with callback methods for parse errors
+ * \return Success if parsing has been successful, or parse error if parsing has failed
  */
-inline return_code read_bristol( std::istream& is, bristol_reader const& reader )
+inline return_code read_bristol( std::istream& is, bristol_reader const& reader, diagnostic_engine* diag = nullptr )
 {
  return bristol_parser( is, reader ).run();
 }
@@ -178,11 +184,30 @@ inline return_code read_bristol( std::istream& is, bristol_reader const& reader
  *
  * A callback method of the reader visitor is invoked for each
  * primitive object matched in the specification.
+ *
+ * \param filename Name of the file
+ * \param reader A BRISTOL reader with callback methods invoked for parsed primitives
+ * \param diag An optional diagnostic engine with callback methods for parse errors
+ * \return Success if parsing has been successful, or parse error if parsing has failed
  */
-inline return_code read_bristol( std::string const& filename, bristol_reader const& reader )
+inline return_code read_bristol( std::string const& filename, bristol_reader const& reader, diagnostic_engine* diag = nullptr )
 {
- std::ifstream is( filename, std::ifstream::in );
- return read_bristol( is, reader );
+ std::ifstream in( filename, std::ifstream::in );
+ if ( !in.is_open() )
+ {
+ if ( diag )
+ {
+ diag->report( diagnostic_level::fatal,
+ fmt::format( "could not open file `{0}`", filename ) );
+ } 
+ return return_code::parse_error;
+ }
+ else
+ {
+ auto const ret = read_bristol( in, reader );
+ in.close();
+ return ret;
+ }
 }
 
 } // namespace lorina