#TDP - 25 Add class Translator from C to C#

It intermediary class
Method make syntax , RPN, translate from other class
become protected
Make multiple inheritance
Translatro<-SyntaxAnalisator<-RPN<-translate..<-Translatro..

Author: StrongerProgrammer7

MethodsDevelopmentTranslator.vcxproj

@@ -140,6 +140,7 @@
     <ClCompile Include="SyntaxAnalisator.cpp" />
     <ClCompile Include="translate_csharp.cpp" />
     <ClCompile Include="Translator.cpp" />
+    <ClCompile Include="TranslatorFromCToCSharp.cpp" />
     <ClCompile Include="Translator_LanguageC.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -149,6 +150,7 @@
     <ClInclude Include="SyntaxAnalisator.h" />
     <ClInclude Include="translate_csharp.h" />
     <ClInclude Include="Translator.h" />
+    <ClInclude Include="TranslatorFromCToCSharp.h" />
     <ClInclude Include="Translator_LanguageC.h">
       <FileType>CppForm</FileType>
     </ClInclude>
@@ -160,13 +162,12 @@
   </ItemGroup>
   <ItemGroup>
     <Text Include="C.txt" />
-    <Text Include="CodeCSharp.txt" />
-    <Text Include="lexical.txt" />
-    <Text Include="RPN.txt" />
     <Text Include="test.txt" />
+    <Text Include="translator_file\lexical.txt" />
+    <Text Include="translator_file\RPN.txt" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="CodeCSharp.cs" />
+    <None Include="translator_file\CodeCSharp.cs" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

MethodsDevelopmentTranslator.vcxproj.filters

@@ -33,6 +33,9 @@
     <ClCompile Include="translate_csharp.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
+    <ClCompile Include="TranslatorFromCToCSharp.cpp">
+      <Filter>Исходные файлы</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Translator_LanguageC.h">
@@ -56,6 +59,9 @@
     <ClInclude Include="translate_csharp.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
+    <ClInclude Include="TranslatorFromCToCSharp.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="C.txt">
@@ -64,18 +70,15 @@
     <Text Include="test.txt">
       <Filter>Файлы ресурсов</Filter>
     </Text>
-    <Text Include="lexical.txt">
-      <Filter>Файлы ресурсов</Filter>
-    </Text>
-    <Text Include="RPN.txt">
+    <Text Include="translator_file\lexical.txt">
       <Filter>Файлы ресурсов</Filter>
     </Text>
-    <Text Include="CodeCSharp.txt">
+    <Text Include="translator_file\RPN.txt">
       <Filter>Файлы ресурсов</Filter>
     </Text>
   </ItemGroup>
   <ItemGroup>
-    <None Include="CodeCSharp.cs">
+    <None Include="translator_file\CodeCSharp.cs">
       <Filter>Файлы ресурсов</Filter>
     </None>
   </ItemGroup>

ReversePolishNotation.h

@@ -1,16 +1,17 @@
 #pragma once
 #ifndef REVERSEPOLISHNOTATION_H
 #define REVERSEPOLISHNOTATION_H
-#include "Translator.h"
+#include "SyntaxAnalisator.h"
 
 typedef std::vector<std::map<std::string, int>> mystack;
 
-class ReversePolishNotation : public Translator
+class ReversePolishNotation : public SyntaxAnalisator
 {
 public:
 	ReversePolishNotation();
+protected:
+	void reversePolishNotationAnalyze(std::string from_file_lexical, std::string to_file_RPN);
 	~ReversePolishNotation();
-	void reversePolishNotationAnalyze(std::string fileName_lexical, std::string fileName_RPN);
 private:
 	mystack stack;
 	int getPriority(std::string word);

SyntaxAnalisator.cpp

@@ -138,7 +138,7 @@ bool SyntaxAnalisator::isLibrary_header(std::string const& word)
 	return (int)word[0] == 34 && (int)word[word.length() - 1] == 34 && (int)word[word.length() - 2] == 104 && (int)word[word.length() - 3] == 46 ? true : false;
 }
 
