michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(api/exception): add lean_exception_get_detailed_message

Browse source
This commit is contained in:
Leonardo de Moura 2015-09-08 18:00:23 -07:00
parent eec3780c6d
commit f452cabc34
3 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/api/exception.cpp
View file

@ -6,9 +6,12 @@ Author: Leonardo de Moura
*/ */
#include "kernel/kernel_exception.h" #include "kernel/kernel_exception.h"
#include "library/unifier.h" #include "library/unifier.h"
#include "library/print.h"
#include "library/tactic/tactic.h" #include "library/tactic/tactic.h"
#include "library/error_handling/error_handling.h"
#include "api/exception.h" #include "api/exception.h"
#include "api/string.h" #include "api/string.h"
using namespace lean; // NOLINT
namespace lean { namespace lean {
memout_exception * get_memout_exception() { memout_exception * get_memout_exception() {
@ -39,6 +42,24 @@ char const * lean_exception_get_message(lean_exception e) {
} }
} }
char const * lean_exception_get_detailed_message(lean_exception e) {
if (!e)
return 0;
try {
formatter_factory fmtf = mk_print_formatter_factory();
std::shared_ptr<output_channel> out(new string_output_channel());
io_state ios(fmtf);
ios.set_regular_channel(out);
ios.set_diagnostic_channel(out);
environment env;
io_state_stream ioss(env, ios);
display_error(ioss, nullptr, *lean::to_exception(e));
return mk_string(static_cast<string_output_channel const *>(out.get())->str());
} catch (...) {
return 0;
}
}
lean_exception_kind lean_exception_get_kind(lean_exception e) { lean_exception_kind lean_exception_get_kind(lean_exception e) {
lean::throwable * ex = lean::to_exception(e); lean::throwable * ex = lean::to_exception(e);
if (!ex) if (!ex)

7
src/api/lean_exception.h
View file

@ -28,6 +28,13 @@ void lean_exception_del(lean_exception e);
*/ */
char const * lean_exception_get_message(lean_exception e); char const * lean_exception_get_message(lean_exception e);
/** \brief Return basic string/message describing the exception.
\remark The string must be deallocated using #lean_string_del.
This function is similar to #lean_exception_get_message, but produces
more information if available.
*/
char const * lean_exception_get_detailed_message(lean_exception e);
typedef enum { typedef enum {
LEAN_NULL_EXCEPTION, // null (aka there is no exception) LEAN_NULL_EXCEPTION, // null (aka there is no exception)
LEAN_SYSTEM_EXCEPTION, // exception generated by the C++ runtime LEAN_SYSTEM_EXCEPTION, // exception generated by the C++ runtime

14
src/tests/shared/env.c
View file

@ -524,11 +524,17 @@ void test_parser_error() {
&new_env, &new_ios, &ex)); &new_env, &new_ios, &ex));
{ {
lean_exception ex2 = 0; lean_exception ex2 = 0;
char const * s; char const * s1 = lean_exception_get_message(ex);
char const * s2 = lean_exception_get_detailed_message(ex);
char const * s3;
printf("\nexception kind: %d\n", lean_exception_get_kind(ex)); printf("\nexception kind: %d\n", lean_exception_get_kind(ex));
check(lean_exception_to_pp_string(env, ios, ex, &s, &ex2)); printf("exception message: %s\n", s1);
printf("exception\n%s", s); printf("exception detailed message: %s\n", s2);
lean_string_del(s); check(lean_exception_to_pp_string(env, ios, ex, &s3, &ex2));
printf("exception: %s\n", s3);
lean_string_del(s1);
lean_string_del(s2);
lean_string_del(s3);
} }
lean_exception_del(ex); lean_exception_del(ex);
lean_env_del(env); lean_env_del(env);