diff options
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/interp/define.boot | 8 | ||||
| -rw-r--r-- | src/interp/wi1.boot | 4 | ||||
| -rw-r--r-- | src/interp/wi2.boot | 4 |
4 files changed, 15 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e1be1190..0623b60e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,12 @@ 2008-08-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/define.boot (compDefineCategory2): Use rwriteLispForm. + (compDefineFunctor1): Likewise. + * interp/wi1.boot (compDefineCategory2): Likewise. + (compDefineFunctor1): Likewise. + +2008-08-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + * lisp/core.lisp.in (|%basicSystemIsComplete|): New. Export. (|link|): Use prologue for all systems. * interp/sys-driver.boot (systemMain): New. Break from restart(). diff --git a/src/interp/define.boot b/src/interp/define.boot index bc04b487..f7ee6d58 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -336,11 +336,11 @@ compDefineCategory2(form,signature,specialCases,body,m,e, pairlis:= [[a,:v] for a in argl for v in $FormalMapVariableList] parSignature:= SUBLIS(pairlis,signature') parForm:= SUBLIS(pairlis,form) - lisplibWrite('"compilerInfo", + rwriteLispForm('"compilerInfo", removeZeroOne ['SETQ,'$CategoryFrame, ['put,['QUOTE,op'],' (QUOTE isCategory),true,['addModemap,MKQ op',MKQ parForm, - MKQ parSignature,true,MKQ fun,'$CategoryFrame]]],$libFile) + MKQ parSignature,true,MKQ fun,'$CategoryFrame]]]) --Equivalent to the following two lines, we hope if null sargl then evalAndRwriteLispForm('NILADIC, @@ -571,14 +571,14 @@ compDefineFunctor1(df is ['DEF,form,signature,$functorSpecialCases,body], $lisplibSlot1 := $NRTslot1Info --NIL or set by $NRTmakeSlot1 $lisplibOperationAlist:= operationAlist $lisplibMissingFunctions:= $CheckVectorList - lisplibWrite('"compilerInfo", + rwriteLispForm('"compilerInfo", removeZeroOne ['SETQ,'$CategoryFrame, ['put,['QUOTE,op'],' (QUOTE isFunctor), ['QUOTE,operationAlist],['addModemap,['QUOTE,op'],[' QUOTE,parForm],['QUOTE,parSignature],true,['QUOTE,op'], ['put,['QUOTE,op' ],'(QUOTE mode), - ['QUOTE,['Mapping,:parSignature]],'$CategoryFrame]]]], $libFile) + ['QUOTE,['Mapping,:parSignature]],'$CategoryFrame]]]]) if null argl then evalAndRwriteLispForm('NILADIC, ['MAKEPROP, ['QUOTE,op'], ['QUOTE,'NILADIC], true]) diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot index b76c2ba9..846e7183 100644 --- a/src/interp/wi1.boot +++ b/src/interp/wi1.boot @@ -1232,11 +1232,11 @@ compDefineCategory2(form,signature,specialCases,body,m,e, pairlis:= [[a,:v] for a in argl for v in $FormalMapVariableList] parSignature:= SUBLIS(pairlis,signature') parForm:= SUBLIS(pairlis,form) ----- lisplibWrite('"compilerInfo", +---- rwriteLispForm('"compilerInfo", ---- ['SETQ,'$CategoryFrame, ---- ['put,['QUOTE,op'],' ---- (QUOTE isCategory),true,['addModemap,MKQ op',MKQ parForm, ----- MKQ parSignature,true,MKQ fun,'$CategoryFrame]]],$libFile) +---- MKQ parSignature,true,MKQ fun,'$CategoryFrame]]]) --Equivalent to the following two lines, we hope if null sargl then evalAndRwriteLispForm('NILADIC, diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot index 633912ce..67b5e115 100644 --- a/src/interp/wi2.boot +++ b/src/interp/wi2.boot @@ -225,14 +225,14 @@ compDefineFunctor1(df, m,$e,$prefix,$formalArgList) == $lisplibSlot1 := $NRTslot1Info --NIL or set by $NRTmakeSlot1 $lisplibOperationAlist:= operationAlist $lisplibMissingFunctions:= $CheckVectorList - lisplibWrite('"compilerInfo", + rwriteLispForm('"compilerInfo", ['SETQ,'$CategoryFrame, ['put,['QUOTE,op'],' (QUOTE isFunctor), ['QUOTE,operationAlist],['addModemap,['QUOTE,op'],[' QUOTE,parForm],['QUOTE,parSignature],true,['QUOTE,op'], ['put,['QUOTE,op' ],'(QUOTE mode), - ['QUOTE,['Mapping,:parSignature]],'$CategoryFrame]]]], $libFile) + ['QUOTE,['Mapping,:parSignature]],'$CategoryFrame]]]]) if null argl then evalAndRwriteLispForm('NILADIC, ['MAKEPROP, ['QUOTE,op'], ['QUOTE,'NILADIC], true]) |