Merge branch 'release/v1.5.0'

EvilBeaver · Dec 8, 2020 · 9673f28 · 9673f28
2 parents 7cc7963 + e1a9e1e
commit 9673f28
Show file tree

Hide file tree

Showing 81 changed files with 5,921 additions and 482 deletions.
diff --git a/Build.csproj b/Build.csproj
@@ -33,9 +33,8 @@
 
         <MSBuild Projects="$(Solution)" Targets="Clean" Properties="ReleaseNumber=$(ReleaseNumber);Configuration=$(Configuration);Platform=%(PlatformItem.MSBuildName)"/>
 
-    </Target>
-
-    <Target Name="Make">
+    </Target>  
+        <Target Name="Make">
         <MSBuild Projects="$(Solution)" Targets="restore;Build" Properties="ReleaseNumber=$(ReleaseNumber);Configuration=$(Configuration);Platform=%(PlatformItem.MSBuildName);"/>
     </Target>
 
@@ -84,7 +83,17 @@
             </BinaryFiles>
             <AspFiles Include="$(MSBuildProjectDirectory)/src/ASPNETHandler/bin/$(Configuration)/net452/ASPNETHandler.dll"/>
         </ItemGroup>
-
+
+        <ItemGroup>
+            <BuiltProjects Include="ScriptEngine.NativeApi" />
+            <BinaryFiles Include="$(MSBuildProjectDirectory)/src/%(BuiltProjects.Identity)/bin/$(Configuration)/net452/*.dll">
+                <Dest>$(TempFolder)/bin</Dest>
+            </BinaryFiles>
+            <BinaryFiles Include="$(MSBuildProjectDirectory)/src/%(BuiltProjects.Identity)/bin/x86/$(Configuration)/net452/*.dll">
+                <Dest>$(TempFolder)/bin32</Dest>
+            </BinaryFiles>
+        </ItemGroup>
+
         <Copy SourceFiles="@(BinaryFiles)" DestinationFiles="@(BinaryFiles->'%(Dest)/%(Filename)%(Extension)')" />
         <Copy SourceFiles="@(AspFiles)" DestinationFolder="%(BinaryFiles.Dest)"/>
         <!-- Копирование скрипта запуска для opm -->
@@ -238,4 +247,4 @@
 
     </Target>
 
