forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

phobos nullable support

This commit is contained in:
Adam D. Ruppe 2023-12-30 19:23:24 -05:00
parent 7641aeb2dc
commit ec062fab06
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jsvar.d
View File

@ -680,6 +680,7 @@ struct var {
@[scriptable] to expose them to the script. @[scriptable] to expose them to the script.
+/ +/
public var opAssign(T)(T t) if(!is(T == var)) { public var opAssign(T)(T t) if(!is(T == var)) {
import std.typecons;
static if(__traits(compiles, this = t.toArsdJsvar())) { static if(__traits(compiles, this = t.toArsdJsvar())) {
static if(__traits(compiles, t is null)) { static if(__traits(compiles, t is null)) {
if(t is null) if(t is null)
@ -693,6 +694,11 @@ struct var {
// so prewrapped stuff can be easily passed. // so prewrapped stuff can be easily passed.
this._type = Type.Object; this._type = Type.Object;
this._payload._object = t; this._payload._object = t;
} else static if(is(T == Nullable!N, N)) {
if(t.isNull())
this = null;
else
this = t.get();
} else static if(is(T == enum)) { } else static if(is(T == enum)) {
this._type = Type.String; this._type = Type.String;
this._payload._string = to!string(t); this._payload._string = to!string(t);
@ -979,6 +985,7 @@ struct var {
Search function for the comment "property getter support" to see the impl. Search function for the comment "property getter support" to see the impl.
+/ +/
public T get(T)() if(!is(T == void)) { public T get(T)() if(!is(T == void)) {
import std.typecons;
static if(is(T == var)) { static if(is(T == var)) {
return this; return this;
} else static if(__traits(compiles, T.fromJsVar(var.init))) { } else static if(__traits(compiles, T.fromJsVar(var.init))) {
@ -987,6 +994,11 @@ struct var {
return T(this); return T(this);
} else static if(__traits(compiles, new T(this))) { } else static if(__traits(compiles, new T(this))) {
return new T(this); return new T(this);
} else static if(is(T == Nullable!N, N)) {
if(payloadType == Type.Object && this._payload._object is null)
return T.init;
else
return nullable(this.get!N);
} else } else
final switch(payloadType) { final switch(payloadType) {
case Type.Boolean: case Type.Boolean: