Qstr's are now split into a linked-list of qstr pools. This has 2 benefits: the first pool can be in ROM (huge benefit, since we no longer use RAM for the core qstrs), and subsequent pools use m_new for the next pool instead of m_renew (thus avoiding a huge single table for all the qstrs). Still would be better to use a hash table, but this scheme takes us part of the way (eventually convert the pools to hash tables). Also fixed bug with import. Also improved the way the module code is referenced (not magic number 1 anymore).
246 lines
6.0 KiB
C
246 lines
6.0 KiB
C
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "nlr.h"
|
|
#include "misc.h"
|
|
#include "mpconfig.h"
|
|
#include "lexer.h"
|
|
#include "lexerunix.h"
|
|
#include "parse.h"
|
|
#include "obj.h"
|
|
#include "compile.h"
|
|
#include "runtime0.h"
|
|
#include "runtime.h"
|
|
#include "repl.h"
|
|
|
|
#ifdef USE_READLINE
|
|
#include <readline/readline.h>
|
|
#include <readline/history.h>
|
|
#endif
|
|
|
|
static char *str_join(const char *s1, int sep_char, const char *s2) {
|
|
int l1 = strlen(s1);
|
|
int l2 = strlen(s2);
|
|
char *s = m_new(char, l1 + l2 + 2);
|
|
memcpy(s, s1, l1);
|
|
if (sep_char != 0) {
|
|
s[l1] = sep_char;
|
|
l1 += 1;
|
|
}
|
|
memcpy(s + l1, s2, l2);
|
|
s[l1 + l2] = 0;
|
|
return s;
|
|
}
|
|
|
|
static char *prompt(char *p) {
|
|
#ifdef USE_READLINE
|
|
char *line = readline(p);
|
|
if (line) {
|
|
add_history(line);
|
|
}
|
|
#else
|
|
static char buf[256];
|
|
fputs(p, stdout);
|
|
char *s = fgets(buf, sizeof(buf), stdin);
|
|
if (!s) {
|
|
return NULL;
|
|
}
|
|
int l = strlen(buf);
|
|
if (buf[l - 1] == '\n') {
|
|
buf[l - 1] = 0;
|
|
} else {
|
|
l++;
|
|
}
|
|
char *line = m_new(char, l);
|
|
memcpy(line, buf, l);
|
|
#endif
|
|
return line;
|
|
}
|
|
|
|
static void do_repl(void) {
|
|
for (;;) {
|
|
char *line = prompt(">>> ");
|
|
if (line == NULL) {
|
|
// EOF
|
|
return;
|
|
}
|
|
if (mp_repl_is_compound_stmt(line)) {
|
|
for (;;) {
|
|
char *line2 = prompt("... ");
|
|
if (line2 == NULL || strlen(line2) == 0) {
|
|
break;
|
|
}
|
|
char *line3 = str_join(line, '\n', line2);
|
|
free(line);
|
|
free(line2);
|
|
line = line3;
|
|
}
|
|
}
|
|
|
|
mp_lexer_t *lex = mp_lexer_new_from_str_len("<stdin>", line, strlen(line), false);
|
|
mp_parse_node_t pn = mp_parse(lex, MP_PARSE_SINGLE_INPUT);
|
|
mp_lexer_free(lex);
|
|
|
|
if (pn != MP_PARSE_NODE_NULL) {
|
|
//mp_parse_node_show(pn, 0);
|
|
mp_obj_t module_fun = mp_compile(pn, true);
|
|
if (module_fun != mp_const_none) {
|
|
nlr_buf_t nlr;
|
|
if (nlr_push(&nlr) == 0) {
|
|
rt_call_function_0(module_fun);
|
|
nlr_pop();
|
|
} else {
|
|
// uncaught exception
|
|
mp_obj_print((mp_obj_t)nlr.ret_val);
|
|
printf("\n");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void do_file(const char *file) {
|
|
// hack: set dir for import based on where this file is
|
|
{
|
|
const char * s = strrchr(file, '/');
|
|
if (s != NULL) {
|
|
int len = s - file;
|
|
char *dir = m_new(char, len + 1);
|
|
memcpy(dir, file, len);
|
|
dir[len] = '\0';
|
|
mp_import_set_directory(dir);
|
|
}
|
|
}
|
|
|
|
mp_lexer_t *lex = mp_lexer_new_from_file(file);
|
|
//const char *pysrc = "def f():\n x=x+1\n print(42)\n";
|
|
//mp_lexer_t *lex = mp_lexer_from_str_len("<>", pysrc, strlen(pysrc), false);
|
|
if (lex == NULL) {
|
|
return;
|
|
}
|
|
|
|
if (0) {
|
|
// just tokenise
|
|
while (!mp_lexer_is_kind(lex, MP_TOKEN_END)) {
|
|
mp_token_show(mp_lexer_cur(lex));
|
|
mp_lexer_to_next(lex);
|
|
}
|
|
mp_lexer_free(lex);
|
|
|
|
} else {
|
|
// compile
|
|
|
|
mp_parse_node_t pn = mp_parse(lex, MP_PARSE_FILE_INPUT);
|
|
mp_lexer_free(lex);
|
|
|
|
if (pn != MP_PARSE_NODE_NULL) {
|
|
//printf("----------------\n");
|
|
//parse_node_show(pn, 0);
|
|
//printf("----------------\n");
|
|
mp_obj_t module_fun = mp_compile(pn, false);
|
|
//printf("----------------\n");
|
|
|
|
#if MICROPY_EMIT_CPYTHON
|
|
if (!comp_ok) {
|
|
printf("compile error\n");
|
|
}
|
|
#else
|
|
if (1 && module_fun != mp_const_none) {
|
|
// execute it
|
|
nlr_buf_t nlr;
|
|
if (nlr_push(&nlr) == 0) {
|
|
rt_call_function_0(module_fun);
|
|
nlr_pop();
|
|
} else {
|
|
// uncaught exception
|
|
mp_obj_print((mp_obj_t)nlr.ret_val);
|
|
printf("\n");
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
|
|
typedef struct _test_obj_t {
|
|
mp_obj_base_t base;
|
|
bool value;
|
|
} test_obj_t;
|
|
|
|
static void test_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in) {
|
|
test_obj_t *self = self_in;
|
|
print(env, "<test %d>", self->value);
|
|
}
|
|
|
|
static mp_obj_t test_get(mp_obj_t self_in) {
|
|
test_obj_t *self = self_in;
|
|
return mp_obj_new_int(self->value);
|
|
}
|
|
|
|
static mp_obj_t test_set(mp_obj_t self_in, mp_obj_t arg) {
|
|
test_obj_t *self = self_in;
|
|
self->value = mp_obj_get_int(arg);
|
|
return mp_const_none;
|
|
}
|
|
|
|
static MP_DEFINE_CONST_FUN_OBJ_1(test_get_obj, test_get);
|
|
static MP_DEFINE_CONST_FUN_OBJ_2(test_set_obj, test_set);
|
|
|
|
static const mp_obj_type_t test_type = {
|
|
{ &mp_const_type },
|
|
"Test",
|
|
test_print, // print
|
|
NULL, // call_n
|
|
NULL, // unary_op
|
|
NULL, // binary_op
|
|
NULL, // getiter
|
|
NULL, // iternext
|
|
{ // method list
|
|
{ "get", &test_get_obj },
|
|
{ "set", &test_set_obj },
|
|
{ NULL, NULL },
|
|
}
|
|
};
|
|
|
|
mp_obj_t test_obj_new(int value) {
|
|
test_obj_t *o = m_new_obj(test_obj_t);
|
|
o->base.type = &test_type;
|
|
o->value = value;
|
|
return o;
|
|
}
|
|
|
|
int main(int argc, char **argv) {
|
|
qstr_init();
|
|
rt_init();
|
|
|
|
rt_store_name(qstr_from_str_static("test"), test_obj_new(42));
|
|
|
|
/*
|
|
printf("bytes:\n");
|
|
printf(" total %d\n", m_get_total_bytes_allocated());
|
|
printf(" cur %d\n", m_get_current_bytes_allocated());
|
|
printf(" peak %d\n", m_get_peak_bytes_allocated());
|
|
*/
|
|
|
|
if (argc == 1) {
|
|
do_repl();
|
|
} else if (argc == 2) {
|
|
do_file(argv[1]);
|
|
} else {
|
|
printf("usage: py [<file>]\n");
|
|
return 1;
|
|
}
|
|
rt_deinit();
|
|
|
|
//printf("total bytes = %d\n", m_get_total_bytes_allocated());
|
|
return 0;
|
|
}
|
|
|
|
// for sqrt
|
|
#include <math.h>
|
|
machine_float_t machine_sqrt(machine_float_t x) {
|
|
return sqrt(x);
|
|
}
|