From 2dffd90b7246e10e7ddc838ede1ebbe71b616406 Mon Sep 17 00:00:00 2001
From: Tomas Pecka <peckato1@fit.cvut.cz>
Date: Tue, 2 Aug 2016 20:50:26 +0200
Subject: [PATCH] Fix name: Nulary -> Nullary
---
alib2data/src/regexp/formal/FormalRegExpEmpty.h | 2 +-
alib2data/src/regexp/formal/FormalRegExpEpsilon.h | 2 +-
alib2data/src/regexp/formal/FormalRegExpSymbol.h | 2 +-
alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.h | 2 +-
alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.h | 2 +-
alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h | 2 +-
alib2std/src/extensions/tree.hpp | 6 +++---
alib2std/test-src/extensions/TreeTest.h | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/alib2data/src/regexp/formal/FormalRegExpEmpty.h b/alib2data/src/regexp/formal/FormalRegExpEmpty.h
index 44796c4af0..17d7461f5c 100644
--- a/alib2data/src/regexp/formal/FormalRegExpEmpty.h
+++ b/alib2data/src/regexp/formal/FormalRegExpEmpty.h
@@ -16,7 +16,7 @@ namespace regexp {
/**
* Represents empty regular expression in the regular expression.
*/
-class FormalRegExpEmpty : public FormalRegExpElement, public std::NularyNode < std::smart_ptr < FormalRegExpElement >, std::smart_ptr < const FormalRegExpElement >, FormalRegExpSymbol > {
+class FormalRegExpEmpty : public FormalRegExpElement, public std::NullaryNode < std::smart_ptr < FormalRegExpElement >, std::smart_ptr < const FormalRegExpElement >, FormalRegExpSymbol > {
public:
void Accept ( void * userData, const FormalRegExpElementVisitor & visitor ) const {
visitor.Visit ( userData, * this );
diff --git a/alib2data/src/regexp/formal/FormalRegExpEpsilon.h b/alib2data/src/regexp/formal/FormalRegExpEpsilon.h
index 65f8194701..e758ec00e2 100644
--- a/alib2data/src/regexp/formal/FormalRegExpEpsilon.h
+++ b/alib2data/src/regexp/formal/FormalRegExpEpsilon.h
@@ -16,7 +16,7 @@ namespace regexp {
/**
* Represents epsilon in the regular expression.
*/
-class FormalRegExpEpsilon : public FormalRegExpElement, public std::NularyNode < std::smart_ptr < FormalRegExpElement >, std::smart_ptr < const FormalRegExpElement >, FormalRegExpSymbol > {
+class FormalRegExpEpsilon : public FormalRegExpElement, public std::NullaryNode < std::smart_ptr < FormalRegExpElement >, std::smart_ptr < const FormalRegExpElement >, FormalRegExpSymbol > {
public:
void Accept ( void * userData, const FormalRegExpElementVisitor & visitor ) const {
visitor.Visit ( userData, * this );
diff --git a/alib2data/src/regexp/formal/FormalRegExpSymbol.h b/alib2data/src/regexp/formal/FormalRegExpSymbol.h
index 57b232ad0b..04f8a32702 100644
--- a/alib2data/src/regexp/formal/FormalRegExpSymbol.h
+++ b/alib2data/src/regexp/formal/FormalRegExpSymbol.h
@@ -16,7 +16,7 @@ namespace regexp {
/**
* Represents symbol in the regular expression. Contains name of the symbol.
*/
-class FormalRegExpSymbol : public FormalRegExpElement, public std::NularyNode < std::smart_ptr < FormalRegExpElement >, std::smart_ptr < const FormalRegExpElement >, FormalRegExpSymbol > {
+class FormalRegExpSymbol : public FormalRegExpElement, public std::NullaryNode < std::smart_ptr < FormalRegExpElement >, std::smart_ptr < const FormalRegExpElement >, FormalRegExpSymbol > {
alphabet::Symbol symbol;
public:
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.h b/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.h
index c5ee0d8494..879d149d95 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpEmpty.h
@@ -15,7 +15,7 @@ namespace regexp {
/**
* Represents empty regular expression in the regular expression.
*/
-class UnboundedRegExpEmpty : public UnboundedRegExpElement, public std::NularyNode < std::smart_ptr < UnboundedRegExpElement >, std::smart_ptr < const UnboundedRegExpElement >, UnboundedRegExpSymbol > {
+class UnboundedRegExpEmpty : public UnboundedRegExpElement, public std::NullaryNode < std::smart_ptr < UnboundedRegExpElement >, std::smart_ptr < const UnboundedRegExpElement >, UnboundedRegExpSymbol > {
public:
void Accept ( void * userData, const UnboundedRegExpElementVisitor & visitor ) const {
visitor.Visit ( userData, * this );
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.h b/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.h
index 45d66c998e..b3937f1619 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpEpsilon.h
@@ -15,7 +15,7 @@ namespace regexp {
/**
* Represents epsilon in the regular expression.
*/
-class UnboundedRegExpEpsilon : public UnboundedRegExpElement, public std::NularyNode < std::smart_ptr < UnboundedRegExpElement >, std::smart_ptr < const UnboundedRegExpElement >, UnboundedRegExpSymbol > {
+class UnboundedRegExpEpsilon : public UnboundedRegExpElement, public std::NullaryNode < std::smart_ptr < UnboundedRegExpElement >, std::smart_ptr < const UnboundedRegExpElement >, UnboundedRegExpSymbol > {
public:
void Accept ( void * userData, const UnboundedRegExpElementVisitor & visitor ) const {
visitor.Visit ( userData, * this );
diff --git a/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h b/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h
index 844412f67a..288b4a7bf0 100644
--- a/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h
+++ b/alib2data/src/regexp/unbounded/UnboundedRegExpSymbol.h
@@ -16,7 +16,7 @@ namespace regexp {
/**
* Represents symbol in the regular expression. Contains name of the symbol.
*/
-class UnboundedRegExpSymbol : public UnboundedRegExpElement, public std::NularyNode < std::smart_ptr < UnboundedRegExpElement >, std::smart_ptr < const UnboundedRegExpElement >, UnboundedRegExpSymbol > {
+class UnboundedRegExpSymbol : public UnboundedRegExpElement, public std::NullaryNode < std::smart_ptr < UnboundedRegExpElement >, std::smart_ptr < const UnboundedRegExpElement >, UnboundedRegExpSymbol > {
alphabet::Symbol symbol;
public:
diff --git a/alib2std/src/extensions/tree.hpp b/alib2std/src/extensions/tree.hpp
index e165ef6774..a66cd6d5ef 100644
--- a/alib2std/src/extensions/tree.hpp
+++ b/alib2std/src/extensions/tree.hpp
@@ -15,7 +15,7 @@ class BaseNode {
Data * parent;
template < class D, class CD, class C >
- friend class NularyNode;
+ friend class NullaryNode;
template < class D, class CD, class C >
friend class UnaryNode;
template < class D, class CD, class C >
@@ -135,9 +135,9 @@ public:
};
template < class Data, class ConstData = Data, class Cast = Data >
-class NularyNode : public AnyaryNode < Data, 0, ConstData, Cast > {
+class NullaryNode : public AnyaryNode < Data, 0, ConstData, Cast > {
public:
- NularyNode ( ) : AnyaryNode < Data, 0, ConstData, Cast > ( std::tuple < > ( ) ) {
+ NullaryNode ( ) : AnyaryNode < Data, 0, ConstData, Cast > ( std::tuple < > ( ) ) {
}
};
diff --git a/alib2std/test-src/extensions/TreeTest.h b/alib2std/test-src/extensions/TreeTest.h
index 80a10e4413..41c6695f6d 100644
--- a/alib2std/test-src/extensions/TreeTest.h
+++ b/alib2std/test-src/extensions/TreeTest.h
@@ -33,7 +33,7 @@ public:
};
- class RegExpSymbol : public RegExpElement, public std::NularyNode < std::shared_ptr < RegExpElement >, std::shared_ptr < const RegExpElement >, RegExpSymbol > {
+ class RegExpSymbol : public RegExpElement, public std::NullaryNode < std::shared_ptr < RegExpElement >, std::shared_ptr < const RegExpElement >, RegExpSymbol > {
char symbol;
public:
--
GitLab