Mark libsolc external C functions as noexcept

These are part of the external C API where leaking through exceptions makes no sense.
This commit is contained in:
Alex Beregszaszi 2018-08-08 13:23:23 +01:00
parent 5b4ad10b3c
commit 7bf9526f5e
2 changed files with 24 additions and 18 deletions

View File

@ -270,46 +270,46 @@ static string s_outputBuffer;
extern "C"
{
extern char const* license()
extern char const* license() noexcept
{
static string fullLicenseText = otherLicenses + licenseText;
return fullLicenseText.c_str();
}
extern char const* version()
extern char const* version() noexcept
{
return VersionString.c_str();
}
extern char const* compileJSON(char const* _input, bool _optimize)
extern char const* compileJSON(char const* _input, bool _optimize) noexcept
{
s_outputBuffer = compileSingle(_input, _optimize);
return s_outputBuffer.c_str();
}
extern char const* compileJSONMulti(char const* _input, bool _optimize)
extern char const* compileJSONMulti(char const* _input, bool _optimize) noexcept
{
s_outputBuffer = compileMulti(_input, _optimize);
return s_outputBuffer.c_str();
}
extern char const* compileJSONCallback(char const* _input, bool _optimize, CStyleReadFileCallback _readCallback)
extern char const* compileJSONCallback(char const* _input, bool _optimize, CStyleReadFileCallback _readCallback) noexcept
{
s_outputBuffer = compileMulti(_input, _optimize, _readCallback);
return s_outputBuffer.c_str();
}
extern char const* compileStandard(char const* _input, CStyleReadFileCallback _readCallback)
extern char const* compileStandard(char const* _input, CStyleReadFileCallback _readCallback) noexcept
{
s_outputBuffer = compileStandardInternal(_input, _readCallback);
return s_outputBuffer.c_str();
}
extern char const* solidity_license()
extern char const* solidity_license() noexcept
{
/// todo: make this the default or an alias
return license();
}
extern char const* solidity_version()
extern char const* solidity_version() noexcept
{
/// todo: make this the default or an alias
return version();
}
extern char const* solidity_compile(char const* _input, CStyleReadFileCallback _readCallback)
extern char const* solidity_compile(char const* _input, CStyleReadFileCallback _readCallback) noexcept
{
/// todo: make this the default or an alias
return compileStandard(_input, _readCallback);

View File

@ -22,6 +22,12 @@
#include <stdbool.h>
#ifdef __cplusplus
#define SOLC_NOEXCEPT noexcept
#else
#define SOLC_NOEXCEPT
#endif
#ifdef __cplusplus
extern "C" {
#endif
@ -30,16 +36,16 @@ extern "C" {
/// heap-allocated and are free'd by the caller.
typedef void (*CStyleReadFileCallback)(char const* _path, char** o_contents, char** o_error);
char const* license();
char const* version();
char const* compileJSON(char const* _input, bool _optimize);
char const* compileJSONMulti(char const* _input, bool _optimize);
char const* compileJSONCallback(char const* _input, bool _optimize, CStyleReadFileCallback _readCallback);
char const* compileStandard(char const* _input, CStyleReadFileCallback _readCallback);
char const* license() SOLC_NOEXCEPT;
char const* version() SOLC_NOEXCEPT;
char const* compileJSON(char const* _input, bool _optimize) SOLC_NOEXCEPT;
char const* compileJSONMulti(char const* _input, bool _optimize) SOLC_NOEXCEPT;
char const* compileJSONCallback(char const* _input, bool _optimize, CStyleReadFileCallback _readCallback) SOLC_NOEXCEPT;
char const* compileStandard(char const* _input, CStyleReadFileCallback _readCallback) SOLC_NOEXCEPT;
char const* solidity_license();
char const* solidity_version();
char const* solidity_compile(char const* _input, CStyleReadFileCallback _readCallback);
char const* solidity_license() SOLC_NOEXCEPT;
char const* solidity_version() SOLC_NOEXCEPT;
char const* solidity_compile(char const* _input, CStyleReadFileCallback _readCallback) SOLC_NOEXCEPT;
#ifdef __cplusplus
}