Port kernel to C++11 and refactor some of the core modules. Convert functors to lambdas, and add C++ const, noexcept and inline annotations to get more efficient generated code.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1419985 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 5 deletions

diff --git a/sca-cpp/trunk/modules/scheme/eval.hpp b/sca-cpp/trunk/modules/scheme/eval.hpp
index 34d1a7bc17..5074471931 100644
--- a/sca-cpp/trunk/modules/scheme/eval.hpp
+++ b/sca-cpp/trunk/modules/scheme/eval.hpp
@@ -147,7 +147,7 @@ const value applyProcedure(const value& procedure, list<value>& arguments) {
         return evalSequence(procedureBody(procedure), env);
     }
     logStream() << "Unknown procedure type " << procedure << endl;
-    return value();
+    return nilValue;
 }
 
 const value sequenceToExp(const list<value> exps) {
@@ -209,16 +209,16 @@ const value expandClauses(const list<value>& clauses) {
         if(isNil(rest))
             return sequenceToExp(condActions(first));
         logStream() << "else clause isn't last " << clauses << endl;
-        return value();
+        return nilValue;
     }
     return makeIf(condPredicate(first), sequenceToExp(condActions(first)), expandClauses(rest));
 }
 
-value condToIf(const value& exp) {
+const value condToIf(const value& exp) {
     return expandClauses(condClauses(exp));
 }
 
-value evalIf(const value& exp, Env& env) {
+const value evalIf(const value& exp, Env& env) {
     if(isTrue(evalExpr(ifPredicate(exp), env)))
         return evalExpr(ifConsequent(exp), env);
     return evalExpr(ifAlternative(exp), env);
@@ -255,7 +255,7 @@ const value evalExpr(const value& exp, Env& env) {
         return applyProcedure(evalExpr(operat(exp), env), operandValues);
     }
     logStream() << "Unknown expression type " << exp << endl;
-    return value();
+    return nilValue;
 }
 
 const list<value> quotedParameters(const list<value>& p) {