View difference between Paste ID: 9gawWsft and 5kDuWhxn

 #include <iostream>
 #include <cmath>
 
 #include "expression.h"
 
 Expression::Expression()
 {
-    saPile = new std::stack<int>();
+    saPile = new std::stack<double>();
 }
 
 
 Expression::~Expression()
 {
     delete saPile;
 }
 
 
-int Expression::chiffresEnNombre(std::vector<int>* unTab)
+double Expression::chiffresEnNombre(std::vector<int>* unTab)
 {
-    int i=0, n=0;
+    unsigned int i, j=unTab->size();
     double n=0.;
-    for (std::vector<int>::iterator it = unTab->begin(); it != unTab->end(); it++, i++)
+
     for (i=0; i < unTab->size(); i++)
-        n += (*it) * pow(10, unTab->size() - i - 1);
+
         if ((*unTab)[i] < 0)
         {
             if (j < unTab->size()) throw 4;
 
             j = i;
         }
-int Expression::evaluer(std::vector<char>* unTab)
+
 
     for (i=0; i < unTab->size(); i++)
     {
         if (i == j) continue;
 
         n += (*unTab)[i] * pow(10., (int)j - (int)i - (i < j));
     }
 
     return n;
 }
-        if ((*it) >= '0' && (*it) <= '9')
+
 
-            leTabChiffres->push_back(conversionCharEnInt(*it));
+double Expression::evaluer(std::vector<char>* unTab)
 {
     while (!saPile->empty())
     {
         saPile->pop();
     }
 
     std::vector<int>* leTabChiffres = new std::vector<int>();
 
     for (std::vector<char>::iterator it = unTab->begin(); it != unTab->end(); it++)
     {
-            if ((*it) == ' ')
+        if (((*it) >= '0' && (*it) <= '9') || (*it) == '.')
         {
             leTabChiffres->push_back(conversionCharEnInt((*it) == '.' ? -1 : (*it)));
         }
-            else
+
         {
             if (!leTabChiffres->empty())
             {
                 saPile->push(chiffresEnNombre(leTabChiffres));
                 //std::cout << "Empile: " << saPile->top() << std::endl;
                 leTabChiffres->resize(0);
             }
 
             switch (*it)
             {
             case ' ':
                 continue;
             default:
                 saPile->push(traiterOperation(*it));
                 //std::cout << "Empile: " << saPile->top() << std::endl;
                 break;
             }
         }
     }
 
     if (!leTabChiffres->empty())
     {
         saPile->push(chiffresEnNombre(leTabChiffres));
     }
-int Expression::traiterOperation(char uneOp)
+
 
-    int a, b;
+
     return saPile->top();
 }
 
 
 int Expression::conversionCharEnInt(char unChar)
 {
     return unChar - '0';
 }
 
 
 double Expression::traiterOperation(char uneOp)
 {
     double a, b;
 
     if (saPile->empty()) throw(2);
-        break;
+
     saPile->pop();
     //std::cout << "Dépile: " << b << std::endl;
-        break;
+
     if (saPile->empty()) throw(2);
     a = saPile->top();
-        break;
+
     //std::cout << "Dépile: " << a << std::endl;
-        if (b == 0) throw 0;
+
     switch (uneOp)
-        break;
+
-    case '%':
+
-        if (b == 0) throw 0;
+
-        return a%b;
+
-        break;
+
     case '*':
         return a*b;
-        break;
+
         if (b == 0.) throw 0;
         return a/b;
-        break;
+
         return a<b;
     case '>':
-        break;
+
     case '=':
         return a==b;
-        break;
+
         return a!=b;
     case '&':
-        break;
+
     case '|':
         return a||b;
-        break;
+
 
     throw 1;
     return 0.;
-    return 0;
+
 
 // EOF