Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-19 16:55:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Decimal percentages

Browse Source 
closes #68
This commit is contained in:
sadellie 2023-07-20 22:25:15 +03:00
parent 627ce5a785
commit 4e28521ec0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/evaluatto/src/main/java/io/github/sadellie/evaluatto/Tokenizer.kt
View File

@ -197,7 +197,7 @@ class Tokenizer(private val streamOfTokens: String) {
} }
private fun List<String>.getNumberOrExpressionBefore(pos: Int): List<String> { private fun List<String>.getNumberOrExpressionBefore(pos: Int): List<String> {
val digits = Token.Digit.all.map { it[0] } val digits = Token.Digit.allWithDot.map { it[0] }
val tokenInFront = this[pos - 1] val tokenInFront = this[pos - 1]
@ -205,7 +205,7 @@ class Tokenizer(private val streamOfTokens: String) {
if (tokenInFront.all { it in digits }) return listOf(tokenInFront) if (tokenInFront.all { it in digits }) return listOf(tokenInFront)
// Not just a number. Probably expression in brackets. // Not just a number. Probably expression in brackets.
if (tokenInFront != Token.Operator.rightBracket) throw Exception("Unexpected token before the percentage") if (tokenInFront != Token.Operator.rightBracket) throw Exception("Unexpected token before percentage")
// Start walking left until we get balanced brackets // Start walking left until we get balanced brackets
var cursor = pos - 1 var cursor = pos - 1

4
data/evaluatto/src/test/java/io/github/sadellie/evaluatto/FixLexiconTest.kt
View File

@ -120,5 +120,9 @@ class FixLexiconTest {
) )
assertLex("(80÷100)×(80÷100)", "80%80%") assertLex("(80÷100)×(80÷100)", "80%80%")
assertLex("10+(2.0÷100×(10))", "10+2.0%")
assertLex("10+(2.÷100×(10))", "10+2.%")
} }
} }