diff options
| author | dos-reis <gdr@axiomatics.org> | 2012-05-12 03:11:52 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2012-05-12 03:11:52 +0000 |
| commit | c849886ef096a445a65041c0e54ab02728b7b512 (patch) | |
| tree | c8e791d6c78d6146c393d4e9358deb1f4aa3c725 /src/interp/format.boot | |
| parent | d0c0f05a363c11d57c7d70baa224dccb92687ae3 (diff) | |
| download | open-axiom-c849886ef096a445a65041c0e54ab02728b7b512.tar.gz | |
* interp/c-util.boot: Miscellaneous cleanup.
* interp/compiler.boot: Likewise.
* interp/database.boot: Likewise.
* interp/debug.lisp: Likewise.
* interp/format.boot: Likewise.
* interp/g-timer.boot: Likewise.
* interp/ht-util.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/macros.lisp: Likewise.
* interp/monitor.lisp: Likewise.
* interp/msgdb.boot: Likewise.
* interp/newfort.boot: Likewise.
* interp/nlib.lisp: Likewise.
* interp/parsing.lisp: Likewise.
* interp/pf2atree.boot: Likewise.
* interp/pf2sex.boot: Likewise.
* interp/posit.boot: Likewise.
* interp/sfsfun.boot: Likewise.
* interp/util.lisp: Likewise.
Diffstat (limited to 'src/interp/format.boot')
| -rw-r--r-- | src/interp/format.boot | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/interp/format.boot b/src/interp/format.boot index 41033b90..e46fbdac 100644 --- a/src/interp/format.boot +++ b/src/interp/format.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2011, Gabriel Dos Reis. +-- Copyright (C) 2007-2012, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -453,7 +453,7 @@ formWrapId id == $formatSigAsTeX = 1 => PNAME id $formatSigAsTeX = 2 => sep := '"`" - FORMAT(nil,'"\verb~a~a~a",sep, id, sep) + formatToString('"\verb~a~a~a",sep, id, sep) error '"Bad formatSigValue" formArguments2String(argl,ml) == [fn(x,m) for x in argl for m in ml] where @@ -659,7 +659,7 @@ application2String(op,argl, linkInfo) == concat('"(",concat(tuple2String argl,'")"))) app2StringConcat0(x,y) == - FORMAT(nil, '"~a ~a", x, y) + formatToString('"~a ~a", x, y) app2StringWrap(string, linkInfo) == not linkInfo => string @@ -667,8 +667,7 @@ app2StringWrap(string, linkInfo) == $formatSigAsTeX = 2 => str2 := "app2StringConcat0"/form2Fence linkInfo sep := '"`" - FORMAT(nil, '"\lispLink{\verb!(|conPage| '~a)!}{~a}", - str2, string) + formatToString('"\lispLink{\verb!(|conPage| '~a)!}{~a}", str2, string) error "Bad value for $formatSigAsTeX" record2String x == @@ -789,14 +788,14 @@ form2Fence form == form2Fence1 x == x is [op,:argl] => op = 'QUOTE => ['"(QUOTE ",:form2FenceQuote first argl,'")"] - ['"(", FORMAT(nil, '"|~a|", op),:"append"/[form2Fence1 y for y in argl],'")"] + ['"(", formatToString('"|~a|", op),:"append"/[form2Fence1 y for y in argl],'")"] null x => '"" - ident? x => FORMAT(nil, '"|~a|", x) + ident? x => formatToString('"|~a|", x) ['" ", x] form2FenceQuote x == integer? x => [toString x] - symbol? x => [FORMAT(nil, '"|~a|", x)] + symbol? x => [formatToString('"|~a|", x)] string? x => ['"_"",x,'"_""] x isnt [.,:.] => systemErrorHere ["form2FenceQuote",x] ['"(",:form2FenceQuote first x,:form2FenceQuoteTail rest x] |