Changeset 717

Timestamp:

04/24/06 12:53:58 (2 years ago)

Author:

bob@redivi.com

Message:

rename find to findValue, forward to forwardCall

Files:

• mochikit/trunk/MochiKit/Async.js (modified) (2 diffs)
• mochikit/trunk/MochiKit/Base.js (modified) (6 diffs)
• mochikit/trunk/MochiKit/Iter.js (modified) (17 diffs)
• mochikit/trunk/MochiKit/Logging.js (modified) (1 diff)
• mochikit/trunk/doc/html/MochiKit/Base.html (modified) (4 diffs)
• mochikit/trunk/doc/html/MochiKit/VersionHistory.html (modified) (1 diff)
• mochikit/trunk/doc/html/MochiKit/index.html (modified) (1 diff)
• mochikit/trunk/doc/rst/MochiKit/Base.rst (modified) (4 diffs)
• mochikit/trunk/doc/rst/MochiKit/VersionHistory.rst (modified) (1 diff)
• mochikit/trunk/packed/MochiKit/MochiKit.js (modified) (25 diffs)
• mochikit/trunk/tests/test_Base.js (modified) (1 diff)

mochikit/trunk/MochiKit/Async.js

@@ -148 +148 @@
-    },
-
-
+Call
-
-    _nextId: MochiKit.Base.counter(),
@@ -624 +624 @@
-        return 'DeferredLock(' + this.id + ', ' + state + ')';
-    },
-
+Call
-
-};

mochikit/trunk/MochiKit/Base.js

