mirror of https://github.com/adamdruppe/arsd.git
cleanup and fix on getting array
This commit is contained in:
parent
4f672591d8
commit
e30eeff127
4
jsvar.d
4
jsvar.d
|
@ -652,6 +652,7 @@ struct var {
|
||||||
} catch (Exception e) {}
|
} catch (Exception e) {}
|
||||||
return T.init;
|
return T.init;
|
||||||
case Type.Array:
|
case Type.Array:
|
||||||
|
import std.range;
|
||||||
auto pl = this._payload._array;
|
auto pl = this._payload._array;
|
||||||
static if(isSomeString!T) {
|
static if(isSomeString!T) {
|
||||||
return to!string(pl);
|
return to!string(pl);
|
||||||
|
@ -721,7 +722,6 @@ struct var {
|
||||||
|
|
||||||
private Type _type;
|
private Type _type;
|
||||||
|
|
||||||
// FIXME: arrays, functions, and strings are supposed to have prototypes too
|
|
||||||
private union Payload {
|
private union Payload {
|
||||||
PrototypeObject _object;
|
PrototypeObject _object;
|
||||||
var[] _array;
|
var[] _array;
|
||||||
|
@ -938,7 +938,6 @@ struct var {
|
||||||
return v;
|
return v;
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME
|
|
||||||
static var fromJson(string json) {
|
static var fromJson(string json) {
|
||||||
auto decoded = parseJSON(json);
|
auto decoded = parseJSON(json);
|
||||||
return var.fromJsonValue(decoded);
|
return var.fromJsonValue(decoded);
|
||||||
|
@ -992,7 +991,6 @@ struct var {
|
||||||
return toJSON(&v);
|
return toJSON(&v);
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: maybe we could do some cool stuff with boolean true/false and uinteger too
|
|
||||||
JSONValue toJsonValue() {
|
JSONValue toJsonValue() {
|
||||||
JSONValue val;
|
JSONValue val;
|
||||||
final switch(payloadType()) {
|
final switch(payloadType()) {
|
||||||
|
|
Loading…
Reference in New Issue