summaryrefslogtreecommitdiffstats
path: root/debug.c
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2015-08-23 19:23:07 -0700
committerKaz Kylheku <kaz@kylheku.com>2015-08-23 19:23:07 -0700
commita6fa35d2877745ba0b285093c40c1a3aad82a0e8 (patch)
treec198bb2deaa979417dbabc184dadf2061da86731 /debug.c
parent6d0af6ae2af0003716581ed23b486f26ac809e0c (diff)
downloadtxr-a6fa35d2877745ba0b285093c40c1a3aad82a0e8.tar.gz
txr-a6fa35d2877745ba0b285093c40c1a3aad82a0e8.tar.bz2
txr-a6fa35d2877745ba0b285093c40c1a3aad82a0e8.zip
Use of new args for function calls in interpreter.
* args.c (args_copy_to_list): New function. * args.h (ARGS_MIN): New preprocessor symbol. (args_add_list): New inline function. (args_copy_to_list): Declared. * debug.c (debug): Args in debug frame are now struct args *. Pull them out nondestructively for printing using args_copy_to_list. * eval.c (do_eval_args): Fill struct args argument list rather than returning evaluated list. Dot position evaluation is handled by installing the dot position value as args->list. (do_eval): Allocate args of at least ARGS_MAX for the call to do_eval_args. Then use generic_funcall to invoke the function rather than apply. (eval_args_lisp1): Modified similarly to do_eval_args. (eval_lisp1): New static function. (expand_macro): Construct struct args argument list for the sake of debug_frame. (op_dwim): Allocate args which are filled by eval_args_lisp1, and applied to the function/object with generic_funcall. The object expression is separately evaluated with eval_lisp1. * match.c (h_fun, v_fun): Construct struct args arglist for the sake of debug_frame call. * unwind.c (uw_push_debug): args argument becomes struct args *. * unwind.h (struct uw_debug): args member becomes struct args *. (uw_push_debug): Declaration updated. * txr.1: Update documentation about dot position argument in function calls. (list . a) now works, which previously didn't.
Diffstat (limited to 'debug.c')
-rw-r--r--debug.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/debug.c b/debug.c
index 54052eef..370d13bd 100644
--- a/debug.c
+++ b/debug.c
@@ -37,6 +37,7 @@
#include "lib.h"
#include "debug.h"
#include "gc.h"
+#include "args.h"
#include "signal.h"
#include "unwind.h"
#include "stream.h"
@@ -224,10 +225,11 @@ val debug(val form, val bindings, val data, val line, val pos, val base)
if (iter->uw.type == UW_DBG) {
if (iter->db.ub_p_a_pairs)
format(std_debug, lit("(~s ~s ~s)\n"), iter->db.func,
- iter->db.args, iter->db.ub_p_a_pairs, nao);
+ args_copy_to_list(iter->db.args),
+ iter->db.ub_p_a_pairs, nao);
else
format(std_debug, lit("(~s ~s)\n"), iter->db.func,
- iter->db.args, nao);
+ args_copy_to_list(iter->db.args), nao);
}
}
}