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

Add capital latin letters support

Browse Source
This commit is contained in:
Iaroslav 2020-07-27 15:37:18 +07:00
parent 2864b2d12e
commit 45087f8b2d
No known key found for this signature in database
GPG Key ID: 46E15E4A31B3BCD7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,9 +2,10 @@ grammar ArithmeticsEvaluator;
fragment DIGIT: '0'..'9'; fragment DIGIT: '0'..'9';
fragment LETTER: 'a'..'z'; fragment LETTER: 'a'..'z';
fragment CAPITAL_LETTER: 'A'..'Z'
fragment UNDERSCORE: '_'; fragment UNDERSCORE: '_';
ID: (LETTER | UNDERSCORE) (LETTER | UNDERSCORE | DIGIT)*; ID: (LETTER | UNDERSCORE | CAPITAL_LETTER) (LETTER | UNDERSCORE | DIGIT | CAPITAL_LETTER)*;
NUM: (DIGIT | '.')+ ([eE] MINUS? DIGIT+)?; NUM: (DIGIT | '.')+ ([eE] MINUS? DIGIT+)?;
MUL: '*'; MUL: '*';
DIV: '/'; DIV: '/';

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())