summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/scheme
diff options
context:
space:
mode:
Diffstat (limited to 'sca-cpp/trunk/modules/scheme')
-rw-r--r--sca-cpp/trunk/modules/scheme/json-value.cpp11
-rw-r--r--sca-cpp/trunk/modules/scheme/value-json.cpp5
2 files changed, 7 insertions, 9 deletions
diff --git a/sca-cpp/trunk/modules/scheme/json-value.cpp b/sca-cpp/trunk/modules/scheme/json-value.cpp
index 4bdf8bd37f..b5c1c25302 100644
--- a/sca-cpp/trunk/modules/scheme/json-value.cpp
+++ b/sca-cpp/trunk/modules/scheme/json-value.cpp
@@ -32,14 +32,13 @@
namespace tuscany {
namespace scheme {
-int jsonValue() {
- const js::JSContext cx;
- const failable<list<value> > lv = json::readJSON(streamList(cin), cx);
- if (!hasContent(lv)) {
- cerr << reason(lv) << " : " << rcode(lv);
+const int jsonValue() {
+ const failable<value> v = json::readValue(streamList(cin));
+ if (!hasContent(v)) {
+ cerr << reason(v) << " : " << rcode(v);
return 1;
}
- cout << writeValue(content(lv));
+ write(content(writeValue(content(v))), cout);
return 0;
}
diff --git a/sca-cpp/trunk/modules/scheme/value-json.cpp b/sca-cpp/trunk/modules/scheme/value-json.cpp
index a8c875fcc8..732b73d2e3 100644
--- a/sca-cpp/trunk/modules/scheme/value-json.cpp
+++ b/sca-cpp/trunk/modules/scheme/value-json.cpp
@@ -32,9 +32,8 @@
namespace tuscany {
namespace scheme {
-int valueJSON() {
- const js::JSContext cx;
- failable<list<string> > s = json::writeJSON(readValue(cin), cx);
+const int valueJSON() {
+ const failable<list<string> > s = json::writeValue(content(readValue(cin)));
if (!hasContent(s)) {
cerr << reason(s) << " : " << rcode(s);
return 1;