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

NumberBuilder refactor

Browse Source
This commit is contained in:
serso 2016-05-16 20:38:19 +02:00
parent facb255433
commit 9e9d443144
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/main/java/org/solovyev/android/calculator/BaseNumberBuilder.java
View File

@ -49,45 +49,46 @@ public abstract class BaseNumberBuilder {
/** /**
* Method determines if we can continue to process current number * Method determines if we can continue to process current number
* *
* @param mathTypeResult current math type result * @param result current math type result
* @return true if we can continue of processing of current number, if false - new number should be constructed * @return true if we can continue of processing of current number, if false - new number should be constructed
*/ */
protected boolean canContinue(@Nonnull MathType.Result mathTypeResult) { protected boolean canContinue(@Nonnull MathType.Result result) {
return mathTypeResult.type.getGroupType() == MathType.MathGroupType.number && final boolean number = result.type.getGroupType() == MathType.MathGroupType.number;
!spaceBefore(mathTypeResult) && return number && !spaceBefore(result) &&
numeralBaseCheck(mathTypeResult) && numeralBaseCheck(result) &&
numeralBaseInTheStart(mathTypeResult.type) || isSignAfterE(mathTypeResult); numeralBaseInTheStart(result.type)
|| isSignAfterE(result);
} }
private boolean spaceBefore(@Nonnull MathType.Result mathTypeResult) { private boolean spaceBefore(@Nonnull MathType.Result mathTypeResult) {
return numberBuilder == null && Strings.isNullOrEmpty(mathTypeResult.match.trim()); return numberBuilder == null && Strings.isNullOrEmpty(mathTypeResult.match.trim());
} }
private boolean numeralBaseInTheStart(@Nonnull MathType mathType) { private boolean numeralBaseInTheStart(@Nonnull MathType result) {
return mathType != MathType.numeral_base || numberBuilder == null; return result != MathType.numeral_base || numberBuilder == null;
} }
private boolean numeralBaseCheck(@Nonnull MathType.Result mathType) { private boolean numeralBaseCheck(@Nonnull MathType.Result result) {
return mathType.type != MathType.digit || getNumeralBase().getAcceptableCharacters().contains(mathType.match.charAt(0)); return result.type != MathType.digit || getNumeralBase().getAcceptableCharacters().contains(result.match.charAt(0));
} }
private boolean isSignAfterE(@Nonnull MathType.Result mathTypeResult) { private boolean isSignAfterE(@Nonnull MathType.Result mathTypeResult) {
if (!isHexMode()) { if (isHexMode()) {
final String match = mathTypeResult.match; return false;
if ("−".equals(match) || "-".equals(match) || "+".equals(match)) {
final StringBuilder localNb = numberBuilder;
if (localNb != null && localNb.length() > 0) {
if (localNb.charAt(localNb.length() - 1) == MathType.EXPONENT) {
return true;
}
}
}
} }
return false; final String match = mathTypeResult.match;
if (!"−".equals(match) && !"-".equals(match) && !"+".equals(match)) {
return false;
}
final StringBuilder nb = numberBuilder;
if (nb == null || nb.length() == 0) {
return false;
}
return nb.charAt(nb.length() - 1) == MathType.EXPONENT;
} }
public boolean isHexMode() { public boolean isHexMode() {
return nb == NumeralBase.hex || (nb == null && engine.getMathEngine().getNumeralBase() == NumeralBase.hex); return getNumeralBase() == NumeralBase.hex;
} }
@Nonnull @Nonnull