diff options
author | bnewbold <bnewbold@robocracy.org> | 2017-01-14 19:41:51 -0800 |
---|---|---|
committer | bnewbold <bnewbold@robocracy.org> | 2017-01-14 19:52:56 -0800 |
commit | 11569fdec123e9c7aeaf38d8a122842c4c758fdf (patch) | |
tree | 2940f78906772581812211e00f93228a63ac30de /modelica-parser-lalrpop/src/parser.lalrpop | |
parent | f8b7d9d7e936bb53db3f978b54592b7af791d1ec (diff) | |
download | modelthing-11569fdec123e9c7aeaf38d8a122842c4c758fdf.tar.gz modelthing-11569fdec123e9c7aeaf38d8a122842c4c758fdf.zip |
parse out exponentiation
Diffstat (limited to 'modelica-parser-lalrpop/src/parser.lalrpop')
-rw-r--r-- | modelica-parser-lalrpop/src/parser.lalrpop | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modelica-parser-lalrpop/src/parser.lalrpop b/modelica-parser-lalrpop/src/parser.lalrpop index cb59a82..2d2469c 100644 --- a/modelica-parser-lalrpop/src/parser.lalrpop +++ b/modelica-parser-lalrpop/src/parser.lalrpop @@ -161,7 +161,8 @@ factor: Expr = { <lhs:factor> "/" <rhs:term> => Expr::BinExpr(BinOperator::Divide, Box::new(lhs), Box::new(rhs)), <lhs:factor> "^" <rhs:term> => - Expr::BinExpr(BinOperator::Divide, Box::new(lhs), Box::new(rhs)), + Expr::BinExpr(BinOperator::Exponentiate, Box::new(lhs), Box::new(rhs)), + // TODO: this could be a "negate" unary op? "-" <t:term> => Expr::BinExpr(BinOperator::Multiply, Box::new(Expr::Integer(-1)), Box::new(t)), term, |