-void SyntaxAnalisator::analyze(std::string filePathOrName_C, std::string fileName_Path_SaveAnalis)
+void SyntaxAnalisator::makeSyntaxAnalyze(std::string filePathOrName_C, std::string fileName_Path_SaveAnalis)
 {
 	std::ifstream fileC;
 	std::ofstream fileAnalysis(fileName_Path_SaveAnalis);

SyntaxAnalisator.h

@@ -8,8 +8,9 @@ class SyntaxAnalisator : public Translator
 {
 public:
 	SyntaxAnalisator();
+protected:
+	void makeSyntaxAnalyze(std::string from_file_C, std::string to_file_lexical);
 	~SyntaxAnalisator();
-	void analyze(std::string filePathOrName_C, std::string fileName_Path_SaveAnalis);
 private:
 	void addCode(std::string str, std::map<std::string, std::string>& table, int numTable);
 	int checkStringSingleElem(std::string const& word);

Translator.cpp

@@ -25,13 +25,6 @@ std::map<std::string, std::string> Translator::getSymbols()
 	return symbolsConst;
 }
 
-void Translator::initialize(std::map<std::string, std::string> identifier, std::map<std::string, std::string> numberConst, std::map<std::string, std::string> symbolsConst)
-{
-	this->identifier = identifier;
-	this->symbolsConst = symbolsConst;
-	this->numberConst = numberConst;
-}
-
 bool Translator::isTypeDeclarationByCode(std::string type_code)
 {
 	return type_code == "W1" || type_code == "W2" || type_code == "W3" || type_code == "W14" || type_code == "W15" || type_code == "W16" || type_code == "W17" ||

Translator.h

@@ -8,12 +8,11 @@ class Translator
 {
 public:
 	Translator();
-	~Translator();
-	virtual std::map<std::string, std::string> getIdentifier();
-	virtual std::map<std::string, std::string> getNumbers();
-	virtual std::map<std::string, std::string> getSymbols();
-	virtual void initialize(std::map<std::string, std::string> identifier, std::map<std::string, std::string> numberConst, std::map<std::string, std::string> symbolsConst);
+	std::map<std::string, std::string> getIdentifier();
+	std::map<std::string, std::string> getNumbers();
+	std::map<std::string, std::string> getSymbols();
 protected:
+	~Translator();
 #define SIZE_serviceWord 20
 #define SIZE_separators 9
 #define SIZE_operation 20

TranslatorFromCToCSharp.cpp

@@ -0,0 +1,19 @@
+#include "TranslatorFromCToCSharp.h"
+
+
+
+TranslatorFromCToCSharp::TranslatorFromCToCSharp()
+{
+}
+
+void TranslatorFromCToCSharp::makeTranslate(std::string source_file)
+{
+	makeSyntaxAnalyze(source_file, "./translator_file/lexical.txt");
+	reversePolishNotationAnalyze("./translator_file/lexical.txt", "./translator_file/RPN.txt");
+	transalteToCSharp("./translator_file/RPN.txt", "./translator_file/CodeCSharp.cs");
+}
+
+
+TranslatorFromCToCSharp::~TranslatorFromCToCSharp()
+{
+}

TranslatorFromCToCSharp.h

@@ -0,0 +1,12 @@
+#pragma once
+#include "translate_csharp.h"
+class TranslatorFromCToCSharp :	public Translate_csharp
+{
+public:
+	TranslatorFromCToCSharp();
+	~TranslatorFromCToCSharp();
+	void makeTranslate(std::string source_file);
+private:
+	
+};
+

Translator_LanguageC.cpp

@@ -1,18 +1,14 @@
 #include "Translator_LanguageC.h"
 #include "function.h"
-#include "SyntaxAnalisator.h"
-#include "ReversePolishNotation.h"
-#include "translate_csharp.h"
+#include "TranslatorFromCToCSharp.h"
 #include <direct.h>
 
 using namespace System;
 using namespace System::Windows::Forms;
 using namespace System::IO;
 
 std::string fileText_C = "";
-SyntaxAnalisator analisator;
-ReversePolishNotation RPN;
-Translate_csharp codeCSharp;
+TranslatorFromCToCSharp translator;
 
 [STAThreadAttribute]
 void main(array<String^>^ args)
@@ -39,14 +35,14 @@ System::Void MethodsDevelopmentTranslator::Translator_LanguageC::Btn_loadFile_Cl
 	{
 		filePathName = openFileDialog1->FileName;
 		try
-		{
+		{	
 			StreamReader^ file = File::OpenText(filePathName);
 			tb_textC->Text = file->ReadToEnd();
 			file->Close();
 			marshalString(filePathName, fileText_C);
 			btn_analisator->Enabled = true;
 			mkdir("translator_file");
-			
+			translator.makeTranslate(fileText_C);
 		}
 		catch (const std::exception&)
 		{
@@ -64,9 +60,8 @@ System::Void MethodsDevelopmentTranslator::Translator_LanguageC::Btn_analisator_
 {
 	if (tb_nameFileAnylize->Text != "" && isExtensionTXT(tb_nameFileAnylize->Text)==true)
 	{
-		std::string fileName = "";
-		marshalString(tb_nameFileAnylize->Text, fileName);
-		analisator.analyze(fileText_C, "./translator_file/lexical.txt");
+		/*std::string fileName = "";
+		marshalString(tb_nameFileAnylize->Text, fileName);*/
 
 		StreamReader^ fileAnalyze = File::OpenText("./translator_file/lexical.txt");
 		tb_syntaxAnalisator->Text = fileAnalyze->ReadToEnd();
@@ -83,10 +78,8 @@ System::Void MethodsDevelopmentTranslator::Translator_LanguageC::Btn_reversePoli
 {
 	if (tb_nameFileAnylize->Text != "" && isExtensionTXT(tb_nameFileAnylize->Text) == true)
 	{
-		RPN.initialize(analisator.getIdentifier(), analisator.getNumbers(), analisator.getSymbols());
 		/*std::string file = "";
 		marshalString(tb_nameFileAnylize->Text, file);*/
-		RPN.reversePolishNotationAnalyze("./translator_file/lexical.txt", "./translator_file/RPN.txt");
 
 		StreamReader^ fileAnalyze = gcnew StreamReader("./translator_file/RPN.txt", System::Text::Encoding::GetEncoding(1251));
 		tb_reversePolishNotation->Text = fileAnalyze->ReadToEnd();
@@ -104,9 +97,6 @@ System::Void MethodsDevelopmentTranslator::Translator_LanguageC::Btn_toCSharp_Cl
 {
 	if (tb_nameFileAnylize->Text != "" && isExtensionTXT(tb_nameFileAnylize->Text) == true)
 	{
-		codeCSharp.initialize(RPN.getIdentifier(), RPN.getNumbers(), RPN.getSymbols());
-		std::string file = "";
-		codeCSharp.transalteToCSharp("./translator_file/RPN.txt", "./translator_file/CodeCSharp.cs");
 
 		StreamReader^ fileAnalyze = gcnew StreamReader("./translator_file/CodeCSharp.cs", System::Text::Encoding::GetEncoding(1251));
 		tb_codeCSharp->Text = fileAnalyze->ReadToEnd();