diff options
Diffstat (limited to 'cpp/sca/modules/eval/eval.hpp')
-rw-r--r-- | cpp/sca/modules/eval/eval.hpp | 56 |
1 files changed, 31 insertions, 25 deletions
diff --git a/cpp/sca/modules/eval/eval.hpp b/cpp/sca/modules/eval/eval.hpp index 1496c3bd09..78051c5a2b 100644 --- a/cpp/sca/modules/eval/eval.hpp +++ b/cpp/sca/modules/eval/eval.hpp @@ -36,7 +36,7 @@ namespace tuscany { namespace eval { -const value evalApply(const value& exp, Env& env); +const value evalExpr(const value& exp, Env& env, const gc_pool& pool); const value compoundProcedureSymbol("compound-procedure"); const value procedureSymbol("procedure"); @@ -86,10 +86,10 @@ const list<value> operands(const value& exp) { return cdr((list<value> )exp); } -const list<value> listOfValues(const list<value> exps, Env& env) { +const list<value> listOfValues(const list<value> exps, Env& env, const gc_pool& pool) { if(isNil(exps)) return list<value> (); - return cons(evalApply(car(exps), env), listOfValues(cdr(exps), env)); + return cons(evalExpr(car(exps), env, pool), listOfValues(cdr(exps), env, pool)); } const value applyOperat(const value& exp) { @@ -132,19 +132,19 @@ const value makeBegin(const list<value> seq) { return cons(beginSymbol, seq); } -const value evalSequence(const list<value>& exps, Env& env) { +const value evalSequence(const list<value>& exps, Env& env, const gc_pool& pool) { if(isLastExp(exps)) - return evalApply(firstExp(exps), env); - evalApply(firstExp(exps), env); - return evalSequence(restExp(exps), env); + return evalExpr(firstExp(exps), env, pool); + evalExpr(firstExp(exps), env, pool); + return evalSequence(restExp(exps), env, pool); } -const value applyProcedure(const value& procedure, list<value>& arguments) { +const value applyProcedure(const value& procedure, list<value>& arguments, const gc_pool& pool) { if(isPrimitiveProcedure(procedure)) return applyPrimitiveProcedure(procedure, arguments); if(isCompoundProcedure(procedure)) { - Env env = extendEnvironment(procedureParameters(procedure), arguments, procedureEnvironment(procedure)); - return evalSequence(procedureBody(procedure), env); + Env env = extendEnvironment(procedureParameters(procedure), arguments, procedureEnvironment(procedure), pool); + return evalSequence(procedureBody(procedure), env, pool); } std::cout << "Unknown procedure type " << procedure << "\n"; return value(); @@ -218,46 +218,52 @@ value condToIf(const value& exp) { return expandClauses(condClauses(exp)); } -value evalIf(const value& exp, Env& env) { - if(isTrue(evalApply(ifPredicate(exp), env))) - return evalApply(ifConsequent(exp), env); - return evalApply(ifAlternative(exp), env); +value evalIf(const value& exp, Env& env, const gc_pool& pool) { + if(isTrue(evalExpr(ifPredicate(exp), env, pool))) + return evalExpr(ifConsequent(exp), env, pool); + return evalExpr(ifAlternative(exp), env, pool); } -const value evalDefinition(const value& exp, Env& env) { - defineVariable(definitionVariable(exp), evalApply(definitionValue(exp), env), env); +const value evalDefinition(const value& exp, Env& env, const gc_pool& pool) { + defineVariable(definitionVariable(exp), evalExpr(definitionValue(exp), env, pool), env); return definitionVariable(exp); } -const value evalApply(const value& exp, Env& env) { +const value evalExpr(const value& exp, Env& env, const gc_pool& pool) { if(isSelfEvaluating(exp)) return exp; if(isQuoted(exp)) return textOfQuotation(exp); if(isDefinition(exp)) - return evalDefinition(exp, env); + return evalDefinition(exp, env, pool); if(isIf(exp)) - return evalIf(exp, env); + return evalIf(exp, env, pool); if(isBegin(exp)) - return evalSequence(beginActions(exp), env); + return evalSequence(beginActions(exp), env, pool); if(isCond(exp)) - return evalApply(condToIf(exp), env); + return evalExpr(condToIf(exp), env, pool); if(isLambda(exp)) return makeProcedure(lambdaParameters(exp), lambdaBody(exp), env); if(isVariable(exp)) return lookupVariableValue(exp, env); if(isApply(exp)) { - list<value> applyOperandValues = evalApply(applyOperand(exp), env); - return applyProcedure(evalApply(applyOperat(exp), env), applyOperandValues); + list<value> applyOperandValues = evalExpr(applyOperand(exp), env, pool); + return applyProcedure(evalExpr(applyOperat(exp), env, pool), applyOperandValues, pool); } if(isApplication(exp)) { - list<value> operandValues = listOfValues(operands(exp), env); - return applyProcedure(evalApply(operat(exp), env), operandValues); + list<value> operandValues = listOfValues(operands(exp), env, pool); + return applyProcedure(evalExpr(operat(exp), env, pool), operandValues, pool); } std::cout << "Unknown expression type " << exp << "\n"; return value(); } +const list<value> quotedParameters(const list<value>& p) { + if (isNil(p)) + return p; + return cons<value>(mklist<value>(quoteSymbol, car(p)), quotedParameters(cdr(p))); +} + } } #endif /* tuscany_eval_eval_hpp */ |