diff options
author | dos-reis <gdr@axiomatics.org> | 2007-11-06 00:27:15 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2007-11-06 00:27:15 +0000 |
commit | 51282a7ef3256b61db639aad48fb86af43c562bc (patch) | |
tree | 4f1ba9b7a6e4b7a6783d8af6142dc9d77348a4c1 | |
parent | a1bd87ef5ca3bbdff6b4d5e27e61bafb68b79087 (diff) | |
download | open-axiom-51282a7ef3256b61db639aad48fb86af43c562bc.tar.gz |
remove more pamphlets
-rw-r--r-- | src/interp/c-doc.boot (renamed from src/interp/c-doc.boot.pamphlet) | 28 | ||||
-rw-r--r-- | src/interp/compiler.boot (renamed from src/interp/compiler.boot.pamphlet) | 92 |
2 files changed, 18 insertions, 102 deletions
diff --git a/src/interp/c-doc.boot.pamphlet b/src/interp/c-doc.boot index 415d53cc..7cc35056 100644 --- a/src/interp/c-doc.boot.pamphlet +++ b/src/interp/c-doc.boot @@ -1,22 +1,7 @@ -\documentclass{article} -\usepackage{axiom} - -\title{\File{src/interp/c-doc.boot} Pamphlet} -\author{The Axiom Team} - -\begin{document} -\maketitle -\begin{abstract} -\end{abstract} -\eject -\tableofcontents -\eject - -\section{License} - -<<license>>= -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. -- All rights reserved. +-- Copyright (C) 2007, Gabriel Dos Reis. +-- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without -- modification, are permitted provided that the following conditions are @@ -46,9 +31,6 @@ -- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -@ -<<*>>= -<<license>> import '"c-util" )package "BOOT" @@ -1321,9 +1303,3 @@ checkDecorateForHt u == u := rest u u -@ -\eject -\begin{thebibliography}{99} -\bibitem{1} nothing -\end{thebibliography} -\end{document} diff --git a/src/interp/compiler.boot.pamphlet b/src/interp/compiler.boot index e93b69c6..c420dfe2 100644 --- a/src/interp/compiler.boot.pamphlet +++ b/src/interp/compiler.boot @@ -1,71 +1,7 @@ -\documentclass{article} -\usepackage{axiom} - -\title{\File{src/interp/compiler.boot} Pamphlet} -\author{The Axiom Team} - -\begin{document} -\maketitle -\begin{abstract} -\end{abstract} -\eject -\tableofcontents -\eject - -\section{Bug fixes} - -The compMacro function does macro expansion during spad file compiles. -If a macro occurs twice in the same file the macro expands infinitely -causing a stack overflow. The reason for the infinite recursion is that -the left hand side of the macro definition is expanded. Thus defining -a macro: -\begin{verbatim} -name ==> 1 -\end{verbatim} -will expand properly the first time. The second time it turns into: -\begin{verbatim} -1 ==> 1 -\end{verbatim} -The original code read: -\begin{verbatim} -compMacro(form,m,e) == - $macroIfTrue: local:= true - ["MDEF",lhs,signature,specialCases,rhs]:= form - rhs := - rhs is ['CATEGORY,:.] => ['"-- the constructor category"] - rhs is ['Join,:.] => ['"-- the constructor category"] - rhs is ['CAPSULE,:.] => ['"-- the constructor capsule"] - rhs is ['add,:.] => ['"-- the constructor capsule"] - formatUnabbreviated rhs - sayBrightly ['" processing macro definition",'%b, - :formatUnabbreviated lhs,'" ==> ",:rhs,'%d] - ["MDEF",lhs,signature,specialCases,rhs]:= form:= macroExpand(form,e) - m=$EmptyMode or m=$NoValueMode => - ["/throwAway",$NoValueMode,put(first lhs,"macro",rhs,e)] - -\end{verbatim} -Juergen Weiss proposed the following fixed code. This does not expand -the left hand side of the macro. -<<compMacro>>= -compMacro(form,m,e) == - $macroIfTrue: local:= true - ["MDEF",lhs,signature,specialCases,rhs]:= form - prhs := - rhs is ['CATEGORY,:.] => ['"-- the constructor category"] - rhs is ['Join,:.] => ['"-- the constructor category"] - rhs is ['CAPSULE,:.] => ['"-- the constructor capsule"] - rhs is ['add,:.] => ['"-- the constructor capsule"] - formatUnabbreviated rhs - sayBrightly ['" processing macro definition",'%b, - :formatUnabbreviated lhs,'" ==> ",:prhs,'%d] - m=$EmptyMode or m=$NoValueMode => - ["/throwAway",$NoValueMode,put(first lhs,"macro",macroExpand(rhs,e),e)] - -@ -\section{License} -<<license>>= -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. -- All rights reserved. +-- Copyright (C) 2007, Gabriel Dos Reis. +-- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without -- modification, are permitted provided that the following conditions are @@ -95,9 +31,6 @@ compMacro(form,m,e) == -- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -@ -<<*>>= -<<license>> import '"c-util" import '"pathname" @@ -771,7 +704,20 @@ compVector(l,m is ["Vector",mUnder],e) == [["VECTOR",:[T.expr for T in Tl]],m,e] --% MACROS -<<compMacro>> +compMacro(form,m,e) == + $macroIfTrue: local:= true + ["MDEF",lhs,signature,specialCases,rhs]:= form + prhs := + rhs is ['CATEGORY,:.] => ['"-- the constructor category"] + rhs is ['Join,:.] => ['"-- the constructor category"] + rhs is ['CAPSULE,:.] => ['"-- the constructor capsule"] + rhs is ['add,:.] => ['"-- the constructor capsule"] + formatUnabbreviated rhs + sayBrightly ['" processing macro definition",'%b, + :formatUnabbreviated lhs,'" ==> ",:prhs,'%d] + m=$EmptyMode or m=$NoValueMode => + ["/throwAway",$NoValueMode,put(first lhs,"macro",macroExpand(rhs,e),e)] + --% SEQ compSeq(["SEQ",:l],m,e) == compSeq1(l,[m,:$exitModeStack],e) @@ -1456,9 +1402,3 @@ compilerDoitWithScreenedLisplib(constructor, fun) == SEQ(UNEMBED 'RWRITE)) -@ -\eject -\begin{thebibliography}{99} -\bibitem{1} nothing -\end{thebibliography} -\end{document} |