From b1088a2502cba1a61b862f708489c8d4baa722fe Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Thu, 8 Dec 2011 09:25:45 -0800 Subject: C++ maintenance. * eval.c (and_s, or_s): Redundant variables removed. * match.h (do_s): extern storage class specifier added. --- ChangeLog | 8 ++++++++ eval.c | 4 +--- match.h | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca930a46..640a7530 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-12-08 Kaz Kylheku + + C++ maintenance. + + * eval.c (and_s, or_s): Redundant variables removed. + + * match.h (do_s): extern storage class specifier added. + 2011-12-07 Kaz Kylheku * eval.c (op_defun): Transform a function body by inserting diff --git a/eval.c b/eval.c index f3ee2b4f..7834c074 100644 --- a/eval.c +++ b/eval.c @@ -51,7 +51,7 @@ val op_table; val eval_error_s; val progn_s, let_s, let_star_s, lambda_s, call_s; -val cond_s, if_s, and_s, or_s, defvar_s, defun_s; +val cond_s, if_s, defvar_s, defun_s; val inc_s, dec_s, push_s, pop_s, flip_s, gethash_s, car_s, cdr_s, vecref_s; val for_s, for_star_s, dohash_s, uw_protect_s, return_s, return_from_s; val list_s, append_s, apply_s; @@ -1055,8 +1055,6 @@ void eval_init(void) call_s = intern(lit("call"), user_package); cond_s = intern(lit("cond"), user_package); if_s = intern(lit("if"), user_package); - and_s = intern(lit("and"), user_package); - or_s = intern(lit("or"), user_package); defvar_s = intern(lit("defvar"), user_package); defun_s = intern(lit("defun"), user_package); inc_s = intern(lit("inc"), user_package); diff --git a/match.h b/match.h index 24afd7c3..277d33a8 100644 --- a/match.h +++ b/match.h @@ -24,7 +24,7 @@ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -val do_s; +extern val do_s; void match_init(void); val match_funcall(val name, val arg, val other_args); int extract(val spec, val filenames, val bindings); -- cgit v1.2.3