diff --git a/.gitignore b/.gitignore index ef0c3988..c22c2796 100644 --- a/.gitignore +++ b/.gitignore @@ -208,3 +208,4 @@ FakesAssemblies/ # ANTLR Generated files **/Generated/* +launchSettings.json diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 61933c45..00000000 --- a/.travis.yml +++ /dev/null @@ -1,11 +0,0 @@ -language: csharp -solution: Sources/PT.PM.Gui.sln -install: - - mono nuget.exe sources add -Name Avalonia -Source https://www.myget.org/F/avalonia-ci/api/v2 - - mono nuget.exe restore Sources/PT.PM.sln - - sudo apt-get install graphviz - - sudo apt-get install p7zip-full -script: - - sudo xbuild /p:Configuration=Release Sources/PT.PM.sln /p:TargetFrameworkVersion="v4.6.2" - - cd Tests/Unit/bin/Release - - sudo mono ../../../../Sources/packages/NUnit.ConsoleRunner.3.6.1/tools/nunit3-console.exe *.Tests.dll \ No newline at end of file diff --git a/PT.PM.Cli.nuspec b/PT.PM.Cli.nuspec deleted file mode 100644 index b3a30d99..00000000 --- a/PT.PM.Cli.nuspec +++ /dev/null @@ -1,25 +0,0 @@ - - - - PT.PM.Cli - 1.5.3 - An engine with CLI for searching patterns in the source code, based on Unified AST or UST. At present time C#, Java, PHP, PL/SQL, T-SQL, and JavaScript are supported. Patterns can be described within the code or using a DSL. - Positive Technologies - - ptsecurity,KvanTTT - PT Pattern Matching Engine Command Line Interface - https://github.com/PositiveTechnologies/PT.PM/blob/master/LICENSE.md - https://www.ptsecurity.com/ww-en/products/ai/ - https://github.com/PositiveTechnologies/PT.PM/blob/master/PT.PM.png?raw=true - true - Copyright 2015-2017 - csharp java php plsql tsql javascript parsing conversion ast parse-trees pattern-matching pattern unified antlr4 roslyn dsl - - - - - - - - - \ No newline at end of file diff --git a/PT.PM.nuspec b/PT.PM.nuspec deleted file mode 100644 index e3c6450e..00000000 --- a/PT.PM.nuspec +++ /dev/null @@ -1,31 +0,0 @@ - - - - PT.PM - 1.5.3 - An engine for searching patterns in the source code, based on Unified AST or UST. At present time C#, Java, PHP, PL/SQL, T-SQL, and JavaScript are supported. Patterns can be described within the code or using a DSL. - Positive Technologies - - ptsecurity,KvanTTT - PT Pattern Matching Engine - https://github.com/PositiveTechnologies/PT.PM/blob/master/LICENSE.md - https://www.ptsecurity.com/ww-en/products/ai/ - https://github.com/PositiveTechnologies/PT.PM/blob/master/PT.PM.png?raw=true - true - Copyright 2015-2017 - csharp java php plsql tsql javascript parsing conversion ast parse-trees pattern-matching pattern unified antlr4 roslyn dsl - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index 8bf45bdc..178de669 100644 --- a/README.md +++ b/README.md @@ -6,19 +6,15 @@ UST). At present time C\#, Java, PHP, PL/SQL, T-SQL, and JavaScript are supported. Patterns can be described within the code or using a domain-specific language (DSL). -| Windows Build Status | Linux Build Status | -|---|---| -| [![Windows Build Status](https://ci.appveyor.com/api/projects/status/vo0acpvek4q1x8yh?svg=true)](https://ci.appveyor.com/project/KvanTTT/pt-pm) | [![Linux/Mac Build Status](https://api.travis-ci.org/PositiveTechnologies/PT.PM.svg?branch=master)](https://travis-ci.org/PositiveTechnologies/PT.PM) | +## Build Status (Windows & Linux) -## NuGet and Artifacts +[![Windows & Linux Build Status](https://ci.appveyor.com/api/projects/status/vo0acpvek4q1x8yh?svg=true)](https://ci.appveyor.com/project/KvanTTT/pt-pm) -The last nightly packages can be found here: [https://ci.appveyor.com/nuget/pt-pm-mk0aj1y5uned](https://ci.appveyor.com/nuget/pt-pm-mk0aj1y5uned). See an article [Using nightly build feed](https://github.com/AvaloniaUI/Avalonia/wiki/Using-nightly-build-feed) for custom package source adding. - -Artifacts also available: [https://ci.appveyor.com/project/KvanTTT/pt-pm/build/artifacts](https://ci.appveyor.com/project/KvanTTT/pt-pm/build/artifacts). +Artifacts are also available. ## Documentation -See a [wiki section](https://github.com/PositiveTechnologies/PT.PM/wiki) and articles at [PT.Doc](https://github.com/PositiveTechnologies/PT.Doc). +See a [Wiki Section](https://github.com/PositiveTechnologies/PT.PM/wiki) and articles at [PT.Doc](https://github.com/PositiveTechnologies/PT.Doc). ## License diff --git a/Sources/AspxParser b/Sources/AspxParser index 0d80e714..d49846e4 160000 --- a/Sources/AspxParser +++ b/Sources/AspxParser @@ -1 +1 @@ -Subproject commit 0d80e7141c8768c240ac10425ad1ba4eae16802a +Subproject commit d49846e4836d7719b239e59a3058a0c830cd2a9c diff --git a/Sources/AssemblyInfoCommon.cs b/Sources/AssemblyInfoCommon.cs index 79929cf4..83b2d89e 100644 --- a/Sources/AssemblyInfoCommon.cs +++ b/Sources/AssemblyInfoCommon.cs @@ -1,25 +1,10 @@ using System; using System.Reflection; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. [assembly: AssemblyCompany("Positive Technologies")] [assembly: AssemblyProduct("PT.PM")] -[assembly: AssemblyCopyright("Copyright © Positive Technologies 2015-2017")] +[assembly: AssemblyCopyright("Copyright © Positive Technologies 2015-2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: CLSCompliant(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] -// [assembly: AssemblyFileVersion("1.0.5.*")] diff --git a/Sources/PT.PM.AntlrUtils/PT.PM.AntlrUtils.csproj b/Sources/PT.PM.AntlrUtils/PT.PM.AntlrUtils.csproj index 341aa806..10fc2f9a 100644 --- a/Sources/PT.PM.AntlrUtils/PT.PM.AntlrUtils.csproj +++ b/Sources/PT.PM.AntlrUtils/PT.PM.AntlrUtils.csproj @@ -1,75 +1,23 @@ - - - + + - Debug - AnyCPU - {2B5519C9-4566-4743-A14A-66234299CDB8} - Library - Properties - PT.PM.AntlrUtils - PT.PM.AntlrUtils - v4.6.2 - 512 + netstandard2.0 + false - - true - full - false + + ..\..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - - pdbonly - true + + ..\..\bin\Release\ - TRACE - prompt - 4 + - - $(SolutionDir)packages\Antlr4.Runtime.4.6.3\lib\net45\Antlr4.Runtime.dll - - - - - - - - + + + + - - - - - - - - - - - - Properties\AssemblyInfoCommon.cs - - - - - {0b10dbae-c18d-4007-b799-0b3b1e00376e} - PT.PM.Common - - - - - - - - \ No newline at end of file + + diff --git a/Sources/PT.PM.AntlrUtils/Properties/AssemblyInfo.cs b/Sources/PT.PM.AntlrUtils/Properties/AssemblyInfo.cs deleted file mode 100644 index 2473bf81..00000000 --- a/Sources/PT.PM.AntlrUtils/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PT.PM.AntlrUtils")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d8e6ed56-f381-4a4e-837e-8aa3c9e8c9c2")] \ No newline at end of file diff --git a/Sources/PT.PM.AntlrUtils/packages.config b/Sources/PT.PM.AntlrUtils/packages.config deleted file mode 100644 index 7386c269..00000000 --- a/Sources/PT.PM.AntlrUtils/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Sources/PT.PM.CSharpParseTreeUst.Tests/CSharpConverterTests.cs b/Sources/PT.PM.CSharpParseTreeUst.Tests/CSharpConverterTests.cs index 4209b74a..2abf803b 100644 --- a/Sources/PT.PM.CSharpParseTreeUst.Tests/CSharpConverterTests.cs +++ b/Sources/PT.PM.CSharpParseTreeUst.Tests/CSharpConverterTests.cs @@ -4,6 +4,7 @@ using NUnit.Framework; using PT.PM.Common.Nodes.GeneralScope; using System.IO; +using System; namespace PT.PM.CSharpParseTreeUst.Tests { @@ -25,7 +26,7 @@ public void Convert_CSharp_BaseTypesExist() bool result = ust.AnyDescendant(descendant => { return descendant is TypeDeclaration typeDeclaration && - typeDeclaration.BaseTypes.Any(type => type.TypeText == "IDisposable"); + typeDeclaration.BaseTypes.Any(type => type.TypeText == nameof(IDisposable)); }); Assert.IsTrue(result, "Ust doesn't contain type declaration node with IDisposable base type"); } diff --git a/Sources/PT.PM.CSharpParseTreeUst.Tests/CSharpParserTests.cs b/Sources/PT.PM.CSharpParseTreeUst.Tests/CSharpParserTests.cs index 112a14b3..ed9531a0 100644 --- a/Sources/PT.PM.CSharpParseTreeUst.Tests/CSharpParserTests.cs +++ b/Sources/PT.PM.CSharpParseTreeUst.Tests/CSharpParserTests.cs @@ -8,6 +8,7 @@ namespace PT.PM.CSharpParseTreeUst.Tests [TestFixture] public class CSharpParserTests { + [Test] public void Parse_CSharpWithRoslyn() { TestUtility.CheckFile(Path.Combine(TestUtility.GrammarsDirectory, "csharp", "not-ready-examples", "AllInOne.cs"), diff --git a/Sources/PT.PM.CSharpParseTreeUst.Tests/PT.PM.CSharpParseTreeUst.Tests.csproj b/Sources/PT.PM.CSharpParseTreeUst.Tests/PT.PM.CSharpParseTreeUst.Tests.csproj index c1f06c4d..d110ff0f 100644 --- a/Sources/PT.PM.CSharpParseTreeUst.Tests/PT.PM.CSharpParseTreeUst.Tests.csproj +++ b/Sources/PT.PM.CSharpParseTreeUst.Tests/PT.PM.CSharpParseTreeUst.Tests.csproj @@ -1,204 +1,50 @@ - - - + + - Debug - AnyCPU - {E3DB8014-0BFB-4399-9B49-A8BE446C5049} - Library - Properties - PT.PM.CSharpParseTreeUst.Tests - PT.PM.CSharpParseTreeUst.Tests - v4.6.2 - 512 + netcoreapp2.0 - - true - full - false - ..\..\Tests\Unit\bin\Debug\ - DEBUG;TRACE - prompt - 4 + + + ..\..\Tests\Debug\ - - pdbonly - true - ..\..\Tests\Unit\bin\Release\ - TRACE - prompt - 4 + + + ..\..\Tests\Release\ + - - $(SolutionDir)packages\Microsoft.CodeAnalysis.Common.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll - - - $(SolutionDir)packages\Microsoft.CodeAnalysis.CSharp.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll - - - $(SolutionDir)packages\NUnit.3.7.1\lib\net45\nunit.framework.dll - - - - $(SolutionDir)packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll - - - $(SolutionDir)packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - - $(SolutionDir)packages\System.Console.4.3.0\lib\net46\System.Console.dll - - - - $(SolutionDir)packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll - - - $(SolutionDir)packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll - - - $(SolutionDir)packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - - - $(SolutionDir)packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll - - - $(SolutionDir)packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - - - - $(SolutionDir)packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll - - - $(SolutionDir)packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll - - - $(SolutionDir)packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll - - - $(SolutionDir)packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll - - - $(SolutionDir)packages\System.Runtime.InteropServices.4.3.0\lib\net462\System.Runtime.InteropServices.dll - - - $(SolutionDir)packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll - - - $(SolutionDir)packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - - - $(SolutionDir)packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - - - $(SolutionDir)packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - - - $(SolutionDir)packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll - - - $(SolutionDir)packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll - - - $(SolutionDir)packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll - - - - - $(SolutionDir)packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll - - - $(SolutionDir)packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll - - - $(SolutionDir)packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll - - - $(SolutionDir)packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll - + + + - - Data\AllInOne.cs - - - - - - PreserveNewest - ASPXCodeBehind - - - ASPXCodeBehind + PreserveNewest - - + PreserveNewest PreserveNewest - ASPXCodeBehind PreserveNewest PreserveNewest - - - Properties\AssemblyInfoCommon.cs - - - - - {9215df23-07be-49aa-90a0-ed1c542c388c} - PT.PM.Matching - - - {2a6f7ac9-92aa-48b8-a53b-50770424c9b6} - PT.PM.Patterns - - - {FEC55A64-1B65-4D39-B5FA-D559D55BB190} - PT.PM.TestUtils - - - {0b10dbae-c18d-4007-b799-0b3b1e00376e} - PT.PM.Common - - - {3b09e6ec-8069-4ed3-aad8-145953fd7dca} - PT.PM.CSharpParseTreeUst - - - {ecb44673-2fb0-49e1-811f-973e3fa4dd22} - PT.PM - - - {88AF3957-A64A-4715-ADE5-3BE099034BDD} - AspxParser - - - - + + PreserveNewest + + - + + + - - + + - - \ No newline at end of file diff --git a/Sources/PT.PM.CSharpParseTreeUst.Tests/Properties/AssemblyInfo.cs b/Sources/PT.PM.CSharpParseTreeUst.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 0f70fb69..00000000 --- a/Sources/PT.PM.CSharpParseTreeUst.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PT.PM.CSharpParseTreeUst.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("13de65b5-e6df-4353-8e5c-9eff0ed32cdf")] \ No newline at end of file diff --git a/Sources/PT.PM.CSharpParseTreeUst.Tests/app.config b/Sources/PT.PM.CSharpParseTreeUst.Tests/app.config deleted file mode 100644 index 7bf8b265..00000000 --- a/Sources/PT.PM.CSharpParseTreeUst.Tests/app.config +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.CSharpParseTreeUst.Tests/packages.config b/Sources/PT.PM.CSharpParseTreeUst.Tests/packages.config deleted file mode 100644 index 884a3ac1..00000000 --- a/Sources/PT.PM.CSharpParseTreeUst.Tests/packages.config +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.CSharpParseTreeUst/PT.PM.CSharpParseTreeUst.csproj b/Sources/PT.PM.CSharpParseTreeUst/PT.PM.CSharpParseTreeUst.csproj index 9af1a451..2068a32d 100644 --- a/Sources/PT.PM.CSharpParseTreeUst/PT.PM.CSharpParseTreeUst.csproj +++ b/Sources/PT.PM.CSharpParseTreeUst/PT.PM.CSharpParseTreeUst.csproj @@ -1,172 +1,23 @@ - - - + + - Debug - AnyCPU - {3B09E6EC-8069-4ED3-AAD8-145953FD7DCA} - Library - Properties - PT.PM.CSharpParseTreeUst - PT.PM.CSharpParseTreeUst - v4.6.2 - 512 + netstandard2.0 + false - - true - full - false - ..\..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\..\bin\Release\ - TRACE - prompt - 4 - - - - $(SolutionDir)packages\Microsoft.CodeAnalysis.Common.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.dll - - - $(SolutionDir)packages\Microsoft.CodeAnalysis.CSharp.2.4.0\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll - - - - $(SolutionDir)packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll - - - $(SolutionDir)packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - True - - - - $(SolutionDir)packages\System.Console.4.3.0\lib\net46\System.Console.dll - - - - $(SolutionDir)packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll - - - $(SolutionDir)packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll - - - $(SolutionDir)packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - - - $(SolutionDir)packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll - - - $(SolutionDir)packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - - - - $(SolutionDir)packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll - - - $(SolutionDir)packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll - - - $(SolutionDir)packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll - - - $(SolutionDir)packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll - - - $(SolutionDir)packages\System.Runtime.InteropServices.4.3.0\lib\net462\System.Runtime.InteropServices.dll - - - $(SolutionDir)packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll - - - $(SolutionDir)packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - - - $(SolutionDir)packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - - - $(SolutionDir)packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - - - $(SolutionDir)packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll - - - $(SolutionDir)packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll - - - $(SolutionDir)packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll - - - - - - - - $(SolutionDir)packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll - - - $(SolutionDir)packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll - - - $(SolutionDir)packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll - - - $(SolutionDir)packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll - - - - - - - - - - - - - Properties\AssemblyInfoCommon.cs - - - - - - - - - - - + - - {0b10dbae-c18d-4007-b799-0b3b1e00376e} - PT.PM.Common - - - {88af3957-a64a-4715-ade5-3be099034bdd} - AspxParser - + + - - - Designer - + + + + - - + + - - + \ No newline at end of file diff --git a/Sources/PT.PM.CSharpParseTreeUst/Properties/AssemblyInfo.cs b/Sources/PT.PM.CSharpParseTreeUst/Properties/AssemblyInfo.cs deleted file mode 100644 index fdb54380..00000000 --- a/Sources/PT.PM.CSharpParseTreeUst/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PT.PM.CSharpParseTreeUst")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("5fc84a5a-2f63-407c-a3be-12e68e79912b")] \ No newline at end of file diff --git a/Sources/PT.PM.CSharpParseTreeUst/app.config b/Sources/PT.PM.CSharpParseTreeUst/app.config deleted file mode 100644 index dd831742..00000000 --- a/Sources/PT.PM.CSharpParseTreeUst/app.config +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.CSharpParseTreeUst/packages.config b/Sources/PT.PM.CSharpParseTreeUst/packages.config deleted file mode 100644 index 75357cef..00000000 --- a/Sources/PT.PM.CSharpParseTreeUst/packages.config +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.Cli/CliParameters.cs b/Sources/PT.PM.Cli.Common/CliParameters.cs similarity index 100% rename from Sources/PT.PM.Cli/CliParameters.cs rename to Sources/PT.PM.Cli.Common/CliParameters.cs diff --git a/Sources/PT.PM.Cli/CliProcessor.cs b/Sources/PT.PM.Cli.Common/CliProcessor.cs similarity index 100% rename from Sources/PT.PM.Cli/CliProcessor.cs rename to Sources/PT.PM.Cli.Common/CliProcessor.cs diff --git a/Sources/PT.PM.Cli/CliProcessorBase.cs b/Sources/PT.PM.Cli.Common/CliProcessorBase.cs similarity index 100% rename from Sources/PT.PM.Cli/CliProcessorBase.cs rename to Sources/PT.PM.Cli.Common/CliProcessorBase.cs diff --git a/Sources/PT.PM.Cli/ConsoleFileLogger.cs b/Sources/PT.PM.Cli.Common/ConsoleFileLogger.cs similarity index 100% rename from Sources/PT.PM.Cli/ConsoleFileLogger.cs rename to Sources/PT.PM.Cli.Common/ConsoleFileLogger.cs diff --git a/Sources/PT.PM.Cli/FileLogger.cs b/Sources/PT.PM.Cli.Common/FileLogger.cs similarity index 100% rename from Sources/PT.PM.Cli/FileLogger.cs rename to Sources/PT.PM.Cli.Common/FileLogger.cs diff --git a/Sources/PT.PM.Cli/NLog.config b/Sources/PT.PM.Cli.Common/NLog.config similarity index 51% rename from Sources/PT.PM.Cli/NLog.config rename to Sources/PT.PM.Cli.Common/NLog.config index b72bb24e..581b90ba 100644 --- a/Sources/PT.PM.Cli/NLog.config +++ b/Sources/PT.PM.Cli.Common/NLog.config @@ -1,9 +1,9 @@ - + - - - + + + diff --git a/Sources/PT.PM.Cli.Common/PT.PM.Cli.Common.csproj b/Sources/PT.PM.Cli.Common/PT.PM.Cli.Common.csproj new file mode 100644 index 00000000..eada5341 --- /dev/null +++ b/Sources/PT.PM.Cli.Common/PT.PM.Cli.Common.csproj @@ -0,0 +1,30 @@ + + + + netstandard2.0 + false + + + + ..\..\bin\Debug\ + + + + ..\..\bin\Release\ + + + + + + + + + + + + + PreserveNewest + + + + diff --git a/Sources/PT.PM.Cli/WorkflowLoggerHelper.cs b/Sources/PT.PM.Cli.Common/WorkflowLoggerHelper.cs similarity index 100% rename from Sources/PT.PM.Cli/WorkflowLoggerHelper.cs rename to Sources/PT.PM.Cli.Common/WorkflowLoggerHelper.cs diff --git a/Sources/PT.PM.Cli/WorkflowLoggerHelperBase.cs b/Sources/PT.PM.Cli.Common/WorkflowLoggerHelperBase.cs similarity index 100% rename from Sources/PT.PM.Cli/WorkflowLoggerHelperBase.cs rename to Sources/PT.PM.Cli.Common/WorkflowLoggerHelperBase.cs diff --git a/Sources/PT.PM.Cli.Tests/CliTests.cs b/Sources/PT.PM.Cli.Tests/CliTests.cs index 26776063..8634b867 100644 --- a/Sources/PT.PM.Cli.Tests/CliTests.cs +++ b/Sources/PT.PM.Cli.Tests/CliTests.cs @@ -13,19 +13,13 @@ namespace PT.PM.Cli.Tests [TestFixture] public class CliTests { - private readonly static string exeName = Path.Combine(TestUtility.TestsPath, "PT.PM.Cli.exe"); private readonly static string patternsFileName = Path.Combine(TestUtility.TestsOutputPath, "patterns.json"); [Test] public void CheckCli_Patterns_CorrectErrorMessages() { - if (CommonUtils.IsRunningOnLinux) - { - Assert.Ignore("TODO: fix failed Cli unit-test on mono (Linux)"); - } - PrepareAndSaveTestPatterns(); - var result = ProcessUtils.SetupHiddenProcessAndStart(exeName, $"--stage {Stage.Pattern} --patterns {patternsFileName} --log-errors"); + var result = ProcessUtils.SetupHiddenProcessAndStart("dotnet", $"{TestUtility.PtPmExePath} --stage {Stage.Pattern} --patterns {patternsFileName} --log-errors"); Assert.AreEqual($"Pattern ParsingException in \"Pattern\": token recognition error at: '>' at {new LineColumnTextSpan(1, 19, 1, 20)}.", result.Output[2]); Assert.AreEqual($"Pattern ParsingException in \"Pattern\": no viable alternative at input '(?' at {new LineColumnTextSpan(1, 2, 1, 3)}.", result.Output[3]); @@ -34,11 +28,6 @@ public void CheckCli_Patterns_CorrectErrorMessages() [Test] public void CheckCli_LogPath_FilesInProperDirectory() { - if (CommonUtils.IsRunningOnLinux) - { - Assert.Ignore("TODO: fix failed Cli unit-test on mono (Linux)"); - } - PrepareAndSaveTestPatterns(); string logPath = Path.Combine(Path.GetTempPath(), "PT.PM"); try @@ -47,7 +36,7 @@ public void CheckCli_LogPath_FilesInProperDirectory() { Directory.Delete(logPath, true); } - var result = ProcessUtils.SetupHiddenProcessAndStart(exeName, $"--stage {Stage.Pattern} --patterns {patternsFileName} --logs-dir \"{logPath}\""); + var result = ProcessUtils.SetupHiddenProcessAndStart("dotnet", $"{TestUtility.PtPmExePath} --stage {Stage.Pattern} --patterns {patternsFileName} --logs-dir \"{logPath}\""); var logFiles = Directory.GetFiles(logPath, "*.*"); Assert.Greater(logFiles.Length, 0); } @@ -64,12 +53,8 @@ public void CheckCli_LogPath_FilesInProperDirectory() [Ignore("TODO: fix on CI")] public void CheckCli_SeveralLanguages_OnlyPassedLanguagesProcessed() { - if (CommonUtils.IsRunningOnLinux) - { - Assert.Ignore("TODO: fix failed Cli unit-test on mono (Linux)"); - } - - ProcessExecutionResult result = ProcessUtils.SetupHiddenProcessAndStart(exeName, + ProcessExecutionResult result = ProcessUtils.SetupHiddenProcessAndStart("dotnet", + $"{TestUtility.PtPmExePath} " + $"-f \"{TestUtility.TestsDataPath}\" " + $"-l PlSql,TSql " + $"--stage {Stage.ParseTree} --log-debugs"); @@ -78,7 +63,8 @@ public void CheckCli_SeveralLanguages_OnlyPassedLanguagesProcessed() Assert.IsTrue(result.Output.Any(line => line.Contains(".php has not been read"))); Assert.IsTrue(result.Output.Any(line => line.Contains("has been detected"))); - result = ProcessUtils.SetupHiddenProcessAndStart(exeName, + result = ProcessUtils.SetupHiddenProcessAndStart("dotnet", + $"{TestUtility.PtPmExePath} " + $"-f \"{TestUtility.TestsDataPath}\" " + $"-l PlSql " + $"--stage {Stage.ParseTree} --log-debugs"); @@ -90,14 +76,10 @@ public void CheckCli_SeveralLanguages_OnlyPassedLanguagesProcessed() [Test] public void CheckCli_FakeLanguage_CorrectlyProcessed() { - if (CommonUtils.IsRunningOnLinux) - { - Assert.Ignore("TODO: fix failed Cli unit-test on mono (Linux)"); - } - var patternTempFile = Path.GetTempFileName() + ".json"; File.WriteAllText(patternTempFile, "[{\"Name\":\"\",\"Key\":\"1\",\"Languages\":[\"Fake\"],\"DataFormat\":\"Dsl\",\"Value\":\"<[(?i)password(?-i)]> = <[\\\"\\\\w*\\\" || null]>\", \"CweId\":\"\", \"Description\":\"\"}]"); - ProcessExecutionResult result = ProcessUtils.SetupHiddenProcessAndStart(exeName, + ProcessExecutionResult result = ProcessUtils.SetupHiddenProcessAndStart("dotnet", + $"{TestUtility.PtPmExePath} " + $"--stage {Stage.Pattern} " + $"--patterns {patternTempFile} " + $"--log-debugs --log-errors"); @@ -109,17 +91,12 @@ public void CheckCli_FakeLanguage_CorrectlyProcessed() [Ignore("TODO: fix on CI")] public void CheckCli_FilePatternsRepository_CorrectlyProcessed() { - if (CommonUtils.IsRunningOnLinux) - { - Assert.Ignore("TODO: fix failed Cli unit-test on mono (Linux)"); - } - var patternsFileName = Path.Combine(Path.GetTempPath(), "patterns.json"); File.WriteAllText(patternsFileName, "[{\"Key\":\"1\",\"Value\":\"<[(?i)password(?-i)]> = <[\\\"\\\\w*\\\" || null]>\"}]"); try { - var result = ProcessUtils.SetupHiddenProcessAndStart(exeName, - $"-f \"{Path.Combine(TestUtility.TestsDataPath, "Patterns.cs")}\" " + + var result = ProcessUtils.SetupHiddenProcessAndStart("dotnet", + $"{TestUtility.PtPmExePath} -f \"{Path.Combine(TestUtility.TestsDataPath, "Patterns.cs")}\" " + $"--patterns \"{patternsFileName}\""); Assert.IsTrue(result.Output.Any(str => str.Contains("Pattern matched"))); diff --git a/Sources/PT.PM.Cli.Tests/PT.PM.Cli.Tests.csproj b/Sources/PT.PM.Cli.Tests/PT.PM.Cli.Tests.csproj index c6b7bd2f..2e82cbf4 100644 --- a/Sources/PT.PM.Cli.Tests/PT.PM.Cli.Tests.csproj +++ b/Sources/PT.PM.Cli.Tests/PT.PM.Cli.Tests.csproj @@ -1,99 +1,23 @@ - - - + + - Debug - AnyCPU - {836A5763-216D-4596-94B6-5F60E7F0655C} - Library - Properties - PT.PM.Cli.Tests - PT.PM.Cli.Tests - v4.6.2 - 512 - + netcoreapp2.0 - - true - full - false - ..\..\Tests\Unit\bin\Debug\ - DEBUG;TRACE - prompt - 4 + + + ..\..\Tests\Debug\ - - pdbonly - true - ..\..\Tests\Unit\bin\Release\ - TRACE - prompt - 4 + + + ..\..\Tests\Release\ + - - $(SolutionDir)packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - $(SolutionDir)packages\NUnit.3.7.1\lib\net45\nunit.framework.dll - - - - - - - - - + + + - - - - - - Properties\AssemblyInfoCommon.cs - + - - - {0b10dbae-c18d-4007-b799-0b3b1e00376e} - PT.PM.Common - - - {349b2aef-fa81-401f-a8bd-c53ee7231544} - PT.PM.Cli - - - {9215DF23-07BE-49AA-90A0-ED1C542C388C} - PT.PM.Matching - - - {2a6f7ac9-92aa-48b8-a53b-50770424c9b6} - PT.PM.Patterns - - - {FEC55A64-1B65-4D39-B5FA-D559D55BB190} - PT.PM.TestUtils - - - {ecb44673-2fb0-49e1-811f-973e3fa4dd22} - PT.PM - - - - - - - - - - - - \ No newline at end of file + diff --git a/Sources/PT.PM.Cli.Tests/Properties/AssemblyInfo.cs b/Sources/PT.PM.Cli.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 6aeb1ce4..00000000 --- a/Sources/PT.PM.Cli.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PT.PM.Cli.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("836a5763-216d-4596-94b6-5f60e7f0655c")] \ No newline at end of file diff --git a/Sources/PT.PM.Cli.Tests/app.config b/Sources/PT.PM.Cli.Tests/app.config deleted file mode 100644 index 5daaf88e..00000000 --- a/Sources/PT.PM.Cli.Tests/app.config +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.Cli.Tests/packages.config b/Sources/PT.PM.Cli.Tests/packages.config deleted file mode 100644 index d4f7e99d..00000000 --- a/Sources/PT.PM.Cli.Tests/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.Cli/PT.PM.Cli.csproj b/Sources/PT.PM.Cli/PT.PM.Cli.csproj index b73236e4..d4ec0225 100644 --- a/Sources/PT.PM.Cli/PT.PM.Cli.csproj +++ b/Sources/PT.PM.Cli/PT.PM.Cli.csproj @@ -1,162 +1,39 @@ - - - + + - Debug - AnyCPU - {349B2AEF-FA81-401F-A8BD-C53EE7231544} + netcoreapp2.0;net462 + ..\PT.PM.ico Exe - Properties - PT.PM.Cli - PT.PM.Cli - v4.6.2 - 512 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - true + PT.PM.Cli.Program + false - - AnyCPU - true - full - false + + ..\..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - AnyCPU - pdbonly - true + + ..\..\bin\Release\ - TRACE - prompt - 4 - false - - .allowedextension - - true - - ..\PT.PM.ico - - - true - ..\..\bin\Debug\ - DEBUG;TRACE - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset + + + TRACE;DEBUG;NETCOREAPP2_0 + - - $(SolutionDir)packages\CommandLineParser.2.1.1-beta\lib\net45\CommandLine.dll - - - $(SolutionDir)packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - $(SolutionDir)packages\NLog.4.4.11\lib\net45\NLog.dll - - - - - $(SolutionDir)packages\System.Console.4.3.0\lib\net46\System.Console.dll - - - - $(SolutionDir)packages\System.IO.4.3.0\lib\net462\System.IO.dll - - - $(SolutionDir)packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll - - - $(SolutionDir)packages\System.Reflection.TypeExtensions.4.4.0\lib\net461\System.Reflection.TypeExtensions.dll - - - $(SolutionDir)packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll - - - $(SolutionDir)packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll - + + + + - - - - - - - - - - Properties\AssemblyInfoCommon.cs - - + + - - PT.PM.ico - - - + PreserveNewest - - - - - {2B5519C9-4566-4743-A14A-66234299CDB8} - PT.PM.AntlrUtils - - - {0b10dbae-c18d-4007-b799-0b3b1e00376e} - PT.PM.Common - - - {9215df23-07be-49aa-90a0-ed1c542c388c} - PT.PM.Matching - - - {2a6f7ac9-92aa-48b8-a53b-50770424c9b6} - PT.PM.Patterns - - - {ecb44673-2fb0-49e1-811f-973e3fa4dd22} - PT.PM - - - - - False - Microsoft .NET Framework 4.5 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - + \ No newline at end of file diff --git a/Sources/PT.PM.Cli/PT.PM.Cli.runtimeconfig.json b/Sources/PT.PM.Cli/PT.PM.Cli.runtimeconfig.json new file mode 100644 index 00000000..23d2c06a --- /dev/null +++ b/Sources/PT.PM.Cli/PT.PM.Cli.runtimeconfig.json @@ -0,0 +1,9 @@ +{ + "runtimeOptions": { + "tfm": "netcoreapp2.0", + "framework": { + "name": "Microsoft.NETCore.App", + "version": "2.0.0" + } + } +} \ No newline at end of file diff --git a/Sources/PT.PM.Cli/Properties/AssemblyInfo.cs b/Sources/PT.PM.Cli/Properties/AssemblyInfo.cs deleted file mode 100644 index 20340960..00000000 --- a/Sources/PT.PM.Cli/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PT.PM.Cli")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8df07903-0041-4954-a97c-02a37968822e")] diff --git a/Sources/PT.PM.Cli/app.config b/Sources/PT.PM.Cli/app.config deleted file mode 100644 index 0bb8113f..00000000 --- a/Sources/PT.PM.Cli/app.config +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.Cli/packages.config b/Sources/PT.PM.Cli/packages.config deleted file mode 100644 index 27855fa9..00000000 --- a/Sources/PT.PM.Cli/packages.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.Common/CodeFile.cs b/Sources/PT.PM.Common/CodeFile.cs index ff91e9d9..834c8481 100644 --- a/Sources/PT.PM.Common/CodeFile.cs +++ b/Sources/PT.PM.Common/CodeFile.cs @@ -176,7 +176,7 @@ public bool Equals(CodeFile other) return Code == other.Code; } - return RelativeName == other.RelativeName; + return FullName == other.FullName; } public override int GetHashCode() diff --git a/Sources/PT.PM.Common/CommonUtils.cs b/Sources/PT.PM.Common/CommonUtils.cs index 7487c699..ed651765 100644 --- a/Sources/PT.PM.Common/CommonUtils.cs +++ b/Sources/PT.PM.Common/CommonUtils.cs @@ -3,12 +3,16 @@ using PT.PM.Common.Nodes.Tokens; using System; using System.Collections.Generic; +using System.IO; +using System.Threading; namespace PT.PM.Common { public static class CommonUtils { private static readonly char[] Separators = new char[] { ',', ' ', '\t', '\r', '\n' }; + private static bool? isSupportThreadAbort = null; + public const string Prefix = "pt.pm_"; public static string FormatJson(string json) @@ -42,6 +46,48 @@ public static bool IsRunningOnLinux } } + public static bool IsSupportThreadAbort + { + get + { + if (!isSupportThreadAbort.HasValue) + { + Thread thread = new Thread(() => { }); + try + { + thread.Abort(); + isSupportThreadAbort = true; + } + catch (PlatformNotSupportedException) + { + isSupportThreadAbort = false; + } + } + + return isSupportThreadAbort.Value; + } + } + + public static bool ExistsOnPath(string fileName) + { + return GetFullPath(fileName) != null; + } + + public static string GetFullPath(string fileName) + { + if (File.Exists(fileName)) + return Path.GetFullPath(fileName); + + var values = Environment.GetEnvironmentVariable("PATH"); + foreach (var path in values.Split(';')) + { + var fullPath = Path.Combine(path, fileName); + if (File.Exists(fullPath)) + return fullPath; + } + return null; + } + public static bool TryCheckIdTokenValue(Expression expr, string value) { return expr is IdToken idToken && idToken.TextValue == value; diff --git a/Sources/PT.PM.Common/Nodes/Expressions/InvocationExpression.cs b/Sources/PT.PM.Common/Nodes/Expressions/InvocationExpression.cs index 9f1dee9d..2970ad65 100644 --- a/Sources/PT.PM.Common/Nodes/Expressions/InvocationExpression.cs +++ b/Sources/PT.PM.Common/Nodes/Expressions/InvocationExpression.cs @@ -1,4 +1,5 @@ using PT.PM.Common.Nodes.Collections; +using System; using System.Collections.Generic; namespace PT.PM.Common.Nodes.Expressions @@ -7,7 +8,7 @@ public class InvocationExpression : Expression { public Expression Target { get; set; } - public ArgsUst Arguments { get; set; } + public ArgsUst Arguments { get; set; } = new ArgsUst(); public InvocationExpression() { @@ -17,7 +18,7 @@ public InvocationExpression(Expression target, ArgsUst arguments, TextSpan textS : base(textSpan) { Target = target; - Arguments = arguments; + Arguments = arguments ?? throw new ArgumentNullException(nameof(arguments)); } public int GetIndexOfArg(Ust ustNode) diff --git a/Sources/PT.PM.Common/PT.PM.Common.csproj b/Sources/PT.PM.Common/PT.PM.Common.csproj index f7dc7f8e..7132b389 100644 --- a/Sources/PT.PM.Common/PT.PM.Common.csproj +++ b/Sources/PT.PM.Common/PT.PM.Common.csproj @@ -1,202 +1,22 @@ - - - + + - Debug - AnyCPU - {0B10DBAE-C18D-4007-B799-0B3B1E00376E} - Library - Properties - PT.PM.Common - PT.PM.Common - v4.6.2 - 512 + netstandard2.0 + false - - true - full - false + + ..\..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - - pdbonly - true + + ..\..\bin\Release\ - TRACE - prompt - 4 + - - - $(SolutionDir)packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Properties\AssemblyInfoCommon.cs - - - - - - - {0292ce45-bba4-46b8-ade4-3c39162c1f46} - PT.PM.Prebuild - - - - - - - - \ No newline at end of file + + diff --git a/Sources/PT.PM.Common/Properties/AssemblyInfo.cs b/Sources/PT.PM.Common/Properties/AssemblyInfo.cs deleted file mode 100644 index af10c004..00000000 --- a/Sources/PT.PM.Common/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PT.PM.Common")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a TypeType in this assembly from -// COM, set the ComVisible attribute to true on that TypeType. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("88a1131f-f67a-4eac-ab48-fd335a6046a9")] diff --git a/Sources/PT.PM.Common/TextUtils.cs b/Sources/PT.PM.Common/TextUtils.cs index 5ad340ae..3a6d0062 100644 --- a/Sources/PT.PM.Common/TextUtils.cs +++ b/Sources/PT.PM.Common/TextUtils.cs @@ -163,23 +163,28 @@ public static CodeFile GetCodeFile(string fileName, CodeFile currentCodeFile, Ha } else { - result = codeFiles?.FirstOrDefault(codeFile => codeFile.RelativeName == fileName || codeFile.FullName == fileName); + result = codeFiles?.FirstOrDefault(codeFile => codeFile.Equals(fileName) || codeFile.RelativeName.Equals(fileName)); if (result == null) { if (!File.Exists(fileName)) { - throw new FileNotFoundException($"File {fileName} is not found.", fileName); - } - else - { - var code = File.ReadAllText(fileName); - result = new CodeFile(code) + if (currentCodeFile != null) { - RootPath = Path.GetDirectoryName(fileName), - Name = Path.GetFileName(fileName) - }; - codeFiles.Add(result); + fileName = Path.Combine(currentCodeFile.RootPath, fileName); + if (!File.Exists(fileName)) + { + throw new FileNotFoundException($"File {fileName} is not found.", fileName); + } + } } + + var code = File.ReadAllText(fileName); + result = new CodeFile(code) + { + RootPath = Path.GetDirectoryName(fileName), + Name = Path.GetFileName(fileName) + }; + codeFiles.Add(result); } } return result; diff --git a/Sources/PT.PM.Common/packages.config b/Sources/PT.PM.Common/packages.config deleted file mode 100644 index 542d4d95..00000000 --- a/Sources/PT.PM.Common/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Sources/PT.PM.Dsl.Tests/PT.PM.Dsl.Tests.csproj b/Sources/PT.PM.Dsl.Tests/PT.PM.Dsl.Tests.csproj index 0a028f71..d3c74b52 100644 --- a/Sources/PT.PM.Dsl.Tests/PT.PM.Dsl.Tests.csproj +++ b/Sources/PT.PM.Dsl.Tests/PT.PM.Dsl.Tests.csproj @@ -1,161 +1,86 @@ - - - + + - Debug - AnyCPU - {370AF0EE-1080-4785-A65C-6F471E64B6D2} - Library - Properties - PT.PM.Dsl.Tests - PT.PM.Dsl.Tests - v4.6.2 - 512 + netcoreapp2.0 - - true - full - false - ..\..\Tests\Unit\bin\Debug\ - DEBUG;TRACE - prompt - 4 + + + ..\..\Tests\Debug - - pdbonly - true - ..\..\Tests\Unit\bin\Release\ - TRACE - prompt - 4 + + + ..\..\Tests\Release\ + - - $(SolutionDir)packages\Antlr4.Runtime.4.6.3\lib\net45\Antlr4.Runtime.dll - - - $(SolutionDir)packages\NUnit.3.7.1\lib\net45\nunit.framework.dll - - - - - - - - - - - - - - - Properties\AssemblyInfoCommon.cs - - - - + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - + + PreserveNewest - - - + + - - {2b5519c9-4566-4743-a14a-66234299cdb8} - PT.PM.AntlrUtils - - - {0b10dbae-c18d-4007-b799-0b3b1e00376e} - PT.PM.Common - - - {0cc3091c-db40-49d1-ac8f-3accabcad952} - PT.PM.Dsl - - - {9215DF23-07BE-49AA-90A0-ED1C542C388C} - PT.PM.Matching - - - {2a6f7ac9-92aa-48b8-a53b-50770424c9b6} - PT.PM.Patterns - - - {08FBC341-AC44-4CAE-AE71-9462F7885E3E} - PT.PM.PhpParseTreeUst - - - {FEC55A64-1B65-4D39-B5FA-D559D55BB190} - PT.PM.TestUtils - + + + - + - - - - \ No newline at end of file + diff --git a/Sources/PT.PM.Dsl.Tests/Properties/AssemblyInfo.cs b/Sources/PT.PM.Dsl.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 31e99110..00000000 --- a/Sources/PT.PM.Dsl.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PT.PM.Dsl.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("370af0ee-1080-4785-a65c-6f471e64b6d2")] diff --git a/Sources/PT.PM.Dsl.Tests/app.config b/Sources/PT.PM.Dsl.Tests/app.config deleted file mode 100644 index dd831742..00000000 --- a/Sources/PT.PM.Dsl.Tests/app.config +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.Dsl.Tests/packages.config b/Sources/PT.PM.Dsl.Tests/packages.config deleted file mode 100644 index f8979678..00000000 --- a/Sources/PT.PM.Dsl.Tests/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.Dsl/PT.PM.Dsl.csproj b/Sources/PT.PM.Dsl/PT.PM.Dsl.csproj index 055ac68e..0feb3b30 100644 --- a/Sources/PT.PM.Dsl/PT.PM.Dsl.csproj +++ b/Sources/PT.PM.Dsl/PT.PM.Dsl.csproj @@ -1,88 +1,34 @@ - - - + + - Debug - AnyCPU - {0CC3091C-DB40-49D1-AC8F-3ACCABCAD952} - Library - Properties - PT.PM.Dsl - PT.PM.Dsl - v4.6.2 - 512 + netstandard2.0 + false - - true - full - false + + ..\..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - - pdbonly - true + + ..\..\bin\Release\ - TRACE - prompt - 4 - - mono - - - - $(SolutionDir)packages\Antlr4.Runtime.4.6.3\lib\net45\Antlr4.Runtime.dll - - - - - - - - - - - - - - - - - - - - Properties\AssemblyInfoCommon.cs - - + - - - + + + + + + + + - - {2b5519c9-4566-4743-a14a-66234299cdb8} - PT.PM.AntlrUtils - - - {9215df23-07be-49aa-90a0-ed1c542c388c} - PT.PM.Matching - - - {0b10dbae-c18d-4007-b799-0b3b1e00376e} - PT.PM.Common - - - {0292ce45-bba4-46b8-ade4-3c39162c1f46} - PT.PM.Prebuild - + + false + + + false + - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.Dsl/Properties/AssemblyInfo.cs b/Sources/PT.PM.Dsl/Properties/AssemblyInfo.cs deleted file mode 100644 index e468f7c2..00000000 --- a/Sources/PT.PM.Dsl/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PT.PM.Dsl")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("0cc3091c-db40-49d1-ac8f-3accabcad952")] \ No newline at end of file diff --git a/Sources/PT.PM.Dsl/packages.config b/Sources/PT.PM.Dsl/packages.config deleted file mode 100644 index 7386c269..00000000 --- a/Sources/PT.PM.Dsl/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Sources/PT.PM.Gui.sln b/Sources/PT.PM.Gui.sln deleted file mode 100644 index 2988fb37..00000000 --- a/Sources/PT.PM.Gui.sln +++ /dev/null @@ -1,385 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.16 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM", "PT.PM\PT.PM.csproj", "{ECB44673-2FB0-49E1-811F-973E3FA4DD22}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.Tests", "PT.PM.Tests\PT.PM.Tests.csproj", "{104F9633-F7A6-4840-A3AD-8D9FD96B39BF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.Matching", "PT.PM.Matching\PT.PM.Matching.csproj", "{9215DF23-07BE-49AA-90A0-ED1C542C388C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.Patterns", "PT.PM.Patterns\PT.PM.Patterns.csproj", "{2A6F7AC9-92AA-48B8-A53B-50770424C9B6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.Matching.Tests", "PT.PM.Matching.Tests\PT.PM.Matching.Tests.csproj", "{F9D784D4-36E4-49F8-BEA4-38BDBB6910D8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.Cli", "PT.PM.Cli\PT.PM.Cli.csproj", "{349B2AEF-FA81-401F-A8BD-C53EE7231544}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.Common", "PT.PM.Common\PT.PM.Common.csproj", "{0B10DBAE-C18D-4007-B799-0B3B1E00376E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.CSharpParseTreeUst", "PT.PM.CSharpParseTreeUst\PT.PM.CSharpParseTreeUst.csproj", "{3B09E6EC-8069-4ED3-AAD8-145953FD7DCA}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.CSharpParseTreeUst.Tests", "PT.PM.CSharpParseTreeUst.Tests\PT.PM.CSharpParseTreeUst.Tests.csproj", "{E3DB8014-0BFB-4399-9B49-A8BE446C5049}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.PhpParseTreeUst", "PT.PM.PhpParseTreeUst\PT.PM.PhpParseTreeUst.csproj", "{08FBC341-AC44-4CAE-AE71-9462F7885E3E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.PhpParseTreeUst.Tests", "PT.PM.PhpParseTreeUst.Tests\PT.PM.PhpParseTreeUst.Tests.csproj", "{933DCCA3-B5D1-45AE-ACAB-1672D71BC349}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.JavaParseTreeUst.Tests", "PT.PM.JavaParseTreeUst.Tests\PT.PM.JavaParseTreeUst.Tests.csproj", "{47F5B401-E788-494E-89C8-A8CA0B6917C4}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.AntlrUtils", "PT.PM.AntlrUtils\PT.PM.AntlrUtils.csproj", "{2B5519C9-4566-4743-A14A-66234299CDB8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.JavaParseTreeUst", "PT.PM.JavaParseTreeUst\PT.PM.JavaParseTreeUst.csproj", "{F5E3CE00-6854-4FA8-ADD2-0248DF6D85DB}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.Dsl", "PT.PM.Dsl\PT.PM.Dsl.csproj", "{0CC3091C-DB40-49D1-AC8F-3ACCABCAD952}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.Dsl.Tests", "PT.PM.Dsl.Tests\PT.PM.Dsl.Tests.csproj", "{370AF0EE-1080-4785-A65C-6F471E64B6D2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{553BE5D1-E6F1-4DDD-97E8-F7C73F4F684C}" - ProjectSection(SolutionItems) = preProject - AssemblyInfoCommon.cs = AssemblyInfoCommon.cs - PT.PM.ico = PT.PM.ico - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.SqlParseTreeUst", "PT.PM.SqlParseTreeUst\PT.PM.SqlParseTreeUst.csproj", "{8F34670A-B91D-460B-9D67-7A03F7194673}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.SqlParseTreeUst.Tests", "PT.PM.SqlParseTreeUst.Tests\PT.PM.SqlParseTreeUst.Tests.csproj", "{EEBBE595-2478-40B1-A147-7F44E40A2686}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.Cli.Tests", "PT.PM.Cli.Tests\PT.PM.Cli.Tests.csproj", "{836A5763-216D-4596-94B6-5F60E7F0655C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.Prebuild", "PT.PM.Prebuild\PT.PM.Prebuild.csproj", "{0292CE45-BBA4-46B8-ADE4-3C39162C1F46}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspxParser", "AspxParser\AspxParser\AspxParser.csproj", "{88AF3957-A64A-4715-ADE5-3BE099034BDD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.JavaScriptParseTreeUst", "PT.PM.JavaScriptParseTreeUst\PT.PM.JavaScriptParseTreeUst.csproj", "{98727837-F9FA-476C-B0B5-88845B53FDDF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.JavaScriptParseTreeUst.Tests", "PT.PM.JavaScriptParseTreeUst.Tests\PT.PM.JavaScriptParseTreeUst.Tests.csproj", "{CC787B80-B003-4F07-8DDD-0E7EF0E9E4CA}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.TestUtils", "PT.PM.TestUtils\PT.PM.TestUtils.csproj", "{FEC55A64-1B65-4D39-B5FA-D559D55BB190}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PT.PM.PatternEditor", "PT.PM.PatternEditor\PT.PM.PatternEditor.csproj", "{0F58CE94-C0A3-4517-9FAF-6197BBE99FF7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x86 = Debug|x86 - DebugGraphviz|Any CPU = DebugGraphviz|Any CPU - DebugGraphviz|x86 = DebugGraphviz|x86 - Release|Any CPU = Release|Any CPU - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {ECB44673-2FB0-49E1-811F-973E3FA4DD22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ECB44673-2FB0-49E1-811F-973E3FA4DD22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ECB44673-2FB0-49E1-811F-973E3FA4DD22}.Debug|x86.ActiveCfg = Debug|Any CPU - {ECB44673-2FB0-49E1-811F-973E3FA4DD22}.Debug|x86.Build.0 = Debug|Any CPU - {ECB44673-2FB0-49E1-811F-973E3FA4DD22}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {ECB44673-2FB0-49E1-811F-973E3FA4DD22}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {ECB44673-2FB0-49E1-811F-973E3FA4DD22}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {ECB44673-2FB0-49E1-811F-973E3FA4DD22}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {ECB44673-2FB0-49E1-811F-973E3FA4DD22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ECB44673-2FB0-49E1-811F-973E3FA4DD22}.Release|Any CPU.Build.0 = Release|Any CPU - {ECB44673-2FB0-49E1-811F-973E3FA4DD22}.Release|x86.ActiveCfg = Release|Any CPU - {ECB44673-2FB0-49E1-811F-973E3FA4DD22}.Release|x86.Build.0 = Release|Any CPU - {104F9633-F7A6-4840-A3AD-8D9FD96B39BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {104F9633-F7A6-4840-A3AD-8D9FD96B39BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {104F9633-F7A6-4840-A3AD-8D9FD96B39BF}.Debug|x86.ActiveCfg = Debug|Any CPU - {104F9633-F7A6-4840-A3AD-8D9FD96B39BF}.Debug|x86.Build.0 = Debug|Any CPU - {104F9633-F7A6-4840-A3AD-8D9FD96B39BF}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {104F9633-F7A6-4840-A3AD-8D9FD96B39BF}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {104F9633-F7A6-4840-A3AD-8D9FD96B39BF}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {104F9633-F7A6-4840-A3AD-8D9FD96B39BF}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {104F9633-F7A6-4840-A3AD-8D9FD96B39BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {104F9633-F7A6-4840-A3AD-8D9FD96B39BF}.Release|Any CPU.Build.0 = Release|Any CPU - {104F9633-F7A6-4840-A3AD-8D9FD96B39BF}.Release|x86.ActiveCfg = Release|Any CPU - {104F9633-F7A6-4840-A3AD-8D9FD96B39BF}.Release|x86.Build.0 = Release|Any CPU - {9215DF23-07BE-49AA-90A0-ED1C542C388C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9215DF23-07BE-49AA-90A0-ED1C542C388C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9215DF23-07BE-49AA-90A0-ED1C542C388C}.Debug|x86.ActiveCfg = Debug|Any CPU - {9215DF23-07BE-49AA-90A0-ED1C542C388C}.Debug|x86.Build.0 = Debug|Any CPU - {9215DF23-07BE-49AA-90A0-ED1C542C388C}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {9215DF23-07BE-49AA-90A0-ED1C542C388C}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {9215DF23-07BE-49AA-90A0-ED1C542C388C}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {9215DF23-07BE-49AA-90A0-ED1C542C388C}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {9215DF23-07BE-49AA-90A0-ED1C542C388C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9215DF23-07BE-49AA-90A0-ED1C542C388C}.Release|Any CPU.Build.0 = Release|Any CPU - {9215DF23-07BE-49AA-90A0-ED1C542C388C}.Release|x86.ActiveCfg = Release|Any CPU - {9215DF23-07BE-49AA-90A0-ED1C542C388C}.Release|x86.Build.0 = Release|Any CPU - {2A6F7AC9-92AA-48B8-A53B-50770424C9B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A6F7AC9-92AA-48B8-A53B-50770424C9B6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A6F7AC9-92AA-48B8-A53B-50770424C9B6}.Debug|x86.ActiveCfg = Debug|Any CPU - {2A6F7AC9-92AA-48B8-A53B-50770424C9B6}.Debug|x86.Build.0 = Debug|Any CPU - {2A6F7AC9-92AA-48B8-A53B-50770424C9B6}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {2A6F7AC9-92AA-48B8-A53B-50770424C9B6}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {2A6F7AC9-92AA-48B8-A53B-50770424C9B6}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {2A6F7AC9-92AA-48B8-A53B-50770424C9B6}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {2A6F7AC9-92AA-48B8-A53B-50770424C9B6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A6F7AC9-92AA-48B8-A53B-50770424C9B6}.Release|Any CPU.Build.0 = Release|Any CPU - {2A6F7AC9-92AA-48B8-A53B-50770424C9B6}.Release|x86.ActiveCfg = Release|Any CPU - {2A6F7AC9-92AA-48B8-A53B-50770424C9B6}.Release|x86.Build.0 = Release|Any CPU - {F9D784D4-36E4-49F8-BEA4-38BDBB6910D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9D784D4-36E4-49F8-BEA4-38BDBB6910D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9D784D4-36E4-49F8-BEA4-38BDBB6910D8}.Debug|x86.ActiveCfg = Debug|Any CPU - {F9D784D4-36E4-49F8-BEA4-38BDBB6910D8}.Debug|x86.Build.0 = Debug|Any CPU - {F9D784D4-36E4-49F8-BEA4-38BDBB6910D8}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {F9D784D4-36E4-49F8-BEA4-38BDBB6910D8}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {F9D784D4-36E4-49F8-BEA4-38BDBB6910D8}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {F9D784D4-36E4-49F8-BEA4-38BDBB6910D8}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {F9D784D4-36E4-49F8-BEA4-38BDBB6910D8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9D784D4-36E4-49F8-BEA4-38BDBB6910D8}.Release|Any CPU.Build.0 = Release|Any CPU - {F9D784D4-36E4-49F8-BEA4-38BDBB6910D8}.Release|x86.ActiveCfg = Release|Any CPU - {F9D784D4-36E4-49F8-BEA4-38BDBB6910D8}.Release|x86.Build.0 = Release|Any CPU - {349B2AEF-FA81-401F-A8BD-C53EE7231544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {349B2AEF-FA81-401F-A8BD-C53EE7231544}.Debug|Any CPU.Build.0 = Debug|Any CPU - {349B2AEF-FA81-401F-A8BD-C53EE7231544}.Debug|x86.ActiveCfg = Debug|Any CPU - {349B2AEF-FA81-401F-A8BD-C53EE7231544}.Debug|x86.Build.0 = Debug|Any CPU - {349B2AEF-FA81-401F-A8BD-C53EE7231544}.DebugGraphviz|Any CPU.ActiveCfg = DebugGraphviz|Any CPU - {349B2AEF-FA81-401F-A8BD-C53EE7231544}.DebugGraphviz|Any CPU.Build.0 = DebugGraphviz|Any CPU - {349B2AEF-FA81-401F-A8BD-C53EE7231544}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {349B2AEF-FA81-401F-A8BD-C53EE7231544}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {349B2AEF-FA81-401F-A8BD-C53EE7231544}.Release|Any CPU.ActiveCfg = Release|Any CPU - {349B2AEF-FA81-401F-A8BD-C53EE7231544}.Release|Any CPU.Build.0 = Release|Any CPU - {349B2AEF-FA81-401F-A8BD-C53EE7231544}.Release|x86.ActiveCfg = Release|Any CPU - {349B2AEF-FA81-401F-A8BD-C53EE7231544}.Release|x86.Build.0 = Release|Any CPU - {0B10DBAE-C18D-4007-B799-0B3B1E00376E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B10DBAE-C18D-4007-B799-0B3B1E00376E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B10DBAE-C18D-4007-B799-0B3B1E00376E}.Debug|x86.ActiveCfg = Debug|Any CPU - {0B10DBAE-C18D-4007-B799-0B3B1E00376E}.Debug|x86.Build.0 = Debug|Any CPU - {0B10DBAE-C18D-4007-B799-0B3B1E00376E}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {0B10DBAE-C18D-4007-B799-0B3B1E00376E}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {0B10DBAE-C18D-4007-B799-0B3B1E00376E}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {0B10DBAE-C18D-4007-B799-0B3B1E00376E}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {0B10DBAE-C18D-4007-B799-0B3B1E00376E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B10DBAE-C18D-4007-B799-0B3B1E00376E}.Release|Any CPU.Build.0 = Release|Any CPU - {0B10DBAE-C18D-4007-B799-0B3B1E00376E}.Release|x86.ActiveCfg = Release|Any CPU - {0B10DBAE-C18D-4007-B799-0B3B1E00376E}.Release|x86.Build.0 = Release|Any CPU - {3B09E6EC-8069-4ED3-AAD8-145953FD7DCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B09E6EC-8069-4ED3-AAD8-145953FD7DCA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B09E6EC-8069-4ED3-AAD8-145953FD7DCA}.Debug|x86.ActiveCfg = Debug|Any CPU - {3B09E6EC-8069-4ED3-AAD8-145953FD7DCA}.Debug|x86.Build.0 = Debug|Any CPU - {3B09E6EC-8069-4ED3-AAD8-145953FD7DCA}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {3B09E6EC-8069-4ED3-AAD8-145953FD7DCA}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {3B09E6EC-8069-4ED3-AAD8-145953FD7DCA}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {3B09E6EC-8069-4ED3-AAD8-145953FD7DCA}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {3B09E6EC-8069-4ED3-AAD8-145953FD7DCA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B09E6EC-8069-4ED3-AAD8-145953FD7DCA}.Release|Any CPU.Build.0 = Release|Any CPU - {3B09E6EC-8069-4ED3-AAD8-145953FD7DCA}.Release|x86.ActiveCfg = Release|Any CPU - {3B09E6EC-8069-4ED3-AAD8-145953FD7DCA}.Release|x86.Build.0 = Release|Any CPU - {E3DB8014-0BFB-4399-9B49-A8BE446C5049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E3DB8014-0BFB-4399-9B49-A8BE446C5049}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E3DB8014-0BFB-4399-9B49-A8BE446C5049}.Debug|x86.ActiveCfg = Debug|Any CPU - {E3DB8014-0BFB-4399-9B49-A8BE446C5049}.Debug|x86.Build.0 = Debug|Any CPU - {E3DB8014-0BFB-4399-9B49-A8BE446C5049}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {E3DB8014-0BFB-4399-9B49-A8BE446C5049}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {E3DB8014-0BFB-4399-9B49-A8BE446C5049}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {E3DB8014-0BFB-4399-9B49-A8BE446C5049}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {E3DB8014-0BFB-4399-9B49-A8BE446C5049}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E3DB8014-0BFB-4399-9B49-A8BE446C5049}.Release|Any CPU.Build.0 = Release|Any CPU - {E3DB8014-0BFB-4399-9B49-A8BE446C5049}.Release|x86.ActiveCfg = Release|Any CPU - {E3DB8014-0BFB-4399-9B49-A8BE446C5049}.Release|x86.Build.0 = Release|Any CPU - {08FBC341-AC44-4CAE-AE71-9462F7885E3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08FBC341-AC44-4CAE-AE71-9462F7885E3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08FBC341-AC44-4CAE-AE71-9462F7885E3E}.Debug|x86.ActiveCfg = Debug|Any CPU - {08FBC341-AC44-4CAE-AE71-9462F7885E3E}.Debug|x86.Build.0 = Debug|Any CPU - {08FBC341-AC44-4CAE-AE71-9462F7885E3E}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {08FBC341-AC44-4CAE-AE71-9462F7885E3E}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {08FBC341-AC44-4CAE-AE71-9462F7885E3E}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {08FBC341-AC44-4CAE-AE71-9462F7885E3E}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {08FBC341-AC44-4CAE-AE71-9462F7885E3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08FBC341-AC44-4CAE-AE71-9462F7885E3E}.Release|Any CPU.Build.0 = Release|Any CPU - {08FBC341-AC44-4CAE-AE71-9462F7885E3E}.Release|x86.ActiveCfg = Release|Any CPU - {08FBC341-AC44-4CAE-AE71-9462F7885E3E}.Release|x86.Build.0 = Release|Any CPU - {933DCCA3-B5D1-45AE-ACAB-1672D71BC349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {933DCCA3-B5D1-45AE-ACAB-1672D71BC349}.Debug|Any CPU.Build.0 = Debug|Any CPU - {933DCCA3-B5D1-45AE-ACAB-1672D71BC349}.Debug|x86.ActiveCfg = Debug|Any CPU - {933DCCA3-B5D1-45AE-ACAB-1672D71BC349}.Debug|x86.Build.0 = Debug|Any CPU - {933DCCA3-B5D1-45AE-ACAB-1672D71BC349}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {933DCCA3-B5D1-45AE-ACAB-1672D71BC349}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {933DCCA3-B5D1-45AE-ACAB-1672D71BC349}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {933DCCA3-B5D1-45AE-ACAB-1672D71BC349}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {933DCCA3-B5D1-45AE-ACAB-1672D71BC349}.Release|Any CPU.ActiveCfg = Release|Any CPU - {933DCCA3-B5D1-45AE-ACAB-1672D71BC349}.Release|Any CPU.Build.0 = Release|Any CPU - {933DCCA3-B5D1-45AE-ACAB-1672D71BC349}.Release|x86.ActiveCfg = Release|Any CPU - {933DCCA3-B5D1-45AE-ACAB-1672D71BC349}.Release|x86.Build.0 = Release|Any CPU - {47F5B401-E788-494E-89C8-A8CA0B6917C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47F5B401-E788-494E-89C8-A8CA0B6917C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47F5B401-E788-494E-89C8-A8CA0B6917C4}.Debug|x86.ActiveCfg = Debug|Any CPU - {47F5B401-E788-494E-89C8-A8CA0B6917C4}.Debug|x86.Build.0 = Debug|Any CPU - {47F5B401-E788-494E-89C8-A8CA0B6917C4}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {47F5B401-E788-494E-89C8-A8CA0B6917C4}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {47F5B401-E788-494E-89C8-A8CA0B6917C4}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {47F5B401-E788-494E-89C8-A8CA0B6917C4}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {47F5B401-E788-494E-89C8-A8CA0B6917C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47F5B401-E788-494E-89C8-A8CA0B6917C4}.Release|Any CPU.Build.0 = Release|Any CPU - {47F5B401-E788-494E-89C8-A8CA0B6917C4}.Release|x86.ActiveCfg = Release|Any CPU - {47F5B401-E788-494E-89C8-A8CA0B6917C4}.Release|x86.Build.0 = Release|Any CPU - {2B5519C9-4566-4743-A14A-66234299CDB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2B5519C9-4566-4743-A14A-66234299CDB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2B5519C9-4566-4743-A14A-66234299CDB8}.Debug|x86.ActiveCfg = Debug|Any CPU - {2B5519C9-4566-4743-A14A-66234299CDB8}.Debug|x86.Build.0 = Debug|Any CPU - {2B5519C9-4566-4743-A14A-66234299CDB8}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {2B5519C9-4566-4743-A14A-66234299CDB8}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {2B5519C9-4566-4743-A14A-66234299CDB8}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {2B5519C9-4566-4743-A14A-66234299CDB8}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {2B5519C9-4566-4743-A14A-66234299CDB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2B5519C9-4566-4743-A14A-66234299CDB8}.Release|Any CPU.Build.0 = Release|Any CPU - {2B5519C9-4566-4743-A14A-66234299CDB8}.Release|x86.ActiveCfg = Release|Any CPU - {2B5519C9-4566-4743-A14A-66234299CDB8}.Release|x86.Build.0 = Release|Any CPU - {F5E3CE00-6854-4FA8-ADD2-0248DF6D85DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F5E3CE00-6854-4FA8-ADD2-0248DF6D85DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F5E3CE00-6854-4FA8-ADD2-0248DF6D85DB}.Debug|x86.ActiveCfg = Debug|Any CPU - {F5E3CE00-6854-4FA8-ADD2-0248DF6D85DB}.Debug|x86.Build.0 = Debug|Any CPU - {F5E3CE00-6854-4FA8-ADD2-0248DF6D85DB}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {F5E3CE00-6854-4FA8-ADD2-0248DF6D85DB}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {F5E3CE00-6854-4FA8-ADD2-0248DF6D85DB}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {F5E3CE00-6854-4FA8-ADD2-0248DF6D85DB}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {F5E3CE00-6854-4FA8-ADD2-0248DF6D85DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F5E3CE00-6854-4FA8-ADD2-0248DF6D85DB}.Release|Any CPU.Build.0 = Release|Any CPU - {F5E3CE00-6854-4FA8-ADD2-0248DF6D85DB}.Release|x86.ActiveCfg = Release|Any CPU - {F5E3CE00-6854-4FA8-ADD2-0248DF6D85DB}.Release|x86.Build.0 = Release|Any CPU - {0CC3091C-DB40-49D1-AC8F-3ACCABCAD952}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CC3091C-DB40-49D1-AC8F-3ACCABCAD952}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CC3091C-DB40-49D1-AC8F-3ACCABCAD952}.Debug|x86.ActiveCfg = Debug|Any CPU - {0CC3091C-DB40-49D1-AC8F-3ACCABCAD952}.Debug|x86.Build.0 = Debug|Any CPU - {0CC3091C-DB40-49D1-AC8F-3ACCABCAD952}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {0CC3091C-DB40-49D1-AC8F-3ACCABCAD952}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {0CC3091C-DB40-49D1-AC8F-3ACCABCAD952}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {0CC3091C-DB40-49D1-AC8F-3ACCABCAD952}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {0CC3091C-DB40-49D1-AC8F-3ACCABCAD952}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CC3091C-DB40-49D1-AC8F-3ACCABCAD952}.Release|Any CPU.Build.0 = Release|Any CPU - {0CC3091C-DB40-49D1-AC8F-3ACCABCAD952}.Release|x86.ActiveCfg = Release|Any CPU - {0CC3091C-DB40-49D1-AC8F-3ACCABCAD952}.Release|x86.Build.0 = Release|Any CPU - {370AF0EE-1080-4785-A65C-6F471E64B6D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {370AF0EE-1080-4785-A65C-6F471E64B6D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {370AF0EE-1080-4785-A65C-6F471E64B6D2}.Debug|x86.ActiveCfg = Debug|Any CPU - {370AF0EE-1080-4785-A65C-6F471E64B6D2}.Debug|x86.Build.0 = Debug|Any CPU - {370AF0EE-1080-4785-A65C-6F471E64B6D2}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {370AF0EE-1080-4785-A65C-6F471E64B6D2}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {370AF0EE-1080-4785-A65C-6F471E64B6D2}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {370AF0EE-1080-4785-A65C-6F471E64B6D2}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {370AF0EE-1080-4785-A65C-6F471E64B6D2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {370AF0EE-1080-4785-A65C-6F471E64B6D2}.Release|Any CPU.Build.0 = Release|Any CPU - {370AF0EE-1080-4785-A65C-6F471E64B6D2}.Release|x86.ActiveCfg = Release|Any CPU - {370AF0EE-1080-4785-A65C-6F471E64B6D2}.Release|x86.Build.0 = Release|Any CPU - {8F34670A-B91D-460B-9D67-7A03F7194673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F34670A-B91D-460B-9D67-7A03F7194673}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F34670A-B91D-460B-9D67-7A03F7194673}.Debug|x86.ActiveCfg = Debug|Any CPU - {8F34670A-B91D-460B-9D67-7A03F7194673}.Debug|x86.Build.0 = Debug|Any CPU - {8F34670A-B91D-460B-9D67-7A03F7194673}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {8F34670A-B91D-460B-9D67-7A03F7194673}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {8F34670A-B91D-460B-9D67-7A03F7194673}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {8F34670A-B91D-460B-9D67-7A03F7194673}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {8F34670A-B91D-460B-9D67-7A03F7194673}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F34670A-B91D-460B-9D67-7A03F7194673}.Release|Any CPU.Build.0 = Release|Any CPU - {8F34670A-B91D-460B-9D67-7A03F7194673}.Release|x86.ActiveCfg = Release|Any CPU - {8F34670A-B91D-460B-9D67-7A03F7194673}.Release|x86.Build.0 = Release|Any CPU - {EEBBE595-2478-40B1-A147-7F44E40A2686}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EEBBE595-2478-40B1-A147-7F44E40A2686}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EEBBE595-2478-40B1-A147-7F44E40A2686}.Debug|x86.ActiveCfg = Debug|Any CPU - {EEBBE595-2478-40B1-A147-7F44E40A2686}.Debug|x86.Build.0 = Debug|Any CPU - {EEBBE595-2478-40B1-A147-7F44E40A2686}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {EEBBE595-2478-40B1-A147-7F44E40A2686}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {EEBBE595-2478-40B1-A147-7F44E40A2686}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {EEBBE595-2478-40B1-A147-7F44E40A2686}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {EEBBE595-2478-40B1-A147-7F44E40A2686}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EEBBE595-2478-40B1-A147-7F44E40A2686}.Release|Any CPU.Build.0 = Release|Any CPU - {EEBBE595-2478-40B1-A147-7F44E40A2686}.Release|x86.ActiveCfg = Release|Any CPU - {EEBBE595-2478-40B1-A147-7F44E40A2686}.Release|x86.Build.0 = Release|Any CPU - {836A5763-216D-4596-94B6-5F60E7F0655C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {836A5763-216D-4596-94B6-5F60E7F0655C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {836A5763-216D-4596-94B6-5F60E7F0655C}.Debug|x86.ActiveCfg = Debug|Any CPU - {836A5763-216D-4596-94B6-5F60E7F0655C}.Debug|x86.Build.0 = Debug|Any CPU - {836A5763-216D-4596-94B6-5F60E7F0655C}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {836A5763-216D-4596-94B6-5F60E7F0655C}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {836A5763-216D-4596-94B6-5F60E7F0655C}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {836A5763-216D-4596-94B6-5F60E7F0655C}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {836A5763-216D-4596-94B6-5F60E7F0655C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {836A5763-216D-4596-94B6-5F60E7F0655C}.Release|Any CPU.Build.0 = Release|Any CPU - {836A5763-216D-4596-94B6-5F60E7F0655C}.Release|x86.ActiveCfg = Release|Any CPU - {836A5763-216D-4596-94B6-5F60E7F0655C}.Release|x86.Build.0 = Release|Any CPU - {0292CE45-BBA4-46B8-ADE4-3C39162C1F46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0292CE45-BBA4-46B8-ADE4-3C39162C1F46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0292CE45-BBA4-46B8-ADE4-3C39162C1F46}.Debug|x86.ActiveCfg = Debug|Any CPU - {0292CE45-BBA4-46B8-ADE4-3C39162C1F46}.Debug|x86.Build.0 = Debug|Any CPU - {0292CE45-BBA4-46B8-ADE4-3C39162C1F46}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {0292CE45-BBA4-46B8-ADE4-3C39162C1F46}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {0292CE45-BBA4-46B8-ADE4-3C39162C1F46}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {0292CE45-BBA4-46B8-ADE4-3C39162C1F46}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {0292CE45-BBA4-46B8-ADE4-3C39162C1F46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0292CE45-BBA4-46B8-ADE4-3C39162C1F46}.Release|Any CPU.Build.0 = Release|Any CPU - {0292CE45-BBA4-46B8-ADE4-3C39162C1F46}.Release|x86.ActiveCfg = Release|Any CPU - {0292CE45-BBA4-46B8-ADE4-3C39162C1F46}.Release|x86.Build.0 = Release|Any CPU - {88AF3957-A64A-4715-ADE5-3BE099034BDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88AF3957-A64A-4715-ADE5-3BE099034BDD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88AF3957-A64A-4715-ADE5-3BE099034BDD}.Debug|x86.ActiveCfg = Debug|Any CPU - {88AF3957-A64A-4715-ADE5-3BE099034BDD}.Debug|x86.Build.0 = Debug|Any CPU - {88AF3957-A64A-4715-ADE5-3BE099034BDD}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {88AF3957-A64A-4715-ADE5-3BE099034BDD}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {88AF3957-A64A-4715-ADE5-3BE099034BDD}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {88AF3957-A64A-4715-ADE5-3BE099034BDD}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {88AF3957-A64A-4715-ADE5-3BE099034BDD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88AF3957-A64A-4715-ADE5-3BE099034BDD}.Release|Any CPU.Build.0 = Release|Any CPU - {88AF3957-A64A-4715-ADE5-3BE099034BDD}.Release|x86.ActiveCfg = Release|Any CPU - {88AF3957-A64A-4715-ADE5-3BE099034BDD}.Release|x86.Build.0 = Release|Any CPU - {98727837-F9FA-476C-B0B5-88845B53FDDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {98727837-F9FA-476C-B0B5-88845B53FDDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {98727837-F9FA-476C-B0B5-88845B53FDDF}.Debug|x86.ActiveCfg = Debug|Any CPU - {98727837-F9FA-476C-B0B5-88845B53FDDF}.Debug|x86.Build.0 = Debug|Any CPU - {98727837-F9FA-476C-B0B5-88845B53FDDF}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {98727837-F9FA-476C-B0B5-88845B53FDDF}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {98727837-F9FA-476C-B0B5-88845B53FDDF}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {98727837-F9FA-476C-B0B5-88845B53FDDF}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {98727837-F9FA-476C-B0B5-88845B53FDDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {98727837-F9FA-476C-B0B5-88845B53FDDF}.Release|Any CPU.Build.0 = Release|Any CPU - {98727837-F9FA-476C-B0B5-88845B53FDDF}.Release|x86.ActiveCfg = Release|Any CPU - {98727837-F9FA-476C-B0B5-88845B53FDDF}.Release|x86.Build.0 = Release|Any CPU - {CC787B80-B003-4F07-8DDD-0E7EF0E9E4CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC787B80-B003-4F07-8DDD-0E7EF0E9E4CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC787B80-B003-4F07-8DDD-0E7EF0E9E4CA}.Debug|x86.ActiveCfg = Debug|Any CPU - {CC787B80-B003-4F07-8DDD-0E7EF0E9E4CA}.Debug|x86.Build.0 = Debug|Any CPU - {CC787B80-B003-4F07-8DDD-0E7EF0E9E4CA}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {CC787B80-B003-4F07-8DDD-0E7EF0E9E4CA}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {CC787B80-B003-4F07-8DDD-0E7EF0E9E4CA}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {CC787B80-B003-4F07-8DDD-0E7EF0E9E4CA}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {CC787B80-B003-4F07-8DDD-0E7EF0E9E4CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC787B80-B003-4F07-8DDD-0E7EF0E9E4CA}.Release|Any CPU.Build.0 = Release|Any CPU - {CC787B80-B003-4F07-8DDD-0E7EF0E9E4CA}.Release|x86.ActiveCfg = Release|Any CPU - {CC787B80-B003-4F07-8DDD-0E7EF0E9E4CA}.Release|x86.Build.0 = Release|Any CPU - {FEC55A64-1B65-4D39-B5FA-D559D55BB190}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FEC55A64-1B65-4D39-B5FA-D559D55BB190}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FEC55A64-1B65-4D39-B5FA-D559D55BB190}.Debug|x86.ActiveCfg = Debug|Any CPU - {FEC55A64-1B65-4D39-B5FA-D559D55BB190}.Debug|x86.Build.0 = Debug|Any CPU - {FEC55A64-1B65-4D39-B5FA-D559D55BB190}.DebugGraphviz|Any CPU.ActiveCfg = Debug|Any CPU - {FEC55A64-1B65-4D39-B5FA-D559D55BB190}.DebugGraphviz|Any CPU.Build.0 = Debug|Any CPU - {FEC55A64-1B65-4D39-B5FA-D559D55BB190}.DebugGraphviz|x86.ActiveCfg = Debug|Any CPU - {FEC55A64-1B65-4D39-B5FA-D559D55BB190}.DebugGraphviz|x86.Build.0 = Debug|Any CPU - {FEC55A64-1B65-4D39-B5FA-D559D55BB190}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FEC55A64-1B65-4D39-B5FA-D559D55BB190}.Release|Any CPU.Build.0 = Release|Any CPU - {FEC55A64-1B65-4D39-B5FA-D559D55BB190}.Release|x86.ActiveCfg = Release|Any CPU - {FEC55A64-1B65-4D39-B5FA-D559D55BB190}.Release|x86.Build.0 = Release|Any CPU - {0F58CE94-C0A3-4517-9FAF-6197BBE99FF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F58CE94-C0A3-4517-9FAF-6197BBE99FF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F58CE94-C0A3-4517-9FAF-6197BBE99FF7}.Debug|x86.ActiveCfg = Debug|x86 - {0F58CE94-C0A3-4517-9FAF-6197BBE99FF7}.Debug|x86.Build.0 = Debug|x86 - {0F58CE94-C0A3-4517-9FAF-6197BBE99FF7}.DebugGraphviz|Any CPU.ActiveCfg = DebugGraphviz|Any CPU - {0F58CE94-C0A3-4517-9FAF-6197BBE99FF7}.DebugGraphviz|Any CPU.Build.0 = DebugGraphviz|Any CPU - {0F58CE94-C0A3-4517-9FAF-6197BBE99FF7}.DebugGraphviz|x86.ActiveCfg = Debug|x86 - {0F58CE94-C0A3-4517-9FAF-6197BBE99FF7}.DebugGraphviz|x86.Build.0 = Debug|x86 - {0F58CE94-C0A3-4517-9FAF-6197BBE99FF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F58CE94-C0A3-4517-9FAF-6197BBE99FF7}.Release|Any CPU.Build.0 = Release|Any CPU - {0F58CE94-C0A3-4517-9FAF-6197BBE99FF7}.Release|x86.ActiveCfg = Release|x86 - {0F58CE94-C0A3-4517-9FAF-6197BBE99FF7}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {1A94D39C-705D-4039-B807-CC6456999135} - EndGlobalSection - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection -EndGlobal diff --git a/Sources/PT.PM.JavaParseTreeUst.Tests/JavaConverterTests.cs b/Sources/PT.PM.JavaParseTreeUst.Tests/JavaConverterTests.cs index b775a4f0..38112dc2 100644 --- a/Sources/PT.PM.JavaParseTreeUst.Tests/JavaConverterTests.cs +++ b/Sources/PT.PM.JavaParseTreeUst.Tests/JavaConverterTests.cs @@ -21,6 +21,11 @@ public class JavaConverterTests [TestCase("AllInOne8.java")] public void Convert_Java_WithoutErrors(string fileName) { + if (fileName == "ManyStringsConcat.java") + { + Assert.Ignore("Not sufficient stack size"); + } + TestUtility.CheckFile(Path.Combine(TestUtility.GrammarsDirectory, "java", "examples", fileName), Stage.Ust); } diff --git a/Sources/PT.PM.JavaParseTreeUst.Tests/JavaParserTests.cs b/Sources/PT.PM.JavaParseTreeUst.Tests/JavaParserTests.cs index a4e95042..7cd42536 100644 --- a/Sources/PT.PM.JavaParseTreeUst.Tests/JavaParserTests.cs +++ b/Sources/PT.PM.JavaParseTreeUst.Tests/JavaParserTests.cs @@ -1,6 +1,5 @@ -using PT.PM.Common; +using NUnit.Framework; using PT.PM.TestUtils; -using NUnit.Framework; using System.IO; namespace PT.PM.JavaParseTreeUst.Tests diff --git a/Sources/PT.PM.JavaParseTreeUst.Tests/PT.PM.JavaParseTreeUst.Tests.csproj b/Sources/PT.PM.JavaParseTreeUst.Tests/PT.PM.JavaParseTreeUst.Tests.csproj index 9227f679..5a259dcd 100644 --- a/Sources/PT.PM.JavaParseTreeUst.Tests/PT.PM.JavaParseTreeUst.Tests.csproj +++ b/Sources/PT.PM.JavaParseTreeUst.Tests/PT.PM.JavaParseTreeUst.Tests.csproj @@ -1,103 +1,21 @@ - - - + + - Debug - AnyCPU - {47F5B401-E788-494E-89C8-A8CA0B6917C4} Library - Properties - PT.PM.JavaParseTreeUst.Tests - PT.PM.JavaParseTreeUst.Tests - v4.6.2 - 512 + netcoreapp2.0 + + - - true - full - false - ..\..\Tests\Unit\bin\Debug\ - DEBUG;TRACE - prompt - 4 + + + ..\..\Tests\Debug\ - - pdbonly - true - ..\..\Tests\Unit\bin\Release\ - TRACE - prompt - 4 + + + ..\..\Tests\Release\ + - - $(SolutionDir)packages\Antlr4.Runtime.4.6.3\lib\net45\Antlr4.Runtime.dll - - - $(SolutionDir)packages\NUnit.3.7.1\lib\net45\nunit.framework.dll - - - - - - - - - - Properties\AssemblyInfoCommon.cs - - - - - {2b5519c9-4566-4743-a14a-66234299cdb8} - PT.PM.AntlrUtils - - - {9215df23-07be-49aa-90a0-ed1c542c388c} - PT.PM.Matching - - - {2a6f7ac9-92aa-48b8-a53b-50770424c9b6} - PT.PM.Patterns - - - {FEC55A64-1B65-4D39-B5FA-D559D55BB190} - PT.PM.TestUtils - - - {0b10dbae-c18d-4007-b799-0b3b1e00376e} - PT.PM.Common - - - {f5e3ce00-6854-4fa8-add2-0248df6d85db} - PT.PM.JavaParseTreeUst - - - {104f9633-f7a6-4840-a3ad-8d9fd96b39bf} - PT.PM.Tests - - - {ecb44673-2fb0-49e1-811f-973e3fa4dd22} - PT.PM - - - - - - - - - - - - Data\AllInOne7.java - - - Data\AllInOne8.java - - - Data\ManyStringsConcat.java - PreserveNewest @@ -111,12 +29,13 @@ PreserveNewest - - - \ No newline at end of file + + + + + + + + + + diff --git a/Sources/PT.PM.JavaParseTreeUst.Tests/Properties/AssemblyInfo.cs b/Sources/PT.PM.JavaParseTreeUst.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index e7697cb2..00000000 --- a/Sources/PT.PM.JavaParseTreeUst.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PT.PM.JavaParseTreeUst.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("14b87267-d993-49bd-9abd-790d47f9f4b3")] \ No newline at end of file diff --git a/Sources/PT.PM.JavaParseTreeUst.Tests/app.config b/Sources/PT.PM.JavaParseTreeUst.Tests/app.config deleted file mode 100644 index dd831742..00000000 --- a/Sources/PT.PM.JavaParseTreeUst.Tests/app.config +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.JavaParseTreeUst.Tests/packages.config b/Sources/PT.PM.JavaParseTreeUst.Tests/packages.config deleted file mode 100644 index f8979678..00000000 --- a/Sources/PT.PM.JavaParseTreeUst.Tests/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.JavaParseTreeUst/Converter/ExpressionVisitor.cs b/Sources/PT.PM.JavaParseTreeUst/Converter/ExpressionVisitor.cs index 100416d4..ca94fcde 100644 --- a/Sources/PT.PM.JavaParseTreeUst/Converter/ExpressionVisitor.cs +++ b/Sources/PT.PM.JavaParseTreeUst/Converter/ExpressionVisitor.cs @@ -7,7 +7,6 @@ using PT.PM.Common.Nodes.Expressions; using PT.PM.Common.Nodes.Tokens; using PT.PM.Common.Nodes.Tokens.Literals; -using PT.PM.JavaParseTreeUst.Parser; using System; using System.Linq; diff --git a/Sources/PT.PM.JavaParseTreeUst/Converter/JavaAntlrParseTreeConverter.cs b/Sources/PT.PM.JavaParseTreeUst/Converter/JavaAntlrParseTreeConverter.cs index 1524c1d5..61ce3979 100644 --- a/Sources/PT.PM.JavaParseTreeUst/Converter/JavaAntlrParseTreeConverter.cs +++ b/Sources/PT.PM.JavaParseTreeUst/Converter/JavaAntlrParseTreeConverter.cs @@ -3,10 +3,8 @@ using PT.PM.Common.Nodes.GeneralScope; using PT.PM.Common.Nodes.Tokens; using PT.PM.Common.Nodes.TypeMembers; -using PT.PM.JavaParseTreeUst.Parser; using PT.PM.AntlrUtils; using Antlr4.Runtime.Tree; -using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -394,7 +392,8 @@ private Ust ProcessTypeDeclaration(ParserRuleContext context, public Ust VisitMethodCall([NotNull] JavaParser.MethodCallContext context) { - return new InvocationExpression((Expression)Visit(context.IDENTIFIER()), (ArgsUst)Visit(context.expressionList()), + return new InvocationExpression((Expression)Visit(context.IDENTIFIER()), + (ArgsUst)Visit(context.expressionList()) ?? new ArgsUst(), context.GetTextSpan()); } } diff --git a/Sources/PT.PM.JavaParseTreeUst/Converter/JavaAntlrUstConverterVisitorHelper.cs b/Sources/PT.PM.JavaParseTreeUst/Converter/JavaAntlrUstConverterVisitorHelper.cs index 1e9234de..28db12e0 100644 --- a/Sources/PT.PM.JavaParseTreeUst/Converter/JavaAntlrUstConverterVisitorHelper.cs +++ b/Sources/PT.PM.JavaParseTreeUst/Converter/JavaAntlrUstConverterVisitorHelper.cs @@ -3,7 +3,6 @@ using PT.PM.Common.Nodes.Tokens; using PT.PM.Common.Nodes.Statements; using PT.PM.Common.Nodes.TypeMembers; -using PT.PM.JavaParseTreeUst.Parser; using Antlr4.Runtime.Tree; using System.Collections.Generic; using System.Linq; diff --git a/Sources/PT.PM.JavaParseTreeUst/Converter/StatementVisitor.cs b/Sources/PT.PM.JavaParseTreeUst/Converter/StatementVisitor.cs index 2d784693..0da980f1 100644 --- a/Sources/PT.PM.JavaParseTreeUst/Converter/StatementVisitor.cs +++ b/Sources/PT.PM.JavaParseTreeUst/Converter/StatementVisitor.cs @@ -5,7 +5,6 @@ using PT.PM.Common.Nodes.Statements; using PT.PM.Common.Nodes.Statements.Switch; using PT.PM.Common.Nodes.Statements.TryCatchFinally; -using PT.PM.JavaParseTreeUst.Parser; using PT.PM.AntlrUtils; using System.Collections.Generic; using System.Linq; diff --git a/Sources/PT.PM.JavaParseTreeUst/Converter/TypeMemberVisitor.cs b/Sources/PT.PM.JavaParseTreeUst/Converter/TypeMemberVisitor.cs index 4cde5918..d0d12abf 100644 --- a/Sources/PT.PM.JavaParseTreeUst/Converter/TypeMemberVisitor.cs +++ b/Sources/PT.PM.JavaParseTreeUst/Converter/TypeMemberVisitor.cs @@ -3,7 +3,6 @@ using PT.PM.Common.Nodes.Tokens; using PT.PM.Common.Nodes.Statements; using PT.PM.Common.Nodes.TypeMembers; -using PT.PM.JavaParseTreeUst.Parser; using Antlr4.Runtime.Tree; using System.Collections.Generic; using System.Linq; diff --git a/Sources/PT.PM.JavaParseTreeUst/JavaAntlrParseTree.cs b/Sources/PT.PM.JavaParseTreeUst/JavaAntlrParseTree.cs index 174b058b..f8475f99 100644 --- a/Sources/PT.PM.JavaParseTreeUst/JavaAntlrParseTree.cs +++ b/Sources/PT.PM.JavaParseTreeUst/JavaAntlrParseTree.cs @@ -1,6 +1,5 @@ using PT.PM.AntlrUtils; using PT.PM.Common; -using PT.PM.JavaParseTreeUst.Parser; namespace PT.PM.JavaParseTreeUst { diff --git a/Sources/PT.PM.JavaParseTreeUst/JavaAntlrParser.cs b/Sources/PT.PM.JavaParseTreeUst/JavaAntlrParser.cs index 0c3139c4..397132ac 100644 --- a/Sources/PT.PM.JavaParseTreeUst/JavaAntlrParser.cs +++ b/Sources/PT.PM.JavaParseTreeUst/JavaAntlrParser.cs @@ -1,7 +1,6 @@ using Antlr4.Runtime; using PT.PM.AntlrUtils; using PT.PM.Common; -using PT.PM.JavaParseTreeUst.Parser; namespace PT.PM.JavaParseTreeUst { diff --git a/Sources/PT.PM.JavaParseTreeUst/PT.PM.JavaParseTreeUst.csproj b/Sources/PT.PM.JavaParseTreeUst/PT.PM.JavaParseTreeUst.csproj index 4238535c..611dc41f 100644 --- a/Sources/PT.PM.JavaParseTreeUst/PT.PM.JavaParseTreeUst.csproj +++ b/Sources/PT.PM.JavaParseTreeUst/PT.PM.JavaParseTreeUst.csproj @@ -1,95 +1,31 @@ - - - + + - Debug - AnyCPU - {F5E3CE00-6854-4FA8-ADD2-0248DF6D85DB} - Library - Properties - PT.PM.JavaParseTreeUst - PT.PM.JavaParseTreeUst - v4.6.2 - 512 - - + netstandard2.0 + false - - true - full - false + + ..\..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - - pdbonly - true + + ..\..\bin\Release\ - TRACE - prompt - 4 - - mono - - - - $(SolutionDir)packages\Antlr4.Runtime.4.6.3\lib\net45\Antlr4.Runtime.dll - - - - - - - - - - - - - - - - - - - - - - - - - Properties\AssemblyInfoCommon.cs - - - - - {2b5519c9-4566-4743-a14a-66234299cdb8} - PT.PM.AntlrUtils - - - {0b10dbae-c18d-4007-b799-0b3b1e00376e} - PT.PM.Common - - - {0292ce45-bba4-46b8-ade4-3c39162c1f46} - PT.PM.Prebuild - - + - - JavaLexer.g4 - - - JavaParser.g4 - - + + + + + + + PT.PM.JavaParseTreeUst + false + + + PT.PM.JavaParseTreeUst + false + - - - - - - \ No newline at end of file + diff --git a/Sources/PT.PM.JavaParseTreeUst/Properties/AssemblyInfo.cs b/Sources/PT.PM.JavaParseTreeUst/Properties/AssemblyInfo.cs deleted file mode 100644 index 553094c2..00000000 --- a/Sources/PT.PM.JavaParseTreeUst/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PT.PM.JavaParseTreeUst")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f5e3ce00-6854-4fa8-add2-0248df6d85db")] \ No newline at end of file diff --git a/Sources/PT.PM.JavaParseTreeUst/packages.config b/Sources/PT.PM.JavaParseTreeUst/packages.config deleted file mode 100644 index 7386c269..00000000 --- a/Sources/PT.PM.JavaParseTreeUst/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Sources/PT.PM.JavaScriptParseTreeUst.Tests/PT.PM.JavaScriptParseTreeUst.Tests.csproj b/Sources/PT.PM.JavaScriptParseTreeUst.Tests/PT.PM.JavaScriptParseTreeUst.Tests.csproj index a8270ccc..70cc42e1 100644 --- a/Sources/PT.PM.JavaScriptParseTreeUst.Tests/PT.PM.JavaScriptParseTreeUst.Tests.csproj +++ b/Sources/PT.PM.JavaScriptParseTreeUst.Tests/PT.PM.JavaScriptParseTreeUst.Tests.csproj @@ -1,105 +1,32 @@ - - - + + - Debug - AnyCPU - {CC787B80-B003-4F07-8DDD-0E7EF0E9E4CA} - Library - Properties - PT.PM.JavaScriptParseTreeUst.Tests - PT.PM.JavaScriptParseTreeUst.Tests - v4.6.2 - 512 - + netcoreapp2.0 - - true - full - false - ..\..\Tests\Unit\bin\Debug\ - DEBUG;TRACE - prompt - 4 + + + ..\..\Tests\Debug\ - - pdbonly - true - ..\..\Tests\Unit\bin\Release\ - TRACE - prompt - 4 + + + ..\..\Tests\Release\ - - - $(SolutionDir)packages\Antlr4.Runtime.4.6.3\lib\net45\Antlr4.Runtime.dll - - - $(SolutionDir)packages\NUnit.3.7.1\lib\net45\nunit.framework.dll - - - - - - - - - - - - - - - Properties\AssemblyInfoCommon.cs - - + PreserveNewest - - - - - - {98727837-f9fa-476c-b0b5-88845b53fddf} - PT.PM.JavaScriptParseTreeUst - - - {9215df23-07be-49aa-90a0-ed1c542c388c} - PT.PM.Matching - - - {2a6f7ac9-92aa-48b8-a53b-50770424c9b6} - PT.PM.Patterns - - - {FEC55A64-1B65-4D39-B5FA-D559D55BB190} - PT.PM.TestUtils - - - {0B10DBAE-C18D-4007-B799-0B3B1E00376E} - PT.PM.Common - - - {ECB44673-2FB0-49E1-811F-973E3FA4DD22} - PT.PM - - - PreserveNewest + + + + + + - + - - - \ No newline at end of file + diff --git a/Sources/PT.PM.JavaScriptParseTreeUst.Tests/Properties/AssemblyInfo.cs b/Sources/PT.PM.JavaScriptParseTreeUst.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 5b2bc9b1..00000000 --- a/Sources/PT.PM.JavaScriptParseTreeUst.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PT.PM.JavaScriptParseTreeUst.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("cc787b80-b003-4f07-8ddd-0e7ef0e9e4ca")] diff --git a/Sources/PT.PM.JavaScriptParseTreeUst.Tests/app.config b/Sources/PT.PM.JavaScriptParseTreeUst.Tests/app.config deleted file mode 100644 index dd831742..00000000 --- a/Sources/PT.PM.JavaScriptParseTreeUst.Tests/app.config +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.JavaScriptParseTreeUst.Tests/packages.config b/Sources/PT.PM.JavaScriptParseTreeUst.Tests/packages.config deleted file mode 100644 index f8979678..00000000 --- a/Sources/PT.PM.JavaScriptParseTreeUst.Tests/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.JavaScriptParseTreeUst/JavaScriptAntlrParseTree.cs b/Sources/PT.PM.JavaScriptParseTreeUst/JavaScriptAntlrParseTree.cs index ebee20e4..116cd2c2 100644 --- a/Sources/PT.PM.JavaScriptParseTreeUst/JavaScriptAntlrParseTree.cs +++ b/Sources/PT.PM.JavaScriptParseTreeUst/JavaScriptAntlrParseTree.cs @@ -1,6 +1,5 @@ using PT.PM.AntlrUtils; using PT.PM.Common; -using PT.PM.JavaScriptParseTreeUst.Parser; namespace PT.PM.JavaScriptParseTreeUst { diff --git a/Sources/PT.PM.JavaScriptParseTreeUst/JavaScriptAntlrParser.cs b/Sources/PT.PM.JavaScriptParseTreeUst/JavaScriptAntlrParser.cs index fc9366f6..08e49171 100644 --- a/Sources/PT.PM.JavaScriptParseTreeUst/JavaScriptAntlrParser.cs +++ b/Sources/PT.PM.JavaScriptParseTreeUst/JavaScriptAntlrParser.cs @@ -1,7 +1,7 @@ using PT.PM.AntlrUtils; using PT.PM.Common; using Antlr4.Runtime; -using PT.PM.JavaScriptParseTreeUst.Parser; +using static PT.PM.JavaScriptParseTreeUst.JavaScriptParser; namespace PT.PM.JavaScriptParseTreeUst { diff --git a/Sources/PT.PM.JavaScriptParseTreeUst/JavaScriptParseTreeConverter.cs b/Sources/PT.PM.JavaScriptParseTreeUst/JavaScriptParseTreeConverter.cs index 76c40fe9..8abadb67 100644 --- a/Sources/PT.PM.JavaScriptParseTreeUst/JavaScriptParseTreeConverter.cs +++ b/Sources/PT.PM.JavaScriptParseTreeUst/JavaScriptParseTreeConverter.cs @@ -10,7 +10,6 @@ using PT.PM.Common.Nodes.Tokens; using PT.PM.Common.Nodes.Tokens.Literals; using PT.PM.Common.Nodes.TypeMembers; -using PT.PM.JavaScriptParseTreeUst.Parser; using System.Collections.Generic; using System.Linq; diff --git a/Sources/PT.PM.JavaScriptParseTreeUst/PT.PM.JavaScriptParseTreeUst.csproj b/Sources/PT.PM.JavaScriptParseTreeUst/PT.PM.JavaScriptParseTreeUst.csproj index 339e13f8..e5dda237 100644 --- a/Sources/PT.PM.JavaScriptParseTreeUst/PT.PM.JavaScriptParseTreeUst.csproj +++ b/Sources/PT.PM.JavaScriptParseTreeUst/PT.PM.JavaScriptParseTreeUst.csproj @@ -1,97 +1,34 @@ - - - + + - Debug - AnyCPU - {98727837-F9FA-476C-B0B5-88845B53FDDF} - Library - Properties - PT.PM.JavaScriptParseTreeUst - PT.PM.JavaScriptParseTreeUst - v4.6.2 - 512 - + netstandard2.0 + false - - true - full - false + + ..\..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - - pdbonly - true + + ..\..\bin\Release\ - TRACE - prompt - 4 - - mono - - - - $(SolutionDir)packages\Antlr4.Runtime.4.6.3\lib\net45\Antlr4.Runtime.dll - - - - - - - - - - - - - JavaScriptBaseLexer.cs - - - JavaScriptBaseParser.cs - - - - - - - - - - - - - Properties\AssemblyInfoCommon.cs - - - - - JavaScriptLexer.g4 - - - JavaScriptParser.g4 - - - + - - {2b5519c9-4566-4743-a14a-66234299cdb8} - PT.PM.AntlrUtils - - - {0b10dbae-c18d-4007-b799-0b3b1e00376e} - PT.PM.Common - - - {0292ce45-bba4-46b8-ade4-3c39162c1f46} - PT.PM.Prebuild - + + + + + + false + PT.PM.JavaScriptParseTreeUst + + + false + PT.PM.JavaScriptParseTreeUst + + + + - - - - + \ No newline at end of file diff --git a/Sources/PT.PM.JavaScriptParseTreeUst/Properties/AssemblyInfo.cs b/Sources/PT.PM.JavaScriptParseTreeUst/Properties/AssemblyInfo.cs deleted file mode 100644 index c9b243a5..00000000 --- a/Sources/PT.PM.JavaScriptParseTreeUst/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PT.PM.JavaScriptParseTreeUst")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("98727837-f9fa-476c-b0b5-88845b53fddf")] diff --git a/Sources/PT.PM.JavaScriptParseTreeUst/packages.config b/Sources/PT.PM.JavaScriptParseTreeUst/packages.config deleted file mode 100644 index 7386c269..00000000 --- a/Sources/PT.PM.JavaScriptParseTreeUst/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Sources/PT.PM.Matching.Tests/PT.PM.Matching.Tests.csproj b/Sources/PT.PM.Matching.Tests/PT.PM.Matching.Tests.csproj index f0114647..9a117514 100644 --- a/Sources/PT.PM.Matching.Tests/PT.PM.Matching.Tests.csproj +++ b/Sources/PT.PM.Matching.Tests/PT.PM.Matching.Tests.csproj @@ -1,128 +1,23 @@ - - - + + - Debug - AnyCPU - {F9D784D4-36E4-49F8-BEA4-38BDBB6910D8} - Library - Properties - PT.PM.Matching.Tests - PT.PM.Matching.Tests - v4.6.2 - 512 + netcoreapp2.0 - - true - full - false - ..\..\Tests\Unit\bin\Debug\ - DEBUG;TRACE - prompt - 4 + + + ..\..\Tests\Debug\ - - pdbonly - true - ..\..\Tests\Unit\bin\Release\ - TRACE - prompt - 4 + + + ..\..\Tests\Release + - - $(SolutionDir)packages\NUnit.3.7.1\lib\net45\nunit.framework.dll - - - + + + - - - - - - - - - - - - - Properties\AssemblyInfoCommon.cs - + - - - {3B09E6EC-8069-4ED3-AAD8-145953FD7DCA} - PT.PM.CSharpParseTreeUst - - - {F5E3CE00-6854-4FA8-ADD2-0248DF6D85DB} - PT.PM.JavaParseTreeUst - - - {98727837-F9FA-476C-B0B5-88845B53FDDF} - PT.PM.JavaScriptParseTreeUst - - - {08FBC341-AC44-4CAE-AE71-9462F7885E3E} - PT.PM.PhpParseTreeUst - - - {8F34670A-B91D-460B-9D67-7A03F7194673} - PT.PM.SqlParseTreeUst - - - {FEC55A64-1B65-4D39-B5FA-D559D55BB190} - PT.PM.TestUtils - - - {0b10dbae-c18d-4007-b799-0b3b1e00376e} - PT.PM.Common - - - {e3db8014-0bfb-4399-9b49-a8be446c5049} - PT.PM.CSharpParseTreeUst.Tests - - - {0cc3091c-db40-49d1-ac8f-3accabcad952} - PT.PM.Dsl - - - {47f5b401-e788-494e-89c8-a8ca0b6917c4} - PT.PM.JavaParseTreeUst.Tests - - - {9215df23-07be-49aa-90a0-ed1c542c388c} - PT.PM.Matching - - - {2a6f7ac9-92aa-48b8-a53b-50770424c9b6} - PT.PM.Patterns - - - {933dcca3-b5d1-45ae-acab-1672d71bc349} - PT.PM.PhpParseTreeUst.Tests - - - {ecb44673-2fb0-49e1-811f-973e3fa4dd22} - PT.PM - - - - - - - - - - - - \ No newline at end of file + diff --git a/Sources/PT.PM.Matching.Tests/Properties/AssemblyInfo.cs b/Sources/PT.PM.Matching.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 4ea3561a..00000000 --- a/Sources/PT.PM.Matching.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PT.PM.Matching.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("3aac945c-0df1-4241-b00f-7c2a197c0ed8")] diff --git a/Sources/PT.PM.Matching.Tests/app.config b/Sources/PT.PM.Matching.Tests/app.config deleted file mode 100644 index 4f422937..00000000 --- a/Sources/PT.PM.Matching.Tests/app.config +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.Matching.Tests/packages.config b/Sources/PT.PM.Matching.Tests/packages.config deleted file mode 100644 index 0ff81ddd..00000000 --- a/Sources/PT.PM.Matching.Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Sources/PT.PM.Matching/PT.PM.Matching.csproj b/Sources/PT.PM.Matching/PT.PM.Matching.csproj index 4afbee94..edcf9cc1 100644 --- a/Sources/PT.PM.Matching/PT.PM.Matching.csproj +++ b/Sources/PT.PM.Matching/PT.PM.Matching.csproj @@ -1,125 +1,19 @@ - - - + - Debug - AnyCPU - {9215DF23-07BE-49AA-90A0-ED1C542C388C} - Library - Properties - PT.PM.Matching - PT.PM.Matching - v4.6.2 - 512 + netstandard2.0 + false - - true - full - false + + ..\..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - - pdbonly - true + + ..\..\bin\Release\ - TRACE - prompt - 4 + - - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Properties\AssemblyInfoCommon.cs - - - - - {0b10dbae-c18d-4007-b799-0b3b1e00376e} - PT.PM.Common - - - - - - - \ No newline at end of file diff --git a/Sources/PT.PM.Matching/PatternDto.cs b/Sources/PT.PM.Matching/PatternDto.cs index c6e65414..b4559dec 100644 --- a/Sources/PT.PM.Matching/PatternDto.cs +++ b/Sources/PT.PM.Matching/PatternDto.cs @@ -39,6 +39,13 @@ public override string ToString() lang.Value.IsSql ? Languages.Contains(lang.Key) : true)) { languages = "SQL"; + string rest = string.Join(", ", patternLanguages.Where(lang => + !lang.Value.IsSql && Languages.Contains(lang.Key)) + .Select(lang => lang.Key)); + if (rest != "") + { + languages += ", " + rest; + } } else { diff --git a/Sources/PT.PM.Matching/Properties/AssemblyInfo.cs b/Sources/PT.PM.Matching/Properties/AssemblyInfo.cs deleted file mode 100644 index ca241b31..00000000 --- a/Sources/PT.PM.Matching/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("PT.PM.Matching")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a TypeType in this assembly from -// COM, set the ComVisible attribute to true on that TypeType. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8fc541b0-916a-46f9-8ecf-7a74d5e4134d")] diff --git a/Sources/PT.PM.Matching/packages.config b/Sources/PT.PM.Matching/packages.config deleted file mode 100644 index 542d4d95..00000000 --- a/Sources/PT.PM.Matching/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Sources/PT.PM.PatternEditor/App.paml.cs b/Sources/PT.PM.PatternEditor/App.paml.cs index e81e4d8d..ff0cd730 100644 --- a/Sources/PT.PM.PatternEditor/App.paml.cs +++ b/Sources/PT.PM.PatternEditor/App.paml.cs @@ -20,6 +20,7 @@ static void Main(string[] args) { InitializeLogging(); AppBuilder.Configure() + .UseReactiveUI() .UsePlatformDetect() .Start(); } diff --git a/Sources/PT.PM.PatternEditor/GuiHelpers.cs b/Sources/PT.PM.PatternEditor/GuiHelpers.cs index c9294134..5ebf9b44 100644 --- a/Sources/PT.PM.PatternEditor/GuiHelpers.cs +++ b/Sources/PT.PM.PatternEditor/GuiHelpers.cs @@ -1,4 +1,5 @@ using Avalonia.Controls; +using PT.PM.Common; using PT.PM.Common.Exceptions; namespace PT.PM.PatternEditor @@ -17,8 +18,8 @@ internal static void ProcessErrorOnDoubleClick(ListBox errorsListBox, TextBox in } else if (errorsListBox.SelectedItem is ConversionException conversionException) { - var textSpan = conversionException.TextSpan; - if (textSpan != null) + TextSpan textSpan = conversionException.TextSpan; + if (!textSpan.IsZero) { selectionStart = textSpan.Start; selectionEnd = textSpan.End; @@ -26,8 +27,8 @@ internal static void ProcessErrorOnDoubleClick(ListBox errorsListBox, TextBox in } else if (errorsListBox.SelectedItem is MatchingException matchException) { - var textSpan = matchException.TextSpan; - if (textSpan != null) + TextSpan textSpan = matchException.TextSpan; + if (!textSpan.IsZero) { selectionStart = textSpan.Start; selectionEnd = textSpan.End; diff --git a/Sources/PT.PM.PatternEditor/MainWindow.paml b/Sources/PT.PM.PatternEditor/MainWindow.paml index 838f6875..cf15de15 100644 --- a/Sources/PT.PM.PatternEditor/MainWindow.paml +++ b/Sources/PT.PM.PatternEditor/MainWindow.paml @@ -1,6 +1,6 @@  + + + + + + @@ -16,7 +24,8 @@ - + +