Merge branch 'issue-Darkempire78#510' into bmg1919

bmg1919 · Jan 16, 2025 · 14fb7cb · 14fb7cb
2 parents 288aa0f + d35ce7b
commit 14fb7cb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/src/main/java/com/darkempire78/opencalculator/activities/MainActivity.kt b/app/src/main/java/com/darkempire78/opencalculator/activities/MainActivity.kt
@@ -973,6 +973,8 @@ class MainActivity : AppCompatActivity() {
 
             val calculation = binding.input.text.toString()
 
+            Expression().addParenthesis(calculation)
+
             if (calculation != "") {
 
                 val resultString = calculationResult.toString()

diff --git a/app/src/main/java/com/darkempire78/opencalculator/calculator/parser/Expression.kt b/app/src/main/java/com/darkempire78/opencalculator/calculator/parser/Expression.kt
@@ -102,7 +102,7 @@ class Expression {
 
     }
 
-    private fun addParenthesis(calculation: String): String {
+    fun addParenthesis(calculation: String): String {
         // Add ")" which lack
         var cleanCalculation = calculation
         var openParentheses = 0
@@ -121,6 +121,10 @@ class Expression {
                 cleanCalculation += ')'
             }
         }
+        // Trigger syntax error if missing '('
+        if (closeParentheses > openParentheses) {
+            syntax_error = true
+        }
 
         return cleanCalculation
     }