Merge lp:~trojan295/pantheon-calculator/bugfix-1415054 into lp:~elementary-apps/pantheon-calculator/trunk

[Damian Czaja]

Added the Euler constant.

Added the Euler constant.

The 'e' symbol was used in scientific notation. I changed it to uppercase 'E' and the lowercase 'e' is now the Euler constant.

[xapantu (xapantu)]

Thanks for your patch, it works fine :)

review: Approve

=== modified file 'src/Core/Evaluation.vala'
--- src/Core/Evaluation.vala	2015-02-09 19:41:46 +0000
+++ src/Core/Evaluation.vala	2015-04-03 12:10:43 +0000
@@ -54,7 +54,7 @@
                                             Operator () { symbol = "÷", inputs = 2, prec = 2, fixity = "LEFT", eval = (a, b) => { return a / b; } },
                                             Operator () { symbol = "mod", inputs = 2, prec = 2, fixity = "LEFT", eval = (a, b) => { return a % b; } },
                                             Operator () { symbol = "^", inputs = 2, prec = 3, fixity = "RIGHT", eval = (a, b) => { return Math.pow (a, b); } },
-                                            Operator () { symbol = "e", inputs = 2, prec = 4, fixity = "RIGHT", eval = (a, b) => { return a*Math.pow (10, b); } },
+                                            Operator () { symbol = "E", inputs = 2, prec = 4, fixity = "RIGHT", eval = (a, b) => { return a*Math.pow (10, b); } },
                                             Operator () { symbol = "%", inputs = 1, prec = 5, fixity = "LEFT", eval = (a, b) => { return b / 100.0;} } };
 
         private struct Function { string symbol; int inputs; Eval eval;}
@@ -71,7 +71,8 @@
 
         private struct Constant { string symbol; Eval eval; }
         private Constant[] constants = {   Constant () { symbol = "pi", eval = () => { return Math.PI; } },
-                                            Constant () { symbol = "π", eval = () => { return Math.PI; } }  };
+                                            Constant () { symbol = "π", eval = () => { return Math.PI; } },
+                                            Constant () { symbol = "e", eval = () => { return Math.E; } }  };
 
         public static string evaluate (string str, int d_places) throws OUT_ERROR {
             try {