diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-01-21 22:48:37 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-01-21 23:18:02 +0000 |
| commit | 05005f679e00241e15a87751d89327f2c4630cb6 (patch) | |
| tree | 50319ab1dee5af8016e95e3c80a3b28346cdca21 /py/compile.c | |
| parent | 0b9ee86133a2a0524691c6cdac209dbfcb3bf116 (diff) | |
py: Remove mp_obj_str_builder and use vstr instead.
With this patch str/bytes construction is streamlined. Always use a
vstr to build a str/bytes object. If the size is known beforehand then
use vstr_init_len to allocate only required memory. Otherwise use
vstr_init and the vstr will grow as needed. Then use
mp_obj_new_str_from_vstr to create a str/bytes object using the vstr
memory.
Saves code ROM: 68 bytes on stmhal, 108 bytes on bare-arm, and 336 bytes
on unix x64.
Diffstat (limited to 'py/compile.c')
| -rw-r--r-- | py/compile.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/py/compile.c b/py/compile.c index ea0782e3c..85f5dab83 100644 --- a/py/compile.c +++ b/py/compile.c @@ -2624,8 +2624,9 @@ STATIC void compile_atom_string(compiler_t *comp, mp_parse_node_struct_t *pns) { } // concatenate string/bytes - byte *s_dest; - mp_obj_t obj = mp_obj_str_builder_start(string_kind == MP_PARSE_NODE_STRING ? &mp_type_str : &mp_type_bytes, n_bytes, &s_dest); + vstr_t vstr; + vstr_init_len(&vstr, n_bytes); + byte *s_dest = (byte*)vstr.buf; for (int i = 0; i < n; i++) { if (MP_PARSE_NODE_IS_LEAF(pns->nodes[i])) { mp_uint_t s_len; @@ -2640,7 +2641,7 @@ STATIC void compile_atom_string(compiler_t *comp, mp_parse_node_struct_t *pns) { } // load the object - EMIT_ARG(load_const_obj, mp_obj_str_builder_end(obj)); + EMIT_ARG(load_const_obj, mp_obj_new_str_from_vstr(string_kind == MP_PARSE_NODE_STRING ? &mp_type_str : &mp_type_bytes, &vstr)); } // pns needs to have 2 nodes, first is lhs of comprehension, second is PN_comp_for node |