-</Project>
+</Project>
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,7 +4,7 @@ pipeline {
     agent none
 
     environment {
-        ReleaseNumber = '1.4.0'
+        ReleaseNumber = '1.5.0'
         outputEnc = '65001'
     }
 

diff --git a/install/install.iss b/install/install.iss
@@ -58,6 +58,7 @@ Name: "docs"; Description: "Документация по свойствам и
 [Files]              
 Source: "{#ArtifactRoot}\{#Binaries}\oscript.exe"; DestDir: "{app}\bin"; Components: main
 Source: "{#ArtifactRoot}\{#Binaries}\ScriptEngine.HostedScript.dll"; DestDir: "{app}\bin"; Components: main
+Source: "{#ArtifactRoot}\{#Binaries}\ScriptEngine.NativeApi.dll"; DestDir: "{app}\bin"; Components: main
 Source: "{#ArtifactRoot}\{#Binaries}\ScriptEngine.dll"; DestDir: "{app}\bin"; Components: main
 Source: "{#ArtifactRoot}\{#Binaries}\OneScript.DebugProtocol.dll"; DestDir: "{app}\bin"; Components: main
 Source: "{#ArtifactRoot}\{#Binaries}\OneScript.DebugServices.dll"; DestDir: "{app}\bin"; Components: main
@@ -200,4 +201,4 @@ begin
     end;
     
     result := true;
-end;
+end;
diff --git a/src/1Script.sln b/src/1Script.sln
diff --git a/src/OneScript.Language.Tests/LexerTests.cs b/src/OneScript.Language.Tests/LexerTests.cs
@@ -279,7 +279,8 @@ public void Word_Literals_Processed_Correctly()
         [Fact]
         public void Preprocessor_Lexem_ProcessedCorrectly()
         {
-            string code = "#Если #КонецЕсли";
+            string code = @"#Если
+                #КонецЕсли";
 
             var iterator = new SourceCodeIterator(code);
             var wordParser = new PreprocessorDirectiveLexerState();

diff --git a/src/OneScript.Language.Tests/PreprocessorTests.cs b/src/OneScript.Language.Tests/PreprocessorTests.cs
@@ -316,6 +316,285 @@ public void PriorityOperators_WithParenthesis()
 
             Assert.Equal(Token.EndOfText, lex.Token);
         }
+
+        [Fact]
+        public void ParsingFirstNot()
+        {
+            var pp = new PreprocessingLexer();
+            pp.Define("Да");
+
+            var code = @"
+            #Если Не Да Тогда
+                F;
+            #КонецЕсли";
+
+            pp.Code = code;
+
+            var lex = pp.NextLexem();
+
+            Assert.Equal(Token.EndOfText, lex.Token);
+        }
+
+        [Fact]
+        public void PreprocessingLexer_Unclosed_ElseBlock()
+        {
+            var pp = new PreprocessingLexer();
+            pp.Define("Да");
+
+            var code = @"
+            #Если Да и Не Да Тогда
+                F;
+            #Иначе
+                G;
+            ";
+
+            pp.Code = code;
+
+            Assert.Throws<SyntaxErrorException>(() => {while (pp.NextLexem().Token != Token.EndOfText);});
+        }
+
+        [Fact]
+        public void PreprocessingLexer_Endif_Without_If()
+        {
+            var pp = new PreprocessingLexer();
+            pp.Define("Да");
+
+            var code = @"
+            #КонецЕсли
+                H;
+            ";
+
+            pp.Code = code;
+
+            Assert.Throws<SyntaxErrorException>(() => pp.NextLexem());
+        }
+
+        [Fact]
+        public void PreprocessingLexer_Extra_Endif()
+        {
+            var pp = new PreprocessingLexer();
+            pp.Define("Да");
+
+            var code = @"
+            #Если Да Тогда
+                F;
+            #КонецЕсли
+            #КонецЕсли
+            ";
+
+            pp.Code = code;
+
+            Assert.Throws<SyntaxErrorException>(() => {while (pp.NextLexem().Token != Token.EndOfText);});
+        }
+
+        [Fact]
+        public void PreprocessingLexer_SimpleRegion()
+        {
+            var pp = new PreprocessingLexer();
+
+            var code = @"
+            #Область reg1
+            
+            #КонецОбласти
+            F";
+
+            pp.Code = code;
+            var lex = pp.NextLexem();
+            Assert.Equal("F", lex.Content);
+        }
+
+        [Fact]
+        public void PreprocessingLexer_MultipleNestedRegions()
+        {
+            var pp = new PreprocessingLexer();
+
+            var code = @"
+            #Region reg1
+            #Область reg2
+            
+            #Область if // keywords are ok
+            
+            #endRegion
+            #КонецОбласти // reg 1
+            
+            #endRegion
+            # Область  reg1 // same name is ok
+
+            #КонецОбласти
+            F";
+
+            pp.Code = code;
+            var lex = pp.NextLexem();
+            Assert.Equal("F", lex.Content);
+        }
+
+
+        [Fact]
+        public void PreprocessingLexer_NoEndRegion()
+        {
+            var pp = new PreprocessingLexer();
+
+            var code = @"
+            #Область reg1
+            #Область reg2
+            #КонецОбласти
+            F";
+
+            pp.Code = code;
+            Assert.Throws<SyntaxErrorException>(() => { while (pp.NextLexem().Token != Token.EndOfText) ; });
+        }
+
+        [Fact]
+        public void PreprocessingLexer_ExtraEndRegion()
+        {
+            var pp = new PreprocessingLexer();
+
+            var code = @"
+            #Область reg1
+            #КонецОбласти
+            #КонецОбласти
+            F";
+
+            pp.Code = code;
+            Assert.Throws<SyntaxErrorException>(() => pp.NextLexem());
+        }
+
+        [Fact]
+        public void PreprocessingLexer_BadRegionName()
+        {
+            var pp = new PreprocessingLexer();
+
+            var code = @"
+            #Область -reg
+            #КонецОбласти
+            F";
+
+            pp.Code = code;
+            Assert.Throws<SyntaxErrorException>(() => pp.NextLexem());
+        }
+
+        [Fact]
+        public void PreprocessingLexer_NoRegionName()
+        {
+            var pp = new PreprocessingLexer();
+
+            var code = @"
+            #Область
+            #КонецОбласти
+            F";
+
+            pp.Code = code;
+            Assert.Throws<SyntaxErrorException>(() => pp.NextLexem());
+        }
+
+        [Fact]
+        public void PreprocessingLexer_NoRegionNameWithComment()
+        {
+            var pp = new PreprocessingLexer();
+
+            var code = @"
+            #Область // no name
+            #КонецОбласти
+            F";
+
+            pp.Code = code;
+            Assert.Throws<SyntaxErrorException>(() => pp.NextLexem());
+        }
+
+        [Fact]
+        public void PreprocessingLexer_SymbolsAfterName()
+        {
+            var pp = new PreprocessingLexer();
+
+            var code = @"
+            #Область reg 00
+            #КонецОбласти
+            F";
+
+            pp.Code = code;
+            Assert.Throws<SyntaxErrorException>(() => pp.NextLexem());
+        }
+
+        [Fact]
+        public void PreprocessingLexer_SymbolsAfterEndRegion()
+        {
+            var pp = new PreprocessingLexer();
+
+            var code = @"
+            #Область reg
+            #КонецОбласти reg
+            F";
+
+            pp.Code = code;
+            Assert.Throws<SyntaxErrorException>(() => pp.NextLexem());
+        }
+
+        [Fact]
+        public void PreprocessingLexer_DirectiveAfterLineBreak()
+        {
+            var pp = new PreprocessingLexer();
+
+            var code = @"
+            #Область reg
+            #
+
+            КонецОбласти
+            F";
+
+            pp.Code = code;
+            Assert.Throws<SyntaxErrorException>(() => { while (pp.NextLexem().Token != Token.EndOfText) ; });
+        }
+
+        [Fact]
+        public void PreprocessingLexer_DirectiveNotOnNewLine()
+        {
+            var pp = new PreprocessingLexer();
+
+            var code = @"
+            #Область reg
+            F; #КонецОбласти
+            ";
+
+            pp.Code = code;
+            Assert.Throws<SyntaxErrorException>(() => { while (pp.NextLexem().Token != Token.EndOfText) ; });
+        }
+
+        [Fact]
+        public void PreprocessingLexer_DirectiveNotOnSingleLine()
+        {
+            var pp = new PreprocessingLexer();
+
+            var code = @"
+            #Если Нет
+            Тогда
+            F;
+            #КонецОбласти
+            ";
+
+            pp.Code = code;
+            Assert.Throws<SyntaxErrorException>(() => { while (pp.NextLexem().Token != Token.EndOfText) ; });
+        }
+
+        [Fact]
+        public void PreprocessingLexer_ExcludedLines()
+        {
+            var pp = new PreprocessingLexer();
+            pp.Define("Да");
+
+            var code = @"
+            #Если Да Тогда
+            F;
+            #Иначе
+            !!
+            #КонецЕсли
+            ";
+
+            pp.Code = code;
+
+            Lexem lex;
+            do { lex = pp.NextLexem(); } while (pp.NextLexem().Token != Token.EndOfText);
+            Assert.Equal(Token.EndOfText, lex.Token);
+        }
 
         private string GetPreprocessedContent(PreprocessingLexer pp, string code)
         {

diff --git a/src/OneScript.Language/CodePositionInfo.cs b/src/OneScript.Language/CodePositionInfo.cs
@@ -9,17 +9,18 @@ namespace OneScript.Language
 {
     public class CodePositionInfo
     {
+        public const int OUT_OF_TEXT = -1;
+
         public CodePositionInfo()
         {
-            LineNumber = -1;
-            ColumnNumber = -1;
+            LineNumber = OUT_OF_TEXT;
+            ColumnNumber = OUT_OF_TEXT;
         }
 
         public int LineNumber { get; set; }
         public int ColumnNumber { get; set; }
         public string Code { get; set; }
         public string ModuleName { get; set; }
 
-        public const int OUT_OF_TEXT = -1;
     }
 }