From 74f27def1a3b3a9fd8fa9a1fe5a54b9283f87093 Mon Sep 17 00:00:00 2001
From: Eric Swenson <eric@swenson.org>
Date: Fri, 26 Jul 2024 13:52:02 +0200
Subject: [PATCH] Addressed three review comments.

Use LISTIFY instead of a hand-coded version.  Got rid of SETQ
of a PROG variable, since variables should have been initialized
to NIL by PROG.
---
 src/shrdlu/blockl.6  | 7 ++-----
 src/shrdlu/blockp.5  | 5 ++---
 src/shrdlu/dictio.75 | 2 ++
 src/shrdlu/loader.20 | 3 +++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/shrdlu/blockl.6 b/src/shrdlu/blockl.6
index e25f148f4..78436b5d4 100644
--- a/src/shrdlu/blockl.6
+++ b/src/shrdlu/blockl.6
@@ -248,16 +248,13 @@
 
 (DEFUN PACKO (OBJ TYPE)
   (PROG (XX)
-    (setq xx nil)
     (MAPC (FUNCTION (LAMBDA (X)
 		      (AND (THVAL (QUOTE (THGOAL (!IS $?X
 						      $E
 						      TYPE)))
 				  (LIST (LIST (QUOTE X) X)))
 			   (SETQ XX (PACKORD X (SIZE X) XX)))))
-	  (cond ((atom obj) (list obj))
-		(t obj))
-	  )
+	  (listify obj))
     (RETURN (MAPCAR (QUOTE CADR) XX))))
 
 (DEFUN PACKON
@@ -348,4 +345,4 @@
 		       (LESSP (OR (END? TIME) 777777)
 			      (GET EV (QUOTE END))))))))
 
-
\ No newline at end of file
+
diff --git a/src/shrdlu/blockp.5 b/src/shrdlu/blockp.5
index f31f7f1f8..c942cc5bb 100644
--- a/src/shrdlu/blockp.5
+++ b/src/shrdlu/blockp.5
@@ -496,8 +496,7 @@ THEOREM)
    (!STACKUP $?X)
    (OR (LESSP (APPLY (QUOTE PLUS)
 		     (MAPCAR (QUOTE (LAMBDA (X) (CADDR (SIZE X))))
-			     (cond ((atom $?x) (list $?x))
-				   (t $?x))))
+		         (listify $?x)))
 	      1201)
        (NOT (DPRINT2 (QUOTE TOO/ HIGH/,))))
    (THCOND
@@ -866,4 +865,4 @@ NIL
 		 !UNGRASP))
 
 (QUOTE (PREDICATES ARE: !LOC !SUPPORT !ON !PHYSOB))
-
\ No newline at end of file
+
diff --git a/src/shrdlu/dictio.75 b/src/shrdlu/dictio.75
index f4e643ac9..d4d2fc65c 100644
--- a/src/shrdlu/dictio.75
+++ b/src/shrdlu/dictio.75
@@ -175,6 +175,8 @@
 		 (RETURN (PROG (CUT NBB BOTH) 
 			       (SETQ NBB N)
 			       (AND (FLUSHME)
+;ejs
+;				    (** N
 				    (move-ptw N
 					NW
 					(EQ (WORD PTW) (CAR A))
diff --git a/src/shrdlu/loader.20 b/src/shrdlu/loader.20
index e8d4083b5..992f658ee 100644
--- a/src/shrdlu/loader.20
+++ b/src/shrdlu/loader.20
@@ -10,7 +10,10 @@
 ;;;    NEVER NOTICE)
 ;;;
 
+;(setsyntax 44. 'single 44.)
 (setsyntax 34. 'single 34.)
+;(setsyntax 35. 'single 35.)
+;(sstatus syntax 35. 1)
 
 (SETQ GC-OVERFLOW '(LAMBDA (X) T))