aboutsummaryrefslogtreecommitdiff
path: root/libbuild2
diff options
context:
space:
mode:
Diffstat (limited to 'libbuild2')
-rw-r--r--libbuild2/functions-json.cxx24
-rw-r--r--libbuild2/variable.cxx5
2 files changed, 25 insertions, 4 deletions
diff --git a/libbuild2/functions-json.cxx b/libbuild2/functions-json.cxx
index 7551fa1..d7265ba 100644
--- a/libbuild2/functions-json.cxx
+++ b/libbuild2/functions-json.cxx
@@ -70,7 +70,29 @@ namespace build2
// for details).
//
if (v.type == json_type::object && v.object.size () == 1)
- return move (v.object.front ().value);
+ {
+ // Reverse simple JSON values to the corresponding fundamental type
+ // values for consistency with subscript/iteration (see
+ // json_subscript_impl() for background).
+ //
+ json_value& jr (v.object.front ().value);
+
+ switch (jr.type)
+ {
+#if 0
+ case json_type::null: return value (names {});
+#else
+ case json_type::null: return value ();
+#endif
+ case json_type::boolean: return value (jr.boolean);
+ case json_type::signed_number: return value (jr.signed_number);
+ case json_type::unsigned_number:
+ case json_type::hexadecimal_number: return value (jr.unsigned_number);
+ case json_type::string: return value (move (jr.string));
+ case json_type::array:
+ case json_type::object: return value (move (jr));
+ }
+ }
fail << "json object member expected instead of " << v.type << endf;
};
diff --git a/libbuild2/variable.cxx b/libbuild2/variable.cxx
index 1c899f9..3db0fd0 100644
--- a/libbuild2/variable.cxx
+++ b/libbuild2/variable.cxx
@@ -1993,11 +1993,11 @@ namespace build2
// opposed to reverse() where it is used to build up values and thus
// needs things to be fully reversible). Once we add type hints, then
// this should become unnecessary and we should be able to just always
- // return json_value.
+ // return json_value. See also $json.member_value() where we do the
+ // same thing.
//
// @@ TODO: split this function into two (index/name) once get rid of this.
//
-#if 1
value r;
switch (jr.type)
{
@@ -2018,7 +2018,6 @@ namespace build2
case json_type::array:
case json_type::object: r = value (move (jr)); break;
}
-#endif
return make_pair (move (r), true);
}