diff options
Diffstat (limited to 'sca-cpp/trunk/modules/server/mod-scheme.hpp')
-rw-r--r-- | sca-cpp/trunk/modules/server/mod-scheme.hpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sca-cpp/trunk/modules/server/mod-scheme.hpp b/sca-cpp/trunk/modules/server/mod-scheme.hpp index 13b4ac5760..6325b6c719 100644 --- a/sca-cpp/trunk/modules/server/mod-scheme.hpp +++ b/sca-cpp/trunk/modules/server/mod-scheme.hpp @@ -19,8 +19,8 @@ /* $Rev$ $Date$ */ -#ifndef tuscany_modscm_hpp -#define tuscany_modscm_hpp +#ifndef tuscany_modscheme_hpp +#define tuscany_modscheme_hpp /** * Evaluation functions used by mod-eval to evaluate implementation.scheme @@ -34,8 +34,7 @@ #include "value.hpp" #include "debug.hpp" #include "monad.hpp" -#include "../scheme/primitive.hpp" -#include "../scheme/driver.hpp" +#include "../scheme/eval.hpp" #include "../http/httpd.hpp" namespace tuscany { @@ -52,7 +51,7 @@ const list<value> primitiveProcedures(const list<value>& l) { } /** - * Evaluate a script component implementation function. + * Evaluate a scheme component implementation function. */ struct evalImplementation { const value impl; @@ -61,11 +60,11 @@ struct evalImplementation { } const value operator()(const list<value>& params) const { const value expr = cons<value>(car(params), append(scheme::quotedParameters(cdr(params)), px)); - debug(expr, "modeval::scm::evalImplementation::input"); + debug(expr, "modeval::scheme::evalImplementation::input"); gc_pool pool(gc_current_pool()); scheme::Env globalEnv = scheme::setupEnvironment(pool); const value val = scheme::evalScript(expr, impl, globalEnv, pool); - debug(val, "modeval::scm::evalImplementation::result"); + debug(val, "modeval::scheme::evalImplementation::result"); if (isNil(val)) return mklist<value>(value(), string("Could not evaluate expression")); return mklist<value>(val); @@ -73,7 +72,7 @@ struct evalImplementation { }; /** - * Read a script component implementation. + * Read a scheme component implementation. */ const failable<lambda<value(const list<value>&)> > readImplementation(const string& path, const list<value>& px) { ifstream is(path); @@ -89,4 +88,4 @@ const failable<lambda<value(const list<value>&)> > readImplementation(const stri } } -#endif /* tuscany_modscm_hpp */ +#endif /* tuscany_modscheme_hpp */ |