electria/tylc
Watch
1
0
Fork
You've already forked tylc
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: implicit operator for adjacent parenthesis

Browse source
This commit is contained in:
electria 2026-07-20 20:25:10 -07:00
commit 48a1da47fb
Signed by: electria
SSH key fingerprint: SHA256:8LlB3ucPbBHqozqkhsNbaV5oG3SlzzqUj8FZDL6IPQs
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/nodes/from_str.rs
View file

@ -111,10 +111,6 @@ impl FromStr for Nodes {
}
ParsingState::ReadingNumber(start_index) => {
if !is_number_char(c) {
if matches!(nodes.last(), Some(Node::ParenthesisEnd)) {
nodes.push(Node::Operator(Default::default()));
}
nodes.push(Node::Number(
Float::parse(&filtered_string[start_index..i])
.map_err(|e| {
@ -138,6 +134,9 @@ impl FromStr for Nodes {
} else if c.is_alphabetic() {
state = ParsingState::ReadingFunctionName(i);
} else if c == '(' {
if matches!(nodes.last(), Some(Node::Number(_) | Node::ParenthesisEnd)) {
nodes.push(Node::Operator(Default::default()));
}
nodes.push(Node::ParenthesisStart);
} else if c == ')' {
nodes.push(Node::ParenthesisEnd);

5
src/nodes/tests.rs
View file

@ -11,6 +11,11 @@ fn implicit_mult() {
Nodes::from_str("10 sin(10)").unwrap().evaluate().to_f64(),
-5.440211108893698
);
assert_eq!(
Nodes::from_str("(10)(10)").unwrap().evaluate().to_f64(),
100.,
)
}
#[test]