Merge branch 'master' of https://github.com/pascalabcnet/pascalabcnet …

…into test
spectatorBH · Jul 7, 2024 · 8a4594f · 8a4594f
2 parents af454bb + f528ee0
commit 8a4594f
Show file tree

Hide file tree

Showing 101 changed files with 857 additions and 614 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,7 +49,7 @@
 **/StringConstants.dll
 **/ParserTools.dll
 **/PascalABCParser.dll
-**/PascalLanguage.dll
+**/PascalABCLanguageInfo.dll
 **/PluginsSupport.dll
 **/PluginsSupportLinux.dll
 **/Properties.Resources.Designer.cs.dll

diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs
@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "9";
 	public const string Build = "0";
-	public const string Revision = "3499";
+	public const string Revision = "3500";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

diff --git a/Configuration/Version.defs b/Configuration/Version.defs
@@ -1,4 +1,4 @@
-%MINOR%=9
-%REVISION%=3499
 %COREVERSION%=0
+%REVISION%=3500
+%MINOR%=9
 %MAJOR%=3
diff --git a/LanguageIntegrator/LanguageIntegrator.cs b/LanguageIntegrator/LanguageIntegrator.cs
@@ -89,7 +89,7 @@ public static void LoadStandardLanguages()
 
             DirectoryInfo directory = new DirectoryInfo(directoryName);
 
-            FileInfo[] dllFiles = directory.GetFiles("*Language.dll");
+            FileInfo[] dllFiles = directory.GetFiles("*LanguageInfo.dll");
 
             foreach (FileInfo languageFile in dllFiles)
             {

diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources
diff --git a/Languages/KuMir/KuMir-gppg-Parser/KuMir00.cs → Parsers/KuMir-gppg-Parser/KuMir00.cs b/Languages/KuMir/KuMir-gppg-Parser/KuMir00.cs → Parsers/KuMir-gppg-Parser/KuMir00.cs
diff --git a/...ir/KuMir-gppg-Parser/KuMir00Parser.csproj → ...rs/KuMir-gppg-Parser/KuMir00Parser.csproj b/...ir/KuMir-gppg-Parser/KuMir00Parser.csproj → ...rs/KuMir-gppg-Parser/KuMir00Parser.csproj
diff --git a/...KuMir/KuMir-gppg-Parser/KuMir00Parser.sln → Parsers/KuMir-gppg-Parser/KuMir00Parser.sln b/...KuMir/KuMir-gppg-Parser/KuMir00Parser.sln → Parsers/KuMir-gppg-Parser/KuMir00Parser.sln
diff --git a/...r/KuMir-gppg-Parser/KuMir00ParserTools.cs → ...s/KuMir-gppg-Parser/KuMir00ParserTools.cs b/...r/KuMir-gppg-Parser/KuMir00ParserTools.cs → ...s/KuMir-gppg-Parser/KuMir00ParserTools.cs
diff --git a/...es/KuMir/KuMir-gppg-Parser/KuMir00yacc.cs → Parsers/KuMir-gppg-Parser/KuMir00yacc.cs b/...es/KuMir/KuMir-gppg-Parser/KuMir00yacc.cs → Parsers/KuMir-gppg-Parser/KuMir00yacc.cs
diff --git a/Languages/KuMir/KuMir-gppg-Parser/Parser.cs → Parsers/KuMir-gppg-Parser/Parser.cs b/Languages/KuMir/KuMir-gppg-Parser/Parser.cs → Parsers/KuMir-gppg-Parser/Parser.cs
diff --git a/...ir-gppg-Parser/Properties/AssemblyInfo.cs → ...ir-gppg-Parser/Properties/AssemblyInfo.cs b/...ir-gppg-Parser/Properties/AssemblyInfo.cs → ...ir-gppg-Parser/Properties/AssemblyInfo.cs
diff --git a/...uMir-gppg-Parser/ShiftReduceParserCode.cs → ...uMir-gppg-Parser/ShiftReduceParserCode.cs b/...uMir-gppg-Parser/ShiftReduceParserCode.cs → ...uMir-gppg-Parser/ShiftReduceParserCode.cs
diff --git a/...ron/Oberon00Parser/LanguageInformation.cs → ...ers/Oberon00Parser/LanguageInformation.cs b/...ron/Oberon00Parser/LanguageInformation.cs → ...ers/Oberon00Parser/LanguageInformation.cs
diff --git a/...eron/Oberon00Parser/Oberon00Parser.csproj → Parsers/Oberon00Parser/Oberon00Parser.csproj b/...eron/Oberon00Parser/Oberon00Parser.csproj → Parsers/Oberon00Parser/Oberon00Parser.csproj
diff --git a/...ron/Oberon00Parser/Oberon00ParserTools.cs → ...ers/Oberon00Parser/Oberon00ParserTools.cs b/...ron/Oberon00Parser/Oberon00ParserTools.cs → ...ers/Oberon00Parser/Oberon00ParserTools.cs
diff --git a/Languages/Oberon/Oberon00Parser/Parser.cs → Parsers/Oberon00Parser/Parser.cs b/Languages/Oberon/Oberon00Parser/Parser.cs → Parsers/Oberon00Parser/Parser.cs
diff --git a/...Oberon00Parser/Properties/AssemblyInfo.cs → ...Oberon00Parser/Properties/AssemblyInfo.cs b/...Oberon00Parser/Properties/AssemblyInfo.cs → ...Oberon00Parser/Properties/AssemblyInfo.cs
diff --git a/...n/Oberon00Parser/ShiftReduceParserCode.cs → ...s/Oberon00Parser/ShiftReduceParserCode.cs b/...n/Oberon00Parser/ShiftReduceParserCode.cs → ...s/Oberon00Parser/ShiftReduceParserCode.cs
diff --git a/Languages/Oberon/Oberon00Parser/oberon00.cs → Parsers/Oberon00Parser/oberon00.cs b/Languages/Oberon/Oberon00Parser/oberon00.cs → Parsers/Oberon00Parser/oberon00.cs
diff --git a/...ges/Oberon/Oberon00Parser/oberon00yacc.cs → Parsers/Oberon00Parser/oberon00yacc.cs b/...ges/Oberon/Oberon00Parser/oberon00yacc.cs → Parsers/Oberon00Parser/oberon00yacc.cs
diff --git a/Languages/OldPython/PythonParser/Errors.cs → Parsers/OldPythonParser/Errors.cs b/Languages/OldPython/PythonParser/Errors.cs → Parsers/OldPythonParser/Errors.cs
diff --git a/...uages/OldPython/PythonParser/GPPGTools.cs → Parsers/OldPythonParser/GPPGTools.cs b/...uages/OldPython/PythonParser/GPPGTools.cs → Parsers/OldPythonParser/GPPGTools.cs
diff --git a/Languages/OldPython/PythonParser/Parser.cs → Parsers/OldPythonParser/Parser.cs b/Languages/OldPython/PythonParser/Parser.cs → Parsers/OldPythonParser/Parser.cs
diff --git a/...n/PythonParser/Properties/AssemblyInfo.cs → ...ldPythonParser/Properties/AssemblyInfo.cs b/...n/PythonParser/Properties/AssemblyInfo.cs → ...ldPythonParser/Properties/AssemblyInfo.cs
diff --git a/...ldPython/PythonParser/PythonParser.csproj → Parsers/OldPythonParser/PythonParser.csproj b/...ldPython/PythonParser/PythonParser.csproj → Parsers/OldPythonParser/PythonParser.csproj
diff --git a/...dPython/PythonParser/PythonParserTools.cs → Parsers/OldPythonParser/PythonParserTools.cs b/...dPython/PythonParser/PythonParserTools.cs → Parsers/OldPythonParser/PythonParserTools.cs
diff --git a/...OldPython/PythonParser/python_gppg_lex.cs → Parsers/OldPythonParser/python_gppg_lex.cs b/...OldPython/PythonParser/python_gppg_lex.cs → Parsers/OldPythonParser/python_gppg_lex.cs
diff --git a/...ldPython/PythonParser/python_gppg_yacc.cs → Parsers/OldPythonParser/python_gppg_yacc.cs b/...ldPython/PythonParser/python_gppg_yacc.cs → Parsers/OldPythonParser/python_gppg_yacc.cs
diff --git a/...l/PascalABCParserNewSaushkin/ABCPascal.cs → ...s/PascalABCParserNewSaushkin/ABCPascal.cs b/...l/PascalABCParserNewSaushkin/ABCPascal.cs → ...s/PascalABCParserNewSaushkin/ABCPascal.cs
diff --git a/.../PascalABCParserNewSaushkin/ABCPascal.lex → .../PascalABCParserNewSaushkin/ABCPascal.lex b/.../PascalABCParserNewSaushkin/ABCPascal.lex → .../PascalABCParserNewSaushkin/ABCPascal.lex
diff --git a/...al/PascalABCParserNewSaushkin/ABCPascal.y → ...rs/PascalABCParserNewSaushkin/ABCPascal.y b/...al/PascalABCParserNewSaushkin/ABCPascal.y → ...rs/PascalABCParserNewSaushkin/ABCPascal.y
diff --git a/...ParserNewSaushkin/ABCPascalParserTools.cs → ...ParserNewSaushkin/ABCPascalParserTools.cs b/...ParserNewSaushkin/ABCPascalParserTools.cs → ...ParserNewSaushkin/ABCPascalParserTools.cs
diff --git a/...CParserNewSaushkin/ABCPascalSavushkin.sln → ...CParserNewSaushkin/ABCPascalSavushkin.sln b/...CParserNewSaushkin/ABCPascalSavushkin.sln → ...CParserNewSaushkin/ABCPascalSavushkin.sln
diff --git a/...scalABCParserNewSaushkin/ABCPascalYacc.cs → ...scalABCParserNewSaushkin/ABCPascalYacc.cs b/...scalABCParserNewSaushkin/ABCPascalYacc.cs → ...scalABCParserNewSaushkin/ABCPascalYacc.cs
diff --git a/...ParserNewSaushkin/DocTagsParser/Parser.cs → ...ParserNewSaushkin/DocTagsParser/Parser.cs b/...ParserNewSaushkin/DocTagsParser/Parser.cs → ...ParserNewSaushkin/DocTagsParser/Parser.cs
diff --git a/...scal/PascalABCParserNewSaushkin/Errors.cs → Parsers/PascalABCParserNewSaushkin/Errors.cs b/...scal/PascalABCParserNewSaushkin/Errors.cs → Parsers/PascalABCParserNewSaushkin/Errors.cs
diff --git a/...ABCParserNewSaushkin/GPLex_GPPG/Gplex.exe → ...ABCParserNewSaushkin/GPLex_GPPG/Gplex.exe b/...ABCParserNewSaushkin/GPLex_GPPG/Gplex.exe → ...ABCParserNewSaushkin/GPLex_GPPG/Gplex.exe
diff --git a/...lABCParserNewSaushkin/GPLex_GPPG/Gppg.exe → ...lABCParserNewSaushkin/GPLex_GPPG/Gppg.exe b/...lABCParserNewSaushkin/GPLex_GPPG/Gppg.exe → ...lABCParserNewSaushkin/GPLex_GPPG/Gppg.exe
diff --git a/...hkin/GPLex_GPPG/QUT.ShiftReduceParser.dll → ...hkin/GPLex_GPPG/QUT.ShiftReduceParser.dll b/...hkin/GPLex_GPPG/QUT.ShiftReduceParser.dll → ...hkin/GPLex_GPPG/QUT.ShiftReduceParser.dll
diff --git a/...ParserNewSaushkin/GPLex_GPPG/gplexx.frame → ...ParserNewSaushkin/GPLex_GPPG/gplexx.frame b/...ParserNewSaushkin/GPLex_GPPG/gplexx.frame → ...ParserNewSaushkin/GPLex_GPPG/gplexx.frame
diff --git a/...arserNewSaushkin/GPLex_GPPG/guesser.frame → ...arserNewSaushkin/GPLex_GPPG/guesser.frame b/...arserNewSaushkin/GPLex_GPPG/guesser.frame → ...arserNewSaushkin/GPLex_GPPG/guesser.frame
diff --git a/...al/PascalABCParserNewSaushkin/Keywords.cs → ...rs/PascalABCParserNewSaushkin/Keywords.cs b/...al/PascalABCParserNewSaushkin/Keywords.cs → ...rs/PascalABCParserNewSaushkin/Keywords.cs
diff --git a/...scal/PascalABCParserNewSaushkin/PABC.tags → Parsers/PascalABCParserNewSaushkin/PABC.tags b/...scal/PascalABCParserNewSaushkin/PABC.tags → Parsers/PascalABCParserNewSaushkin/PABC.tags
diff --git a/...ascal/PascalABCParserNewSaushkin/PABC.ymc → Parsers/PascalABCParserNewSaushkin/PABC.ymc b/...ascal/PascalABCParserNewSaushkin/PABC.ymc → Parsers/PascalABCParserNewSaushkin/PABC.ymc
diff --git a/...scal/PascalABCParserNewSaushkin/Parser.cs → Parsers/PascalABCParserNewSaushkin/Parser.cs b/...scal/PascalABCParserNewSaushkin/Parser.cs → Parsers/PascalABCParserNewSaushkin/Parser.cs
diff --git a/...BCParserNewSaushkin/ParserLambdaHelper.cs → ...BCParserNewSaushkin/ParserLambdaHelper.cs b/...BCParserNewSaushkin/ParserLambdaHelper.cs → ...BCParserNewSaushkin/ParserLambdaHelper.cs
diff --git a/...ewSaushkin/PascalABCSaushkinParser.csproj → ...ewSaushkin/PascalABCSaushkinParser.csproj b/...ewSaushkin/PascalABCSaushkinParser.csproj → ...ewSaushkin/PascalABCSaushkinParser.csproj
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1443F539-DCC7-4491-B4FD-B716C739DB3C}</ProjectGuid>
+    <ProjectGuid>{0ED020FF-D28E-4791-BBDD-B8B9BA714096}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Languages.Pascal.Frontend</RootNamespace>
@@ -41,7 +41,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>3</WarningLevel>
@@ -52,7 +52,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\..\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -111,31 +111,31 @@
     <Compile Include="StringResources.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Errors\Errors.csproj">
+    <ProjectReference Include="..\..\Errors\Errors.csproj">
       <Project>{44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B}</Project>
       <Name>Errors</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\LanguageIntegrator\LanguageIntegrator.csproj">
+    <ProjectReference Include="..\..\LanguageIntegrator\LanguageIntegrator.csproj">
       <Project>{a48d9069-d569-4110-9252-a10f139b669b}</Project>
       <Name>LanguageIntegrator</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Localization\Localization.csproj">
+    <ProjectReference Include="..\..\Localization\Localization.csproj">
       <Project>{2DE2842F-0912-4251-BC0F-480854C44A13}</Project>
       <Name>Localization</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\ParserTools\ParserTools.csproj">
+    <ProjectReference Include="..\..\ParserTools\ParserTools.csproj">
       <Project>{AF2EFD7B-69DD-4B43-AF65-B59B29349C23}</Project>
       <Name>ParserTools</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\StringConstants\StringConstants.csproj">
+    <ProjectReference Include="..\..\StringConstants\StringConstants.csproj">
       <Project>{e8aefbf9-0113-4fa4-be45-6cda555498b7}</Project>
       <Name>StringConstants</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\SyntaxTree\SyntaxTree.csproj">
+    <ProjectReference Include="..\..\SyntaxTree\SyntaxTree.csproj">
       <Project>{C2CAC65A-B2AE-4CCC-B067-E6B8E75DF73A}</Project>
       <Name>SyntaxTree</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\SyntaxVisitors\SyntaxVisitors.csproj">
+    <ProjectReference Include="..\..\SyntaxVisitors\SyntaxVisitors.csproj">
       <Project>{a9ab4282-83b4-41a7-86c3-e5bf6a45e7e2}</Project>
       <Name>SyntaxVisitors</Name>
     </ProjectReference>

diff --git a/...ParserNewSaushkin/SemanticRulesForYacc.cs → ...ParserNewSaushkin/SemanticRulesForYacc.cs b/...ParserNewSaushkin/SemanticRulesForYacc.cs → ...ParserNewSaushkin/SemanticRulesForYacc.cs
diff --git a/...alABCParserNewSaushkin/StringResources.cs → ...alABCParserNewSaushkin/StringResources.cs b/...alABCParserNewSaushkin/StringResources.cs → ...alABCParserNewSaushkin/StringResources.cs
diff --git a/...l/PascalABCParserNewSaushkin/convert4.exe → ...s/PascalABCParserNewSaushkin/convert4.exe b/...l/PascalABCParserNewSaushkin/convert4.exe → ...s/PascalABCParserNewSaushkin/convert4.exe
diff --git a/...rserNewSaushkin/generateParserScanner.bat → ...rserNewSaushkin/generateParserScanner.bat b/...rserNewSaushkin/generateParserScanner.bat → ...rserNewSaushkin/generateParserScanner.bat
diff --git a/...lABCParserNewSaushkin/generateScanner.bat → ...lABCParserNewSaushkin/generateScanner.bat b/...lABCParserNewSaushkin/generateScanner.bat → ...lABCParserNewSaushkin/generateScanner.bat
diff --git a/...s/VisualBasic/VBNETParser/ASTConverter.cs → Parsers/VBNETParser/ASTConverter.cs b/...s/VisualBasic/VBNETParser/ASTConverter.cs → Parsers/VBNETParser/ASTConverter.cs
diff --git a/...s/VisualBasic/VBNETParser/AssemblyInfo.cs → Parsers/VBNETParser/AssemblyInfo.cs b/...s/VisualBasic/VBNETParser/AssemblyInfo.cs → Parsers/VBNETParser/AssemblyInfo.cs
diff --git a/...ic/VBNETParser/DocTagsParser/DocParser.cs → ...rs/VBNETParser/DocTagsParser/DocParser.cs b/...ic/VBNETParser/DocTagsParser/DocParser.cs → ...rs/VBNETParser/DocTagsParser/DocParser.cs
diff --git a/...lBasic/VBNETParser/LanguageInformation.cs → Parsers/VBNETParser/LanguageInformation.cs b/...lBasic/VBNETParser/LanguageInformation.cs → Parsers/VBNETParser/LanguageInformation.cs
diff --git a/Languages/VisualBasic/VBNETParser/Parser.cs → Parsers/VBNETParser/Parser.cs b/Languages/VisualBasic/VBNETParser/Parser.cs → Parsers/VBNETParser/Parser.cs
diff --git a/...isualBasic/VBNETParser/VBNETParser.csproj → Parsers/VBNETParser/VBNETParser.csproj b/...isualBasic/VBNETParser/VBNETParser.csproj → Parsers/VBNETParser/VBNETParser.csproj
diff --git a/...s/Pascal/PascalLanguage/PascalLanguage.cs → PascalABCLanguageInfo/PascalABCLanguage.cs b/...s/Pascal/PascalLanguage/PascalLanguage.cs → PascalABCLanguageInfo/PascalABCLanguage.cs
@@ -10,10 +10,10 @@
 
 namespace Languages.Pascal
 {
-    public class PascalLanguage : BaseLanguage
+    public class PascalABCLanguage : BaseLanguage
     {
 
-        public PascalLanguage() : base(
+        public PascalABCLanguage() : base(
             name: StringConstants.pascalLanguageName,
             version: "1.2",
             copyright: "Copyright © 2005-2024 by Ivan Bondarev, Stanislav Mikhalkovich",

diff --git a/...scal/PascalLanguage/PascalLanguage.csproj → ...LanguageInfo/PascalABCLanguageInfo.csproj b/...scal/PascalLanguage/PascalLanguage.csproj → ...LanguageInfo/PascalABCLanguageInfo.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Languages.Pascal</RootNamespace>
-    <AssemblyName>PascalLanguage</AssemblyName>
+    <AssemblyName>PascalABCLanguageInfo</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
@@ -17,15 +17,15 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\bin\</OutputPath>
+    <OutputPath>..\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -40,46 +40,46 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="PascalLanguage.cs" />
+    <Compile Include="PascalABCLanguage.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\LambdaAnySynToSemConverter\LambdaAnySynToSemConverter.csproj">
+    <ProjectReference Include="..\LambdaAnySynToSemConverter\LambdaAnySynToSemConverter.csproj">
       <Project>{27d9800e-2689-4aa1-a2d6-128e4a9bae98}</Project>
       <Name>LambdaAnySynToSemConverter</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\LanguageIntegrator\LanguageIntegrator.csproj">
+    <ProjectReference Include="..\LanguageIntegrator\LanguageIntegrator.csproj">
       <Project>{a48d9069-d569-4110-9252-a10f139b669b}</Project>
       <Name>LanguageIntegrator</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\ParserTools\ParserTools.csproj">
+    <ProjectReference Include="..\Parsers\PascalABCParserNewSaushkin\PascalABCSaushkinParser.csproj">
+      <Project>{0ed020ff-d28e-4791-bbdd-b8b9ba714096}</Project>
+      <Name>PascalABCSaushkinParser</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ParserTools\ParserTools.csproj">
       <Project>{af2efd7b-69dd-4b43-af65-b59b29349c23}</Project>
       <Name>ParserTools</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\StringConstants\StringConstants.csproj">
+    <ProjectReference Include="..\StringConstants\StringConstants.csproj">
       <Project>{e8aefbf9-0113-4fa4-be45-6cda555498b7}</Project>
       <Name>StringConstants</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\SyntaxTree\SyntaxTree.csproj">
+    <ProjectReference Include="..\SyntaxTreeConverters\SyntaxTreeConverters.csproj">
+      <Project>{f10a5330-dcf4-4533-877c-7b1b1be23884}</Project>
+      <Name>SyntaxTreeConverters</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\SyntaxTree\SyntaxTree.csproj">
       <Project>{c2cac65a-b2ae-4ccc-b067-e6b8e75df73a}</Project>
       <Name>SyntaxTree</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\SyntaxVisitors\SyntaxVisitors.csproj">
+    <ProjectReference Include="..\SyntaxVisitors\SyntaxVisitors.csproj">
       <Project>{A9AB4282-83B4-41A7-86C3-E5BF6A45E7E2}</Project>
       <Name>SyntaxVisitors</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\TreeConverter\TreeConverter.csproj">
+    <ProjectReference Include="..\TreeConverter\TreeConverter.csproj">
       <Project>{1c9c945a-586d-42a2-a06b-65d84fa7ff78}</Project>
       <Name>TreeConverter</Name>
     </ProjectReference>
-    <ProjectReference Include="..\PascalABCParserNewSaushkin\PascalABCSaushkinParser.csproj">
-      <Project>{1443f539-dcc7-4491-b4fd-b716c739db3c}</Project>
-      <Name>PascalABCSaushkinParser</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\SyntaxTreeConverters\SyntaxTreeConverters\SyntaxTreeConverters.csproj">
-      <Project>{f10a5330-dcf4-4533-877c-7b1b1be23884}</Project>
-      <Name>SyntaxTreeConverters</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/...PascalLanguage/Properties/AssemblyInfo.cs → ...BCLanguageInfo/Properties/AssemblyInfo.cs b/...PascalLanguage/Properties/AssemblyInfo.cs → ...BCLanguageInfo/Properties/AssemblyInfo.cs
diff --git a/PascalABCNET.sln b/PascalABCNET.sln
@@ -61,7 +61,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Optimizer", "Optimizer\Opti
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeCompletion", "CodeCompletion\CodeCompletion.csproj", "{1AB15F6E-C22E-499A-A7ED-54BA7DE5CFA6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Languages", "Languages", "{BB6973BA-B3A2-4B31-A986-7CB008F22C4F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LanguagePlugins", "LanguagePlugins", "{BB6973BA-B3A2-4B31-A986-7CB008F22C4F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Trees", "Trees", "{94EED2FF-0641-4562-8167-CBC280A733AF}"
 EndProject
@@ -103,21 +103,15 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageIntegrator", "Langu
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StringConstants", "StringConstants\StringConstants.csproj", "{E8AEFBF9-0113-4FA4-BE45-6CDA555498B7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pascal", "Pascal", "{17A1159B-4039-451E-BBEF-F4643A39F1E6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualBasic", "VisualBasic", "{0CD99885-0BBF-431E-A83C-21CFFB506FF0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PascalABCSaushkinParser", "Languages\Pascal\PascalABCParserNewSaushkin\PascalABCSaushkinParser.csproj", "{1443F539-DCC7-4491-B4FD-B716C739DB3C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNETParser", "Languages\VisualBasic\VBNETParser\VBNETParser.csproj", "{1D51D03C-FB74-4AB2-84B4-09EB077BEAFE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LambdaAnySynToSemConverter", "LambdaAnySynToSemConverter\LambdaAnySynToSemConverter.csproj", "{27D9800E-2689-4AA1-A2D6-128E4A9BAE98}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PascalLanguage", "Languages\Pascal\PascalLanguage\PascalLanguage.csproj", "{BD902586-E0D5-407A-904A-32249B8B709E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Parsers", "Parsers", "{E952792F-B9F0-450C-B0D8-3128DF95EF19}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SyntaxTreeConverters", "SyntaxTreeConverters", "{BE2CCDAD-74BE-401F-A92A-81CEF4725E96}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PascalABCSaushkinParser", "Parsers\PascalABCParserNewSaushkin\PascalABCSaushkinParser.csproj", "{0ED020FF-D28E-4791-BBDD-B8B9BA714096}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LambdaAnySynToSemConverter", "LambdaAnySynToSemConverter\LambdaAnySynToSemConverter.csproj", "{27D9800E-2689-4AA1-A2D6-128E4A9BAE98}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PascalABCLanguageInfo", "PascalABCLanguageInfo\PascalABCLanguageInfo.csproj", "{BD902586-E0D5-407A-904A-32249B8B709E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SyntaxTreeConverters", "Languages\Pascal\SyntaxTreeConverters\SyntaxTreeConverters\SyntaxTreeConverters.csproj", "{F10A5330-DCF4-4533-877C-7B1B1BE23884}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SyntaxTreeConverters", "SyntaxTreeConverters\SyntaxTreeConverters.csproj", "{F10A5330-DCF4-4533-877C-7B1B1BE23884}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -493,40 +487,6 @@ Global
 		{E8AEFBF9-0113-4FA4-BE45-6CDA555498B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E8AEFBF9-0113-4FA4-BE45-6CDA555498B7}.Release|x86.ActiveCfg = Release|Any CPU
 		{E8AEFBF9-0113-4FA4-BE45-6CDA555498B7}.Release|x86.Build.0 = Release|Any CPU
-		{1443F539-DCC7-4491-B4FD-B716C739DB3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1443F539-DCC7-4491-B4FD-B716C739DB3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1443F539-DCC7-4491-B4FD-B716C739DB3C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1443F539-DCC7-4491-B4FD-B716C739DB3C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1443F539-DCC7-4491-B4FD-B716C739DB3C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1443F539-DCC7-4491-B4FD-B716C739DB3C}.Debug|x86.Build.0 = Debug|Any CPU
-		{1443F539-DCC7-4491-B4FD-B716C739DB3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1443F539-DCC7-4491-B4FD-B716C739DB3C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1443F539-DCC7-4491-B4FD-B716C739DB3C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1443F539-DCC7-4491-B4FD-B716C739DB3C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1443F539-DCC7-4491-B4FD-B716C739DB3C}.Release|x86.ActiveCfg = Release|Any CPU
-		{1443F539-DCC7-4491-B4FD-B716C739DB3C}.Release|x86.Build.0 = Release|Any CPU
-		{1D51D03C-FB74-4AB2-84B4-09EB077BEAFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D51D03C-FB74-4AB2-84B4-09EB077BEAFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D51D03C-FB74-4AB2-84B4-09EB077BEAFE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1D51D03C-FB74-4AB2-84B4-09EB077BEAFE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1D51D03C-FB74-4AB2-84B4-09EB077BEAFE}.Debug|x86.Build.0 = Debug|Any CPU
-		{1D51D03C-FB74-4AB2-84B4-09EB077BEAFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D51D03C-FB74-4AB2-84B4-09EB077BEAFE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1D51D03C-FB74-4AB2-84B4-09EB077BEAFE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1D51D03C-FB74-4AB2-84B4-09EB077BEAFE}.Release|x86.ActiveCfg = Release|Any CPU
-		{1D51D03C-FB74-4AB2-84B4-09EB077BEAFE}.Release|x86.Build.0 = Release|Any CPU
-		{BD902586-E0D5-407A-904A-32249B8B709E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD902586-E0D5-407A-904A-32249B8B709E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD902586-E0D5-407A-904A-32249B8B709E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BD902586-E0D5-407A-904A-32249B8B709E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BD902586-E0D5-407A-904A-32249B8B709E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BD902586-E0D5-407A-904A-32249B8B709E}.Debug|x86.Build.0 = Debug|Any CPU
-		{BD902586-E0D5-407A-904A-32249B8B709E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD902586-E0D5-407A-904A-32249B8B709E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD902586-E0D5-407A-904A-32249B8B709E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BD902586-E0D5-407A-904A-32249B8B709E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BD902586-E0D5-407A-904A-32249B8B709E}.Release|x86.ActiveCfg = Release|Any CPU
-		{BD902586-E0D5-407A-904A-32249B8B709E}.Release|x86.Build.0 = Release|Any CPU
 		{27D9800E-2689-4AA1-A2D6-128E4A9BAE98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{27D9800E-2689-4AA1-A2D6-128E4A9BAE98}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{27D9800E-2689-4AA1-A2D6-128E4A9BAE98}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -539,6 +499,30 @@ Global
 		{27D9800E-2689-4AA1-A2D6-128E4A9BAE98}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{27D9800E-2689-4AA1-A2D6-128E4A9BAE98}.Release|x86.ActiveCfg = Release|Any CPU
 		{27D9800E-2689-4AA1-A2D6-128E4A9BAE98}.Release|x86.Build.0 = Release|Any CPU
+		{0ED020FF-D28E-4791-BBDD-B8B9BA714096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0ED020FF-D28E-4791-BBDD-B8B9BA714096}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0ED020FF-D28E-4791-BBDD-B8B9BA714096}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0ED020FF-D28E-4791-BBDD-B8B9BA714096}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0ED020FF-D28E-4791-BBDD-B8B9BA714096}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0ED020FF-D28E-4791-BBDD-B8B9BA714096}.Debug|x86.Build.0 = Debug|Any CPU
+		{0ED020FF-D28E-4791-BBDD-B8B9BA714096}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0ED020FF-D28E-4791-BBDD-B8B9BA714096}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0ED020FF-D28E-4791-BBDD-B8B9BA714096}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0ED020FF-D28E-4791-BBDD-B8B9BA714096}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0ED020FF-D28E-4791-BBDD-B8B9BA714096}.Release|x86.ActiveCfg = Release|Any CPU
+		{0ED020FF-D28E-4791-BBDD-B8B9BA714096}.Release|x86.Build.0 = Release|Any CPU
+		{BD902586-E0D5-407A-904A-32249B8B709E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD902586-E0D5-407A-904A-32249B8B709E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD902586-E0D5-407A-904A-32249B8B709E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BD902586-E0D5-407A-904A-32249B8B709E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BD902586-E0D5-407A-904A-32249B8B709E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BD902586-E0D5-407A-904A-32249B8B709E}.Debug|x86.Build.0 = Debug|Any CPU
+		{BD902586-E0D5-407A-904A-32249B8B709E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD902586-E0D5-407A-904A-32249B8B709E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD902586-E0D5-407A-904A-32249B8B709E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BD902586-E0D5-407A-904A-32249B8B709E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BD902586-E0D5-407A-904A-32249B8B709E}.Release|x86.ActiveCfg = Release|Any CPU
+		{BD902586-E0D5-407A-904A-32249B8B709E}.Release|x86.Build.0 = Release|Any CPU
 		{F10A5330-DCF4-4533-877C-7B1B1BE23884}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F10A5330-DCF4-4533-877C-7B1B1BE23884}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F10A5330-DCF4-4533-877C-7B1B1BE23884}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -594,14 +578,11 @@ Global
 		{536CC813-7C4E-42BC-AE3A-BA1427F38756} = {EC68A3D8-6D63-4A79-ABA6-BF8E9D7756D7}
 		{A48D9069-D569-4110-9252-A10F139B669B} = {F8CE2712-826B-450B-A72F-D32D80C99858}
 		{E8AEFBF9-0113-4FA4-BE45-6CDA555498B7} = {F8CE2712-826B-450B-A72F-D32D80C99858}
-		{17A1159B-4039-451E-BBEF-F4643A39F1E6} = {BB6973BA-B3A2-4B31-A986-7CB008F22C4F}
-		{0CD99885-0BBF-431E-A83C-21CFFB506FF0} = {BB6973BA-B3A2-4B31-A986-7CB008F22C4F}
-		{1443F539-DCC7-4491-B4FD-B716C739DB3C} = {17A1159B-4039-451E-BBEF-F4643A39F1E6}
-		{1D51D03C-FB74-4AB2-84B4-09EB077BEAFE} = {0CD99885-0BBF-431E-A83C-21CFFB506FF0}
-		{BD902586-E0D5-407A-904A-32249B8B709E} = {17A1159B-4039-451E-BBEF-F4643A39F1E6}
-		{BE2CCDAD-74BE-401F-A92A-81CEF4725E96} = {17A1159B-4039-451E-BBEF-F4643A39F1E6}
 		{27D9800E-2689-4AA1-A2D6-128E4A9BAE98} = {F8CE2712-826B-450B-A72F-D32D80C99858}
-		{F10A5330-DCF4-4533-877C-7B1B1BE23884} = {BE2CCDAD-74BE-401F-A92A-81CEF4725E96}
+		{E952792F-B9F0-450C-B0D8-3128DF95EF19} = {F8CE2712-826B-450B-A72F-D32D80C99858}
+		{0ED020FF-D28E-4791-BBDD-B8B9BA714096} = {E952792F-B9F0-450C-B0D8-3128DF95EF19}
+		{BD902586-E0D5-407A-904A-32249B8B709E} = {F8CE2712-826B-450B-A72F-D32D80C99858}
+		{F10A5330-DCF4-4533-877C-7B1B1BE23884} = {F8CE2712-826B-450B-A72F-D32D80C99858}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {68E993E6-EE86-4DDF-B0A1-4FE884F8AC39}