From e09cdf66196b14eb96def02d83e6ccc23eef590a Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Tue, 26 Oct 2021 19:53:17 -0700 Subject: [PATCH] Remove more non-essential code --- bestline.c | 4 +--- lisp.c | 2 -- lisp.lisp | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/bestline.c b/bestline.c index b49e598..9979093 100644 --- a/bestline.c +++ b/bestline.c @@ -51,7 +51,6 @@ │ │ │ SHORTCUTS │ │ │ -│ │ │ CTRL-E END │ │ CTRL-A START │ │ CTRL-B BACK │ @@ -78,6 +77,7 @@ │ ALT-D KILL WORD FORWARDS │ │ CTRL-Y YANK │ │ ALT-Y ROTATE KILL RING AND YANK AGAIN │ +│ ALT-\ SQUEEZE ADJACENT WHITESPACE │ │ CTRL-T TRANSPOSE │ │ ALT-T TRANSPOSE WORD │ │ ALT-U UPPERCASE WORD │ @@ -1762,8 +1762,6 @@ static size_t GetMonospaceWidth(const char *p, size_t n, char *out_haswides) { case '_': t = kStr; break; - case '\\': - goto Whoopsie; default: t = kAscii; break; diff --git a/lisp.c b/lisp.c index 24c21a9..adc5f4e 100644 --- a/lisp.c +++ b/lisp.c @@ -404,8 +404,6 @@ static int Evaluate(int e, int a) { return Cadr(e); if (ax == ATOM_COND) return Evcon(Cdr(e), a); - if (ax == ATOM_LAMBDA) - return e; } return Apply(ax, Evlis(Cdr(e), a), a); } diff --git a/lisp.lisp b/lisp.lisp index a7ec891..d8f7f50 100644 --- a/lisp.lisp +++ b/lisp.lisp @@ -74,6 +74,7 @@ NIL ;; REQUIRES CONS CAR CDR QUOTE ATOM EQ LAMBDA COND ;; SIMPLIFIED BUG FIXED VERSION OF JOHN MCCARTHY PAPER ;; NOTE: ((EQ (CAR E) NIL) (QUOTE *UNDEFINED)) CAN HELP +;; NOTE: ((EQ (CAR E) (QUOTE LAMBDA)) E) IS NICE ((LAMBDA (ASSOC EVCON BIND APPEND EVAL) (EVAL (QUOTE ((LAMBDA (FF X) (FF X)) (QUOTE (LAMBDA (X) @@ -109,7 +110,6 @@ NIL ((EQ (CAR E) (QUOTE CONS)) (CONS (EVAL (CAR (CDR E)) A) (EVAL (CAR (CDR (CDR E))) A))) ((EQ (CAR E) (QUOTE COND)) (EVCON (CDR E) A)) - ((EQ (CAR E) (QUOTE LAMBDA)) E) ((QUOTE T) (EVAL (CONS (EVAL (CAR E) A) (CDR E)) A)))) ((EQ (CAR (CAR E)) (QUOTE LAMBDA)) (EVAL (CAR (CDR (CDR (CAR E))))