diff options
| -rw-r--r-- | src/boot/ast.boot | 2 | ||||
| -rw-r--r-- | src/boot/includer.boot | 5 | ||||
| -rw-r--r-- | src/boot/initial-env.lisp | 11 | ||||
| -rw-r--r-- | src/boot/strap/ast.clisp | 2 | ||||
| -rw-r--r-- | src/boot/strap/includer.clisp | 8 |
5 files changed, 7 insertions, 21 deletions
diff --git a/src/boot/ast.boot b/src/boot/ast.boot index a106a366..d757cda4 100644 --- a/src/boot/ast.boot +++ b/src/boot/ast.boot @@ -580,7 +580,7 @@ bfLET2(lhs,rhs) == if cons? l2 and atom first l2 then l2 := [l2,:nil] var1 is "DOT" => [['L%T,g,rev],:l2] - last l2 is ['L%T, =var1, val1] => + first lastNode l2 is ['L%T, =var1, val1] => [['L%T,g,rev],:reverse rest reverse l2, bfLetForm(var1,['reverse!,val1])] [['L%T,g,rev],:l2,bfLetForm(var1,['reverse!,var1])] diff --git a/src/boot/includer.boot b/src/boot/includer.boot index 26a38ba3..f9749df2 100644 --- a/src/boot/includer.boot +++ b/src/boot/includer.boot @@ -174,9 +174,8 @@ bRgen s == bDelay(function bRgen1,[s]) bRgen1 s == - a := shoeReadLine s - shoePLACEP a => ["nullstream"] - [a,:bRgen s] + a := shoeReadLine s => [a,:bRgen s] + ["nullstream"] bIgen n == bDelay(function bIgen1,[n]) diff --git a/src/boot/initial-env.lisp b/src/boot/initial-env.lisp index ef82d033..6aa71a2b 100644 --- a/src/boot/initial-env.lisp +++ b/src/boot/initial-env.lisp @@ -63,11 +63,6 @@ (defvar *lisp-source-filetype* "lisp") -(defmacro |shoeOpenOutputFile| - (stream fn prog) - `(with-open-file (,stream ,fn :direction :output - :if-exists :supersede) ,prog)) - (defun shoeprettyprin1 (x &optional (stream *standard-output*)) (let ((*print-pretty* t) (*print-array* t) @@ -91,9 +86,6 @@ (shoeprettyprin0 x stream) (terpri stream)) -(defun |shoePLACEP| (item) - (eq item nil)) - (defun MAKE-HASHTABLE (id1) (let ((test (case id1 ((EQ ID) #'eq) @@ -144,6 +136,3 @@ (defun |shoeReadLisp| (s n) (multiple-value-list (read-from-string s nil nil :start n))) - -(defun |last| (x) - (car (last x))) diff --git a/src/boot/strap/ast.clisp b/src/boot/strap/ast.clisp index 36022667..90c9eab9 100644 --- a/src/boot/strap/ast.clisp +++ b/src/boot/strap/ast.clisp @@ -915,7 +915,7 @@ (COND ((EQ |var1| 'DOT) (CONS (LIST 'L%T |g| |rev|) |l2|)) ((PROGN - (SETQ |ISTMP#1| (|last| |l2|)) + (SETQ |ISTMP#1| (CAR (|lastNode| |l2|))) (AND (CONSP |ISTMP#1|) (EQ (CAR |ISTMP#1|) 'L%T) (PROGN (SETQ |ISTMP#2| (CDR |ISTMP#1|)) diff --git a/src/boot/strap/includer.clisp b/src/boot/strap/includer.clisp index 669ca761..57079461 100644 --- a/src/boot/strap/includer.clisp +++ b/src/boot/strap/includer.clisp @@ -135,11 +135,9 @@ (DEFUN |bRgen1| (|s|) (PROG (|a|) (RETURN - (PROGN - (SETQ |a| (|shoeReadLine| |s|)) - (COND - ((|shoePLACEP| |a|) (LIST '|nullstream|)) - (T (CONS |a| (|bRgen| |s|)))))))) + (COND + ((SETQ |a| (|shoeReadLine| |s|)) (CONS |a| (|bRgen| |s|))) + (T (LIST '|nullstream|)))))) (DEFUN |bIgen| (|n|) (|bDelay| #'|bIgen1| (LIST |n|))) |