Fixed an issue with the Parser where if the token at the top of the o…

…perator stack is a parenthesis, that it would attempt to convert it into a function and crash.
Carson-McCombs · Jun 26, 2024 · 2693f05 · 2693f05
1 parent f62c358
commit 2693f05
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 24 deletions.
diff --git a/app/src/main/java/model/parser/evaluator/ShuntingYardParser.kt b/app/src/main/java/model/parser/evaluator/ShuntingYardParser.kt
@@ -96,6 +96,7 @@ class ShuntingYardParser {
             val baseParseResult = ParseResult(isStatic = isStatic, globalDependencyIds = globalDependencyIds, localDependencyIds = localDependencyIds)
             val outputQueue = ArrayDeque<Token>()
             val operatorStack = ArrayDeque<Token>()
+            //println(tokens.joinToString ("\n "))
             for (token in tokens) {
                 //println("-------------")
                 //println("Token: ${token.text}")
@@ -117,7 +118,6 @@ class ShuntingYardParser {
 
                                 while (operatorStack.first().text != "(") {
                                     if (operatorStack.isEmpty()) return baseParseResult.copy( errorText = "No opening parenthesis found")
-                                    //outputQueue.addLast(operatorStack.removeFirst())
                                     //println("-------------")
                                     //println("Token: ${operatorStack.first().text}")
                                     //println("Output Queue: ${outputQueue.map { t -> t.text }}")
@@ -138,12 +138,13 @@ class ShuntingYardParser {
                             operatorStack.addFirst(token)
                             continue
                         }
-                        //var functionA = Function.functionMap[token.text] ?: return Pair(null, Error("Unknown Function \"${operatorStack.first()}\""))
-                        //var functionB = Function.functionMap[operatorStack.first().text] ?: return Pair(null, Error("Unknown Function \"${operatorStack.first()}\""))
+                        if (operatorStack.first().tokenType == TokenType.PUNCTUATION){
+                            operatorStack.addFirst(token)
+                            continue
+                        }
                         val tokenFunction = token.value as Function
                         var otherFunction = operatorStack.first().value as Function
                         while ((otherFunction.name != "(") && (tokenFunction.precedence > otherFunction.precedence) || (tokenFunction.precedence == otherFunction.precedence && tokenFunction.associativity == AssociativityDirection.LeftToRight)) {
-                            //outputQueue.addLast(operatorStack.removeFirst())
                             //println("-------------")
                             //println("Token: ${operatorStack.first().text}")
                             //println("Output Queue: ${outputQueue.map { t -> t.text }}")
@@ -164,7 +165,6 @@ class ShuntingYardParser {
                 //println("Output Queue: ${outputQueue.map { t -> t.text }}")
                 //println("Operator Stack: ${operatorStack.map { t -> t.text }}")
                 if (operatorStack.last().text == "(") return baseParseResult.copy( errorText = "Cannot end statement with an open parenthesis")
-                //outputQueue.addLast(operatorStack.removeFirst())
                 val err = addToOutputQueue(outputQueue, operatorStack.removeFirst())
                 if (err != null) return baseParseResult.copy( errorText = err.message ?: "")
             }

diff --git a/app/src/main/java/view/expressionGroupScreen/ErrorPopupView.kt b/app/src/main/java/view/expressionGroupScreen/ErrorPopupView.kt
@@ -0,0 +1,24 @@
+package view.expressionGroupScreen
+
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.window.Popup
+
+@Composable
+fun ErrorPopupView(title: String, error: Error){
+    Popup {
+        Text(
+            text = title,
+            style = MaterialTheme.typography.titleLarge
+            )
+        Text(text = error.message ?: "empty error message")
+    }
+}
+
+@Preview
+@Composable
+fun ErrorPopupView_Preview(){
+    ErrorPopupView(title = "Error Preview", error = Error("Example Error Text"))
+}
diff --git a/app/src/main/java/view/expressionGroupScreen/GroupScreenView.kt b/app/src/main/java/view/expressionGroupScreen/GroupScreenView.kt
@@ -72,7 +72,7 @@ fun GroupScreenView(
         addChildGroup = { viewModel.addChildExpressionGroup() },
         expressionEvents = remember(viewModel.id, "expressionEvents") { ExpressionEvents.fromViewModel(viewModel)},
         groupEvents = remember(viewModel.id, "expressionEvents") { GroupEvents.fromViewModel(viewModel) },
-        groupScreenEvents = groupScreenEvents
+        groupScreenEvents = groupScreenEvents,
     )
 }
 
@@ -89,7 +89,7 @@ private fun GroupScreenView(
     addChildGroup: () -> Unit,
     expressionEvents: ExpressionEvents,
     groupEvents: GroupEvents,
-    groupScreenEvents: GroupScreenEvents
+    groupScreenEvents: GroupScreenEvents,
 ){
 
     Scaffold(

diff --git a/app/src/main/java/viewModel/GroupScreenViewModel.kt b/app/src/main/java/viewModel/GroupScreenViewModel.kt
@@ -75,6 +75,8 @@ class GroupScreenViewModel(
         initialValue = emptyMap()
     )
 
+    val unhandledErrorState: Pair<String,Error>? = null
+
     private val _expressionTextFieldStateMap: MutableMap<Long, TextFieldState> = mutableMapOf()
 
     fun getExpressionTextFieldState(expressionId: Long): TextFieldState {
@@ -188,23 +190,28 @@ class GroupScreenViewModel(
             val name = getExpressionNameTextFieldState(expressionId).text.toString()
             val rawText = getExpressionTextFieldState(expressionId).text.toString()
             var expression = childExpressionsMap.value[expressionId]!!
-            val parseResult = ShuntingYardParser.evaluate(
-                id = expressionId,
-                rawText = rawText,
-                getGroupPath = { exprId ->
-                    repository.getExpressionGroupPath(exprId)
-                },
-                getExpressionId = { expressionFullPath: String ->
-                    repository.expressionFullPathToIdMap.value[expressionFullPath]
-                },
-                getExpression = { exprId: Long ->
-                    repository.expressionMap.value[exprId]
-                },
-                getOverlappingDependencies = {exprId, otherIds -> repository.getOverlappingDependencies(exprId, otherIds) }
-            )
-            expression = expression.copy(name = name, text = rawText, parseResult =  parseResult, updated = true)
-            repository.upsertExpression(expression)
-            if (oldText != rawText) repository.updateDependentExpressions(expression = expression)
+            try {
+                val parseResult = ShuntingYardParser.evaluate(
+                    id = expressionId,
+                    rawText = rawText,
+                    getGroupPath = { exprId ->
+                        repository.getExpressionGroupPath(exprId)
+                    },
+                    getExpressionId = { expressionFullPath: String ->
+                        repository.expressionFullPathToIdMap.value[expressionFullPath]
+                    },
+                    getExpression = { exprId: Long ->
+                        repository.expressionMap.value[exprId]
+                    },
+                    getOverlappingDependencies = {exprId, otherIds -> repository.getOverlappingDependencies(exprId, otherIds) }
+                )
+                expression = expression.copy(name = name, text = rawText, parseResult =  parseResult, updated = true)
+                repository.upsertExpression(expression)
+                if (oldText != rawText) repository.updateDependentExpressions(expression = expression)
+            } catch (error: Error) {
+                println(error)
+            }
+
         }
     }