diff options
author | dos-reis <gdr@axiomatics.org> | 2008-08-09 22:51:35 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2008-08-09 22:51:35 +0000 |
commit | 1687da9f3f891156c71b320f944e5c0fbaf1cbd0 (patch) | |
tree | a073231126a8058766142b5e1b15267e3ddb3c7b /src/interp/pf2sex.boot | |
parent | f176a2f516055a0a211e6dd1d05c836dd913692e (diff) | |
download | open-axiom-1687da9f3f891156c71b320f944e5c0fbaf1cbd0.tar.gz |
* interp/pf2sex.boot (pf2Sex1): Handle more ASTs.
(pfType2SexOrNil): New.
(pfDoc2SexOrNil): Likewise.
(pfWith2Sex): Likewise.
(pfAdd2Sex): Likewise.
(pfWDeclare2Sex): Likewise.
(pfAttribute2Sex): Likewise.
(pfWIf2Sex): Likewise.
(pfExport2Sex): Likewise.
(pfInline2Sex): Likewise.
(pfImport2Sex): Likewise.
(pfQualType2Sex): Likewise.
* interp/ptrees.boot (pf0InlineItems): New.
* interp/i-spec2.boot (up%Import): New.
(sorry): Likewise.
(up%Export): Likewise.
(up%Inline): Likewise.
(up%With): Likewise.
(up%Add): Likewise.
* interp/i-intern.boot (mkAtree3): Handle %Inline, %With, %Add,
and %Export.
* interp/i-spec1.boot ($specialOps): Adjust.
* doc/msgs/s2-us.msgs (S2IP0006): New.
Diffstat (limited to 'src/interp/pf2sex.boot')
-rw-r--r-- | src/interp/pf2sex.boot | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/interp/pf2sex.boot b/src/interp/pf2sex.boot index 77c04c83..9da4d3b4 100644 --- a/src/interp/pf2sex.boot +++ b/src/interp/pf2sex.boot @@ -495,19 +495,25 @@ pfMLambda2Sex pf == pfType2SexOrNil pf == - pfNohting? pf => nil + pfNothing? pf => nil + pf2Sex1 pf + +pfDoc2SexOrNil pf == + pfNothing? pf => nil pf2Sex1 pf pfWith2Sex pf == - ["%With", pf2Sex1 pfWithBase, pf2Sex1 pfWithWithin pf, - pf2Sex1 pf2Sex1 pfWithWithon pf] + ["%With", pfType2SexOrNil pfWithBase pf, + [pf2Sex1 s for s in pf0WithWithin pf], + pfType2SexOrNil pfWithWithon pf] pfAdd2Sex pf == ["%Add", pf2Sex1 pfAddBase pf, pf2Sex1 pfAddAddin pf, pfType2SexOrNil pfAddAddon pf] pfWDeclare2Sex pf == - ["%Declare", pf2Sex1 pfWDeclareSignature pf, pf2Sex1 pfWDeclareDoc pf] + ["%Signature", rest pf2Sex1 pfWDeclareSignature pf, + pfDoc2SexOrNil pfWDeclareDoc pf] pfAttribute2Sex pf == ["%Attribute", pf2Sex1 pfAttributeExpr pf] @@ -523,9 +529,8 @@ pfImport2Sex pf == ["%Import", :[pf2Sex1 item for item in pf0ImportItems pf]] pfInline2Sex pf == - ["%Inline", :[pf2Sex1 item for item in pfInlineItems pf]] + ["%Inline", :[pf2Sex1 item for item in pf0InlineItems pf]] pfQualType2Sex pf == - ["%QualType", pf2Sex1 pfQyalTypeType pf, - pfType2SexOrNil pfQualTypeQual pf] - + -- pfQualTypeQual is always nothing. + pf2Sex1 pfQualTypeType pf |