From 108c794a04d47c780169a416cb8af18f0fd9582d Mon Sep 17 00:00:00 2001
From: Lafrite <lafrite@poneyworld.net>
Date: Sun, 21 Dec 2014 19:03:44 +0100
Subject: [PATCH] solve bug with expression like [2, op.sub1]

---
 pymath/expression.py | 15 +++++++++++++++
 pymath/polynom.py    |  6 +++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/pymath/expression.py b/pymath/expression.py
index 622a1c3..fe70637 100644
--- a/pymath/expression.py
+++ b/pymath/expression.py
@@ -58,6 +58,7 @@ class Expression(object):
 
         if len(expression.postfix_tokens) == 1:
             return expression.postfix_tokens[0]
+
         else:
             expression._isExpression = 1
             return expression
@@ -166,6 +167,20 @@ class Expression(object):
                 tmpTokenList.append(tokenList[0])
 
                 del tokenList[0]
+
+        if len(tokenList) == 2 and isNumber(tokenList[0]) \
+                    and isOperator(tokenList[1]) and tokenList[1].arity == 1:
+            # S'il reste deux éléments dont un operation d'arité 1
+            op1 = tokenList[0]
+            operator = tokenList[1]
+
+            res = operator(op1)
+
+            tmpTokenList.append(res)
+
+            # Comme on vient de faire le calcul, on peut détruire aussi les deux prochains termes
+            del tokenList[0:2]
+
         tmpTokenList += tokenList
 
         steps = expand_list(tmpTokenList)
diff --git a/pymath/polynom.py b/pymath/polynom.py
index f8b07db..fc570a5 100644
--- a/pymath/polynom.py
+++ b/pymath/polynom.py
@@ -399,7 +399,11 @@ def test(p,q):
         #print("\t", str(i.postfix))
         print(i)
 
-    print("\n Evaluer ------")
+    print("\n Evaluer p ------")
+    for i in p(3).simplify():
+        print(i)
+
+    print("\n Evaluer q ------")
     for i in q(3).simplify():
         print(i)