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

postfix functions registry

Browse Source
This commit is contained in:
serso
2011-11-01 12:31:38 +04:00
parent 80af3d0468
commit b756cb6966
5 changed files with 54 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java
View File

@@ -6,8 +6,9 @@
package org.solovyev.android.calculator.jscl;
import jscl.math.Expression;
import jscl.text.ParseException;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.calculator.model.DummyTextProcessor;
import org.solovyev.android.calculator.model.FromJsclSimplifyTextProcessor;
import org.solovyev.android.calculator.model.TextProcessor;
@@ -17,16 +18,16 @@ public enum JsclOperation {
simplify(new FromJsclSimplifyTextProcessor()) {
@NotNull
@Override
public String evaluate(@NotNull Expression expression) {
return expression.simplify().toString();
public String evaluate(@NotNull String expression) throws ParseException {
return CalculatorEngine.instance.getEngine().simplify(expression);
}
},
elementary(DummyTextProcessor.instance) {
@NotNull
@Override
public String evaluate(@NotNull Expression expression) {
return expression.elementary().toString();
public String evaluate(@NotNull String expression) throws ParseException {
return CalculatorEngine.instance.getEngine().elementary(expression);
}
},
@@ -34,8 +35,8 @@ public enum JsclOperation {
numeric(new FromJsclNumericTextProcessor()) {
@NotNull
@Override
public String evaluate(@NotNull Expression expression) {
return expression.numeric().toString();
public String evaluate(@NotNull String expression) throws ParseException {
return CalculatorEngine.instance.getEngine().evaluate(expression);
}
};
@@ -52,5 +53,5 @@ public enum JsclOperation {
}
@NotNull
public abstract String evaluate(@NotNull Expression expression);
public abstract String evaluate(@NotNull String expression) throws ParseException;
}