diff options
| author | dos-reis <gdr@axiomatics.org> | 2007-09-17 15:05:35 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2007-09-17 15:05:35 +0000 |
| commit | 2e464d0c7c161931e8767b6019d93c92d7fd9586 (patch) | |
| tree | e9707259f95b045f43597af72023b16a802e133e | |
| parent | 7fddd1baa9d6b643302f8c243686d74741aa198a (diff) | |
| download | open-axiom-2e464d0c7c161931e8767b6019d93c92d7fd9586.tar.gz | |
* i-spec1.boot.pamphlet (mkAndApplyZippedPredicates): Fix typo.
(mkIterZippedFun): Use indexList, not the global $indexVars.
| -rw-r--r-- | src/interp/ChangeLog | 5 | ||||
| -rw-r--r-- | src/interp/i-spec1.boot.pamphlet | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index e72fe303..dafb881e 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,3 +1,8 @@ +2007-09-17 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * i-spec1.boot.pamphlet (mkAndApplyZippedPredicates): Fix typo. + (mkIterZippedFun): Use indexList, not the global $indexVars. + 2007-09-15 Gabriel Dos Reis <gdr@cs.tamu.edu> Fix Bug SF/1790563 diff --git a/src/interp/i-spec1.boot.pamphlet b/src/interp/i-spec1.boot.pamphlet index 3b4427cd..8175bc6a 100644 --- a/src/interp/i-spec1.boot.pamphlet +++ b/src/interp/i-spec1.boot.pamphlet @@ -945,21 +945,21 @@ mkAndApplyZippedPredicates (s,zipType,itrl) == -- for one index variable case for now. may generalize later for iter in itrl repeat iter is ['WHILE,pred] => - predVec := mkIterZippedFun($indexList,pred,zipType,$localVars) + predVec := mkIterZippedFun($indexVars,pred,zipType,$localVars) s := [mkAtreeNode 'swhile,predVec,s] iter is ['UNTIL,pred] => - predVec := mkIterZippedFun($indexList,pred,zipType,$localVars) + predVec := mkIterZippedFun($indexVars,pred,zipType,$localVars) s := [mkAtreeNode 'suntil,predVec,s] iter is ['SUCHTHAT,pred] => putTarget(pred,$Boolean) - predVec := mkIterZippedFun($indexList,pred,zipType,$localVars) + predVec := mkIterZippedFun($indexVars,pred,zipType,$localVars) s := [mkAtreeNode 'select,predVec,s] s mkIterZippedFun(indexList,funBody,zipType,$localVars) == -- transform funBody into a lamda with $index as the parameter - numVars:= #$indexVars - for [var,:.] in $indexVars repeat + numVars:= #indexList + for [var,:.] in indexList repeat funBody := subVecNodes(mkIterVarSub(var,numVars),var,funBody) put($index,'mode,zipType,$env) mkLocalVar($mapName,$index) |