52b5d76a6b
mp_parse_node_free now frees the memory associated with non-interned strings. And the parser calls mp_parse_node_free when discarding a non-used node (such as a doc string). Also, the compiler now frees the parse tree explicitly just before it exits (as opposed to relying on the caller to do this). Addresses issue #708 as best we can.
106 lines
3.6 KiB
C
106 lines
3.6 KiB
C
/*
|
|
* This file is part of the Micro Python project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include <stdint.h>
|
|
|
|
#include "mpconfig.h"
|
|
#include "nlr.h"
|
|
#include "misc.h"
|
|
#include "qstr.h"
|
|
#include "lexer.h"
|
|
#include "lexerunix.h"
|
|
#include "parse.h"
|
|
#include "obj.h"
|
|
#include "parsehelper.h"
|
|
#include "compile.h"
|
|
#include "runtime0.h"
|
|
#include "runtime.h"
|
|
#include "builtin.h"
|
|
|
|
STATIC mp_obj_t parse_compile_execute(mp_obj_t o_in, mp_parse_input_kind_t parse_input_kind) {
|
|
mp_uint_t str_len;
|
|
const char *str = mp_obj_str_get_data(o_in, &str_len);
|
|
|
|
// create the lexer
|
|
mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_string_gt_, str, str_len, 0);
|
|
qstr source_name = mp_lexer_source_name(lex);
|
|
|
|
// parse the string
|
|
mp_parse_error_kind_t parse_error_kind;
|
|
mp_parse_node_t pn = mp_parse(lex, parse_input_kind, &parse_error_kind);
|
|
|
|
if (pn == MP_PARSE_NODE_NULL) {
|
|
// parse error; raise exception
|
|
mp_obj_t exc = mp_parse_make_exception(lex, parse_error_kind);
|
|
mp_lexer_free(lex);
|
|
nlr_raise(exc);
|
|
}
|
|
|
|
mp_lexer_free(lex);
|
|
|
|
// compile the string
|
|
mp_obj_t module_fun = mp_compile(pn, source_name, MP_EMIT_OPT_NONE, false);
|
|
|
|
if (module_fun == mp_const_none) {
|
|
// TODO handle compile error correctly
|
|
return mp_const_none;
|
|
}
|
|
|
|
// complied successfully, execute it
|
|
return mp_call_function_0(module_fun);
|
|
}
|
|
|
|
STATIC mp_obj_t mp_builtin_eval(mp_obj_t o_in) {
|
|
return parse_compile_execute(o_in, MP_PARSE_EVAL_INPUT);
|
|
}
|
|
|
|
MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_eval_obj, mp_builtin_eval);
|
|
|
|
STATIC mp_obj_t mp_builtin_exec(uint n_args, const mp_obj_t *args) {
|
|
// Unconditional getting/setting assumes that these operations
|
|
// are cheap, which is the case when this comment was written.
|
|
mp_obj_dict_t *old_globals = mp_globals_get();
|
|
mp_obj_dict_t *old_locals = mp_locals_get();
|
|
if (n_args > 1) {
|
|
mp_obj_t globals = args[1];
|
|
mp_obj_t locals;
|
|
if (n_args > 2) {
|
|
locals = args[2];
|
|
} else {
|
|
locals = globals;
|
|
}
|
|
mp_globals_set(globals);
|
|
mp_locals_set(locals);
|
|
}
|
|
mp_obj_t res = parse_compile_execute(args[0], MP_PARSE_FILE_INPUT);
|
|
// TODO if the above call throws an exception, then we never get to reset the globals/locals
|
|
mp_globals_set(old_globals);
|
|
mp_locals_set(old_locals);
|
|
return res;
|
|
}
|
|
|
|
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_exec_obj, 1, 3, mp_builtin_exec);
|