From 3e851719bbe07fab67f08153f00d4ce107f47d03 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Fri, 14 Aug 2015 21:49:39 +0200
Subject: [PATCH] fix return types
---
aconversions2/src/ConversionHandler.cpp | 8 ++++----
alib2algo/src/automaton/convert/ToGrammarLeftRG.cpp | 2 +-
alib2algo/src/automaton/convert/ToGrammarLeftRG.h | 5 ++---
alib2algo/src/automaton/convert/ToGrammarRightRG.cpp | 2 +-
alib2algo/src/automaton/convert/ToGrammarRightRG.h | 5 ++---
alib2algo/src/regexp/convert/ToAutomatonDerivation.h | 1 -
alib2algo/src/regexp/convert/ToAutomatonThompson.h | 1 -
.../src/regexp/convert/ToGrammarRightRGDerivation.cpp | 2 +-
alib2algo/src/regexp/convert/ToGrammarRightRGDerivation.h | 5 ++---
alib2algo/src/regexp/convert/ToGrammarRightRGGlushkov.cpp | 2 +-
alib2algo/src/regexp/convert/ToGrammarRightRGGlushkov.h | 5 ++---
11 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/aconversions2/src/ConversionHandler.cpp b/aconversions2/src/ConversionHandler.cpp
index 73f18364c4..4ac215a036 100644
--- a/aconversions2/src/ConversionHandler.cpp
+++ b/aconversions2/src/ConversionHandler.cpp
@@ -138,7 +138,7 @@ void ConversionHandler::convertFAtoRG( void )
switch( m_algorithm ) {
case INCOMING_TRANSITIONS: {
- grammar::Grammar grammar = automaton::convert::ToGrammarLeftRG::convert(fsm);
+ grammar::LeftRG grammar = automaton::convert::ToGrammarLeftRG::convert(fsm);
std::chrono::measurements::end();
std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY);
@@ -148,7 +148,7 @@ void ConversionHandler::convertFAtoRG( void )
}
case OUTGOING_TRANSITIONS:
case DEFAULT: {
- grammar::Grammar grammar = automaton::convert::ToGrammarRightRG::convert(fsm);
+ grammar::RightRG grammar = automaton::convert::ToGrammarRightRG::convert(fsm);
std::chrono::measurements::end();
std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY);
@@ -213,7 +213,7 @@ void ConversionHandler::convertREtoRG( void )
switch(m_algorithm) {
case BRZOZOWSKI_DERIVATION: {
- grammar::Grammar grammar = regexp::convert::ToGrammarRightRGDerivation::convert(regexp);
+ grammar::RightRG grammar = regexp::convert::ToGrammarRightRGDerivation::convert(regexp);
std::chrono::measurements::end();
std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY);
@@ -223,7 +223,7 @@ void ConversionHandler::convertREtoRG( void )
}
case GLUSHKOV_NFA:
case DEFAULT: {
- grammar::Grammar grammar = regexp::convert::ToGrammarRightRGGlushkov::convert(regexp);
+ grammar::RightRG grammar = regexp::convert::ToGrammarRightRGGlushkov::convert(regexp);
std::chrono::measurements::end();
std::chrono::measurements::start("Output write", std::chrono::measurements::Type::AUXILARY);
diff --git a/alib2algo/src/automaton/convert/ToGrammarLeftRG.cpp b/alib2algo/src/automaton/convert/ToGrammarLeftRG.cpp
index 7bcec94877..f5198d95b4 100644
--- a/alib2algo/src/automaton/convert/ToGrammarLeftRG.cpp
+++ b/alib2algo/src/automaton/convert/ToGrammarLeftRG.cpp
@@ -16,7 +16,7 @@ namespace automaton {
namespace convert {
-grammar::Grammar ToGrammarLeftRG::convert(const automaton::Automaton& automaton) {
+grammar::LeftRG ToGrammarLeftRG::convert(const automaton::Automaton& automaton) {
return getInstance().dispatch(automaton.getData());
}
diff --git a/alib2algo/src/automaton/convert/ToGrammarLeftRG.h b/alib2algo/src/automaton/convert/ToGrammarLeftRG.h
index 97994cd771..7aacfe217c 100644
--- a/alib2algo/src/automaton/convert/ToGrammarLeftRG.h
+++ b/alib2algo/src/automaton/convert/ToGrammarLeftRG.h
@@ -14,7 +14,6 @@
#include <automaton/FSM/NFA.h>
#include <automaton/FSM/DFA.h>
-#include <grammar/Grammar.h>
#include <automaton/Automaton.h>
namespace automaton {
@@ -25,13 +24,13 @@ namespace convert {
* Finite automaton to right regular grammar converter.
* Source: My own :)
*/
-class ToGrammarLeftRG : public std::SingleDispatch<grammar::Grammar, automaton::AutomatonBase> {
+class ToGrammarLeftRG : public std::SingleDispatch<grammar::LeftRG, automaton::AutomatonBase> {
public:
/**
* Performs conversion.
* @return left regular grammar equivalent to source automaton.
*/
- static grammar::Grammar convert(const automaton::Automaton& automaton);
+ static grammar::LeftRG convert(const automaton::Automaton& automaton);
static grammar::LeftRG convert(const automaton::NFA& automaton);
static grammar::LeftRG convert(const automaton::DFA& automaton);
diff --git a/alib2algo/src/automaton/convert/ToGrammarRightRG.cpp b/alib2algo/src/automaton/convert/ToGrammarRightRG.cpp
index 829aacc3ba..e8a53e4cf2 100644
--- a/alib2algo/src/automaton/convert/ToGrammarRightRG.cpp
+++ b/alib2algo/src/automaton/convert/ToGrammarRightRG.cpp
@@ -13,7 +13,7 @@ namespace automaton {
namespace convert {
-grammar::Grammar ToGrammarRightRG::convert(const automaton::Automaton& automaton) {
+grammar::RightRG ToGrammarRightRG::convert(const automaton::Automaton& automaton) {
return getInstance().dispatch(automaton.getData());
}
diff --git a/alib2algo/src/automaton/convert/ToGrammarRightRG.h b/alib2algo/src/automaton/convert/ToGrammarRightRG.h
index 88cd9b30be..c06fd4ce8c 100644
--- a/alib2algo/src/automaton/convert/ToGrammarRightRG.h
+++ b/alib2algo/src/automaton/convert/ToGrammarRightRG.h
@@ -14,7 +14,6 @@
#include <automaton/FSM/NFA.h>
#include <automaton/FSM/DFA.h>
-#include <grammar/Grammar.h>
#include <automaton/Automaton.h>
namespace automaton {
@@ -25,13 +24,13 @@ namespace convert {
* Finite automaton to right regular grammar converter.
* Source: Melichar 2.104
*/
-class ToGrammarRightRG : public std::SingleDispatch<grammar::Grammar, automaton::AutomatonBase> {
+class ToGrammarRightRG : public std::SingleDispatch<grammar::RightRG, automaton::AutomatonBase> {
public:
/**
* Performs conversion.
* @return left regular grammar equivalent to source automaton.
*/
- static grammar::Grammar convert(const automaton::Automaton& automaton);
+ static grammar::RightRG convert(const automaton::Automaton& automaton);
static grammar::RightRG convert(const automaton::NFA& automaton);
static grammar::RightRG convert(const automaton::DFA& automaton);
diff --git a/alib2algo/src/regexp/convert/ToAutomatonDerivation.h b/alib2algo/src/regexp/convert/ToAutomatonDerivation.h
index ee7acbe067..2b6bc8b75a 100644
--- a/alib2algo/src/regexp/convert/ToAutomatonDerivation.h
+++ b/alib2algo/src/regexp/convert/ToAutomatonDerivation.h
@@ -14,7 +14,6 @@
#include <regexp/formal/FormalRegExp.h>
#include <regexp/unbounded/UnboundedRegExp.h>
-#include <automaton/Automaton.h>
#include <automaton/FSM/NFA.h>
namespace regexp {
diff --git a/alib2algo/src/regexp/convert/ToAutomatonThompson.h b/alib2algo/src/regexp/convert/ToAutomatonThompson.h
index 70696124a2..d407db651a 100644
--- a/alib2algo/src/regexp/convert/ToAutomatonThompson.h
+++ b/alib2algo/src/regexp/convert/ToAutomatonThompson.h
@@ -13,7 +13,6 @@
#include <regexp/RegExp.h>
#include <regexp/formal/FormalRegExp.h>
#include <regexp/unbounded/UnboundedRegExp.h>
-#include <automaton/Automaton.h>
#include <automaton/FSM/EpsilonNFA.h>
namespace regexp {
diff --git a/alib2algo/src/regexp/convert/ToGrammarRightRGDerivation.cpp b/alib2algo/src/regexp/convert/ToGrammarRightRGDerivation.cpp
index d36a6783ca..103bf0d441 100644
--- a/alib2algo/src/regexp/convert/ToGrammarRightRGDerivation.cpp
+++ b/alib2algo/src/regexp/convert/ToGrammarRightRGDerivation.cpp
@@ -22,7 +22,7 @@ namespace regexp {
namespace convert {
-grammar::Grammar ToGrammarRightRGDerivation::convert(const regexp::RegExp& regexp) {
+grammar::RightRG ToGrammarRightRGDerivation::convert(const regexp::RegExp& regexp) {
return getInstance().dispatch(regexp.getData());
}
diff --git a/alib2algo/src/regexp/convert/ToGrammarRightRGDerivation.h b/alib2algo/src/regexp/convert/ToGrammarRightRGDerivation.h
index bb29dc98c3..9c998e4258 100644
--- a/alib2algo/src/regexp/convert/ToGrammarRightRGDerivation.h
+++ b/alib2algo/src/regexp/convert/ToGrammarRightRGDerivation.h
@@ -11,7 +11,6 @@
#include <common/multipleDispatch.hpp>
#include <grammar/Regular/RightRG.h>
-#include <grammar/Grammar.h>
#include <regexp/RegExp.h>
#include <regexp/formal/FormalRegExp.h>
#include <regexp/unbounded/UnboundedRegExp.h>
@@ -24,13 +23,13 @@ namespace convert {
* Converts reg. expression to right regular grammar using brzozowski derivation algorithm.
* Source: Melichar 2.137
*/
-class ToGrammarRightRGDerivation : public std::SingleDispatch<grammar::Grammar, regexp::RegExpBase> {
+class ToGrammarRightRGDerivation : public std::SingleDispatch<grammar::RightRG, regexp::RegExpBase> {
public:
/**
* Performs conversion.
* @return right regular grammar equivalent to source regexp.
*/
- static grammar::Grammar convert(const regexp::RegExp& regexp);
+ static grammar::RightRG convert(const regexp::RegExp& regexp);
template <class T>
static grammar::RightRG convert(const T& regexp);
diff --git a/alib2algo/src/regexp/convert/ToGrammarRightRGGlushkov.cpp b/alib2algo/src/regexp/convert/ToGrammarRightRGGlushkov.cpp
index 3bb1d85cf5..581cc34d4d 100644
--- a/alib2algo/src/regexp/convert/ToGrammarRightRGGlushkov.cpp
+++ b/alib2algo/src/regexp/convert/ToGrammarRightRGGlushkov.cpp
@@ -26,7 +26,7 @@ namespace regexp {
namespace convert {
-grammar::Grammar ToGrammarRightRGGlushkov::convert(const regexp::RegExp& regexp) {
+grammar::RightRG ToGrammarRightRGGlushkov::convert(const regexp::RegExp& regexp) {
return getInstance().dispatch(regexp.getData());
}
diff --git a/alib2algo/src/regexp/convert/ToGrammarRightRGGlushkov.h b/alib2algo/src/regexp/convert/ToGrammarRightRGGlushkov.h
index 6889f19dbe..77a91cfd54 100644
--- a/alib2algo/src/regexp/convert/ToGrammarRightRGGlushkov.h
+++ b/alib2algo/src/regexp/convert/ToGrammarRightRGGlushkov.h
@@ -10,7 +10,6 @@
#include <common/multipleDispatch.hpp>
-#include <grammar/Grammar.h>
#include <grammar/Regular/RightRG.h>
#include <regexp/RegExp.h>
@@ -25,14 +24,14 @@ namespace convert {
* Converts regular expression to right regular grammar using Glushkov algorithm.
* Source: None yet.
*/
-class ToGrammarRightRGGlushkov : public std::SingleDispatch<grammar::Grammar, regexp::RegExpBase> {
+class ToGrammarRightRGGlushkov : public std::SingleDispatch<grammar::RightRG, regexp::RegExpBase> {
public:
/**
* Performs conversion.
* @param regexp original regular expression
* @return right regular grammar equivalent to source regexp.
*/
- static grammar::Grammar convert(const regexp::RegExp& regexp);
+ static grammar::RightRG convert(const regexp::RegExp& regexp);
static grammar::RightRG convert(const regexp::FormalRegExp& regexp);
static grammar::RightRG convert(const regexp::UnboundedRegExp& regexp);
--
GitLab