From 57b8674edcc7e13afa456e14e3bd83c550835f3b Mon Sep 17 00:00:00 2001
From: Tiffany Bennett <tiffany@stormbit.net>
Date: Tue, 2 Aug 2016 23:36:39 -0400
Subject: [PATCH] Fix parsing of functions, *, and .123

---
 src/unit_defs.rs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/unit_defs.rs b/src/unit_defs.rs
index 835a471..1cb631b 100644
--- a/src/unit_defs.rs
+++ b/src/unit_defs.rs
@@ -25,6 +25,7 @@ pub enum Token {
     RPar,
     Plus,
     Minus,
+    Asterisk,
     ImaginaryUnit,
     Error(String),
 }
@@ -56,6 +57,7 @@ impl<'a> Iterator for TokenIterator<'a> {
             ')' => Token::RPar,
             '+' => Token::Plus,
             '-' => Token::Minus,
+            '*' => Token::Asterisk,
             '/' => match self.0.peek() {
                 Some(&'/') => loop {
                     match self.0.next() {
@@ -75,7 +77,7 @@ impl<'a> Iterator for TokenIterator<'a> {
                 },
                 _ => Token::Slash
             },
-            x @ '0'...'9' => {
+            x @ '0'...'9' | x @ '.' => {
                 let mut buf = String::new();
                 buf.push(x);
                 while let Some(c) = self.0.peek().cloned() {
@@ -229,6 +231,9 @@ fn parse_mul(mut iter: &mut Iter) -> Expr {
     loop { match *iter.peek().unwrap() {
         Token::Slash | Token::TriplePipe | Token::RPar | Token::Newline | Token::Comment |
         Token::Eof => break,
+        Token::Asterisk => {
+            iter.next();
+        },
         _ => terms.push(parse_pow(iter))
     }}
     if terms.len() == 1 {
@@ -337,9 +342,16 @@ pub fn parse(mut iter: &mut Iter) -> Defs {
                     Token::ColonEq => Def::Unit(parse_expr(iter)),
                     Token::LBrack => {
                         // NYI
+                        let mut n = 0;
+                        let mut first = true;
                         loop {
                             match iter.next().unwrap() {
-                                Token::RBrace => break,
+                                Token::LBrace => n += 1,
+                                Token::RBrace if n == 1 => break,
+                                Token::RBrace => n -= 1,
+                                Token::Newline | Token::Comment if !first && n == 0 => break,
+                                Token::Newline if first => first = false,
+                                Token::Eof => break,
                                 _ => ()
                             }
                         }