+ symbol and ranked symbol wrappers when relevant

alib2data/src/alphabet/BarSymbol.cpp

@@ -38,7 +38,8 @@ BarSymbol::operator std::string () const {
 	return "|";
 }
-BarSymbol BarSymbol::BAR = BarSymbol();
+BarSymbol BarSymbol::BAR = BarSymbol ( );
+Symbol BarSymbol::BAR_SYMBOL = Symbol ( BarSymbol ( ) );
 const std::string BarSymbol::XML_TAG_NAME = "BarSymbol";

alib2data/src/alphabet/BarSymbol.h

@@ -9,6 +9,7 @@
 #define BAR_SYMBOL_H_
 #include "SymbolBase.h"
+#include "Symbol.h"
 namespace alphabet {
@@ -39,6 +40,7 @@ public:
 	virtual explicit operator std::string ( ) const;
 	static BarSymbol BAR;
+	static Symbol BAR_SYMBOL;
 	const static std::string XML_TAG_NAME;

alib2data/src/alphabet/BlankSymbol.cpp

@@ -38,7 +38,8 @@ BlankSymbol::operator std::string () const {
 	return "B";
 }
-BlankSymbol BlankSymbol::BLANK = BlankSymbol();
+BlankSymbol BlankSymbol::BLANK = BlankSymbol ( );
+Symbol BlankSymbol::BLANK_SYMBOL = Symbol ( BlankSymbol ( ) );
 const std::string BlankSymbol::XML_TAG_NAME = "BlankSymbol";

alib2data/src/alphabet/BlankSymbol.h

@@ -9,6 +9,7 @@
 #define BLANK_SYMBOL_H_
 #include "SymbolBase.h"
+#include "Symbol.h"
 namespace alphabet {
@@ -39,6 +40,7 @@ public:
 	virtual explicit operator std::string ( ) const;
 	static BlankSymbol BLANK;
+	static Symbol BLANK_SYMBOL;
 	const static std::string XML_TAG_NAME;

alib2data/src/alphabet/BottomOfTheStackSymbol.cpp

@@ -38,7 +38,8 @@ BottomOfTheStackSymbol::operator std::string () const {
 	return "T";
 }
-BottomOfTheStackSymbol BottomOfTheStackSymbol::BOTTOM_OF_THE_STACK = BottomOfTheStackSymbol();
+BottomOfTheStackSymbol BottomOfTheStackSymbol::BOTTOM_OF_THE_STACK = BottomOfTheStackSymbol ( );
+Symbol BottomOfTheStackSymbol::BOTTOM_OF_THE_STACK_SYMBOL = Symbol ( BottomOfTheStackSymbol ( ) );
 const std::string BottomOfTheStackSymbol::XML_TAG_NAME = "BottomOfTheStackSymbol";

alib2data/src/alphabet/BottomOfTheStackSymbol.h

@@ -9,6 +9,7 @@
 #define BOTTOM_OF_THE_STACK_SYMBOL_H_
 #include "SymbolBase.h"
+#include "Symbol.h"
 namespace alphabet {
@@ -39,6 +40,7 @@ public:
 	virtual explicit operator std::string ( ) const;
 	static BottomOfTheStackSymbol BOTTOM_OF_THE_STACK;
+	static Symbol BOTTOM_OF_THE_STACK_SYMBOL;
 	const static std::string XML_TAG_NAME;

alib2data/src/alphabet/EndSymbol.cpp

@@ -38,7 +38,8 @@ EndSymbol::operator std::string () const {
 	return "$";
 }
-EndSymbol EndSymbol::END = EndSymbol();
+EndSymbol EndSymbol::END = EndSymbol ( );
+Symbol EndSymbol::END_SYMBOL = Symbol ( EndSymbol ( ) );
 const std::string EndSymbol::XML_TAG_NAME = "EndSymbol";

alib2data/src/alphabet/EndSymbol.h

@@ -9,6 +9,7 @@
 #define END_SYMBOL_H_
 #include "SymbolBase.h"
+#include "Symbol.h"
 namespace alphabet {
@@ -39,6 +40,7 @@ public:
 	virtual explicit operator std::string ( ) const;
 	static EndSymbol END;
+	static Symbol END_SYMBOL;
 	const static std::string XML_TAG_NAME;

alib2data/src/alphabet/StartSymbol.cpp

@@ -38,7 +38,8 @@ StartSymbol::operator std::string () const {
 	return "$";
 }
-StartSymbol StartSymbol::START = StartSymbol();
+StartSymbol StartSymbol::START = StartSymbol ( );
+Symbol StartSymbol::START_SYMBOL = Symbol ( StartSymbol ( ) );
 const std::string StartSymbol::XML_TAG_NAME = "StartSymbol";

alib2data/src/alphabet/StartSymbol.h

@@ -9,6 +9,7 @@
 #define START_SYMBOL_H_
 #include "SymbolBase.h"
+#include "Symbol.h"
 namespace alphabet {
@@ -39,6 +40,7 @@ public:
 	virtual explicit operator std::string ( ) const;
 	static StartSymbol START;
+	static Symbol START_SYMBOL;
 	const static std::string XML_TAG_NAME;

alib2data/src/alphabet/SubtreeWildcardSymbol.cpp

@@ -38,7 +38,9 @@ SubtreeWildcardSymbol::operator std::string () const {
 	return "#S";
 }
-SubtreeWildcardSymbol SubtreeWildcardSymbol::SUBTREE_WILDCARD = SubtreeWildcardSymbol();
+SubtreeWildcardSymbol SubtreeWildcardSymbol::SUBTREE_WILDCARD = SubtreeWildcardSymbol ( );
+Symbol SubtreeWildcardSymbol::SUBTREE_WILDCARD_SYMBOL = Symbol ( SubtreeWildcardSymbol ( ) );
+RankedSymbol SubtreeWildcardSymbol::RANKED_SUBTREE_WILDCARD_SYMBOL = RankedSymbol ( Symbol ( SubtreeWildcardSymbol ( ) ), 0);
 const std::string SubtreeWildcardSymbol::XML_TAG_NAME = "SubtreeWildcardSymbol";

alib2data/src/alphabet/SubtreeWildcardSymbol.h

@@ -9,6 +9,8 @@
 #define SUBTREE_WILDCARD_SYMBOL_H_
 #include "SymbolBase.h"
+#include "Symbol.h"
+#include "RankedSymbol.h"
 namespace alphabet {
@@ -39,6 +41,8 @@ public:
 	virtual explicit operator std::string ( ) const;
 	static SubtreeWildcardSymbol SUBTREE_WILDCARD;
+	static Symbol SUBTREE_WILDCARD_SYMBOL;
+	static RankedSymbol RANKED_SUBTREE_WILDCARD_SYMBOL;
 	const static std::string XML_TAG_NAME;

alib2data/src/alphabet/VariablesBarSymbol.cpp

@@ -38,6 +38,8 @@ VariablesBarSymbol::operator std::string ( ) const {
 }
 VariablesBarSymbol VariablesBarSymbol::BAR = VariablesBarSymbol ( );
+Symbol VariablesBarSymbol::BAR_SYMBOL = Symbol ( VariablesBarSymbol ( ) );
+RankedSymbol VariablesBarSymbol::RANKED_BAR_SYMBOL = RankedSymbol ( Symbol ( VariablesBarSymbol ( ) ), 0);
 const std::string VariablesBarSymbol::XML_TAG_NAME = "VariablesBarSymbol";

alib2data/src/alphabet/VariablesBarSymbol.h

@@ -9,6 +9,8 @@
 #define VARIABLES_BAR_SYMBOL_H_
 #include "SymbolBase.h"
+#include "Symbol.h"
+#include "RankedSymbol.h"
 namespace alphabet {
@@ -39,6 +41,8 @@ public:
 	virtual explicit operator std::string ( ) const;
 	static VariablesBarSymbol BAR;
+	static Symbol BAR_SYMBOL;
+	static RankedSymbol RANKED_BAR_SYMBOL;
 	const static std::string XML_TAG_NAME;