diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/interp/ChangeLog | 9 | ||||
| -rw-r--r-- | src/interp/Makefile.in | 23 | ||||
| -rw-r--r-- | src/interp/Makefile.pamphlet | 33 | ||||
| -rw-r--r-- | src/interp/bc-matrix.boot.pamphlet | 6 | ||||
| -rw-r--r-- | src/interp/bc-util.boot.pamphlet | 2 | ||||
| -rw-r--r-- | src/interp/br-prof.boot.pamphlet | 10 |
6 files changed, 24 insertions, 59 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index 1ef84715..c8196599 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,3 +1,12 @@ +2007-09-25 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * Makefile.pamphlet (<<bc-matrix.clisp>>): Remove. + (<<bc-util.clisp>>): Likewise. + (<<br-prof.clisp>>): Likewise. + * bc-matrix.boot.pamphlet: Push into BOOT package. + * bc-util.boot.pamphlet: Likewise. + * br-prof.boot.pamphlet: Likewise. + 2007-09-24 Gabriel Dos Reis <gdr@cs.tamu.edu> * i-output.boot.pamphlet (half): New macro. diff --git a/src/interp/Makefile.in b/src/interp/Makefile.in index ab300b8b..66f21c7e 100644 --- a/src/interp/Makefile.in +++ b/src/interp/Makefile.in @@ -349,7 +349,7 @@ ${DEPSYS}: vmlisp.$(FASLEXT) \ bookvol5.$(FASLEXT)\ util.$(FASLEXT) \ postpar.$(FASLEXT) \ - parse.clisp \ + parse.$(FASLEXT) \ parsing.$(FASLEXT) \ metalex.$(FASLEXT) \ bootlex.$(FASLEXT) \ @@ -378,10 +378,9 @@ ${DEPSYS}: vmlisp.$(FASLEXT) \ @ echo '(|importModule| "util")' >> makedep.lisp @ echo '(in-package "BOOT")' >> makedep.lisp @ echo '(build-depsys (quote ($(patsubst %, "%", ${DEP}))) "${AXIOM}")' >> makedep.lisp - @ echo '(unless (probe-file "parse.$(FASLEXT)") (|compileLispFile| "parse.clisp" "parse.$(FASLEXT)"))' >> makedep.lisp @ echo '(in-package "AxiomCore")' >> makedep.lisp @ echo '(|importModule| "newaux")' >> makedep.lisp - @ echo '(load "parse")' >> makedep.lisp + @ echo '(|importModule| "parse")' >> makedep.lisp @ echo '(|importModule| "metalex")' >> makedep.lisp @ echo '(|importModule| "parsing")' >> makedep.lisp @ echo '(|importModule| "fnewmeta")' >> makedep.lisp @@ -406,8 +405,7 @@ ${DEPSYS}: vmlisp.$(FASLEXT) \ ../lisp/base-lisp$(EXEEXT) -- --make --output=$@ \ --load-directory=. makedep.lisp @rm $(addsuffix .$(FASLEXT), \ - parse clam slam g-error \ - g-boot c-util g-util) + clam slam g-error g-boot c-util g-util) @ echo 4 ${DEPSYS} created @@ -588,10 +586,6 @@ ax.clisp: ax.boot @ echo 463 making $@ $< @ echo '(progn (old-boot::boot "ax.boot"))' | ${DEPSYS} -bc-matrix.clisp: bc-matrix.boot - @ echo 424 making $@ from $< - @ echo '(progn (old-boot::boot "bc-matrix.boot"))' | ${DEPSYS} - bc-misc.clisp: bc-misc.boot @ echo 428 making $@ from $< @ echo '(progn (old-boot::boot "bc-misc.boot"))' | ${DEPSYS} @@ -600,10 +594,6 @@ bc-solve.clisp: bc-solve.boot @ echo 432 making $@ from $< @ echo '(progn (old-boot::boot "bc-solve.boot"))' | ${DEPSYS} -bc-util.clisp: bc-util.boot - @ echo 436 making $@ from $< - @ echo '(progn (old-boot::boot "bc-util.boot"))' | ${DEPSYS} - br-con.clisp: br-con.boot @ echo 467 making $@ from $< @ echo '(progn (old-boot::boot "br-con.boot"))' | ${DEPSYS} @@ -620,13 +610,6 @@ br-op2.clisp: br-op2.boot @ echo 479 making $@ from $< @ echo '(progn (old-boot::boot "br-op2.boot"))' | ${DEPSYS} -br-prof.clisp: br-prof.boot - @ echo 499 making $@ from $< - @ ($(axiom_build_document) --tangle --output=br-prof.boot $< ;\ - echo '(progn (old-boot::boot "br-prof.boot"))' | ${DEPSYS}; \ - rm br-prof.boot ) - - br-saturn.clisp: br-saturn.boot @ echo 491 making $@ from $< @ echo '(progn (old-boot::boot "br-saturn.boot"))' | ${DEPSYS} diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet index d540e5b1..c10dc169 100644 --- a/src/interp/Makefile.pamphlet +++ b/src/interp/Makefile.pamphlet @@ -1695,14 +1695,6 @@ as.clisp: as.boot @ echo '(progn (old-boot::boot "as.boot"))' | ${DEPSYS} @ -\subsection{bc-matrix.boot} - -<<bc-matrix.clisp>>= -bc-matrix.clisp: bc-matrix.boot - @ echo 424 making $@ from $< - @ echo '(progn (old-boot::boot "bc-matrix.boot"))' | ${DEPSYS} -@ - \subsection{bc-misc.boot} <<bc-misc.clisp>>= @@ -1719,14 +1711,6 @@ bc-solve.clisp: bc-solve.boot @ echo '(progn (old-boot::boot "bc-solve.boot"))' | ${DEPSYS} @ -\subsection{bc-util.boot} - -<<bc-util.clisp>>= -bc-util.clisp: bc-util.boot - @ echo 436 making $@ from $< - @ echo '(progn (old-boot::boot "bc-util.boot"))' | ${DEPSYS} -@ - \subsection{ht-util.boot} <<ht-util.clisp>>= @@ -1831,17 +1815,6 @@ br-saturn.clisp: br-saturn.boot @ echo '(progn (old-boot::boot "br-saturn.boot"))' | ${DEPSYS} @ -\subsection{br-prof.boot} - -<<br-prof.clisp>>= -br-prof.clisp: br-prof.boot - @ echo 499 making $@ from $< - @ ($(axiom_build_document) --tangle --output=br-prof.boot $< ;\ - echo '(progn (old-boot::boot "br-prof.boot"))' | ${DEPSYS}; \ - rm br-prof.boot ) - -@ - \section{The databases} \begin{verbatim} @@ -2077,14 +2050,10 @@ boot-pkg.$(FASLEXT): boot-pkg.lisp <<ax.clisp>> -<<bc-matrix.clisp>> - <<bc-misc.clisp>> <<bc-solve.clisp>> -<<bc-util.clisp>> - <<br-con.clisp>> <<br-data.clisp>> @@ -2093,8 +2062,6 @@ boot-pkg.$(FASLEXT): boot-pkg.lisp <<br-op2.clisp>> -<<br-prof.clisp>> - <<br-saturn.clisp>> <<br-search.clisp>> diff --git a/src/interp/bc-matrix.boot.pamphlet b/src/interp/bc-matrix.boot.pamphlet index 008722a6..f19d2948 100644 --- a/src/interp/bc-matrix.boot.pamphlet +++ b/src/interp/bc-matrix.boot.pamphlet @@ -46,6 +46,8 @@ <<*>>= <<license>> +)package "BOOT" + -- Basic Command matrix entry bcMatrix() == bcReadMatrix nil @@ -154,8 +156,8 @@ bcMatrixGen htPage == mat := htpProperty(htPage,'matrix) formula := LASSOC('formula,mat) => formula := formula.0 - rowVar := LASSOC('rowVar,mat).0 - colVar := LASSOC('colVar,mat).0 + rowVar := (LASSOC('rowVar,mat)).0 + colVar := (LASSOC('colVar,mat)).0 STRCONC('"matrix([[",formula,'" for ",colVar,'" in 1..", STRINGIMAGE ncols,'"] for ",rowVar,'" in 1..",STRINGIMAGE nrows,'"])") mat := htpProperty(htPage,'matrix) => diff --git a/src/interp/bc-util.boot.pamphlet b/src/interp/bc-util.boot.pamphlet index 56287145..af732000 100644 --- a/src/interp/bc-util.boot.pamphlet +++ b/src/interp/bc-util.boot.pamphlet @@ -46,6 +46,8 @@ <<*>>= <<license>> +)package "BOOT" + bcFinish(name,arg,:args) == bcGen bcMkFunction(name,arg,args) bcMkFunction(name,arg,args) == diff --git a/src/interp/br-prof.boot.pamphlet b/src/interp/br-prof.boot.pamphlet index cf1d0e58..cc83fd57 100644 --- a/src/interp/br-prof.boot.pamphlet +++ b/src/interp/br-prof.boot.pamphlet @@ -47,6 +47,8 @@ <<*>>= <<license>> +)package "BOOT" + --====================> WAS b-prof.boot <================================ --============================================================================ @@ -68,10 +70,10 @@ kciPage(htPage,junk) == kciReduceOpAlist(opAlist,infoAlist) == --count opAlist - res := [pair for [op,:items] in opAlist | pair] where pair == + res := [pair for [op,:items] in opAlist | pair] where pair() == u := LASSOC(op,infoAlist) => y := [x for x in items - | x is [sig,:.] and or/[sig = sig1 for [sig1,:.] in u]] => [op,:y] + | x is [sig,:.] and "or"/[sig = sig1 for [sig1,:.] in u]] => [op,:y] nil nil res @@ -140,7 +142,7 @@ dbShowInfoOp(htPage,op,sig,alist) == htSay '"\menuitemstyle{} {\em calls to} " if con ^= 'Rep then htSay '"{\em argument} " htSay con - if and/[fn is ['origin,orig,.] and + if "and"/[fn is ['origin,orig,.] and (null origin and (origin := orig) or origin = orig) for fn in fns] then htSay '" {\em of type} " bcConform orig @@ -259,7 +261,7 @@ hasNewInfoAlist conname == (u := getInfoAlist conname) and hasNewInfoText u hasNewInfoText u == - and/[ATOM op and and/[item is [sig,:alist] and + and/[ATOM op and "and"/[item is [sig,:alist] and null sig or null atom sig and null atom alist for item in items] for [op,:items] in u] getInfoAlist conname == |