diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-12-15 14:42:13 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-12-15 14:42:13 +0000 |
| commit | 7fec31d29bd8ca5d8a2c718caeacd5a2ed006ec1 (patch) | |
| tree | d1da6dea56977fdb3879c361f27ab309a8fb384d | |
| parent | abc74d7854a504c94f6f66d997d3a2448a0c0322 (diff) | |
| download | open-axiom-7fec31d29bd8ca5d8a2c718caeacd5a2ed006ec1.tar.gz | |
* interp/format.boot (formDecl2String): Tidy.
* interp/i-toplev.boot (printTypeAndTimeNormal): Likewise.
* interp/msgdb.boot (applyPrefix2String): Likewise.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/interp/format.boot | 2 | ||||
| -rw-r--r-- | src/interp/i-toplev.boot | 2 | ||||
| -rw-r--r-- | src/interp/msgdb.boot | 9 |
4 files changed, 14 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 21772fcc..96363f72 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2010-12-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/format.boot (formDecl2String): Tidy. + * interp/i-toplev.boot (printTypeAndTimeNormal): Likewise. + * interp/msgdb.boot (applyPrefix2String): Likewise. + +2010-12-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/msgdb.boot (applyPrefix2String): New. (substituteSegmentedMsg): Use to implement documented behaviour of formatting code P. diff --git a/src/interp/format.boot b/src/interp/format.boot index 3d03184f..8e8d26d4 100644 --- a/src/interp/format.boot +++ b/src/interp/format.boot @@ -473,7 +473,7 @@ formDecl2String(left,right) == ls:= form2StringLocal left rs:= form2StringLocal right NE($whereList,whereBefore) and $permitWhere => ls - concat(form2StringLocal ls,'": ",rs) + concat(ls,'": ",rs) formJoin1(op,u) == if op = 'Join then [:argl,last] := u else (argl := nil; last := [op,:u]) diff --git a/src/interp/i-toplev.boot b/src/interp/i-toplev.boot index 09f12bed..232a8751 100644 --- a/src/interp/i-toplev.boot +++ b/src/interp/i-toplev.boot @@ -217,7 +217,7 @@ printTypeAndTimeNormal(x,m) == if m is ['Union, :argl] then x' := retract(objNewWrap(x,m)) m' := objMode x' - m := ['Union, :[arg for arg in argl | sameUnionBranch(arg, m')], '"..."] + m := ['Union, :[arg for arg in argl | sameUnionBranch(arg, m')], "..."] if $printTimeIfTrue then timeString := makeLongTimeString($interpreterTimedNames, $interpreterTimedClasses) diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot index efa3ddff..7bc7cc3c 100644 --- a/src/interp/msgdb.boot +++ b/src/interp/msgdb.boot @@ -156,12 +156,15 @@ removeAttributes msg == applyPrefix2String args == [:f x for x in args] where f x == - -- FIXME: we should in fact check for formatting codes - cons? x => g x - [x] + listify + cons? x => g x -- FIXME: should check for formatting codes + x g x == $texFormatting => prefix2StringAsTeX x prefix2String x + listify x == + cons? x => x + [x] substituteSegmentedMsg(msg,args) == -- this does substitution of the parameters |