Showing the changes to jsfunction.c (1 of 1 file). Show all
Unified · Split
| @@ -49,34 +49,45 @@ static void jsB_Function_prototype(js_State *J) · 48 unmodified lines | ||
| 49 | 49 | static void Fp_toString(js_State *J) |
| 50 | 50 | { |
| 51 | 51 | js_Object *self = js_toobject(J, 0); |
| 52 | − char *s; | |
| 53 | − int i, n; | |
| 52 | + js_Buffer *sb = NULL; | |
| 53 | + int i; | |
| 54 | 54 | |
| 55 | 55 | if (!js_iscallable(J, 0)) |
| 56 | 56 | js_typeerror(J, "not a function"); |
| 57 | 57 | |
| 58 | 58 | if (self->type == JS_CFUNCTION || self->type == JS_CSCRIPT) { |
| 59 | 59 | js_Function *F = self->u.f.function; |
| 60 | − n = strlen("function () { ... }"); | |
| 61 | − n += strlen(F->name); | |
| 62 | − for (i = 0; i < F->numparams; ++i) | |
| 63 | − n += strlen(F->vartab[i]) + 1; | |
| 64 | − s = js_malloc(J, n + 1); | |
| 65 | − strcpy(s, "function "); | |
| 66 | − strcat(s, F->name); | |
| 67 | − strcat(s, "("); | |
| 60 | + | |
| 61 | + if (js_try(J)) { | |
| 62 | + js_free(J, sb); | |
| 63 | + js_throw(J); | |
| 64 | + } | |
| 65 | + | |
| 66 | + js_puts(J, &sb, "function "); | |
| 67 | + js_puts(J, &sb, F->name); | |
| 68 | + js_putc(J, &sb, '('); | |
| 68 | 69 | for (i = 0; i < F->numparams; ++i) { |
| 69 | − if (i > 0) strcat(s, ","); | |
| 70 | − strcat(s, F->vartab[i]); | |
| 70 | + if (i > 0) js_putc(J, &sb, ','); | |
| 71 | + js_puts(J, &sb, F->vartab[i]); | |
| 71 | 72 | } |
| 72 | − strcat(s, ") { ... }"); | |
| 73 | + js_puts(J, &sb, ") { ... }"); | |
| 74 | + | |
| 75 | + js_pushstring(J, sb->s); | |
| 76 | + js_endtry(J); | |
| 77 | + js_free(J, sb); | |
| 78 | + } else if (self->type == JS_CCFUNCTION) { | |
| 73 | 79 | if (js_try(J)) { |
| 74 | − js_free(J, s); | |
| 80 | + js_free(J, sb); | |
| 75 | 81 | js_throw(J); |
| 76 | 82 | } |
| 77 | − js_pushstring(J, s); | |
| 78 | − js_free(J, s); | |
| 83 | + | |
| 84 | + js_puts(J, &sb, "function "); | |
| 85 | + js_puts(J, &sb, self->u.c.name); | |
| 86 | + js_puts(J, &sb, "() { ... }"); | |
| 87 | + | |
| 88 | + js_pushstring(J, sb->s); | |
| 79 | 89 | js_endtry(J); |
| 90 | + js_free(J, sb); | |
| 80 | 91 | } else { |
| 81 | 92 | js_pushliteral(J, "function () { ... }"); |
| 82 | 93 | } |