@@ -277 +277 @@
-    },
-
-
+Call
-        /***
-
@@ -1086 +1086 @@
-    },
-
-
+Value
-        if (typeof(end) == "undefined" || end == null) {
-            end = lst.length;
@@ -1289 +1289 @@
-    "NamedError",
-    "operator",
-
+Call
-    "itemgetter",
-    "typeMatcher",
@@ -1331 +1331 @@
-    "evalJSON",
-    "parseQueryString",
-
+Value
-    "findIdentical",
-    "flattenArguments"
@@ -1366 +1366 @@
-    // A singleton raised when no suitable adapter is found
-    var m = this;
+
+    // Backwards compat
+    m.forward = m.forwardCall;
+    m.find = m.findValue;
+
-    if (typeof(encodeURIComponent) != "undefined") {
-        m.urlEncode = function (unencoded) {
@@ -1392 +1397 @@
-            }
-        },
-
+Call
-    });
-

mochikit/trunk/MochiKit/Iter.js

@@ -126 +126 @@
-        return {
-            repr: function () { return "count(" + n + ")"; },
-
+Call
-            next: m.counter(n)
-        };
@@ -143 +143 @@
-        return {
-            repr: function () { return "cycle(...)"; },
-
+Call
-            next: function () {
-                try {
@@ -183 +183 @@
-                    return "repeat(" + m.repr(elem) + ")";
-                },
-
+Call
-                next: function () {
-                    return elem;
@@ -193 +193 @@
-                return "repeat(" + m.repr(elem) + ", " + n + ")";
-            },
-
+Call
-            next: function () {
-                if (n <= 0) {
@@ -224 +224 @@
-        return {
-            repr: function () { return "izip(...)"; },
-
+Call
-            next: function () { return m.map(next, iterables); }
-        };
@@ -242 +242 @@
-        return {
-            repr: function () { return "ifilter(...)"; },
-
+Call
-            next: function () {
-                while (true) {
@@ -270 +270 @@
-        return {
-            repr: function () { return "ifilterfalse(...)"; },
-
+Call
-            next: function () {
-                while (true) {
@@ -312 +312 @@
-                return "islice(" + ["...", start, stop, step].join(", ") + ")";
-            },
-
+Call
-            next: function () {
-                var rval;
@@ -341 +341 @@
-        return {
-            repr: function () { return "imap(...)"; },
-
+Call
-            next: function () {
-                return fun.apply(this, map(next, iterables));
@@ -359 +359 @@
-        return {
-            repr: function () { return "applymap(...)"; },
-
+Call
-            next: function () {
-                return fun.apply(self, seq.next());
@@ -381 +381 @@
-        return {
-            repr: function () { return "chain(...)"; },
-
+Call
-            next: function () {
-                while (argiter.length > 1) {
@@ -415 +415 @@
-        return {
-            repr: function () { return "takewhile(...)"; },
-
+Call
-            next: function () {
-                var rval = seq.next();
@@ -441 +441 @@
-        return {
-            "repr": function () { return "dropwhile(...)"; },
-
+Call
-            "next": function () {
-                while (true) {
@@ -461 +461 @@
-        return {
-            repr: function () { return "tee(" + ident + ", ...)"; },
-
+Call
-            next: function () {
-                var rval;
@@ -639 +639 @@
-                return "range(" + [start, stop, step].join(", ") + ")";
-            },
-
+Call
-        };
-    },
@@ -908 +908 @@
-        return {
-            repr: function () { return "arrayLikeIter(...)"; },
-
+Call
-            next: function () {
-                if (i >= iterable.length) {
@@ -925 +925 @@
-        return {
-            repr: function () { return "iterateNextIter(...)"; },
-
+Call
-            next: function () {
-                var rval = iterable.iterateNext();

mochikit/trunk/MochiKit/Logging.js

@@ -77 +77 @@
-            ).join(', ') + ')';
-    },
-
+Call
-};
-

mochikit/trunk/doc/html/MochiKit/Base.html

@@ -459 +459 @@
-</blockquote>
-<p>
-
-">find
+value
+value">findValue
-<blockquote>
-<p>Finds the index of <tt class="docutils literal"><span class="pre">value</span></tt> in the <tt class="docutils literal"><span class="pre">Array</span></tt>-like object <tt class="docutils literal"><span class="pre">lst</span></tt> using
@@ -468 +468 @@
-<p>For example:</p>
-<pre class="literal-block">
-
-
+Value
+Value
-</pre>
-</blockquote>
@@ -480 +480 @@
-at the index <tt class="docutils literal"><span class="pre">end</span> <span class="pre">-</span> <span class="pre">1</span></tt>.  If <tt class="docutils literal"><span class="pre">value</span></tt> is not found in <tt class="docutils literal"><span class="pre">lst</span></tt>, it will
-return <tt class="docutils literal"><span class="pre">-1</span></tt>.</p>
-">find
+value">findValue
-be comprised of objects for which no comparator is defined and all you care
-about is finding an identical object (e.g. the same instance), or if
@@ -503 +503 @@
-</blockquote>
-<p>
-
-">forward
+call
+call">forwardCall
-<blockquote>
-Returns a function that forwards a method call to <tt class="docutils literal"><span class="pre">this.name(...)</span></tt></blockquote>

mochikit/trunk/doc/html/MochiKit/VersionHistory.html

@@ -16 +16 @@
-<p>2006-04-XX      v1.3 &quot;warp zone&quot;</p>
-<ul class="simple">
+<li>IMPORTANT: Renamed MochiKit.Base.forward to forwardCall (for export)</li>
+<li>IMPORTANT: Renamed MochiKit.Base.find to findValue (for export)</li>
-<li>New MochiKit.Base.flattenArguments for flattening a list of arguments to
-a single Array</li>

mochikit/trunk/doc/html/MochiKit/index.html

@@ -55 +55 @@
-<p>2006-04-XX      v1.3 &quot;warp zone&quot;</p>
-<ul class="simple">
+<li>IMPORTANT: Renamed MochiKit.Base.forward to forwardCall (for export)</li>
+<li>IMPORTANT: Renamed MochiKit.Base.find to findValue (for export)</li>
-<li>New MochiKit.Base.flattenArguments for flattening a list of arguments to
-a single Array</li>

mochikit/trunk/doc/rst/MochiKit/Base.rst

@@ -474 +474 @@
-
-
-
+Value
-
-    Finds the index of ``value`` in the ``Array``-like object ``lst`` using
@@ -483 +483 @@
-    For example::
-    
-
-
+Value
+Value
-
-
@@ -494 +494 @@
-    return ``-1``.
-    
-
+Value
-    be comprised of objects for which no comparator is defined and all you care
-    about is finding an identical object (e.g. the same instance), or if
@@ -515 +515 @@
-
-
-
+Call
-
-    Returns a function that forwards a method call to ``this.name(...)``

mochikit/trunk/doc/rst/MochiKit/VersionHistory.rst

@@ -1 +1 @@
-2006-04-XX      v1.3 "warp zone"
-
+- IMPORTANT: Renamed MochiKit.Base.forward to forwardCall (for export)
+- IMPORTANT: Renamed MochiKit.Base.find to findValue (for export)
-- New MochiKit.Base.flattenArguments for flattening a list of arguments to
-  a single Array

mochikit/trunk/packed/MochiKit/MochiKit.js

@@ -207 +207 @@
-},contains:function(a,b){
-return b in a;
-
+Call
-return function(){
-return this[_30].apply(this,arguments);
@@ -689 +689 @@
-}
-return -1;
-
+Value
-if(typeof (end)=="undefined"||end==null){
-end=lst.length;
@@ -810 +810 @@
-return false;
-}};
-","itemgetter","typeMatcher","isCallable","isUndefined","isUndefinedOrNull","isNull","isNotEmpty","isArrayLike","isDateLike","xmap","map","xfilter","filter","bind","bindMethods","NotFound","AdapterRegistry","registerComparator","compare","registerRepr","repr","objEqual","arrayEqual","concat","keyComparator","reverseKeyComparator","partial","merge","listMinMax","listMax","listMin","objMax","objMin","nodeWalk","zip","urlEncode","queryString","serializeJSON","registerJSON","evalJSON","parseQueryString","find
+Call","itemgetter","typeMatcher","isCallable","isUndefined","isUndefinedOrNull","isNull","isNotEmpty","isArrayLike","isDateLike","xmap","map","xfilter","filter","bind","bindMethods","NotFound","AdapterRegistry","registerComparator","compare","registerRepr","repr","objEqual","arrayEqual","concat","keyComparator","reverseKeyComparator","partial","merge","listMinMax","listMax","listMin","objMax","objMin","nodeWalk","zip","urlEncode","queryString","serializeJSON","registerJSON","evalJSON","parseQueryString","findValue
-MochiKit.Base.EXPORT_OK=["nameFunctions","comparatorRegistry","reprRegistry","jsonRegistry","compareDateLike","compareArrayLike","reprArrayLike","reprString","reprNumber"];
-MochiKit.Base._exportSymbols=function(_124,_125){
@@ -826 +826 @@
-MochiKit.Base.__new__=function(){
-var m=this;
+m.forward=m.forwardCall;
+m.find=m.findValue;
-if(typeof (encodeURIComponent)!="undefined"){
-m.urlEncode=function(_127){
@@ -846 +848 @@
-return this.name+"()";
-}
-
+Call
-m.NotFound=new m.NamedError("MochiKit.Base.NotFound");
-m.listMax=m.partial(m.listMinMax,1);
@@ -926 +928 @@
-return {repr:function(){
-return "count("+n+")";
-
+Call
-},cycle:function(p){
-var self=MochiKit.Iter;
@@ -934 +936 @@
-return {repr:function(){
-return "cycle(...)";
-
+Call
-try{
-var rval=_136.next();
@@ -963 +965 @@
-return {repr:function(){
-return "repeat("+m.repr(elem)+")";
-
+Call
-return elem;
-}};
@@ -969 +971 @@
-return {repr:function(){
-return "repeat("+m.repr(elem)+", "+n+")";
-
+Call
-if(n<=0){
-throw MochiKit.Iter.StopIteration;
@@ -984 +986 @@
-return {repr:function(){
-return "izip(...)";
-
+Call
-return m.map(next,_141);
-}};
@@ -995 +997 @@
-return {repr:function(){
-return "ifilter(...)";
-
+Call
-while(true){
-var rval=seq.next();
@@ -1012 +1014 @@
-return {repr:function(){
-return "ifilterfalse(...)";
-
+Call
-while(true){
-var rval=seq.next();
@@ -1043 +1045 @@
-return {repr:function(){
-return "islice("+["...",_144,stop,step].join(", ")+")";
-
+Call
-var rval;
-while(i<_144){
@@ -1063 +1065 @@
-return {repr:function(){
-return "imap(...)";
-
+Call
-return fun.apply(this,map(next,_148));
-}};
@@ -1071 +1073 @@
-return {repr:function(){
-return "applymap(...)";
-
+Call
-return fun.apply(self,seq.next());
-}};
@@ -1083 +1085 @@
-return {repr:function(){
-return "chain(...)";
-
+Call
-while(_150.length>1){
-try{
@@ -1107 +1109 @@
-return {repr:function(){
-return "takewhile(...)";
-
+Call
-var rval=seq.next();
-if(!pred(rval)){
@@ -1123 +1125 @@
-return {"repr":function(){
-return "dropwhile(...)";
-
+Call
-while(true){
-var rval=seq.next();
@@ -1139 +1141 @@
-return {repr:function(){
-return "tee("+_152+", ...)";
-
+Call
-var rval;
-var i=sync.pos[_152];
@@ -1254 +1256 @@
-},repr:function(){
-return "range("+[_162,stop,step].join(", ")+")";
-
+Call
-},sum:function(_163,_164){
-var x=_164||0;
@@ -1433 +1435 @@
-return {repr:function(){
-return "arrayLikeIter(...)";
-
+Call
-if(i>=_185.length){
-throw MochiKit.Iter.StopIteration;
@@ -1444 +1446 @@
-return {repr:function(){
-return "iterateNextIter(...)";
-
+Call
-var rval=_187.iterateNext();
-if(rval===null||rval===undefined){
@@ -1503 +1505 @@
-var m=MochiKit.Base;
-return "LogMessage("+m.map(m.repr,[this.num,this.level,this.info]).join(", ")+")";
-
+Call
-MochiKit.Base.update(MochiKit.Logging,{logLevelAtLeast:function(_191){
-var self=MochiKit.Logging;
@@ -2072 +2074 @@
-}
-return "Deferred("+this.id+", "+_278+")";
-
+Call
-var self=MochiKit.Async;
-if(this.fired==-1){
@@ -2361 +2363 @@
-}
-return "DeferredLock("+this.id+", "+_300+")";
-
+Call
-MochiKit.Async.DeferredList=function(list,_302,_303,_304,_305){
-this.list=list;

mochikit/trunk/tests/test_Base.js

@@ -377 +377 @@
-    t.is( c(), 3, "counter increases" );
-
-([1, 2, 3], 4), -1, "find
-([1, 2, 3], 1), 0, "find
-([1, 2, 3], 1, 1), -1, "find
-([1, 2, 3], 2, 0, 1), -1, "find
+Value([1, 2, 3], 4), -1, "findValue
+Value([1, 2, 3], 1), 0, "findValue
+Value([1, 2, 3], 1, 1), -1, "findValue
+Value([1, 2, 3], 2, 0, 1), -1, "findValue
-    t.is( findIdentical([1, 2, 3], 4), -1, "findIdentical returns -1");
-    t.is( findIdentical([1, 2, 3], 1), 0, "findIdentical returns correct index");