kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

take 2, 100% fewer variable name conflicts

Browse Source
This commit is contained in:
russ 2017-10-29 20:32:41 -07:00
parent 01666cefb9
commit 18c6892df3
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/parser.rs
View File

@ -282,6 +282,19 @@ impl<'a> Iterator for TokenIterator<'a> {
result.push(nxt); result.push(nxt);
self.char_stream.next(); self.char_stream.next();
} }
'.' => {
result.push(nxt);
self.char_stream.next();
while let Some(&nxt_float) = self.char_stream.peek() {
match nxt_float {
'0'...'9' => {
result.push(nxt_float);
self.char_stream.next();
}
_ => break,
}
}
}
_ => break, _ => break,
} }
} }
@ -290,6 +303,8 @@ impl<'a> Iterator for TokenIterator<'a> {
if let Ok(val) = out.parse::<i64>() { if let Ok(val) = out.parse::<i64>() {
return Some(Token::IntConst(val)); return Some(Token::IntConst(val));
} else if let Ok(val) = out.parse::<f64>() {
return Some(Token::FloatConst(val));
} }
return Some(Token::LexErr(LexError::MalformedNumber)); return Some(Token::LexErr(LexError::MalformedNumber));
} }
@ -318,18 +333,7 @@ impl<'a> Iterator for TokenIterator<'a> {
"break" => return Some(Token::Break), "break" => return Some(Token::Break),
"return" => return Some(Token::Return), "return" => return Some(Token::Return),
"fn" => return Some(Token::Fn), "fn" => return Some(Token::Fn),
x => { x => return Some(Token::Identifier(x.to_string())),
match out.starts_with("f") {
false => return Some(Token::Identifier(x.to_string())),
true => {
if let Ok(f) = (&out[1..]).to_owned().replace("_", ".").parse::<f64>() {
return Some(Token::FloatConst(f));
} else {
return Some(Token::Identifier(x.to_string()));
}
}
}
}
} }
} }
'"' => { '"' => {

8
src/tests.rs
View File

@ -406,19 +406,19 @@ fn test_array_with_structs() {
fn test_float() { fn test_float() {
let mut engine = Engine::new(); let mut engine = Engine::new();
if let Ok(result) = engine.eval::<bool>("let x = f0_0; let y = f1_0; x < y") { if let Ok(result) = engine.eval::<bool>("let x = 0.0; let y = 1.0; x < y") {
assert!(result); assert!(result);
} else { } else {
assert!(false); assert!(false);
} }
if let Ok(result) = engine.eval::<bool>("let x = f0_0; let y = f1_0; x > y") { if let Ok(result) = engine.eval::<bool>("let x = 0.0; let y = 1.0; x > y") {
assert!(!result); assert!(!result);
} else { } else {
assert!(false); assert!(false);
} }
if let Ok(result) = engine.eval::<f64>("let x = f9_9999; x") { if let Ok(result) = engine.eval::<f64>("let x = 9.9999; x") {
assert_eq!(result, 9.9999); assert_eq!(result, 9.9999);
} else { } else {
assert!(false); assert!(false);
@ -464,7 +464,7 @@ fn struct_with_float() {
assert!(false); assert!(false);
} }
if let Ok(result) = engine.eval::<f64>("let ts = new_ts(); ts.x = f10_1001; ts.x") { if let Ok(result) = engine.eval::<f64>("let ts = new_ts(); ts.x = 10.1001; ts.x") {
assert_eq!(result, 10.1001); assert_eq!(result, 10.1001);
} else { } else {
assert!(false); assert!(false);