summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Boehm <hboehm@google.com>2015-10-11 13:43:16 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-11 13:43:16 (GMT)
commit4727061654f6f7fea8e90d3e87d835839121ed8d (patch)
treec5d2f065c54a7d4cc1b577ccd2ab470a9861579c
parentb7be7bfdec8d4823a448c45fe164e9640ea3e83f (diff)
parente4b8ff7c9c8a041ab451cdc78a019b2a4a666b99 (diff)
downloadandroid_packages_apps_ExactCalculator-4727061654f6f7fea8e90d3e87d835839121ed8d.zip
android_packages_apps_ExactCalculator-4727061654f6f7fea8e90d3e87d835839121ed8d.tar.gz
android_packages_apps_ExactCalculator-4727061654f6f7fea8e90d3e87d835839121ed8d.tar.bz2
am e4b8ff7c: Don\'t evaluate a lone decimal point to zero
* commit 'e4b8ff7c9c8a041ab451cdc78a019b2a4a666b99': Don't evaluate a lone decimal point to zero
-rw-r--r--src/com/android/calculator2/CalculatorExpr.java15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/com/android/calculator2/CalculatorExpr.java b/src/com/android/calculator2/CalculatorExpr.java
index b387e8b..77e53ea 100644
--- a/src/com/android/calculator2/CalculatorExpr.java
+++ b/src/com/android/calculator2/CalculatorExpr.java
@@ -217,12 +217,19 @@ class CalculatorExpr {
}
/**
- * Return BoundedRational representation of constant.
- * Never null.
+ * Return BoundedRational representation of constant, if well-formed.
+ * Result is never null.
*/
- public BoundedRational toRational() {
+ public BoundedRational toRational() throws SyntaxException {
String whole = mWhole;
- if (whole.isEmpty()) whole = "0";
+ if (whole.isEmpty()) {
+ if (mFraction.isEmpty()) {
+ // Decimal point without digits.
+ throw new SyntaxException();
+ } else {
+ whole = "0";
+ }
+ }
BigInteger num = new BigInteger(whole + mFraction);
BigInteger den = BigInteger.TEN.pow(mFraction.length());
if (mExponent > 0) {