diff options
| author | dos-reis <gdr@axiomatics.org> | 2007-11-30 04:38:26 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2007-11-30 04:38:26 +0000 |
| commit | 7ae1eacf142cdd20dd70f77b3ba5f2b91e0ad6d1 (patch) | |
| tree | e53254631243bb7b370f85fd75ab2949fa19e269 /src/interp/compiler.boot | |
| parent | 299569280385c1347ef4ad93dd31f201fe78af85 (diff) | |
| download | open-axiom-7ae1eacf142cdd20dd70f77b3ba5f2b91e0ad6d1.tar.gz | |
* Makefile.pamphlet (INOBJS): Lose varini.$(FASLEXT).
(varini.$(FASLEXT)): Remove rule.
* compiler.boot (compileSpad2Cmd): Don't set $ncConverse; it is
unused. Don't set $newcomMode and $newComp.
(compTopLevel): There is no function newComp. So simplify.
* cattable.boot (updateCategoryTable): Remove test for $newcompMode.
* database.boot (updateDatabase): Likewise.
* int-top.boot (SpadInterpretStream): Don't set $newcompMode.
($ncmParse): Move from varini.boot.
($ncmMacro): Likewise.
* bookvol5.pamphlet: Remove reference to $newcompMode.
* define.boot (compDefineCapsuleFunction): Simplify.
* msg.boot: Move diagnostic related variables from varini.boot to here.
* posit.boot ($nopos): Move from varini.boot to here.
* setq.lisp ($newcompMode): Don't set here
($newComp): Likewise.
($LINELENGTH): Likewise.
* spad.lisp ($newComp): Likewise.
($LINELENGTH): Likewise.
* varinit.boot: Remove.
Diffstat (limited to 'src/interp/compiler.boot')
| -rw-r--r-- | src/interp/compiler.boot | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index f5bcab8f..572a0b85 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -53,12 +53,10 @@ compTopLevel(x,m,e) == $compTimeSum: local := 0 $resolveTimeSum: local := 0 $packagesUsed: local := [] - -- The next line allows the new compiler to be tested interactively. - compFun := if $newCompAtTopLevel=true then 'newComp else 'compOrCroak x is ["DEF",:.] or x is ["where",["DEF",:.],:.] => - ([val,mode,.]:= FUNCALL(compFun,x,m,e); [val,mode,e]) + ([val,mode,.]:= compOrCroak(x,m,e); [val,mode,e]) --keep old environment after top level function defs - FUNCALL(compFun,x,m,e) + compOrCroak(x,m,e) compUniquely(x,m,e) == $compUniquelyIfTrue: local:= true @@ -1303,13 +1301,6 @@ compileSpad2Cmd args == translate _ ) - -- next three are for the OLD NEW compiler - -- should be unhooked - - $newcompMode : local := nil - $ncConverse : local := nil - $newComp : local := nil - translateOldToNew := nil $scanIfTrue : local := nil |