diff --git a/libcorpus2/CMakeLists.txt b/libcorpus2/CMakeLists.txt index c0554e4e0a670b34da75d81ea173686718885b72..424099bfd21aad3e38d156d383d3691ea76a4d74 100644 --- a/libcorpus2/CMakeLists.txt +++ b/libcorpus2/CMakeLists.txt @@ -16,9 +16,6 @@ set(LIBCORPUS2_DATA_DIR set(LIBCORPUS2_VERSION "${corpus2_ver_major}.${corpus2_ver_minor}.${corpus2_ver_patch}") - -MESSAGE(${LIBCORPUS2_DATA_DIR}) - configure_file(config_d.in include/libcorpus2/config_d.h) configure_file(version.in include/libcorpus2/version.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/) diff --git a/libcorpus2/exception.cpp b/libcorpus2/exception.cpp index 96e7448a8da167d1d1b83f3b2450571d8dd341be..87fd2ec47c55e507ba03ff3a02dfbe65d44c732f 100644 --- a/libcorpus2/exception.cpp +++ b/libcorpus2/exception.cpp @@ -12,6 +12,11 @@ namespace Corpus2 { { } + std::string Corpus2Error::scope() const + { + return "Corpus2"; + } + FileNotFound::FileNotFound(const std::string& filename, const std::string& paths, const std::string& where) : Corpus2Error("File not found: " + filename), filename(filename), @@ -35,4 +40,5 @@ namespace Corpus2 { return ss.str(); } + } /* end ns Corpus2 */ diff --git a/libcorpus2/exception.h b/libcorpus2/exception.h index ab443b7d956a1923a7923dfbfab93979583aef3e..a68a507ba7354e8ab070d3f30b2f5fb6aa3b9a6a 100644 --- a/libcorpus2/exception.h +++ b/libcorpus2/exception.h @@ -20,6 +20,9 @@ public: Corpus2Error(const std::string &what); ~Corpus2Error() throw(); + + /// PwrNlpError override + std::string scope() const; }; class FileNotFound : public Corpus2Error diff --git a/libpwrutils/exception.cpp b/libpwrutils/exception.cpp index f500c110668473d1f2f075af6dd074ec51cc63ac..1efff594e1dba559464a4b725c8285739d956b4a 100644 --- a/libpwrutils/exception.cpp +++ b/libpwrutils/exception.cpp @@ -32,4 +32,9 @@ std::string PwrNlpError::info() const return what(); } +std::string PwrNlpError::scope() const +{ + return "general"; +} + } /* end ns PwrNlp */ diff --git a/libpwrutils/exception.h b/libpwrutils/exception.h index 5ad8a4dc650151b749eed200d1e6ae1bedda7948..8569a8a7c074f565f8ceaeae82ca80a0992d740b 100644 --- a/libpwrutils/exception.h +++ b/libpwrutils/exception.h @@ -41,6 +41,9 @@ public: /// verbose-info function virtual std::string info() const; + + /// scope information (subproject-like) + virtual std::string scope() const; }; } /* end ns PwrNlp */