Skip to content

Commit

Permalink
Internal typing work on public API parts
Browse files Browse the repository at this point in the history
  • Loading branch information
@svaarala
svaarala committed Jul 3, 2014
1 parent 0115ecc commit 936b9cb
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 21 deletions.
4 changes: 2 additions & 2 deletions src/duk_api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ void duk_xmove(duk_context *ctx, duk_context *from_ctx, duk_idx_t count) {
DUK_ASSERT(from_ctx != NULL);

if (count < 0) {
DUK_ERROR(thr, DUK_ERR_API_ERROR, duk_errmsg_invalid_count);
DUK_ERROR(thr, DUK_ERR_API_ERROR, duk_str_invalid_count);
return;
}

Expand Down Expand Up @@ -3142,7 +3142,7 @@ void duk_pop_n(duk_context *ctx, duk_idx_t count) {
DUK_ASSERT(ctx != NULL);

if (count < 0) {
DUK_ERROR(thr, DUK_ERR_API_ERROR, duk_errmsg_invalid_count);
DUK_ERROR(thr, DUK_ERR_API_ERROR, duk_str_invalid_count);
return;
}

Expand Down
38 changes: 20 additions & 18 deletions src/duk_api_call.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
static void duk__call_prop_prep_stack(duk_context *ctx, duk_idx_t normalized_obj_index, duk_idx_t nargs) {
DUK_DDD(DUK_DDDPRINT("duk__call_prop_prep_stack, normalized_obj_index=%d, nargs=%d, stacktop=%d",
normalized_obj_index, (int) nargs, (int) duk_get_top(ctx)));
(int) normalized_obj_index, (int) nargs, (int) duk_get_top(ctx)));

/* [... key arg1 ... argN] */

Expand Down Expand Up @@ -45,10 +45,12 @@ void duk_call(duk_context *ctx, duk_idx_t nargs) {
idx_func = duk_get_top(ctx) - nargs - 1; /* must work for nargs <= 0 */
if (idx_func < 0 || nargs < 0) {
/* note that we can't reliably pop anything here */
DUK_ERROR(thr, DUK_ERR_API_ERROR, "invalid call args");
DUK_ERROR(thr, DUK_ERR_API_ERROR, duk_str_invalid_call_args);
}

/* awkward; we assume there is space for this */
/* XXX: awkward; we assume there is space for this, overwrite
* directly instead?
*/
duk_push_undefined(ctx);
duk_insert(ctx, idx_func + 1);

Expand All @@ -72,7 +74,7 @@ void duk_call_method(duk_context *ctx, duk_idx_t nargs) {
idx_func = duk_get_top(ctx) - nargs - 2; /* must work for nargs <= 0 */
if (idx_func < 0 || nargs < 0) {
/* note that we can't reliably pop anything here */
DUK_ERROR(thr, DUK_ERR_API_ERROR, "invalid call args");
DUK_ERROR(thr, DUK_ERR_API_ERROR, duk_str_invalid_call_args);
}

call_flags = 0; /* not protected, respect reclimit, not constructor */
Expand Down Expand Up @@ -119,7 +121,7 @@ duk_int_t duk_pcall(duk_context *ctx, duk_idx_t nargs) {
* might STILL throw an out-of-memory error or some other internal
* fatal error.
*/
DUK_ERROR(thr, DUK_ERR_API_ERROR, "invalid call args");
DUK_ERROR(thr, DUK_ERR_API_ERROR, duk_str_invalid_call_args);
return DUK_EXEC_ERROR; /* unreachable */
}

Expand Down Expand Up @@ -148,7 +150,7 @@ duk_int_t duk_pcall_method(duk_context *ctx, duk_idx_t nargs) {
idx_func = duk_get_top(ctx) - nargs - 2; /* must work for nargs <= 0 */
if (idx_func < 0 || nargs < 0) {
/* See comments in duk_pcall(). */
DUK_ERROR(thr, DUK_ERR_API_ERROR, "invalid call args");
DUK_ERROR(thr, DUK_ERR_API_ERROR, duk_str_invalid_call_args);
return DUK_EXEC_ERROR; /* unreachable */
}

Expand Down Expand Up @@ -185,8 +187,8 @@ duk_int_t duk_pcall_prop(duk_context *ctx, duk_idx_t obj_index, duk_idx_t nargs)
* and property lookup, not just the call itself.
*/

duk_push_int(ctx, obj_index); /* FIXME: typing */
duk_push_int(ctx, nargs);
duk_push_idx(ctx, obj_index);
duk_push_idx(ctx, nargs);

/* Inputs: explicit arguments (nargs), +1 for key, +2 for obj_index/nargs passing.
* If the value stack does not contain enough args, an error is thrown; this matches
Expand All @@ -204,7 +206,7 @@ duk_int_t duk_safe_call(duk_context *ctx, duk_safe_call_function func, duk_idx_t

if (duk_get_top(ctx) < nargs || nrets < 0) {
/* See comments in duk_pcall(). */
DUK_ERROR(thr, DUK_ERR_API_ERROR, "invalid call args");
DUK_ERROR(thr, DUK_ERR_API_ERROR, duk_str_invalid_call_args);
return DUK_EXEC_ERROR; /* unreachable */
}

Expand Down Expand Up @@ -244,14 +246,14 @@ void duk_new(duk_context *ctx, duk_idx_t nargs) {
*
* This would be easy to fix, e.g. by knowing that the Array constructor
* will always create a replacement object and skip creating the fallback
* object in that case. FIXME.
* object in that case.
*
* Note: functions called via "new" need to know they are called as a
* constructor. For instance, built-in constructors behave differently
* depending on how they are called.
*/

/* FIXME: should this go to duk_js_call.c? it implements core semantics. */
/* XXX: should this go to duk_js_call.c? it implements core semantics. */

duk_hthread *thr = (duk_hthread *) ctx;
duk_hobject *proto;
Expand All @@ -265,9 +267,10 @@ void duk_new(duk_context *ctx, duk_idx_t nargs) {

idx_cons = duk_require_normalize_index(ctx, -nargs - 1);

DUK_DDD(DUK_DDDPRINT("top=%d, nargs=%d, idx_cons=%d", duk_get_top(ctx), nargs, idx_cons));
DUK_DDD(DUK_DDDPRINT("top=%d, nargs=%d, idx_cons=%d",
(int) duk_get_top(ctx), (int) nargs, (int) idx_cons));

/* FIXME: code duplication */
/* XXX: code duplication */

/*
* Figure out the final, non-bound constructor, to get "prototype"
Expand Down Expand Up @@ -340,7 +343,7 @@ void duk_new(duk_context *ctx, duk_idx_t nargs) {
DUK_DDD(DUK_DDDPRINT("before call, idx_cons+1 (constructor) -> %!T, idx_cons+2 (fallback/this) -> %!T, "
"nargs=%d, top=%d",
duk_get_tval(ctx, idx_cons + 1), duk_get_tval(ctx, idx_cons + 2),
nargs, duk_get_top(ctx)));
(int) nargs, (int) duk_get_top(ctx)));

/*
* Call the constructor function (called in "constructor mode").
Expand All @@ -356,7 +359,7 @@ void duk_new(duk_context *ctx, duk_idx_t nargs) {
/* [... fallback retval] */

DUK_DDD(DUK_DDDPRINT("constructor call finished, rc=%d, fallback=%!iT, retval=%!iT",
rc, duk_get_tval(ctx, -2), duk_get_tval(ctx, -1)));
(int) rc, duk_get_tval(ctx, -2), duk_get_tval(ctx, -1)));

/*
* Determine whether to use the constructor return value as the created
Expand Down Expand Up @@ -384,7 +387,7 @@ void duk_new(duk_context *ctx, duk_idx_t nargs) {
return;

not_constructable:
DUK_ERROR(thr, DUK_ERR_TYPE_ERROR, "not constructable");
DUK_ERROR(thr, DUK_ERR_TYPE_ERROR, duk_str_not_constructable);
}

duk_bool_t duk_is_constructor_call(duk_context *ctx) {
Expand Down Expand Up @@ -442,9 +445,8 @@ duk_int_t duk_get_magic(duk_context *ctx) {

if (DUK_HOBJECT_IS_NATIVEFUNCTION(func)) {
duk_hnativefunction *nf = (duk_hnativefunction *) func;
return (int) nf->magic;
return (duk_int_t) nf->magic;
}

return 0;
}

2 changes: 1 addition & 1 deletion src/duk_api_string.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ static void duk__concat_and_join_helper(duk_context *ctx, duk_idx_t count_in, du

if (DUK_UNLIKELY(count_in <= 0)) {
if (count_in < 0) {
DUK_ERROR(thr, DUK_ERR_API_ERROR, duk_errmsg_invalid_count);
DUK_ERROR(thr, DUK_ERR_API_ERROR, duk_str_invalid_count);
return;
}
DUK_ASSERT(count_in == 0);
Expand Down

0 comments on commit 936b9cb

Please sign in to comment.