diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-12-11 03:51:03 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2012-12-11 03:51:03 +0000 |
commit | ae0b7c0063db6236be2d7cf01ddbf2159f77c98c (patch) | |
tree | 2f64d65d018634b8728623e2ca99514541fab8aa /sca-cpp/trunk/modules/atom | |
parent | 1f3796522a078dda5906395ba471d151ad694b6b (diff) |
Port kernel to C++11 and refactor some of the core modules. Convert functors to lambdas, and add C++ const, noexcept and inline annotations to get more efficient generated code.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1419985 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/modules/atom')
-rw-r--r-- | sca-cpp/trunk/modules/atom/atom-test.cpp | 268 | ||||
-rw-r--r-- | sca-cpp/trunk/modules/atom/atom.hpp | 85 |
2 files changed, 173 insertions, 180 deletions
diff --git a/sca-cpp/trunk/modules/atom/atom-test.cpp b/sca-cpp/trunk/modules/atom/atom-test.cpp index 479ed64f29..056e9ea965 100644 --- a/sca-cpp/trunk/modules/atom/atom-test.cpp +++ b/sca-cpp/trunk/modules/atom/atom-test.cpp @@ -38,100 +38,100 @@ ostream* writer(const string& s, ostream* os) { const string itemEntry( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - "<entry xmlns=\"http://www.w3.org/2005/Atom\">\n" - " <title type=\"text\">item</title>\n" - " <id>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</id>\n" - " <author>\n" - " <email>jane@example.com</email>\n" - " </author>\n" - " <updated>Fri Jan 01 08:11:36 PDT 2012</updated>\n" - " <content type=\"application/xml\">\n" - " <item>\n" - " <name>Apple</name>\n" - " <price>$2.99</price>\n" - " </item>\n" - " </content>\n" - " <link href=\"cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b\"/>\n" + "<entry xmlns=\"http://www.w3.org/2005/Atom\">" + "<title type=\"text\">item</title>" + "<id>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</id>" + "<author>" + "<email>jane@example.com</email>" + "</author>" + "<updated>Fri Jan 01 08:11:36 PDT 2012</updated>" + "<content type=\"application/xml\">" + "<item>" + "<name>Apple</name>" + "<price>$2.99</price>" + "</item>" + "</content>" + "<link href=\"cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b\"/>" "</entry>\n"); const string itemTextEntry("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - "<entry xmlns=\"http://www.w3.org/2005/Atom\">\n" - " <title type=\"text\">item</title>\n" - " <id>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</id>\n" - " <author>\n" - " <email>jane@example.com</email>\n" - " </author>\n" - " <updated>Fri Jan 01 08:11:36 PDT 2012</updated>\n" - " <content type=\"text\">Apple</content>\n" - " <link href=\"cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b\"/>\n" + "<entry xmlns=\"http://www.w3.org/2005/Atom\">" + "<title type=\"text\">item</title>" + "<id>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</id>" + "<author>" + "<email>jane@example.com</email>" + "</author>" + "<updated>Fri Jan 01 08:11:36 PDT 2012</updated>" + "<content type=\"text\">Apple</content>" + "<link href=\"cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b\"/>" "</entry>\n"); const string itemNoContentEntry("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - "<entry xmlns=\"http://www.w3.org/2005/Atom\">\n" - " <title type=\"text\">item</title>\n" - " <id>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</id>\n" - " <author>\n" - " <name>jane</name>\n" - " </author>\n" - " <updated>Fri Jan 01 08:11:36 PDT 2012</updated>\n" - " <link href=\"cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b\"/>\n" + "<entry xmlns=\"http://www.w3.org/2005/Atom\">" + "<title type=\"text\">item</title>" + "<id>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</id>" + "<author>" + "<name>jane</name>" + "</author>" + "<updated>Fri Jan 01 08:11:36 PDT 2012</updated>" + "<link href=\"cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b\"/>" "</entry>\n"); const string incompleteEntry("<entry xmlns=\"http://www.w3.org/2005/Atom\">\n" - " <title>item</title>\n" - " <content type=\"text/xml\">\n" - " <Item xmlns=\"http://services/\">\n" - " <name xmlns=\"\">Orange</name>\n" - " <price xmlns=\"\">3.55</price>\n" - " </Item>\n" - " </content>\n" + "<title>item</title>" + "<content type=\"text/xml\">" + "<Item xmlns=\"http://services/\">" + "<name xmlns=\"\">Orange</name>" + "<price xmlns=\"\">3.55</price>" + "</Item>" + "</content>" "</entry>\n"); const string completedEntry("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - "<entry xmlns=\"http://www.w3.org/2005/Atom\">\n" - " <title type=\"text\">item</title>\n" - " <id></id>\n" - " <content type=\"application/xml\">\n" - " <Item xmlns=\"http://services/\">\n" - " <name xmlns=\"\">Orange</name>\n" - " <price xmlns=\"\">3.55</price>\n" - " </Item>\n" - " </content>\n" - " <link href=\"\"/>\n" + "<entry xmlns=\"http://www.w3.org/2005/Atom\">" + "<title type=\"text\">item</title>" + "<id></id>" + "<content type=\"application/xml\">" + "<Item xmlns=\"http://services/\">" + "<name xmlns=\"\">Orange</name>" + "<price xmlns=\"\">3.55</price>" + "</Item>" + "</content>" + "<link href=\"\"/>" "</entry>\n"); -bool testEntry() { +const bool testEntry() { { - const list<value> i = list<value>() + element + value("item") - + value(list<value>() + element + value("name") + value(string("Apple"))) - + value(list<value>() + element + value("price") + value(string("$2.99"))); - const list<value> a = list<value>() + (list<value>() + element + value("entry") - + value(list<value>() + element + value("title") + value(string("item"))) - + value(list<value>() + element + value("id") + value(string("cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b"))) - + value(list<value>() + element + value("author") + value(string("jane@example.com"))) - + value(list<value>() + element + value("updated") + value(string("Fri Jan 01 08:11:36 PDT 2012"))) - + value(list<value>() + element + value("content") + value(i))); + const list<value> i = nilListValue + element + value("item") + + value(nilListValue + element + value("name") + value(string("Apple"))) + + value(nilListValue + element + value("price") + value(string("$2.99"))); + const list<value> a = nilListValue + (nilListValue + element + value("entry") + + value(nilListValue + element + value("title") + value(string("item"))) + + value(nilListValue + element + value("id") + value(string("cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b"))) + + value(nilListValue + element + value("author") + value(string("jane@example.com"))) + + value(nilListValue + element + value("updated") + value(string("Fri Jan 01 08:11:36 PDT 2012"))) + + value(nilListValue + element + value("content") + value(i))); ostringstream os; writeATOMEntry<ostream*>(writer, &os, a); assert(str(os) == itemEntry); } { - const list<value> a = list<value>() + (list<value>() + element + value("entry") - + value(list<value>() + element + value("title") + value(string("item"))) - + value(list<value>() + element + value("id") + value(string("cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b"))) - + value(list<value>() + element + value("author") + value(string("jane@example.com"))) - + value(list<value>() + element + value("updated") + value(string("Fri Jan 01 08:11:36 PDT 2012"))) - + value(list<value>() + element + value("content") + value(string("Apple")))); + const list<value> a = nilListValue + (nilListValue + element + value("entry") + + value(nilListValue + element + value("title") + value(string("item"))) + + value(nilListValue + element + value("id") + value(string("cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b"))) + + value(nilListValue + element + value("author") + value(string("jane@example.com"))) + + value(nilListValue + element + value("updated") + value(string("Fri Jan 01 08:11:36 PDT 2012"))) + + value(nilListValue + element + value("content") + value(string("Apple")))); ostringstream os; writeATOMEntry<ostream*>(writer, &os, a); assert(str(os) == itemTextEntry); } { - const list<value> a = list<value>() + (list<value>() + element + value("entry") - + value(list<value>() + element + value("title") + value(string("item"))) - + value(list<value>() + element + value("id") + value(string("cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b"))) - + value(list<value>() + element + value("author") + value(string("jane"))) - + value(list<value>() + element + value("updated") + value(string("Fri Jan 01 08:11:36 PDT 2012")))); + const list<value> a = nilListValue + (nilListValue + element + value("entry") + + value(nilListValue + element + value("title") + value(string("item"))) + + value(nilListValue + element + value("id") + value(string("cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b"))) + + value(nilListValue + element + value("author") + value(string("jane"))) + + value(nilListValue + element + value("updated") + value(string("Fri Jan 01 08:11:36 PDT 2012")))); ostringstream os; writeATOMEntry<ostream*>(writer, &os, a); assert(str(os) == itemNoContentEntry); @@ -164,54 +164,54 @@ bool testEntry() { } const string emptyFeed("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - "<feed xmlns=\"http://www.w3.org/2005/Atom\">\n" - " <title type=\"text\">Feed</title>\n" - " <id>1234</id>\n" + "<feed xmlns=\"http://www.w3.org/2005/Atom\">" + "<title type=\"text\">Feed</title>" + "<id>1234</id>" "</feed>\n"); const string itemFeed("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" - "<feed xmlns=\"http://www.w3.org/2005/Atom\">\n" - " <title type=\"text\">Feed</title>\n" - " <id>1234</id>\n" - " <entry xmlns=\"http://www.w3.org/2005/Atom\">\n" - " <title type=\"text\">item</title>\n" - " <id>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</id>\n" - " <author>\n" - " <email>jane@example.com</email>\n" - " </author>\n" - " <updated>Fri Jan 01 08:11:36 PDT 2012</updated>\n" - " <content type=\"application/xml\">\n" - " <item>\n" - " <name>Apple</name>\n" - " <price>$2.99</price>\n" - " </item>\n" - " </content>\n" - " <link href=\"cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b\"/>\n" - " </entry>\n" - " <entry xmlns=\"http://www.w3.org/2005/Atom\">\n" - " <title type=\"text\">item</title>\n" - " <id>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83c</id>\n" - " <author>\n" - " <email>jane@example.com</email>\n" - " </author>\n" - " <updated>Fri Jan 01 08:11:36 PDT 2012</updated>\n" - " <content type=\"application/xml\">\n" - " <item>\n" - " <name>Orange</name>\n" - " <price>$3.55</price>\n" - " </item>\n" - " </content>\n" - " <link href=\"cart-53d67a61-aa5e-4e5e-8401-39edeba8b83c\"/>\n" - " </entry>\n" + "<feed xmlns=\"http://www.w3.org/2005/Atom\">" + "<title type=\"text\">Feed</title>" + "<id>1234</id>" + "<entry xmlns=\"http://www.w3.org/2005/Atom\">" + "<title type=\"text\">item</title>" + "<id>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b</id>" + "<author>" + "<email>jane@example.com</email>" + "</author>" + "<updated>Fri Jan 01 08:11:36 PDT 2012</updated>" + "<content type=\"application/xml\">" + "<item>" + "<name>Apple</name>" + "<price>$2.99</price>" + "</item>" + "</content>" + "<link href=\"cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b\"/>" + "</entry>" + "<entry xmlns=\"http://www.w3.org/2005/Atom\">" + "<title type=\"text\">item</title>" + "<id>cart-53d67a61-aa5e-4e5e-8401-39edeba8b83c</id>" + "<author>" + "<email>jane@example.com</email>" + "</author>" + "<updated>Fri Jan 01 08:11:36 PDT 2012</updated>" + "<content type=\"application/xml\">" + "<item>" + "<name>Orange</name>" + "<price>$3.55</price>" + "</item>" + "</content>" + "<link href=\"cart-53d67a61-aa5e-4e5e-8401-39edeba8b83c\"/>" + "</entry>" "</feed>\n"); -bool testFeed() { +const bool testFeed() { { - const list<value> a = list<value>() + (list<value>() + element + value("feed") - + value(list<value>() + element + value("title") + value(string("Feed"))) - + value(list<value>() + element + value("id") + value(string("1234"))) - + value(list<value>() + element + value("author") + value(string("jane@example.com"))) - + value(list<value>() + element + value("updated") + value(string("Fri Jan 01 08:11:36 PDT 2012")))); + const list<value> a = nilListValue + (nilListValue + element + value("feed") + + value(nilListValue + element + value("title") + value(string("Feed"))) + + value(nilListValue + element + value("id") + value(string("1234"))) + + value(nilListValue + element + value("author") + value(string("jane@example.com"))) + + value(nilListValue + element + value("updated") + value(string("Fri Jan 01 08:11:36 PDT 2012")))); ostringstream os; writeATOMFeed<ostream*>(writer, &os, a); assert(str(os) == emptyFeed); @@ -223,31 +223,31 @@ bool testFeed() { assert(str(os) == emptyFeed); } { - const list<value> i1 = list<value>() + element + "item" - + (list<value>() + element + "name" + "Apple") - + (list<value>() + element + "price" + "$2.99"); + const list<value> i1 = nilListValue + element + "item" + + (nilListValue + element + "name" + "Apple") + + (nilListValue + element + "price" + "$2.99"); - const list<value> i2 = list<value>() + element + "item" - + (list<value>() + element + "name" + "Orange") - + (list<value>() + element + "price" + "$3.55"); + const list<value> i2 = nilListValue + element + "item" + + (nilListValue + element + "name" + "Orange") + + (nilListValue + element + "price" + "$3.55"); - const list<value> i = list<value>() - + value(list<value>() + element + value("entry") - + value(list<value>() + element + value("title") + value(string("item"))) - + value(list<value>() + element + value("id") + value(string("cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b"))) - + value(list<value>() + element + value("author") + value(string("jane@example.com"))) - + value(list<value>() + element + value("updated") + value(string("Fri Jan 01 08:11:36 PDT 2012"))) - + value(list<value>() + element + value("content") + value(i1))) - + value(list<value>() + element + value("entry") - + value(list<value>() + element + value("title") + value(string("item"))) - + value(list<value>() + element + value("id") + value(string("cart-53d67a61-aa5e-4e5e-8401-39edeba8b83c"))) - + value(list<value>() + element + value("author") + value(string("jane@example.com"))) - + value(list<value>() + element + value("updated") + value(string("Fri Jan 01 08:11:36 PDT 2012"))) - + value(list<value>() + element + value("content") + value(i2))); + const list<value> i = nilListValue + + value(nilListValue + element + value("entry") + + value(nilListValue + element + value("title") + value(string("item"))) + + value(nilListValue + element + value("id") + value(string("cart-53d67a61-aa5e-4e5e-8401-39edeba8b83b"))) + + value(nilListValue + element + value("author") + value(string("jane@example.com"))) + + value(nilListValue + element + value("updated") + value(string("Fri Jan 01 08:11:36 PDT 2012"))) + + value(nilListValue + element + value("content") + value(i1))) + + value(nilListValue + element + value("entry") + + value(nilListValue + element + value("title") + value(string("item"))) + + value(nilListValue + element + value("id") + value(string("cart-53d67a61-aa5e-4e5e-8401-39edeba8b83c"))) + + value(nilListValue + element + value("author") + value(string("jane@example.com"))) + + value(nilListValue + element + value("updated") + value(string("Fri Jan 01 08:11:36 PDT 2012"))) + + value(nilListValue + element + value("content") + value(i2))); - const list<value> a = list<value>() + (append<value>(list<value>() + element + value("feed") - + value(list<value>() + element + value("title") + value(string("Feed"))) - + value(list<value>() + element + value("id") + value("1234")), + const list<value> a = nilListValue + (append<value>(nilListValue + element + value("feed") + + value(nilListValue + element + value("title") + value(string("Feed"))) + + value(nilListValue + element + value("id") + value("1234")), i)); ostringstream os; @@ -273,7 +273,7 @@ bool testFeed() { } int main() { - tuscany::gc_scoped_pool p; + const tuscany::gc_scoped_pool p; tuscany::cout << "Testing..." << tuscany::endl; tuscany::atom::testEntry(); diff --git a/sca-cpp/trunk/modules/atom/atom.hpp b/sca-cpp/trunk/modules/atom/atom.hpp index 5de3894214..2f6e688bcb 100644 --- a/sca-cpp/trunk/modules/atom/atom.hpp +++ b/sca-cpp/trunk/modules/atom/atom.hpp @@ -30,7 +30,7 @@ #include "list.hpp" #include "value.hpp" #include "monad.hpp" -#include "xml.hpp" +#include "../xml/xml.hpp" namespace tuscany { namespace atom { @@ -46,24 +46,24 @@ const value entry("entry"); */ const list<value> entryElementValues(const list<value>& e) { const list<value> lt = filter<value>(selector(mklist<value>(element, "title")), e); - const list<value> t = list<value>() + element + value("title") + (isNil(lt)? value(emptyString) : elementValue(car(lt))); + const list<value> t = nilListValue + element + value("title") + (isNil(lt)? value(emptyString) : elementValue(car(lt))); const list<value> li = filter<value>(selector(mklist<value>(element, "id")), e); - const list<value> i = list<value>() + element + value("id") + (isNil(li)? value(emptyString) : elementValue(car(li))); + const list<value> i = nilListValue + element + value("id") + (isNil(li)? value(emptyString) : elementValue(car(li))); const list<value> la = filter<value>(selector(mklist<value>(element, "author")), e); - const list<value> lan = isNil(la)? list<value>() : filter<value>(selector(mklist<value>(element, "name")), car(la)); - const list<value> lae = isNil(la)? list<value>() : filter<value>(selector(mklist<value>(element, "email")), car(la)); + const list<value> lan = isNil(la)? nilListValue : filter<value>(selector(mklist<value>(element, "name")), car(la)); + const list<value> lae = isNil(la)? nilListValue : filter<value>(selector(mklist<value>(element, "email")), car(la)); const list<value> laa = isNil(lan)? lae : lan; - const list<value> a = isNil(laa)? list<value>() : mklist<value>(list<value>() + element + value("author") + elementValue(car(laa))); + const list<value> a = isNil(laa)? nilListValue : mklist<value>(nilListValue + element + value("author") + elementValue(car(laa))); const list<value> lu = filter<value>(selector(mklist<value>(element, "updated")), e); - const list<value> u = isNil(lu)? list<value>() : mklist<value>(list<value>() + element + value("updated") + elementValue(car(lu))); + const list<value> u = isNil(lu)? nilListValue : mklist<value>(nilListValue + element + value("updated") + elementValue(car(lu))); const list<value> lc = filter<value>(selector(mklist<value>(element, "content")), e); - const list<value> c = isNil(lc)? list<value>() : mklist<value>(list<value>() + element + value("content") + elementValue(car(lc))); + const list<value> c = isNil(lc)? nilListValue : mklist<value>(nilListValue + element + value("content") + elementValue(car(lc))); - return append<value>(append<value>(append<value>(list<value>() + element + entry + value(t) + value(i), a), u), c); + return append<value>(append<value>(append<value>(nilListValue + element + entry + value(t) + value(i), a), u), c); } /** @@ -79,7 +79,7 @@ const list<value> entriesElementValues(const list<value>& e) { * Return true if a list of strings contains an ATOM feed. */ const bool isATOMFeed(const list<string>& ls) { - if (!isXML(ls)) + if (!xml::isXML(ls)) return false; return contains(car(ls), "<feed") && contains(car(ls), "=\"http://www.w3.org/2005/Atom\""); } @@ -88,7 +88,7 @@ const bool isATOMFeed(const list<string>& ls) { * Return true if a list of strings contains an ATOM entry. */ const bool isATOMEntry(const list<string>& ls) { - if (!isXML(ls)) + if (!xml::isXML(ls)) return false; return contains(car(ls), "<entry") && !contains(car(ls), "<feed") && contains(car(ls), "=\"http://www.w3.org/2005/Atom\""); } @@ -97,7 +97,7 @@ const bool isATOMEntry(const list<string>& ls) { * Convert a list of strings to a list of values representing an ATOM entry. */ const failable<list<value> > readATOMEntry(const list<string>& ilist) { - const list<value> e = readXML(ilist); + const list<value> e = content(xml::readElements(ilist)); if (isNil(e)) return mkfailure<list<value> >("Empty entry"); return mklist<value>(entryElementValues(car(e))); @@ -107,32 +107,25 @@ const failable<list<value> > readATOMEntry(const list<string>& ilist) { * Convert a list of strings to a list of values representing an ATOM feed. */ const failable<list<value> > readATOMFeed(const list<string>& ilist) { - const list<value> f = readXML(ilist); + const list<value> f = content(xml::readElements(ilist)); if (isNil(f)) return mkfailure<list<value> >("Empty feed"); const list<value> t = filter<value>(selector(mklist<value>(element, "title")), car(f)); const list<value> i = filter<value>(selector(mklist<value>(element, "id")), car(f)); const list<value> e = filter<value>(selector(mklist<value>(element, entry)), car(f)); - return mklist<value>(append<value>(list<value>() + element + feed - + value(list<value>() + element + value("title") + elementValue(car(t))) - + value(list<value>() + element + value("id") + elementValue(car(i))), + return mklist<value>(append<value>(nilListValue + element + feed + + value(nilListValue + element + value("title") + elementValue(car(t))) + + value(nilListValue + element + value("id") + elementValue(car(i))), entriesElementValues(e))); } /** * Returns children of an ATOM content element. */ -struct filterContentElementChildren { - const value type; - filterContentElementChildren() : type("type") { - } - const bool operator()(const value& v) const { - return !(isAttribute(v) && attributeName((list<value>)v) == type); - } -}; - const list<value> contentElementChildren(const value& content) { - return filter<value>(filterContentElementChildren(), elementChildren(content)); + return filter<value>([](const value& v) { + return !(isAttribute(v) && attributeName((list<value>)v) == "type"); + }, elementChildren(content)); } /** @@ -146,18 +139,18 @@ const list<value> entryElement(const list<value>& l) { const value updated = elementChild("updated", l); const value content = elementChild("content", l); const bool text = isNil(content)? false : elementHasValue(content); - return list<value>() - + element + entry + (list<value>() + attribute + "xmlns" + "http://www.w3.org/2005/Atom") - + (list<value>() + element + "title" + (list<value>() + attribute + "type" + "text") + elementValue(title)) - + (list<value>() + element + "id" + elementValue(id)) - + (isNil(author)? list<value>() : (list<value>() + element + "author" + - (email? (list<value>() + element + "email" + elementValue(author)) : (list<value>() + element + "name" + elementValue(author))))) - + (isNil(updated)? list<value>() : (list<value>() + element + "updated" + elementValue(updated))) + return nilListValue + + element + entry + (nilListValue + attribute + "xmlns" + "http://www.w3.org/2005/Atom") + + (nilListValue + element + "title" + (nilListValue + attribute + "type" + "text") + elementValue(title)) + + (nilListValue + element + "id" + elementValue(id)) + + (isNil(author)? nilListValue : (nilListValue + element + "author" + + (email? (nilListValue + element + "email" + elementValue(author)) : (nilListValue + element + "name" + elementValue(author))))) + + (isNil(updated)? nilListValue : (nilListValue + element + "updated" + elementValue(updated))) + (isNil(content)? - list<value>() : - append<value>(list<value>() + element + "content" + (list<value>() + attribute + "type" + (text? "text" : "application/xml")), + nilListValue : + append<value>(nilListValue + element + "content" + (nilListValue + attribute + "type" + (text? "text" : "application/xml")), text? mklist<value>(elementValue(content)) : contentElementChildren(content))) - + (list<value>() + element + "link" + (list<value>() + attribute + "href" + elementValue(id))); + + (nilListValue + element + "link" + (nilListValue + attribute + "href" + elementValue(id))); } /** @@ -172,9 +165,9 @@ const list<value> entriesElements(const list<value>& l) { /** * Convert a list of element values representing an ATOM entry to an ATOM entry. */ -template<typename R> const failable<R> writeATOMEntry(const lambda<R(const string&, const R)>& reduce, const R& initial, const list<value>& ll) { +template<typename R> const failable<R> writeATOMEntry(const lambda<const R(const string&, const R)>& reduce, const R& initial, const list<value>& ll) { const list<value> l = isNil(ll)? ll : (list<value>)car(ll); - return writeXML<R>(reduce, initial, mklist<value>(entryElement(l))); + return xml::writeElements<R>(reduce, initial, mklist<value>(entryElement(l))); } const failable<list<string> > writeATOMEntry(const list<value>& l) { @@ -187,31 +180,31 @@ const failable<list<string> > writeATOMEntry(const list<value>& l) { /** * Convert a list of element values representing an ATOM feed to an ATOM feed. */ -template<typename R> const failable<R> writeATOMFeed(const lambda<R(const string&, const R)>& reduce, const R& initial, const list<value>& ll) { +template<typename R> const failable<R> writeATOMFeed(const lambda<const R(const string&, const R)>& reduce, const R& initial, const list<value>& ll) { const list<value> l = isNil(ll)? ll : (list<value>)car(ll); const list<value> lt = filter<value>(selector(mklist<value>(element, "title")), l); const value t = isNil(lt)? value(emptyString) : elementValue(car(lt)); const list<value> li = filter<value>(selector(mklist<value>(element, "id")), l); const value i = isNil(li)? value(emptyString) : elementValue(car(li)); - const list<value> f = list<value>() - + element + feed + (list<value>() + attribute + "xmlns" + "http://www.w3.org/2005/Atom") - + (list<value>() + element + "title" + (list<value>() + attribute + "type" + "text") + t) - + (list<value>() + element + "id" + i); + const list<value> f = nilListValue + + element + feed + (nilListValue + attribute + "xmlns" + "http://www.w3.org/2005/Atom") + + (nilListValue + element + "title" + (nilListValue + attribute + "type" + "text") + t) + + (nilListValue + element + "id" + i); // Write ATOM entries const list<value> le = filter<value>(selector(mklist<value>(element, entry)), l); if (isNil(le)) - return writeXML<R>(reduce, initial, mklist<value>(f)); + return xml::writeElements<R>(reduce, initial, mklist<value>(f)); // Write a single ATOM entry element with a list of values if (!isNil(le) && !isNil(car(le)) && isList(car<value>(caddr<value>(car(le))))) { const list<value> fe = append(f, entriesElements(caddr<value>(car(le)))); - return writeXML<R>(reduce, initial, mklist<value>(fe)); + return xml::writeElements<R>(reduce, initial, mklist<value>(fe)); } // Write separate ATOM entry elements const list<value> fe = append(f, entriesElements(le)); - return writeXML<R>(reduce, initial, mklist<value>(fe)); + return xml::writeElements<R>(reduce, initial, mklist<value>(fe)); } /** |