summaryrefslogtreecommitdiffstats
path: root/cpp/sca/modules/eval/read.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/sca/modules/eval/read.hpp')
-rw-r--r--cpp/sca/modules/eval/read.hpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/sca/modules/eval/read.hpp b/cpp/sca/modules/eval/read.hpp
index cd9068c017..6baf670a1e 100644
--- a/cpp/sca/modules/eval/read.hpp
+++ b/cpp/sca/modules/eval/read.hpp
@@ -38,8 +38,8 @@
namespace tuscany
{
-const value rightParenthesis(makeList(value(")")));
-const value leftParenthesis(makeList(value("(")));
+const value rightParenthesis(makeList<value>(")"));
+const value leftParenthesis(makeList<value>("("));
const double stringToNumber(const std::string& str) {
double d;
@@ -120,7 +120,7 @@ const value readToken(std::istream& in) {
}
const value readQuoted(std::istream& in) {
- return value(makeList(quoteSymbol, read(in)));
+ return makeList(quoteSymbol, read(in));
}
const list<value> readList(const list<value>& listSoFar, std::istream& in) {
@@ -146,7 +146,7 @@ const list<char> readIdentifierHelper(const list<char>& listSoFar, std::istream&
}
const value readIdentifier(const char chr, std::istream& in) {
- return value(listToString(readIdentifierHelper(makeList(chr), in)).c_str());
+ return listToString(readIdentifierHelper(makeList(chr), in)).c_str();
}
const list<char> readStringHelper(const list<char>& listSoFar, std::istream& in) {
@@ -157,7 +157,7 @@ const list<char> readStringHelper(const list<char>& listSoFar, std::istream& in)
}
const value readString(const char chr, std::istream& in) {
- return value(listToString(readStringHelper(list<char>(), in)));
+ return listToString(readStringHelper(list<char>(), in));
}
const list<char> readNumberHelper(const list<char>& listSoFar, std::istream& in) {
@@ -168,13 +168,13 @@ const list<char> readNumberHelper(const list<char>& listSoFar, std::istream& in)
}
const value readNumber(const char chr, std::istream& in) {
- return value(stringToNumber(listToString(readNumberHelper(makeList(chr), in))));
+ return stringToNumber(listToString(readNumberHelper(makeList(chr), in)));
}
const value read(std::istream& in) {
const value nextToken = readToken(in);
if(isLeftParenthesis(nextToken))
- return value(readList(list<value> (), in));
+ return readList(list<value> (), in);
return nextToken;
}