diff --git a/alib2data/src/alphabet/SymbolFeatures.h b/alib2data/src/alphabet/SymbolFeatures.h index 4b1599998167f3b01b91103911bfb40d99943229..670faf1358834121077f26a67b93cdcaf6a8211e 100644 --- a/alib2data/src/alphabet/SymbolFeatures.h +++ b/alib2data/src/alphabet/SymbolFeatures.h @@ -17,7 +17,6 @@ enum class FEATURES { END, RANKED, BAR, - RANKED_BAR, SUBTREE_WILDCARD, SYMBOL_SET_SYMBOL, SYMBOL_PAIR_SYMBOL, diff --git a/alib2data/src/alphabet/SymbolFromStringLexer.cpp b/alib2data/src/alphabet/SymbolFromStringLexer.cpp index 73367221824f5c24fabaf5761982646115835f16..e7617cfd8a40153f949ea6a088755b01c53ba588 100644 --- a/alib2data/src/alphabet/SymbolFromStringLexer.cpp +++ b/alib2data/src/alphabet/SymbolFromStringLexer.cpp @@ -47,11 +47,11 @@ L1: token.type = TokenType::BOTTOM; token.raw += character; return token; - } else if(character == 'E') { + } else if(character == '$') { token.type = TokenType::END; token.raw += character; return token; - } else if(character == 'S') { + } else if(character == '^') { token.type = TokenType::START; token.raw += character; return token; diff --git a/alib2data/src/alphabet/SymbolFromStringParser.cpp b/alib2data/src/alphabet/SymbolFromStringParser.cpp index 4bccee507d7b0d882a51d9080a8094fbc7d0edbb..e75cfc78815f48c7b9badb9ea0007541d64d1418 100644 --- a/alib2data/src/alphabet/SymbolFromStringParser.cpp +++ b/alib2data/src/alphabet/SymbolFromStringParser.cpp @@ -20,7 +20,7 @@ namespace alphabet { Symbol SymbolFromStringParser::parseSymbol(std::istream& input) const { - return parseSymbol(input, std::set<FEATURES>({FEATURES::LABELED, FEATURES::BLANK, FEATURES::BOTTOM, FEATURES::END, FEATURES::BAR, FEATURES::SUBTREE_WILDCARD, FEATURES::START})); + return parseSymbol(input, std::set<FEATURES>({FEATURES::LABELED, FEATURES::BLANK, FEATURES::BOTTOM, FEATURES::END, FEATURES::START})); } Symbol SymbolFromStringParser::parseSymbol(std::istream& input, const std::set<FEATURES>& features) const { diff --git a/alib2data/src/alphabet/SymbolFromXMLParser.cpp b/alib2data/src/alphabet/SymbolFromXMLParser.cpp index 21b3f052ec78892aa0f9a55614cac160563da5d2..c37d1a98be14a69a5b6ba0f54e073d7d44cdbbfa 100644 --- a/alib2data/src/alphabet/SymbolFromXMLParser.cpp +++ b/alib2data/src/alphabet/SymbolFromXMLParser.cpp @@ -15,7 +15,7 @@ namespace alphabet { Symbol SymbolFromXMLParser::parseSymbol(std::deque<sax::Token>& input) const { - return parseSymbol(input, std::set<FEATURES>({FEATURES::LABELED, FEATURES::BLANK, FEATURES::BOTTOM, FEATURES::END, FEATURES::RANKED, FEATURES::BAR, FEATURES::RANKED_BAR, FEATURES::SUBTREE_WILDCARD, FEATURES::SYMBOL_PAIR_SYMBOL, FEATURES::SYMBOL_SET_SYMBOL, FEATURES::UNIQUE_SYMBOL, FEATURES::START})); + return parseSymbol(input, std::set<FEATURES>({FEATURES::LABELED, FEATURES::BLANK, FEATURES::BOTTOM, FEATURES::END, FEATURES::RANKED, FEATURES::BAR, FEATURES::SUBTREE_WILDCARD, FEATURES::SYMBOL_PAIR_SYMBOL, FEATURES::SYMBOL_SET_SYMBOL, FEATURES::UNIQUE_SYMBOL, FEATURES::START})); } Symbol SymbolFromXMLParser::parseSymbol(std::deque<sax::Token>& input, const std::set<FEATURES>& features) const { diff --git a/alib2data/src/alphabet/SymbolToStringComposer.cpp b/alib2data/src/alphabet/SymbolToStringComposer.cpp index e944bb41e2d8f3fea899091cbec199d7b72aa891..6da95cc6107a61628bd9d1f9bb094ec599fc67b2 100644 --- a/alib2data/src/alphabet/SymbolToStringComposer.cpp +++ b/alib2data/src/alphabet/SymbolToStringComposer.cpp @@ -43,7 +43,7 @@ void SymbolToStringComposer::Visit(void* userData, const EndSymbol&) const { void SymbolToStringComposer::Visit(void* userData, const StartSymbol&) const { std::ostream &out = *((std::ostream*) userData); - out << "#S"; + out << "#^"; } void SymbolToStringComposer::Visit(void* userData, const RankedSymbol& symbol) const {