make function arity exclude optional params

Author: p7g

compiler.c

@@ -1576,8 +1576,7 @@ static int compile_const_function(struct cstate *state, size_t **free_vars_out,
 
 	func_out->code = create_code(&inner_state);
 	func_out->name = name_id;
-	func_out->arity = num_params;
-	func_out->num_opt_params = num_opt_params;
+	func_out->arity = num_params - num_opt_params;
 
 	scope_free(inner_fn_state.scope);
 

constant.c

@@ -136,7 +136,6 @@ struct cb_value cb_const_to_value(const struct cb_const *const_)
 		}
 		for (int i = 0; i < const_func->code->nupvalues; i += 1)
 			func->value.as_user.upvalues[i] = NULL;
-		func->value.as_user.num_opt_params = const_func->num_opt_params;
 
 		ret.type = CB_VALUE_FUNCTION;
 		ret.val.as_function = func;

constant.h

@@ -58,7 +58,7 @@ struct cb_const_struct {
 };
 
 struct cb_const_user_function {
-	size_t name, arity, num_opt_params;
+	size_t name, arity;
 	struct cb_code *code;
 };
 

eval.c

@@ -143,7 +143,6 @@ static CB_INLINE int do_call(unsigned short num_args, struct cb_frame *frame,
 	struct cb_value func_val;
 	struct cb_function *func;
 	int failed;
-	int num_opt_params;
 
 	func_val = *(*sp - num_args - 1);
 
@@ -156,10 +155,7 @@ static CB_INLINE int do_call(unsigned short num_args, struct cb_frame *frame,
 	}
 
 	func = func_val.val.as_function;
-	num_opt_params = func->type == CB_FUNCTION_USER
-		? func->value.as_user.num_opt_params
-		: 0;
-	if (func->arity - num_opt_params > num_args) {
+	if (func->arity > num_args) {
 		cb_str s = cb_agent_get_string(func->name);
 		struct cb_value err;
 		cb_value_from_fmt(&err, "Too few arguments to function '%s'\n",
@@ -182,9 +178,9 @@ static CB_INLINE int do_call(unsigned short num_args, struct cb_frame *frame,
 		next_frame.num_args = num_args;
 		next_frame.module_id = cb_modspec_id(code->modspec);
 		next_frame.code = code;
-		next_frame.bp = *sp - *stack - num_args - 1;
+		next_frame.bp = old_sp - num_args - 1;
 
-		ensure_stack(code->stack_size, *sp - *stack);
+		ensure_stack(code->stack_size, old_sp);
 		failed = cb_eval(&next_frame);
 	}
 

tests/test_iteration.cb

@@ -79,6 +79,5 @@ export function test_peekable() {
     test::assert(iter::next(it) == 2, "Expected next to be 2");
 
     test::assert(iter::next(it) == 3, "Expected next to be null");
-    println("PEEK", it.peek());
     test::assert(it.peek() == null, "Expected peek to be null");
-}
+}

value.h

@@ -62,7 +62,6 @@ struct cb_code;
 struct cb_user_function {
 	struct cb_code *code;
 	struct cb_upvalue **upvalues;
-	size_t num_opt_params;
 };
 
 struct cb_function {