Merge lp:~lexsurkov/pantheon-calculator/Bug_1465680 into lp:~elementary-apps/pantheon-calculator/trunk

[lexsurkov]

Fixed Bug #1465680 Incorrectly calculating of percentages

Fixed Bug #1465680 Incorrectly calculating of percentages

[xapantu (xapantu)]

Unfortunately we are discussing the bug you linked, I am not sure we reached an agreement yet =(

But I am rather sure we will not want what was described in the bug report.

review: Disapprove

[lexsurkov (lexsurkov)]

I am think, you must test the commit. I not destroyed work the calculator, but made corrections like making step by step calculator. I do not insist that it is the right solution, but maybe there will be new ideas.

Unmerged revisions

160. By lexsurkov on 2015-09-04

Fixed Bug #1465680 Incorrectly calculating of percentages

=== modified file 'src/Core/Evaluation.vala'
--- src/Core/Evaluation.vala	2015-04-03 12:04:47 +0000
+++ src/Core/Evaluation.vala	2015-09-04 06:42:16 +0000
@@ -55,6 +55,7 @@
                                             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 = "prc", inputs = 2, prec = 5, fixity = "LEFT", eval = (a, b) => { return (a * b) / 100; } },
                                             Operator () { symbol = "%", inputs = 1, prec = 5, fixity = "LEFT", eval = (a, b) => { return b / 100.0;} } };
 
         private struct Function { string symbol; int inputs; Eval eval;}
@@ -186,12 +187,19 @@
                     } catch (SHUNTING_ERROR e) { throw new EVAL_ERROR.NO_CONSTANT (""); }
                 } else if (t.token_type == TokenType.OPERATOR) {
                     try {
+                        if (t.content == "%" && t != token_list.last ().data) {
+                            Token next_token = token_list.nth (token_list.index (t) + 1).data;
+                            if (next_token.token_type == TokenType.OPERATOR && (next_token.content == "-" || next_token.content == "+"))
+                                t = new Token ("prc", TokenType.OPERATOR);
+                        } 
                         Operator o = get_operator (t);
                         Token t1 = stack.pop ();
                         Token t2 = new Token ("0", TokenType.NUMBER);
 
-                        if (!stack.is_length (0) && o.inputs == 2)
+                        if (!stack.is_length (0) && o.inputs == 2 && t.content != "prc")
                             t2 = stack.pop ();
+                        else if ((!stack.is_length (0) && o.inputs == 2 && t.content == "prc"))
+                            t2 = stack.peek ();
                         stack.push (compute_tokens (t, t1, t2));
                     } catch (SHUNTING_ERROR e) { throw new EVAL_ERROR.NO_OPERATOR (""); }
                 } else if (t.token_type == TokenType.FUNCTION) {

=== modified file 'src/Core/Scanner.vala'
--- src/Core/Scanner.vala	2015-04-05 08:14:49 +0000
+++ src/Core/Scanner.vala	2015-09-04 06:42:16 +0000
@@ -81,7 +81,7 @@
 
                     } else if (t.token_type == TokenType.OPERATOR && t.content == "-") {
                         if (last_token == null || (last_token != null && last_token.token_type != TokenType.NUMBER &&
-                        last_token.token_type != TokenType.P_RIGHT)) {
+                        last_token.token_type != TokenType.P_RIGHT && last_token.content != "%")) {
                             next_number_negative = true;
                             continue;
                         }