Merge pull request #288 from OnionGrief/fa-regex-refactoring

Fa and regex refactoring

.clang-format

@@ -7,4 +7,4 @@ AllowShortIfStatementsOnASingleLine: WithoutElse
 SpaceBeforeParens: ControlStatements
 AllowShortFunctionsOnASingleLine: Empty
 AlignAfterOpenBracket: Align
-ColumnLimit: 80
+ColumnLimit: 100

.github/workflows/cmake.yml

@@ -18,28 +18,28 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Configure Refal
-      run: mkdir refal5 && cd ./refal5 && wget http://www.botik.ru/pub/local/scp/refal5/ref5_081222.zip && unzip ref5_081222.zip &&rm makefile && cp makefile.lin makefile && make
-    - name: test Refal
-      run: cd ./refal5 && export PATH=$PATH:$(pwd) && echo $(pwd) >> $GITHUB_PATH
-    - name: build Refal program
-      run: cd ./refal && ls *.ref && find . -type f -name "*.ref" | xargs refc  && ls *.rsl
-    - name: Configure CMake
-      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build
+      - uses: actions/checkout@v3
+      - name: Configure Refal
+        run: mkdir refal5 && cd ./refal5 && wget http://www.botik.ru/pub/local/scp/refal5/ref5_081222.zip && unzip ref5_081222.zip &&rm makefile && cp makefile.lin makefile && make
+      - name: test Refal
+        run: cd ./refal5 && export PATH=$PATH:$(pwd) && echo $(pwd) >> $GITHUB_PATH
+      - name: build Refal program
+        run: cd ./refal && ls *.ref && find . -type f -name "*.ref" | xargs refc  && ls *.rsl
+      - name: Configure CMake
+        # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+        # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+        run: cmake -B ${{github.workspace}}/build
 
-    - name: Build
-      # Build your program with the given configuration
-      run: cmake --build ${{github.workspace}}/build
+      - name: Build
+        # Build your program with the given configuration
+        run: cmake --build ${{github.workspace}}/build
 
-    - name: Test
-      #working-directory: ${{github.workspace}}/build/apps/TestsApp
-      # Execute tests defined by the CMake configuration.
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      # ну почему не из корня ...
-      #run: ctest -C ${{env.BUILD_TYPE}}
-      run: ./build/apps/TestsApp/TestsApp
+      - name: Test
+        #working-directory: ${{github.workspace}}/build/apps/TestsApp
+        # Execute tests defined by the CMake configuration.
+        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+        # ну почему не из корня ...
+        #run: ctest -C ${{env.BUILD_TYPE}}
+        run: ./build/apps/TestsApp/TestsApp
 
 

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.5)
-set (CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 17)
 
 project(chipollino)
 

LICENSE.md

@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2022 Andrei Ilin, Alexander Delman, Kirill Shevchenko, Mikhail Teriukha, Anna Terentyeva, Danila Knyazihin, Alina Chibizova, Edgar Makarov
+Copyright (c) 2022 Andrei Ilin, Alexander Delman, Kirill Shevchenko, Mikhail Teriukha, Anna Terentyeva, Danila
+Knyazihin, Alina Chibizova, Edgar Makarov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

apps/InputGeneratorApp/CMakeLists.txt

@@ -1,18 +1,18 @@
 # Set the project name
-project (InputGeneratorApp)
+project(InputGeneratorApp)
 
 # Create a sources variable with a link to all cpp files to compile
 set(SOURCES
-	src/main.cpp)
+        src/main.cpp)
 
 # Add a library with the above sources
 add_executable(${PROJECT_NAME} ${SOURCES})
 
-target_include_directories( ${PROJECT_NAME}
-    PUBLIC ${PROJECT_SOURCE_DIR}/include
-)
+target_include_directories(${PROJECT_NAME}
+        PUBLIC ${PROJECT_SOURCE_DIR}/include
+        )
 
 target_link_libraries(${PROJECT_NAME}
- 	InputGenerator
-	Interpreter
-)
+        InputGenerator
+        Interpreter
+        )

apps/InterpreterApp/CMakeLists.txt

@@ -1,17 +1,17 @@
 # Set the project name
-project (InterpreterApp)
+project(InterpreterApp)
 
 # Create a sources variable with a link to all cpp files to compile
 set(SOURCES
-	src/main.cpp)
+        src/main.cpp)
 
 # Add a library with the above sources
 add_executable(${PROJECT_NAME} ${SOURCES})
 
-target_include_directories( ${PROJECT_NAME}
-    PUBLIC ${PROJECT_SOURCE_DIR}/include
-)
+target_include_directories(${PROJECT_NAME}
+        PUBLIC ${PROJECT_SOURCE_DIR}/include
+        )
 
 target_link_libraries(${PROJECT_NAME}
-	Interpreter
-)
+        Interpreter
+        )

apps/TestsApp/CMakeLists.txt

@@ -1,26 +1,26 @@
 # Set the project name
-project (TestsApp)
+project(TestsApp)
 
 # Create a sources variable with a link to all cpp files to compile
 set(SOURCES
-	src/Example.cpp
-	src/main.cpp)
+        src/Example.cpp
+        src/main.cpp)
 
 # Add a library with the above sources
 add_executable(${PROJECT_NAME} ${SOURCES})
 
-target_include_directories( ${PROJECT_NAME}
-    PUBLIC ${PROJECT_SOURCE_DIR}/include
-)
+target_include_directories(${PROJECT_NAME}
+        PUBLIC ${PROJECT_SOURCE_DIR}/include
+        )
 
 target_link_libraries(${PROJECT_NAME}
- 	InputGenerator
- 	Interpreter
- 	Tester
- 	Objects
-)
+        InputGenerator
+        Interpreter
+        Tester
+        Objects
+        )
 
 enable_testing()
 
 add_test(NAME UnitTests
-         COMMAND ${PROJECT_NAME})
+        COMMAND ${PROJECT_NAME})

apps/TestsApp/include/TestsApp/Example.h

@@ -42,9 +42,9 @@ class Example {
 	static void table();
 	static void fa_semdet_check();
 	static void classes_number_GlaisterShallit();
-	static void testing_with_generator(
-		int regex_length, int star_num, int star_nesting, int alphabet_size,
-		const function<void(string& rgx_str)>& check_function);
+	static void testing_with_generator(int regex_length, int star_num, int star_nesting,
+									   int alphabet_size,
+									   const function<void(string& rgx_str)>& check_function);
 	static void arden_lemma_testing();
 	static void fa_to_pgrammar();
 	static void logger_test();