fix #349 #340

Darkempire78 · Nov 5, 2023 · ca427f4 · ca427f4
1 parent 679fa41
commit ca427f4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition 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
@@ -84,7 +84,6 @@ class Calculator(
                 nextChar()
                 val x = parseExpression()
                 if (pos < equation.length) println("Unexpected: \"" + ch.toChar() + "\" in expression: " + equation)
-                syntax_error = true
                 return x
             }
 

diff --git a/app/src/main/java/com/darkempire78/opencalculator/Expression.kt b/app/src/main/java/com/darkempire78/opencalculator/Expression.kt
@@ -119,7 +119,7 @@ class Expression {
                     cleanCalculationLength ++
                 }
             } else if (cleanCalculation[i] == ')') {
-                if (i+1 < cleanCalculation.length && (cleanCalculation[i+1] in "0123456789(")) {
+                if (i+1 < cleanCalculation.length && (cleanCalculation[i+1] in "0123456789(.")) {
                     cleanCalculation = cleanCalculation.addCharAtIndex('*', i+1)
                     cleanCalculationLength ++
                 }