supports function into a function

Darkempire78 · Nov 20, 2022 · 3804353 · 3804353
1 parent 52e91a7
commit 3804353
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/src/main/java/com/darkempire78/opencalculator/Calculator.kt b/app/src/main/java/com/darkempire78/opencalculator/Calculator.kt
@@ -76,7 +76,7 @@ class Calculator {
                     val func: String = equation.substring(startPos, pos)
                     if (eat('('.code)) {
                         x = parseExpression()
-                        if (!eat(')'.code)) throw RuntimeException("Missing ')' after argument to $func")
+                        if (!eat(')'.code)) x = parseFactor()
                     } else {
                         x = parseFactor()
                     }

diff --git a/app/src/main/java/com/darkempire78/opencalculator/Expression.kt b/app/src/main/java/com/darkempire78/opencalculator/Expression.kt
@@ -119,10 +119,11 @@ class Expression {
                     val functionsList = listOf("arcos", "arcsin", "arctan", "cos", "sin", "tan", "ln", "log", "exp")
                     for (function in functionsList) {
                         val text = cleanCalculation.subSequence(0, i+1).toString()
-                        if (text.endsWith(function) && !text.startsWith(function)) {
+                        if (text.endsWith(function) && text.length != function.length) {
                             if (text[text.length - function.length - 1] != '*') {
                                 cleanCalculation = cleanCalculation.subSequence(0, i - function.length + 1).toString() +
                                         "*" + function + cleanCalculation.subSequence(i+1, cleanCalculation.length).toString()
+                                cleanCalculationLength ++
                                 break
                             }
                         }