diff options
| author | dos-reis <gdr@axiomatics.org> | 2007-11-22 17:20:27 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2007-11-22 17:20:27 +0000 |
| commit | fcc7f11db9c755b9b58ce43d37bbe8a702af8ebf (patch) | |
| tree | 05aa94e2606b88faf554913a03a60bc424e56102 /src/interp/pspad2.boot | |
| parent | 4244764830efa92de999f8e548f0cc2a800e61d1 (diff) | |
| download | open-axiom-fcc7f11db9c755b9b58ce43d37bbe8a702af8ebf.tar.gz | |
* as.boot: Globally substitute %noBranch for noBranch.
* ax.boot: Likewise.
* cattable.boot: Likewise.
* compiler.boot: Likewise.
* def.lisp: Likewise.
* define.boot: Likewise.
* functor.boot: Likewise.
* g-opt.boot: Likewise.
* i-analy.boot: Likewise.
* i-intern.boot: Likewise.
* i-map.boot: Likewise.
* i-object.boot: Likewise.
* i-output.boot: Likewise.
* i-spec2.boot: Likewise.
* info.boot: Likewise.
* mark.boot: Likewise.
* nrunopt.boot: Likewise.
* package.boot: Likewise.
* parse.boot: Likewise.
* pf2atree.boot: Likewise.
* pf2sex.boot: Likewise.
* postpar.boot: Likewise.
* pspad2.boot: Likewise.
* wi2.boot: Likewise.
Diffstat (limited to 'src/interp/pspad2.boot')
| -rw-r--r-- | src/interp/pspad2.boot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/pspad2.boot b/src/interp/pspad2.boot index 4f5a729b..80af26dc 100644 --- a/src/interp/pspad2.boot +++ b/src/interp/pspad2.boot @@ -167,7 +167,7 @@ formatDeftranREPEAT(itl,body) == u := [x for x in itl | x is ["UNTIL",p]] or return nil nitl := SETDIFFERENCE(itl,u) pred := MKPF([p for ['UNTIL,p] in u],'or) - cond := ['IF,pred,['leave,n,nil],'noBranch] + cond := ['IF,pred,['leave,n,nil],'%noBranch] nbody := body is ['SEQ,:l,[.,n,x]] => ['SEQ,:l,x,['exit,n,cond]] ['SEQ,body,['exit,n,cond]] @@ -179,7 +179,7 @@ formatDeftranSEQ(x,flag) == [u] formatDeftranIf(a,b,c) == - b = 'noBranch => + b = '%noBranch => a is [op,:r] and (al := '((_= . _~_=) (_< . _>_=) (_> . _<_=)); iop := LASSOC(op, al) or rassoc(op, al)) => [["=>",[iop, :r],c]] @@ -187,7 +187,7 @@ formatDeftranIf(a,b,c) == [["=>", r, c]] [["=>", ['not, a], c]] post := - c = 'noBranch => nil + c = '%noBranch => nil c is ['SEQ,:.] => CDR c [c] [["=>",a,b],:post] @@ -229,8 +229,8 @@ formatDefault ["default",a] == formatUNCOERCE ['UNCOERCE,x] == format x formatIF ['IF,a,b,c] == - c = 'noBranch => formatIF2(a,b,"if ") - b = 'noBranch => formatIF ['IF,['not,a],c,'noBranch] + c = '%noBranch => formatIF2(a,b,"if ") + b = '%noBranch => formatIF ['IF,['not,a],c,'%noBranch] formatIF2(a,b,"if ") and newLine() and formatIF3 c formatIF2(a,b,prefix) == @@ -238,7 +238,7 @@ formatIF2(a,b,prefix) == formatIF3 x == x is ['IF,a,b,c] => - c = 'noBranch => tryBreak(format "else if " + c = '%noBranch => tryBreak(format "else if " and format a and format " then ",b,"then","Nud") formatIF2(a,b,"else if ") and newLine() and formatIF3 c tryBreak(format "else ",x,"else","Nud") |