(#318) Пеарсер автоматов теперь в интерпретаторе

OnionGrief · Jan 22, 2024 · c351425 · c351425
1 parent 4fa1cfc
commit c351425
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/libs/AutomataParser/include/AutomataParser/Parser.h b/libs/AutomataParser/include/AutomataParser/Parser.h
@@ -47,7 +47,7 @@ class Parser {
 
   public:
     // Разбор MFA из файла
-    statiс MemoryFiniteAutomaton parse_MFA(std::string filename);
+    static MemoryFiniteAutomaton parse_MFA(std::string filename);
 
     // Разбор FA из файла
     static FiniteAutomaton parse_FA(std::string filename);

diff --git a/libs/Interpreter/include/Interpreter/Interpreter.h b/libs/Interpreter/include/Interpreter/Interpreter.h
@@ -20,6 +20,7 @@
 #include "Objects/MemoryFiniteAutomaton.h"
 #include "Objects/Regex.h"
 #include "Objects/TransformationMonoid.h"
+#include "AutomataParser/Parser.h"
 
 using namespace Typization; // NOLINT(build/namespaces)
 using namespace FuncLib;	// NOLINT(build/namespaces)

diff --git a/libs/Interpreter/src/Interpreter.cpp b/libs/Interpreter/src/Interpreter.cpp
@@ -313,11 +313,11 @@ optional<GeneralObject> Interpreter::apply_function(const Function& function,
 	}
 	if (function.name == "getNFA") {
 		string filename = get<ObjectString>(arguments[0]).value;
-		return ObjectNFA(FiniteAutomaton());
+		return ObjectNFA(Parser::parse_FA(filename));
 	}
 	if (function.name == "getMFA") {
 		string filename = get<ObjectString>(arguments[0]).value;
-		return ObjectMFA(MemoryFiniteAutomaton());
+		return ObjectMFA(Parser::parse_MFA(filename));
 	}
 	// # place for another diff types funcs