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

Release
1c-syntax · Jun 12, 2023 · b2b5b2a · b2b5b2a
2 parents 0285fec + eeb0f8e
commit b2b5b2a
Show file tree

Hide file tree

Showing 39 changed files with 111 additions and 54 deletions.
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -29,7 +29,7 @@ jobs:
       run: ./gradlew --no-daemon javadoc
 
     - name: Set up Python
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: '3.6'
         architecture: 'x64'
@@ -123,7 +123,7 @@ jobs:
         cp -R temp/site/. public/dev/en
         
     - name: Deploy
-      uses: peaceiris/actions-gh-pages@v3.8.0
+      uses: peaceiris/actions-gh-pages@v3.9.3
       with:
         deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
         publish_branch: gh-pages

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,12 +6,12 @@ plugins {
     jacoco
     `java-library`
     antlr
-    id("org.sonarqube") version "3.3"
+    id("org.sonarqube") version "4.2.1.3168"
     id("org.cadixdev.licenser") version "0.6.1"
     id("com.github.gradle-git-version-calculator") version "1.1.0"
-    id("io.freefair.javadoc-links") version "6.4.3"
-    id("io.freefair.javadoc-utf-8") version "6.4.3"
-    id("com.github.ben-manes.versions") version "0.42.0"
+    id("io.freefair.javadoc-links") version "6.5.1"
+    id("io.freefair.javadoc-utf-8") version "6.6.1"
+    id("com.github.ben-manes.versions") version "0.47.0"
     id("me.champeau.gradle.jmh") version "0.5.3"
 }
 

