extern/kalker
1
0
Fork 0
mirror of https://github.com/PaddiM8/kalker.git synced 2024-12-13 18:10:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow unary after power, eg. x^-1

Browse Source
This commit is contained in:
bakk 2022-01-20 20:42:29 +01:00
parent f953534a59
commit 6212cd6b2d
1 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
kalk/src/parser.rs
View File

@ -481,7 +481,7 @@ fn parse_factor(context: &mut Context) -> Result<Expr, CalcError> {
}
fn parse_unit(context: &mut Context) -> Result<Expr, CalcError> {
let expr = parse_unary(context)?;
let expr = parse_exponent(context)?;
if match_token(context, TokenKind::Identifier) {
let peek = &peek(context).value.clone();
@ -496,23 +496,8 @@ fn parse_unit(context: &mut Context) -> Result<Expr, CalcError> {
Ok(expr)
}
fn parse_unary(context: &mut Context) -> Result<Expr, CalcError> {
if match_token(context, TokenKind::Minus) {
let op = advance(context).kind;
let expr = Box::new(parse_unary(context)?);
return Ok(Expr::Unary(op, expr));
}
let expr = parse_exponent(context)?;
if match_token(context, TokenKind::Percent) {
Ok(Expr::Unary(advance(context).kind, Box::new(expr)))
} else {
Ok(expr)
}
}
fn parse_exponent(context: &mut Context) -> Result<Expr, CalcError> {
let left = parse_indexer(context)?;
let left = parse_unary(context)?;
if match_token(context, TokenKind::Power) {
let op = advance(context).kind;
@ -523,6 +508,21 @@ fn parse_exponent(context: &mut Context) -> Result<Expr, CalcError> {
Ok(left)
}
fn parse_unary(context: &mut Context) -> Result<Expr, CalcError> {
if match_token(context, TokenKind::Minus) {
let op = advance(context).kind;
let expr = Box::new(parse_unary(context)?);
return Ok(Expr::Unary(op, expr));
}
let expr = parse_indexer(context)?;
if match_token(context, TokenKind::Percent) {
Ok(Expr::Unary(advance(context).kind, Box::new(expr)))
} else {
Ok(expr)
}
}
fn parse_indexer(context: &mut Context) -> Result<Expr, CalcError> {
let left = parse_factorial(context)?;
@ -872,6 +872,22 @@ mod tests {
);
}
#[wasm_bindgen_test]
fn test_pow_unary() {
let tokens = vec![
token(Literal, "10"),
token(Power, ""),
token(Minus, ""),
token(Literal, "1"),
token(Eof, ""),
];
assert_eq!(
parse(tokens).unwrap(),
Stmt::Expr(binary(literal(10f64), Power, unary(Minus, literal(1f64)))),
);
}
#[test]
#[wasm_bindgen_test]
fn test_percent() {