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

Fixed warnings in dom.d and web.d

This commit is contained in:
Abscissa 2011-07-21 18:33:10 -04:00
parent 2907e290d2
commit da4610db32
2 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dom.d
View File

@ -2109,8 +2109,7 @@ class Document {
pos++; pos++;
string v = htmlEntitiesDecode(data[start..pos], strict); string v = htmlEntitiesDecode(data[start..pos], strict);
pos++; // skip over the end pos++; // skip over the end
return v; return v;
break;
default: default:
if(strict) if(strict)
parseError("Attributes must be quoted"); parseError("Attributes must be quoted");
@ -2227,8 +2226,7 @@ class Document {
if(!caseSensitive) if(!caseSensitive)
tname = tname.toLower; tname = tname.toLower;
return Ele(1, null, tname); // closing tag reports itself here return Ele(1, null, tname); // closing tag reports itself here
break;
case ' ': // assume it isn't a real element... case ' ': // assume it isn't a real element...
if(strict) if(strict)
parseError("bad markup - improperly placed <"); parseError("bad markup - improperly placed <");
@ -2351,10 +2349,8 @@ class Document {
default: assert(0); default: assert(0);
case '/': // self closing tag case '/': // self closing tag
return addTag(true); return addTag(true);
break;
case '>': case '>':
return addTag(false); return addTag(false);
break;
case ' ': case ' ':
case '\t': case '\t':
case '\n': case '\n':
@ -2365,11 +2361,8 @@ class Document {
switch(data[pos]) { switch(data[pos]) {
case '/': // self closing tag case '/': // self closing tag
return addTag(true); return addTag(true);
break;
case '>': // closed tag; open -- we now read the contents case '>': // closed tag; open -- we now read the contents
return addTag(false);
return addTag(false);
break;
default: // it is an attribute default: // it is an attribute
string attrName = readAttributeName(); string attrName = readAttributeName();
string attrValue = attrName; string attrValue = attrName;
@ -2637,7 +2630,7 @@ class Document {
string prolog = "<!DOCTYPE html>\n"; string prolog = "<!DOCTYPE html>\n";
///. ///.
string toString() const { override string toString() const {
return prolog ~ root.toString(); return prolog ~ root.toString();
} }
@ -3166,13 +3159,7 @@ int intFromHex(string hex) {
current.evenChild = true; current.evenChild = true;
break; break;
case "visited": case "visited", "active", "hover", "target", "focus", "checked", "selected":
case "active":
case "hover":
case "target":
case "focus":
case "checked":
case "selected":
current.attributesPresent ~= "nothing"; current.attributesPresent ~= "nothing";
// FIXME // FIXME
/* /*
@ -3183,15 +3170,15 @@ int intFromHex(string hex) {
// extensions not implemented // extensions not implemented
//case "text": // takes the text in the element and wraps it in an element, returning it //case "text": // takes the text in the element and wraps it in an element, returning it
+/ +/
goto case;
case "before": case "before", "after":
case "after":
current.attributesPresent ~= "FIXME"; current.attributesPresent ~= "FIXME";
break; break;
default: default:
//if(token.indexOf("lang") == -1) //if(token.indexOf("lang") == -1)
//assert(0, token); //assert(0, token);
break;
} }
state = State.Starting; state = State.Starting;
break; break;
@ -3213,7 +3200,7 @@ int intFromHex(string hex) {
} }
break; break;
} }
// fallthrough goto case;
case State.ExpectingAttributeCloser: case State.ExpectingAttributeCloser:
if(token != "]") { if(token != "]") {
// not the closer; consider it part of comparison // not the closer; consider it part of comparison
@ -3502,7 +3489,7 @@ class CssStyle {
} }
///. ///.
string toString() { override string toString() {
string ret; string ret;
if(originatingRule.length) if(originatingRule.length)
ret = originatingRule ~ " {"; ret = originatingRule ~ " {";

5
web.d
View File

@ -168,7 +168,6 @@ class ApiProvider {
Document _defaultPage() { Document _defaultPage() {
throw new Exception("no default"); throw new Exception("no default");
return null;
} }
Element _getGenericContainer() Element _getGenericContainer()
@ -1660,10 +1659,12 @@ void formatAs(T, R)(T ret, R api, ref JSONValue returnValue, string format, stri
case "table": case "table":
auto document = new Document("<root></root>"); auto document = new Document("<root></root>");
static if(__traits(compiles, structToTable(document, ret))) static if(__traits(compiles, structToTable(document, ret)))
{
returnValue.str = structToTable(document, ret).toString(); returnValue.str = structToTable(document, ret).toString();
break;
}
else else
goto badType; goto badType;
break;
default: default:
badType: badType:
throw new Exception("Couldn't get result as " ~ format); throw new Exception("Couldn't get result as " ~ format);