Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(#279) Рефакторинг метода to-regex класса FiniteAutomaton #282

Merged
merged 21 commits into from
Nov 25, 2023
Merged

(#279) Рефакторинг метода to-regex класса FiniteAutomaton #282

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
928fe1c
Refactored FiniteAutomaton::to_regex #279
AngelicHedgehog Oct 23, 2023
0be5062
Removed artefact #279
AngelicHedgehog Oct 23, 2023
6d8a85d
Merge branch 'main' into vilenskii/refacts
AngelicHedgehog Nov 12, 2023
58b8a27
(#279) удалено старое содержимое метода
AngelicHedgehog Nov 12, 2023
f0fe215
(#279) Первая реализация FiniteAutomaton::to_regex
AngelicHedgehog Nov 22, 2023
7903085
(#279) Добавлено логирование
AngelicHedgehog Nov 22, 2023
7340be4
Merge branch 'main' into vilenskii/refacts
AngelicHedgehog Nov 22, 2023
b5ca6d5
(#279) Устранена ошибка ссылки на rvalue
AngelicHedgehog Nov 22, 2023
e893cb4
(#279) Удалены лишние заголовки
AngelicHedgehog Nov 22, 2023
b4d46ae
(#279) Исправлена Segmentation fault
AngelicHedgehog Nov 22, 2023
ea1e4c3
(#279) Фикс бага формата регулярки возврата
AngelicHedgehog Nov 22, 2023
a4d2e8c
Merge branch 'main' into vilenskii/refacts
AngelicHedgehog Nov 23, 2023
3fe5878
(#279) Устранено лишнее преобразование финальной регулярки
AngelicHedgehog Nov 23, 2023
13c0de8
(#279) Добавлено определение номера начального состояния
AngelicHedgehog Nov 23, 2023
ce9370f
(#279) Излишние выкладки
AngelicHedgehog Nov 23, 2023
e1b2860
(#279) Добавлена генерация афловита с языком
AngelicHedgehog Nov 23, 2023
012327f
(#279) Исправлен метод генерации языка финальной регулярки
AngelicHedgehog Nov 23, 2023
f9e69c0
(#279) Изменён способ задания языка на явный
AngelicHedgehog Nov 23, 2023
bec1d3c
Merge branch 'hotfix' into vilenskii/refacts
xendalm Nov 23, 2023
4bd2149
(#279) fixed arden test, added auto alphabet generating (new AlgExpre…
xendalm Nov 24, 2023
d4d0207
(#302) тест на генерируемых регулярках
mathhyyn Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libs/Objects/src/FiniteAutomaton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2594,8 +2594,8 @@ Regex FiniteAutomaton::to_regex(iLogTemplate* log) const {
if (SLAE.count(start_state_index) && SLAE[start_state_index].count(end_state_index)) {
auto& result_regex = SLAE[start_state_index][end_state_index];

// глубокая генерация алфавита c языком возвращаемой регулярке
result_regex.set_language(language->get_alphabet());
// явная подстановка нужного языка в финальную регулярку
result_regex.language = language;

if (log) {
log->set_parameter("result", result_regex.to_txt());
Expand Down