You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2013/01/03 09:10:27 UTC
svn commit: r1428206 [2/4] - in /tuscany/sca-cpp/trunk: components/cache/
components/chat/ components/constdb/ components/filedb/ components/sqldb/
hosting/server/ hosting/server/htdocs/ hosting/server/htdocs/account/
hosting/server/htdocs/app/ hosting...
Modified: tuscany/sca-cpp/trunk/hosting/server/htdocs/login/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/login/index.html?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/htdocs/login/index.html (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/login/index.html Thu Jan 3 08:10:25 2013
@@ -212,7 +212,7 @@ try {
* Initialize status message area.
*/
(function initstatus() {
- if (isNil($('status')))
+ if (isNull($('status')))
return;
$('status').style.display = 'none';
@@ -230,7 +230,7 @@ try {
*/
window.showstatus = function(s, c) {
//debug('show status', s);
- if (isNil($('status')) || $('status').error)
+ if (isNull($('status')) || $('status').error)
return s;
$('status').innerHTML = '<span class="' + (c? c : 'okstatus') + '">' + s + '</span>';
$('status').className = ui.isMobile()? 'status3dm' : 'status3d';
@@ -258,7 +258,7 @@ window.errorstatus = function(s) {
*/
window.workingstatus = function(w, c) {
//debug('show working', w);
- if (isNil($('working')))
+ if (isNull($('working')))
return w;
if (!ui.isMobile())
$('working').style.top = ui.pixpos(Math.round(window.clientHeight / 2));
@@ -469,7 +469,7 @@ var appresources = [
appcache.remove(res[0]);
appcache.get(res[0], 'remote');
}, append(appresources, config.appresources()));
- if (!isNil(lcmf)) {
+ if (!isNull(lcmf)) {
//debug('reloading');
window.location.reload();
}
Modified: tuscany/sca-cpp/trunk/hosting/server/htdocs/page/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/page/index.html?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/htdocs/page/index.html (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/page/index.html Thu Jan 3 08:10:25 2013
@@ -132,7 +132,7 @@ var pages = sca.reference(editorComp, 'p
*/
var msiefixupbounds = ui.isMSIE();
function widgettransform(e) {
- if (!isNil(e.xtranslate))
+ if (!isNull(e.xtranslate))
return [e.xtranslate, e.ytranslate];
var t = e.style.getPropertyValue('-webkit-transform') || e.style.getPropertyValue('-moz-transform') ||
e.style.getPropertyValue('-ms-transform') || e.style.getPropertyValue('-o-transform') ||
@@ -156,7 +156,7 @@ function widgettransform(e) {
*/
function widgetxpos(e) {
var t = widgettransform(e)[0];
- return ui.numpos(e.style.left) + (isNil(t)? 0 : t);
+ return ui.numpos(e.style.left) + (isNull(t)? 0 : t);
}
/**
@@ -164,7 +164,7 @@ function widgetxpos(e) {
*/
function widgetypos(e) {
var t = widgettransform(e)[1];
- return ui.numpos(e.style.top) + (isNil(t)? 0 : t);
+ return ui.numpos(e.style.top) + (isNull(t)? 0 : t);
}
/**
@@ -290,7 +290,7 @@ function clonewidget(e) {
*/
function selectwidget(n, s) {
//debug('selectwidget', n, s);
- if (isNil(n) || !s) {
+ if (isNull(n) || !s) {
// Clear the widget value field
$('widgetValue').value = '';
$('widgetValue').readOnly = true;
@@ -304,7 +304,7 @@ function selectwidget(n, s) {
$('deleteWidgetButton').disabled = true;
// Clear the widget outline
- if (!isNil(n))
+ if (!isNull(n))
n.style.removeProperty('outline');
return true;
}
@@ -422,44 +422,44 @@ function setwidgettext(e, t) {
e.id = f != ''? f.substring(1) : ('page:' + wc);
if (wc == 'hd1' || wc == 'hd2' || wc == 'text' || wc == 'section') {
- car(childElements(e)).innerHTML = isNil(c)? f : car(c);
+ car(childElements(e)).innerHTML = isNull(c)? f : car(c);
return t;
}
if (wc == 'button') {
- car(childElements(e)).value = isNil(c)? f : car(c);
+ car(childElements(e)).value = isNull(c)? f : car(c);
return t;
}
if (wc == 'entry' || wc == 'password') {
- car(childElements(e)).defaultValue = isNil(c)? f : car(c);
+ car(childElements(e)).defaultValue = isNull(c)? f : car(c);
return t;
}
if (wc == 'checkbox') {
- car(childElements(e)).value = isNil(c)? f : car(c);
- map(function(n) { if (n.nodeName == "SPAN") n.innerHTML = isNil(c)? f : car(c); return n; }, nodeList(e.childNodes));
+ car(childElements(e)).value = isNull(c)? f : car(c);
+ map(function(n) { if (n.nodeName == "SPAN") n.innerHTML = isNull(c)? f : car(c); return n; }, nodeList(e.childNodes));
return t;
}
if (wc == 'select') {
var ce = car(childElements(car(childElements(e))));
- ce.value = isNil(c)? f : car(c);
- ce.innerHTML = isNil(c)? f : car(c);
+ ce.value = isNull(c)? f : car(c);
+ ce.innerHTML = isNull(c)? f : car(c);
return t;
}
if (wc == 'list') {
- e.innerHTML = '<table class="datatable" style="width: 100%;;"><tr><td class="datatd">' + (isNil(c)? f : car(c)) + '</td></tr><tr><td class="datatd">...</td></tr></table>';
+ e.innerHTML = '<table class="datatable" style="width: 100%;;"><tr><td class="datatd">' + (isNull(c)? f : car(c)) + '</td></tr><tr><td class="datatd">...</td></tr></table>';
return t;
}
if (wc == 'table') {
- e.innerHTML = '<table class="datatable" style="width: 100%;"><tr><td class="datatdl">' + (isNil(c)? f : car(c)) + '</td><td class="datatdr">...</td></tr><tr><td class="datatdl">...</td><td class="datatdr">...</td></tr></table>';
+ e.innerHTML = '<table class="datatable" style="width: 100%;"><tr><td class="datatdl">' + (isNull(c)? f : car(c)) + '</td><td class="datatdr">...</td></tr><tr><td class="datatdl">...</td><td class="datatdr">...</td></tr></table>';
return t;
}
if (wc == 'link') {
var ce = car(childElements(e));
- ce.href = isNil(c)? 'link:/index.html' : ('link:' + car(c));
- car(childElements(ce)).innerHTML = isNil(c)? (f != ''? f : '/index.html') : isNil(cdr(c))? (f != ''? f : car(c)) : cadr(c);
+ ce.href = isNull(c)? 'link:/index.html' : ('link:' + car(c));
+ car(childElements(ce)).innerHTML = isNull(c)? (f != ''? f : '/index.html') : isNull(cdr(c))? (f != ''? f : car(c)) : cadr(c);
return t;
}
if (wc == 'img') {
- car(childElements(e)).src = isNil(c)? '/public/img.png' : car(c);
+ car(childElements(e)).src = isNull(c)? '/public/img.png' : car(c);
return t;
}
return '';
@@ -512,7 +512,7 @@ function widgetbounds(e) {
//debug('fixup br', e, br.left, br.top, br.right, br.bottom, t[0], t[1]);
function fixuptransform(e) {
var t = widgettransform(e);
- if (!isNil(e.xtranslate))
+ if (!isNull(e.xtranslate))
return [e.xtranslate, e.ytranslate];
var t = e.style.getPropertyValue('-webkit-transform') || e.style.getPropertyValue('-moz-transform') ||
e.style.getPropertyValue('-ms-transform') || e.style.getPropertyValue('-o-transform') ||
@@ -538,12 +538,12 @@ function widgetbounds(e) {
*/
function draggable(x, y, l) {
//debug('draggable?', x, y, l);
- if (isNil(l))
+ if (isNull(l))
return null;
var n = car(l);
- if (isNil(n.id) || n.id == '') {
+ if (isNull(n.id) || n.id == '') {
var d = draggable(x, y, reverse(nodeList(n.childNodes)));
- if (!isNil(d))
+ if (!isNull(d))
return d;
return draggable(x, y, cdr(l));
}
@@ -849,9 +849,9 @@ function mkeditor() {
onpagechange(false);
// On Firefox > 4, re-apply the outline after the widget has been repositioned
- if (fffixupoutline && !isNil(selected)) {
+ if (fffixupoutline && !isNull(selected)) {
ui.delay(function() {
- if (!isNil(selected))
+ if (!isNull(selected))
selected.style.outline = '2px solid #598edd';
}, 32);
}
@@ -932,7 +932,7 @@ function mkeditor() {
}
// Dismiss the palette
- if (palvis && isNil(draggable(moveX, moveY, mklist($('palettecontent')))))
+ if (palvis && isNull(draggable(moveX, moveY, mklist($('palettecontent')))))
hidepalette();
return true;
@@ -1091,7 +1091,7 @@ function mkeditor() {
* Get and display the requested app page.
*/
(function getpage() {
- if (isNil(appname))
+ if (isNull(appname))
return false;
workingstatus(true);
showstatus('Loading');
@@ -1108,15 +1108,15 @@ function mkeditor() {
// Get the page from the ATOM entry, convert it to XHTML and place it in a hidden buffer
var pageentry = car(atom.readATOMEntry(mklist(doc)));
var content = namedElementChild("'content", pageentry);
- var el = isNil(content)? mklist() : elementChildren(content);
- if (isNil(el))
+ var el = isNull(content)? mklist() : elementChildren(content);
+ if (isNull(el))
$('xhtmlbuffer').innerHTML = '<div id="page"></div>';
else
$('xhtmlbuffer').innerHTML = writeStrings(writeXML(el, false));
// Remove any existing page nodes from the editor div
var fnodes = filter(function(e) {
- if (isNil(e.id) || e.id == '')
+ if (isNull(e.id) || e.id == '')
return false;
return true;
}, nodeList($('pagediv').childNodes));
@@ -1169,7 +1169,7 @@ function pagexhtml() {
// part of the page, as well as nodes positioned out the
// editing area
var fnodes = filter(function(e) {
- if (isNil(e.id) || e.id == '')
+ if (isNull(e.id) || e.id == '')
return false;
return true;
}, nodes);
Modified: tuscany/sca-cpp/trunk/hosting/server/htdocs/proxy/public/oops/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/proxy/public/oops/index.html?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/htdocs/proxy/public/oops/index.html (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/proxy/public/oops/index.html Thu Jan 3 08:10:25 2013
@@ -161,7 +161,7 @@ try {
* Initialize status message area.
*/
(function initstatus() {
- if (isNil($('status')))
+ if (isNull($('status')))
return;
$('status').style.display = 'none';
@@ -179,7 +179,7 @@ try {
*/
window.showstatus = function(s, c) {
//debug('show status', s);
- if (isNil($('status')) || $('status').error)
+ if (isNull($('status')) || $('status').error)
return s;
$('status').innerHTML = '<span class="' + (c? c : 'okstatus') + '">' + s + '</span>';
$('status').className = ui.isMobile()? 'status3dm' : 'status3d';
@@ -207,7 +207,7 @@ window.errorstatus = function(s) {
*/
window.workingstatus = function(w, c) {
//debug('show working', w);
- if (isNil($('working')))
+ if (isNull($('working')))
return w;
if (!ui.isMobile())
$('working').style.top = ui.pixpos(Math.round(window.clientHeight / 2));
@@ -329,7 +329,7 @@ var appresources = [
appcache.remove(res[0]);
appcache.get(res[0], 'remote');
}, append(appresources, config.appresources()));
- if (!isNil(lcmf)) {
+ if (!isNull(lcmf)) {
//debug('reloading');
window.location.reload();
}
Modified: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/config.js
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/config.js?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/htdocs/public/config.js (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/public/config.js Thu Jan 3 08:10:25 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-if (isNil(config))
+if (isNull(config))
config = {};
/**
Modified: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notauth/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notauth/index.html?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notauth/index.html (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notauth/index.html Thu Jan 3 08:10:25 2013
@@ -161,7 +161,7 @@ try {
* Initialize status message area.
*/
(function initstatus() {
- if (isNil($('status')))
+ if (isNull($('status')))
return;
$('status').style.display = 'none';
@@ -179,7 +179,7 @@ try {
*/
window.showstatus = function(s, c) {
//debug('show status', s);
- if (isNil($('status')) || $('status').error)
+ if (isNull($('status')) || $('status').error)
return s;
$('status').innerHTML = '<span class="' + (c? c : 'okstatus') + '">' + s + '</span>';
$('status').className = ui.isMobile()? 'status3dm' : 'status3d';
@@ -207,7 +207,7 @@ window.errorstatus = function(s) {
*/
window.workingstatus = function(w, c) {
//debug('show working', w);
- if (isNil($('working')))
+ if (isNull($('working')))
return w;
if (!ui.isMobile())
$('working').style.top = ui.pixpos(Math.round(window.clientHeight / 2));
@@ -328,7 +328,7 @@ var appresources = [
appcache.remove(res[0]);
appcache.get(res[0], 'remote');
}, append(appresources, config.appresources()));
- if (!isNil(lcmf)) {
+ if (!isNull(lcmf)) {
//debug('reloading');
window.location.reload();
}
Modified: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notfound/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notfound/index.html?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notfound/index.html (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notfound/index.html Thu Jan 3 08:10:25 2013
@@ -162,7 +162,7 @@ try {
* Initialize status message area.
*/
(function initstatus() {
- if (isNil($('status')))
+ if (isNull($('status')))
return;
$('status').style.display = 'none';
@@ -180,7 +180,7 @@ try {
*/
window.showstatus = function(s, c) {
//debug('show status', s);
- if (isNil($('status')) || $('status').error)
+ if (isNull($('status')) || $('status').error)
return s;
$('status').innerHTML = '<span class="' + (c? c : 'okstatus') + '">' + s + '</span>';
$('status').className = ui.isMobile()? 'status3dm' : 'status3d';
@@ -208,7 +208,7 @@ window.errorstatus = function(s) {
*/
window.workingstatus = function(w, c) {
//debug('show working', w);
- if (isNil($('working')))
+ if (isNull($('working')))
return w;
if (!ui.isMobile())
$('working').style.top = ui.pixpos(Math.round(window.clientHeight / 2));
@@ -329,7 +329,7 @@ var appresources = [
appcache.remove(res[0]);
appcache.get(res[0], 'remote');
}, append(appresources, config.appresources()));
- if (!isNil(lcmf)) {
+ if (!isNull(lcmf)) {
//debug('reloading');
window.location.reload();
}
Modified: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notyet/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notyet/index.html?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notyet/index.html (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/public/notyet/index.html Thu Jan 3 08:10:25 2013
@@ -162,7 +162,7 @@ try {
* Initialize status message area.
*/
(function initstatus() {
- if (isNil($('status')))
+ if (isNull($('status')))
return;
$('status').style.display = 'none';
@@ -180,7 +180,7 @@ try {
*/
window.showstatus = function(s, c) {
//debug('show status', s);
- if (isNil($('status')) || $('status').error)
+ if (isNull($('status')) || $('status').error)
return s;
$('status').innerHTML = '<span class="' + (c? c : 'okstatus') + '">' + s + '</span>';
$('status').className = ui.isMobile()? 'status3dm' : 'status3d';
@@ -208,7 +208,7 @@ window.errorstatus = function(s) {
*/
window.workingstatus = function(w, c) {
//debug('show working', w);
- if (isNil($('working')))
+ if (isNull($('working')))
return w;
if (!ui.isMobile())
$('working').style.top = ui.pixpos(Math.round(window.clientHeight / 2));
@@ -329,7 +329,7 @@ var appresources = [
appcache.remove(res[0]);
appcache.get(res[0], 'remote');
}, append(appresources, config.appresources()));
- if (!isNil(lcmf)) {
+ if (!isNull(lcmf)) {
//debug('reloading');
window.location.reload();
}
Modified: tuscany/sca-cpp/trunk/hosting/server/htdocs/public/oops/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/public/oops/index.html?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/htdocs/public/oops/index.html (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/public/oops/index.html Thu Jan 3 08:10:25 2013
@@ -161,7 +161,7 @@ try {
* Initialize status message area.
*/
(function initstatus() {
- if (isNil($('status')))
+ if (isNull($('status')))
return;
$('status').style.display = 'none';
@@ -179,7 +179,7 @@ try {
*/
window.showstatus = function(s, c) {
//debug('show status', s);
- if (isNil($('status')) || $('status').error)
+ if (isNull($('status')) || $('status').error)
return s;
$('status').innerHTML = '<span class="' + (c? c : 'okstatus') + '">' + s + '</span>';
$('status').className = ui.isMobile()? 'status3dm' : 'status3d';
@@ -207,7 +207,7 @@ window.errorstatus = function(s) {
*/
window.workingstatus = function(w, c) {
//debug('show working', w);
- if (isNil($('working')))
+ if (isNull($('working')))
return w;
if (!ui.isMobile())
$('working').style.top = ui.pixpos(Math.round(window.clientHeight / 2));
@@ -328,7 +328,7 @@ var appresources = [
appcache.remove(res[0]);
appcache.get(res[0], 'remote');
}, append(appresources, config.appresources()));
- if (!isNil(lcmf)) {
+ if (!isNull(lcmf)) {
//debug('reloading');
window.location.reload();
}
Modified: tuscany/sca-cpp/trunk/hosting/server/htdocs/rate/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/rate/index.html?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/htdocs/rate/index.html (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/rate/index.html Thu Jan 3 08:10:25 2013
@@ -116,7 +116,7 @@ var savedxml = '';
* Get and display the requested app rating.
*/
(function getrating() {
- if (isNil(appname))
+ if (isNull(appname))
return false;
workingstatus(true);
showstatus('Loading');
@@ -133,7 +133,7 @@ var savedxml = '';
appentry = doc != null? car(elementsToValues(atom.readATOMEntry(mklist(doc)))) : mklist("'entry", mklist("'title", ''), mklist("'id", appname));
savedxml = car(atom.writeATOMEntry(valuesToElements(mklist(appentry))));
var content = cadr(assoc("'content", appentry));
- if (!isNil(content))
+ if (!isNull(content))
selectrating(parseInt(cadr(content)));
onlinestatus();
Modified: tuscany/sca-cpp/trunk/hosting/server/htdocs/search/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/search/index.html?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/htdocs/search/index.html (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/search/index.html Thu Jan 3 08:10:25 2013
@@ -74,7 +74,7 @@ function viewapp(appname) {
* Get and display an app icon.
*/
function geticon(appname) {
- if (isNil(appname))
+ if (isNull(appname))
return false;
return icons.get(appname, function(doc) {
@@ -86,9 +86,9 @@ function geticon(appname) {
var content = assoc("'content", iconentry);
var icon = assoc("'icon", content);
var img = assoc("'image", icon);
- if (!isNil(img)) {
+ if (!isNull(img)) {
var appimg = $('search_app_img_' + appname);
- if (!isNil(appimg))
+ if (!isNull(appimg))
appimg.src = cadr(img);
}
return true;
@@ -114,7 +114,7 @@ function getapps(query) {
var feed = car(elementsToValues(atom.readATOMFeed(mklist(doc))));
var aentries = assoc("'entry", feed);
- var entries = isNil(aentries)? mklist() : isList(car(cadr(aentries)))? cadr(aentries) : mklist(cdr(aentries));
+ var entries = isNull(aentries)? mklist() : isList(car(cadr(aentries)))? cadr(aentries) : mklist(cdr(aentries));
var defappimg = ui.b64png(appcache.get('/public/app.b64'));
@@ -122,7 +122,7 @@ function getapps(query) {
var icons = mklist();
(function displayentries(entries) {
- if (isNil(entries))
+ if (isNull(entries))
return apps;
var entry = car(entries);
var title = cadr(assoc("'title", entry))
@@ -136,8 +136,8 @@ function getapps(query) {
var ar2 = assoc("'rating2", aratings);
var ar3 = assoc("'rating3", aratings);
var ar4 = assoc("'rating4", aratings);
- var rating = isNil(ar)? 0 : Number(cadr(ar));
- var reviews = (isNil(ar1)? 0 : Number(cadr(ar1))) + (isNil(ar2)? 0 : Number(cadr(ar2))) + (isNil(ar3)? 0 : Number(cadr(ar3))) + (isNil(ar4)? 0 : Number(cadr(ar4)));
+ var rating = isNull(ar)? 0 : Number(cadr(ar));
+ var reviews = (isNull(ar1)? 0 : Number(cadr(ar1))) + (isNull(ar2)? 0 : Number(cadr(ar2))) + (isNull(ar3)? 0 : Number(cadr(ar3))) + (isNull(ar4)? 0 : Number(cadr(ar4)));
apps += '<div class="box">'
apps += '<div class="appicon">'
@@ -165,7 +165,7 @@ function getapps(query) {
ui.unmemo$('search_app_');
(function displayicons(icons) {
- if (isNil(icons))
+ if (isNull(icons))
return true;
geticon(car(icons));
return displayicons(cdr(icons));
Modified: tuscany/sca-cpp/trunk/hosting/server/htdocs/store/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/htdocs/store/index.html?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/htdocs/store/index.html (original)
+++ tuscany/sca-cpp/trunk/hosting/server/htdocs/store/index.html Thu Jan 3 08:10:25 2013
@@ -59,10 +59,10 @@ var categories = [
* Find a store category.
*/
function findcategory(name) {
- if (isNil(name))
+ if (isNull(name))
return findcategory('featured');
var f = filter(function(c) { return cadr(c) == name }, categories);
- if (isNil(f))
+ if (isNull(f))
return findcategory('featured');
return car(f);
}
@@ -121,7 +121,7 @@ $('createApp').onclick = function() {
* Get and display an app icon.
*/
function geticon(appname) {
- if (isNil(appname))
+ if (isNull(appname))
return false;
return icons.get(appname, function(doc) {
@@ -133,9 +133,9 @@ function geticon(appname) {
var content = assoc("'content", iconentry);
var icon = assoc("'icon", content);
var img = assoc("'image", icon);
- if (!isNil(img)) {
+ if (!isNull(img)) {
var appimg = $('store_app_img_' + appname);
- if (!isNil(appimg))
+ if (!isNull(appimg))
appimg.src = cadr(img);
}
return true;
@@ -161,7 +161,7 @@ function geticon(appname) {
var feed = car(elementsToValues(atom.readATOMFeed(mklist(doc))));
var aentries = assoc("'entry", feed);
- var entries = isNil(aentries)? mklist() : isList(car(cadr(aentries)))? cadr(aentries) : mklist(cdr(aentries));
+ var entries = isNull(aentries)? mklist() : isList(car(cadr(aentries)))? cadr(aentries) : mklist(cdr(aentries));
var defappimg = ui.b64png(appcache.get('/public/app.b64'));
@@ -169,7 +169,7 @@ function geticon(appname) {
var icons = mklist();
(function displayentries(entries) {
- if (isNil(entries))
+ if (isNull(entries))
return apps;
var entry = car(entries);
var title = cadr(assoc("'title", entry))
@@ -183,8 +183,8 @@ function geticon(appname) {
var ar2 = assoc("'rating2", aratings);
var ar3 = assoc("'rating3", aratings);
var ar4 = assoc("'rating4", aratings);
- var rating = isNil(ar)? 0 : Number(cadr(ar));
- var reviews = (isNil(ar1)? 0 : Number(cadr(ar1))) + (isNil(ar2)? 0 : Number(cadr(ar2))) + (isNil(ar3)? 0 : Number(cadr(ar3))) + (isNil(ar4)? 0 : Number(cadr(ar4)));
+ var rating = isNull(ar)? 0 : Number(cadr(ar));
+ var reviews = (isNull(ar1)? 0 : Number(cadr(ar1))) + (isNull(ar2)? 0 : Number(cadr(ar2))) + (isNull(ar3)? 0 : Number(cadr(ar3))) + (isNull(ar4)? 0 : Number(cadr(ar4)));
apps += '<div class="box">'
apps += '<div class="appicon">'
@@ -213,7 +213,7 @@ function geticon(appname) {
ui.unmemo$('store_app_');
(function displayicons(icons) {
- if (isNil(icons))
+ if (isNull(icons))
return true;
geticon(car(icons));
return displayicons(cdr(icons));
Modified: tuscany/sca-cpp/trunk/hosting/server/icons.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/icons.py?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/icons.py (original)
+++ tuscany/sca-cpp/trunk/hosting/server/icons.py Thu Jan 3 08:10:25 2013
@@ -49,7 +49,7 @@ def put(id, icon, user, cache, apps):
# Get the requested app
app = apps.get(id)
- if isNil(app):
+ if isNull(app):
debug('icons.py::put', 'app not found', id)
return False
@@ -61,23 +61,23 @@ def put(id, icon, user, cache, apps):
# Get image and token from input icon
def image(c):
img = assoc("'image", c)
- return None if isNil(img) else to50x50png(cadr(img))
+ return None if isNull(img) else to50x50png(cadr(img))
def token(c):
tok = assoc("'token", c)
- return None if isNil(tok) else cadr(tok)
+ return None if isNull(tok) else cadr(tok)
img = image(content(icon))
tok = token(content(icon))
# Update the icon
# Put with an upload token
- if not isNil(tok):
+ if not isNull(tok):
debug('icons.py::put::token', tok)
# Token alone, store token with existing image, if any
- if isNil(img):
+ if isNull(img):
eicon = cache.get(iconid(id))
- eimg = None if isNil(eicon) else image(content(eicon))
- if isNil(eimg):
+ eimg = None if isNull(eicon) else image(content(eicon))
+ if isNull(eimg):
iconentry = mkentry(title(app), car(id), author(app), now(), ("'icon", ("'token", tok)))
debug('icons.py::put::iconentry', iconentry)
return cache.put(iconid(id), iconentry)
@@ -90,9 +90,9 @@ def put(id, icon, user, cache, apps):
# Token plus image, put image if token is valid, removing the token
debug('icons.py::put::img', img)
eicon = cache.get(iconid(id))
- etok = None if isNil(eicon) else token(content(eicon))
+ etok = None if isNull(eicon) else token(content(eicon))
debug('icons.py::put::etok', etok)
- if isNil(etok) or tok != etok:
+ if isNull(etok) or tok != etok:
debug('icons.py::put', 'invalid token', tok)
return False
@@ -101,7 +101,7 @@ def put(id, icon, user, cache, apps):
return cache.put(iconid(id), iconentry)
# Update icon image
- if not isNil(img):
+ if not isNull(img):
debug('icons.py::put::img', img)
iconentry = mkentry(title(app), car(id), author(app), now(), ("'icon", ("'image", img)))
debug('icons.py::put::iconentry', iconentry)
@@ -115,12 +115,12 @@ def put(id, icon, user, cache, apps):
# Get an icon
def get(id, user, cache, apps):
debug('icons.py::get::id', id)
- if isNil(id):
+ if isNull(id):
return (("'feed", ("'title", "Icons"), ("'id", "icons")),)
# Get the requested app
app = apps.get(id)
- if isNil(app):
+ if isNull(app):
debug('icons.py::get', 'app not found', id)
# Return a default new icon
@@ -128,7 +128,7 @@ def get(id, user, cache, apps):
# Get the requested icon
icon = cache.get(iconid(id))
- if isNil(icon):
+ if isNull(icon):
debug('icons.py::get', 'icon not found', id)
# Return a default new icon
@@ -137,16 +137,16 @@ def get(id, user, cache, apps):
# Get image, token, and updated date from icon
def image(c):
img = assoc("'image", c)
- return None if isNil(img) else cadr(img)
+ return None if isNull(img) else cadr(img)
def token(c):
tok = assoc("'token", c)
- return None if isNil(tok) else cadr(tok)
+ return None if isNull(tok) else cadr(tok)
img = image(content(icon))
tok = token(content(icon))
# Return the icon
- iconc = (() if isNil(img) else (("'image", img),)) + (() if isNil(tok) or (user.get(()) != author(app) and user.get(()) != 'admin') else (("'token", tok),))
- if isNil(iconc):
+ iconc = (() if isNull(img) else (("'image", img),)) + (() if isNull(tok) or (user.get(()) != author(app) and user.get(()) != 'admin') else (("'token", tok),))
+ if isNull(iconc):
iconentry = mkentry(title(app), car(id), author(app), updated(icon), ())
debug('icons.py::get::iconentry', iconentry)
return iconentry
@@ -161,7 +161,7 @@ def delete(id, user, cache, apps):
# Get the requested app
app = apps.get(id)
- if isNil(app):
+ if isNull(app):
debug('icons.py::delete', 'app not found', id)
return False
Modified: tuscany/sca-cpp/trunk/hosting/server/pages.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/pages.py?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/pages.py (original)
+++ tuscany/sca-cpp/trunk/hosting/server/pages.py Thu Jan 3 08:10:25 2013
@@ -31,7 +31,7 @@ def put(id, page, user, cache, apps):
# Get the requested app
app = apps.get(id)
- if isNil(app):
+ if isNull(app):
debug('pages.py::put', 'app not found', id)
return False
@@ -48,12 +48,12 @@ def put(id, page, user, cache, apps):
# Get a page from the page db
def get(id, user, cache, apps):
debug('pages.py::get::id', id)
- if isNil(id):
+ if isNull(id):
return (("'feed", ("'title", "Pages"), ("'id", "pages")),)
# Get the requested app
app = apps.get(id)
- if isNil(app):
+ if isNull(app):
debug('pages.py::get', 'app not found', id)
# Return a default new page
@@ -61,7 +61,7 @@ def get(id, user, cache, apps):
# Get the requested page
page = cache.get(pageid(id))
- if isNil(page):
+ if isNull(page):
debug('pages.py::get', 'page not found', id)
# Return a default new page
@@ -80,7 +80,7 @@ def delete(id, user, cache, apps):
# Get the requested app
app = apps.get(id)
- if isNil(app):
+ if isNull(app):
debug('pages.py::delete', 'app not found', id)
return False
Modified: tuscany/sca-cpp/trunk/hosting/server/palettes.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/palettes.py?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/palettes.py (original)
+++ tuscany/sca-cpp/trunk/hosting/server/palettes.py Thu Jan 3 08:10:25 2013
@@ -30,7 +30,7 @@ def put(id, palette, cache):
# Get a palette from the palettes db
def get(id, cache):
- if isNil(id):
+ if isNull(id):
return (("'feed", ("'title", "Palettes"), ("'id", "palettes")),)
return mkentry(car(id), car(id), None, now(), car(cache.get(paletteid(id))))
Modified: tuscany/sca-cpp/trunk/hosting/server/pictures.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/pictures.py?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/pictures.py (original)
+++ tuscany/sca-cpp/trunk/hosting/server/pictures.py Thu Jan 3 08:10:25 2013
@@ -47,7 +47,7 @@ def put(id, picture, user, cache):
debug('pictures.py::put::id', id)
debug('pictures.py::put::picture', picture)
- picid = user.get(()) if isNil(id) else car(id)
+ picid = user.get(()) if isNull(id) else car(id)
# Only the admin can update other user's pictures
if picid != user.get(()) and user.get(()) != 'admin':
@@ -57,23 +57,23 @@ def put(id, picture, user, cache):
# Get image and token from input picture
def image(c):
img = assoc("'image", c)
- return None if isNil(img) else to50x50png(cadr(img))
+ return None if isNull(img) else to50x50png(cadr(img))
def token(c):
tok = assoc("'token", c)
- return None if isNil(tok) else cadr(tok)
+ return None if isNull(tok) else cadr(tok)
img = image(content(picture))
tok = token(content(picture))
# Update the picture
# Put with an upload token
- if not isNil(tok):
+ if not isNull(tok):
debug('pictures.py::put::token', tok)
# Token alone, store token with existing image, if any
- if isNil(img):
+ if isNull(img):
epicture = cache.get(pictureid(picid))
- eimg = None if isNil(epicture) else image(content(epicture))
- if isNil(eimg):
+ eimg = None if isNull(epicture) else image(content(epicture))
+ if isNull(eimg):
picentry = mkentry(title(picture), picid, picid, now(), ("'picture", ("'token", tok)))
debug('pictures.py::put::picentry', picentry)
return cache.put(pictureid(picid), picentry)
@@ -86,9 +86,9 @@ def put(id, picture, user, cache):
# Token plus image, put image if token is valid, removing the token
debug('pictures.py::put::img', img)
epicture = cache.get(pictureid(picid))
- etok = None if isNil(epicture) else token(content(epicture))
+ etok = None if isNull(epicture) else token(content(epicture))
debug('pictures.py::put::etok', etok)
- if isNil(etok) or tok != etok:
+ if isNull(etok) or tok != etok:
debug('pictures.py::put', 'invalid token', tok)
return False
@@ -97,7 +97,7 @@ def put(id, picture, user, cache):
return cache.put(pictureid(picid), picentry)
# Update picture image
- if not isNil(img):
+ if not isNull(img):
debug('pictures.py::put::img', img)
picentry = mkentry(title(picture), picid, picid, now(), ("'picture", ("'image", img)))
debug('pictures.py::put::picentry', picentry)
@@ -113,24 +113,24 @@ def get(id, user, cache):
debug('pictures.py::get::id', id)
# Get the requested picture
- picid = user.get(()) if isNil(id) else car(id)
+ picid = user.get(()) if isNull(id) else car(id)
picture = cache.get(pictureid(picid))
- if isNil(picture):
+ if isNull(picture):
return mkentry(picid, picid, picid, now(), ())
# Get image and token from picture
def image(c):
img = assoc("'image", c)
- return None if isNil(img) else cadr(img)
+ return None if isNull(img) else cadr(img)
def token(c):
tok = assoc("'token", c)
- return None if isNil(tok) else cadr(tok)
+ return None if isNull(tok) else cadr(tok)
img = image(content(picture))
tok = token(content(picture))
# Return the picture
- picc = (() if isNil(img) else (("'image", img),)) + (() if isNil(tok) or (user.get(()) != author(picture) and user.get(()) != 'admin') else (("'token", tok),))
- if isNil(picc):
+ picc = (() if isNull(img) else (("'image", img),)) + (() if isNull(tok) or (user.get(()) != author(picture) and user.get(()) != 'admin') else (("'token", tok),))
+ if isNull(picc):
picentry = mkentry(title(picture), picid, author(picture), updated(picture), ())
debug('pictures.py::get::picentry', picentry)
return picentry
Modified: tuscany/sca-cpp/trunk/hosting/server/ratings.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/ratings.py?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/ratings.py (original)
+++ tuscany/sca-cpp/trunk/hosting/server/ratings.py Thu Jan 3 08:10:25 2013
@@ -31,7 +31,7 @@ def put(id, ratings, user, cache, db, ap
# Get the requested app
app = apps.get(id)
- if isNil(app):
+ if isNull(app):
debug('ratings.py::put', 'app not found', id)
return False
@@ -52,7 +52,7 @@ def patch(id, ratings, user, cache, db,
# Get the requested app
app = apps.get(id)
- if isNil(app):
+ if isNull(app):
debug('ratings.py::patch', 'app not found', id)
return False
@@ -107,9 +107,9 @@ def get(id, user, cache, db, apps):
debug('ratings.py::get::id', id)
# Return the top ratings
- if isNil(id):
+ if isNull(id):
topentries = db.get((("'regex", '("ratings" .* "app.ratings")'), ("'rank", "(regexp_matches(value, '(.*\(rating )([^\)]+)(\).*)'))[2]::float"), ("'limit", 25)))
- flatentries = tuple(map(lambda v: car(v), () if isNil(topentries) else topentries))
+ flatentries = tuple(map(lambda v: car(v), () if isNull(topentries) else topentries))
def rating(e):
return cadr(assoc("'rating", assoc("'ratings", assoc("'content", e))))
sortedentries = tuple(sorted(flatentries, key = rating, reverse = True))
@@ -119,7 +119,7 @@ def get(id, user, cache, db, apps):
# Get the requested app
app = apps.get(id)
- if isNil(app):
+ if isNull(app):
debug('ratings.py::get', 'app not found', id)
# Return default ratings
@@ -127,7 +127,7 @@ def get(id, user, cache, db, apps):
# Get the requested ratings
ratings = cache.get(ratingsid(id))
- if isNil(ratings):
+ if isNull(ratings):
debug('ratings.py::get', 'ratings not found', id)
# Return default ratings
@@ -144,7 +144,7 @@ def delete(id, user, cache, db, apps):
# Get the requested app
app = apps.get(id)
- if isNil(app):
+ if isNull(app):
debug('ratings.py::delete', 'app not found', id)
return False
Modified: tuscany/sca-cpp/trunk/hosting/server/reviews.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/reviews.py?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/reviews.py (original)
+++ tuscany/sca-cpp/trunk/hosting/server/reviews.py Thu Jan 3 08:10:25 2013
@@ -28,10 +28,10 @@ def reviewsid(user):
def getreviews(id, cache):
debug('reviews.py::getreviews::id', id)
val = cache.get(id)
- if isNil(val):
+ if isNull(val):
return ()
reviews = cdddr(car(val))
- if not isNil(reviews) and isList(car(cadr(car(reviews)))):
+ if not isNull(reviews) and isList(car(cadr(car(reviews)))):
# Expand list of entries
ereviews = tuple(map(lambda e: cons("'entry", e), cadr(car(reviews))))
debug('reviews.py::getreviews::ereviews', ereviews)
@@ -42,7 +42,7 @@ def getreviews(id, cache):
# Get a review from a user's reviews
def getreview(id, reviews):
- if isNil(reviews):
+ if isNull(reviews):
return None
if car(id) == entryid(reviews):
return (car(reviews),)
@@ -51,20 +51,20 @@ def getreview(id, reviews):
# Get reviews from the user's reviews
def get(id, user, cache, apps, ratings):
debug('reviews.py::get::id', id)
- if isNil(id):
+ if isNull(id):
reviews = ((("'feed", ("'title", "Your Reviews"), ("'id", user.get(()))) + getreviews(reviewsid(user), cache)),)
debug('reviews.py::get::reviews', reviews)
return reviews
# Get the requested app
app = apps.get(id)
- if isNil(app):
+ if isNull(app):
debug('reviews.py::get', 'app not found', id)
return False
# Get the review
review = getreview(id, getreviews(reviewsid(user), cache))
- if isNil(review):
+ if isNull(review):
debug('reviews.py::get', 'review not found', id)
# Return a default empty review
@@ -75,7 +75,7 @@ def get(id, user, cache, apps, ratings):
# Patch an app ratings
def patchratings(id, user, ratings, oreview, nreview):
- patch = ("'patch", ("'old", "0" if isNil(oreview) else cadr(content(oreview))), ("'new", "0" if isNil(nreview) else cadr(content(nreview))))
+ patch = ("'patch", ("'old", "0" if isNull(oreview) else cadr(content(oreview))), ("'new", "0" if isNull(nreview) else cadr(content(nreview))))
patchentry = mkentry(car(id), car(id), user.get(()), now(), patch);
debug('reviews.py::patchratings::patchentry', patchentry)
return ratings.patch(id, patchentry)
@@ -89,7 +89,7 @@ def putreviews(id, reviews, cache):
# Put a review into a user's reviews
def putreview(id, review, reviews):
- if isNil(reviews):
+ if isNull(reviews):
return review
if car(id) == entryid(reviews):
return cons(car(review), cdr(reviews))
@@ -102,7 +102,7 @@ def put(id, review, user, cache, apps, r
# Get the requested app
app = apps.get(id)
- if isNil(app):
+ if isNull(app):
debug('reviews.py::put', 'app not found', id)
return False
@@ -122,7 +122,7 @@ def put(id, review, user, cache, apps, r
# Delete a review from a reviews record
def deletereview(id, reviews):
- if isNil(reviews):
+ if isNull(reviews):
return ()
if car(id) == entryid(reviews):
return cdr(reviews)
@@ -131,19 +131,19 @@ def deletereview(id, reviews):
# Delete reviews from the user's reviews record
def delete(id, user, cache, apps, ratings):
debug('reviews.py::delete::id', id)
- if isNil(id):
+ if isNull(id):
return cache.delete(reviewsid(user))
# Get the requested app
app = apps.get(id)
- if isNil(app):
+ if isNull(app):
debug('reviews.py::delete', 'app not found', id)
return False
# Get the review
reviews = getreviews(reviewsid(user), cache)
review = getreview(id, reviews)
- if isNil(review):
+ if isNull(review):
debug('reviews.py::delete', 'review not found', id)
return False
Modified: tuscany/sca-cpp/trunk/hosting/server/search.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/search.py?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/search.py (original)
+++ tuscany/sca-cpp/trunk/hosting/server/search.py Thu Jan 3 08:10:25 2013
@@ -30,10 +30,10 @@ def mergeratings(entries, ratings):
info = content(app)
rating = ratings.get(id)
rates = content(rating)
- mergedentry = mkentry(title(app), car(id), author(app), updated(app), ("'info",) + (() if isNil(info) else cdr(info)) + (() if isNil(rates) else cdr(rates)))
+ mergedentry = mkentry(title(app), car(id), author(app), updated(app), ("'info",) + (() if isNull(info) else cdr(info)) + (() if isNull(rates) else cdr(rates)))
return mergedentry
- mergedentries = tuple(filter(lambda e: not isNil(e), map(lambda e: car(mergerating((e,))), entries)))
+ mergedentries = tuple(filter(lambda e: not isNull(e), map(lambda e: car(mergerating((e,))), entries)))
debug('search.py::mergeratings::mergedentries', mergedentries)
return mergedentries
@@ -41,7 +41,7 @@ def mergeratings(entries, ratings):
def get(id, user, cache, db, apps, ratings):
debug('search.py::get::id', id)
q = assoc("'q", id)
- if isNil(q):
+ if isNull(q):
return None
# Run the search
@@ -49,7 +49,7 @@ def get(id, user, cache, db, apps, ratin
debug('search.py::get::foundentries', foundentries)
# Merge app ratings
- appentries = mergeratings(tuple(map(lambda v: car(v), () if isNil(foundentries) else foundentries)), ratings)
+ appentries = mergeratings(tuple(map(lambda v: car(v), () if isNull(foundentries) else foundentries)), ratings)
results = ((("'feed", ("'title", "Search Results"), ("'id", 'search')) + appentries),)
debug('search.py::get::results', results)
Modified: tuscany/sca-cpp/trunk/hosting/server/selector.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/selector.py?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/selector.py (original)
+++ tuscany/sca-cpp/trunk/hosting/server/selector.py Thu Jan 3 08:10:25 2013
@@ -20,9 +20,9 @@ from util import *
# Get the database to use for a particular key
def get(id, db):
- if isNil(id):
+ if isNull(id):
return db
- if not isNil(filter(lambda i: isList(i) and not isNil(i) and car(i) == "'limit", id)):
+ if not isNull(filter(lambda i: isList(i) and not isNull(i) and car(i) == "'limit", id)):
return db
if cadr(id)[0:1].lower() < 'm':
return (db[0],)
Modified: tuscany/sca-cpp/trunk/hosting/server/store.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/store.py?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/store.py (original)
+++ tuscany/sca-cpp/trunk/hosting/server/store.py Thu Jan 3 08:10:25 2013
@@ -30,10 +30,10 @@ def getstore(id, cache):
# Lookup the requested store
val = cache.get(id)
- if isNil(val):
+ if isNull(val):
return ()
store = cdddr(car(val))
- if not isNil(store) and isList(car(cadr(car(store)))):
+ if not isNull(store) and isList(car(cadr(car(store)))):
# Expand list of entries
estore = tuple(map(lambda e: cons("'entry", e), cadr(car(store))))
debug('store.py::getstore::estore', estore)
@@ -57,7 +57,7 @@ def put(id, app, user, cache, apps, rati
appid = cdr(id)
def putapp(appid, app, store):
- if isNil(store):
+ if isNull(store):
return app
if car(appid) == entryid(store):
return cons(car(app), cdr(store))
@@ -77,15 +77,15 @@ def mergeapps(entries, apps, ratings):
debug('store.py::mergeapp::entry', entry)
id = (entryid(entry),)
app = apps.get(id)
- if isNil(app):
+ if isNull(app):
return ((),)
info = content(app)
rating = ratings.get(id)
rates = content(rating)
- mergedentry = mkentry(title(app), car(id), author(app), updated(app), ("'info",) + (() if isNil(info) else cdr(info)) + (() if isNil(rates) else cdr(rates)))
+ mergedentry = mkentry(title(app), car(id), author(app), updated(app), ("'info",) + (() if isNull(info) else cdr(info)) + (() if isNull(rates) else cdr(rates)))
return mergedentry
- mergedentries = tuple(filter(lambda e: not isNil(e), map(lambda e: car(mergeapp((e,))), entries)))
+ mergedentries = tuple(filter(lambda e: not isNull(e), map(lambda e: car(mergeapp((e,))), entries)))
debug('store.py::mergeapps::mergedentries', mergedentries)
return mergedentries
@@ -105,13 +105,13 @@ def get(id, user, cache, apps, ratings):
# Collect the featured apps
appid = cdr(id)
def findapp(appid, store):
- if isNil(store):
+ if isNull(store):
return None
if car(appid) == entryid(store):
return (car(store),)
return findapp(appid, cdr(store))
- if isNil(appid):
+ if isNull(appid):
storeapps = mergeapps(getstore(storeid(tag), cache), apps, ratings)
store = ((("'feed", ("'title", "App Store"), ("'id", tag)) + storeapps),)
debug('store.py::get::store', store)
@@ -127,11 +127,11 @@ def delete(id, user, cache, apps, rating
tag = car(id)
appid = cdr(id)
- if isNil(appid):
+ if isNull(appid):
return cache.delete(storeid(tag))
def deleteapp(appid, store):
- if isNil(store):
+ if isNull(store):
return ()
if car(appid) == entryid(store):
return cdr(store)
Modified: tuscany/sca-cpp/trunk/hosting/server/util.py
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/hosting/server/util.py?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/hosting/server/util.py (original)
+++ tuscany/sca-cpp/trunk/hosting/server/util.py Thu Jan 3 08:10:25 2013
@@ -57,9 +57,9 @@ def reverse(l):
r.reverse()
return tuple(r)
-def isNil(l):
+def isNull(l):
if isinstance(l, streampair):
- return l.isNil()
+ return l.isNull()
return l is None or l == ()
def isSymbol(v):
@@ -76,7 +76,7 @@ def isList(v):
return True
def isTaggedList(v, t):
- return isList(v) and not isNil(v) and car(v) == t
+ return isList(v) and not isNull(v) and car(v) == t
# Scheme-like streams
@@ -88,7 +88,7 @@ class streampair(object):
def __repr__(self):
return repr(self[0:len(self)])
- def isNil(self):
+ def isNull(self):
return self.cdr == ()
def __len__(self):
@@ -102,7 +102,7 @@ class streampair(object):
return self.cdr()[i - 1]
def __getslice__(self, i, j):
- if isNil(self):
+ if isNull(self):
return ()
if i > 0:
if j == maxint:
@@ -156,7 +156,7 @@ def curry(f, *args):
# Convert a path represented as a list of values to a string
def path(p):
- if isNil(p):
+ if isNull(p):
return ""
return "/" + car(p) + path(cdr(p))
Modified: tuscany/sca-cpp/trunk/kernel/element.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/kernel/element.hpp?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/kernel/element.hpp (original)
+++ tuscany/sca-cpp/trunk/kernel/element.hpp Thu Jan 3 08:10:25 2013
@@ -43,7 +43,7 @@ const string atsign("@");
* Returns true if a value is an element.
*/
inline const bool isElement(const value& v) {
- if (!isList(v) || isNil(v) || element != car<value>(v))
+ if (!isList(v) || isNull(v) || element != car<value>(v))
return false;
return true;
}
@@ -52,7 +52,7 @@ inline const bool isElement(const value&
* Returns true if a value is an attribute.
*/
inline const bool isAttribute(const value& v) {
- if (!isList(v) || isNil(v) || attribute != car<value>(v))
+ if (!isList(v) || isNull(v) || attribute != car<value>(v))
return false;
return true;
}
@@ -82,7 +82,7 @@ inline const value elementName(const lis
* Returns true if an element has children.
*/
inline const bool elementHasChildren(const list<value>& l) {
- return !isNil(cddr(l));
+ return !isNull(cddr(l));
}
/**
@@ -99,7 +99,7 @@ inline const bool elementHasValue(const
const list<value> r = reverse(l);
if (isSymbol(car(r)))
return false;
- if(isList(car(r)) && !isNil((list<value>)car(r)) && isSymbol(car<value>(car(r))))
+ if(isList(car(r)) && !isNull((list<value>)car(r)) && isSymbol(car<value>(car(r))))
return false;
return true;
}
@@ -118,7 +118,7 @@ inline const bool elementToValueIsList(c
if (!isList(v))
return false;
const list<value> l = v;
- return (isNil(l) || !isSymbol(car(l)));
+ return (isNull(l) || !isSymbol(car(l)));
}
inline const value elementToValue(const value& t) {
@@ -159,7 +159,7 @@ inline const bool elementToValueIsSymbol
if (!isList(v))
return false;
const list<value> l = v;
- if (isNil(l))
+ if (isNull(l))
return false;
if (!isSymbol(car(l)))
return false;
@@ -167,7 +167,7 @@ inline const bool elementToValueIsSymbol
}
inline const list<value> elementToValueGroupValues(const value& v, const list<value>& l) {
- if (isNil(l) || !elementToValueIsSymbol(v) || !elementToValueIsSymbol(car(l)))
+ if (isNull(l) || !elementToValueIsSymbol(v) || !elementToValueIsSymbol(car(l)))
return cons(v, l);
if (car<value>(car(l)) != car<value>(v))
return cons(v, l);
@@ -181,7 +181,7 @@ inline const list<value> elementToValueG
}
inline const list<value> elementsToValues(const list<value>& e) {
- if (isNil(e))
+ if (isNull(e))
return e;
return elementToValueGroupValues(elementToValue(car(e)), elementsToValues(cdr(e)));
}
@@ -193,9 +193,9 @@ inline const value valueToElement(const
const list<value> valuesToElements(const list<value>& l);
// Convert a name value pair
- if (isList(t) && !isNil((list<value>)t) && isSymbol(car<value>(t))) {
+ if (isList(t) && !isNull((list<value>)t) && isSymbol(car<value>(t))) {
const value n = car<value>(t);
- const value v = isNil(cdr<value>(t))? nilValue : cadr<value>(t);
+ const value v = isNull(cdr<value>(t))? nilValue : cadr<value>(t);
// Convert a single value to an attribute or an element
if (!isList(v)) {
@@ -205,7 +205,7 @@ inline const value valueToElement(const
}
// Convert a list value
- if (isNil((list<value>)v) || !isSymbol(car<value>(v)))
+ if (isNull((list<value>)v) || !isSymbol(car<value>(v)))
return cons(element, cons(n, mklist<value>(valuesToElements(v))));
// Convert a nested name value pair value
@@ -222,7 +222,7 @@ inline const value valueToElement(const
* Convert a list of values to a list of elements.
*/
inline const list<value> valuesToElements(const list<value>& l) {
- if (isNil(l))
+ if (isNull(l))
return l;
return cons<value>(valueToElement(car(l)), valuesToElements(cdr(l)));
}
@@ -234,7 +234,7 @@ inline const value attributeValue(const
const list<value> f = filter<value>([name](const value& v) {
return isAttribute(v) && attributeName((list<value>)v) == name;
}, l);
- if (isNil(f))
+ if (isNull(f))
return nilValue;
return caddr<value>(car(f));
}
@@ -253,7 +253,7 @@ inline const list<value> elementChildren
*/
inline const value elementChild(const value& name, const list<value>& l) {
const list<value> f = elementChildren(name, l);
- if (isNil(f))
+ if (isNull(f))
return nilValue;
return car(f);
}
Modified: tuscany/sca-cpp/trunk/kernel/function.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/kernel/function.hpp?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/kernel/function.hpp (original)
+++ tuscany/sca-cpp/trunk/kernel/function.hpp Thu Jan 3 08:10:25 2013
@@ -160,7 +160,7 @@ public:
}
template<typename S> friend ostream& operator<<(ostream&, const lambda<S>&);
- template<typename S> friend const bool isNil(const lambda<S>& l) noexcept;
+ template<typename S> friend const bool isNull(const lambda<S>& l) noexcept;
private:
typedef Callable<R,P...> CallableType;
@@ -179,7 +179,7 @@ template<typename S> inline ostream& ope
/**
* Return true if a lambda is nil.
*/
-template<typename S> inline const bool isNil(const lambda<S>& l) noexcept {
+template<typename S> inline const bool isNull(const lambda<S>& l) noexcept {
return (const void*)l.callable == NULL;
}
Modified: tuscany/sca-cpp/trunk/kernel/kernel-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/kernel/kernel-test.cpp?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/kernel/kernel-test.cpp (original)
+++ tuscany/sca-cpp/trunk/kernel/kernel-test.cpp Thu Jan 3 08:10:25 2013
@@ -225,7 +225,7 @@ const bool testMutable() {
}
{
gc_mutable_ref<value> v;
- assert(isNil((value)v));
+ assert(isNull((value)v));
v = 1;
assert(v == 1);
}
@@ -386,7 +386,7 @@ ostream& operator<<(ostream& out, const
const bool testCons() {
assert(car(cons(2, mklist(3))) == 2);
assert(car(cdr(cons(2, mklist(3)))) == 3);
- assert(isNil(cdr(cdr(cons(2, mklist(3))))));
+ assert(isNull(cdr(cdr(cons(2, mklist(3))))));
assert(cons(Element(1), mklist(Element(2))) == mklist(Element(1), Element(2)));
return true;
@@ -471,7 +471,7 @@ const bool testAppend() {
assert(car(append(mklist(1), mklist(2))) == 1);
assert(car(cdr(append(mklist(1), mklist(2)))) == 2);
assert(car(cdr(cdr(append(mklist(1), mklist(2, 3))))) == 3);
- assert(isNil(cdr(cdr(cdr(append(mklist(1), mklist(2, 3)))))));
+ assert(isNull(cdr(cdr(cdr(append(mklist(1), mklist(2, 3)))))));
assert(list<int>() + 1 + 2 + 3 == mklist(1, 2, 3));
return true;
@@ -497,12 +497,12 @@ const bool testComplex() {
const list<Complex> p = mklist(Complex(1, 2), Complex(3, 4));
assert(car(p).x == 1);
assert(car(cdr(p)).x == 3);
- assert(isNil(cdr(cdr(p))));
+ assert(isNull(cdr(cdr(p))));
return true;
}
const bool testMap() {
- assert(isNil(map<int, int>(square, list<int>())));
+ assert(isNull(map<int, int>(square, list<int>())));
const list<int> m = map<int, int>(square, mklist(2, 3));
assert(car(m) == 4);
@@ -535,7 +535,7 @@ const bool testFilter() {
}
const bool testMember() {
- assert(isNil(member(4, mklist(1, 2, 3))));
+ assert(isNull(member(4, mklist(1, 2, 3))));
assert(car(member(1, mklist(1, 2, 3))) == 1);
assert(car(member(2, mklist(1, 2, 3))) == 2);
assert(car(member(3, mklist(1, 2, 3))) == 3);
@@ -543,7 +543,7 @@ const bool testMember() {
}
const bool testReverse() {
- assert(isNil(reverse(list<int>())));
+ assert(isNull(reverse(list<int>())));
assert(car(reverse(mklist(1, 2, 3))) == 3);
assert(cadr(reverse(mklist(1, 2, 3))) == 2);
return true;
@@ -566,7 +566,7 @@ const bool testSubst() {
const bool testAssoc() {
const list<list<string> > l = mklist(mklist<string>("x", "X"), mklist<string>("a", "A"), mklist<string>("y", "Y"), mklist<string>("a", "AA"));
assert(assoc<string>("a", l) == mklist<string>("a", "A"));
- assert(isNil(assoc<string>("z", l)));
+ assert(isNull(assoc<string>("z", l)));
const list<list<string> > l3 = mklist(mklist<string>("x", "X"), mklist<string>("a", "A"), mklist<string>("a", "AA"));
assert(delAssoc<string>("y", l) == l3);
@@ -762,7 +762,7 @@ const bool testBinaryTreeAssoc() {
assert(rbtreeAssoc<value>("a", bt) == mklist<value>("a", "aa"));
assert(rbtreeAssoc<value>("b", bt) == mklist<value>("b", "bb"));
assert(rbtreeAssoc<value>("f", bt) == mklist<value>("f", "ff"));
- assert(isNil(rbtreeAssoc<value>("x", bt)));
+ assert(isNull(rbtreeAssoc<value>("x", bt)));
return true;
}
Modified: tuscany/sca-cpp/trunk/kernel/list.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/kernel/list.hpp?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/kernel/list.hpp (original)
+++ tuscany/sca-cpp/trunk/kernel/list.hpp Thu Jan 3 08:10:25 2013
@@ -120,9 +120,9 @@ public:
inline const bool operator==(const list<T>& p) const noexcept {
if(this == &p)
return true;
- if(isNil(cdr))
- return isNil(p.cdr);
- if(isNil(p.cdr))
+ if(isNull(cdr))
+ return isNull(p.cdr);
+ if(isNull(p.cdr))
return false;
if(!(car == p.car))
return false;
@@ -134,9 +134,9 @@ public:
inline const bool operator<(const list<T>& p) const noexcept {
if(this == &p)
return false;
- if (isNil(cdr))
- return !isNil(p.cdr);
- if (isNil(p.cdr))
+ if (isNull(cdr))
+ return !isNull(p.cdr);
+ if (isNull(p.cdr))
return false;
if (car < p.car)
return true;
@@ -148,9 +148,9 @@ public:
inline const bool operator>(const list<T>& p) const noexcept {
if(this == &p)
return false;
- if (isNil(cdr))
+ if (isNull(cdr))
return false;
- if (isNil(p.cdr))
+ if (isNull(p.cdr))
return true;
if (car > p.car)
return true;
@@ -173,7 +173,7 @@ private:
string watch;
#endif
- template<typename X> friend const bool isNil(const list<X>& p) noexcept;
+ template<typename X> friend const bool isNull(const list<X>& p) noexcept;
template<typename X> friend const X car(const list<X>& p) noexcept;
template<typename X> friend const list<X> cdr(const list<X>& p) noexcept;
@@ -188,7 +188,7 @@ private:
* to watch than the list itself in a debugger.
*/
template<typename T> inline const string watchList(const list<T>& p) noexcept {
- if(isNil(p))
+ if(isNull(p))
return "()";
odebugstream os;
os << "(" << car(p) << " ...)";
@@ -200,22 +200,22 @@ template<typename T> inline const string
/**
* Returns true if the given list is nil.
*/
-template<typename T> inline const bool isNil(const list<T>& p) noexcept {
- return isNil(p.cdr);
+template<typename T> inline const bool isNull(const list<T>& p) noexcept {
+ return isNull(p.cdr);
}
/**
* Write a list to an output stream.
*/
template<typename T> inline ostream& writeHelper(ostream& out, const list<T>& l) noexcept {
- if (isNil(l))
+ if (isNull(l))
return out;
out << " " << car(l);
return writeHelper(out, cdr(l));
}
template<typename T> inline ostream& operator<<(ostream& out, const list<T>& l) noexcept {
- if(isNil(l))
+ if(isNull(l))
return out << "()";
out << "(" << car(l);
writeHelper<T>(out, cdr(l));
@@ -294,7 +294,7 @@ template<typename T> inline const list<T
*/
template<typename T> inline const T car(const list<T>& p) noexcept {
// Abort if trying to access the car of a nil list
- assertOrFail(!isNil(p.cdr));
+ assertOrFail(!isNull(p.cdr));
return p.car;
}
@@ -401,7 +401,7 @@ template<typename T> inline const list<T
*/
template<typename T> inline const size_t length(const list<T>& p) noexcept {
const lambda<size_t(const size_t, const list<T>&)> lengthRef = [&lengthRef](const size_t c, const list<T>& p) -> const size_t {
- if(isNil(p))
+ if(isNull(p))
return c;
return lengthRef(c + 1, cdr(p));
};
@@ -412,7 +412,7 @@ template<typename T> inline const size_t
* Appends a list and a lambda function returning a list.
*/
template<typename T> inline const list<T> append(const list<T>&a, const lambda<const list<T>()>& fb) noexcept {
- if(isNil(a))
+ if(isNull(a))
return fb();
return cons<T>(car(a), [a, fb]() { return append(cdr(a), fb); });
}
@@ -439,7 +439,7 @@ template<typename T, typename V> const l
* Run a map lambda function on a list.
*/
template<typename T, typename R> inline const list<R> map(const lambda<const R(const T)>& f, const list<T>& p) noexcept {
- if(isNil(p))
+ if(isNull(p))
return list<R> ();
return cons(f(car(p)), map(f, cdr(p)));
}
@@ -449,7 +449,7 @@ template<typename T, typename R> inline
*/
template<typename T, typename R> inline const R reduce(const lambda<const R(const R, const T)>& f, const R& initial, const list<T>& p) noexcept {
const lambda<const R(const R&, const list<T>&p)> reduceAccumulate = [f, &reduceAccumulate](const R& acc, const list<T>& p) -> R {
- if(isNil(p))
+ if(isNull(p))
return acc;
return reduceAccumulate(f(acc, car(p)), cdr(p));
};
@@ -458,7 +458,7 @@ template<typename T, typename R> inline
template<typename T, typename R> inline const R reduceRight(const lambda<const R(const T, const R)>& f, const R& initial, const list<T>& p) noexcept {
const lambda<const R(const list<T>&p, const R&)> reduceRightAccumulate = [f, &reduceRightAccumulate](const list<T>& p, const R& acc) -> R {
- if(isNil(p))
+ if(isNull(p))
return acc;
return reduceRightAccumulate(cdr(p), f(car(p), acc));
};
@@ -469,7 +469,7 @@ template<typename T, typename R> inline
* Run a filter lambda function on a list.
*/
template<typename T> inline const list<T> filter(const lambda<const bool(const T)>& f, const list<T>& p) noexcept {
- if(isNil(p))
+ if(isNull(p))
return list<T> ();
if(f(car(p))) {
const lambda<const list<T>(const lambda<const bool(const T)>, const list<T>)> ff(filter<T>);
@@ -482,7 +482,7 @@ template<typename T> inline const list<T
* Returns a list pointing to a member of a list.
*/
template<typename T> inline const list<T> member(const T& t, const list<T>& p) noexcept {
- if(isNil(p))
+ if(isNull(p))
return list<T> ();
if(t == car(p))
return p;
@@ -493,7 +493,7 @@ template<typename T> inline const list<T
* Reverse a list.
*/
template<typename T> inline const list<T> reverseIter(const list<T>& acc, const list<T>& p) noexcept {
- if(isNil(p))
+ if(isNull(p))
return acc;
return reverseIter(cons(car(p), acc), cdr(p));
}
@@ -528,7 +528,7 @@ template<typename T> inline const T list
template<typename T> inline const list<T> listTail(const list<T>& l, const size_t k) noexcept {
if(k == 0)
return l;
- if(isNil(l))
+ if(isNull(l))
return l;
return listTail(cdr(l), k - 1);
}
@@ -537,7 +537,7 @@ template<typename T> inline const list<T
* Substitute elements in a list.
*/
template<typename T> inline const list<T> subst(const T& o, const T& n, const list<T>& p) noexcept {
- if(isNil(p))
+ if(isNull(p))
return p;
if(o == car(p))
return cons<T>(n, subst(o, n, cdr(p)));
@@ -548,7 +548,7 @@ template<typename T> inline const list<T
* Returns the first pair matching a key from a list of key value pairs.
*/
template<typename T> inline const list<T> assoc(const T& k, const list<list<T> >& p) noexcept {
- if(isNil(p))
+ if(isNull(p))
return list<T>();
if(k == car(car(p)))
return car(p);
@@ -560,7 +560,7 @@ template<typename T> inline const list<T
* Requires T to support isList and cast to list<T>.
*/
template<typename T> inline const list<T> assoc(const T& k, const list<T>& p) noexcept {
- if(isNil(p))
+ if(isNull(p))
return list<T>();
const T c = car(p);
if(isList(c) && k == car<T>(c))
@@ -572,7 +572,7 @@ template<typename T> inline const list<T
* Returns a list of lists containing elements from two input lists.
*/
template<typename T> inline const list<list<T> > zip(const list<T>& a, const list<T>& b) noexcept {
- if (isNil(a) || isNil(b))
+ if (isNull(a) || isNull(b))
return list<list<T> >();
return cons<list<T> >(mklist<T>(car(a), car(b)), zip(cdr(a), cdr(b)));
}
@@ -581,13 +581,13 @@ template<typename T> inline const list<l
* Converts a list of key value pairs to a list containing the list of keys and the list of values.
*/
template<typename T> inline const list<T> unzipKeys(const list<list<T> >& l) noexcept {
- if (isNil(l))
+ if (isNull(l))
return list<T>();
return cons(car(car(l)), unzipKeys(cdr(l)));
}
template<typename T> inline const list<T> unzipValues(const list<list<T> >& l) noexcept {
- if (isNil(l))
+ if (isNull(l))
return list<T>();
return cons(cadr(car(l)), unzipValues(cdr(l)));
}
@@ -600,7 +600,7 @@ template<typename T> inline const list<l
* Delete assocs matching a key from a list of assocs.
*/
template<typename T> inline const list<list<T> > delAssoc(const T& k, const list<list<T> >& p) noexcept {
- if(isNil(p))
+ if(isNull(p))
return p;
if(k == car(car(p)))
return delAssoc(k, cdr(p));
@@ -612,7 +612,7 @@ template<typename T> inline const list<l
* Requires T to support isList, isAssoc, and cast to list<T>.
*/
template<typename T> inline const list<T> delAssoc(const T& k, const list<T>& p) noexcept {
- if(isNil(p))
+ if(isNull(p))
return p;
const T c = car(p);
if(isList(c) && k == car<T>(c))
@@ -624,7 +624,7 @@ template<typename T> inline const list<T
* Substitute assocs with matching keys in a list of assocs.
*/
template<typename T> inline const list<list<T> > substAssoc(const T& k, const list<T>& n, const list<list<T> >& p, const bool add = false) noexcept {
- if(isNil(p))
+ if(isNull(p))
return add? mklist<list<T> >(n) : p;
if(k == car(car(p)))
return cons<list<T> >(n, substAssoc(k, n, cdr(p), false));
@@ -636,7 +636,7 @@ template<typename T> inline const list<l
* Requires T to support isList, isAssoc, and cast to list<T>.
*/
template<typename T> inline const list<T> substAssoc(const T& k, const list<T>& n, const list<T>& p, const bool add = false) noexcept {
- if(isNil(p))
+ if(isNull(p))
return add? mklist<T>(n) : p;
const T c = car(p);
if(isList(c) && k == car<T>(c))
Modified: tuscany/sca-cpp/trunk/kernel/parallel-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/kernel/parallel-test.cpp?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/kernel/parallel-test.cpp (original)
+++ tuscany/sca-cpp/trunk/kernel/parallel-test.cpp Thu Jan 3 08:10:25 2013
@@ -109,7 +109,7 @@ const list<future<int> > submitSquares(w
}
bool checkSquareResults(const list<future<int> > r, int i) {
- if (isNil(r))
+ if (isNull(r))
return true;
assert(car(r) == i * i);
checkSquareResults(cdr(r), i + 1);
@@ -160,7 +160,7 @@ const list<future<long int> > submitTLSS
}
const bool checkTLSSets(const list<future<long int> > s) {
- if (isNil(s))
+ if (isNull(s))
return true;
assert(car(s) == 0);
return checkTLSSets(cdr(s));
@@ -174,7 +174,7 @@ const list<future<bool> > submitTLSCheck
}
const bool checkTLSResults(const list<future<bool> > r) {
- if (isNil(r))
+ if (isNull(r))
return true;
assert(car(r) == true);
return checkTLSResults(cdr(r));
Modified: tuscany/sca-cpp/trunk/kernel/parallel.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/kernel/parallel.hpp?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/kernel/parallel.hpp (original)
+++ tuscany/sca-cpp/trunk/kernel/parallel.hpp Thu Jan 3 08:10:25 2013
@@ -274,7 +274,7 @@ template<typename R> inline const future
* Enqueues shutdown requests.
*/
inline const bool shutdownEnqueue(const list<pthread_t>& threads, wqueue<blambda>& work) noexcept {
- if (isNil(threads))
+ if (isNull(threads))
return true;
enqueue(work, result(false));
return shutdownEnqueue(cdr(threads), work);
@@ -284,7 +284,7 @@ inline const bool shutdownEnqueue(const
* Waits for shut down threads to terminate.
*/
inline const bool shutdownJoin(const list<pthread_t>& threads) noexcept {
- if (isNil(threads))
+ if (isNull(threads))
return true;
pthread_join(car(threads), NULL);
return shutdownJoin(cdr(threads));
@@ -303,7 +303,7 @@ inline const bool shutdown(const worker&
* Cancel a worker.
*/
inline const bool cancel(const list<pthread_t>& threads) noexcept {
- if (isNil(threads))
+ if (isNull(threads))
return true;
pthread_cancel(car(threads));
return cancel(cdr(threads));
Modified: tuscany/sca-cpp/trunk/kernel/sstream.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/kernel/sstream.hpp?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/kernel/sstream.hpp (original)
+++ tuscany/sca-cpp/trunk/kernel/sstream.hpp Thu Jan 3 08:10:25 2013
@@ -46,7 +46,7 @@ inline void* stream_memcpy(void* t, cons
* Write a list of strings into a buffer.
*/
const bool writeList(const list<string>& l, char* const buf) {
- if (isNil(l))
+ if (isNull(l))
return true;
const string c = car(l);
char* b = buf - length(c);
@@ -114,7 +114,7 @@ public:
private:
inline const string str() {
spill();
- if (isNil((const list<string>)buf))
+ if (isNull((const list<string>)buf))
return emptyString;
char* const sbuf = gc_cnew(len + 1);
writeList(buf, sbuf + len);
@@ -239,10 +239,10 @@ inline const list<string> tokenize(const
inline const string join(const char* const sep, const list<string>& l) {
ostringstream os;
const lambda<ostringstream&(const char* const, const list<string>&, ostringstream&)> join = [&join](const char* const sep, const list<string>& l, ostringstream& os) -> ostringstream& {
- if (isNil(l))
+ if (isNull(l))
return os;
os << car(l);
- if (!isNil(cdr(l)))
+ if (!isNull(cdr(l)))
os << sep;
return join(sep, cdr(l), os);
};
@@ -277,7 +277,7 @@ inline const list<string> fragment(const
* Write a list of strings to an output stream.
*/
inline ostream& write(const list<string>& l, ostream& os) {
- if(isNil(l))
+ if(isNull(l))
return os;
os << car(l);
return write(cdr(l), os);
@@ -287,9 +287,9 @@ inline ostream& write(const list<string>
* Convert a list of strings to a string.
*/
inline const string write(const list<string>& l) {
- if (isNil(l))
+ if (isNull(l))
return emptyString;
- if (isNil(cdr(l)))
+ if (isNull(cdr(l)))
return car(l);
ostringstream os;
write(l, os);
Modified: tuscany/sca-cpp/trunk/kernel/tree.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/kernel/tree.hpp?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/kernel/tree.hpp (original)
+++ tuscany/sca-cpp/trunk/kernel/tree.hpp Thu Jan 3 08:10:25 2013
@@ -40,13 +40,13 @@ namespace tuscany {
* Requires T to support isList, isAssoc, and cast to list<T>.
*/
template<typename T> inline const list<T> treeDelAssoc(const list<T>& k, const list<T>& l) noexcept {
- if (isNil(k) || isNil(l))
+ if (isNull(k) || isNull(l))
return l;
const list<T> lv = l;
// If list is an assoc and matches, skip it
if (isAssoc(lv)) {
- if (car<T>(lv) == car(k) && isNil(cdr(k)))
+ if (car<T>(lv) == car(k) && isNull(cdr(k)))
return list<T>();
}
@@ -56,23 +56,23 @@ template<typename T> inline const list<T
if (!isList(a))
return cons<T>(a, treeDelAssoc<T>(k, cdr(lv)));
const list<T> da = treeDelAssoc<T>(k, a);
- return isNil(da)? treeDelAssoc<T>(k, cdr(lv)) : cons<T>(da, treeDelAssoc<T>(k, cdr(lv)));
+ return isNull(da)? treeDelAssoc<T>(k, cdr(lv)) : cons<T>(da, treeDelAssoc<T>(k, cdr(lv)));
}
// If we found a match, skip it and lookup children and rest of the list
if (car<T>(a) == car(k)) {
- if (isNil(cdr(k)))
+ if (isNull(cdr(k)))
return treeDelAssoc<T>(k, cdr(lv));
return cons<T>(cons<T>(car<T>(a), treeDelAssoc<T>(cdr(k), cdr<T>(a))), treeDelAssoc<T>(k, cdr(lv)));
}
// No match, lookup children and rest of the list
- if (isNil(cdr<T>(a)))
+ if (isNull(cdr<T>(a)))
return cons<T>(a, treeDelAssoc<T>(k, cdr(lv)));
if (!isList(cadr<T>(a)))
return cons<T>(cons<T>(car<T>(a), cons<T>(cadr<T>(a), treeDelAssoc<T>(k, cddr<T>(a)))), treeDelAssoc<T>(k, cdr(lv)));
const list<T> da = treeDelAssoc<T>(k, cadr<T>(a));
- if (isNil(da))
+ if (isNull(da))
return cons<T>(cons<T>(car<T>(a), treeDelAssoc<T>(k, cddr<T>(a))), treeDelAssoc<T>(k, cdr(lv)));
return cons<T>(cons<T>(car<T>(a), cons<T>(da, treeDelAssoc<T>(k, cddr<T>(a)))), treeDelAssoc<T>(k, cdr(lv)));
}
@@ -83,12 +83,12 @@ template<typename T> inline const list<T
* Requires T to support isList, isAssoc, and cast to list<T>.
*/
template<typename T> inline const list<T> treeSubstAssoc(const list<T>& k, const list<T>& n, const list<T>& lv) noexcept {
- if (isNil(k) || isNil(lv))
+ if (isNull(k) || isNull(lv))
return lv;
// If list is an assoc and matches, substitute it
if (isAssoc(lv)) {
- if (car<T>(lv) == car(k) && isNil(cdr(k)))
+ if (car<T>(lv) == car(k) && isNull(cdr(k)))
return n;
}
@@ -102,13 +102,13 @@ template<typename T> inline const list<T
// If we found a match, substitute it and lookup children and rest of the list
if (car<T>(a) == car(k)) {
- if (isNil(cdr(k)))
+ if (isNull(cdr(k)))
return cons<T>(n, treeSubstAssoc<T>(k, n, cdr(lv)));
return cons<T>(cons<T>(car<T>(a), treeSubstAssoc<T>(cdr(k), n, cdr<T>(a))), treeSubstAssoc<T>(k, n, cdr(lv)));
}
// No match, lookup children and rest of the list
- if (isNil(cdr<T>(a)))
+ if (isNull(cdr<T>(a)))
return cons<T>(a, treeSubstAssoc<T>(k, n, cdr(lv)));
if (!isList(cadr<T>(a)))
return cons<T>(cons<T>(car<T>(a), cons<T>(cadr<T>(a), treeSubstAssoc<T>(k, n, cddr<T>(a)))), treeSubstAssoc<T>(k, n, cdr(lv)));
@@ -121,12 +121,12 @@ template<typename T> inline const list<T
* Requires T to support isList, isAssoc, and cast to list<T>.
*/
template<typename T> inline const list<T> treeSelectAssoc(const list<T>& k, const list<T>& lv) noexcept {
- if (isNil(k) || isNil(lv))
+ if (isNull(k) || isNull(lv))
return list<T>();
// If list is an assoc and matches, select it
if (isAssoc(lv)) {
- if (car<T>(lv) == car(k) && isNil(cdr(k)))
+ if (car<T>(lv) == car(k) && isNull(cdr(k)))
return mklist<T>(lv);
}
@@ -140,13 +140,13 @@ template<typename T> inline const list<T
// If we found a match, select it and lookup children and rest of the list
if (car<T>(a) == car(k)) {
- if (isNil(cdr(k)))
+ if (isNull(cdr(k)))
return cons<T>(a, treeSelectAssoc<T>(k, cdr(lv)));
return append<T>(treeSelectAssoc<T>(cdr(k), cdr<T>(a)), treeSelectAssoc<T>(k, cdr(lv)));
}
// No match, lookup children and rest of the list
- if (isNil(cdr<T>(a)))
+ if (isNull(cdr<T>(a)))
return treeSelectAssoc<T>(k, cdr(lv));
if (!isList(cadr<T>(a)))
return append<T>(treeSelectAssoc<T>(k, cddr<T>(a)), treeSelectAssoc<T>(k, cdr(lv)));
@@ -164,7 +164,7 @@ template<typename T> inline const list<T
* Find a leaf with the given key in a rooted binary tree.
*/
template<typename T> inline const list<T> rbtreeAssoc(const T& k, const list<T>& tree) {
- if (isNil(tree))
+ if (isNull(tree))
return tree;
if (k == car<T>(car(tree)))
return car(tree);
@@ -177,7 +177,7 @@ template<typename T> inline const list<T
* Construct a new rooted binary tree from a leaf and a tree.
*/
template<typename T> inline const list<T> rbtreeCons(const T& e, const list<T>& tree) {
- if (isNil(tree))
+ if (isNull(tree))
return mkrbtree(e, list<T>(), list<T>());
if (e == car(tree))
return tree;
@@ -190,7 +190,7 @@ template<typename T> inline const list<T
* Make a rooted binary tree from an unordered list of leaves.
*/
template<typename T> inline const list<T> mkrbtree(const list<T>& l) {
- if (isNil(l))
+ if (isNull(l))
return l;
return rbtreeCons(car(l), mkrbtree(cdr(l)));
}
@@ -199,7 +199,7 @@ template<typename T> inline const list<T
* Convert a rooted binary tree to an ordered list of leaves.
*/
template<typename T> inline const list<T> flatten(const list<T>& tree) {
- if (isNil(tree))
+ if (isNull(tree))
return tree;
return append<T>(flatten<T>(cadr(tree)), cons<T>(car(tree), flatten<T>(caddr(tree))));
}
Modified: tuscany/sca-cpp/trunk/kernel/value.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/kernel/value.hpp?rev=1428206&r1=1428205&r2=1428206&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/kernel/value.hpp (original)
+++ tuscany/sca-cpp/trunk/kernel/value.hpp Thu Jan 3 08:10:25 2013
@@ -489,7 +489,7 @@ inline const value::ValueType type(const
/**
* Returns true if a value is nil.
*/
-inline const bool isNil(const value& v) noexcept {
+inline const bool isNull(const value& v) noexcept {
return type(v) == value::Nil;
}
@@ -546,7 +546,7 @@ inline const bool isPtr(const value& v)
* Returns true if a value is a tagged list.
*/
inline const bool isTaggedList(const value& exp, const value& tag) noexcept {
- if(isList(exp) && !isNil((list<value>)exp))
+ if(isList(exp) && !isNull((list<value>)exp))
return car((list<value>)exp) == tag;
return false;
}
@@ -555,14 +555,14 @@ inline const bool isTaggedList(const val
* Returns true if a value is an assoc.
*/
inline const bool isAssoc(const value& exp) noexcept {
- return isList(exp) && !isNil((list<value>)exp) && isSymbol(car<value>(exp));
+ return isList(exp) && !isNull((list<value>)exp) && isSymbol(car<value>(exp));
}
/**
* Make a list of values from a list of other things.
*/
template<typename T> inline const list<value> mkvalues(const list<T>& l) noexcept {
- if (isNil(l))
+ if (isNull(l))
return nilListValue;
return cons<value>(car(l), mkvalues(cdr(l)));
}
@@ -571,7 +571,7 @@ template<typename T> inline const list<v
* Convert a list of values to a list of other things.
*/
template<typename T> inline const list<T> convertValues(const list<value>& l) noexcept {
- if (isNil(l))
+ if (isNull(l))
return list<T>();
return cons<T>(car(l), convertValues<T>(cdr(l)));
}
@@ -580,7 +580,7 @@ template<typename T> inline const list<T
* Convert a list of lists of values to a list of values.
*/
inline const list<value> listOfValues(const list<list<value> >& l) noexcept {
- if (isNil(l))
+ if (isNull(l))
return nilListValue;
return cons<value>(car(l), listOfValues(cdr(l)));
}
@@ -589,7 +589,7 @@ inline const list<value> listOfValues(co
* Convert a list of values to a list of lists of values.
*/
inline const list<list<value> > listOfListOfValues(const list<value>& l) noexcept {
- if (isNil(l))
+ if (isNull(l))
return list<list<value> >();
return cons<list<value> >(type(car(l)) == value::List? list<value>(car(l)) : nilPairValue, listOfListOfValues(cdr(l)));
}
@@ -613,7 +613,7 @@ inline const list<value> pathValues(cons
* Convert a path represented as a list of values to a string value.
*/
inline const value path(const list<value>& p) noexcept {
- if (isNil(p))
+ if (isNull(p))
return emptyString;
return string("/") + (string)car(p) + (string)path(cdr(p));
}