continued progress on aztec, no pass

src/aztec/encoder/token.rs

@@ -18,39 +18,83 @@ use std::rc::Rc;
 
 use crate::common::BitArray;
 
-use super::{SimpleToken, BinaryShiftToken};
+use super::{BinaryShiftToken, SimpleToken};
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub enum TokenType {
-  Simple(SimpleToken), BinaryShift(BinaryShiftToken), Empty
+    Simple(SimpleToken),
+    BinaryShift(BinaryShiftToken),
+    Empty,
 }
 
+impl TokenType {
+    pub fn appendTo(&self, bit_array: &mut BitArray, text: &[u8]) {
+        // let token = &self.tokens[self.current_pointer];
+        match self {
+            TokenType::Simple(a) => a.appendTo(bit_array, text),
+            TokenType::BinaryShift(a) => a.appendTo(bit_array, text),
+            TokenType::Empty => panic!("cannot appendTo on Empty final item"),
+        }
+    }
+}
+
+#[derive(Debug,Clone,PartialEq, Eq)]
 pub struct Token {
-  tokens: Vec<TokenType>,
-  current_pointer: usize,
+    tokens: Vec<TokenType>,
+    //current_pointer: usize,
 }
 
 impl Token {
-  pub fn new () -> Self {
-    Self {
-        tokens: vec![TokenType::Empty],
-        current_pointer: 0,
+    pub fn new() -> Self {
+        Self {
+            tokens: Vec::new(),
+            //current_pointer: 0,
+        }
+    }
+    // pub fn getPrevious(&mut self) -> &TokenType {
+    //     self.current_pointer -= 1;
+    //     &self.tokens[self.current_pointer]
+    // }
+    pub fn add(&mut self, value: i32, bit_count: u32)  {
+        //self.current_pointer += 1;
+        self.tokens
+            .push(TokenType::Simple(SimpleToken::new(value, bit_count)));
+        // &self.tokens[self.current_pointer]
+    }
+    pub fn addBinaryShift(&mut self, start: u32, byte_count: u32)  {
+        //self.current_pointer += 1;
+        self.tokens
+            .push(TokenType::BinaryShift(BinaryShiftToken::new(
+                start, byte_count,
+            )));
+        // &self.tokens[self.current_pointer]
+    }
+}
+
+pub struct TokenIter {
+    src: Vec<TokenType>,
+    // pos: usize,
+}
+
+impl Iterator for TokenIter {
+    type Item = TokenType;
+
+    fn next(&mut self) -> Option<Self::Item> {
+      self.src.pop()
+    }
+}
+
+impl IntoIterator for Token {
+    type Item = TokenType;
+
+    type IntoIter = TokenIter;
+
+    fn into_iter(self) -> Self::IntoIter {
+        TokenIter {
+            src: self.tokens,
+            // pos: self.current_pointer,
+        }
     }
-  }
-  pub fn getPrevious(&mut self) -> &TokenType{
-    self.current_pointer -= 1;
-    &self.tokens[self.current_pointer]
-  }
-  pub fn add(&mut self, value:i32, bit_count: u32,) -> &TokenType {
-    self.current_pointer+=1;
-    self.tokens.push(TokenType::Simple(SimpleToken::new(value,bit_count)));
-    &self.tokens[self.current_pointer]
-  }
-  pub fn addBinaryShift(&mut self, start: u32, byte_count: u32) -> &TokenType {
-    self.current_pointer+=1;
-    self.tokens.push(TokenType::BinaryShift(BinaryShiftToken::new(start,byte_count)));
-    &self.tokens[self.current_pointer]
-  }
 }
 
 // pub enum Token{