diff --git a/src/jmh/java/com/github/_1c_syntax/bsl/parser/JMXBSLLexerTest.java b/src/jmh/java/com/github/_1c_syntax/bsl/parser/JMXBSLLexerTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/jmh/java/com/github/_1c_syntax/bsl/parser/JMXBSLParserTest.java b/src/jmh/java/com/github/_1c_syntax/bsl/parser/JMXBSLParserTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/antlr/BSLLexer.g4 b/src/main/antlr/BSLLexer.g4
@@ -364,6 +364,10 @@ PREPROC_RPAREN: ')';
 
 PREPROC_STRING: '"' (~["\n\r])* '"';
 
+PREPROC_NATIVE
+    : N A T I V E
+    ;
+
 PREPROC_USE_KEYWORD
     :
     (RU_I RU_S RU_P RU_O RU_L RU_SOFT_SIGN RU_Z RU_O RU_V RU_A RU_T RU_SOFT_SIGN

diff --git a/src/main/antlr/BSLParser.g4 b/src/main/antlr/BSLParser.g4
@@ -27,14 +27,22 @@ options {
 }
 
 // ROOT
-file: shebang? preprocessor* moduleVars? preprocessor* (fileCodeBlockBeforeSub subs)? fileCodeBlock EOF;
+file: shebang? moduleAnnotations? preprocessor* moduleVars? preprocessor* (fileCodeBlockBeforeSub subs)? fileCodeBlock EOF;
+
+// moduleAnnotations
+preproc_native   : HASH PREPROC_NATIVE;
+usedLib          : (PREPROC_STRING | PREPROC_IDENTIFIER);
+use              : HASH PREPROC_USE_KEYWORD usedLib;
+
+moduleAnnotations
+    :
+     (preproc_native use*)
+     | (use+ preproc_native? use*)
+    ;
 
 // preprocessor
 shebang          : HASH PREPROC_EXCLAMATION_MARK (PREPROC_ANY | PREPROC_IDENTIFIER)*;
 
-usedLib          : (PREPROC_STRING | PREPROC_IDENTIFIER);
-use              : PREPROC_USE_KEYWORD usedLib;
-
 regionStart      : PREPROC_REGION regionName;
 regionEnd        : PREPROC_END_REGION;
 regionName       : PREPROC_IDENTIFIER;
@@ -91,7 +99,6 @@ preprocessor
         | preproc_elsif
         | preproc_else
         | preproc_endif
-        | use
       )
     ;
 

diff --git a/src/main/antlr/SDBLParser.g4 b/src/main/antlr/SDBLParser.g4
@@ -225,9 +225,9 @@ builtInFunctions:
     | (doCall=(YEAR | QUARTER | MONTH | DAYOFYEAR | DAY | WEEK | WEEKDAY | HOUR | MINUTE | SECOND) LPAREN date=expression RPAREN)
     | (doCall=(BEGINOFPERIOD | ENDOFPERIOD) LPAREN date=expression COMMA periodType=(MINUTE | HOUR | DAY | WEEK | MONTH | QUARTER | YEAR | TENDAYS | HALFYEAR) RPAREN)
     | (doCall=DATEADD LPAREN date=expression COMMA periodType=(SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | QUARTER | YEAR | TENDAYS | HALFYEAR) COMMA count=expression RPAREN)
-    | (doCall=DATEDIFF LPAREN first=expression COMMA second=expression COMMA periodType=(SECOND | MINUTE | HOUR | DAY | MONTH | QUARTER | YEAR) RPAREN)
+    | (doCall=DATEDIFF LPAREN firstdate=expression COMMA seconddate=expression COMMA periodType=(SECOND | MINUTE | HOUR | DAY | MONTH | QUARTER | YEAR) RPAREN)
     | (doCall=(VALUETYPE | PRESENTATION | REFPRESENTATION | GROUPEDBY) LPAREN value=expression RPAREN)
-    | (doCall=ISNULL LPAREN first=expression COMMA second=expression RPAREN)
+    | (doCall=ISNULL LPAREN first=logicalExpression COMMA second=logicalExpression RPAREN)
 ;
 
 // агрегатные ф-ии

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionTokenizer.java b/src/main/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionTokenizer.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/BSLParserRuleContext.java b/src/main/java/com/github/_1c_syntax/bsl/parser/BSLParserRuleContext.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/BSLTokenizer.java b/src/main/java/com/github/_1c_syntax/bsl/parser/BSLTokenizer.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/CRAwareLexerATNSimulator.java b/src/main/java/com/github/_1c_syntax/bsl/parser/CRAwareLexerATNSimulator.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/CaseChangingCharStream.java b/src/main/java/com/github/_1c_syntax/bsl/parser/CaseChangingCharStream.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/SDBLTokenizer.java b/src/main/java/com/github/_1c_syntax/bsl/parser/SDBLTokenizer.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/Tokenizer.java b/src/main/java/com/github/_1c_syntax/bsl/parser/Tokenizer.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/UnicodeBOMInputStream.java b/src/main/java/com/github/_1c_syntax/bsl/parser/UnicodeBOMInputStream.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/BSLDescriptionReader.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/BSLDescriptionReader.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/MethodDescription.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/MethodDescription.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/...ain/java/com/github/_1c_syntax/bsl/parser/description/SourceDefinedSymbolDescription.java b/...ain/java/com/github/_1c_syntax/bsl/parser/description/SourceDefinedSymbolDescription.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/VariableDescription.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/VariableDescription.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/package-info.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/package-info.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/DescriptionReader.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/DescriptionReader.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/ParameterDescription.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/ParameterDescription.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/SimpleRange.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/SimpleRange.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/TypeDescription.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/TypeDescription.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/package-info.java b/src/main/java/com/github/_1c_syntax/bsl/parser/description/support/package-info.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/AbstractLexerTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/AbstractLexerTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/AbstractParserTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/AbstractParserTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLLexerTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLLexerTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
@@ -593,7 +593,8 @@ void checkAsyncModeMapping() {
         || BSLLexer.PREPROC_ANY == i
         || BSLLexer.ANNOTATION_UNKNOWN == i
         || BSLLexer.PREPROC_DELETE_ANY == i
-        || BSLLexer.UNKNOWN == i) {
+        || BSLLexer.UNKNOWN == i
+        || BSLLexer.PREPROC_NATIVE == i) {
         assertThat(tokenTypes).doesNotContain(i);
       } else {
         assertThat(tokenTypes).contains(i);

diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionLexerTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionLexerTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

diff --git a/src/test/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionParserTest.java b/src/test/java/com/github/_1c_syntax/bsl/parser/BSLMethodDescriptionParserTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of BSL Parser.
  *
- * Copyright (c) 2018-2022
+ * Copyright (c) 2018-2023
  * Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>, Sergey Batanov <[email protected]>
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later