bugfix and change epsilon represition

bug:
1.when the automata all states are acceptable then it would out of index
2.fix state marking when start state and accept state is the same one
3.fix mimizing algorithm when all state are accepteable

Author: yufengzjj

Automata.cpp renamed to Automata/Automata.cpp

@@ -12,13 +12,13 @@
 #include <iterator>
 #include <string>
 #include <exception>
-#include "third_part/ATMPL/optional/optional.hpp"
-#include "Set.h"
+#include "../third_part/ATMPL/optional/optional.hpp"
+#include "../util/Set.h"
 template<typename _State = int, typename _Driver = char, typename _Sigma = std::string>
 class Automata
 {
 public:
-	enum { epsilon = 0 };
+	enum { epsilon = 1 };
 	enum { invalid_state = -1 };
 	//the set must impl unique insert().
 	using state_set = Set<_State>;
@@ -151,8 +151,21 @@ void Automata<_State, _Driver, _Sigma>::minimize()
 		}
 		throw AutomataException("unexpected state" + std::to_string(s_));
 	};
-	equivalence.push_front(accept_);
-	equivalence.push_front(origin - accept_);
+	if (!accept_.empty())
+	{
+		equivalence.push_front(accept_);
+
+	}
+	if (!(origin - accept_).empty())
+	{
+		equivalence.push_front(origin - accept_);
+	}
+	else
+	{
+		//in this consequence it should not use minimizing algorithm
+		return;
+	}
+	
 	bool done = false;
 	while (!done)//calculate equivalence state set
 	{
@@ -229,14 +242,15 @@ void Automata<_State, _Driver, _Sigma>::minimize()
 		}
 		auto eq_state_i = equivalence_state.begin();
 		std::advance(eq_state_i, std::distance(equivalence.begin(), eq));
-		if (eq->find(start_) != eq->end())
+		if (!(*eq & accept_).empty())
 		{
-			ato.set_start(*eq_state_i);
+			ato.set_accept(*eq_state_i);
 		}
-		else if (!(*eq & accept_).empty())
+		if (eq->find(start_) != eq->end())
 		{
-			ato.set_accept(*eq_state_i);
+			ato.set_start(*eq_state_i);
 		}
+		
 
 	}
 	*this = ato;

Automata.h renamed to Automata/Automata.h

@@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.6)
 project(ERE)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
-set(SOURCE_FILES FA.cpp Automata.cpp BREParser.cpp Set.cpp ERE.cpp)
+set(SOURCE_FILES Automata/FA.cpp Automata/Automata.cpp Parser/BREParser.cpp util/Set.cpp ERE.cpp)
 add_executable(ERE ${SOURCE_FILES})
 target_link_libraries(ERE libboost_program_options-mt.a)

FA.cpp renamed to Automata/FA.cpp

@@ -1,6 +1,6 @@
-#include "Set.h"
-#include "Automata.h"
-#include "BREParser.h"
+#include "util/Set.h"
+#include "Automata//Automata.h"
+#include "Parser/BREParser.h"
 #include "boost/program_options/options_description.hpp"
 #include "boost/program_options/parsers.hpp"
 #include "boost/program_options/variables_map.hpp"
@@ -31,15 +31,15 @@ int main(int argc, char* argv[])
 		("help,h", "produce help message")
 		("expr,e", po::value<std::string>(), "set regular expression")
 		("string,s", po::value<std::string>(), "string to check by regular expression")
-		("alphabet,a", po::value<std::string>()->default_value(FA::alphabet), "set regular expression alphabet");
+		("alphabet,a", po::value<std::string>()->default_value(FA::alphabet.data()), "set regular expression alphabet");
 	po::variables_map vm;
 	po::store(po::parse_command_line(argc, argv, desc), vm);
 	po::notify(vm);
 	if (vm.count("expr") && vm.count("string"))
 	{
 		try
 		{
-			FA::set_alphabet(vm["alphabet"].as<std::string>());
+			FA::set_alphabet(vm["alphabet"].as<std::string>().c_str());
 			BREParser bre_parser;
 			bre_parser.register_event(BREParser::event::NFA_complete, event_handler);
 			bre_parser.register_event(BREParser::event::NFA_determinated, event_handler);

FA.h renamed to Automata/FA.h

@@ -88,15 +88,17 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="Automata.h" />
-    <ClInclude Include="BREParser.h" />
-    <ClInclude Include="FA.h" />
-    <ClInclude Include="Set.h" />
+    <ClCompile Include="Automata\Automata.cpp" />
+    <ClCompile Include="Automata\FA.cpp" />
+    <ClCompile Include="ERE.cpp" />
+    <ClCompile Include="Parser\BREParser.cpp" />
+    <ClCompile Include="util\Set.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="BREParser.cpp" />
-    <ClCompile Include="FA.cpp" />
-    <ClCompile Include="ERE.cpp" />
+    <ClInclude Include="Automata\Automata.h" />
+    <ClInclude Include="Automata\FA.h" />
+    <ClInclude Include="Parser\BREParser.h" />
+    <ClInclude Include="util\Set.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

CMakeLists.txt

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="ERE.cpp" />
+    <ClCompile Include="Parser\BREParser.cpp">
+      <Filter>Parser</Filter>
+    </ClCompile>
+    <ClCompile Include="util\Set.cpp">
+      <Filter>util</Filter>
+    </ClCompile>
+    <ClCompile Include="Automata\Automata.cpp">
+      <Filter>Automata</Filter>
+    </ClCompile>
+    <ClCompile Include="Automata\FA.cpp">
+      <Filter>Automata</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Parser">
+      <UniqueIdentifier>{86ed5819-5bb7-496c-a427-cb4a0c39ad6e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="util">
+      <UniqueIdentifier>{9515bada-3a17-4266-99ae-2299b657bff1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Automata">
+      <UniqueIdentifier>{9425ca9f-6075-4a9f-9c79-ec244024ac86}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Parser\BREParser.h">
+      <Filter>Parser</Filter>
+    </ClInclude>
+    <ClInclude Include="util\Set.h">
+      <Filter>util</Filter>
+    </ClInclude>
+    <ClInclude Include="Automata\Automata.h">
+      <Filter>Automata</Filter>
+    </ClInclude>
+    <ClInclude Include="Automata\FA.h">
+      <Filter>Automata</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

ERE.cpp

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments>-e "a(b|c)*" -s abbbccc -a a</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments> -e "a*|(b|c)*" -s aaaa -a abc</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
 </Project>

ERE.vcxproj

@@ -1,5 +1,5 @@
 #include "BREParser.h"
-
+#include <algorithm>
 BREParser::BREParser()
 	:m_pos(-1)
 {
@@ -94,7 +94,7 @@ FA BREParser::item()
 		next();
 		return _fa;
 	}
-	else if (FA::alphabet.find(peek_next()) != std::string::npos)
+	else if (std::find(FA::alphabet.begin(), FA::alphabet.end(),peek_next()) != FA::alphabet.end())
 	{
 		return sym();
 	}