This patch removes src/interp/metameta.lisp.pamphlet which is
no longer used. It assumes the following previously posted
patches have been applied:
20070721.01.tpd.patch
20070721.02.tpd.patch
20070722.01.tpd.patch
===========================================================================
diff --git a/changelog b/changelog
index 962132e..7cbe49b 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,65 @@
+20070810 tpd src/interp/metameta.lisp removed (unused)
+20070810 tpd src/interp/ccl-depsys.lsp remove metameta
+20070810 tpd src/interp/parsing.lisp remove metameta
+20070810 tpd src/interp/Makefile remove metameta
+20070810 tpd src/interp/debugsys.lisp remove metameta.lisp load
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-REPEATOR
+20070810 tpd src/interp/metameta.lisp unused PARSE-REPEATOR
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-OPT_EXPR
+20070810 tpd src/interp/metameta.lisp unused PARSE-OPT_EXPR
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-LOCAL_VAR
+20070810 tpd src/interp/metameta.lisp unused PARSE-LOCAL_VAR
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-DEST_REF
+20070810 tpd src/interp/metameta.lisp unused PARSE-DEST_REF
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-NON_DEST_REF
+20070810 tpd src/interp/metameta.lisp unused PARSE-NON_DEST_REF
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-SEXPR_STRING
+20070810 tpd src/interp/metameta.lisp unused PARSE-SEXPR_STRING
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-CONS_SEXPR
+20070810 tpd src/interp/metameta.lisp unused PARSE-CONS_SEXPR
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-REF_SEXPR
+20070810 tpd src/interp/metameta.lisp unused PARSE-REF_SEXPR
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-SEXPR
+20070810 tpd src/interp/metameta.lisp unused PARSE-SEXPR
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-TEST
+20070810 tpd src/interp/metameta.lisp unused PARSE-TEST
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-N_TEST
+20070810 tpd src/interp/metameta.lisp unused PARSE-N_TEST
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-REP_TEST
+20070810 tpd src/interp/metameta.lisp unused PARSE-REP_TEST
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-FIL_TEST
+20070810 tpd src/interp/metameta.lisp unused PARSE-FIL_TEST
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-SUBEXPR
+20070810 tpd src/interp/metameta.lisp unused PARSE-SUBEXPR
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-EXPR2
+20070810 tpd src/interp/metameta.lisp unused PARSE-EXPR2
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-EXPR1
+20070810 tpd src/interp/metameta.lisp unused PARSE-EXPR1
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-EXPR
+20070810 tpd src/interp/metameta.lisp unused PARSE-EXPR
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-FID
+20070810 tpd src/interp/metameta.lisp unused PARSE-FID
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-RULE1
+20070810 tpd src/interp/metameta.lisp unused PARSE-RULE1
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-RULE
+20070810 tpd src/interp/metameta.lisp unused PARSE-RULE
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-HEADER
+20070810 tpd src/interp/metameta.lisp unused PARSE-HEADER
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::PARSE-PROGRAM
+20070810 tpd src/interp/metameta.lisp unused parse-program
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::IN-META
+20070810 tpd src/interp/metalex.lisp.pamphlet unused in-meta function
+20070810 tpd src/interp/metalex.lisp.pamphlet unused meta function
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::NEWRULE
+20070810 tpd src/interp/metalex.lisp unused newrule
+20070810 tpd src/interp/spad.lisp unused TRAPFLAG
+20070810 tpd src/interp/debug.lisp unused TRAPFLAG
+20070810 tpd src/interp/debug.lisp unused (MAKEPROP 'META '/TRAN '/TRANSMETA)
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::/TRANSMETA
+20070810 tpd src/interp/spad.lisp unused /transmeta
+20070810 tpd src/interp/parsing.lisp unused transpgvar
+20070810 tpd src/interp/sys-pkg.lisp unused BOOT::TRANSPGVAR
+20070810 tpd src/interp/interp-proclaims.lisp unused BOOT::TRANSPGVAR
20070722 tpd src/interp/Makefile cleanup latex warnings
20070721 wxh src/interp/spad.lisp make evalSharpOne declare arg specials
20070721 tpd src/interp/setq.lisp update contributor name list
diff --git a/src/boot/ccl-depsys.lsp.pamphlet b/src/boot/ccl-depsys.lsp.pamphlet
index e6a94f8..b0e91fc 100644
--- a/src/boot/ccl-depsys.lsp.pamphlet
+++ b/src/boot/ccl-depsys.lsp.pamphlet
@@ -63,7 +63,6 @@
(load "def.lisp")
(load "fnewmeta.lisp")
(load "metalex.lisp")
-(load "metameta.lisp")
(load "postprop.lisp")
(load "preparse.lisp")
diff --git a/src/doc/axiom.bib.pamphlet b/src/doc/axiom.bib.pamphlet
index 4bb27e4..97204c7 100644
--- a/src/doc/axiom.bib.pamphlet
+++ b/src/doc/axiom.bib.pamphlet
@@ -671,13 +671,6 @@ pamphlet and booklet files.
}
@
-\subsection{metameta.lisp}
-<<metameta.lisp>>=
[EMAIL PROTECTED],
- path=./src/interp/metameta.lisp.pamphlet
-}
-
-@
\subsection{modemap.boot}
<<modemap.boot>>=
@MISC{modemap.boot,
@@ -13873,13 +13866,6 @@ pamphlet and booklet files.
}
@
-\subsection{metameta.lisp}
-<<metameta.lisp>>=
[EMAIL PROTECTED],
- path=./new/src/interp/metameta.lisp.pamphlet
-}
-
-@
\subsection{modemap.boot}
<<modemap.boot>>=
@MISC{modemap.boot,
@@ -20850,7 +20836,6 @@ pamphlet and booklet files.
<<macros.lisp>>
<<metalex.lisp>>
<<mark.boot>>
-<<metameta.lisp>>
<<modemap.boot>>
<<monitor.lisp>>
<<nci.lisp>>
@@ -22736,7 +22721,6 @@ pamphlet and booklet files.
<<mark.boot>>
<<match.boot>>
<<metalex.lisp>>
-<<metameta.lisp>>
<<modemap.boot>>
<<monitor.lisp>>
<<msg.boot>>
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index 23ec4cc..3fa2d97 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -244,7 +244,6 @@ generations of ``old'' and all meaning of the term is lost.
OPOBJS= ${AUTO}/parsing.${O} ${AUTO}/bootlex.${O} \
${AUTO}/def.${O} \
${AUTO}/fnewmeta.${O} ${AUTO}/metalex.${O} \
- ${AUTO}/metameta.${O} \
${AUTO}/parse.${O} ${AUTO}/postpar.${O} \
${AUTO}/postprop.${LISP} ${AUTO}/preparse.${O}
@@ -460,7 +459,7 @@ DOCFILES=${DOC}/alql.boot.dvi \
${DOC}/lisplib.boot.dvi ${DOC}/macex.boot.dvi \
${DOC}/macros.lisp.dvi ${DOC}/Makefile.dvi \
${DOC}/mark.boot.dvi ${DOC}/match.boot.dvi \
- ${DOC}/metalex.lisp.dvi ${DOC}/metameta.lisp.dvi \
+ ${DOC}/metalex.lisp.dvi \
${DOC}/modemap.boot.dvi ${DOC}/monitor.lisp.dvi \
${DOC}/msg.boot.dvi ${DOC}/msgdb.boot.dvi \
${DOC}/nag-c02.boot.dvi ${DOC}/nag-c05.boot.dvi \
@@ -755,7 +754,7 @@ ${DEPSYS}: ${DEP} ${OUT}/sys-pkg.${LISP}
${OUT}/nocompil.${LISP} \
${OUT}/bootlex.${LISP} ${OUT}/newaux.${LISP} \
${OUT}/preparse.${LISP} \
${OUT}/postprop.${LISP} ${OUT}/def.${LISP} \
- ${OUT}/metameta.${LISP} ${OUT}/fnewmeta.${LISP} \
+ ${OUT}/fnewmeta.${LISP} \
${OUT}/g-boot.${LISP} ${OUT}/c-util.${LISP} \
${OUT}/g-util.${LISP} \
${OUT}/clam.${LISP} \
@@ -806,10 +805,6 @@ ${DEPSYS}: ${DEP} ${OUT}/sys-pkg.${LISP}
${OUT}/nocompil.${LISP} \
'(compile-file "${OUT}/def.${LISP}"' \
':output-file "${OUT}/def.${O}"))' >> ${OUT}/makedep.lisp
@ echo '(load "${OUT}/def")' >> ${OUT}/makedep.lisp
- @ echo '(unless (probe-file "${OUT}/metameta.${O}")' \
- '(compile-file "${OUT}/metameta.${LISP}"' \
- ':output-file "${OUT}/metameta.${O}"))' >> ${OUT}/makedep.lisp
- @ echo '(load "${OUT}/metameta")' >> ${OUT}/makedep.lisp
@ echo '(unless (probe-file "${OUT}/fnewmeta.${O}")' \
'(compile-file "${OUT}/fnewmeta.${LISP}"' \
':output-file "${OUT}/fnewmeta.${O}"))' >> ${OUT}/makedep.lisp
@@ -1603,53 +1598,6 @@ ${DOC}/metalex.lisp.dvi: ${IN}/metalex.lisp.pamphlet
@
-\subsection{metameta.lisp \cite{23}}
-<<metameta.o (AUTO from OUT)>>=
-${AUTO}/metameta.${O}: ${OUT}/metameta.${O}
- @ echo 71 making ${AUTO}/metameta.${O} from ${OUT}/metameta.${O}
- @ cp ${OUT}/metameta.${O} ${AUTO}
-
-@
-<<metameta.o (OUT from MID)>>=
-${OUT}/metameta.${O}: ${MID}/metameta.lisp
- @ echo 72 making ${OUT}/metameta.${O} from ${MID}/metameta.lisp
- @ ( cd ${MID} ; \
- if [ -z "${NOISE}" ] ; then \
- echo '(progn (compile-file "${MID}/metameta.lisp"' \
- ':output-file "${OUT}/metameta.${O}") (${BYE}))' | ${DEPSYS} ; \
- else \
- echo '(progn (compile-file "${MID}/metameta.lisp"' \
- ':output-file "${OUT}/metameta.${O}") (${BYE}))' | ${DEPSYS} \
- >${TMP}/trace ; \
- fi )
-
-@
-<<metameta.lisp (OUT from MID)>>=
-${OUT}/metameta.${LISP}: ${MID}/metameta.lisp
- @ echo 73 making ${OUT}/metameta.${LISP} from ${MID}/metameta.lisp
- @ rm -f ${OUT}/metameta.${O}
- @ cp ${MID}/metameta.lisp ${OUT}/metameta.${LISP}
-
-@
-<<metameta.lisp (MID from IN)>>=
-${MID}/metameta.lisp: ${IN}/metameta.lisp.pamphlet
- @ echo 74 making ${MID}/metameta.lisp from ${IN}/metameta.lisp.pamphlet
- @ ( cd ${MID} ; \
- ${TANGLE} ${IN}/metameta.lisp.pamphlet >metameta.lisp )
-
-@
-<<metameta.lisp.dvi (DOC from IN)>>=
-${DOC}/metameta.lisp.dvi: ${IN}/metameta.lisp.pamphlet
- @echo 75 making ${DOC}/metameta.lisp.dvi from
${IN}/metameta.lisp.pamphlet
- @(cd ${DOC} ; \
- cp ${IN}/metameta.lisp.pamphlet ${DOC} ; \
- ${DOCUMENT} ${NOISE} metameta.lisp ; \
- rm -f ${DOC}/metameta.lisp.pamphlet ; \
- rm -f ${DOC}/metameta.lisp.tex ; \
- rm -f ${DOC}/metameta.lisp )
-
-@
-
\subsection{monitor.lisp \cite{24}}
<<monitor.o (OUT from MID)>>=
${OUT}/monitor.${O}: ${MID}/monitor.lisp
@@ -9019,12 +8967,6 @@ clean:
<<metalex.lisp (MID from IN)>>
<<metalex.lisp.dvi (DOC from IN)>>
-<<metameta.o (AUTO from OUT)>>
-<<metameta.o (OUT from MID)>>
-<<metameta.lisp (OUT from MID)>>
-<<metameta.lisp (MID from IN)>>
-<<metameta.lisp.dvi (DOC from IN)>>
-
<<modemap.o (AUTO from OUT)>>
<<modemap.o (OUT from MID)>>
<<modemap.clisp (MID from IN)>>
@@ -9406,7 +9348,6 @@ pp
\bibitem{20} {\bf \$SPAD/src/interp/hash.lisp.pamphlet}
\bibitem{21} {\bf \$SPAD/src/interp/macros.lisp.pamphlet}
\bibitem{22} {\bf \$SPAD/src/interp/metalex.lisp.pamphlet}
-\bibitem{23} {\bf \$SPAD/src/interp/metameta.lisp.pamphlet}
\bibitem{24} {\bf \$SPAD/src/interp/monitor.lisp.pamphlet}
\bibitem{25} {\bf \$SPAD/src/interp/newaux.lisp.pamphlet}
\bibitem{26} {\bf \$SPAD/src/interp/nlib.lisp.pamphlet}
diff --git a/src/interp/debug.lisp.pamphlet b/src/interp/debug.lisp.pamphlet
index 9a9e613..f1a4e08 100644
--- a/src/interp/debug.lisp.pamphlet
+++ b/src/interp/debug.lisp.pamphlet
@@ -125,7 +125,6 @@ exit (rds ifile)
(MAKEPROP 'BOOT '/XCAPE '#\_)
(MAKEPROP 'SPAD '/XCAPE '#\_)
(MAKEPROP 'META '/READFUN 'META\,RULE)
-(MAKEPROP 'META '/TRAN '/TRANSMETA)
(MAKEPROP 'INPUT '/READFUN '|New,LEXPR,Interactive|)
(MAKEPROP 'INPUT '/TRAN '/TRANSPAD)
(MAKEPROP 'BOOT '/READFUN '|New,LEXPR1|)
@@ -189,13 +188,13 @@ exit (rds ifile)
ISID NBLNK COMMENTCHR $TOKSTACK (/SOURCEFILES |$sourceFiles|)
METAKEYLST DEFINITION_NAME (|$sourceFileTypes| '(|spad| |boot| |lisp|
|lsp| |meta|))
($FUNCTION FN) $BOOT $NEWSPAD $LINESTACK $LINENUMBER STACK STACKX BACK
OK
- TRAPFLAG |$InteractiveMode| TOK COUNT ERRCOL COLUMN *QUERY CHR LINE
+ |$InteractiveMode| TOK COUNT ERRCOL COLUMN *QUERY CHR LINE
(*COMP370-APPLY* (if (eq op 'define) #'eval-defun #'compile-defun)))
(declare (special ECHOMETA SINGLINEMODE XCAPE XTOKENREADER INPUTSTREAM
SPADERRORSTREAM ISID NBLNK COMMENTCHR $TOKSTACK
/SOURCEFILES
METAKEYLST DEFINITION_NAME |$sourceFileTypes|
$FUNCTION $BOOT $NEWSPAD $LINESTACK $LINENUMBER STACK
STACKX BACK OK
- TRAPFLAG |$InteractiveMode| TOK COUNT ERRCOL COLUMN *QUERY
CHR LINE))
+ |$InteractiveMode| TOK COUNT ERRCOL COLUMN *QUERY CHR
LINE))
(if (PAIRP FN) (SETQ FN (QCAR FN)))
(SETQ INFILE (OR INFILE (|getFunctionSourceFile| FN)))
;; $FUNCTION is freely set in getFunctionSourceFile
@@ -297,7 +296,6 @@ exit (rds ifile)
;(SETQ ERRCOL 0)
;(SETQ COUNT 0)
;(SETQ COLUMN 0)
- ;(SETQ TRAPFLAG NIL)
(SETQ OK 'T)
;(NXTTOK)
;(SETQ LINE (CURINPUTLINE))
diff --git a/src/interp/debugsys.lisp.pamphlet
b/src/interp/debugsys.lisp.pamphlet
index 7f4fa95..1674e8f 100644
--- a/src/interp/debugsys.lisp.pamphlet
+++ b/src/interp/debugsys.lisp.pamphlet
@@ -195,7 +195,6 @@ loaded by hand we need to establish a value.
(thesymb "/int/interp/def.lisp")
(thesymb "/int/interp/fnewmeta.lisp")
(thesymb "/int/interp/metalex.lisp")
- (thesymb "/int/interp/metameta.lisp")
(thesymb "/int/interp/parsing.lisp")
(thesymb "/int/interp/parse.clisp")
(thesymb "/int/interp/postpar.clisp")
diff --git a/src/interp/interp-proclaims.lisp b/src/interp/interp-proclaims.lisp
index 7d9c8ad..016d485 100644
--- a/src/interp/interp-proclaims.lisp
+++ b/src/interp/interp-proclaims.lisp
@@ -699,8 +699,6 @@
BOOT::|d03faf| BOOT::|d03eef| BOOT::|d03edf|
BOOT::|htSystemVariables| BOOT::|htSetVars|
BOOT::|mkSetTitle| BOOT::|npCategory|
- BOOT::PARSE-CONS_SEXPR BOOT::PARSE-SEXPR
- BOOT::PARSE-REF_SEXPR BOOT::PARSE-EXPR2 BOOT::PARSE-EXPR1
BOOT::|htsv| BOOT::|npDefinitionItem| BOOT::|npDefn|
BOOT::|npMacro| BOOT::|npMDEFinition| BOOT::|npRule|
BOOT::RESETHASHTABLES BOOT::READSPADEXPR
@@ -731,8 +729,8 @@
BOOT::|f02axf| BOOT::|f02awf| BOOT::|f02akf| BOOT::|f02ajf|
BOOT::|f02agf| BOOT::|htShowPageNoScroll| BOOT::|f02aff|
BOOT::|f02aef| BOOT::|f02adf| BOOT::|f02abf| BOOT::|f02aaf|
- BOOT::|measure| BOOT::|writeSaturnSuffix| BOOT::NEWRULE
- BOOT::PARSE-LOCAL_VAR BOOT::|htErrorStar|
+ BOOT::|measure| BOOT::|writeSaturnSuffix|
+ BOOT::|htErrorStar|
BOOT::|queryClients| BOOT::|onDisk| BOOT::|endHTPage|
BOOT::|readSpadProfileIfThere| BOOT::|bcDraw3Dpar1|
BOOT::|bcDraw3Dpar| BOOT::|htShowPageStarSaturn|
@@ -842,17 +840,16 @@
BOOT::|npSCategory| BOOT::|npPrimary| BOOT::|npState|
BOOT::|npDefaultValue| BOOT::|npAssignVariableName|
BOOT::|npPDefinition| BOOT::|npDollar|
- BOOT::|npSQualTypelist| BOOT::PARSE-NON_DEST_REF
- BOOT::PARSE-OPT_EXPR BOOT::PARSE-REPEATOR
- BOOT::|npCategoryL| BOOT::PARSE-SEXPR_STRING
- BOOT::|npProduct| BOOT::PARSE-TEST BOOT::|npIterators|
- BOOT::PARSE-EXPR BOOT::|npWhile|
- BOOT::|displayPreCompilationErrors| BOOT::PARSE-N_TEST
- BOOT::|npForIn| BOOT::PARSE-REP_TEST BOOT::|npGives|
- BOOT::PARSE-FIL_TEST BOOT::|npLogical| BOOT::PARSE-SUBEXPR
- BOOT::|npExpress| BOOT::PARSE-FID BOOT::PARSE-RULE
- BOOT::|npExpress1| BOOT::PARSE-HEADER
- BOOT::|npCommaBackSet| BOOT::PARSE-RULE1 BOOT::|npQualType|
+ BOOT::|npSQualTypelist|
+ BOOT::|npCategoryL|
+ BOOT::|npProduct| BOOT::|npIterators|
+ BOOT::|npWhile|
+ BOOT::|displayPreCompilationErrors|
+ BOOT::|npForIn| BOOT::|npGives|
+ BOOT::|npLogical|
+ BOOT::|npExpress|
+ BOOT::|npExpress1|
+ BOOT::|npCommaBackSet| BOOT::|npQualType|
VMLISP:$TOTAL-GC-TIME BOOT::|npADD|
BOOT::|npConditionalStatement|
BOOT::|npQualifiedDefinition| BOOT::|npPushId|
@@ -934,10 +931,10 @@
BOOT::|menuButton| BOOT::|htSaturnBreak| BOOT::|random|
BOOT::|dbConsExposureMessage| BOOT::|mkSigPredVectors|
BOOT::FIRST-ERROR BOOT::|writeSaturnPrefix| BOOT::|on|
- BOOT::|offDisk| BOOT::|htBigSkip| BOOT::PARSE-PROGRAM
- BOOT::IN-META BOOT::|traceReply| BOOT::|?t|
+ BOOT::|offDisk| BOOT::|htBigSkip|
+ BOOT::|traceReply| BOOT::|?t|
BOOT::SKIP-BLANKS BOOT::|pspacers| BOOT::NEXT-LINES-SHOW
- BOOT::|resetCounters| BOOT::PARSE-DEST_REF
+ BOOT::|resetCounters|
BOOT::SPAD_SHORT_ERROR BOOT::|pcounters|
BOOT::SPAD_LONG_ERROR BOOT::INIT-BOOT/SPAD-READER
BOOT::NEXT-LINES-CLEAR BOOT::|resetTimers|
@@ -1675,7 +1672,7 @@
BOOT::DECIMAL-LENGTH BOOT::|unabbrevAndLoad| BOOT::READLISP
BOOT::|abbQuery| BOOT::SPAD-EVAL BOOT::/TRANSNBOOT
BOOT::SPAD-MDTR-2 BOOT::SPAD-MDTR-1 BOOT::/TRANSPAD
- BOOT::|setAutoLoadProperty| BOOT::/TRANSMETA
+ BOOT::|setAutoLoadProperty|
BOOT::|getConstructorUnabbreviation| BOOT::|getLisplibName|
BOOT::OPTIMIZE&PRINT
BOOT::|getPartialConstructorModemapSig| BOOT::UNCONS
@@ -2550,7 +2547,7 @@
BOOT:|initializeSetVariables| BOOT::|inclmsgSay|
BOOT::|inclmsgConStill| BOOT::|incStringStream|
BOOT::|inclmsgConActive| BOOT:NUMOFNODES FOAM::TYPE2INIT
- BOOT:TRANSPGVAR FOAM::FOAM-FUNCTION-INFO BOOT::|GetValue|
+ FOAM::FOAM-FUNCTION-INFO BOOT::|GetValue|
BOOT::|hasToInfo| FOAM::INSERT-TYPES BOOT::|formatPred|
BOOT::|chaseInferences,foo| BOOT::|liftCond|
FOAM::FOAMPROGINFOSTRUCT-P BOOT::|formatInfo|
diff --git a/src/interp/metalex.lisp.pamphlet b/src/interp/metalex.lisp.pamphlet
index 00f1b76..5778b44 100644
--- a/src/interp/metalex.lisp.pamphlet
+++ b/src/interp/metalex.lisp.pamphlet
@@ -58,38 +58,6 @@
(in-package "BOOT")
-; *** 1. META file handling
-
-(defun in-meta ()
- (setq XTokenReader 'get-META-token)
- (setq Line-Handler 'next-META-line)
- (setq Meta_Error_Handler 'meta-meta-error-handler)
- (setq $BOOT nil))
-
-(defun newrule ()
- (in-meta)
- (setq meta_prefix "PARSE-")
- (test Rule1)
- (eval (pop-stack-1))
- (ioclear)
- (in-boot))
-
-(defun meta (&optional (*meta-input-file* "/spad/meta.meta")
- (*meta-output-file* nil))
- (ioclear)
- (in-meta)
- (with-open-stream
- (in-stream (open *meta-input-file* :direction :input))
- (with-open-stream
- (out-stream (if *meta-output-file*
- (open *meta-output-file* :direction :output)
- *terminal-io*))
- (format out-stream
- "~&;;; -*- Mode:Lisp; Package:Boot -*-~%~%")
- (parse-program)
- (IOClear in-stream out-stream)))
- T)
-
; *** 2. META Line Handling
(defun next-META-line (&optional (in-stream t))
@@ -319,6 +287,26 @@ special character be the atom whose print name is the
character itself."
(incf $num_of_meta_errors)
(setq Meta_Errors_Occurred t)))
nil)
+
+; (trace skip-blanks)
+; (trace get-special-token)
+; (trace token-lookahead-type)
+; (trace make-adjustable-string)
+; (trace print-package)
+; (trace get-number-token)
+
+(trace next-META-line)
+(trace kill-comments)
+(trace kill-trailing-blanks)
+(trace get-META-token)
+(trace get-identifier-token)
+(trace get-string-token)
+(trace get-bstring-token)
+(trace make-defun)
+(trace print-fluids)
+(trace set-prefix)
+(trace print-rule)
+(trace meta-meta-error-handler)
@
\eject
\begin{thebibliography}{99}
diff --git a/src/interp/metameta.lisp.pamphlet
b/src/interp/metameta.lisp.pamphlet
deleted file mode 100644
index 47070f8..0000000
--- a/src/interp/metameta.lisp.pamphlet
+++ /dev/null
@@ -1,384 +0,0 @@
-\documentclass{article}
-\usepackage{axiom}
-\begin{document}
-\title{\$SPAD/src/interp metameta.lisp}
-\author{Timothy Daly}
-\maketitle
-\begin{abstract}
-\end{abstract}
-\eject
-\tableofcontents
-\eject
-\section{License}
-<<license>>=
-;; Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd.
-;; All rights reserved.
-;;
-;; Redistribution and use in source and binary forms, with or without
-;; modification, are permitted provided that the following conditions are
-;; met:
-;;
-;; - Redistributions of source code must retain the above copyright
-;; notice, this list of conditions and the following disclaimer.
-;;
-;; - Redistributions in binary form must reproduce the above copyright
-;; notice, this list of conditions and the following disclaimer in
-;; the documentation and/or other materials provided with the
-;; distribution.
-;;
-;; - Neither the name of The Numerical ALgorithms Group Ltd. nor the
-;; names of its contributors may be used to endorse or promote products
-;; derived from this software without specific prior written permission.
-;;
-;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-;; IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-;; TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-;; PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-;; OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-;; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-;; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-;; PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-;; LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-;; NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-;; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-@
-<<*>>=
-<<license>>
-
-; .META(META PROGRAM)
-; .PREFIX 'PARSE-'
-; .PACKAGE 'PARSING'
-; .DECLARE(METAPGVAR METAVARLST METAKEYLST METARULNAM TRAPFLAG)
-
-(IN-PACKAGE "BOOT")
-
-(DEFPARAMETER METAPGVAR NIL)
-(DEFPARAMETER METAVARLST NIL)
-(DEFPARAMETER METAKEYLST NIL)
-(DEFPARAMETER METARULNAM NIL)
-(DEFPARAMETER TRAPFLAG NIL)
-
-; PROGRAM:<HEADER*>! <RULE*>! ='.FIN' ;
-
-(DEFUN PARSE-PROGRAM NIL
- (AND (BANG |FIL_TEST| (OPTIONAL (STAR REPEATOR (PARSE-HEADER))))
- (BANG |FIL_TEST| (OPTIONAL (STAR REPEATOR (PARSE-RULE))))
- (MATCH-STRING ".FIN")))
-
-; HEADER: '.META' '(' IDENTIFIER IDENTIFIER <IDENTIFIER>! ')' .(SETQ
XNAME ##3)
-; / '.DECLARE' '(' IDENTIFIER* ')' .(PRINT-FLUIDS #1)
-; / '.PREFIX' STRING .(SET-PREFIX #1)
-; / '.PACKAGE' STRING .(PRINT-PACKAGE #1) ;
-
-(DEFUN PARSE-HEADER NIL
- (OR (AND (MATCH-ADVANCE-STRING ".META")
- (MUST (MATCH-ADVANCE-STRING "("))
- (MUST (PARSE-IDENTIFIER))
- (MUST (PARSE-IDENTIFIER))
- (BANG |FIL_TEST| (OPTIONAL (PARSE-IDENTIFIER)))
- (MUST (MATCH-ADVANCE-STRING ")"))
- (ACTION (SETQ XNAME (NTH-STACK 3))))
- (AND (MATCH-ADVANCE-STRING ".DECLARE")
- (MUST (MATCH-ADVANCE-STRING "("))
- (MUST (STAR REPEATOR (PARSE-IDENTIFIER)))
- (MUST (MATCH-ADVANCE-STRING ")"))
- (ACTION (PRINT-FLUIDS (POP-STACK-1))))
- (AND (MATCH-ADVANCE-STRING ".PREFIX")
- (MUST (PARSE-STRING))
- (ACTION (SET-PREFIX (POP-STACK-1))))
- (AND (MATCH-ADVANCE-STRING ".PACKAGE")
- (MUST (PARSE-STRING))
- (ACTION (PRINT-PACKAGE (POP-STACK-1))))))
-
-; RULE: RULE1 ';' .(PRINT-RULE #1) / ^='.FIN' .(META-SYNTAX-ERROR) ;
-
-(DEFUN PARSE-RULE NIL
- (OR (AND (PARSE-RULE1)
- (MUST (MATCH-ADVANCE-STRING ";"))
- (ACTION (PRINT-RULE (POP-STACK-1))))
- (AND (NOT (MATCH-STRING ".FIN"))
- (ACTION (META-SYNTAX-ERROR)))))
-
-; RULE1: IDENTIFIER .(SETQ METARULNAM (INTERN (STRCONC META_PREFIX ##1)))
-; <'{' FID* '}'>! ':' EXPR =';'
-; < =$METAPGVAR +(PROG =(TRANSPGVAR METAPGVAR) (RETURN #1))
-; .(SETQ METAPGVAR NIL) >
-; +=(MAKE-DEFUN #3 #2 #1) ;
-
-(DEFUN PARSE-RULE1 NIL
- (AND (PARSE-IDENTIFIER)
- (ACTION (SETQ METARULNAM (INTERN (STRCONC |META_PREFIX| (NTH-STACK
1)))))
- (BANG |FIL_TEST|
- (OPTIONAL (AND (MATCH-ADVANCE-STRING "{")
- (MUST (STAR REPEATOR (PARSE-FID)))
- (MUST (MATCH-ADVANCE-STRING "}")))))
- (MUST (MATCH-ADVANCE-STRING ":"))
- (MUST (PARSE-EXPR))
- (MUST (MATCH-STRING ";"))
- (OPTIONAL (AND METAPGVAR
- (PUSH-REDUCTION 'PARSE-RULE1
- (CONS 'PROG
- (CONS (TRANSPGVAR METAPGVAR)
- (CONS (CONS
- 'RETURN
- (CONS (POP-STACK-1)
NIL))
- NIL))))
- (ACTION (SETQ METAPGVAR NIL))))
- (PUSH-REDUCTION 'PARSE-RULE1
- (MAKE-DEFUN (POP-STACK-3) (POP-STACK-2)
(POP-STACK-1)))))
-
-; FID: IDENTIFIER +#1 ;
-
-(DEFUN PARSE-FID NIL
- (AND (PARSE-IDENTIFIER)
- (PUSH-REDUCTION 'PARSE-FID (POP-STACK-1))))
-
-; EXPR: SUBEXPR
-; < EXPR1* +(OR #2 -#1)
-; / EXPR2* +(OR #2 -#1) > ;
-
-(DEFUN PARSE-EXPR NIL
- (AND (PARSE-SUBEXPR)
- (OPTIONAL (OR (AND (STAR REPEATOR (PARSE-EXPR1))
- (PUSH-REDUCTION 'PARSE-EXPR
- (CONS 'OR
- (CONS (POP-STACK-2)
- (APPEND (POP-STACK-1)
NIL)))))
- (AND (STAR REPEATOR (PARSE-EXPR2))
- (PUSH-REDUCTION 'PARSE-EXPR
- (CONS 'OR
- (CONS (POP-STACK-2)
- (APPEND (POP-STACK-1)
NIL)))))))))
-
-; EXPR1: '/' <^'/'> SUBEXPR ;
-
-(DEFUN PARSE-EXPR1 NIL
- (AND (MATCH-ADVANCE-STRING "/")
- (OPTIONAL (NOT (MATCH-ADVANCE-STRING "/")))
- (MUST (PARSE-SUBEXPR))))
-
-; EXPR2: '\\' <^'\\'> SUBEXPR ;
-
-(DEFUN PARSE-EXPR2 NIL
- (AND (MATCH-ADVANCE-STRING "\\")
- (OPTIONAL (NOT (MATCH-ADVANCE-STRING "\\")))
- (MUST (PARSE-SUBEXPR))))
-
-; SUBEXPR:FIL_TEST <^?$TRAPFLAG FIL_TEST>*!
-; <FIL_TEST <?$TRAPFLAG +(MUST #1)> >*!
-; +(#3 -#2 -#1) +=(MAKE-PARSE-FUNCTION #1 "AND) ;
-
-(DEFUN PARSE-SUBEXPR NIL
- (AND (PARSE-FIL_TEST)
- (BANG |FIL_TEST|
- (OPTIONAL (STAR |OPT_EXPR|
- (AND (NOT TRAPFLAG)
- (PARSE-FIL_TEST)))))
- (BANG |FIL_TEST|
- (OPTIONAL (STAR |OPT_EXPR|
- (AND (PARSE-FIL_TEST)
- (OPTIONAL (AND TRAPFLAG
- (PUSH-REDUCTION 'PARSE-SUBEXPR
- (CONS
- 'MUST
- (CONS
(POP-STACK-1) NIL))))))
- )))
- (PUSH-REDUCTION 'PARSE-SUBEXPR
- (CONS (POP-STACK-3)
- (APPEND (POP-STACK-2) (APPEND (POP-STACK-1)
NIL))))
- (PUSH-REDUCTION 'PARSE-SUBEXPR (MAKE-PARSE-FUNCTION (POP-STACK-1)
'AND))))
-
-; FIL_TEST: REP_TEST <'!' +(BANG FIL_TEST #1)> ;
-
-(DEFUN PARSE-FIL_TEST NIL
- (AND (PARSE-REP_TEST)
- (OPTIONAL (AND (MATCH-ADVANCE-STRING "!")
- (PUSH-REDUCTION 'PARSE-FIL_TEST
- (CONS 'BANG
- (CONS '|FIL_TEST| (CONS
(POP-STACK-1) NIL))))))))
-
-; REP_TEST: N_TEST <REPEATOR> ;
-
-(DEFUN PARSE-REP_TEST NIL
- (AND (PARSE-N_TEST)
- (OPTIONAL (PARSE-REPEATOR))))
-
-; N_TEST: '^' TEST +(NOT #1) / TEST ;
-
-(DEFUN PARSE-N_TEST NIL
- (OR (AND (MATCH-ADVANCE-STRING "^")
- (MUST (PARSE-TEST))
- (PUSH-REDUCTION 'PARSE-N_TEST (CONS 'NOT (CONS (POP-STACK-1) NIL))))
- (PARSE-TEST)))
-
-; TEST: IDENTIFIER ( '{' <SEXPR*>! '}'
-; +(=(INTERN (STRCONC META_PREFIX #2)) -#1)
-; / +(=(INTERN (STRCONC META_PREFIX #1)))) .(SETQ TRAPFLAG T)
-; / STRING +(MATCH-ADVANCE-STRING #1) .(SETQ TRAPFLAG T)
-; / '=' REF_SEXPR .(SETQ TRAPFLAG T)
-; / '?' REF_SEXPR .(SETQ TRAPFLAG NIL)
-; / '.' SEXPR +(ACTION #1) .(SETQ TRAPFLAG NIL)
-; / '+' CONS_SEXPR +(PUSH-REDUCTION =(LIST "QUOTE METARULNAM) #1)
-; .(SETQ TRAPFLAG NIL)
-; / '(' EXPR ')' .(SETQ TRAPFLAG T)
-; / '<' EXPR '>' .(PARSE-OPT_EXPR) .(SETQ TRAPFLAG NIL) ;
-
-(DEFUN PARSE-TEST NIL
- (OR (AND (PARSE-IDENTIFIER)
- (MUST (OR (AND (MATCH-ADVANCE-STRING "{")
- (BANG |FIL_TEST| (OPTIONAL (STAR REPEATOR
(PARSE-SEXPR))))
- (MUST (MATCH-ADVANCE-STRING "}"))
- (PUSH-REDUCTION 'PARSE-TEST
- (CONS (INTERN (STRCONC
- |META_PREFIX|
- (POP-STACK-2)))
- (APPEND (POP-STACK-1) NIL))))
- (PUSH-REDUCTION 'PARSE-TEST
- (CONS (INTERN (STRCONC |META_PREFIX|
(POP-STACK-1)))
- NIL))))
- (ACTION (SETQ TRAPFLAG T)))
- (AND (PARSE-STRING)
- (PUSH-REDUCTION 'PARSE-TEST
- (CONS 'MATCH-ADVANCE-STRING (CONS (POP-STACK-1)
NIL)))
- (ACTION (SETQ TRAPFLAG T)))
- (AND (MATCH-ADVANCE-STRING "=")
- (MUST (PARSE-REF_SEXPR))
- (ACTION (SETQ TRAPFLAG T)))
- (AND (MATCH-ADVANCE-STRING "?")
- (MUST (PARSE-REF_SEXPR))
- (ACTION (SETQ TRAPFLAG NIL)))
- (AND (MATCH-ADVANCE-STRING ".")
- (MUST (PARSE-SEXPR))
- (PUSH-REDUCTION 'PARSE-TEST (CONS 'ACTION (CONS (POP-STACK-1) NIL)))
- (ACTION (SETQ TRAPFLAG NIL)))
- (AND (MATCH-ADVANCE-STRING "+")
- (MUST (PARSE-CONS_SEXPR))
- (PUSH-REDUCTION 'PARSE-TEST
- (CONS 'PUSH-REDUCTION
- (CONS (LIST 'QUOTE METARULNAM) (CONS
(POP-STACK-1) NIL))))
- (ACTION (SETQ TRAPFLAG NIL)))
- (AND (MATCH-ADVANCE-STRING "(")
- (MUST (PARSE-EXPR))
- (MUST (MATCH-ADVANCE-STRING ")"))
- (ACTION (SETQ TRAPFLAG T)))
- (AND (MATCH-ADVANCE-STRING "<")
- (MUST (PARSE-EXPR))
- (MUST (MATCH-ADVANCE-STRING ">"))
- (ACTION (PARSE-OPT_EXPR))
- (ACTION (SETQ TRAPFLAG NIL)))))
-
-; SEXPR: IDENTIFIER / NUMBER / STRING / NON_DEST_REF / DEST_REF /
LOCAL_VAR
-; / '"' SEXPR +(QUOTE #1) / '=' SEXPR / '(' <SEXPR*>! ')' ;
-
-(DEFUN PARSE-SEXPR NIL
- (OR (PARSE-IDENTIFIER)
- (PARSE-NUMBER)
- (PARSE-STRING)
- (PARSE-NON_DEST_REF)
- (PARSE-DEST_REF)
- (PARSE-LOCAL_VAR)
- (AND (MATCH-ADVANCE-STRING "\"")
- (MUST (PARSE-SEXPR))
- (PUSH-REDUCTION 'PARSE-SEXPR (CONS 'QUOTE (CONS (POP-STACK-1)
NIL))))
- (AND (MATCH-ADVANCE-STRING "=")
- (MUST (PARSE-SEXPR)))
- (AND (MATCH-ADVANCE-STRING "(")
- (BANG |FIL_TEST| (OPTIONAL (STAR REPEATOR (PARSE-SEXPR))))
- (MUST (MATCH-ADVANCE-STRING ")")))))
-
-; REF_SEXPR: STRING +(MATCH-STRING #1) / SEXPR ;
-
-(DEFUN PARSE-REF_SEXPR NIL
- (OR (AND (PARSE-STRING)
- (PUSH-REDUCTION 'PARSE-REF_SEXPR (CONS 'MATCH-STRING (CONS
(POP-STACK-1) NIL))))
- (PARSE-SEXPR)))
-
-; CONS_SEXPR: IDENTIFIER <^=(MEMBER ##1 METAPGVAR) +(QUOTE #1)>
-; / LOCAL_VAR +(QUOTE #1)
-; / '(' <SEXPR_STRING>! ')'
-; / SEXPR ;
-
-(DEFUN PARSE-CONS_SEXPR NIL
- (OR (AND (PARSE-IDENTIFIER)
- (OPTIONAL (AND (NOT (MEMBER (NTH-STACK 1) METAPGVAR))
- (PUSH-REDUCTION 'PARSE-CONS_SEXPR
- (CONS 'QUOTE (CONS (POP-STACK-1)
NIL))))))
- (AND (PARSE-LOCAL_VAR)
- (PUSH-REDUCTION 'PARSE-CONS_SEXPR (CONS 'QUOTE (CONS (POP-STACK-1)
NIL))))
- (AND (MATCH-ADVANCE-STRING "(")
- (BANG |FIL_TEST| (OPTIONAL (PARSE-SEXPR_STRING)))
- (MUST (MATCH-ADVANCE-STRING ")")))
- (PARSE-SEXPR)))
-
-; SEXPR_STRING: CONS_SEXPR <SEXPR_STRING>! +(CONS #2 #1)
-; / '-' CONS_SEXPR <SEXPR_STRING>! +(APPEND #2 #1) ;
-
-(DEFUN PARSE-SEXPR_STRING NIL
- (OR (AND (PARSE-CONS_SEXPR)
- (BANG |FIL_TEST| (OPTIONAL (PARSE-SEXPR_STRING)))
- (PUSH-REDUCTION 'PARSE-SEXPR_STRING
- (CONS 'CONS (CONS (POP-STACK-2) (CONS (POP-STACK-1)
NIL)))))
- (AND (MATCH-ADVANCE-STRING "-")
- (MUST (PARSE-CONS_SEXPR))
- (BANG |FIL_TEST| (OPTIONAL (PARSE-SEXPR_STRING)))
- (PUSH-REDUCTION 'PARSE-SEXPR_STRING
- (CONS 'APPEND (CONS (POP-STACK-2) (CONS
(POP-STACK-1) NIL)))))))
-
-; NON_DEST_REF: '##' NUMBER +(NTH-STACK #1) ;
-
-(DEFUN PARSE-NON_DEST_REF NIL
- (AND (MATCH-ADVANCE-STRING "##")
- (MUST (PARSE-NUMBER))
- (PUSH-REDUCTION 'PARSE-NON_DEST_REF (CONS 'NTH-STACK (CONS
(POP-STACK-1) NIL)))))
-
-; DEST_REF: '#' NUMBER +=(LIST (INTERN (STRCONC 'POP-STACK-' (STRINGIMAGE
#1)))) ;
-
-(DEFUN PARSE-DEST_REF NIL
- (AND (MATCH-ADVANCE-STRING "#")
- (MUST (PARSE-NUMBER))
- (PUSH-REDUCTION 'PARSE-DEST_REF
- (LIST (INTERN (STRCONC "POP-STACK-" (STRINGIMAGE
(POP-STACK-1))))))))
-
-; LOCAL_VAR: '$' ( IDENTIFIER / NUMBER +=(GETGENSYM #1) .(PUSH ##1
METAPGVAR)) ;
-
-(DEFUN PARSE-LOCAL_VAR NIL
- (AND (MATCH-ADVANCE-STRING "$")
- (MUST (OR (PARSE-IDENTIFIER)
- (AND (PARSE-NUMBER)
- (PUSH-REDUCTION 'PARSE-LOCAL_VAR (GETGENSYM
(POP-STACK-1)))
- (ACTION (PUSH (NTH-STACK 1) METAPGVAR)))))))
-
-; OPT_EXPR: <'*' +(STAR OPT_EXPR #1) / REPEATOR> +(OPTIONAL #1) ;
-
-(DEFUN PARSE-OPT_EXPR NIL
- (AND (OPTIONAL (OR (AND (MATCH-ADVANCE-STRING "*")
- (PUSH-REDUCTION 'PARSE-OPT_EXPR
- (CONS 'STAR
- (CONS '|OPT_EXPR|
- (CONS (POP-STACK-1)
NIL)))))
- (PARSE-REPEATOR)))
- (PUSH-REDUCTION 'PARSE-OPT_EXPR (CONS 'OPTIONAL (CONS (POP-STACK-1)
NIL)))))
-
-; REPEATOR: ('*' / BSTRING +(AND (MATCH-ADVANCE-STRING #1) (MUST ##1)))
-; +(STAR REPEATOR #1) ;
-
-(DEFUN PARSE-REPEATOR NIL
- (AND (OR (MATCH-ADVANCE-STRING "*")
- (AND (PARSE-BSTRING)
- (PUSH-REDUCTION 'PARSE-REPEATOR
- (CONS 'AND
- (CONS (CONS 'MATCH-ADVANCE-STRING
- (CONS (POP-STACK-1) NIL))
- (CONS (CONS 'MUST (CONS (NTH-STACK
1) NIL))
- NIL))))))
- (PUSH-REDUCTION 'PARSE-REPEATOR
- (CONS 'STAR (CONS 'REPEATOR (CONS (POP-STACK-1)
NIL))))))
-
-; .FIN ;
-@
-\eject
-\begin{thebibliography}{99}
-\bibitem{1} nothing
-\end{thebibliography}
-\end{document}
diff --git a/src/interp/parsing.lisp.pamphlet b/src/interp/parsing.lisp.pamphlet
index cce7470..8dbb420 100644
--- a/src/interp/parsing.lisp.pamphlet
+++ b/src/interp/parsing.lisp.pamphlet
@@ -53,10 +53,6 @@
; in META/LISP, R.D. Jenks, Tech Report, IBM T.J. Watson Research
Center,
; 1969. Familiarity with this document is assumed.
;
-; The parser generator itself is described in either the file
-; MetaBoot.lisp (hand-coded version) or the file MetaMeta.lisp
(machine
-; generated from self-descriptive Meta code), both of which load
themselves
-; into package Parsing.
; CONTENTS:
;
@@ -85,8 +81,6 @@
; 5. Routines for inspecting and resetting total I/O system state
;
; METALEX.LISP: Meta file handling, auxiliary parsing actions and
tokenizing
-; METAMETA.LISP: Meta parsing
-;
; BOOTLEX.LISP: Boot file handling, auxiliary parsing actions and
tokenizing
; NEWMETA.LISP: Boot parsing
@@ -875,8 +869,6 @@ Symbolics read-line returns embedded newlines in a c-m-Y.")
(defparameter /genvarlst nil "??")
-(defun transpgvar (metapgvar) (remove-duplicates metapgvar))
-
(defparameter /gensymlist nil "List of rule local variables generated by
getgensym.")
(defun getgensym (n)
diff --git a/src/interp/spad.lisp.pamphlet b/src/interp/spad.lisp.pamphlet
index c39b435..cfc828f 100644
--- a/src/interp/spad.lisp.pamphlet
+++ b/src/interp/spad.lisp.pamphlet
@@ -169,15 +169,6 @@
(DEFUN /TRANSNBOOT (X) (S-PROCESS X) NIL)
-(DEFUN /TRANSMETA (X)
- (PROG (KEYNAM ROOTFN U)
- (SETQ ROOTFN (/MFINDROOT (CAR /SOURCEFILES)))
- (SETQ $LASTPREFIX (GET ROOTFN 'METAPFX))
- (SETQ KEYNAM (INTERNL $LASTPREFIX (PNAME ROOTFN) "KEY"))
- (SET KEYNAM (REMDUP (APPEND METAKEYLST (EVAL KEYNAM))))
- (SETQ U (GETRULEFUNLISTS ROOTFN (LIST X)))
- (SUBLISNQ (PAIR (CADR U) (CAR U)) X)))
-
;; NIL needed below since END\_UNIT is not generated by current parser
(defun |isTokenDelimiter| () (MEMBER (CURRENT-SYMBOL) '(\) END\_UNIT NIL)))
@@ -486,7 +477,7 @@ special.
(let (ZZ str N RLGENSYMFG RLGENSYMLST |NewFLAG| XCAPE *PROMPT*
SINGLELINEMODE OK ISID NBLNK COUNT CHR ULCASEFG ($LINESTACK
'BEGIN_UNIT)
$NEWLINSTACK $TOKSTACK COMMENTCHR TOK LINE BACK INPUTSTREAM XTRANS
- XTOKENREADER STACK STACKX TRAPFLAG)
+ XTOKENREADER STACK STACKX)
(SETQ XTRANS '|boot-New|
XTOKENREADER 'NewSYSTOK
SYNTAX_ERROR 'SPAD_SYNTAX_ERROR)
@@ -563,7 +554,7 @@ special.
(NewFLAG T) (XTRANS '|boot-New|) (XCAPE '!)
(COMMENTCHR 'NOTHING) (XTOKENREADER 'NewSYSTOK)
($NBOOT T) (ERRCOL 0) (COUNT 0) (COLUMN 0)
- (TRAPFLAG NIL) (OK T) (SPADERRORSTREAM CUROUTSTREAM)
+ (OK T) (SPADERRORSTREAM CUROUTSTREAM)
($LINESTACK 'BEGIN_UNIT)
(INPUTSTREAM LINESET)
(CHR 'ENDOFLINECHR))
diff --git a/src/interp/sys-pkg.lisp.pamphlet b/src/interp/sys-pkg.lisp.pamphlet
index 850237d..eaa76b7 100644
--- a/src/interp/sys-pkg.lisp.pamphlet
+++ b/src/interp/sys-pkg.lisp.pamphlet
@@ -174,7 +174,7 @@ provides support for compiler code.
BOOT::$FILELINENUMBER BOOT::|$timerTicksPerSecond|
BOOT::|bootUnionPrint| BOOT::|$consistencyCheck|
BOOT::|$oldTime| BOOT::$NEWSPAD BOOT::NUMOFNODES
- BOOT::|$ResMode| BOOT::S* BOOT::TRANSPGVAR BOOT::$BOXSTRING
+ BOOT::|$ResMode| BOOT::S* BOOT::$BOXSTRING
BOOT::|$BasicPredicates| BOOT::|$eltIfNil| BOOT::$FUNNAME_TAIL
BOOT::|$QuickCode| BOOT::GENVAR BOOT::|$TypeEqui|
BOOT::TOKEN-TYPE BOOT::|updateSourceFiles| BOOT::|$BFtag|
_______________________________________________
Axiom-developer mailing list
Axiom-developer@nongnu.org
http://lists.nongnu.org/mailman/listinfo/axiom-developer
