Kumir lang support #4477
Open
Kumir lang support #4477
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kaby76
reviewed
Apr 27, 2025
kaby76
reviewed
Apr 27, 2025
KvanTTT
requested changes
Apr 27, 2025
kaby76
reviewed
Apr 27, 2025
kaby76
reviewed
Apr 27, 2025
|
Well, something is wrong. The check for the ability to merge is not completing. |
kaby76
approved these changes
May 18, 2025
|
@Bormotoon for some reason the check for merge is not ending. Couuld you close and re-open this please? |
KvanTTT
reviewed
Jun 25, 2025
| // --- Keywords (Core Language) --- | ||
| // Keywords are case-insensitive (both lowercase and uppercase Cyrillic are matched). | ||
| MODULE : 'модуль'; | ||
| ENDMODULE : ('конец' WS 'модуля' | 'конецмодуля' | 'конец_модуля'); |
There was a problem hiding this comment.
I recommend simplifying:
Suggested change
| ENDMODULE : ('конец' WS 'модуля' | 'конецмодуля' | 'конец_модуля'); | |
| fragment: WS_FRAGMENT: [ \t\r\n]+; | |
| ENDMODULE : 'конец' (WS_FRAGMENT | '_')? 'модуля'; |
| POST_CONDITION : 'надо'; | ||
| ASSERTION : 'утв'; | ||
| LOOP : 'нц'; | ||
| ENDLOOP_COND : ('кц' WS 'при' | 'кц_при'); |
There was a problem hiding this comment.
Suggested change
| ENDLOOP_COND : ('кц' WS 'при' | 'кц_при'); | |
| ENDLOOP_COND : 'кц' (WS_FRAGMENT | '_')? 'при'; |
| OR : 'или'; | ||
| OUT_PARAM : 'рез'; | ||
| IN_PARAM : 'арг'; | ||
| INOUT_PARAM : ('аргрез' | 'арг' WS 'рез' | 'арг_рез'); |
There was a problem hiding this comment.
Suggested change
| INOUT_PARAM : ('аргрез' | 'арг' WS 'рез' | 'арг_рез'); | |
| INOUT_PARAM : 'арг' (WS_FRAGMENT | '_')? 'рез'; |
Comment on lines
+66
to
+70
| INTEGER_ARRAY_TYPE : ('цел' WS? 'таб' | 'цел_таб'); | ||
| REAL_ARRAY_TYPE : ('вещ' WS? 'таб' | 'вещ_таб'); | ||
| CHAR_ARRAY_TYPE : ('сим' WS? 'таб' | 'сим_таб'); | ||
| STRING_ARRAY_TYPE : ('лит' WS? 'таб' | 'лит_таб'); | ||
| BOOLEAN_ARRAY_TYPE : ('лог' WS? 'таб' | 'лог_таб'); |
There was a problem hiding this comment.
Suggested change
| INTEGER_ARRAY_TYPE : ('цел' WS? 'таб' | 'цел_таб'); | |
| REAL_ARRAY_TYPE : ('вещ' WS? 'таб' | 'вещ_таб'); | |
| CHAR_ARRAY_TYPE : ('сим' WS? 'таб' | 'сим_таб'); | |
| STRING_ARRAY_TYPE : ('лит' WS? 'таб' | 'лит_таб'); | |
| BOOLEAN_ARRAY_TYPE : ('лог' WS? 'таб' | 'лог_таб'); | |
| INTEGER_ARRAY_TYPE : 'цел' (WS_FRAGMENT | '_')? 'таб'; | |
| REAL_ARRAY_TYPE : 'вещ' (WS_FRAGMENT | '_')? 'таб'; | |
| CHAR_ARRAY_TYPE : 'сим' (WS_FRAGMENT | '_')? 'таб'; | |
| STRING_ARRAY_TYPE : 'лит' (WS_FRAGMENT | '_')? 'таб'; | |
| BOOLEAN_ARRAY_TYPE : 'лог' (WS_FRAGMENT | '_')? 'таб'; |
| // Color constants | ||
| PROZRACHNIY : 'прозрачный'; | ||
| BELIY : 'белый'; | ||
| CHERNIY : 'чёрный' | 'черный'; |
There was a problem hiding this comment.
Suggested change
| CHERNIY : 'чёрный' | 'черный'; | |
| fragment E_OR_YO : 'ё' | 'е'; | |
| CHERNIY : 'ч' E_OR_YO рный'; |
Comment on lines
+83
to
+84
| ZELENIY : 'зелёный' | 'зеленый'; | ||
| ZHELTIY : 'жёлтый' | 'желтый'; |
There was a problem hiding this comment.
Suggested change
| ZELENIY : 'зелёный' | 'зеленый'; | |
| ZHELTIY : 'жёлтый' | 'желтый'; | |
| ZELENIY : 'зел' E_OR_YO 'ный'; | |
| ZHELTIY : 'ж' E_OR_YO 'лтый'; |
| DOC_COMMENT : '#' ~[\r\n]* -> channel(HIDDEN); | ||
|
|
||
| // --- Whitespace --- | ||
| WS : [ \t\r\n]+ -> skip; |
There was a problem hiding this comment.
Use the previously introduced WS_FRAGMENT:
Suggested change
| WS : [ \t\r\n]+ -> skip; | |
| WS : WS_FRAGMENT+ -> skip; |
Comment on lines
+135
to
+137
| fragment DIGIT : [0-9]; | ||
| fragment HEX_DIGIT : [0-9a-fA-F]; | ||
| fragment LETTER : [a-zA-Zа-яА-ЯёЁ]; |
There was a problem hiding this comment.
The UPPER case is not needed since the grammar sets up caseInsensitive = true
Suggested change
| fragment DIGIT : [0-9]; | |
| fragment HEX_DIGIT : [0-9a-fA-F]; | |
| fragment LETTER : [a-zA-Zа-яА-ЯёЁ]; | |
| fragment DIGIT : [0-9]; | |
| fragment HEX_DIGIT : [0-9a-f]; | |
| fragment LETTER : [a-zа-яё]; |
| fragment LETTER : [a-zA-Zа-яА-ЯёЁ]; | ||
| fragment DecInteger : DIGIT+; | ||
| fragment HexInteger : '$' HEX_DIGIT+; | ||
| fragment ExpFragment: [eE] [+-]? DIGIT+; |
There was a problem hiding this comment.
Suggested change
| fragment ExpFragment: [eE] [+-]? DIGIT+; | |
| fragment ExpFragment: [e] [+-]? DIGIT+; |
|
Is this ready to merge? |
|
There are some minor issues to fix, but generally yes. |
|
Sorry, not yet. There will be some more changes and optimizations as suggested here. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Kumir is a Russian algorithmic language primarily used for teaching programming in schools.