Merge lp:~f-riccardo87/ubuntu-calculator-app/calculation-results into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Riccardo Ferrazzo]

Pressing equals more times repeat the last operation

Pressing equals more times repeat the last operation (using the result as the first operand).

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:38
http://91.189.93.125:8080/job/ubuntu-calculator-app-ci/5/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calculator-app-quantal-amd64-ci/5/console
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-calculator-app-raring-amd64-ci/5/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/ubuntu-calculator-app-ci/5/rebuild

review: Approve (continuous-integration)

[Dalius (dalius-sandbox)]

review: Approve

=== modified file 'Simple/SimplePage.qml'
--- Simple/SimplePage.qml	2013-03-20 16:28:57 +0000
+++ Simple/SimplePage.qml	2013-03-22 16:16:24 +0000
@@ -16,6 +16,7 @@
         if(engineFormula.length === 0){
             engineFormula.push('');
         }
+        if(screenFormula[screenFormula.length-1]._operation === "=") return;
         try{
             var n_scanner = new CALC.Scanner(engineFormula.join('') + engine, context);
         } catch(exception) {
@@ -50,6 +51,7 @@
     }
 
     function changeSign(){
+        if(screenFormula[screenFormula.length-1]._operation === "=") return;
         var prev_tokens = [];
         var add_minus = true;
         screenFormula.pop();
@@ -98,9 +100,14 @@
     }
 
     function calculate() {
-        var result = 0;
+        if(screenFormula[screenFormula.length-1]._operation === "="){
+            var lastOperation = engineFormula.pop();
+            var previousResult = screenFormula[screenFormula.length-1]._number
+            engineFormula = [previousResult, lastOperation];
+            scanner = new CALC.Scanner(engineFormula.join(""), context);
+        }
         try{
-            result = new CALC.Parser(scanner).reduce(context);
+            var result = new CALC.Parser(scanner).reduce(context);
             if (result === Number.POSITIVE_INFINITY)
                 result = '∞';
             else if (result === Number.NEGATIVE_INFINITY)
@@ -108,7 +115,12 @@
         } catch(exception) {
             if(exception instanceof CALC.DivisionByZeroError){
                 result = "division by zero error";
-            } else if(exception instanceof SyntaxError){
+            } else{
+                console.log(screenFormula, engineFormula);
+                screenFormula.pop();
+                engineFormula.pop();
+                scanner = new CALC.Scanner(engineFormula.join(''), context);
+                calculate();
                 return;
             }
         }
 
=== modified file 'engine.js'
--- engine.js	2013-03-18 15:39:31 +0000
+++ engine.js	2013-03-22 16:16:24 +0000
@@ -523,7 +523,6 @@
 
         // If there are more values in the stack
         // (Error) The user input has too many values.
-        console.log(this.queue.length)
         throw new Error('runtime error: too many values');
     },