py: Fix printing of size_t entity; fix qemu-arm for changes to lexer.

dpgeorge · dpgeorge · commit 451a0870753b · 2014-12-05T22:50:16.000Z
diff --git a/py/lexer.c b/py/lexer.c
@@ -754,7 +754,7 @@ void mp_lexer_to_next(mp_lexer_t *lex) {
 
 #if MICROPY_DEBUG_PRINTERS
 void mp_lexer_show_token(const mp_lexer_t *lex) {
-    printf("(" UINT_FMT ":" UINT_FMT ") kind:%u str:%p len:%u", lex->tok_line, lex->tok_column, lex->tok_kind, lex->vstr.buf, lex->vstr.len);
+    printf("(" UINT_FMT ":" UINT_FMT ") kind:%u str:%p len:%zu", lex->tok_line, lex->tok_column, lex->tok_kind, lex->vstr.buf, lex->vstr.len);
     if (lex->vstr.len > 0) {
         const byte *i = (const byte *)lex->vstr.buf;
         const byte *j = (const byte *)i + lex->vstr.len;
diff --git a/qemu-arm/main.c b/qemu-arm/main.c
@@ -32,7 +32,7 @@ void do_str(const char *src) {
     }
 
     // parse okay
-    qstr source_name = mp_lexer_source_name(lex);
+    qstr source_name = lex->source_name;
     mp_lexer_free(lex);
     mp_obj_t module_fun = mp_compile(pn, source_name, MP_EMIT_OPT_NONE, true);
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ void do_str(const char *src) {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`// parse okay`
`35`		`- qstr source_name = mp_lexer_source_name(lex);`
	`35`	`+ qstr source_name = lex->source_name;`
`36`	`36`	`mp_lexer_free(lex);`
`37`	`37`	`mp_obj_t module_fun = mp_compile(pn, source_name, MP_EMIT_OPT_NONE, true);`
`38`	`38`