simshanith · December 21, 2010 10:18 · Dec 21, 2010 · Dec 21, 2010 · Dec 21, 2010 · Dec 21, 2010
diff --git a/clj.persistentvector.js b/clj.persistentvector.js
@@ -4,6 +4,9 @@ discussion title: clojure -> javascript
 http://groups.google.com/group/clojure/browse_frm/thread/83c3c18951a764e2/62d630249e75599c?#62d630249e75599c
 
 Some (hopefully annotated) additions are by Shane Daniel.
+
+of note: Karl Krukow's streamlined port of Clojure data structures to Java.
+https://github.com/krukow/clj-ds
 */
 RT = { EMPTY_ARRAY: [] };
 

diff --git a/clj.persistentvector.js b/clj.persistentvector.js
@@ -166,6 +166,7 @@ function PersistentVector( meta_arg, cnt, shift, root, tail ) {
     return arr.slice( 0, arr.length - 1 );
   };
 
+
 //added by Shane. returns JavaScript array.
   this.asArray = function(){return root.concat(tail)};
 

diff --git a/clj.persistentvector.js b/clj.persistentvector.js
@@ -28,7 +28,8 @@ function PersistentVector( meta_arg, cnt, shift, root, tail ) {
     return cnt - tail.length;
   };
 
-  this.nth = function( i ) {
+//edited by Shane to add optNotFound arg
+  this.nth = function( i, optNotFound ) {
     if( i >= 0 && i < cnt ) {
       if( i >= tailoff() ) {
         return tail[ i & 0x01f ];
@@ -39,7 +40,8 @@ function PersistentVector( meta_arg, cnt, shift, root, tail ) {
       }
       return arr[ i & 0x01f ];
     }
-    throw "IndexOutOfBoundsException";
+   else if(optNotFound) {return optNotFound} else{
+    throw "IndexOutOfBoundsException"}
   };
 
   this.assocN = function( i, val ) {

diff --git a/clj.persistentvector.js b/clj.persistentvector.js
@@ -163,6 +163,10 @@ function PersistentVector( meta_arg, cnt, shift, root, tail ) {
     }
     return arr.slice( 0, arr.length - 1 );
   };
+
+//added by Shane. returns JavaScript array.
+  this.asArray = function(){return root.concat(tail)};
+
 }
 
 PersistentVector.EMPTY = new PersistentVector(
@@ -174,6 +178,4 @@ PersistentVector.create = function( items ) {
     ret = ret.cons( items[ i ] );
   }
   return ret;
-}
-
-PersistentVector.asArray = function(){return this.root.concat(this.tail)};
+}
diff --git a/clj.persistentvector.js b/clj.persistentvector.js
@@ -1,7 +1,9 @@
-/* written by Chouser. taken from clojure google group, http://groups.google.com/group/clojure
+/* originally written by Chouser. taken from clojure google group, http://groups.google.com/group/clojure
 discussion title: clojure -> javascript
 
 http://groups.google.com/group/clojure/browse_frm/thread/83c3c18951a764e2/62d630249e75599c?#62d630249e75599c
+
+Some (hopefully annotated) additions are by Shane Daniel.
 */
 RT = { EMPTY_ARRAY: [] };
 
@@ -172,4 +174,6 @@ PersistentVector.create = function( items ) {
     ret = ret.cons( items[ i ] );
   }
   return ret;
