From c35fce7727de2e2db40a9ca0abcc164381659fbf Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Fri, 24 Aug 2018 21:07:04 -0700
Subject: [PATCH] [parser, types] Call subparser_completed

---
 parser/src/lib.rs | 17 +++++++++--------
 types/src/pair.rs | 14 +++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/parser/src/lib.rs b/parser/src/lib.rs
index 256ad17..982f908 100644
--- a/parser/src/lib.rs
+++ b/parser/src/lib.rs
@@ -42,7 +42,7 @@ impl<T> Parser<T> where T: Iterator<Item=LexerResult> {
     fn prepare(&mut self) {
         assert_eq!(self.parsers.len(), 0);
         let program_parser = Box::new(ProgramParser::new());
-        self.parsers.push(program_parser);
+        self.push_parser(program_parser);
     }
 
     fn parse_lex(&mut self, lex: &Lex) -> NodeParseResult {
@@ -57,17 +57,12 @@ impl<T> Parser<T> where T: Iterator<Item=LexerResult> {
 
     fn pop_parser(&mut self) {
         let popped = self.parsers.pop();
-        println!("popped parser stack, {} parser{} remain --> {:?}",
-                 self.parsers.len(),
-                 if self.parsers.len() == 1 { " " } else { "s" },
-                 popped);
+        println!("popped parser stack --> {:?}", self.parsers);
     }
 
     fn push_parser(&mut self, next: Box<NodeParser>) {
         self.parsers.push(next);
-        println!("pushed onto parser stack, {} now -> {:?}",
-                 self.parsers.len(),
-                 self.parsers.last());
+        println!("pushed onto parser stack -> {:?}", self.parsers);
     }
 
     fn next_lex(&mut self) -> Option<T::Item> {
@@ -100,13 +95,19 @@ impl<T> Iterator for Parser<T> where T: Iterator<Item=LexerResult> {
                 }
                 Some(NodeParseResult::Continue) => self.next_lex(),
                 Some(NodeParseResult::Complete{ obj }) => {
+                    println!("{:?} completed with {:?}", self.parsers.last().unwrap(), obj);
                     self.pop_parser();
                     if self.parsers.len() == 0 && input_lex.is_none() {
                         // We are done.
                         println!("we are done");
                         out = Some(Ok(obj));
                         break;
+                    } else {
+                        let prev_parser = self.parsers.last_mut().unwrap();
+                        prev_parser.subparser_completed(obj);
+                        // TODO: Handle the result from above.
                     }
+                    println!("parsers {:?}", self.parsers);
                     self.next_lex()
                 },
                 Some(NodeParseResult::Push{ next }) => {
diff --git a/types/src/pair.rs b/types/src/pair.rs
index 9ffb567..56b439d 100644
--- a/types/src/pair.rs
+++ b/types/src/pair.rs
@@ -7,9 +7,10 @@ use std::fmt;
 use super::*;
 use object::Object;
 
+#[derive(Debug)]
 pub struct Pair {
-    car: Obj,
-    cdr: Obj
+    pub car: Obj,
+    pub cdr: Obj
 }
 
 impl Pair {
@@ -17,6 +18,10 @@ impl Pair {
         Pair { car: Obj::Null, cdr: Obj::Null }
     }
 
+    pub fn with_car(car: Obj) -> Pair {
+        Pair { car: car, cdr: Obj::Null }
+    }
+
     fn fmt_pair(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let r = write!(f, "{}", self.car);
         r.and_then(|r| match self.cdr {
@@ -44,8 +49,3 @@ impl fmt::Display for Pair {
     }
 }
 
-impl fmt::Debug for Pair {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}", self)
-    }
-}