From ab615bc0c2c58346f5fa1d023c93aa5756b80bf4 Mon Sep 17 00:00:00 2001 From: "Adam D. Ruppe" Date: Fri, 22 Jul 2011 20:36:34 -0400 Subject: [PATCH] WTF, i hate source control, what a pain in the ass --- dom.d | 35 +++++++++++------------------------ web.d | 16 ++++++++++++++-- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dom.d b/dom.d index 043cc7a..bb0aa9d 100644 --- a/dom.d +++ b/dom.d @@ -2122,8 +2122,7 @@ class Document { pos++; string v = htmlEntitiesDecode(data[start..pos], strict); pos++; // skip over the end - return v; - break; + return v; default: if(strict) parseError("Attributes must be quoted"); @@ -2240,8 +2239,7 @@ class Document { if(!caseSensitive) tname = tname.toLower; - return Ele(1, null, tname); // closing tag reports itself here - break; + return Ele(1, null, tname); // closing tag reports itself here case ' ': // assume it isn't a real element... if(strict) parseError("bad markup - improperly placed <"); @@ -2364,10 +2362,8 @@ class Document { default: assert(0); case '/': // self closing tag return addTag(true); - break; case '>': return addTag(false); - break; case ' ': case '\t': case '\n': @@ -2378,11 +2374,8 @@ class Document { switch(data[pos]) { case '/': // self closing tag return addTag(true); - break; case '>': // closed tag; open -- we now read the contents - - return addTag(false); - break; + return addTag(false); default: // it is an attribute string attrName = readAttributeName(); string attrValue = attrName; @@ -2650,7 +2643,7 @@ class Document { string prolog = "\n"; ///. - string toString() const { + override string toString() const { return prolog ~ root.toString(); } @@ -3179,13 +3172,7 @@ int intFromHex(string hex) { current.evenChild = true; break; - case "visited": - case "active": - case "hover": - case "target": - case "focus": - case "checked": - case "selected": + case "visited", "active", "hover", "target", "focus", "checked", "selected": current.attributesPresent ~= "nothing"; // FIXME /* @@ -3196,15 +3183,15 @@ int intFromHex(string hex) { // extensions not implemented //case "text": // takes the text in the element and wraps it in an element, returning it +/ - - case "before": - case "after": + goto case; + case "before", "after": current.attributesPresent ~= "FIXME"; break; default: //if(token.indexOf("lang") == -1) //assert(0, token); + break; } state = State.Starting; break; @@ -3226,7 +3213,7 @@ int intFromHex(string hex) { } break; } - // fallthrough + goto case; case State.ExpectingAttributeCloser: if(token != "]") { // not the closer; consider it part of comparison @@ -3515,7 +3502,7 @@ class CssStyle { } ///. - string toString() { + override string toString() { string ret; if(originatingRule.length) ret = originatingRule ~ " {"; @@ -3638,7 +3625,7 @@ class StyleSheet { /* Copyright: Adam D. Ruppe, 2010 - 2011 License: Boost License 1.0. -Authors: Adam D. Ruppe +Authors: Adam D. Ruppe, with contributions by Nick Sabalausky Copyright Adam D. Ruppe 2010-2011. Distributed under the Boost Software License, Version 1.0. diff --git a/web.d b/web.d index 93d62fe..55d98d8 100644 --- a/web.d +++ b/web.d @@ -168,7 +168,6 @@ class ApiProvider { Document _defaultPage() { throw new Exception("no default"); - return null; } Element _getGenericContainer() @@ -1673,10 +1672,12 @@ void formatAs(T, R)(T ret, R api, ref JSONValue returnValue, string format, stri case "table": auto document = new Document(""); static if(__traits(compiles, structToTable(document, ret))) + { returnValue.str = structToTable(document, ret).toString(); + break; + } else goto badType; - break; default: badType: throw new Exception("Couldn't get result as " ~ format); @@ -2439,3 +2440,14 @@ really isn't bad anyway. The benefit for html was very easy and big. I'm not so sure about css and js. */ + +/* +Copyright: Adam D. Ruppe, 2010 - 2011 +License: Boost License 1.0. +Authors: Adam D. Ruppe, with contributions by Nick Sabalausky + + Copyright Adam D. Ruppe 2010-2011. +Distributed under the Boost Software License, Version 1.0. + (See accompanying file LICENSE_1_0.txt or copy at + http://www.boost.org/LICENSE_1_0.txt) +*/