Mirrors/rink-rs
2
0
Fork 0
mirror of https://github.com/tiffany352/rink-rs synced 2024-09-20 22:21:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix parsing of functions, *, and .123

Browse source
This commit is contained in:
Tiffany Bennett 2016-08-02 23:36:39 -04:00
parent 5af35c2ef8
commit 57b8674edc
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/unit_defs.rs
View file

@ -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,
_ => ()
}
}