Cleaner conversion functions

leebyron · leebyron · commit 07a72193b51c · 2014-07-28T22:56:13.000-07:00
diff --git a/dist/Sequence.js b/dist/Sequence.js
@@ -54,22 +54,22 @@ var Immutable = require('./Immutable');
 
   Sequence.prototype.toVector=function() {"use strict";
     // Use Late Binding here to solve the circular dependency.
-    return require('./Vector').empty().merge(this.values());
+    return require('./Vector').from(this);
   };
 
   Sequence.prototype.toMap=function() {"use strict";
     // Use Late Binding here to solve the circular dependency.
-    return require('./Map').empty().merge(this);
+    return require('./Map').from(this);
   };
 
   Sequence.prototype.toOrderedMap=function() {"use strict";
     // Use Late Binding here to solve the circular dependency.
-    return require('./OrderedMap').empty().merge(this);
+    return require('./OrderedMap').from(this);
   };
 
   Sequence.prototype.toSet=function() {"use strict";
     // Use Late Binding here to solve the circular dependency.
-    return require('./Set').empty().union(this);
+    return require('./Set').from(this);
   };
 
   Sequence.prototype.equals=function(other) {"use strict";
@@ -464,11 +464,6 @@ for(var Sequence____Key in Sequence){if(Sequence.hasOwnProperty(Sequence____Key)
     return array;
   };
 
-  IndexedSequence.prototype.toVector=function() {"use strict";
-    // Use Late Binding here to solve the circular dependency.
-    return require('./Vector').empty().merge(this);
-  };
-
   IndexedSequence.prototype.fromEntries=function() {"use strict";
     var sequence = this;
     var fromEntriesSequence = sequence.__makeSequence();
diff --git a/src/Sequence.js b/src/Sequence.js
@@ -54,22 +54,22 @@ class Sequence {
 
   toVector() {
     // Use Late Binding here to solve the circular dependency.
-    return require('./Vector').empty().merge(this.values());
+    return require('./Vector').from(this);
   }
 
   toMap() {
     // Use Late Binding here to solve the circular dependency.
-    return require('./Map').empty().merge(this);
+    return require('./Map').from(this);
   }
 
   toOrderedMap() {
     // Use Late Binding here to solve the circular dependency.
-    return require('./OrderedMap').empty().merge(this);
+    return require('./OrderedMap').from(this);
   }
 
   toSet() {
     // Use Late Binding here to solve the circular dependency.
-    return require('./Set').empty().union(this);
+    return require('./Set').from(this);
   }
 
   equals(other) {
@@ -464,11 +464,6 @@ class IndexedSequence extends Sequence {
     return array;
   }
 
-  toVector() {
-    // Use Late Binding here to solve the circular dependency.
-    return require('./Vector').empty().merge(this);
-  }
-
   fromEntries() {
     var sequence = this;
     var fromEntriesSequence = sequence.__makeSequence();
