Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve exception error messages #109

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve exception error messages #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 31 additions & 22 deletions lib/libconfig.h++
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#define __libconfig_hpp

#include <stdio.h>
#include <exception>
#include <stdexcept>
#include <string>

#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
Expand Down Expand Up @@ -54,33 +54,42 @@ struct config_setting_t; // fwd decl

namespace libconfig {

class LIBCONFIGXX_API ConfigException : public std::exception { };
struct LIBCONFIGXX_API ConfigException : public std::runtime_error
{
ConfigException(std::string const &message);

ConfigException(ConfigException const &other);
ConfigException& operator=(ConfigException const &other);

virtual ~ConfigException() LIBCONFIGXX_NOEXCEPT;
};

class Setting; // fwd decl
class SettingIterator;
class SettingConstIterator;

class LIBCONFIGXX_API SettingException : public ConfigException
{
public:

SettingException(const Setting &setting);
SettingException(const Setting &setting, int idx);
SettingException(const Setting &setting, const char *name);
SettingException(const char *path);
protected:

SettingException(char const *messagePrefix, const Setting &setting);
SettingException(char const *messagePrefix, const Setting &setting, int idx);
SettingException(char const *messagePrefix, const Setting &setting, const char *name);
SettingException(char const *messagePrefix, std::string path);

public:

SettingException(const SettingException &other);
SettingException& operator=(const SettingException &other);

virtual ~SettingException() LIBCONFIGXX_NOEXCEPT;

const char *getPath() const;

virtual const char *what() const LIBCONFIGXX_NOEXCEPT;
std::string const & getPath() const;

private:

char *_path;
std::string _path;
};

class LIBCONFIGXX_API SettingTypeException : public SettingException
Expand All @@ -91,7 +100,9 @@ class LIBCONFIGXX_API SettingTypeException : public SettingException
SettingTypeException(const Setting &setting, int idx);
SettingTypeException(const Setting &setting, const char *name);

virtual const char *what() const LIBCONFIGXX_NOEXCEPT;
private:

static const char * const ERROR_PREFIX;
};

class LIBCONFIGXX_API SettingRangeException : public SettingException
Expand All @@ -102,7 +113,9 @@ class LIBCONFIGXX_API SettingRangeException : public SettingException
SettingRangeException(const Setting &setting, int idx);
SettingRangeException(const Setting &setting, const char *name);

virtual const char *what() const LIBCONFIGXX_NOEXCEPT;
private:

static const char * const ERROR_PREFIX;
};

class LIBCONFIGXX_API SettingNotFoundException : public SettingException
Expand All @@ -113,23 +126,21 @@ class LIBCONFIGXX_API SettingNotFoundException : public SettingException
SettingNotFoundException(const Setting &setting, int idx);
SettingNotFoundException(const Setting &setting, const char *name);

virtual const char *what() const LIBCONFIGXX_NOEXCEPT;
private:

static const char * const ERROR_PREFIX;
};

class LIBCONFIGXX_API SettingNameException : public SettingException
{
public:

SettingNameException(const Setting &setting, const char *name);

virtual const char *what() const LIBCONFIGXX_NOEXCEPT;
};

class LIBCONFIGXX_API FileIOException : public ConfigException
struct LIBCONFIGXX_API FileIOException : public ConfigException
{
public:

virtual const char *what() const LIBCONFIGXX_NOEXCEPT;
FileIOException();
};

class LIBCONFIGXX_API ParseException : public ConfigException
Expand All @@ -151,8 +162,6 @@ class LIBCONFIGXX_API ParseException : public ConfigException
inline const char *getError() const
{ return(_error); }

virtual const char *what() const LIBCONFIGXX_NOEXCEPT;

private:

const char *_file;
Expand Down
Loading