diff options
| -rw-r--r-- | src/system.yy | 6 | ||||
| -rw-r--r-- | src/util.h | 19 |
2 files changed, 23 insertions, 2 deletions
diff --git a/src/system.yy b/src/system.yy index cd6ddc9..0727213 100644 --- a/src/system.yy +++ b/src/system.yy @@ -27,6 +27,7 @@ bool legacy = true; #include <cstdint> #include "lexer.h" #include "location.h" +#include "util.h" } //%locations @@ -69,7 +70,8 @@ block_end: ofstream f(p, ios_base::out | ios_base::binary); msg.SerializeToOstream(&f); f.close(); - } + } else + throw syntax_error(string_format("Block EPOCH mismatch: begin:%llu, end:%llu", msg.epoch(), $ULONG)); msg.Clear(); } @@ -275,7 +277,7 @@ namespace yy // Report an error to the user. auto parser::error (const std::string& msg) -> void { - std::cerr << msg << " on line " << lexer.lineno() << '\n'; + std::cerr << "\nERROR: " << msg << " on line " << lexer.lineno() - 1<< '\n'; } } diff --git a/src/util.h b/src/util.h new file mode 100644 index 0000000..a54d3eb --- /dev/null +++ b/src/util.h @@ -0,0 +1,19 @@ +#ifndef __UTIL_H__ +#define __UTIL_H__ + +#include <memory> +#include <string> +#include <stdexcept> + +template<typename ... Args> +std::string string_format( const std::string& format, Args ... args ) +{ + int size_s = std::snprintf( nullptr, 0, format.c_str(), args ... ) + 1; // Extra space for '\0' + if( size_s <= 0 ){ throw std::runtime_error( "Error during formatting." ); } + auto size = static_cast<size_t>( size_s ); + std::unique_ptr<char[]> buf( new char[ size ] ); + std::snprintf( buf.get(), size, format.c_str(), args ... ); + return std::string( buf.get(), buf.get() + size - 1 ); // We don't want the '\0' inside +} + +#endif /* __UTIL_H__ */ |