Refactoring, rename isNil to isNull.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1428206 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 40 insertions, 40 deletions

diff --git a/sca-cpp/trunk/components/cache/datacache.cpp b/sca-cpp/trunk/components/cache/datacache.cpp
index 4fafd9e345..b96fe92b71 100644
--- a/sca-cpp/trunk/components/cache/datacache.cpp
+++ b/sca-cpp/trunk/components/cache/datacache.cpp
@@ -48,12 +48,12 @@ const failable<value> get(const value& key, const lvvlambda& rcache1, const lvvl
 
     // Lookup level1 cache
     const value val1 = rcache1(mklist<value>("get", key));
-    if (!isNil(val1))
+    if (!isNull(val1))
         return val1;
 
     // Lookup level2 cache
     const value val2 = rcache2(mklist<value>("get", key));
-    if (isNil(val2)) {
+    if (isNull(val2)) {
         ostringstream os;
         os << "Couldn't get cache entry: " << key;
         return mkfailure<value>(str(os), 404, false);
diff --git a/sca-cpp/trunk/components/cache/memcache.cpp b/sca-cpp/trunk/components/cache/memcache.cpp
index e1a3c7e9af..a15250c37b 100644
--- a/sca-cpp/trunk/components/cache/memcache.cpp
+++ b/sca-cpp/trunk/components/cache/memcache.cpp
@@ -68,7 +68,7 @@ const failable<value> put(const list<value>& params, const memcache::MemCached&
 const failable<value> patch(const list<value>& params, const memcache::MemCached& ch) {
     // Read patch
     value p = assoc<value>("patch", assoc<value>("content", car<value>(cadr(params))));
-    if (isNil(p))
+    if (isNull(p))
         return mkfailure<value>("Couldn't read patch script");
     const string script = cadr<value>(p);
     debug(script, "memcache::patch::script");
@@ -82,7 +82,7 @@ const failable<value> patch(const list<value>& params, const memcache::MemCached
     // Apply patch
     scheme::Env env = scheme::setupEnvironment();
     const value pval = scheme::evalScript(cons<value>("patch", scheme::quotedParameters(mklist<value>(car(params), hasContent(ival)? content(ival) : (value)list<value>()))), is, env);
-    if (isNil(pval)) {
+    if (isNull(pval)) {
         ostringstream os;
         os << "Couldn't patch memcached entry: " << car(params);
         return mkfailure<value>(str(os), 404, false);
@@ -109,7 +109,7 @@ const failable<value> del(const list<value>& params, const memcache::MemCached&
  * Convert a list of properties to a list of server addresses.
  */
 const list<string> servers(const list<value>& params) {
-    if (isNil(params))
+    if (isNull(params))
         return list<string>();
     const value s = ((lvvlambda)car(params))(nilListValue);
     return cons<string>(s, servers(cdr(params)));
diff --git a/sca-cpp/trunk/components/cache/memcache.hpp b/sca-cpp/trunk/components/cache/memcache.hpp
index 7962d1caa0..06e2061a09 100644
--- a/sca-cpp/trunk/components/cache/memcache.hpp
+++ b/sca-cpp/trunk/components/cache/memcache.hpp
@@ -95,10 +95,10 @@ private:
     }
 
     const failable<bool> addServers(apr_memcache_t* const m, const list<string>& servers) {
-        if (isNil(servers))
+        if (isNull(servers))
             return true;
         const list<string> toks = tokenize(":", car(servers));
-        const failable<bool> r = addServer(m, car(toks), isNil(cdr(toks))? 11211 : atoi(c_str(cadr(toks))));
+        const failable<bool> r = addServer(m, car(toks), isNull(cdr(toks))? 11211 : atoi(c_str(cadr(toks))));
         if (!hasContent(r))
             return r;
         return addServers(m, cdr(servers));
diff --git a/sca-cpp/trunk/components/cache/memocache.cpp b/sca-cpp/trunk/components/cache/memocache.cpp
index 5539ccee2f..6ac3cece26 100644
--- a/sca-cpp/trunk/components/cache/memocache.cpp
+++ b/sca-cpp/trunk/components/cache/memocache.cpp
@@ -47,7 +47,7 @@ const failable<value> memoize(const list<value>& params, const lvvlambda& relay,
 
     // Lookup memoized value from cache
     const value val = cache(mklist<value>("get", params));
-    if (!isNil(val)) {
+    if (!isNull(val)) {
         debug(val, "memocache::memoize::cached");
         return val;
     }
diff --git a/sca-cpp/trunk/components/cache/partitioner.cpp b/sca-cpp/trunk/components/cache/partitioner.cpp
index 8a56a7f932..c7c49c04de 100644
--- a/sca-cpp/trunk/components/cache/partitioner.cpp
+++ b/sca-cpp/trunk/components/cache/partitioner.cpp
@@ -44,7 +44,7 @@ const failable<list<value> > partition(const value& key, const lvvlambda& select
 
     // Call the selector component to convert the given key to a list of partitions
     const value p = selector(mklist<value>("get", key, partitions));
-    if (isNil(p)) {
+    if (isNull(p)) {
         ostringstream os;
         os << "Couldn't get partition: " << key;
         return mkfailure<list<value> >(str(os), -1, false);
@@ -57,12 +57,12 @@ const failable<list<value> > partition(const value& key, const lvvlambda& select
  * Get lists of items from a list of partitions.
  */
 const failable<list<value> > getlist(const value& key, const list<value>& partitions) {
-    if (isNil(partitions))
+    if (isNull(partitions))
         return nilListValue;
 
     const lvvlambda l = car(partitions);
     const value val = l(mklist<value>("get", key));
-    if (isNil(val))
+    if (isNull(val))
         return getlist(key, cdr(partitions));
     if (!isList(val)) {
         ostringstream os;
@@ -92,7 +92,7 @@ const failable<value> get(const value& key, const lvvlambda& selector, const lis
     if (length(p) == 1) {
         const lvvlambda l = car(p);
         const value val = l(mklist<value>("get", key));
-        if (isNil(val)) {
+        if (isNull(val)) {
             ostringstream os;
             os << "Couldn't get entry from partition: " << key;
             return mkfailure<value>(str(os), 404, false);
diff --git a/sca-cpp/trunk/components/chat/chat-sendreceiver.cpp b/sca-cpp/trunk/components/chat/chat-sendreceiver.cpp
index 94577b7551..7669f91f36 100644
--- a/sca-cpp/trunk/components/chat/chat-sendreceiver.cpp
+++ b/sca-cpp/trunk/components/chat/chat-sendreceiver.cpp
@@ -55,7 +55,7 @@ const failable<value> post(const list<value>& params, XMPPClient& xc) {
  */
 const failable<value> start(const list<value>& params) {
     // Extract the relay reference and the XMPP JID and password
-    const bool hasRelay = !isNil(cddr(params));
+    const bool hasRelay = !isNull(cddr(params));
     const lvvlambda rel = hasRelay? (lvvlambda)car(params) : lvvlambda();
     const list<value> props = hasRelay? cdr(params) : params;
     const value jid = ((lvvlambda)car(props))(nilListValue);
@@ -71,7 +71,7 @@ const failable<value> start(const list<value>& params) {
     worker w(3);
     const lambda<const failable<bool>(const value&, const value&, XMPPClient&)> rl = [rel](const value& jid, const value& val, unused XMPPClient& xc) -> const failable<bool> {
         // A relay function that posts the XMPP messages it receives to a relay component reference.
-        if (isNil(rel))
+        if (isNull(rel))
             return true;
         debug(jid, "chat::relay::jid");
         debug(val, "chat::relay::value");
diff --git a/sca-cpp/trunk/components/chat/xmpp.hpp b/sca-cpp/trunk/components/chat/xmpp.hpp
index 31b4ed3a13..945f1cadc1 100644
--- a/sca-cpp/trunk/components/chat/xmpp.hpp
+++ b/sca-cpp/trunk/components/chat/xmpp.hpp
@@ -176,7 +176,7 @@ int messageHandler(unused xmpp_conn_t* const conn, xmpp_stanza_t* const stanza,
     XMPPClient& xc = *(XMPPClient*)udata;
     const char* const from = xmpp_stanza_get_attribute(stanza, "from");
     const char* const text = xmpp_stanza_get_text(xmpp_stanza_get_child_by_name(stanza, "body"));
-    if (isNil((lambda<const failable<bool>(const value&, const value&, XMPPClient&)>)xc.listener))
+    if (isNull((lambda<const failable<bool>(const value&, const value&, XMPPClient&)>)xc.listener))
         return 1;
     const value val(content(scheme::readValue(text)));
     debug(from, "chat::messageHandler::from");
@@ -315,7 +315,7 @@ const failable<bool> listen(const lambda<const failable<bool>(const value&, cons
     xc.listener = listener;
     xmpp_handler_add(xc.conn, messageHandler, NULL, "message", NULL, &xc);
     xc.ctx->loop_status = XMPP_LOOP_RUNNING;
-    while(xc.connected && !isNil((lambda<const failable<bool>(const value&, const value&, XMPPClient&)>)xc.listener) && xc.ctx->loop_status == XMPP_LOOP_RUNNING)
+    while(xc.connected && !isNull((lambda<const failable<bool>(const value&, const value&, XMPPClient&)>)xc.listener) && xc.ctx->loop_status == XMPP_LOOP_RUNNING)
         xmpp_run_once(xc.ctx, 1000L);
     return true;
 }
diff --git a/sca-cpp/trunk/components/constdb/constdb.cpp b/sca-cpp/trunk/components/constdb/constdb.cpp
index 2d34ed2b73..d5d2d05e3a 100644
--- a/sca-cpp/trunk/components/constdb/constdb.cpp
+++ b/sca-cpp/trunk/components/constdb/constdb.cpp
@@ -68,7 +68,7 @@ const failable<value> put(const list<value>& params, const tinycdb::TinyCDB& cdb
 const failable<value> patch(const list<value>& params, const tinycdb::TinyCDB& cdb) {
     // Read patch
     value p = assoc<value>("patch", assoc<value>("content", car<value>(cadr(params))));
-    if (isNil(p))
+    if (isNull(p))
         return mkfailure<value>("Couldn't read patch script");
     const string script = cadr<value>(p);
     debug(script, "tinycdb::patch::script");
@@ -82,7 +82,7 @@ const failable<value> patch(const list<value>& params, const tinycdb::TinyCDB& c
     // Apply patch
     scheme::Env env = scheme::setupEnvironment();
     const value pval = scheme::evalScript(cons<value>("patch", scheme::quotedParameters(mklist<value>(car(params), hasContent(ival)? content(ival) : (value)list<value>()))), is, env);
-    if (isNil(pval)) {
+    if (isNull(pval)) {
         ostringstream os;
         os << "Couldn't patch tinycdb entry: " << car(params);
         return mkfailure<value>(str(os), 404, false);
diff --git a/sca-cpp/trunk/components/filedb/filedb.cpp b/sca-cpp/trunk/components/filedb/filedb.cpp
index b28cc9bedb..efc5838fa6 100644
--- a/sca-cpp/trunk/components/filedb/filedb.cpp
+++ b/sca-cpp/trunk/components/filedb/filedb.cpp
@@ -68,7 +68,7 @@ const failable<value> put(const list<value>& params, const filedb::FileDB& db) {
 const failable<value> patch(const list<value>& params, const filedb::FileDB& db) {
     // Read patch
     value p = assoc<value>("patch", assoc<value>("content", car<value>(cadr(params))));
-    if (isNil(p))
+    if (isNull(p))
         return mkfailure<value>("Couldn't read patch script");
     const string script = cadr<value>(p);
     debug(script, "filedb::patch::script");
@@ -82,7 +82,7 @@ const failable<value> patch(const list<value>& params, const filedb::FileDB& db)
     // Apply patch
     scheme::Env env = scheme::setupEnvironment();
     const value pval = scheme::evalScript(cons<value>("patch", scheme::quotedParameters(mklist<value>(car(params), hasContent(ival)? content(ival) : (value)list<value>()))), is, env);
-    if (isNil(pval)) {
+    if (isNull(pval)) {
         ostringstream os;
         os << "Couldn't patch file database entry: " << car(params);
         return mkfailure<value>(str(os), 404, false);
diff --git a/sca-cpp/trunk/components/filedb/filedb.hpp b/sca-cpp/trunk/components/filedb/filedb.hpp
index 41dde88bef..89e0c1b424 100644
--- a/sca-cpp/trunk/components/filedb/filedb.hpp
+++ b/sca-cpp/trunk/components/filedb/filedb.hpp
@@ -91,7 +91,7 @@ private:
  * Convert a key to a file name.
  */
 const string filename(const list<value>& path, const string& root) {
-    if (isNil(path))
+    if (isNull(path))
         return root;
     const string name = root + "/" + (isString(car(path))? (string)car(path) : write(content(scheme::writeValue(car(path)))));
     return filename(cdr(path), name);
@@ -107,7 +107,7 @@ const string filename(const value& key, const string& root) {
  * Make the parent directories of a keyed file.
  */
 const failable<bool> mkdirs(const list<value>& path, const string& root) {
-    if (isNil(cdr(path)))
+    if (isNull(cdr(path)))
         return true;
     const string dir = root + "/" + (isString(car(path))? (string)car(path) : write(content(scheme::writeValue(car(path)))));
     mkdir(c_str(dir), S_IRWXU);
diff --git a/sca-cpp/trunk/components/sqldb/pgsql.hpp b/sca-cpp/trunk/components/sqldb/pgsql.hpp
index 5e0004c4e6..e7c7c5d5cd 100644
--- a/sca-cpp/trunk/components/sqldb/pgsql.hpp
+++ b/sca-cpp/trunk/components/sqldb/pgsql.hpp
@@ -320,7 +320,7 @@ const failable<bool> patch(const value& key, const value& val, const PGSql& pgsq
  * Convert a key to an item id.
  */
 const list<value> keyid(const list<value>& key) {
-    if (isNil(key))
+    if (isNull(key))
         return nilListValue;
     if (isList(car(key)))
         return keyid(cdr(key));
@@ -331,7 +331,7 @@ const list<value> keyid(const list<value>& key) {
  * Convert a key to a (param name, value) assoc.
  */
 const list<value> keyparams(const list<value>& key) {
-    if (isNil(key))
+    if (isNull(key))
         return nilListValue;
     if (!isList(car(key)))
         return keyparams(cdr(key));
@@ -386,11 +386,11 @@ const failable<value> get(const value& key, const PGSql& pgsql) {
     const list<value> rank = assoc<value>("rank", kparams);
     const list<value> id = lk? keyid(key) : nilListValue;
     const list<value> atable = assoc<value>("table", kparams);
-    const string table = isNil(atable)? pgsql.table : (string)cadr(atable);
+    const string table = isNull(atable)? pgsql.table : (string)cadr(atable);
     const list<value> akname = assoc<value>("kcolumn", kparams);
-    const string kname = isNil(akname)? pgsql.kname : (string)cadr(akname);
+    const string kname = isNull(akname)? pgsql.kname : (string)cadr(akname);
     const list<value> avname = assoc<value>("vcolumn", kparams);
-    const string vname = isNil(avname)? pgsql.vname : (string)cadr(avname);
+    const string vname = isNull(avname)? pgsql.vname : (string)cadr(avname);
 
     // Build the SQL query
     const char* sqlparams[6];
@@ -398,60 +398,60 @@ const failable<value> get(const value& key, const PGSql& pgsql) {
     int w = 0;
     ostringstream sqlos;
     sqlos << "select data." << kname << ", data." << vname;
-    if (!isNil(textsearch)) {
+    if (!isNull(textsearch)) {
         // Text search, setup text result ranking
         sqlos << ", ts_rank_cd(to_tsvector(data." << vname << "), tsquery, 32) as tsrank";
     }
-    if (!isNil(rank)) {
+    if (!isNull(rank)) {
         // Ranking, setup rank expression
         const string rs = (string)cadr(rank);
         sqlparams[p++] = c_str(rs);
         sqlos << ", $" << p << " as rank";
     }
     sqlos << " from " << table << " data";
-    if (!isNil(textsearch)) {
+    if (!isNull(textsearch)) {
         // Text search, define the query
         const string ts = tstranslate((string)cadr(textsearch));
         sqlparams[p++] = c_str(ts);
         sqlos << ", plainto_tsquery($" << p << ") tsquery";
     }
-    if (!lk || !isNil(id)) {
+    if (!lk || !isNull(id)) {
         // Query of the form key = id
         sqlparams[p++] = c_str(write(content(scheme::writeValue(lk? (value)id : key))));
         sqlos << (w == 0? " where" : " and");
         sqlos << " data." << kname << " = $" << p;
         w++;
     }
-    if (!isNil(regex)) {
+    if (!isNull(regex)) {
         // Query of the form key ~ param
         sqlparams[p++] = c_str((string)cadr(regex));
         sqlos << (w == 0? " where" : " and");
         sqlos << " data." << kname << " ~ $" << p;
         w++;
     }
-    if (!isNil(like)) {
+    if (!isNull(like)) {
         // Query of the form key like param
         sqlparams[p++] = c_str((string)cadr(like));
         sqlos << (w == 0? " where" : " and");
         sqlos << " data." << kname << " like $" << p;
         w++;
     }
-    if (!isNil(textsearch)) {
+    if (!isNull(textsearch)) {
         // Text search, apply the query
         sqlos << (w == 0? " where" : " and");
         sqlos << " tsquery @@ to_tsvector(data." << vname << ")";
         w++;
     }
-    if (!isNil(textsearch) || !isNil(rank)) {
+    if (!isNull(textsearch) || !isNull(rank)) {
         // Result ordering
-        sqlos << " order by" << (isNil(rank)? "" : " rank desc") << ((isNil(rank) || isNil(textsearch))? "" : ",") << (isNil(textsearch)? "" : " tsrank desc");
+        sqlos << " order by" << (isNull(rank)? "" : " rank desc") << ((isNull(rank) || isNull(textsearch))? "" : ",") << (isNull(textsearch)? "" : " tsrank desc");
     }
-    if (!isNil(offset)) {
+    if (!isNull(offset)) {
         // Result pagination offset
         sqlos << " offset " << atoi(c_str((string)cadr(offset)));
     }
     // Result limit count
-    const int l = isNil(limit)? 1 : atoi(c_str((string)cadr(limit)));
+    const int l = isNull(limit)? 1 : atoi(c_str((string)cadr(limit)));
     sqlos << " limit " << l << ";";
     
     // Execute the query
diff --git a/sca-cpp/trunk/components/sqldb/sqldb.cpp b/sca-cpp/trunk/components/sqldb/sqldb.cpp
index 75be2c0624..c0fcd0a2f1 100644
--- a/sca-cpp/trunk/components/sqldb/sqldb.cpp
+++ b/sca-cpp/trunk/components/sqldb/sqldb.cpp
@@ -69,7 +69,7 @@ const failable<value> put(const list<value>& params, const pgsql::PGSql& pg) {
 const failable<value> patch(const list<value>& params, const pgsql::PGSql& pg) {
     // Read patch
     value p = assoc<value>("patch", assoc<value>("content", car<value>(cadr(params))));
-    if (isNil(p))
+    if (isNull(p))
         return mkfailure<value>("Couldn't read patch script");
     const string script = cadr<value>(p);
     debug(script, "pgsql::patch::script");
@@ -92,7 +92,7 @@ const failable<value> patch(const list<value>& params, const pgsql::PGSql& pg) {
         istringstream is(script);
         scheme::Env env = scheme::setupEnvironment();
         const value pval = scheme::evalScript(cons<value>("patch", scheme::quotedParameters(mklist<value>(key, hasContent(ival)? content(ival) : (value)list<value>()))), is, env);
-        if (isNil(pval)) {
+        if (isNull(pval)) {
             ostringstream os;
             os << "Couldn't patch postgresql entry: " << key;
             return mkfailure<value>(str(os), 404, false);