diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-05-09 16:39:23 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-05-09 16:39:23 +0000 |
| commit | 86a41a3e4a9ae61f3ab002ead3f16abcbef06130 (patch) | |
| tree | 87683e7c108715882d43751948e0d00f1c51dcc2 /src/interp | |
| parent | fe4b74b0a56bc60835a7f4e7f6344f7ceea0b0b6 (diff) | |
| download | open-axiom-86a41a3e4a9ae61f3ab002ead3f16abcbef06130.tar.gz | |
More cleanups
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/bc-solve.boot | 6 | ||||
| -rw-r--r-- | src/interp/i-map.boot | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/interp/bc-solve.boot b/src/interp/bc-solve.boot index be4a176b..a2984641 100644 --- a/src/interp/bc-solve.boot +++ b/src/interp/bc-solve.boot @@ -184,14 +184,14 @@ bcCreateVariableString(i) == STRCONC('"x",STRINGIMAGE i) bcMakeUnknowns(number)== - apply('CONCAT,[STRCONC(bcCreateVariableString(i)," ") for i in 1..number]) + apply(function strconc,[STRCONC(bcCreateVariableString(i)," ") for i in 1..number]) bcMakeEquations(i,number)== number =1 => STRCONC(bcCreateVariableString(1),"^2+1") bcCreateVariableString(i) STRCONC( STRCONC( - apply('CONCAT,[STRCONC(bcCreateVariableString(j),"+") for j in 1..number]),"1"), + apply(function strconc,[STRCONC(bcCreateVariableString(j),"+") for j in 1..number]),"1"), STRCONC("-2*",STRCONC(bcCreateVariableString(i),"^2"))) @@ -202,7 +202,7 @@ bcMakeLinearEquations(i,number)== STRCONC(bcCreateVariableString(1),STRCONC("-",bcCreateVariableString(2))) STRCONC( STRCONC( - apply('CONCAT,[STRCONC(bcCreateVariableString(j),"+") for j in 1..number]),"1"), + apply(function strconc,[STRCONC(bcCreateVariableString(j),"+") for j in 1..number]),"1"), STRCONC("-2*",bcCreateVariableString(i))) diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot index 661e5f5c..a5ccd815 100644 --- a/src/interp/i-map.boot +++ b/src/interp/i-map.boot @@ -441,11 +441,11 @@ simplifyMapConstructorRefs form == args is [obj,dom] => dom' := prefix2String dom --if atom dom' then dom' := [dom'] - --[op,obj,apply('CONCAT,dom')] + --[op,obj,apply(function strconc,dom')] dom'' := atom dom' => dom' null rest dom' => first dom' - apply('CONCAT, dom') + apply(function strconc, dom') [op,obj, dom''] form form |