-}
+}
+
+PersistentVector.asArray = function(){return this.root.concat(this.tail)};
diff --git a/gistfile1.js → clj.persistentvector.js b/gistfile1.js → clj.persistentvector.js
diff --git a/gistfile1.js b/gistfile1.js
@@ -0,0 +1,175 @@
+/* written by Chouser. taken from clojure google group, http://groups.google.com/group/clojure
+discussion title: clojure -> javascript
+
+http://groups.google.com/group/clojure/browse_frm/thread/83c3c18951a764e2/62d630249e75599c?#62d630249e75599c
+*/
+RT = { EMPTY_ARRAY: [] };
+
+function APersistentVector( meta_arg ) {
+
+  this.meta = function() {
+    return meta_arg;
+  };
+
+  this.peek = function() {
+    if( this.count() > 0 ) {
+      return this.nth( this.count() - 1 );
+    }
+    return null;
+  };
+};
+
+function PersistentVector( meta_arg, cnt, shift, root, tail ) {
+  APersistentVector.call( this, meta_arg );
+
+  function tailoff() {
+    return cnt - tail.length;
+  };
+
+  this.nth = function( i ) {
+    if( i >= 0 && i < cnt ) {
+      if( i >= tailoff() ) {
+        return tail[ i & 0x01f ];
+      }
+      var arr = root;
+      for( var level = shift; level > 0; level -= 5 ) {
+        arr = arr[ (i >>> level) & 0x01f ];
+      }
+      return arr[ i & 0x01f ];
+    }
+    throw "IndexOutOfBoundsException";
+  };
+
+  this.assocN = function( i, val ) {
+    if( i >= 0 && i < cnt ) {
+      if( i >= tailoff() ) {
+        var newTail = tail.slice( 0 );
+        newTail[ i & 0x01f ] = val;
+        return new PersistentVector( this.meta(), cnt, shift, root, newTail );
+      }
+      return new PersistentVector(
+          this.meta(), cnt, shift, doAssoc( shift, root, i, val), tail );
+    }
+    if( i == cnt ) {
+      return this.cons( val );
+    }
+    throw "IndexOutOfBoundsException";
+  };
+
+  function doAssoc( level, arr, i, val ) {
+    var ret = arr.slice( 0 );
+    if( level == 0 ) {
+      ret[ i & 0x01f ] = val;
+    }
+    else {
+      var subidx = (i >>> level) & 0x01f;
+      ret[ subidx ] = doAssoc( level - 5, arr[ subidx ], i, val );
+    }
+    return ret;
+  };
+
+  this.count = function() {
+    return cnt;
+  };
+
+  this.withMeta = function( meta_arg ) {
+    return new PersistentVector( meta_arg, cnt, shift, root, tail );
+  };
+
+  this.cons = function( val ) {
+    if( tail.length < 32 ) {
+      var newTail = tail.concat( [val] );
+      return new PersistentVector( this.meta(), cnt + 1, shift, root, newTail );
+    }
+    var expansion = [null];
+    var newroot = pushTail( shift - 5, root, tail, expansion );
+    var newshift = shift;
+    if( expansion[0] != null ) {
+      newroot = [newroot, expansion[0]];
+      newshift += 5;
+    }
+    return new PersistentVector( this.meta(), cnt+1, newshift, newroot, [val] );
+  };
+
+  this.empty = function() {
+    return PersistentVector.EMPTY.withMeta( this.meta() );
+  };
+
+  function pushTail( level, arr, tailNode, expansion ) {
+    var newchild;
+    if( level == 0 ) {
+      newchild = tailNode;
+    }
+    else {
+      newchild = pushTail( level - 5, arr[arr.length - 1], tailNode, expansion);
+      if( expansion[0] == null ) {
+        return arr.slice( 0, arr.length - 1 );
+      }
+      else {
+        newchild = expansion[0];
+      }
+    }
+    //expansion
+    if( arr.length == 32 ) {
+      expansion[0] = [newchild];
+      return arr;
+    }
+    expansion[0] = null;
+    return arr.concat([newchild]);
+  };
+
+  this.pop = function() {
+    if( cnt == 0 ) {
+      throw "IllegalStateException: Can't pop empty vector";
+    }
+    if( cnt == 1 ) {
+      return PersistentVector.EMPTY.withMeta( this.meta() );
+    }
+    if( tail.length > 1 ) {
+      var newTail = tail.slice( 0, tail.length - 1 );
+      return new PersistentVector( this.meta(), cnt - 1, shift, root, newTail );
+    }
+    var ptail = [null];
+    var newroot = popTail( shift - 5, root, ptail );
+    var newshift = shift;
+    if( newroot == null ) {
+      newroot = RT.EMPTY_ARRAY;
+    }
+    if( shift > 5 && newroot.length == 1 ) {
+      newroot = newroot[0];
+      newshift -= 5;
+    }
+    return new PersistentVector(
+        this.meta(), cnt - 1, newshift, newroot, ptail[0] );
+  };
+
+  function popTail( shift, arr, ptail ) {
+    if( shift > 0 ) {
+      var newchild = popTail( shift - 5, arr[ arr.length - 1 ], ptail );
+      if( newchild != null ) {
+        var ret = arr.slice( 0 );
+        ret[ arr.length - 1 ] = newchild;
+        return ret;
+      }
+    }
+    if( shift == 0 ) {
+      ptail[0] = arr[ arr.length - 1 ];
+    }
+    //contraction
+    if( arr.length == 1 ) {
+      return null;
+    }
+    return arr.slice( 0, arr.length - 1 );
+  };
+}
+
+PersistentVector.EMPTY = new PersistentVector(
+    {}, 0, 5, RT.EMPTY_ARRAY, RT.EMPTY_ARRAY );
+
+PersistentVector.create = function( items ) {
+  var ret = PersistentVector.EMPTY;
+  for( var i = 0; i < items.length; ++i ) {
+    ret = ret.cons( items[ i ] );
+  }
+  return ret;
+}