diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-09-25 20:48:45 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-09-25 20:48:45 +0000 |
| commit | 489cfd14dccfcaf7b0ebd41e9d0f8e081a9d1d9f (patch) | |
| tree | 84a87ab3bdba58fe9fd2975efc829d1ed10b8781 /src/interp/ht-util.boot | |
| parent | 7704713134cb251be6129f38833930228e09eee2 (diff) | |
| download | open-axiom-489cfd14dccfcaf7b0ebd41e9d0f8e081a9d1d9f.tar.gz | |
* boot/ast.boot (bfMember): Improve a bit.
* boot/tokens.boot: Don't rename 'is' and 'inst'.
* boot/parser.boot: Use 'in' instead of 'MEMQ' where approrpriate.
* interp/: Likewise.
Diffstat (limited to 'src/interp/ht-util.boot')
| -rw-r--r-- | src/interp/ht-util.boot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot index 77e2424a..c840f667 100644 --- a/src/interp/ht-util.boot +++ b/src/interp/ht-util.boot @@ -210,12 +210,12 @@ htpSetPageDescription(htPage, pageDescription) == iht line == -- issue a single hyperteTeX line, or a group of lines $newPage => nil - PAIRP line => + CONSP line => $htLineList := NCONC(nreverse mapStringize COPY_-LIST line, $htLineList) $htLineList := [basicStringize line, :$htLineList] bcIssueHt line == - PAIRP line => htMakePage1 line + CONSP line => htMakePage1 line iht line mapStringize l == @@ -404,7 +404,7 @@ htMakeTemplates(templateList, numLabels) == templateList := [templateParts template for template in templateList] [[substLabel(i, template) for template in templateList] for i in 1..numLabels] where substLabel(i, template) == - PAIRP template => + CONSP template => INTERN CONCAT(first template, PRINC_-TO_-STRING i, rest template) template @@ -520,7 +520,7 @@ checkCondition(s1, string, condList) == condErrorMsg type == typeString := form2String type - if PAIRP typeString then typeString := APPLY(function CONCAT, typeString) + if CONSP typeString then typeString := APPLY(function CONCAT, typeString) CONCAT('"Error: Could not make your input into a ", typeString) parseAndEval string == |