diff --git a/atrim/.cproject b/atrim.fsm/.cproject
similarity index 98%
rename from atrim/.cproject
rename to atrim.fsm/.cproject
index 6e6d8fdeadd5ba271b0b63b74c798d17ea3426eb..3c88f6f08f8a9281bdbc304fe0d40072ed2320da 100644
--- a/atrim/.cproject
+++ b/atrim.fsm/.cproject
@@ -27,7 +27,7 @@
<listOptionValue builtIn="false" value="/usr/include/libxml2"/>
<listOptionValue builtIn="false" value=""${workspace_loc:/alib/src}""/>
</option>
- <option id="gnu.cpp.compiler.option.other.other.1520737263" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -std=c++11" valueType="string"/>
+ <option id="gnu.cpp.compiler.option.other.other.1520737263" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -std=c++11" valueType="string"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.236265274" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.667742770" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
diff --git a/atrim/.project b/atrim.fsm/.project
similarity index 97%
rename from atrim/.project
rename to atrim.fsm/.project
index 50b1ef04662a1a00a139dfd40da0fb740302227e..1bd8e07e1dec5bb4634931ac4410539459b06a5b 100644
--- a/atrim/.project
+++ b/atrim.fsm/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>atrim</name>
+ <name>atrim.fsm</name>
<comment></comment>
<projects>
</projects>
diff --git a/atrim/makefile b/atrim.fsm/makefile
similarity index 95%
rename from atrim/makefile
rename to atrim.fsm/makefile
index f0d998dec16103531883630c2f6c11f946202dc2..a04f7cc8cc367a2aa6c70c6e57d5b7449fa9721c 100644
--- a/atrim/makefile
+++ b/atrim.fsm/makefile
@@ -1,5 +1,5 @@
CC=g++
-EXECUTABLE=atrim
+EXECUTABLE=atrim.fsm
CCFLAGS= -std=c++11 -O2 -c -Wall -I../alib/src -I/usr/include/libxml2
LDFLAGS= -L../alib/lib -lxml2 -lalib -Wl,-rpath,.
diff --git a/atrim/src/RedundantStateRemover.cpp b/atrim.fsm/src/DeadStateRemover.cpp
similarity index 88%
rename from atrim/src/RedundantStateRemover.cpp
rename to atrim.fsm/src/DeadStateRemover.cpp
index 409aee5cf7a8f312c32d877198898369f45b76f8..7045561e12918fc395c181a3e098200cc68054ba 100644
--- a/atrim/src/RedundantStateRemover.cpp
+++ b/atrim.fsm/src/DeadStateRemover.cpp
@@ -1,19 +1,16 @@
/*
- * RedundantStateRemover.cpp
+ * DeadStateRemover.cpp
*
* Created on: 4. 3. 2014
* Author: tomas
*/
-#include "RedundantStateRemover.h"
+#include "DeadStateRemover.h"
using namespace automaton;
using namespace std;
-namespace trim
-{
-
-FSM RedundantStateRemover::remove( const FSM & fsm )
+FSM DeadStateRemover::remove( const FSM & fsm )
{
deque<set<State>> Qi;
Qi.push_back( set<State>( ) );
@@ -35,6 +32,7 @@ FSM RedundantStateRemover::remove( const FSM & fsm )
i += 1;
}
+
FSM ret;
for( const auto & q : Qi.at( i ) )
@@ -58,5 +56,3 @@ FSM RedundantStateRemover::remove( const FSM & fsm )
return ret;
}
-
-} /* namespace trim */
diff --git a/atrim/src/RedundantStateRemover.h b/atrim.fsm/src/DeadStateRemover.h
similarity index 58%
rename from atrim/src/RedundantStateRemover.h
rename to atrim.fsm/src/DeadStateRemover.h
index 3ba2e01149f38383327cecea404b3161f06bf1a1..3ebc1d63db3b512c99a2084154865a781a7088ab 100644
--- a/atrim/src/RedundantStateRemover.h
+++ b/atrim.fsm/src/DeadStateRemover.h
@@ -1,32 +1,27 @@
/*
- * RedundantStateRemover.h
+ * DeadStateRemover.h
*
* Created on: 4. 3. 2014
* Author: tomas
*/
-#ifndef REDUNDANTSTATEREMOVER_H_
-#define REDUNDANTSTATEREMOVER_H_
+#ifndef DEADSTATEREMOVER_H_
+#define DEADSTATEREMOVER_H_
#include <deque>
#include <set>
#include <automaton/FSM/FSM.h>
-namespace trim
-{
-
#define isInSet(x,set) ( (set).find((x)) != (set).end())
/**
* Melichar 2.32
*/
-class RedundantStateRemover
+class DeadStateRemover
{
public:
static automaton::FSM remove( const automaton::FSM & fsm );
};
-} /* namespace trim */
-
-#endif /* REDUNDANTSTATEREMOVER_H_ */
+#endif /* DEADSTATEREMOVER_H_ */
diff --git a/atrim/src/UnreachableStateRemover.cpp b/atrim.fsm/src/UnreachableStateRemover.cpp
similarity index 96%
rename from atrim/src/UnreachableStateRemover.cpp
rename to atrim.fsm/src/UnreachableStateRemover.cpp
index 3caf41fd80954c6dc7604d168e225b648013814a..38ddc2eaf496695089a25680aa5bb8899e183830 100644
--- a/atrim/src/UnreachableStateRemover.cpp
+++ b/atrim.fsm/src/UnreachableStateRemover.cpp
@@ -10,10 +10,6 @@
using namespace alib;
using namespace automaton;
using namespace std;
-using namespace trim;
-
-namespace trim
-{
FSM UnreachableStateRemover::remove( const FSM & fsm )
{
@@ -69,5 +65,3 @@ set<State> UnreachableStateRemover::findReachableStates( const FSM & fsm )
return qcurr;
}
-
-} /* namespace trim */
diff --git a/atrim/src/UnreachableStateRemover.h b/atrim.fsm/src/UnreachableStateRemover.h
similarity index 93%
rename from atrim/src/UnreachableStateRemover.h
rename to atrim.fsm/src/UnreachableStateRemover.h
index 0345ebbc36371e273ae030c66ea9bed83ee89fdc..5e5929e7b74acd21e186c82bd5df6c7e9417817b 100644
--- a/atrim/src/UnreachableStateRemover.h
+++ b/atrim.fsm/src/UnreachableStateRemover.h
@@ -16,9 +16,6 @@
#include <map>
#include <set>
-namespace trim
-{
-
#define isInSet(x,set) ( (set).find((x)) != (set).end())
/**
@@ -33,6 +30,4 @@ private:
static std::set<automaton::State> findReachableStates( const automaton::FSM & fsm );
};
-} /* namespace trim */
-
#endif /* UNREACHABLE_H_ */
diff --git a/atrim.fsm/src/atrim.fsm.cpp b/atrim.fsm/src/atrim.fsm.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e4a774ff234a355e527ec7d60684b7dd07eb561d
--- /dev/null
+++ b/atrim.fsm/src/atrim.fsm.cpp
@@ -0,0 +1,87 @@
+#include <iostream>
+#include <getopt.h>
+
+#include <AutomatonFactory.h>
+#include <AlibException.h>
+#include <automaton/AutomatonParser.h>
+
+#include <sax/SaxInterface.h>
+#include <sax/ParserException.h>
+
+#include "UnreachableStateRemover.h"
+#include "DeadStateRemover.h"
+
+using namespace std;
+using namespace automaton;
+using namespace alib;
+using namespace sax;
+
+void help( void )
+{
+ cout << "atrim.fsm 0.01" << endl;
+ cout << "Removes unreachable and dead states from FSM. Input is read from stdin." << endl;
+ cout << "Usage: atrim [--dead] [--unproductive]" << endl << endl;
+ cout << "If neither --dead nor --unreachable option is used, both dead and unreachable states are removed." << endl;
+ cout << endl;
+ cout << " --dead \t Removes dead states." << endl;
+ cout << " --unreachable \t Removes unreachable states." << endl;
+ cout << " -h, --help \t shows this." << endl;
+
+ cout << endl;
+}
+
+int main(int argc, char* argv[])
+{
+ int del_d = 0, del_u = 0;
+
+ static struct option long_options[] = {
+ {"help", no_argument, NULL, 'h'},
+ {"dead", no_argument, & del_d, 1},
+ {"unreachable", no_argument, & del_u, 1},
+ {0, 0, 0, 0}
+ };
+
+ int long_index = 0, opt = 0;
+
+ while( ( opt = getopt_long( argc, argv, "h", long_options, & long_index ) ) != -1 )
+ {
+ switch( opt )
+ {
+ case 0:
+ break;
+
+ case 'v':
+ case 'h':
+ default:
+ help( );
+ return 0;
+ }
+ }
+
+ list<Token> tokens;
+ if(optind == argc)
+ {
+ string input(istreambuf_iterator<char>(cin), (istreambuf_iterator<char>()));
+ SaxInterface::parseMemory(input, tokens);
+ }
+ else
+ {
+ SaxInterface::parseFile(argv[optind],tokens);
+ }
+
+
+ FSM fsm = AutomatonFactory::buildFSM( AutomatonParser::parse(tokens) );
+
+ // default behaviour, no switches
+ if( ! del_d && ! del_u )
+ del_d = del_u = 1;
+
+ if( del_u )
+ fsm = UnreachableStateRemover::remove( fsm );
+ if( del_d )
+ fsm = DeadStateRemover::remove( fsm );
+
+ fsm.toXML( cout );
+
+ return 0;
+}
diff --git a/atrim.grammar/src/UnproductiveNonTerminalRemover.cpp b/atrim.grammar/src/UnproductiveNonTerminalRemover.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..6f9f8775375b0ef91569dfcff13514c898a88370
--- /dev/null
+++ b/atrim.grammar/src/UnproductiveNonTerminalRemover.cpp
@@ -0,0 +1,54 @@
+/*
+ * UnproductiveNonTerminalRemover.cpp
+ *
+ * Created on: 20. 3. 2014
+ * Author: tomas
+ */
+
+#include "UnproductiveNonTerminalRemover.h"
+
+using namespace grammar;
+
+ContextFreeGrammar UnreachableNonTerminalRemover::remove( const ContextFreeGrammar & grammar )
+{
+
+ set<Symbol> N;
+ deque<set<Symbol>> Ni;
+
+ // N_0 = { S }
+ N.insert( grammar.getStartSymbol( ) );
+ Ni.push_back( set<Symbol>( ) );
+ Ni.at( 0 ).insert( grammar.getStartSymbol( ) );
+
+ // "mathematical bfs w/o queue"
+
+ int i = 1;
+ while( ! Ni.at( i - 1 ).empty( ) )
+ {
+
+ }
+
+ ContextFreeGrammar ret;
+
+ for( const auto & symbol : N )
+ ret.addNonTerminalSymbol( symbol );
+
+ for( const auto & rule : grammar.getRules( ) )
+ {
+ if( isInSet( rule.getLeftSide( ).front( ), ret.getNonTerminalSymbols( ) ) )
+ {
+ // add all terminals in the rule
+ for( const auto & symbol : rule.getRightSide( ) )
+ {
+ // not nonterminal and not in set of terminals
+ if( ! isInSet( symbol, ret.getNonTerminalSymbols( ) ) && ! isInSet( symbol, ret.getTerminalSymbols( ) ) )
+ ret.addTerminalSymbol( symbol );
+ }
+ ret.addRule( rule );
+ }
+ }
+
+ ret.setStartSymbol( grammar.getStartSymbol( ) );
+
+ return ret;
+}
diff --git a/atrim.grammar/src/UnproductiveNonTerminalRemover.h b/atrim.grammar/src/UnproductiveNonTerminalRemover.h
new file mode 100644
index 0000000000000000000000000000000000000000..7e57a052f62ab63169f63e778e155a156eeab7d3
--- /dev/null
+++ b/atrim.grammar/src/UnproductiveNonTerminalRemover.h
@@ -0,0 +1,19 @@
+/*
+ * UnproductiveNonTerminalRemover.h
+ *
+ * Created on: 20. 3. 2014
+ * Author: tomas
+ */
+
+#ifndef UNPRODUCTIVENONTERMINALREMOVER_H_
+#define UNPRODUCTIVENONTERMINALREMOVER_H_
+
+#include <grammar/ContextFree/ContextFreeGrammar.h>
+
+class UnproductiveNonTerminalRemover
+{
+public:
+ static grammar::ContextFreeGrammar remove( const grammar::ContextFreeGrammar & grammar );
+};
+
+#endif /* UNPRODUCTIVENONTERMINALREMOVER_H_ */
diff --git a/atrim/src/TrimNFA.cpp b/atrim/src/TrimNFA.cpp
deleted file mode 100644
index b6a184e8314f4b6677db9bae33dbf334981bc2bb..0000000000000000000000000000000000000000
--- a/atrim/src/TrimNFA.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * TrimNFA.cpp
- *
- * Created on: 4. 3. 2014
- * Author: tomas
- */
-
-#include "TrimNFA.h"
-
-using namespace automaton;
-
-namespace trim
-{
-
-FSM TrimNFA::remove( const FSM & fsm )
-{
- FSM ret;
- ret = UnreachableStateRemover::remove( fsm );
- ret = RedundantStateRemover::remove( ret );
- return ret;
-}
-
-} /* namespace trim */
diff --git a/atrim/src/TrimNFA.h b/atrim/src/TrimNFA.h
deleted file mode 100644
index 55f21f9e9ee47aa850e50f4f9ec7741ad14f183a..0000000000000000000000000000000000000000
--- a/atrim/src/TrimNFA.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * TrimNFA.h
- *
- * Created on: 4. 3. 2014
- * Author: tomas
- */
-
-#ifndef TRIMNFA_H_
-#define TRIMNFA_H_
-
-#include <automaton/FSM/FSM.h>
-
-#include "RedundantStateRemover.h"
-#include "UnreachableStateRemover.h"
-
-namespace trim
-{
-
-class TrimNFA
-{
-public:
- static automaton::FSM remove( const automaton::FSM & fsm );
-};
-
-} /* namespace trim */
-
-#endif /* TRIMNFA_H_ */
diff --git a/atrim/src/atrim.fsm.cpp b/atrim/src/atrim.fsm.cpp
deleted file mode 100644
index dd33c147fe257544c24c1a70f091d257a189fbac..0000000000000000000000000000000000000000
--- a/atrim/src/atrim.fsm.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
- #include <iostream>
-
-#include <AutomatonFactory.h>
-#include <AlibException.h>
-#include <automaton/AutomatonParser.h>
-
-#include <sax/SaxInterface.h>
-#include <sax/ParserException.h>
-
-#include "TrimNFA.h"
-
-using namespace std;
-using namespace automaton;
-using namespace alib;
-using namespace sax;
-
-using namespace trim;
-
-int main(int argc, char** argv) {
- int fileParameterIndex = -1;
-
- try {
- if( argc > 1 )
- {
- for( int i = 1; i < argc; i++ )
- {
- if( string( "-h" ).compare( argv[i] ) == 0 )
- {
- std::cout << "Removes unreachable states from NFA." << std::endl;
- std::cout << "Usage: atrim [automaton.xml]" << std::endl;
- return 1;
- }
- else
- {
- if(fileParameterIndex == -1)
- fileParameterIndex = i;
- else
- throw AlibException("Only one file can be passed as parameter - " + string(argv[i]) + " " + string(argv[fileParameterIndex]));
- }
- }
- }
-
- std::list<Token> tokens;
-
- if(fileParameterIndex != -1)
- {
- SaxInterface::parseFile(argv[fileParameterIndex],tokens);
- }
- else
- {
- string input(istreambuf_iterator<char>(cin), (istreambuf_iterator<char>()));
- SaxInterface::parseMemory(input, tokens);
- }
-
- UnknownAutomaton automaton = AutomatonParser::parse( tokens );
- FSM fsm = AutomatonFactory::buildFSM( automaton );
-
- TrimNFA::remove( fsm ).toXML( cout );
-
- } catch (AlibException& e) {
- cout << e.what() << endl;
- return -1;
- }
-
- cout.flush();
-}