From 0703e9b047dcf7eb4255b4bb07f7174d2dc8006c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Pecka?= <tomaspecka@gmail.com>
Date: Thu, 16 Jan 2014 16:18:35 +0100
Subject: [PATCH] Restore build after alib changes

---
 .../src/conversions/fa2rg/AbstractFAtoRGConverter.h         | 2 +-
 aconversions/src/conversions/fa2rg/FAtoLRGConverter.h       | 2 +-
 aconversions/src/conversions/fa2rg/FAtoRRGConverter.h       | 2 +-
 aconversions/src/conversions/fa2rg/afa2lrg.cpp              | 4 ++--
 aconversions/src/conversions/fa2rg/afa2rrg.cpp              | 4 ++--
 aconversions/src/conversions/re2fa/Glushkov.h               | 2 ++
 aconversions/src/conversions/re2fa/are2fa.cpp               | 6 +-----
 .../src/conversions/rg2fa/AbstractRGtoFAConverter.h         | 2 +-
 aconversions/src/conversions/rg2fa/LRGtoFAConverter.h       | 2 +-
 aconversions/src/conversions/rg2fa/Makefile                 | 2 +-
 aconversions/src/conversions/rg2fa/RRGtoFAConverter.h       | 2 +-
 aconversions/src/conversions/rg2fa/arg2fa.cpp               | 2 +-
 aconversions/src/utils/GrammarUtils.h                       | 2 +-
 13 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/aconversions/src/conversions/fa2rg/AbstractFAtoRGConverter.h b/aconversions/src/conversions/fa2rg/AbstractFAtoRGConverter.h
index 66e6e95e6d..3b9cb83e9d 100644
--- a/aconversions/src/conversions/fa2rg/AbstractFAtoRGConverter.h
+++ b/aconversions/src/conversions/fa2rg/AbstractFAtoRGConverter.h
@@ -2,7 +2,7 @@
 #define __ABSTRACTFATORGCONVERTER_H__
 
 #include <automaton/FSM/FSM.h>
-#include <grammar/RegularGrammar.h>
+#include <grammar/Regular/RegularGrammar.h>
 #include <memory>
 
 #include "../../utils/ConversionException.h"
diff --git a/aconversions/src/conversions/fa2rg/FAtoLRGConverter.h b/aconversions/src/conversions/fa2rg/FAtoLRGConverter.h
index 2cbcc479a8..45635b13fe 100644
--- a/aconversions/src/conversions/fa2rg/FAtoLRGConverter.h
+++ b/aconversions/src/conversions/fa2rg/FAtoLRGConverter.h
@@ -2,7 +2,7 @@
 #define __FATOLRGCONVERTER_H__
 
 #include "AbstractFAtoRGConverter.h"
-#include <grammar/LeftRegularGrammar.h>
+#include <grammar/Regular/LeftRegularGrammar.h>
 #include <automaton/FSM/FSM.h>
 
 #include "../../utils/GrammarUtils.h"
diff --git a/aconversions/src/conversions/fa2rg/FAtoRRGConverter.h b/aconversions/src/conversions/fa2rg/FAtoRRGConverter.h
index 519166d134..7033b68a2b 100644
--- a/aconversions/src/conversions/fa2rg/FAtoRRGConverter.h
+++ b/aconversions/src/conversions/fa2rg/FAtoRRGConverter.h
@@ -2,7 +2,7 @@
 #define __FATORRGCONVERTER_H__
 
 #include "AbstractFAtoRGConverter.h"
-#include <grammar/RightRegularGrammar.h>
+#include <grammar/Regular/RightRegularGrammar.h>
 #include <automaton/FSM/FSM.h>
 
 #include "../../utils/GrammarUtils.h"
