Skip to content

Commit

Permalink
Correct the Lisp makefile package
Browse files Browse the repository at this point in the history
  • Loading branch information
@blakemcbride
blakemcbride committed Apr 23, 2024
1 parent 87687b6 commit 878b424
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 42 deletions.
6 changes: 4 additions & 2 deletions Makefile.unx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ LAST_UPDATE_DAY = 1
# Set defaults
PARMS = -DCELLS=100000 -DATOMS=3000 -DSTACK=1500 -DARRAY=5000

OPT = -O3
#OPT = -g -Og

CFLAGS = -Dstricmp=strcasecmp -O3 $(M32) $(PARMS) -DYEAR=$(LAST_UPDATE_YEAR) -DMONTH=$(LAST_UPDATE_MONTH) -DDAY=$(LAST_UPDATE_DAY)
CFLAGS = -Dstricmp=strcasecmp $(OPT) $(M32) $(PARMS) -DYEAR=$(LAST_UPDATE_YEAR) -DMONTH=$(LAST_UPDATE_MONTH) -DDAY=$(LAST_UPDATE_DAY)

.f.c:
f2c -onetrip -A -h $<
Expand All @@ -25,7 +27,7 @@ bare.img : lispf4 SYSATOMS script.1


lispf4 : lispf41.o lispf42.o auxillary.o
gcc -o $@ $(M32) -O $^ -lm
gcc -o $@ $(M32) $(OPT) $^ -lm

