diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-04-15 21:56:20 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-04-15 21:56:20 +0000 |
| commit | 53356dde96d8bc9e264dbd291df8b9b3a75aa5d1 (patch) | |
| tree | 2ff719aaa40e8978033107dbad034189c2c296ba /src/interp/termrw.boot | |
| parent | 63a250a0a3b189e6e315008936aa9e53984b5ba5 (diff) | |
| download | open-axiom-53356dde96d8bc9e264dbd291df8b9b3a75aa5d1.tar.gz | |
misc cleanup
Diffstat (limited to 'src/interp/termrw.boot')
| -rw-r--r-- | src/interp/termrw.boot | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/interp/termrw.boot b/src/interp/termrw.boot index 243812b7..d4f3f0a0 100644 --- a/src/interp/termrw.boot +++ b/src/interp/termrw.boot @@ -38,18 +38,18 @@ termRW(t,R) == -- reduce t by rewrite system R until b repeat t0:= termRW1(t,R) - b:= EQ(t,t0) + b:= sameObject?(t,t0) t:= t0 t termRW1(t,R) == -- tries to do one reduction on the leftmost outermost subterm of t t0:= term1RW(t,R) - not EQ(t0,t) or atom t => t0 + not sameObject?(t0,t) or atom t => t0 [t1,:t2]:= t tt1:= termRW1(t1,R) tt2:= t2 and termRW1(t2,R) - EQ(t1,tt1) and EQ(t2,tt2) => t + sameObject?(t1,tt1) and sameObject?(t2,tt2) => t [tt1,:tt2] term1RW(t,R) == @@ -65,7 +65,7 @@ term1RWall(t,R) == -- same as term1RW, but returns a list [vars,:varRules]:= R [not (SL='failed) and subCopy(copy rest r,SL) for r in varRules | - not EQ(SL:= termMatch(first r,t,NIL,vars),'failed)] + not sameObject?(SL:= termMatch(first r,t,NIL,vars),'failed)] termMatch(tp,t,SL,vars) == -- t is a term pattern, t a term @@ -91,7 +91,7 @@ termMatch(tp,t,SL,vars) == -- isContained(v,t) == -- -- tests (by EQ), whether v occurs in term t -- -- v must not be NIL --- EQ(v,t) => 'T +-- sameObject?(v,t) => 'T -- atom t => NIL -- isContained(v,first t) or isContained(v,rest t) |