diff --git a/aconversions/src/conversions/fa2rg/afa2lrg.cpp b/aconversions/src/conversions/fa2rg/afa2lrg.cpp
index 59cc82fcc9..223a833958 100644
--- a/aconversions/src/conversions/fa2rg/afa2lrg.cpp
+++ b/aconversions/src/conversions/fa2rg/afa2lrg.cpp
@@ -3,7 +3,7 @@
 #include <AlibException.h>
 #include <AutomatonFactory.h>
 #include <grammar/GrammarPrinter.h>
-#include <grammar/RightRegularGrammar.h>
+#include <grammar/Regular/RightRegularGrammar.h>
 
 #include "FAtoLRGConverter.h"
 
@@ -22,7 +22,7 @@ int main(int argc, char** argv)
         FSM fsm = AutomatonFactory::buildFSM( AutomatonFactory::fromString( input ) );
 
         FAtoLRGConverter conv( fsm );
-        GrammarPrinter::toXML( conv.convert(), cout );
+        conv.convert().toXML( cout );
     }
     catch( AlibException & e )
     {
diff --git a/aconversions/src/conversions/fa2rg/afa2rrg.cpp b/aconversions/src/conversions/fa2rg/afa2rrg.cpp
index 0dbf6c1058..0b4a210064 100644
--- a/aconversions/src/conversions/fa2rg/afa2rrg.cpp
+++ b/aconversions/src/conversions/fa2rg/afa2rrg.cpp
@@ -4,7 +4,7 @@
 #include <AlibException.h>
 #include <AutomatonFactory.h>
 #include <grammar/GrammarPrinter.h>
-#include <grammar/RegularGrammar.h>
+#include <grammar/Regular/RegularGrammar.h>
 
 #include "FAtoRRGConverter.h"
 
@@ -23,7 +23,7 @@ int main(int argc, char** argv)
         FSM fsm = AutomatonFactory::buildFSM( AutomatonFactory::fromString( input ) );
 
         FAtoRRGConverter conv( fsm );
-        GrammarPrinter::toXML( conv.convert(), cout );
+        conv.convert().toXML( cout );
     }
     catch( AlibException & e )
     {
diff --git a/aconversions/src/conversions/re2fa/Glushkov.h b/aconversions/src/conversions/re2fa/Glushkov.h
index 44dfee8f4d..6032ce3f91 100644
--- a/aconversions/src/conversions/re2fa/Glushkov.h
+++ b/aconversions/src/conversions/re2fa/Glushkov.h
@@ -18,7 +18,9 @@ namespace conversions
  */
 class Glushkov : public AbstractREtoFAConverter
 {
+};
 
 } /* namespace conversions */
 
+
 #endif /* GLUSHKOV_H_ */
diff --git a/aconversions/src/conversions/re2fa/are2fa.cpp b/aconversions/src/conversions/re2fa/are2fa.cpp
index 715b588904..167925f02f 100644
--- a/aconversions/src/conversions/re2fa/are2fa.cpp
+++ b/aconversions/src/conversions/re2fa/are2fa.cpp
@@ -14,8 +14,6 @@
 #include <regexp/RegExpParser.h>
 #include <sax/SaxInterface.h>
 
-#include "Brzozowski.h"
-#include "Glushkov.h"
 #include "Thompson.h"
 
 
@@ -35,9 +33,7 @@ int main(int argc, char** argv)
         RegExp re = RegExpParser::parse(tokens);
 
         Thompson conv( re );