#lispf41.c : lispf41.f
# f2c -onetrip -A -h $<
Expand Down
84 changes: 44 additions & 40 deletions makef.lisp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,49 +36,52 @@
(COND (PRINTFLG (PRINT (EVALA X AL)) (GO LOOP))
(T (EVALA X AL) (GO LOOP])

(MAKEF/EVAL
(MAKEF-EVAL
(LAMBDA (X) (CAR (APPLYSTK 'ERRORSET (LIST X) AL))))

(MAKEF/FNSX
(LAMBDA (L) (PRINTL "(DEFINEQ") (PRETTYPRINT L OPT) (PRINTL ")")))
(MAKEF-FNSX
(LAMBDA (L)
(PRINTL "(DEFINEQ")
(PRETTYPRINT L OPT)
(PRINTL ")")))

(MAKEF/GETPROPS
(MAKEF-GETPROPS
[LAMBDA (L)
(COND ((NLISTP L) NIL)
((MEMB (CAR L) SYSPROPS)
(MAKEF/GETPROPS (CDDR L)))
(MAKEF-GETPROPS (CDDR L)))
[(OR NIL* (CADR L))
(CONS (CAR L)
(CONS (CADR L) (MAKEF/GETPROPS (CDDR L]
(T (MAKEF/GETPROPS (CDDR L])
(CONS (CADR L) (MAKEF-GETPROPS (CDDR L]
(T (MAKEF-GETPROPS (CDDR L])

(MAKEF/MAPC*
(MAKEF-MAPC*
(LAMBDA (L FN)
(SELECTQ (AND (CDR L) (NULL (CDDR L)) (CAR L))
(-*- (MAPC (MAKEF/EVAL (CADR
(-*- (MAPC (MAKEF-EVAL (CADR
L)) FN))
(MAPC L FN))))

(MAKEF/OUT
(MAKEF-OUT
(NLAMBDA LL
(PRIN0 (CONS (CAR LL) (EVLIS (CDR LL))) T OPT)
(TERPRI)))

(MAKEF/PROPX
(MAKEF-PROPX
[LAMBDA (PROPS L NIL*)
(COND [(EQ PROPS 'ALL)
(MAKEF/MAPC* L
(MAKEF-MAPC* L
'(LAMBDA (X)
[SETQ X
(CONS X (MAKEF/GETPROPS (CDR X]
(CONS X (MAKEF-GETPROPS (CDR X]
(COND ((CDR X)
(PRIN0 (CONS 'PUTPROPS X) T OPT)
(TERPRI]
((ATOM PROPS) (MAKEF/PROPX (LIST PROPS) L NIL*))
((ATOM PROPS) (MAKEF-PROPX (LIST PROPS) L NIL*))
(T (MAPC PROPS
'(LAMBDA
(P RES)
[MAKEF/MAPC* L
[MAKEF-MAPC* L
'(LAMBDA
(X)
(AND (OR NIL* (GETPROP X P))
Expand All @@ -87,14 +90,14 @@
(LIST X (GETPROP X P))
RES]
(AND RES
(MAKEF/OUT DEFLIST
(MAKEF-OUT DEFLIST
(LIST 'QUOTE (REVERSE RES))
(LIST 'QUOTE P])

(MAKEF/VARSX
(MAKEF-VARSX
[LAMBDA (L)
(MAKEF/MAPC* L
'(LAMBDA (X) (MAKEF/OUT RPAQQ X (MAKEF/EVAL X])
(MAKEF-MAPC* L
'(LAMBDA (X) (MAKEF-OUT RPAQQ X (MAKEF-EVAL X])

(MAKEFILE
(LAMBDA (FILE XFILE OPT)
Expand Down Expand Up @@ -125,46 +128,47 @@
(SETQ GBC (SYSFLAG 1 NIL))
(SETQ DEPTH (PRINTLEVEL 150))
(SETQ LENGTH (PRINTLENGTH 1000))
(MAKEF/OUT FILEHEADER FILE)
(MAKEF/OUT PRINT (LIST 'QUOTE COMSV))
(MAKEF/OUT PRINT (SUBST GENV '&&X ''(VERSION &&X)))
(MAKEF-OUT FILEHEADER FILE)
(MAKEF-OUT PRINT (LIST 'QUOTE COMSV))
(MAKEF-OUT PRINT (SUBST GENV '&&X ''(VERSION &&X)))
(COND (FNSV (SETQ FNSV (DSORT (COPY FNSV)))
(MAKEF/FNSX (LIST '* (LIST 'QUOTE FNSV)))
(MAKEF/OUT PRINT (LIST 'QUOTE FNS))
(MAKEF/OUT RPAQQ FNS FNSV)))
(MAKEF/OUT RPAQQ COMS COMSV)
(MAKEF/OUT RPAQ GEN GENV)
(MAKEF-FNSX FNSV)
(MAKEF-OUT PRINT (LIST 'QUOTE FNS))
(MAKEF-OUT RPAQQ FNS FNSV)))
(MAKEF-OUT RPAQQ COMS COMSV)
(MAKEF-OUT RPAQ GEN GENV)
[COND (VARSV (SETQ VARSV (DSORT (COPY VARSV)))
(MAKEF/OUT PRINT (LIST 'QUOTE VARS))
(MAKEF/OUT RPAQQ VARS VARSV)
(MAKEF-OUT PRINT (LIST 'QUOTE VARS))
(MAKEF-OUT RPAQQ VARS VARSV)
(MAPC VARSV
'(LAMBDA
(X)
(COND ((LITATOM X)
(MAKEF/VARSX (LIST X)))
(MAKEF-VARSX (LIST X)))
((LISTP X)
(SELECTQ
(CAR X)
(FNS (MAKEF/FNSX
(FNS
(MAKEF-FNSX
(CDR X)))
(VARS
(MAKEF/VARSX (CDR X)))
(MAKEF-VARSX (CDR X)))
(PROP
(MAKEF/PROPX
(MAKEF-PROPX
(CADR X)
(CDDR X)
T))
(IFPROP
(MAKEF/PROPX
(MAKEF-PROPX
(CADR X)
(CDDR X)))
(P (MAKEF/MAPC*
(P (MAKEF-MAPC*
(CDR X)
'PRINT))
(E (OUTUNIT UNIT)
(MAKEF/MAPC*
(MAKEF-MAPC*
(CDR X)
'MAKEF/EVAL)
'MAKEF-EVAL)
(OUTUNIT FILENR))
(PROG1
(OUTUNIT UNIT)
Expand Down Expand Up @@ -192,7 +196,7 @@
(PRETTYPRINT
(LAMBDA (L OPT POS)
[SETQ POS (IOTAB 7 (PLUS 2 (IOTAB 7]
(MAKEF/MAPC* L
(MAKEF-MAPC* L
'(LAMBDA (X)
(PRIN1 "(")
(PRINT X)
Expand Down Expand Up @@ -224,8 +228,8 @@
)
(PRINT 'MAKEFFNS)
(RPAQQ MAKEFFNS
(CLOSE CURFILE FILECREATED FILEHEADER LOAD MAKEF/EVAL MAKEF/FNSX
MAKEF/GETPROPS MAKEF/MAPC* MAKEF/OUT MAKEF/PROPX MAKEF/VARSX
(CLOSE CURFILE FILECREATED FILEHEADER LOAD MAKEF-EVAL MAKEF-FNSX
MAKEF-GETPROPS MAKEF-MAPC* MAKEF-OUT MAKEF-PROPX MAKEF-VARSX
MAKEFILE OPEN PP PRETTYPRINT SYSIN SYSOUT))
(RPAQQ MAKEFCOMS (MAKE FILE PACKAGE MODIFIED BY BLAKE MCBRIDE))
(RPAQ MAKEFGENNR 9)
Expand Down

0 comments on commit 878b424

Please sign in to comment.