diff --git a/pom.xml b/pom.xml
index a4736b0..7b96789 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
4.0.0
pl.bgora
RPNLibrary
- 2.0.1
+ 3.0.0
RPNLibrary
RPN Libray for Java.
@@ -20,14 +20,6 @@
UTF-8
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- 1.8
-
-
diff --git a/src/main/java/pl/bgora/rpn/Calculator.java b/src/main/java/pl/bgora/rpn/Calculator.java
index 13d4f78..2c80ba6 100644
--- a/src/main/java/pl/bgora/rpn/Calculator.java
+++ b/src/main/java/pl/bgora/rpn/Calculator.java
@@ -200,12 +200,12 @@ private String prepareInput(String input) throws WrongArgumentException {
} else if (Character.isLetter(c)) {
lastWasDigit = false;
lastWasOperator = false;
- lastWasWhiteSpace = false;
- if (!lastWasLetter) {
+ if (!lastWasLetter && !lastWasWhiteSpace) {
result.append(" ").append(c);
} else {
result.append(c);
}
+ lastWasWhiteSpace = false;
lastWasLetter = true;
} else {
throw new WrongArgumentException("Element \"" + c + "\" is not recognized by the Checker");
diff --git a/src/main/java/pl/bgora/rpn/RPNChecking.java b/src/main/java/pl/bgora/rpn/RPNChecking.java
index 7422128..7cbd447 100644
--- a/src/main/java/pl/bgora/rpn/RPNChecking.java
+++ b/src/main/java/pl/bgora/rpn/RPNChecking.java
@@ -37,11 +37,7 @@ public interface RPNChecking {
int compareOperators(String c1, String c2);
- default boolean isFunction(String input) {
- return false;
- }
+ boolean isFunction(String input);
- default int getFunctionParamsCount(String functionName) {
- return 0;
- }
+ int getFunctionParamsCount(String functionName);
}
diff --git a/src/main/java/pl/bgora/rpn/RPNExecuting.java b/src/main/java/pl/bgora/rpn/RPNExecuting.java
index d2d4851..f66eb9f 100644
--- a/src/main/java/pl/bgora/rpn/RPNExecuting.java
+++ b/src/main/java/pl/bgora/rpn/RPNExecuting.java
@@ -49,7 +49,5 @@ public interface RPNExecuting {
* @return Calculation result as BigDecimal.
* @throws NoSuchFunctionFound thrown if Executing object cannot find method.
*/
- default BigDecimal executeFunction(String functionName, RoundingMode mode, String... arguments) throws NoSuchFunctionFound {
- return null;
- }
+ BigDecimal executeFunction(String functionName, RoundingMode mode, String... arguments) throws NoSuchFunctionFound;
}