kscience/kmath
9
0
Fork 1
Code Issues Pull Requests 6 Packages Projects Releases 16 Wiki Activity

Dev #127

Merged
altavir merged 214 commits from dev into master 2020-08-11 08:33:21 +03:00
Conversation 0 Commits 214 Files Changed 149 +9 -9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 37ef3a1879 - Show all commits

18
kmath-ast/src/commonMain/kotlin/scientifik/kmath/ast/parser.kt
View File

@ -16,15 +16,15 @@ import scientifik.kmath.operations.SpaceOperations
* TODO move to common * TODO move to common
*/ */
private object ArithmeticsEvaluator : Grammar<MST>() { private object ArithmeticsEvaluator : Grammar<MST>() {
val num by token("-?[\\d.]+(?:[eE]-?\\d+)?") val num by token("-?[\\d.]+(?:[eE]-?\\d+)?".toRegex())
val lpar by token("\\(") val lpar by token("\\(".toRegex())
val rpar by token("\\)") val rpar by token("\\)".toRegex())
val mul by token("\\*") val mul by token("\\*".toRegex())
val pow by token("\\^") val pow by token("\\^".toRegex())
val div by token("/") val div by token("/".toRegex())
val minus by token("-") val minus by token("-".toRegex())
val plus by token("\\+") val plus by token("\\+".toRegex())
val ws by token("\\s+", ignore = true) val ws by token("\\s+".toRegex(), ignore = true)
val number: Parser<MST> by num use { MST.Numeric(text.toDouble()) } val number: Parser<MST> by num use { MST.Numeric(text.toDouble()) }