Merge pull request #417 from Interlisp/masterscope-macros

Masterscope wasn't expanding cl:defmacro defined macros

library/MSANALYZE

@@ -1,9 +1,10 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS)
-
(FILECREATED " 3-Mar-2021 10:31:16" {DSK}<home>larry>ilisp>medley>library>MSANALYZE.;2
 62577  
+
(FILECREATED "18-Aug-2021 12:13:11" {DSK}<home>larry>medley>library>MSANALYZE.;5
 62745  
 
-      changes to%:  (VARS MSMACROPROPS)
+      changes to%:  (FNS MSPRGMACRO MSFINDP)
+                    (VARS MSMACROPROPS)
 
-      previous date%: "15-Aug-90 13:13:24" {DSK}<home>larry>ilisp>medley>library>MSANALYZE.;1)
+      previous date%: "18-Aug-2021 10:56:25" {DSK}<home>larry>medley>library>MSANALYZE.;4)
 
 
 (* ; "
@@ -418,8 +419,10 @@ DONTCOPY
                        'EVAL))))))
 
 (MSPRGMACRO

-  (LAMBDA (FORM MACDEF CONTEXT)
                              (* lmm "13-DEC-82 23:45")

+  [LAMBDA (FORM MACDEF CONTEXT)
                        (* ; "Edited 18-Aug-2021 11:23 by larry")

-    (PROG ((ME (MACROEXPANSION FORM MACDEF)))
+    (PROG [(ME (if
 (LITATOM MACDEF)
+                   then
 (CL:MACROEXPAND FORM)
+                 else
 (MACROEXPANSION FORM MACDEF]
           (COND
              ((AND (NOT (EQUAL ME FORM))
                    (NOT (EQUAL ME INCLISP)))
@@ -428,7 +431,7 @@ DONTCOPY
               (PROG ((INCLISP (INCLISP FORM))
                      (EXPR FORM))
                     (MSPRGE
 ME FORM 'EVAL))
-              (RETURN T))))))
+              (RETURN T])
 
 (MSPRGCALL

   (LAMBDA (FN PRNT CONTEXT)
                                  (* lmm "22-DEC-78 12:57")

@@ -1270,14 +1273,14 @@ DONTCOPY
 (DEFINEQ
 
 (MSFINDP

-  (LAMBDA (STRUC SUB)
                                        (* lmm "14-Aug-84 16:38")

+  [LAMBDA (STRUC SUBL)
                                 (* ; "Edited 18-Aug-2021 10:56 by larry")

     (PROG NIL
-      LP  (RETURN (OR (EQ SUB STRUC)
+      LP  (RETURN (OR (EQ SUBL STRUC)
                       (AND (LISTP STRUC)
                            (OR (MSFINDP
 (CAR STRUC)
-                                      SUB)
+                                      SUBL)
                                (PROGN (SETQ STRUC (CDR STRUC))
-                                      (GO LP)))))))))
+                                      (GO LP])
 )
 (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY
 
@@ -1285,11 +1288,11 @@ DONTCOPY
 )
 (PUTPROPS MSANALYZE COPYRIGHT ("Venue & Xerox Corporation" T 1982 1983 1984 1985 1986 1988 1990 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3762 11281 (VARS 3772 . 3913) (FREEVARS 3915 . 4068) (CALLS 4070 . 10411) (
+  (FILEMAP (NIL (3820 11339 (VARS 3830 . 3971) (FREEVARS 3973 . 4126) (CALLS 4128 . 10469) (
-COLLECTFNDATA 10413 . 10792) (CALLS3 10794 . 11279)) (13538 52620 (ALLCALLS 13548 . 14227) (
+COLLECTFNDATA 10471 . 10850) (CALLS3 10852 . 11337)) (13596 52783 (ALLCALLS 13606 . 14285) (
-MSINITFNDATA 14229 . 14473) (MSPRGE 14475 . 21549) (MSPRGMACRO 21551 . 22042) (MSPRGCALL 22044 . 22368
+MSINITFNDATA 14287 . 14531) (MSPRGE 14533 . 21607) (MSPRGMACRO 21609 . 22205) (MSPRGCALL 22207 . 22531
-) (MSBINDVAR 22370 . 22889) (MSPRGRECORD 22891 . 29804) (MSPRGERR 29806 . 29974) (MSPRGTEMPLATE1 29976
+) (MSBINDVAR 22533 . 23052) (MSPRGRECORD 23054 . 29967) (MSPRGERR 29969 . 30137) (MSPRGTEMPLATE1 30139
- . 39137) (MSPRGTEMPLATE 39139 . 39819) (MSPRGLAMBDA 39821 . 49416) (MSPRGLST 49418 . 49586) (ADDTO 
+ . 39300) (MSPRGTEMPLATE 39302 . 39982) (MSPRGLAMBDA 39984 . 49579) (MSPRGLST 49581 . 49749) (ADDTO 
-49588 . 50379) (NLAMBDAFNP 50381 . 51133) (MSPRGDWIM 51135 . 51954) (MSDWIMTRAN 51956 . 52618)) (61946
+49751 . 50542) (NLAMBDAFNP 50544 . 51296) (MSPRGDWIM 51298 . 52117) (MSDWIMTRAN 52119 . 52781)) (62109
- 62373 (MSFINDP 61956 . 62371)))))
+ 62541 (MSFINDP 62119 . 62539)))))
 STOP