diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-18 22:24:59 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-18 22:24:59 +0000 |
commit | 344e0e58ad63fba551f46fc4d9a2468e395f473a (patch) | |
tree | 5a9c1c443635b52bf7f5e78c3bd627da81ea8e60 /cpp/sca/modules | |
parent | 2ee1a61be35c4ae0a017bf65f4ac6779c59b4388 (diff) |
Minor code cleanup, refactored list functions and cleaned up function names, moved support for elements to a new header file.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@826543 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | cpp/sca/modules/eval/driver.hpp | 2 | ||||
-rw-r--r-- | cpp/sca/modules/eval/environment.hpp | 2 | ||||
-rw-r--r-- | cpp/sca/modules/eval/eval-test.cpp | 13 | ||||
-rw-r--r-- | cpp/sca/modules/eval/eval.hpp | 4 | ||||
-rw-r--r-- | cpp/sca/modules/eval/primitive.hpp | 6 | ||||
-rw-r--r-- | cpp/sca/modules/eval/read.hpp | 12 |
6 files changed, 18 insertions, 21 deletions
diff --git a/cpp/sca/modules/eval/driver.hpp b/cpp/sca/modules/eval/driver.hpp index 398fc9616d..7a0645781f 100644 --- a/cpp/sca/modules/eval/driver.hpp +++ b/cpp/sca/modules/eval/driver.hpp @@ -47,7 +47,7 @@ const bool announceOutput(std::ostream& out, const std::string str) { const bool userPrint(std::ostream& out, const value object) { if(isCompoundProcedure(object)) - out << makeList<value>(compoundProcedureSymbol, procedureParameters(object), procedureBody(object), "<procedure-env>"); + out << mklist<value>(compoundProcedureSymbol, procedureParameters(object), procedureBody(object), "<procedure-env>"); out << object; return true; } diff --git a/cpp/sca/modules/eval/environment.hpp b/cpp/sca/modules/eval/environment.hpp index 671175b96d..834563069e 100644 --- a/cpp/sca/modules/eval/environment.hpp +++ b/cpp/sca/modules/eval/environment.hpp @@ -86,7 +86,7 @@ const Frame makeBinding(const Frame& frameSoFar, const list<value>& variables, c return frameSoFar; } if (isDotVariable(car(variables))) - return makeBinding(frameSoFar, cdr(variables), makeList<value>(values)); + return makeBinding(frameSoFar, cdr(variables), mklist<value>(values)); if (isNil(values)) { if (!isNil(variables)) diff --git a/cpp/sca/modules/eval/eval-test.cpp b/cpp/sca/modules/eval/eval-test.cpp index 725f1b43fa..c536ed51a4 100644 --- a/cpp/sca/modules/eval/eval-test.cpp +++ b/cpp/sca/modules/eval/eval-test.cpp @@ -33,7 +33,7 @@ namespace tuscany { bool testEnv() { Env globalEnv = list<value>(); - Env env = extendEnvironment(makeList<value>("a"), makeList<value>(1), globalEnv); + Env env = extendEnvironment(mklist<value>("a"), mklist<value>(1), globalEnv); defineVariable("x", env, env); //assert(lookupVariableValue(value("x"), env) == env); assert(lookupVariableValue("a", env) == value(1)); @@ -62,13 +62,13 @@ bool testRead() { assert(read(is2) == value(123)); std::istringstream is3("(abcd)"); - assert(read(is3) == makeList(value("abcd"))); + assert(read(is3) == mklist(value("abcd"))); std::istringstream is4("(abcd xyz)"); - assert(read(is4) == makeList<value>("abcd", "xyz")); + assert(read(is4) == mklist<value>("abcd", "xyz")); std::istringstream is5("(abcd (xyz tuv))"); - assert(read(is5) == makeList<value>("abcd", makeList<value>("xyz", "tuv"))); + assert(read(is5) == mklist<value>("abcd", mklist<value>("xyz", "tuv"))); return true; } @@ -133,7 +133,7 @@ bool testEval() { } bool testEvalExpr() { - const value exp = makeList<value>("+", 2, 3); + const value exp = mklist<value>("+", 2, 3); Env env = setupEnvironment(); const value r = eval(exp, env); assert(r == value(5)); @@ -172,8 +172,5 @@ int main() { tuscany::testEvalGC(); std::cout << "OK" << std::endl; - - tuscany::testEvalRun(); - return 0; } diff --git a/cpp/sca/modules/eval/eval.hpp b/cpp/sca/modules/eval/eval.hpp index 0f6ef77904..2be2894bf3 100644 --- a/cpp/sca/modules/eval/eval.hpp +++ b/cpp/sca/modules/eval/eval.hpp @@ -67,7 +67,7 @@ static list<value> lambdaBody(const value& exp) { } const value makeProcedure(const list<value>& parameters, const value& body, const Env& env) { - return makeList<value>(procedureSymbol, parameters, body, env); + return mklist<value>(procedureSymbol, parameters, body, env); } const bool isApply(const value& exp) { @@ -197,7 +197,7 @@ const bool isIf(const value& exp) { } const value makeIf(value predicate, value consequent, value alternative) { - return makeList(ifSymbol, predicate, consequent, alternative); + return mklist(ifSymbol, predicate, consequent, alternative); } const value expandClauses(const list<value>& clauses) { diff --git a/cpp/sca/modules/eval/primitive.hpp b/cpp/sca/modules/eval/primitive.hpp index ece89e077d..0d738d1392 100644 --- a/cpp/sca/modules/eval/primitive.hpp +++ b/cpp/sca/modules/eval/primitive.hpp @@ -132,11 +132,11 @@ const value primitiveImplementation(const list<value>& proc) { } template<typename F> const value primitiveProcedure(const F& f) { - return makeList<value>(primitiveSymbol, (lambda<value(list<value>&)>)f); + return mklist<value>(primitiveSymbol, (lambda<value(list<value>&)>)f); } const list<value> primitiveProcedureNames() { - list<value> l = makeList<value>("car"); + list<value> l = mklist<value>("car"); l = cons<value>("cdr", l); l = cons<value>("cons", l); l = cons<value>("list", l); @@ -153,7 +153,7 @@ const list<value> primitiveProcedureNames() { } const list<value> primitiveProcedureObjects() { - list<value> l = makeList(primitiveProcedure(valueCar)); + list<value> l = mklist(primitiveProcedure(valueCar)); l = cons(primitiveProcedure(valueCdr), l); l = cons(primitiveProcedure(valueCons), l); l = cons(primitiveProcedure(valueList), l); diff --git a/cpp/sca/modules/eval/read.hpp b/cpp/sca/modules/eval/read.hpp index 9266498d99..189075ded9 100644 --- a/cpp/sca/modules/eval/read.hpp +++ b/cpp/sca/modules/eval/read.hpp @@ -38,9 +38,9 @@ namespace tuscany { -const value rightParenthesis(makeList<value>(")")); -const value leftParenthesis(makeList<value>("(")); -const value comment(makeList<value>(";")); +const value rightParenthesis(mklist<value>(")")); +const value leftParenthesis(mklist<value>("(")); +const value comment(mklist<value>(";")); const double stringToNumber(const std::string& str) { double d; @@ -121,7 +121,7 @@ const value readToken(std::istream& in) { } const value readQuoted(std::istream& in) { - return makeList(quoteSymbol, read(in)); + return mklist(quoteSymbol, read(in)); } const list<value> readList(const list<value>& listSoFar, std::istream& in) { @@ -147,7 +147,7 @@ const list<char> readIdentifierHelper(const list<char>& listSoFar, std::istream& } const value readIdentifier(const char chr, std::istream& in) { - return listToString(readIdentifierHelper(makeList(chr), in)).c_str(); + return listToString(readIdentifierHelper(mklist(chr), in)).c_str(); } const list<char> readStringHelper(const list<char>& listSoFar, std::istream& in) { @@ -169,7 +169,7 @@ const list<char> readNumberHelper(const list<char>& listSoFar, std::istream& in) } const value readNumber(const char chr, std::istream& in) { - return stringToNumber(listToString(readNumberHelper(makeList(chr), in))); + return stringToNumber(listToString(readNumberHelper(mklist(chr), in))); } const value read(std::istream& in) { |