Parse ** operator. Bump version.

Author: parrt

testing/test_parser.py

@@ -131,6 +131,16 @@ def test_arith():
                       rhs=BinaryOp(op=<STAR:*,11:12>,lhs=z,rhs=h_))""")
 
 
+def test_pow():
+    check("a**2",
+          """BinaryOp(op=<DOUBLESTAR:**,1:3>,lhs=a,rhs=2)""")
+
+
+def test_chained_pow():
+    check("a**b**c",
+          """BinaryOp(op=<DOUBLESTAR:**,1:3>,lhs=a,rhs=BinaryOp(op=<DOUBLESTAR:**,4:6>,lhs=b,rhs=c))""")
+
+
 def test_chained_op():
     check("a + b + c",
           """BinaryOp(op=<PLUS:+,6:7>,

testing/test_tree_eval.py

@@ -76,6 +76,17 @@ def test_add_mul():
     c = 5
     check("a+b*c", 23)
 
+def test_pow():
+    a = 3
+    b = 4
+    check("a**b", 3**4)
+
+def test_pow2():
+    a = 3
+    b = 4
+    c = 5
+    check("a**(b+1)**c", 3**5**5)
+
 def test_parens():
     a = 3
     b = 4

tsensor/parsing.py

@@ -30,7 +30,7 @@
     NOTEQUAL, PERCENTEQUAL, AMPEREQUAL, DOUBLESTAREQUAL, STAREQUAL, PLUSEQUAL,\
     MINEQUAL, DOUBLESLASHEQUAL, SLASHEQUAL, LEFTSHIFTEQUAL,\
     LESSEQUAL, EQUAL, EQEQUAL, GREATEREQUAL, RIGHTSHIFTEQUAL, ATEQUAL,\
-    CIRCUMFLEXEQUAL, VBAREQUAL
+    CIRCUMFLEXEQUAL, VBAREQUAL, DOUBLESTAR
 
 import tsensor.ast
 
@@ -157,15 +157,25 @@ def addexpr(self):
 
     def multexpr(self):
         start = self.LT(1)
-        root = self.unaryexpr()
+        root = self.powexpr()
         while self.LA(1) in MULOP:
             op = self.LT(1)
             self.t += 1
-            b = self.unaryexpr()
+            b = self.powexpr()
             stop = self.LT(-1)
             root = tsensor.ast.BinaryOp(op, root, b, start, stop)
         return root
 
+    def powexpr(self):
+        start = self.LT(1)
+        root = self.unaryexpr()
+        if self.LA(1)==DOUBLESTAR:
+            op = self.match(DOUBLESTAR)
+            r = self.powexpr()
+            stop = self.LT(-1)
+            root = tsensor.ast.BinaryOp(op, root, r, start, stop)
+        return root
+
     def unaryexpr(self):
         start = self.LT(1)
         if self.LA(1) in UNARYOP:

tsensor/version.py

@@ -21,4 +21,4 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 """
-__version__ = '0.1b5'
+__version__ = '0.1b6'