c5966128c7
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.
50 lines
1.7 KiB
C
50 lines
1.7 KiB
C
// these functions are separate from parse.c to keep parser independent of mp_obj_t
|
|
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
|
|
#include "misc.h"
|
|
#include "mpconfig.h"
|
|
#include "qstr.h"
|
|
#include "lexer.h"
|
|
#include "parse.h"
|
|
#include "obj.h"
|
|
#include "parsehelper.h"
|
|
|
|
#define STR_UNEXPECTED_INDENT "unexpected indent"
|
|
#define STR_UNMATCHED_UNINDENT "unindent does not match any outer indentation level"
|
|
#define STR_INVALID_SYNTAX "invalid syntax"
|
|
|
|
void mp_parse_show_exception(mp_lexer_t *lex, mp_parse_error_kind_t parse_error_kind) {
|
|
printf(" File \"%s\", line %d, column %d\n", qstr_str(mp_lexer_source_name(lex)), mp_lexer_cur(lex)->src_line, mp_lexer_cur(lex)->src_column);
|
|
switch (parse_error_kind) {
|
|
case MP_PARSE_ERROR_UNEXPECTED_INDENT:
|
|
printf("IndentationError: %s\n", STR_UNEXPECTED_INDENT);
|
|
break;
|
|
|
|
case MP_PARSE_ERROR_UNMATCHED_UNINDENT:
|
|
printf("IndentationError: %s\n", STR_UNMATCHED_UNINDENT);
|
|
break;
|
|
|
|
case MP_PARSE_ERROR_INVALID_SYNTAX:
|
|
default:
|
|
printf("SyntaxError: %s\n", STR_INVALID_SYNTAX);
|
|
break;
|
|
}
|
|
}
|
|
|
|
mp_obj_t mp_parse_make_exception(mp_parse_error_kind_t parse_error_kind) {
|
|
// TODO add source file and line number to exception?
|
|
switch (parse_error_kind) {
|
|
case MP_PARSE_ERROR_UNEXPECTED_INDENT:
|
|
return mp_obj_new_exception_msg(&mp_type_IndentationError, STR_UNEXPECTED_INDENT);
|
|
|
|
case MP_PARSE_ERROR_UNMATCHED_UNINDENT:
|
|
return mp_obj_new_exception_msg(&mp_type_IndentationError, STR_UNMATCHED_UNINDENT);
|
|
|
|
case MP_PARSE_ERROR_INVALID_SYNTAX:
|
|
default:
|
|
return mp_obj_new_exception_msg(&mp_type_SyntaxError, STR_INVALID_SYNTAX);
|
|
}
|
|
}
|