Expressions: Fixed issue #3128; mod(x;y) should support arbitrary units for both arguments.

This commit is contained in:
Eivind Kvedalen
2017-07-13 12:14:40 +02:00
parent 67060d6229
commit 72dd6dfd9a
2 changed files with 11 additions and 4 deletions

View File

@@ -1007,9 +1007,7 @@ Expression * FunctionExpression::eval() const
case MOD:
if (v2 == 0)
throw ExpressionError("Invalid second argument.");
if (!v2->getUnit().isEmpty())
throw ExpressionError("Second argument must have empty unit.");
unit = v1->getUnit();
unit = v1->getUnit() / v2->getUnit();
break;
case POW: {
if (v2 == 0)