-        FSM fsm = conv.convert( );
-
-        AutomatonPrinter::toXML( fsm, cout );
+        conv.convert( ).toXML( cout );
     }
     catch( AlibException & e )
     {
diff --git a/aconversions/src/conversions/rg2fa/AbstractRGtoFAConverter.h b/aconversions/src/conversions/rg2fa/AbstractRGtoFAConverter.h
index 67575b57af..1c4f8d7747 100644
--- a/aconversions/src/conversions/rg2fa/AbstractRGtoFAConverter.h
+++ b/aconversions/src/conversions/rg2fa/AbstractRGtoFAConverter.h
@@ -2,7 +2,7 @@
 #define __ABSTRACTRGTOFACONVERTER_H__
 
 #include <automaton/FSM/FSM.h>
-#include <grammar/RegularGrammar.h>
+#include <grammar/Regular/RegularGrammar.h>
 
 namespace conversions
 {
diff --git a/aconversions/src/conversions/rg2fa/LRGtoFAConverter.h b/aconversions/src/conversions/rg2fa/LRGtoFAConverter.h
index 856a0cbe80..5cc661c13d 100644
--- a/aconversions/src/conversions/rg2fa/LRGtoFAConverter.h
+++ b/aconversions/src/conversions/rg2fa/LRGtoFAConverter.h
@@ -2,7 +2,7 @@
 #define __LRGTOFACONVERTER_H__
 
 #include <automaton/FSM/FSM.h>
-#include <grammar/LeftRegularGrammar.h>
+#include <grammar/Regular/LeftRegularGrammar.h>
 
 #include "../../utils/AutomatonUtils.h"
 #include "../../utils/GrammarUtils.h"
diff --git a/aconversions/src/conversions/rg2fa/Makefile b/aconversions/src/conversions/rg2fa/Makefile
index 02b4e2f63e..2bf7c4c852 100644
--- a/aconversions/src/conversions/rg2fa/Makefile
+++ b/aconversions/src/conversions/rg2fa/Makefile
@@ -1,4 +1,4 @@
-EXECUTABLE=are2fa
+EXECUTABLE=arg2fa
 
 all: $(EXECUTABLE).o AbstractRGtoFAConverter.o LRGtoFAConverter.o RRGtoFAConverter.o AutomatonUtils.o GrammarUtils.o ConversionException.o
 	$(LD) $(LDFLAGS) $^ -o $(EXECUTABLE)
diff --git a/aconversions/src/conversions/rg2fa/RRGtoFAConverter.h b/aconversions/src/conversions/rg2fa/RRGtoFAConverter.h
index 1d6af194f5..981ed00bcb 100644
--- a/aconversions/src/conversions/rg2fa/RRGtoFAConverter.h
+++ b/aconversions/src/conversions/rg2fa/RRGtoFAConverter.h
@@ -1,7 +1,7 @@
 #ifndef __RRGTOFACONVERTER_H__
 #define __RRGTOFACONVERTER_H__
 
-#include <grammar/RightRegularGrammar.h>
+#include <grammar/Regular/RightRegularGrammar.h>
 #include <automaton/FSM/FSM.h>
 
 #include "../../utils/AutomatonUtils.h"
diff --git a/aconversions/src/conversions/rg2fa/arg2fa.cpp b/aconversions/src/conversions/rg2fa/arg2fa.cpp
index 83c81929b2..f5bf31a320 100644
--- a/aconversions/src/conversions/rg2fa/arg2fa.cpp
+++ b/aconversions/src/conversions/rg2fa/arg2fa.cpp
@@ -42,7 +42,7 @@ int main(int argc, char** argv)
         //}
 
         FSM fsm = conv.convert( );
-        AutomatonPrinter::toXML( fsm, cout );
+        fsm.toXML( cout );
     }
     catch( AlibException & e )
     {
diff --git a/aconversions/src/utils/GrammarUtils.h b/aconversions/src/utils/GrammarUtils.h
index 1e5c740b02..039e15c99e 100644
--- a/aconversions/src/utils/GrammarUtils.h
+++ b/aconversions/src/utils/GrammarUtils.h
@@ -11,7 +11,7 @@
 #include "utils.h"
 
 #include <grammar/GrammarException.h>
-#include <grammar/RegularGrammar.h>
+#include <grammar/Regular/RegularGrammar.h>
 #include <grammar/Rule.h>
 #include <alphabet/Symbol.h>
 
-- 
GitLab