Browse Source

Remove more non-essential code

Justine Tunney 3 years ago
parent
commit
e09cdf6619
3 changed files with 2 additions and 6 deletions
  1. 1 3
      bestline.c
  2. 0 2
      lisp.c
  3. 1 1
      lisp.lisp

+ 1 - 3
bestline.c

@@ -51,7 +51,6 @@
 │                                                                              │
 │                                                                              │
 │ SHORTCUTS                                                                    │
 │ SHORTCUTS                                                                    │
 │                                                                              │
 │                                                                              │
-│                                                                              │
 │   CTRL-E         END                                                         │
 │   CTRL-E         END                                                         │
 │   CTRL-A         START                                                       │
 │   CTRL-A         START                                                       │
 │   CTRL-B         BACK                                                        │
 │   CTRL-B         BACK                                                        │
@@ -78,6 +77,7 @@
 │   ALT-D          KILL WORD FORWARDS                                          │
 │   ALT-D          KILL WORD FORWARDS                                          │
 │   CTRL-Y         YANK                                                        │
 │   CTRL-Y         YANK                                                        │
 │   ALT-Y          ROTATE KILL RING AND YANK AGAIN                             │
 │   ALT-Y          ROTATE KILL RING AND YANK AGAIN                             │
+│   ALT-\          SQUEEZE ADJACENT WHITESPACE                                 │
 │   CTRL-T         TRANSPOSE                                                   │
 │   CTRL-T         TRANSPOSE                                                   │
 │   ALT-T          TRANSPOSE WORD                                              │
 │   ALT-T          TRANSPOSE WORD                                              │
 │   ALT-U          UPPERCASE WORD                                              │
 │   ALT-U          UPPERCASE WORD                                              │
@@ -1762,8 +1762,6 @@ static size_t GetMonospaceWidth(const char *p, size_t n, char *out_haswides) {
                 case '_':
                 case '_':
                     t = kStr;
                     t = kStr;
                     break;
                     break;
-                case '\\':
-                    goto Whoopsie;
                 default:
                 default:
                     t = kAscii;
                     t = kAscii;
                     break;
                     break;

+ 0 - 2
lisp.c

@@ -404,8 +404,6 @@ static int Evaluate(int e, int a) {
       return Cadr(e);
       return Cadr(e);
     if (ax == ATOM_COND)
     if (ax == ATOM_COND)
       return Evcon(Cdr(e), a);
       return Evcon(Cdr(e), a);
-    if (ax == ATOM_LAMBDA)
-      return e;
   }
   }
   return Apply(ax, Evlis(Cdr(e), a), a);
   return Apply(ax, Evlis(Cdr(e), a), a);
 }
 }

+ 1 - 1
lisp.lisp

@@ -74,6 +74,7 @@ NIL
 ;; REQUIRES CONS CAR CDR QUOTE ATOM EQ LAMBDA COND
 ;; REQUIRES CONS CAR CDR QUOTE ATOM EQ LAMBDA COND
 ;; SIMPLIFIED BUG FIXED VERSION OF JOHN MCCARTHY PAPER
 ;; SIMPLIFIED BUG FIXED VERSION OF JOHN MCCARTHY PAPER
 ;; NOTE: ((EQ (CAR E) NIL) (QUOTE *UNDEFINED)) CAN HELP
 ;; NOTE: ((EQ (CAR E) NIL) (QUOTE *UNDEFINED)) CAN HELP
+;; NOTE: ((EQ (CAR E) (QUOTE LAMBDA)) E) IS NICE
 ((LAMBDA (ASSOC EVCON BIND APPEND EVAL)
 ((LAMBDA (ASSOC EVCON BIND APPEND EVAL)
    (EVAL (QUOTE ((LAMBDA (FF X) (FF X))
    (EVAL (QUOTE ((LAMBDA (FF X) (FF X))
                  (QUOTE (LAMBDA (X)
                  (QUOTE (LAMBDA (X)
@@ -109,7 +110,6 @@ NIL
                ((EQ (CAR E) (QUOTE CONS)) (CONS (EVAL (CAR (CDR E)) A)
                ((EQ (CAR E) (QUOTE CONS)) (CONS (EVAL (CAR (CDR E)) A)
                                                 (EVAL (CAR (CDR (CDR E))) A)))
                                                 (EVAL (CAR (CDR (CDR E))) A)))
                ((EQ (CAR E) (QUOTE COND)) (EVCON (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))))
                ((QUOTE T) (EVAL (CONS (EVAL (CAR E) A) (CDR E)) A))))
             ((EQ (CAR (CAR E)) (QUOTE LAMBDA))
             ((EQ (CAR (CAR E)) (QUOTE LAMBDA))
              (EVAL (CAR (CDR (CDR (CAR E))))
              (EVAL (CAR (CDR (CDR (CAR E))))