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

fixes for just introduced typeof(null)

This commit is contained in:
Trass3r 2011-11-29 17:41:14 +01:00
parent 74fdfbbb55
commit 61f0d29523
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web.d
View File

@ -1500,7 +1500,9 @@ private string[] parameterNamesOfImpl (alias func) ()
string toHtml(T)(T a) { string toHtml(T)(T a) {
string ret; string ret;
static if(is(T : Document)) { static if(is(T == typeof(null)))
ret = null;
else static if(is(T : Document)) {
if(a is null) if(a is null)
ret = null; ret = null;
else else
@ -1547,7 +1549,9 @@ JSONValue toJsonValue(T, R = ApiProvider)(T a, string formatToStringAs = null, R
if(is(R : ApiProvider)) if(is(R : ApiProvider))
{ {
JSONValue val; JSONValue val;
static if(is(T == JSONValue)) { static if(is(T == typeof(null))) {
val.type = JSON_TYPE.NULL;
} else static if(is(T == JSONValue)) {
val = a; val = a;
} else static if(__traits(compiles, val = a.makeJsonValue())) { } else static if(__traits(compiles, val = a.makeJsonValue())) {
val = a.makeJsonValue(); val = a.makeJsonValue();
@ -1568,8 +1572,6 @@ JSONValue toJsonValue(T, R = ApiProvider)(T a, string formatToStringAs = null, R
val.type = JSON_TYPE.FLOAT; val.type = JSON_TYPE.FLOAT;
val.floating = to!real(a); val.floating = to!real(a);
static assert(0); static assert(0);
} else static if(is(T == void*)) {
val.type = JSON_TYPE.NULL;
} else static if(isPointer!(T)) { } else static if(isPointer!(T)) {
if(a is null) { if(a is null) {
val.type = JSON_TYPE.NULL; val.type = JSON_TYPE.NULL;