diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-09-29 06:46:16 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-09-29 06:46:16 +0000 |
| commit | 8c21fa51748d435b43b06fff98ff3b2e5af8c435 (patch) | |
| tree | bafe9ff4ce05b3086aed8705806a807b79a0ffc6 | |
| parent | d6d284af63e89085e704e27c2f8c893c0ebc2e1a (diff) | |
| download | open-axiom-8c21fa51748d435b43b06fff98ff3b2e5af8c435.tar.gz | |
* interp/br-util.boot (htPred2English): Espace "has".
* interp/format.boot (pred2English): Likewise.
* interp/i-spec1.boot ($specialOps): Likewise.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/interp/br-util.boot | 2 | ||||
| -rw-r--r-- | src/interp/format.boot | 2 | ||||
| -rw-r--r-- | src/interp/i-spec1.boot | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e474577e..fc857474 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2009-09-29 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/br-util.boot (htPred2English): Espace "has". + * interp/format.boot (pred2English): Likewise. + * interp/i-spec1.boot ($specialOps): Likewise. + +2009-09-29 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/i-funsel.boot (matchMmSig): Fix thinko from revision 1297. 2009-09-26 Gabriel Dos Reis <gdr@cse.tamu.edu> diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot index 068ad421..5becaedb 100644 --- a/src/interp/br-util.boot +++ b/src/interp/br-util.boot @@ -164,7 +164,7 @@ htPred2English(x,:options) == bcConform(first l,$emList) htSay('" has ") fnAttr CADADR l - op in '(has ofCategory) => + op in '(_has ofCategory) => bcConform(first l,$emList) htSay('" has ") [a,b] := l diff --git a/src/interp/format.boot b/src/interp/format.boot index 4c598244..416ecab4 100644 --- a/src/interp/format.boot +++ b/src/interp/format.boot @@ -708,7 +708,7 @@ pred2English x == concat(pred2English first l,tail) x is ['NOT,l] => concat('"not ",pred2English l) - x is [op,a,b] and op in '(has ofCategory) => + x is [op,a,b] and op in '(_has ofCategory) => concat(pred2English a,'%b,'"has",'%d,form2String abbreviate b) x is [op,a,b] and op in '(HasSignature HasAttribute HasCategory) => concat(prefix2String0 formatPredParts a,'%b,'"has",'%d, diff --git a/src/interp/i-spec1.boot b/src/interp/i-spec1.boot index 84cbc85f..cfc0ed79 100644 --- a/src/interp/i-spec1.boot +++ b/src/interp/i-spec1.boot @@ -40,7 +40,7 @@ namespace BOOT $specialOps := '( ADEF AlgExtension _and _case COERCE COLLECT construct Declare DEF Dollar - equation error free has IF _is _isnt iterate _break %LET _local MDEF _or + equation error free _has IF _is _isnt iterate _break %LET _local MDEF _or pretend QUOTE REDUCE REPEAT _return SEQ TARGET tuple typeOf _where _[_|_|_] %Macro %MLambda %Import %Export %Inline %With %Add %Match) |