diff options
author | dos-reis <gdr@axiomatics.org> | 2009-05-05 15:08:14 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2009-05-05 15:08:14 +0000 |
commit | ac2f74a3dc5293da393f513a8677513043e1e1d7 (patch) | |
tree | 9fecc0dea8096f064ed108904e6e615ebfe615df /src/interp/br-saturn.boot | |
parent | 68f86316038d1b98eca653f0e4cd97d44455b290 (diff) | |
download | open-axiom-ac2f74a3dc5293da393f513a8677513043e1e1d7.tar.gz |
Fix SF/2785271
* interp/sys-constants.boot ($Primitives): Remove.
* interp/br-con.boot (conOpPage1): Replace $Primitives by
$DomainNames.
(dbShowConsDoc1): Likewise.
* interp/buildom.boot ($nonLisplibDomains): Likewise.
* interp/br-op2.boot (kFormatSlotDomain): isConstructorName.
* interp/br-saturn.boot (bfConform1): Handle string literals as
constructor arguments.
Diffstat (limited to 'src/interp/br-saturn.boot')
-rw-r--r-- | src/interp/br-saturn.boot | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot index 3880cebc..272fb6e6 100644 --- a/src/interp/br-saturn.boot +++ b/src/interp/br-saturn.boot @@ -1245,7 +1245,7 @@ displayDomainOp(htPage,which,origin,op,sig,predicate, $conargs : local := rest conform if which = '"operation" then $signature : local := - MEMQ(conname,$Primitives) => nil + MEMQ(conname,$DomainNames) => nil CDAR getConstructorModemapFromDB conname --RDJ: this next line is necessary until compiler bug is fixed --that forgets to substitute #variables for t#variables; @@ -1629,14 +1629,18 @@ bcConform1 form == main where hd form hd form == atom form => - not MEMQ(form,$Primitives) and null constructor? form => - s := STRINGIMAGE form + -- string literals, e.g. "failed", are constructor arguments + -- too, until we fix that. + STRINGP form or not isConstructorName form => + s := + STRINGP form => strconc("_"",form,"_"") + STRINGIMAGE form (s.0 = char '_#) => (n := POSN1(form, $FormalFunctionParameterList)) => htSay form2HtString ($FormalMapVariableList . n) htSay '"\" htSay form - htSay escapeSpecialChars STRINGIMAGE form + htSay escapeSpecialChars s s := STRINGIMAGE form $italicHead? => htSayItalics s $bcMultipleNames => |