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

Extend mathematic operations support in the kmath-ast parser #120

Merged
CommanderTvis merged 10 commits from extended-grammar into dev 2020-07-27 19:37:09 +03:00
Conversation 1 Commits 10 Files Changed 10 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 45087f8b2d - Show all commits

3
kmath-ast/reference/ArithmeticsEvaluator.g4
View File

@ -2,9 +2,10 @@ grammar ArithmeticsEvaluator;
Shimuuar commented 2020-07-27 11:02:43 +03:00 (Migrated from github.com)
Review
Copy Link

1.23e+3 generally + in exponent is generally allowed

`1.23e+3` generally + in exponent is generally allowed
Shimuuar commented 2020-07-27 11:02:43 +03:00 (Migrated from github.com)
Review
Copy Link

1.23e+3 generally + in exponent is generally allowed

`1.23e+3` generally + in exponent is generally allowed
CommanderTvis commented 2020-07-27 16:51:45 +03:00 (Migrated from github.com)
Review
Copy Link

Fixed

Fixed
CommanderTvis commented 2020-07-27 16:51:45 +03:00 (Migrated from github.com)
Review
Copy Link

Fixed

Fixed
fragment DIGIT: '0'..'9'; fragment DIGIT: '0'..'9';
fragment LETTER: 'a'..'z'; fragment LETTER: 'a'..'z';
Shimuuar commented 2020-07-27 11:02:15 +03:00 (Migrated from github.com)
Review
Copy Link

What about uppercase letters?

What about uppercase letters?
CommanderTvis commented 2020-07-27 16:51:53 +03:00 (Migrated from github.com)
Review
Copy Link

Added.

Added.
fragment CAPITAL_LETTER: 'A'..'Z'
Shimuuar commented 2020-07-27 11:02:43 +03:00 (Migrated from github.com)
Review
Copy Link

1.23e+3 generally + in exponent is generally allowed

`1.23e+3` generally + in exponent is generally allowed
CommanderTvis commented 2020-07-27 16:51:45 +03:00 (Migrated from github.com)
Review
Copy Link

Fixed

Fixed
fragment UNDERSCORE: '_'; fragment UNDERSCORE: '_';
ID: (LETTER | UNDERSCORE) (LETTER | UNDERSCORE | DIGIT)*; ID: (LETTER | UNDERSCORE | CAPITAL_LETTER) (LETTER | UNDERSCORE | DIGIT | CAPITAL_LETTER)*;
Shimuuar commented 2020-07-27 11:02:43 +03:00 (Migrated from github.com)
Review
Copy Link

1.23e+3 generally + in exponent is generally allowed

`1.23e+3` generally + in exponent is generally allowed
CommanderTvis commented 2020-07-27 16:51:45 +03:00 (Migrated from github.com)
Review
Copy Link

Fixed

Fixed
Shimuuar commented 2020-07-27 11:02:43 +03:00 (Migrated from github.com)
Review
Copy Link

1.23e+3 generally + in exponent is generally allowed

`1.23e+3` generally + in exponent is generally allowed
CommanderTvis commented 2020-07-27 16:51:45 +03:00 (Migrated from github.com)
Review
Copy Link

Fixed

Fixed
NUM: (DIGIT | '.')+ ([eE] MINUS? DIGIT+)?; NUM: (DIGIT | '.')+ ([eE] MINUS? DIGIT+)?;
MUL: '*'; MUL: '*';
DIV: '/'; DIV: '/';

Shimuuar commented 2020-07-27 11:02:43 +03:00 (Migrated from github.com)
Review
Copy Link

1.23e+3 generally + in exponent is generally allowed

`1.23e+3` generally + in exponent is generally allowed
Shimuuar commented 2020-07-27 11:02:43 +03:00 (Migrated from github.com)
Review
Copy Link

1.23e+3 generally + in exponent is generally allowed

`1.23e+3` generally + in exponent is generally allowed
CommanderTvis commented 2020-07-27 16:51:45 +03:00 (Migrated from github.com)
Review
Copy Link

Fixed

Fixed
CommanderTvis commented 2020-07-27 16:51:45 +03:00 (Migrated from github.com)
Review
Copy Link

Fixed

Fixed

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

@ -19,7 +19,7 @@ import scientifik.kmath.operations.SpaceOperations
*/ */
object ArithmeticsEvaluator : Grammar<MST>() { object ArithmeticsEvaluator : Grammar<MST>() {
private val num: Token by token("[\\d.]+(?:[eE]-?\\d+)?".toRegex()) private val num: Token by token("[\\d.]+(?:[eE]-?\\d+)?".toRegex())
private val id: Token by token("[a-z_][\\da-z_]*".toRegex()) private val id: Token by token("[a-z_A-Z][\\da-z_A-Z]*".toRegex())
private val lpar: Token by token("\\(".toRegex()) private val lpar: Token by token("\\(".toRegex())
private val rpar: Token by token("\\)".toRegex()) private val rpar: Token by token("\\)".toRegex())
private val comma: Token by token(",".toRegex()) private val comma: Token by token(",".toRegex())