Changeset 491

Timestamp:

01/10/06 19:25:15 (3 years ago)

Author:

bob

Message:

find and findIdentical

Files:

• mochikit/trunk/MochiKit/Base.js (modified) (2 diffs)
• mochikit/trunk/doc/html/MochiKit/Base.html (modified) (1 diff)
• 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) (1 diff)
• mochikit/trunk/doc/rst/MochiKit/VersionHistory.rst (modified) (1 diff)
• mochikit/trunk/packed/MochiKit/MochiKit.js (modified) (123 diffs)
• mochikit/trunk/tests/test_MochiKit-Base.html (modified) (2 diffs)

mochikit/trunk/MochiKit/Base.js

@@ -1056 +1056 @@
-    },
-
+    findIdentical: function (lst, value, start/* = 0 */, /* optional */end) {
+        if (typeof(end) == "undefined" || end == null) {
+            end = lst.length;
+        }
+        for (var i = (start || 0); i < end; i++) {
+            if (lst[i] === value) {
+                return i;
+            }
+        }
+        return -1;
+    },
+
+    find: function (lst, value, start/* = 0 */, /* optional */end) {
+        if (typeof(end) == "undefined" || end == null) {
+            end = lst.length;
+        }
+        var cmp = MochiKit.Base.compare;
+        for (var i = (start || 0); i < end; i++) {
+            if (cmp(lst[i], value) == 0) {
+                return i;
+            }
+        }
+        return -1;
+    },
+    
-    nodeWalk: function (node, visitor) {
-        /***
@@ -1287 +1312 @@
-    "registerJSON",
-    "evalJSON",
-
+
+
+
-];
-

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

@@ -455 +455 @@
-</blockquote>
-<p>
+<a name="fn-find"></a>
+<a class="mochidef reference" href="#fn-find">find(lst, value, start=0, end=lst.length)</a>:</p>
+<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
+<a class="mochiref reference" href="#fn-compare">compare</a>.  The search starts at the index <tt class="docutils literal"><span class="pre">start</span></tt>, and ends
+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>
+<p>For example:</p>
+<pre class="literal-block">
+assert( find([1, 2, 3, 2, 1], 2) == 1 )
+assert( find([1, 2, 3, 2, 1], 2, 2) == 3 )
+</pre>
+</blockquote>
+<p>
+<a name="fn-findidentical"></a>
+<a class="mochidef reference" href="#fn-findidentical">findIdentical(lst, value, start=0, end=lst.length)</a>:</p>
+<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
+the <tt class="docutils literal"><span class="pre">===</span></tt> operator.  The search starts at the index <tt class="docutils literal"><span class="pre">start</span></tt>, and ends
+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>
+<p>You should use this function instead of <a class="mochiref reference" href="#fn-find">find</a> if <tt class="docutils literal"><span class="pre">lst</span></tt> may
+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
+<tt class="docutils literal"><span class="pre">lst</span></tt> is comprised of just numbers or strings and performance is
+important.</p>
+<p>For example:</p>
+<pre class="literal-block">
+assert( findIdentical([1, 2, 3, 2, 1], 2) == 1 )
+assert( findIdentical([1, 2, 3, 2, 1], 2, 2) == 3 )
+</pre>
+</blockquote>
+<p>
-<a name="fn-forward"></a>
-<a class="mochidef reference" href="#fn-forward">forward(name)</a>:</p>

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

@@ -12 +12 @@
-<p>2006-01-XX      v1.2 &quot;the ocho&quot;</p>
-<ul class="simple">
+<li>Added new MochiKit.Base.findIdentical function to find the index of an
+element in an Array-like object.  Uses === for identity comparison.</li>
+<li>Added new MochiKit.Base.find function to find the index of an element in
+an Array-like object.  Uses compare for rich comparison.</li>
-<li>MochiKit.Base.bind will accept a string for func, which will be immediately
-looked up as self[func].</li>

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

@@ -50 +50 @@
-<p>2006-01-XX      v1.2 &quot;the ocho&quot;</p>
-<ul class="simple">
+<li>Added new MochiKit.Base.findIdentical function to find the index of an
+element in an Array-like object.  Uses === for identity comparison.</li>
+<li>Added new MochiKit.Base.find function to find the index of an element in
+an Array-like object.  Uses compare for rich comparison.</li>
-<li>MochiKit.Base.bind will accept a string for func, which will be immediately
-looked up as self[func].</li>

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

@@ -474 +474 @@
-
-
+:mochidef:`find(lst, value, start=0, end=lst.length)`:
+
+    Finds the index of ``value`` in the ``Array``-like object ``lst`` using
+    :mochiref:`compare`.  The search starts at the index ``start``, and ends
+    at the index ``end - 1``.  If ``value`` is not found in ``lst``, it will
+    return ``-1``.
+
+    For example::
+    
+        assert( find([1, 2, 3, 2, 1], 2) == 1 )
+        assert( find([1, 2, 3, 2, 1], 2, 2) == 3 )
+
+
+:mochidef:`findIdentical(lst, value, start=0, end=lst.length)`:
+
+    Finds the index of ``value`` in the ``Array``-like object ``lst`` using
+    the ``===`` operator.  The search starts at the index ``start``, and ends
+    at the index ``end - 1``.  If ``value`` is not found in ``lst``, it will
+    return ``-1``.
+    
+    You should use this function instead of :mochiref:`find` if ``lst`` may
+    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
+    ``lst`` is comprised of just numbers or strings and performance is
+    important.
+
+    For example::
+    
+        assert( findIdentical([1, 2, 3, 2, 1], 2) == 1 )
+        assert( findIdentical([1, 2, 3, 2, 1], 2, 2) == 3 )
+
+
-:mochidef:`forward(name)`:
-

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

@@ -1 +1 @@
-2006-01-XX      v1.2 "the ocho"
-
+- Added new MochiKit.Base.findIdentical function to find the index of an
+  element in an Array-like object.  Uses === for identity comparison.
+- Added new MochiKit.Base.find function to find the index of an element in
+  an Array-like object.  Uses compare for rich comparison.
-- MochiKit.Base.bind will accept a string for func, which will be immediately
-  looked up as self[func].

mochikit/trunk/packed/MochiKit/MochiKit.js

@@ -664 +664 @@
-},objMin:function(){
-return MochiKit.Base.listMinMax(-1,arguments);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-if(res){
-99(_98
-
-
-0
-0
+104(_103
+
+
+5
+5
-if(typeof (base)=="undefined"){
-base="";
@@ -680 +701 @@
-base=base+".";
-}
-0
-0
+5
+5
-if(typeof (o)=="function"&&typeof (o.NAME)=="undefined"){
-try{
@@ -690 +711 @@
-}
-}
-3,_104
-3)=="string"||(typeof (_103.nodeType)!="undefined"&&_103
-3
-3
-4
+8,_109
+8)=="string"||(typeof (_108.nodeType)!="undefined"&&_108
+8
+8
+9
-}else{
-if(arguments.length==1){
-3
-3
-4
+8
+8
+9
-for(var k in o){
-var v=o[k];
-if(typeof (v)!="function"){
-3
-4
+8
+9
-}
-}
@@ -710 +731 @@
-}
-var rval=[];
-3.length,_104
-08
+8.length,_109
+13
-for(var i=0;i<len;i++){
-4
+9
-if(typeof (v)!="undefined"&&v!=null){
-08(_103[i])+"="+_108
+13(_108[i])+"="+_113
-}
-}
-return rval.join("&");
-09,_110
-1=_109
+14,_115
+6=_114
-var o={};
-2
+7
-if(typeof (decodeURIComponent)!="undefined"){
-2
-
-2
-
-0
-1
-1
-2
+7
+
+7
+
+5
+6
+6
+7
-var arr=o[name];
-if(!(arr instanceof Array)){
@@ -737 +758 @@
-o[name]=arr;
-}
-2
-
-
-1
-1
-2(pair[0])]=_112
+7
+
+
+6
+6
+7(pair[0])]=_117
-}
-}
@@ -750 +771 @@
-this.pairs=[];
-};
-4,wrap,_116
-16
-4
-
-4
+9,wrap,_121
+21
+9
+
+9
-}
-},match:function(){
@@ -774 +795 @@
-return false;
-}};
-
+,"find","findIdentical"
-MochiKit.Base.EXPORT_OK=["nameFunctions","comparatorRegistry","reprRegistry","jsonRegistry","compareDateLike","compareArrayLike","reprArrayLike","reprString","reprNumber"];
-17,_118
+22,_123
-if((typeof (JSAN)=="undefined"&&typeof (dojo)=="undefined")||(typeof (MochiKit.__compat__)=="boolean"&&MochiKit.__compat__)){
-18
+23
-for(var i=0;i<all.length;i++){
-17[all[i]]=_118
+22[all[i]]=_123
-}
-}
@@ -787 +808 @@
-var m=this;
-if(typeof (encodeURIComponent)!="undefined"){
-0
-0
-
-
-1
-1
+5
+5
+
+
+6
+6
-};
-}
@@ -853 +874 @@
-},toString:function(){
-return this.__repr__();
-2,_123,_124
-2,_123,_124
-25,_126
+7,_128,_129
+7,_128,_129
+30,_131
-var self=MochiKit.Iter;
-if(arguments.length==2){
-return self.takewhile(function(a){
-26
-25
-
-25
-25
-
-25
-25
-
-
-
-25
+31
+30
+
+30
+30
+
+30
+30
+
+
+
+30
-}
-catch(e){
-var m=MochiKit.Base;
-if(e==m.NotFound){
-25)+": "+m.repr(_125
+30)+": "+m.repr(_130
-}
-throw e;
@@ -891 +912 @@
-var m=MochiKit.Base;
-var lst=[];
-29
+34
-return {repr:function(){
-return "cycle(...)";
-},toString:m.forward("repr"),next:function(){
-try{
-29
+34
-lst.push(rval);
-return rval;
@@ -936 +957 @@
-return elem;
-}};
-1
-1
+6
+6
-},izip:function(p,q){
-var m=MochiKit.Base;
-var next=MochiKit.Iter.next;
-4
+9
-return {repr:function(){
-return "izip(...)";
-},toString:m.forward("repr"),next:function(){
-4
+9
-}};
-},ifilter:function(pred,seq){
@@ -985 +1006 @@
-var m=MochiKit.Base;
-seq=self.iter(seq);
-37
+42
-var stop=0;
-var step=1;
@@ -993 +1014 @@
-}else{
-if(arguments.length==3){
-37
+42
-stop=arguments[2];
-}else{
-37
+42
-stop=arguments[2];
-step=arguments[3];
@@ -1002 +1023 @@
-}
-return {repr:function(){
-37
+42
-},toString:m.forward("repr"),next:function(){
-var rval;
-37
+42
-rval=seq.next();
-i++;
-}
-37
+42
-throw self.StopIteration;
-}
-37
+42
-return rval;
-}};
@@ -1018 +1039 @@
-var m=MochiKit.Base;
-var self=MochiKit.Iter;
-1
+6
-var map=m.map;
-var next=self.next;
@@ -1024 +1045 @@
-return "imap(...)";
-},toString:m.forward("repr"),next:function(){
-1
+6
-}};
-},applymap:function(fun,seq,self){
@@ -1040 +1061 @@
-return self.iter(arguments[0]);
-}
-3
+8
-return {repr:function(){
-return "chain(...)";
-},toString:m.forward("repr"),next:function(){
-3
-
-3
+8
+
+8
-}
-catch(e){
@@ -1052 +1073 @@
-throw e;
-}
-3
-
-
-3
-3
+8
+
+
+8
+8
-this.next=m.bind("next",arg);
-return this.next();
@@ -1093 +1114 @@
-return rval;
-}};
-45,sync,_147
-45
+50,sync,_152
+50
-var m=MochiKit.Base;
-48
+53
-return {repr:function(){
-45
+50
-},toString:m.forward("repr"),next:function(){
-var rval;
-45
+50
-if(i==sync.max){
-47
+52
-sync.deque.push(rval);
-sync.max+=1;
-45
+50
-}else{
-rval=sync.deque[i-sync.min];
-45
-48
+50
+53
-sync.min+=1;
-sync.deque.shift();
@@ -1117 +1138 @@
-return rval;
-}};
-49
+54
-var rval=[];
-var sync={"pos":[],"deque":[],"max":-1,"min":-1};
@@ -1124 +1145 @@
-}
-var self=MochiKit.Iter;
-49=self.iter(_149
+54=self.iter(_154
-var _tee=self._tee;
-for(var i=0;i<n;i++){
-49
+54
-}
-return rval;
-1
+6
-var m=MochiKit.Base;
-1
-1
-
-1
-1
+6
+6
+
+6
+6
-}
-}
-var self=MochiKit.Iter;
-1=self.iter(_151
+6=self.iter(_156
-var rval=[];
-try{
-while(true){
-1
+6
-}
-}
@@ -1154 +1175 @@
-}
-return undefined;
-2,_153
+7,_158
-var i=0;
-3
+8
-var self=MochiKit.Iter;
-2=self.iter(_152
+7=self.iter(_157
-if(arguments.length<3){
-try{
-2
+7
-}
-catch(e){
@@ -1173 +1194 @@
-try{
-while(true){
-2
+7
-}
-}
@@ -1183 +1204 @@
-return x;
-},range:function(){
-55
+60
-var stop=0;
-var step=1;
@@ -1190 +1211 @@
-}else{
-if(arguments.length==2){
-55
+60
-stop=arguments[1];
-}else{
-if(arguments.length==3){
-55
+60
-stop=arguments[1];
-step=arguments[2];
@@ -1206 +1227 @@
-}
-return {next:function(){
-55>=stop)||(step<0&&_155
+60>=stop)||(step<0&&_160
-throw MochiKit.Iter.StopIteration;
-}
-55
-55
+60
+60
-return rval;
-},repr:function(){
-55
+60
-},toString:MochiKit.Base.forward("repr")};
-56,_157
-57
+61,_162
+62
-var self=MochiKit.Iter;
-56=self.iter(_156
+61=self.iter(_161
-try{
-while(true){
-56
+61
-}
-}
@@ -1230 +1251 @@
-}
-return x;
-58
+63
-var self=MochiKit.Iter;
-58=self.iter(_158
+63=self.iter(_163
-try{
-while(true){
-58
+63
-}
-}
@@ -1243 +1264 @@
-}
-}
-59
+64
-var m=MochiKit.Base;
-if(arguments.length>2){
-func=m.bind(func,self);
-}
-59
-
-59
-59
+64
+
+64
+64
-}
-}
@@ -1261 +1282 @@
-}else{
-self=MochiKit.Iter;
-59
-
-1
+64
+
+6
-var self=MochiKit.Iter;
-try{
-1
+6
-return false;
-}
@@ -1275 +1296 @@
-return true;
-}
-2
-2
+7
+7
-if(arguments.length==1){
-cmp=MochiKit.Base.compare;
@@ -1282 +1303 @@
-rval.sort(cmp);
-return rval;
-3
-3
+8
+8
-rval.reverse();
-return rval;
-4
+9
-var self=MochiKit.Iter;
-try{
-4
+9
-return true;
-}
@@ -1298 +1319 @@
-return false;
-}
-65
-65
-65
-65
+70
+70
+70
+70
-}
-}else{
-var self=MochiKit.Iter;
-65=self.iter(_165
+70=self.iter(_170
-try{
-while(true){
-65
+70
-}
-}
@@ -1318 +1339 @@
-}
-return lst;
-66,_167
+71,_172
-var m=MochiKit.Base;
-var self=MochiKit.Iter;
-if(arguments.length<2){
-67
-
-66=self.iter(_166
+72
+
+71=self.iter(_171
-var pk=undefined;
-var k=undefined;
-var v;
-function fetch(){
-66
-67
+71
+72
-}
-function eat(){
@@ -1337 +1358 @@
-return ret;
-}
-0
+5
-return {repr:function(){
-return "groupby(...)";
@@ -1343 +1364 @@
-while(k==pk){
-fetch();
-0
-0
+5
+5
-break;
-}
@@ -1359 +1380 @@
-}}];
-}};
-1,_172
+6,_177
-var m=MochiKit.Base;
-var self=MochiKit.Iter;
-if(arguments.length<2){
-2
-
-1=self.iter(_171
-3
-4
-75
+7
+
+6=self.iter(_176
+8
+9
+80
-while(true){
-try{
-76=_171
-2(_176
+81=_176
+7(_181
-}
-catch(e){
@@ -1380 +1401 @@
-throw e;
-}
-4||key!=_175
-77
-3.push([key,_177
-
-77.push(_176
-4
-75
-
-3
-78
+9||key!=_180
+82
+8.push([key,_182
+
+82.push(_181
+9
+80
+
+8
+83
-var i=0;
-return {repr:function(){
-return "arrayLikeIter(...)";
-},toString:MochiKit.Base.forward("repr"),next:function(){
-78
+83
-throw MochiKit.Iter.StopIteration;
-}
-78
+83
-}};
-79
-79&&typeof (_179
-0
+84
+84&&typeof (_184
+5
-return {repr:function(){
-return "iterateNextIter(...)";
-},toString:MochiKit.Base.forward("repr"),next:function(){
-0
+5
-if(rval===null||rval===undefined){
-throw MochiKit.Iter.StopIteration;
@@ -1454 +1475 @@
-MochiKit.Logging.EXPORT=["LogLevel","LogMessage","Logger","alertListener","logger","log","logError","logDebug","logFatal","logWarning"];
-MochiKit.Logging.EXPORT_OK=["logLevelAtLeast","isLogMessage","compareLogMessage"];
-2
+7
-this.num=num;
-2
+7
-this.info=info;
-this.timestamp=new Date();
@@ -1464 +1485 @@
-return "LogMessage("+m.map(m.repr,[this.num,this.level,this.info]).join(", ")+")";
-},toString:MochiKit.Base.forward("repr")};
-4
+9
-var self=MochiKit.Logging;
-4
-4=self.LogLevel[_184
+9
+9=self.LogLevel[_189
-}
-return function(msg){
-86
-86
-86=self.LogLevel[_186
-
-86>=_184
+91
+91
+91=self.LogLevel[_191
+
+91>=_189
-};
-},isLogMessage:function(){
-87
+92
-for(var i=0;i<arguments.length;i++){
-87
+92
-return false;
-}
@@ -1489 +1510 @@
-alert("num: "+msg.num+"\nlevel: "+msg.level+"\ninfo: "+msg.info.join(" "));
-}});
-88
+93
-this.counter=0;
-88)=="undefined"||_188
-88
-
-88
+93)=="undefined"||_193
+93
+
+93
-this._messages=[];
-this.listeners={};
@@ -1508 +1529 @@
-pair[1](msg);
-}
-89,_190,_191
-0
-0=MochiKit.Logging.logLevelAtLeast(_190
-
-2=[_190,_191
-2.ident=_189
-89]=_192
-3
-3
-4,_195
-4
+94,_195,_196
+5
+5=MochiKit.Logging.logLevelAtLeast(_195
+
+7=[_195,_196
+7.ident=_194
+94]=_197
+8
+8
+9,_200
+9
-this._messages.push(msg);
-this.dispatchListeners(msg);
@@ -1525 +1546 @@
-this._messges.shift();
-}
-196
-197
-196)=="undefined"||_196
-197=Math.max(0,this._messages.length-_196
-
-197
-198
-198)=="undefined"||_198
-198
-
-199=this.getMessages(_198
-199
+201
+202
+201)=="undefined"||_201
+202=Math.max(0,this._messages.length-_201
+
+202
+203
+203)=="undefined"||_203
+203
+
+204=this.getMessages(_203
+204
-var lst=map(function(m){
-return "\n  ["+m.num+"] "+m.level+": "+m.info.join(" ");
-199
-199
+204
+204
-return lst.join("");
-}
-return "";
-0
+5
-if(typeof (MochiKit.LoggingPane)=="undefined"){
-alert(this.getMessageText());
-}else{
-0
+5
-}
-}};
@@ -1555 +1576 @@
-var m=MochiKit.Base;
-m.registerComparator("LogMessage",this.isLogMessage,this.compareLogMessage);
-1
-2
-3=_202
-1(_203,"DEBUG"),log:_201(_203,"INFO"),error:_201(_203,"ERROR"),fatal:_201(_203,"FATAL"),warning:_201(_203
+6
+7
+8=_207
+6(_208,"DEBUG"),log:_206(_208,"INFO"),error:_206(_208,"ERROR"),fatal:_206(_208,"FATAL"),warning:_206(_208
-var self=this;
-4
+9
-return function(){
-self.logger[name].apply(self.logger,arguments);
-};
-};
-4
-4
-4
-4
-4
-2
+9
+9
+9
+9
+9
+7
-this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_OK)};
-m.nameFunctions(this);
@@ -1649 +1670 @@
-return new Date(Date.UTC(year,month,day,hour,min,sec,msec)-ofs);
-};
-0
+5
-if(typeof (date)=="undefined"||date==null){
-return null;
@@ -1656 +1677 @@
-var mm=date.getMinutes();
-var ss=date.getSeconds();
-0
+5
-return lst.join(":");
-};
-4
+9
-if(typeof (date)=="undefined"||date==null){
-return null;
-}
-4
-4
-4
+9
+9
+9
-date=new Date(date.getTime()+(date.getTimezoneOffset()*60000));
-}
-4
+9
-};
-MochiKit.DateTime.toISODate=function(date){
@@ -1674 +1695 @@
-return null;
-}
-17
-17(date.getMonth()+1),_217
+22
+22(date.getMonth()+1),_222
-};
-MochiKit.DateTime.americanDate=function(d){
@@ -1692 +1713 @@
-return null;
-}
-19
-19(d.getMonth()+1),_219
+24
+24(d.getMonth()+1),_224
-};
-MochiKit.DateTime.toAmericanDate=function(d){
@@ -1718 +1739 @@
-};
-MochiKit.DateTime.__new__();
-0,_221
+5,_226
-if((typeof (JSAN)=="undefined"&&typeof (dojo)=="undefined")||(typeof (MochiKit.__compat__)=="boolean"&&MochiKit.__compat__)){
-1
+6
-for(var i=0;i<all.length;i++){
-0[all[i]]=_221
+5[all[i]]=_226
-}
-}