Spreadsheet: Fixed handling of unary minus/plus, exponentation order,…

… and unit rule (#2099)
FreeCAD · Jun 13, 2015 · 9d5d05a · 9d5d05a
1 parent 12e4d59
commit 9d5d05a
Show file tree

Hide file tree

Showing 5 changed files with 270 additions and 270 deletions.
diff --git a/src/Mod/Spreadsheet/App/Expression.cpp b/src/Mod/Spreadsheet/App/Expression.cpp
@@ -507,10 +507,9 @@ Expression * OperatorExpression::eval() const
     case DIV:
         output = new NumberExpression(owner, v1->getQuantity() / v2->getQuantity());
         break;
-    case POW: {
+    case POW:
         output = new NumberExpression(owner, v1->getQuantity().pow(v2->getQuantity()) );
         break;
-    }
     case EQ:
         if (v1->getUnit() != v2->getUnit())
             throw Exception("Incompatible units for + operator");
@@ -541,6 +540,12 @@ Expression * OperatorExpression::eval() const
             throw Exception("Incompatible units for + operator");
         output = new NumberExpression(owner, Quantity(v2->getValue() - v1->getValue()) < 1e-7);
         break;
+    case NEG:
+        output = new NumberExpression(owner, -v1->getQuantity() );
+        break;
+    case POS:
+        output = new NumberExpression(owner, v1->getQuantity() );
+        break;
     default:
         assert(0);
     }
@@ -581,6 +586,15 @@ std::string OperatorExpression::toString() const
 {
     std::stringstream s;
 
+    switch (op) {
+    case NEG:
+        s << "-";
+        break;
+    case POS:
+        s << "+";
+        break;
+    }
+
     if (left->priority() < priority())
         s << "(" << left->toString() << ")";
     else
@@ -622,6 +636,9 @@ std::string OperatorExpression::toString() const
         break;
     case UNIT:
         break;
+    case POS:
+    case NEG:
+        return s.str();
     default:
         assert(0);
     }
@@ -664,6 +681,9 @@ int OperatorExpression::priority() const
         return 10;
     case POW:
         return 10;
+    case NEG:
+    case POS:
+        return 15;
     default:
         return 0;
     }

diff --git a/src/Mod/Spreadsheet/App/Expression.h b/src/Mod/Spreadsheet/App/Expression.h
@@ -236,7 +236,7 @@ class  SpreadsheetExport UnitExpression : public Expression {
 
     virtual Expression * copy() const;
 
-    virtual int priority() const { return 10; }
+    virtual int priority() const { return 20; }
 
     void setUnit(const Base::Quantity &_quantity);
 
@@ -270,7 +270,7 @@ class SpreadsheetExport NumberExpression : public UnitExpression {
 
     virtual Expression * copy() const;
 
-    virtual int priority() const { return 10; }
+    virtual int priority() const { return 20; }
 
     void negate();
 
@@ -288,7 +288,7 @@ class SpreadsheetExport ConstantExpression : public NumberExpression {
 
     virtual Expression * copy() const;
 
-    virtual int priority() const { return 10; }
+    virtual int priority() const { return 20; }
 
     std::string getName() const { return name; }
 
@@ -318,7 +318,9 @@ class SpreadsheetExport OperatorExpression : public UnitExpression {
         GT,
         LTE,
         GTE,
-        UNIT
+        UNIT,
+        NEG,
+        POS
     };
     OperatorExpression(const App::DocumentObject *_owner = 0, Expression * _left = 0, Operator _op = NONE, Expression * _right = 0);
 
@@ -361,7 +363,7 @@ class SpreadsheetExport RangeExpression : public Expression {
 
     virtual Expression * copy() const;
 
-    virtual int priority() const { return 0; }
+    virtual int priority() const { return 20; }
 
     virtual void getDeps(std::set<Path> &props) const;
 
@@ -458,7 +460,7 @@ class SpreadsheetExport FunctionExpression : public UnitExpression {
 
     virtual Expression * copy() const;
 
-    virtual int priority() const { return 10; }
+    virtual int priority() const { return 20; }
 
     virtual void getDeps(std::set<Path> &props) const;
 
@@ -494,7 +496,7 @@ class SpreadsheetExport VariableExpression : public UnitExpression {
 
     virtual Expression * copy() const;
 
-    virtual int priority() const { return 10; }
+    virtual int priority() const { return 20; }
 
     virtual void getDeps(std::set<Path> &props) const;
 
@@ -535,6 +537,8 @@ class SpreadsheetExport StringExpression : public Expression {
 
     virtual std::string getText() const { return text; }
 
+    virtual int priority() const { return 20; }
+
     virtual Expression * copy() const;
 
 protected: