diff --git a/.gitignore b/.gitignore index fece88ca9..362b9526f 100644 --- 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/LanguageIntegrator/LanguageIntegrator.cs b/LanguageIntegrator/LanguageIntegrator.cs index 3b4bba2b7..6cff61955 100644 --- a/LanguageIntegrator/LanguageIntegrator.cs +++ b/LanguageIntegrator/LanguageIntegrator.cs @@ -89,7 +89,7 @@ namespace Languages.Integration 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/Languages/KuMir/KuMir-gppg-Parser/KuMir00.cs b/Parsers/KuMir-gppg-Parser/KuMir00.cs similarity index 100% rename from Languages/KuMir/KuMir-gppg-Parser/KuMir00.cs rename to Parsers/KuMir-gppg-Parser/KuMir00.cs diff --git a/Languages/KuMir/KuMir-gppg-Parser/KuMir00Parser.csproj b/Parsers/KuMir-gppg-Parser/KuMir00Parser.csproj similarity index 100% rename from Languages/KuMir/KuMir-gppg-Parser/KuMir00Parser.csproj rename to Parsers/KuMir-gppg-Parser/KuMir00Parser.csproj diff --git a/Languages/KuMir/KuMir-gppg-Parser/KuMir00Parser.sln b/Parsers/KuMir-gppg-Parser/KuMir00Parser.sln similarity index 100% rename from Languages/KuMir/KuMir-gppg-Parser/KuMir00Parser.sln rename to Parsers/KuMir-gppg-Parser/KuMir00Parser.sln diff --git a/Languages/KuMir/KuMir-gppg-Parser/KuMir00ParserTools.cs b/Parsers/KuMir-gppg-Parser/KuMir00ParserTools.cs similarity index 100% rename from Languages/KuMir/KuMir-gppg-Parser/KuMir00ParserTools.cs rename to Parsers/KuMir-gppg-Parser/KuMir00ParserTools.cs diff --git a/Languages/KuMir/KuMir-gppg-Parser/KuMir00yacc.cs b/Parsers/KuMir-gppg-Parser/KuMir00yacc.cs similarity index 100% rename from Languages/KuMir/KuMir-gppg-Parser/KuMir00yacc.cs rename to Parsers/KuMir-gppg-Parser/KuMir00yacc.cs diff --git a/Languages/KuMir/KuMir-gppg-Parser/Parser.cs b/Parsers/KuMir-gppg-Parser/Parser.cs similarity index 100% rename from Languages/KuMir/KuMir-gppg-Parser/Parser.cs rename to Parsers/KuMir-gppg-Parser/Parser.cs diff --git a/Languages/KuMir/KuMir-gppg-Parser/Properties/AssemblyInfo.cs b/Parsers/KuMir-gppg-Parser/Properties/AssemblyInfo.cs similarity index 100% rename from Languages/KuMir/KuMir-gppg-Parser/Properties/AssemblyInfo.cs rename to Parsers/KuMir-gppg-Parser/Properties/AssemblyInfo.cs diff --git a/Languages/KuMir/KuMir-gppg-Parser/ShiftReduceParserCode.cs b/Parsers/KuMir-gppg-Parser/ShiftReduceParserCode.cs similarity index 100% rename from Languages/KuMir/KuMir-gppg-Parser/ShiftReduceParserCode.cs rename to Parsers/KuMir-gppg-Parser/ShiftReduceParserCode.cs diff --git a/Languages/Oberon/Oberon00Parser/LanguageInformation.cs b/Parsers/Oberon00Parser/LanguageInformation.cs similarity index 100% rename from Languages/Oberon/Oberon00Parser/LanguageInformation.cs rename to Parsers/Oberon00Parser/LanguageInformation.cs diff --git a/Languages/Oberon/Oberon00Parser/Oberon00Parser.csproj b/Parsers/Oberon00Parser/Oberon00Parser.csproj similarity index 100% rename from Languages/Oberon/Oberon00Parser/Oberon00Parser.csproj rename to Parsers/Oberon00Parser/Oberon00Parser.csproj diff --git a/Languages/Oberon/Oberon00Parser/Oberon00ParserTools.cs b/Parsers/Oberon00Parser/Oberon00ParserTools.cs similarity index 100% rename from Languages/Oberon/Oberon00Parser/Oberon00ParserTools.cs rename to Parsers/Oberon00Parser/Oberon00ParserTools.cs diff --git a/Languages/Oberon/Oberon00Parser/Parser.cs b/Parsers/Oberon00Parser/Parser.cs similarity index 100% rename from Languages/Oberon/Oberon00Parser/Parser.cs rename to Parsers/Oberon00Parser/Parser.cs diff --git a/Languages/Oberon/Oberon00Parser/Properties/AssemblyInfo.cs b/Parsers/Oberon00Parser/Properties/AssemblyInfo.cs similarity index 100% rename from Languages/Oberon/Oberon00Parser/Properties/AssemblyInfo.cs rename to Parsers/Oberon00Parser/Properties/AssemblyInfo.cs diff --git a/Languages/Oberon/Oberon00Parser/ShiftReduceParserCode.cs b/Parsers/Oberon00Parser/ShiftReduceParserCode.cs similarity index 100% rename from Languages/Oberon/Oberon00Parser/ShiftReduceParserCode.cs rename to Parsers/Oberon00Parser/ShiftReduceParserCode.cs diff --git a/Languages/Oberon/Oberon00Parser/oberon00.cs b/Parsers/Oberon00Parser/oberon00.cs similarity index 100% rename from Languages/Oberon/Oberon00Parser/oberon00.cs rename to Parsers/Oberon00Parser/oberon00.cs diff --git a/Languages/Oberon/Oberon00Parser/oberon00yacc.cs b/Parsers/Oberon00Parser/oberon00yacc.cs similarity index 100% rename from Languages/Oberon/Oberon00Parser/oberon00yacc.cs rename to Parsers/Oberon00Parser/oberon00yacc.cs diff --git a/Languages/OldPython/PythonParser/Errors.cs b/Parsers/OldPythonParser/Errors.cs similarity index 100% rename from Languages/OldPython/PythonParser/Errors.cs rename to Parsers/OldPythonParser/Errors.cs diff --git a/Languages/OldPython/PythonParser/GPPGTools.cs b/Parsers/OldPythonParser/GPPGTools.cs similarity index 100% rename from Languages/OldPython/PythonParser/GPPGTools.cs rename to Parsers/OldPythonParser/GPPGTools.cs diff --git a/Languages/OldPython/PythonParser/Parser.cs b/Parsers/OldPythonParser/Parser.cs similarity index 100% rename from Languages/OldPython/PythonParser/Parser.cs rename to Parsers/OldPythonParser/Parser.cs diff --git a/Languages/OldPython/PythonParser/Properties/AssemblyInfo.cs b/Parsers/OldPythonParser/Properties/AssemblyInfo.cs similarity index 100% rename from Languages/OldPython/PythonParser/Properties/AssemblyInfo.cs rename to Parsers/OldPythonParser/Properties/AssemblyInfo.cs diff --git a/Languages/OldPython/PythonParser/PythonParser.csproj b/Parsers/OldPythonParser/PythonParser.csproj similarity index 100% rename from Languages/OldPython/PythonParser/PythonParser.csproj rename to Parsers/OldPythonParser/PythonParser.csproj diff --git a/Languages/OldPython/PythonParser/PythonParserTools.cs b/Parsers/OldPythonParser/PythonParserTools.cs similarity index 100% rename from Languages/OldPython/PythonParser/PythonParserTools.cs rename to Parsers/OldPythonParser/PythonParserTools.cs diff --git a/Languages/OldPython/PythonParser/python_gppg_lex.cs b/Parsers/OldPythonParser/python_gppg_lex.cs similarity index 100% rename from Languages/OldPython/PythonParser/python_gppg_lex.cs rename to Parsers/OldPythonParser/python_gppg_lex.cs diff --git a/Languages/OldPython/PythonParser/python_gppg_yacc.cs b/Parsers/OldPythonParser/python_gppg_yacc.cs similarity index 100% rename from Languages/OldPython/PythonParser/python_gppg_yacc.cs rename to Parsers/OldPythonParser/python_gppg_yacc.cs diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/ABCPascal.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/ABCPascal.cs rename to Parsers/PascalABCParserNewSaushkin/ABCPascal.cs diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/ABCPascal.lex b/Parsers/PascalABCParserNewSaushkin/ABCPascal.lex similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/ABCPascal.lex rename to Parsers/PascalABCParserNewSaushkin/ABCPascal.lex diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/ABCPascal.y b/Parsers/PascalABCParserNewSaushkin/ABCPascal.y similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/ABCPascal.y rename to Parsers/PascalABCParserNewSaushkin/ABCPascal.y diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/ABCPascalParserTools.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalParserTools.cs similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/ABCPascalParserTools.cs rename to Parsers/PascalABCParserNewSaushkin/ABCPascalParserTools.cs diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/ABCPascalSavushkin.sln b/Parsers/PascalABCParserNewSaushkin/ABCPascalSavushkin.sln similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/ABCPascalSavushkin.sln rename to Parsers/PascalABCParserNewSaushkin/ABCPascalSavushkin.sln diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/ABCPascalYacc.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/ABCPascalYacc.cs rename to Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/DocTagsParser/Parser.cs b/Parsers/PascalABCParserNewSaushkin/DocTagsParser/Parser.cs similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/DocTagsParser/Parser.cs rename to Parsers/PascalABCParserNewSaushkin/DocTagsParser/Parser.cs diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/Errors.cs b/Parsers/PascalABCParserNewSaushkin/Errors.cs similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/Errors.cs rename to Parsers/PascalABCParserNewSaushkin/Errors.cs diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/GPLex_GPPG/Gplex.exe b/Parsers/PascalABCParserNewSaushkin/GPLex_GPPG/Gplex.exe similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/GPLex_GPPG/Gplex.exe rename to Parsers/PascalABCParserNewSaushkin/GPLex_GPPG/Gplex.exe diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/GPLex_GPPG/Gppg.exe b/Parsers/PascalABCParserNewSaushkin/GPLex_GPPG/Gppg.exe similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/GPLex_GPPG/Gppg.exe rename to Parsers/PascalABCParserNewSaushkin/GPLex_GPPG/Gppg.exe diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/GPLex_GPPG/QUT.ShiftReduceParser.dll b/Parsers/PascalABCParserNewSaushkin/GPLex_GPPG/QUT.ShiftReduceParser.dll similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/GPLex_GPPG/QUT.ShiftReduceParser.dll rename to Parsers/PascalABCParserNewSaushkin/GPLex_GPPG/QUT.ShiftReduceParser.dll diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/GPLex_GPPG/gplexx.frame b/Parsers/PascalABCParserNewSaushkin/GPLex_GPPG/gplexx.frame similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/GPLex_GPPG/gplexx.frame rename to Parsers/PascalABCParserNewSaushkin/GPLex_GPPG/gplexx.frame diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/GPLex_GPPG/guesser.frame b/Parsers/PascalABCParserNewSaushkin/GPLex_GPPG/guesser.frame similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/GPLex_GPPG/guesser.frame rename to Parsers/PascalABCParserNewSaushkin/GPLex_GPPG/guesser.frame diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/Keywords.cs b/Parsers/PascalABCParserNewSaushkin/Keywords.cs similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/Keywords.cs rename to Parsers/PascalABCParserNewSaushkin/Keywords.cs diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/PABC.tags b/Parsers/PascalABCParserNewSaushkin/PABC.tags similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/PABC.tags rename to Parsers/PascalABCParserNewSaushkin/PABC.tags diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/PABC.ymc b/Parsers/PascalABCParserNewSaushkin/PABC.ymc similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/PABC.ymc rename to Parsers/PascalABCParserNewSaushkin/PABC.ymc diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/Parser.cs b/Parsers/PascalABCParserNewSaushkin/Parser.cs similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/Parser.cs rename to Parsers/PascalABCParserNewSaushkin/Parser.cs diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/ParserLambdaHelper.cs b/Parsers/PascalABCParserNewSaushkin/ParserLambdaHelper.cs similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/ParserLambdaHelper.cs rename to Parsers/PascalABCParserNewSaushkin/ParserLambdaHelper.cs diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/PascalABCSaushkinParser.csproj b/Parsers/PascalABCParserNewSaushkin/PascalABCSaushkinParser.csproj similarity index 89% rename from Languages/Pascal/PascalABCParserNewSaushkin/PascalABCSaushkinParser.csproj rename to Parsers/PascalABCParserNewSaushkin/PascalABCSaushkinParser.csproj index c74cde449..4a1cec354 100644 --- a/Languages/Pascal/PascalABCParserNewSaushkin/PascalABCSaushkinParser.csproj +++ b/Parsers/PascalABCParserNewSaushkin/PascalABCSaushkinParser.csproj @@ -5,7 +5,7 @@ AnyCPU 9.0.30729 2.0 - {1443F539-DCC7-4491-B4FD-B716C739DB3C} + {0ED020FF-D28E-4791-BBDD-B8B9BA714096} Library Properties Languages.Pascal.Frontend @@ -52,7 +52,7 @@ pdbonly true - ..\..\..\bin\ + ..\..\bin\ TRACE prompt 4 @@ -111,31 +111,31 @@ - + {44A01F9E-DCE7-470C-AAE5-C3DE0CCBEE3B} Errors - + {a48d9069-d569-4110-9252-a10f139b669b} LanguageIntegrator - + {2DE2842F-0912-4251-BC0F-480854C44A13} Localization - + {AF2EFD7B-69DD-4B43-AF65-B59B29349C23} ParserTools - + {e8aefbf9-0113-4fa4-be45-6cda555498b7} StringConstants - + {C2CAC65A-B2AE-4CCC-B067-E6B8E75DF73A} SyntaxTree - + {a9ab4282-83b4-41a7-86c3-e5bf6a45e7e2} SyntaxVisitors diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/SemanticRulesForYacc.cs b/Parsers/PascalABCParserNewSaushkin/SemanticRulesForYacc.cs similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/SemanticRulesForYacc.cs rename to Parsers/PascalABCParserNewSaushkin/SemanticRulesForYacc.cs diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/StringResources.cs b/Parsers/PascalABCParserNewSaushkin/StringResources.cs similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/StringResources.cs rename to Parsers/PascalABCParserNewSaushkin/StringResources.cs diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/convert4.exe b/Parsers/PascalABCParserNewSaushkin/convert4.exe similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/convert4.exe rename to Parsers/PascalABCParserNewSaushkin/convert4.exe diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/generateParserScanner.bat b/Parsers/PascalABCParserNewSaushkin/generateParserScanner.bat similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/generateParserScanner.bat rename to Parsers/PascalABCParserNewSaushkin/generateParserScanner.bat diff --git a/Languages/Pascal/PascalABCParserNewSaushkin/generateScanner.bat b/Parsers/PascalABCParserNewSaushkin/generateScanner.bat similarity index 100% rename from Languages/Pascal/PascalABCParserNewSaushkin/generateScanner.bat rename to Parsers/PascalABCParserNewSaushkin/generateScanner.bat diff --git a/Languages/VisualBasic/VBNETParser/ASTConverter.cs b/Parsers/VBNETParser/ASTConverter.cs similarity index 100% rename from Languages/VisualBasic/VBNETParser/ASTConverter.cs rename to Parsers/VBNETParser/ASTConverter.cs diff --git a/Languages/VisualBasic/VBNETParser/AssemblyInfo.cs b/Parsers/VBNETParser/AssemblyInfo.cs similarity index 100% rename from Languages/VisualBasic/VBNETParser/AssemblyInfo.cs rename to Parsers/VBNETParser/AssemblyInfo.cs diff --git a/Languages/VisualBasic/VBNETParser/DocTagsParser/DocParser.cs b/Parsers/VBNETParser/DocTagsParser/DocParser.cs similarity index 100% rename from Languages/VisualBasic/VBNETParser/DocTagsParser/DocParser.cs rename to Parsers/VBNETParser/DocTagsParser/DocParser.cs diff --git a/Languages/VisualBasic/VBNETParser/LanguageInformation.cs b/Parsers/VBNETParser/LanguageInformation.cs similarity index 100% rename from Languages/VisualBasic/VBNETParser/LanguageInformation.cs rename to Parsers/VBNETParser/LanguageInformation.cs diff --git a/Languages/VisualBasic/VBNETParser/Parser.cs b/Parsers/VBNETParser/Parser.cs similarity index 100% rename from Languages/VisualBasic/VBNETParser/Parser.cs rename to Parsers/VBNETParser/Parser.cs diff --git a/Languages/VisualBasic/VBNETParser/VBNETParser.csproj b/Parsers/VBNETParser/VBNETParser.csproj similarity index 100% rename from Languages/VisualBasic/VBNETParser/VBNETParser.csproj rename to Parsers/VBNETParser/VBNETParser.csproj diff --git a/Languages/Pascal/PascalLanguage/PascalLanguage.cs b/PascalABCLanguageInfo/PascalABCLanguage.cs similarity index 96% rename from Languages/Pascal/PascalLanguage/PascalLanguage.cs rename to PascalABCLanguageInfo/PascalABCLanguage.cs index eaafde08a..bcad2844f 100644 --- a/Languages/Pascal/PascalLanguage/PascalLanguage.cs +++ b/PascalABCLanguageInfo/PascalABCLanguage.cs @@ -10,10 +10,10 @@ using PascalABCCompiler.TreeConverter; 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/Languages/Pascal/PascalLanguage/PascalLanguage.csproj b/PascalABCLanguageInfo/PascalABCLanguageInfo.csproj similarity index 77% rename from Languages/Pascal/PascalLanguage/PascalLanguage.csproj rename to PascalABCLanguageInfo/PascalABCLanguageInfo.csproj index 2c4566818..1bffd5e6c 100644 --- a/Languages/Pascal/PascalLanguage/PascalLanguage.csproj +++ b/PascalABCLanguageInfo/PascalABCLanguageInfo.csproj @@ -8,7 +8,7 @@ Library Properties Languages.Pascal - PascalLanguage + PascalABCLanguageInfo v4.0 512 true @@ -25,7 +25,7 @@ pdbonly true - ..\..\..\bin\ + ..\bin\ TRACE prompt 4 @@ -40,46 +40,46 @@ - + - + {27d9800e-2689-4aa1-a2d6-128e4a9bae98} LambdaAnySynToSemConverter - + {a48d9069-d569-4110-9252-a10f139b669b} LanguageIntegrator - + + {0ed020ff-d28e-4791-bbdd-b8b9ba714096} + PascalABCSaushkinParser + + {af2efd7b-69dd-4b43-af65-b59b29349c23} ParserTools - + {e8aefbf9-0113-4fa4-be45-6cda555498b7} StringConstants - + + {f10a5330-dcf4-4533-877c-7b1b1be23884} + SyntaxTreeConverters + + {c2cac65a-b2ae-4ccc-b067-e6b8e75df73a} SyntaxTree - + {A9AB4282-83B4-41A7-86C3-E5BF6A45E7E2} SyntaxVisitors - + {1c9c945a-586d-42a2-a06b-65d84fa7ff78} TreeConverter - - {1443f539-dcc7-4491-b4fd-b716c739db3c} - PascalABCSaushkinParser - - - {f10a5330-dcf4-4533-877c-7b1b1be23884} - SyntaxTreeConverters - \ No newline at end of file diff --git a/Languages/Pascal/PascalLanguage/Properties/AssemblyInfo.cs b/PascalABCLanguageInfo/Properties/AssemblyInfo.cs similarity index 100% rename from Languages/Pascal/PascalLanguage/Properties/AssemblyInfo.cs rename to PascalABCLanguageInfo/Properties/AssemblyInfo.cs diff --git a/PascalABCNET.sln b/PascalABCNET.sln index c1f52f38b..047776b8e 100644 --- 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}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PascalLanguage", "Languages\Pascal\PascalLanguage\PascalLanguage.csproj", "{BD902586-E0D5-407A-904A-32249B8B709E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SyntaxTreeConverters", "SyntaxTreeConverters", "{BE2CCDAD-74BE-401F-A92A-81CEF4725E96}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LambdaAnySynToSemConverter", "LambdaAnySynToSemConverter\LambdaAnySynToSemConverter.csproj", "{27D9800E-2689-4AA1-A2D6-128E4A9BAE98}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SyntaxTreeConverters", "Languages\Pascal\SyntaxTreeConverters\SyntaxTreeConverters\SyntaxTreeConverters.csproj", "{F10A5330-DCF4-4533-877C-7B1B1BE23884}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Parsers", "Parsers", "{E952792F-B9F0-450C-B0D8-3128DF95EF19}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PascalABCSaushkinParser", "Parsers\PascalABCParserNewSaushkin\PascalABCSaushkinParser.csproj", "{0ED020FF-D28E-4791-BBDD-B8B9BA714096}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PascalABCLanguageInfo", "PascalABCLanguageInfo\PascalABCLanguageInfo.csproj", "{BD902586-E0D5-407A-904A-32249B8B709E}" +EndProject +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} diff --git a/PascalABCNET_40.sln b/PascalABCNET_40.sln index 3a8760132..ff879bbdc 100644 --- a/PascalABCNET_40.sln +++ b/PascalABCNET_40.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 @@ -95,22 +95,16 @@ 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", "{2C15CC70-9793-4E37-B2B9-6EF0E10ED954}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PascalABCSaushkinParser", "Languages\Pascal\PascalABCParserNewSaushkin\PascalABCSaushkinParser.csproj", "{1443F539-DCC7-4491-B4FD-B716C739DB3C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualBasic", "VisualBasic", "{9169D94E-A787-4919-B42E-E56302253F7B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VBNETParser", "Languages\VisualBasic\VBNETParser\VBNETParser.csproj", "{1D51D03C-FB74-4AB2-84B4-09EB077BEAFE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PascalLanguage", "Languages\Pascal\PascalLanguage\PascalLanguage.csproj", "{BD902586-E0D5-407A-904A-32249B8B709E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SyntaxTreeConverters", "SyntaxTreeConverters", "{7B2FFEB8-783B-4280-BB5F-3F069DCEF554}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SyntaxTreeConverters", "Languages\Pascal\SyntaxTreeConverters\SyntaxTreeConverters\SyntaxTreeConverters.csproj", "{F10A5330-DCF4-4533-877C-7B1B1BE23884}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LambdaAnySynToSemConverter", "LambdaAnySynToSemConverter\LambdaAnySynToSemConverter.csproj", "{27D9800E-2689-4AA1-A2D6-128E4A9BAE98}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SyntaxTreeConverters", "SyntaxTreeConverters\SyntaxTreeConverters.csproj", "{F10A5330-DCF4-4533-877C-7B1B1BE23884}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Parsers", "Parsers", "{A7AA76D0-7E64-4080-B311-822DD0BCEB6F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PascalABCSaushkinParser", "Parsers\PascalABCParserNewSaushkin\PascalABCSaushkinParser.csproj", "{0ED020FF-D28E-4791-BBDD-B8B9BA714096}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PascalABCLanguageInfo", "PascalABCLanguageInfo\PascalABCLanguageInfo.csproj", "{BD902586-E0D5-407A-904A-32249B8B709E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -437,52 +431,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 - {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 - {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Debug|x86.ActiveCfg = Debug|Any CPU - {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Debug|x86.Build.0 = Debug|Any CPU - {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Release|Any CPU.Build.0 = Release|Any CPU - {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Release|x86.ActiveCfg = Release|Any CPU - {F10A5330-DCF4-4533-877C-7B1B1BE23884}.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 @@ -495,6 +443,42 @@ 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 + {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 + {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Debug|x86.ActiveCfg = Debug|Any CPU + {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Debug|x86.Build.0 = Debug|Any CPU + {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Release|Any CPU.Build.0 = Release|Any CPU + {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F10A5330-DCF4-4533-877C-7B1B1BE23884}.Release|x86.ActiveCfg = Release|Any CPU + {F10A5330-DCF4-4533-877C-7B1B1BE23884}.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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -534,14 +518,11 @@ Global {3AA92A45-7142-4C59-B12F-56DAE32A40E3} = {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} - {2C15CC70-9793-4E37-B2B9-6EF0E10ED954} = {BB6973BA-B3A2-4B31-A986-7CB008F22C4F} - {1443F539-DCC7-4491-B4FD-B716C739DB3C} = {2C15CC70-9793-4E37-B2B9-6EF0E10ED954} - {9169D94E-A787-4919-B42E-E56302253F7B} = {BB6973BA-B3A2-4B31-A986-7CB008F22C4F} - {1D51D03C-FB74-4AB2-84B4-09EB077BEAFE} = {9169D94E-A787-4919-B42E-E56302253F7B} - {BD902586-E0D5-407A-904A-32249B8B709E} = {2C15CC70-9793-4E37-B2B9-6EF0E10ED954} - {7B2FFEB8-783B-4280-BB5F-3F069DCEF554} = {2C15CC70-9793-4E37-B2B9-6EF0E10ED954} - {F10A5330-DCF4-4533-877C-7B1B1BE23884} = {7B2FFEB8-783B-4280-BB5F-3F069DCEF554} {27D9800E-2689-4AA1-A2D6-128E4A9BAE98} = {F8CE2712-826B-450B-A72F-D32D80C99858} + {F10A5330-DCF4-4533-877C-7B1B1BE23884} = {F8CE2712-826B-450B-A72F-D32D80C99858} + {A7AA76D0-7E64-4080-B311-822DD0BCEB6F} = {F8CE2712-826B-450B-A72F-D32D80C99858} + {0ED020FF-D28E-4791-BBDD-B8B9BA714096} = {A7AA76D0-7E64-4080-B311-822DD0BCEB6F} + {BD902586-E0D5-407A-904A-32249B8B709E} = {F8CE2712-826B-450B-A72F-D32D80C99858} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {97A10B06-9161-4E2B-9C6F-10EEF45013EC} diff --git a/ReleaseGenerators/PascalABCNETConsoleZIP.bat b/ReleaseGenerators/PascalABCNETConsoleZIP.bat index cde189744..71ec1131e 100644 --- a/ReleaseGenerators/PascalABCNETConsoleZIP.bat +++ b/ReleaseGenerators/PascalABCNETConsoleZIP.bat @@ -1,6 +1,6 @@ cd ..\bin del ..\Release\PACNETConsole.zip -..\utils\pkzipc\pkzipc.exe -add ..\Release\PABCNETC.zip pabcnetc.exe pabcnetcclear.exe Compiler.dll CompilerTools.dll Errors.dll Localization.dll NETGenerator.dll ParserTools.dll ICSharpCode.NRefactory.dll SemanticTree.dll SyntaxTree.dll TreeConverter.dll OptimizerConversion.dll PascalABCParser.dll PascalLanguage.dll licence.txt PascalABCNET.chm System.Threading.dll SyntaxTreeConverters.dll YieldHelpers.dll SyntaxVisitors.dll LambdaAnySynToSemConverter.dll LanguageIntegrator.dll StringConstants.dll +..\utils\pkzipc\pkzipc.exe -add ..\Release\PABCNETC.zip pabcnetc.exe pabcnetcclear.exe Compiler.dll CompilerTools.dll Errors.dll Localization.dll NETGenerator.dll ParserTools.dll ICSharpCode.NRefactory.dll SemanticTree.dll SyntaxTree.dll TreeConverter.dll OptimizerConversion.dll PascalABCParser.dll PascalABCLanguageInfo.dll licence.txt PascalABCNET.chm System.Threading.dll SyntaxTreeConverters.dll YieldHelpers.dll SyntaxVisitors.dll LambdaAnySynToSemConverter.dll LanguageIntegrator.dll StringConstants.dll ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PABCNETC.zip Lib\*.pcu ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PABCNETC.zip Lng\*.dat ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PABCNETC.zip Lng\*.LanguageName diff --git a/ReleaseGenerators/PascalABCNETMonoZIP.bat b/ReleaseGenerators/PascalABCNETMonoZIP.bat index 200dd281f..5ff66e8ef 100644 --- a/ReleaseGenerators/PascalABCNETMonoZIP.bat +++ b/ReleaseGenerators/PascalABCNETMonoZIP.bat @@ -1,6 +1,6 @@ cd ..\bin del ..\Release\PascalABCNETMono.zip -..\utils\pkzipc\pkzipc.exe -add ..\Release\PascalABCNETMono.zip PascalABCNETMono.exe pabcnetc.exe pabcnetc PascalABCNET Compiler.dll CompilerTools.dll Errors.dll Localization.dll NETGenerator.dll ParserTools.dll SyntaxTreeConverters.dll ICSharpCode.NRefactory.dll SemanticTree.dll SyntaxTree.dll TreeConverter.dll OptimizerConversion.dll PascalABCParser.dll PascalLanguage.dll licence.txt PascalABCNET.chm System.Threading.dll PluginsSupport.dll InternalErrorReport.dll ICSharpCode.TextEditor.dll ICSharpCode.SharpZipLib.dll CodeCompletion.dll Debugger.Core.dll Mono.Debugger.Soft.dll Mono.Debugging.dll Mono.Debugging.Soft.dll NETXP.Controls.dll NETXP.Controls.Bars.dll NETXP.Library.dll NETXP.Win32.dll WeifenLuo.WinFormsUI.Docking.dll template.pct YieldHelpers.dll LanguageIntegrator.dll StringConstants.dll +..\utils\pkzipc\pkzipc.exe -add ..\Release\PascalABCNETMono.zip PascalABCNETMono.exe pabcnetc.exe pabcnetc PascalABCNET Compiler.dll CompilerTools.dll Errors.dll Localization.dll NETGenerator.dll ParserTools.dll SyntaxTreeConverters.dll ICSharpCode.NRefactory.dll SemanticTree.dll SyntaxTree.dll TreeConverter.dll OptimizerConversion.dll PascalABCParser.dll PascalABCLanguageInfo.dll licence.txt PascalABCNET.chm System.Threading.dll PluginsSupport.dll InternalErrorReport.dll ICSharpCode.TextEditor.dll ICSharpCode.SharpZipLib.dll CodeCompletion.dll Debugger.Core.dll Mono.Debugger.Soft.dll Mono.Debugging.dll Mono.Debugging.Soft.dll NETXP.Controls.dll NETXP.Controls.Bars.dll NETXP.Library.dll NETXP.Win32.dll WeifenLuo.WinFormsUI.Docking.dll template.pct YieldHelpers.dll LanguageIntegrator.dll StringConstants.dll ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PascalABCNETMono.zip Lib\*.pcu ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PascalABCNETMono.zip Highlighting\*.xshd ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PascalABCNETMono.zip Ico\*.ico diff --git a/ReleaseGenerators/sect_PascalABCParser.nsh b/ReleaseGenerators/sect_PascalABCParser.nsh index e223c1e8c..1e9f68738 100644 --- a/ReleaseGenerators/sect_PascalABCParser.nsh +++ b/ReleaseGenerators/sect_PascalABCParser.nsh @@ -2,9 +2,9 @@ SectionIn 1 2 RO SetOutPath "$INSTDIR" File "..\bin\PascalABCParser.dll" - File "..\bin\PascalLanguage.dll" + File "..\bin\PascalABCLanguageInfo.dll" ${AddFile} "PascalABCParser.dll" - ${AddFile} "PascalLanguage.dll" + ${AddFile} "PascalABCLanguageInfo.dll" ; File "..\bin\PascalABCPartParser.dll" SetOutPath "$INSTDIR\Highlighting" File "..\bin\Highlighting\PascalABCNET.xshd" @@ -13,7 +13,7 @@ Call NGEN ; Push "PascalABCPartParser.dll" ; Call NGEN - Push "PascalLanguage.dll" + Push "PascalABCLanguageInfo.dll" Call NGEN SetOutPath "$INSTDIR\Ico" File "..\bin\Ico\pas.ico" diff --git a/Languages/Pascal/SyntaxTreeConverters/SyntaxTreeConverters/Properties/AssemblyInfo.cs b/SyntaxTreeConverters/Properties/AssemblyInfo.cs similarity index 100% rename from Languages/Pascal/SyntaxTreeConverters/SyntaxTreeConverters/Properties/AssemblyInfo.cs rename to SyntaxTreeConverters/Properties/AssemblyInfo.cs diff --git a/Languages/Pascal/SyntaxTreeConverters/SyntaxTreeConverters/StandardSyntaxConverter.cs b/SyntaxTreeConverters/StandardSyntaxConverter.cs similarity index 100% rename from Languages/Pascal/SyntaxTreeConverters/SyntaxTreeConverters/StandardSyntaxConverter.cs rename to SyntaxTreeConverters/StandardSyntaxConverter.cs diff --git a/Languages/Pascal/SyntaxTreeConverters/SyntaxTreeConverters/SyntaxTreeConverters.csproj b/SyntaxTreeConverters/SyntaxTreeConverters.csproj similarity index 86% rename from Languages/Pascal/SyntaxTreeConverters/SyntaxTreeConverters/SyntaxTreeConverters.csproj rename to SyntaxTreeConverters/SyntaxTreeConverters.csproj index 8c74d7da9..ed8a2aa88 100644 --- a/Languages/Pascal/SyntaxTreeConverters/SyntaxTreeConverters/SyntaxTreeConverters.csproj +++ b/SyntaxTreeConverters/SyntaxTreeConverters.csproj @@ -25,7 +25,7 @@ pdbonly true - ..\..\..\..\bin\ + ..\bin\ TRACE prompt 4 @@ -39,23 +39,23 @@ - + {44a01f9e-dce7-470c-aae5-c3de0ccbee3b} Errors - + {2de2842f-0912-4251-bc0f-480854c44a13} Localization - + {c2cac65a-b2ae-4ccc-b067-e6b8e75df73a} SyntaxTree - + {a9ab4282-83b4-41a7-86c3-e5bf6a45e7e2} SyntaxVisitors - + {1c9c945a-586d-42a2-a06b-65d84fa7ff78} TreeConverter diff --git a/TreeConverter/TreeRealization/CompilerDirective.cs b/TreeConverter/TreeRealization/CompilerDirective.cs index 753214dfa..2b0a7741e 100644 --- a/TreeConverter/TreeRealization/CompilerDirective.cs +++ b/TreeConverter/TreeRealization/CompilerDirective.cs @@ -1,21 +1,21 @@ -// Copyright (c) Ivan Bondarev, Stanislav Mikhalkovich (for details please see \doc\copyright.txt) -// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) - -namespace PascalABCCompiler.TreeRealization -{ - public class compiler_directive - { - public string name; - public string directive; +// Copyright (c) Ivan Bondarev, Stanislav Mikhalkovich (for details please see \doc\copyright.txt) +// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) + +namespace PascalABCCompiler.TreeRealization +{ + public class compiler_directive + { + public string name; + public string directive; public location location; public string source_file; // Файл из которого загрузили директиву. В отличии от location - может указывать на .pcu - - public compiler_directive(string name, string directive, location loc, string source_file) - { - this.name = name; - this.directive = directive; - this.location = loc; - this.source_file = source_file; - } - } + + public compiler_directive(string name, string directive, location loc, string source_file) + { + this.name = name; + this.directive = directive; + this.location = loc; + this.source_file = source_file; + } + } } \ No newline at end of file diff --git a/VisualPascalABCNET/DS/VisualEnvironmentCompiler.cs b/VisualPascalABCNET/DS/VisualEnvironmentCompiler.cs index fca21139e..2d4aa4f41 100644 --- a/VisualPascalABCNET/DS/VisualEnvironmentCompiler.cs +++ b/VisualPascalABCNET/DS/VisualEnvironmentCompiler.cs @@ -322,7 +322,7 @@ namespace VisualPascalABC /// private void OnLanguageLoaded(Languages.Facade.ILanguage language) { - string languageConnectedMessage = string.Format(VECStringResources.Get("LANGUAGE_LOADED{0}{1}"), language.Name, Path.GetFileName(language.GetType().Assembly.Location)); + string languageConnectedMessage = string.Format(VECStringResources.Get("LANGUAGE_LOADED{0}"), language.Name); languageConnectedMessage += Environment.NewLine; AddTextToCompilerMessages(languageConnectedMessage); } diff --git a/_GenerateLinuxVersion.bat b/_GenerateLinuxVersion.bat index a5f5c9d15..3663c83f3 100644 --- a/_GenerateLinuxVersion.bat +++ b/_GenerateLinuxVersion.bat @@ -41,7 +41,7 @@ copy bin\PascalABCNET.chm Release\PascalABCNETLinux\PascalABCNET.chm copy bin\PascalABCNETLinux.exe Release\PascalABCNETLinux\PascalABCNETLinux.exe copy bin\PascalABCNETLinux.exe.config Release\PascalABCNETLinux\PascalABCNETLinux.exe.config copy bin\PascalABCParser.dll Release\PascalABCNETLinux\PascalABCParser.dll -copy bin\PascalLanguage.dll Release\PascalABCNETLinux\PascalLanguage.dll +copy bin\PascalABCLanguageInfo.dll Release\PascalABCNETLinux\PascalABCLanguageInfo.dll copy bin\Pause.exe Release\PascalABCNETLinux\Pause.exe copy bin\PluginsSupportLinux.dll Release\PascalABCNETLinux\PluginsSupportLinux.dll copy bin\ProgrammRunner.exe Release\PascalABCNETLinux\ProgrammRunner.exe diff --git a/bin/Lng/Eng/VisualPascalABCNET_VEC.dat b/bin/Lng/Eng/VisualPascalABCNET_VEC.dat index a874a0c6d..8d3372682 100644 --- a/bin/Lng/Eng/VisualPascalABCNET_VEC.dat +++ b/bin/Lng/Eng/VisualPascalABCNET_VEC.dat @@ -48,7 +48,7 @@ STATETEXT_FINDREFERNCES_RESULT{0}={0} matches found STATETEXT_NOTFOUND=0 matches found SUPPORTED_LANGUAGES=Supported languages: -LANGUAGE_LOADED{0}{1}=Loaded {0} language ({1}) +LANGUAGE_LOADED{0}{1}=Loaded {0} language LANGUAGE_LOAD_ERROR{0}={0} language loading error PARSER_CONNECTED{0}=Connected parser {0} diff --git a/bin/Lng/Rus/VisualPascalABCNET_VEC.dat b/bin/Lng/Rus/VisualPascalABCNET_VEC.dat index c4da6d33f..4ab014883 100644 --- a/bin/Lng/Rus/VisualPascalABCNET_VEC.dat +++ b/bin/Lng/Rus/VisualPascalABCNET_VEC.dat @@ -48,7 +48,7 @@ STATETEXT_FINDREFERNCES_RESULT{0}=Найдено {0} ссылок STATETEXT_NOTFOUND=Ничего не найдено SUPPORTED_LANGUAGES=Подключены входные языки: -LANGUAGE_LOADED{0}{1}=Загружен языковой пакет {0} ({1}) +LANGUAGE_LOADED{0}=Загружен языковой пакет {0} LANGUAGE_LOAD_ERROR{0}=Ошибка загрузки языкового пакета {0} PARSER_CONNECTED{0}=Подключен парсер {0}