aboutsummaryrefslogtreecommitdiff
path: root/windows
diff options
context:
space:
mode:
authorDamien George2014-02-15 16:10:44 +0000
committerDamien George2014-02-15 16:10:44 +0000
commitc5966128c7c8a768f6726f299d85d5daef6bed48 (patch)
treefea6913ae43d722078a837d8c7fd9a1e459f3891 /windows
parenta71c83a1d1aeca1d81d7c673929f8e836dec131e (diff)
Implement proper exception type hierarchy.
Each built-in exception is now a type, with base type BaseException. C exceptions are created by passing a pointer to the exception type to make an instance of. When raising an exception from the VM, an instance is created automatically if an exception type is raised (as opposed to an exception instance). Exception matching (RT_BINARY_OP_EXCEPTION_MATCH) is now proper. Handling of parse error changed to match new exceptions. mp_const_type renamed to mp_type_type for consistency.
Diffstat (limited to 'windows')
-rw-r--r--windows/main.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/windows/main.c b/windows/main.c
index da0cbca44..4456a796d 100644
--- a/windows/main.c
+++ b/windows/main.c
@@ -11,6 +11,7 @@
#include "lexerunix.h"
#include "parse.h"
#include "obj.h"
+#include "parsehelper.h"
#include "compile.h"
#include "runtime0.h"
#include "runtime.h"
@@ -39,14 +40,12 @@ static void execute_from_lexer(mp_lexer_t *lex, mp_parse_input_kind_t input_kind
return;
}
- qstr parse_exc_id;
- const char *parse_exc_msg;
- mp_parse_node_t pn = mp_parse(lex, input_kind, &parse_exc_id, &parse_exc_msg);
+ mp_parse_error_kind_t parse_error_kind;
+ mp_parse_node_t pn = mp_parse(lex, input_kind, &parse_error_kind);
if (pn == MP_PARSE_NODE_NULL) {
// parse error
- mp_lexer_show_error_pythonic_prefix(lex);
- printf("%s: %s\n", qstr_str(parse_exc_id), parse_exc_msg);
+ mp_parse_show_exception(lex, parse_error_kind);
mp_lexer_free(lex);
return;
}