(#218) Glushkov template fix

OnionGrief · Jun 25, 2024 · 3825e36 · 3825e36
1 parent cdcaf86
commit 3825e36
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/libs/Objects/src/BackRefRegex.cpp b/libs/Objects/src/BackRefRegex.cpp
@@ -948,6 +948,10 @@ MemoryFiniteAutomaton BackRefRegex::to_mfa_additional(iLogTemplate* log) const {
 	MemoryFiniteAutomaton mfa(0, states, language);
 	if (log) {
 		log->set_parameter("brefregex", *this);
+		log->set_parameter("linearised bregex", temp_copy);
+		log->set_parameter("first", str_first);
+		log->set_parameter("last", str_last);
+		log->set_parameter("follow", str_follow);
 		log->set_parameter("result", mfa);
 	}
 	return mfa;

diff --git a/libs/Objects/src/Regex.cpp b/libs/Objects/src/Regex.cpp
@@ -508,7 +508,7 @@ FiniteAutomaton Regex::to_glushkov(iLogTemplate* log) const {
 		log->set_parameter("linearised regex", temp_copy);
 		log->set_parameter("first", str_first);
 		log->set_parameter("last", str_last);
-		log->set_parameter("get_follow", str_follow);
+		log->set_parameter("follow", str_follow);
 		log->set_parameter("result", fa);
 	}
 	return fa;

diff --git a/resources/template/Glushkov.tex b/resources/template/Glushkov.tex
@@ -83,7 +83,7 @@ \section{Автомат Глушкова}
 
 	Множество $\Follow$:
 
-	%template_pairs
+	%template_follow
 
 \end{frame}
 

diff --git a/resources/template/MFAexpt.tex b/resources/template/MFAexpt.tex
@@ -3,7 +3,22 @@ \section{MFAexpt}
 	Регулярное выражение:
 	%template_brefregex
 
+	Линеаризованное регулярное выражение:
+	%template_linearised bregex
+
 	Результат:
 	%template_result
 
+    Множество $\First$:
+
+    %template_first
+
+    Множество $\Last$:
+
+    %template_last
+
+    Множество $\Follow$:
+
+    %template_follow
+
 \end{frame}