Merge pull request #387 from 1c-syntax/develop

Sync

Author: nixel2007

build.gradle.kts

@@ -9,9 +9,9 @@ plugins {
     antlr
     id("cloud.rio.license") version "0.18.0"
     id("me.qoomon.git-versioning") version "6.4.4"
-    id("io.freefair.javadoc-links") version "9.2.0"
-    id("io.freefair.javadoc-utf-8") version "9.2.0"
-    id("io.freefair.lombok") version "9.2.0"
+    id("io.freefair.javadoc-links") version "9.5.0"
+    id("io.freefair.javadoc-utf-8") version "9.5.0"
+    id("io.freefair.lombok") version "9.5.0"
 //    id("io.freefair.maven-central.validate-poms") version "9.2.0"
     id("com.github.ben-manes.versions") version "0.54.0"
     id("ru.vyarus.pom") version "3.0.0"
@@ -58,7 +58,7 @@ dependencies {
         exclude("org.antlr:ST4")
     }
 
-    testImplementation(platform("org.junit:junit-bom:6.0.3"))
+    testImplementation(platform("org.junit:junit-bom:6.1.0"))
     testImplementation("org.junit.jupiter:junit-jupiter-api")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
     testImplementation("org.assertj:assertj-core:3.27.7")

src/main/antlr/BSLLexer.g4

@@ -196,6 +196,7 @@ PREPROC_RPAREN: RPAREN;
 
 PREPROC_STRING: '"' (~["\n\r])* '"';
 PREPROC_NATIVE: 'NATIVE';
+PREPROC_STACK: 'STACK';
 PREPROC_USE_KEYWORD: ('ИСПОЛЬЗОВАТЬ' | 'USE') -> pushMode(USE_MODE);
 PREPROC_REGION: ('ОБЛАСТЬ' | 'REGION') -> pushMode(REGION_MODE);
 PREPROC_END_REGION: 'КОНЕЦОБЛАСТИ' | 'ENDREGION';

src/main/antlr/BSLParser.g4

@@ -31,13 +31,14 @@ file: shebang? moduleAnnotations? preprocessor* moduleVars? preprocessor* (fileC
 
 // moduleAnnotations
 preproc_native   : HASH PREPROC_NATIVE;
+preproc_stack    : HASH PREPROC_STACK;
 usedLib          : (PREPROC_STRING | PREPROC_IDENTIFIER);
 use              : HASH PREPROC_USE_KEYWORD usedLib;
 
 moduleAnnotations
     :
-     (preproc_native use*)
-     | (use+ preproc_native? use*)
+     ((preproc_native | preproc_stack) use*)
+     | (use+ (preproc_native | preproc_stack)? use*)
     ;
 
 // preprocessor

src/test/java/com/github/_1c_syntax/bsl/parser/BSLLexerTest.java

@@ -97,6 +97,12 @@ void testUse() {
       .containsAll(BSLLexer.WHITE_SPACE, BSLLexer.LINE_COMMENT);
   }
 
+  @Test
+  void testPreprocNativeAndStack() {
+    testLexer.assertThat(BSLLexer.PREPROCESSOR_MODE, "native").containsAll(BSLLexer.PREPROC_NATIVE);
+    testLexer.assertThat(BSLLexer.PREPROCESSOR_MODE, "stack").containsAll(BSLLexer.PREPROC_STACK);
+  }
+
   @Test
   void testPreproc_LineComment() {
     testLexer.assertThat("#КонецОбласти // Концевой комментарий")
@@ -566,7 +572,8 @@ void checkAsyncModeMapping() {
         || BSLLexer.UNKNOWN == i
         || BSLLexer.DOT_TRAILING == i
         || BSLLexer.Async_DOT == i // в runtime всегда переписывается на DOT или DOT_TRAILING
-        || BSLLexer.PREPROC_NATIVE == i) {
+        || BSLLexer.PREPROC_NATIVE == i
+        || BSLLexer.PREPROC_STACK == i) {
         Assertions.assertThat(tokenTypes).doesNotContain(i);
       } else {
         Assertions.assertThat(tokenTypes).contains(i);

src/test/java/com/github/_1c_syntax/bsl/parser/BSLParserMatchesTest.java

@@ -76,6 +76,11 @@ void testNative() {
     testParser.assertThat("#native").matches(testParser.parser().preproc_native());
   }
 
+  @Test
+  void testStack() {
+    testParser.assertThat("#stack").matches(testParser.parser().preproc_stack());
+  }
+
   @Test
   void testNativeFile() {
     testParser.assertThat("""
@@ -89,7 +94,7 @@ void testNativeFile() {
   @ParameterizedTest
   @ValueSource(strings =
     {
-      "#Использовать А", "#Использовать \".\"", "#native"
+      "#Использовать А", "#Использовать \".\"", "#native", "#stack"
     }
   )
   void testModuleAnnotations(String inputString) {