Std: intersperse and peekable fixes

README.md

@@ -31,7 +31,7 @@ impl Area for Shape {
     }
 }
 
-fn main() {
+pub fn main() {
     let shapes: List<Shape> = [
         Shape::Rect(width: 4., height: 2.),
         Shape::Circle(radius: 12.34),

node-import-transform.ts

@@ -19,7 +19,7 @@ function exec(args: string[]): string[] {
         .filter(s => s.length > 0)
 }
 
-if (exec([`grep`, `-r`, `.js'`, `dist`]).length > 0) {
+if (exec([`grep`, `-r`, `.js'`, `dist`]).length > 10) {
     exit()
 }
 const dirImports = exec([`find`, `dist`, `-name`, `index.js`])

src/std/iter/intersperseIter.no

@@ -1,5 +1,7 @@
+use std::iter::{ PeekableIter, PeekableAdapter }
+
 pub type IntersperseIter<T>(
-    iter: Iter<T>,
+    iter: PeekableIter<T>,
     separator: T,
     needsSeparator: Bool
 )
@@ -10,8 +12,9 @@ impl <T> Iter<T> for IntersperseIter<T> {
             self.needsSeparator = false
             Some(self.separator)
         } else {
-            self.needsSeparator = true
-            self.iter.next()
+            let n = self.iter.next()
+            self.needsSeparator = self.iter.peek().isSome()
+            n
         }
     }
 }
@@ -22,7 +25,7 @@ pub trait IntersperseAdapter<T> {
 
 impl <T> IntersperseAdapter<T> for Iter<T> {
     fn intersperse(self, separator: T): Iter<T> {
-        IntersperseIter(iter: self, separator, needsSeparator: false)
+        IntersperseIter(iter: self.peekable(), separator, needsSeparator: false)
     }
 }
 

src/std/iter/peekable.no

@@ -1,15 +1,16 @@
 pub type PeekableIter<T>(
     iter: Iter<T>,
-    peeked: Option<Option<T>>,
+    peeked: Option<Option<T>>
 )
 
 impl <T> PeekableIter<T> {
-    fn peek(self): Option<T> {
+    pub fn peek(self): Option<T> {
         match self.peeked {
             Some(value) { value }
             None() {
-                self.peeked = Some(self.iter.next())
-                self.peeked
+                let n = self.next()
+                self.peeked = Some(value: n)
+                n
             }
         }
     }