TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove recursion from MathType

Browse Source
This commit is contained in:
serso 2016-04-20 13:01:45 +02:00
parent 6137912385
commit 24cb3b49b1
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/solovyev/android/calculator/math/MathType.java
View File

@ -23,21 +23,24 @@
package org.solovyev.android.calculator.math; package org.solovyev.android.calculator.math;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import jscl.JsclMathEngine;
import jscl.NumeralBase;
import jscl.math.function.Constants;
import org.solovyev.android.Check; import org.solovyev.android.Check;
import org.solovyev.android.calculator.App; import org.solovyev.android.calculator.App;
import org.solovyev.android.calculator.Engine; import org.solovyev.android.calculator.Engine;
import org.solovyev.android.calculator.ParseException; import org.solovyev.android.calculator.ParseException;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jscl.JsclMathEngine;
import jscl.NumeralBase;
import jscl.math.function.Constants;
public enum MathType { public enum MathType {
@ -313,8 +316,8 @@ public enum MathType {
if (mathType == MathType.grouping_separator) { if (mathType == MathType.grouping_separator) {
if (i + 1 < text.length() && if (i + 1 < text.length() &&
getType(text, i + 1, hexMode, result, engine).type == MathType.digit && MathType.digit.getTokens().contains(text.substring(i + 1, i + 2)) &&
i - 1 >= 0 && getType(text, i - 1, hexMode, result, engine).type == MathType.digit) { i - 1 >= 0 && MathType.digit.getTokens().contains(text.substring(i - 1, i))) {
return result.set(mathType, s); return result.set(mathType, s);
} }
continue; continue;