safer detection of eof in string lexers

alib2str/src/automaton/AutomatonFromStringLexer.cpp

@@ -20,12 +20,17 @@ AutomatonFromStringLexer::Token AutomatonFromStringLexer::next(std::istream& in)
 L0:
 	character = in.get();
-	if(in.eof()) {
+	if ( in.eof ( ) || character == EOF ) { // for some reason the in stream was not setting eof bit for automata input without last newline
 		token.type = TokenType::TEOF;
 		return token;
 	} else if(character == ' ' || character == '\t') {
 		token.raw += character;
 		goto L0;
+	} else if(character == '\r') {
+		token.type = TokenType::NEW_LINE;
+		token.value += character;
+		token.raw += character;
+		return token;
 	} else if(character == '\n') {
 		token.type = TokenType::NEW_LINE;
 		token.value += character;

alib2str/src/container/ContainerFromStringLexer.cpp

@@ -18,7 +18,7 @@ ContainerFromStringLexer::Token ContainerFromStringLexer::next(std::istream& in)
 L0:
 	character = in.get();
-	if(in.eof()) {
+	if ( in.eof ( ) || character == EOF ) {
 		token.type = TokenType::TEOF;
 		return token;
 	} else if(character == ' ' || character == '\n' || character == '\t') {

alib2str/src/grammar/GrammarFromStringLexer.cpp

@@ -18,7 +18,7 @@ GrammarFromStringLexer::Token GrammarFromStringLexer::next(std::istream& in) {
 L0:
 	character = in.get();
-	if(in.eof()) {
+	if ( in.eof ( ) || character == EOF ) {
 		token.type = TokenType::TEOF;
 		return token;
 	} else if(character == ' ' || character == '\t' || character == '\n') {

alib2str/src/primitive/PrimitiveFromStringLexer.cpp

@@ -18,7 +18,7 @@ PrimitiveFromStringLexer::Token PrimitiveFromStringLexer::next(std::istream& in)
 L0:
 	character = in.get();
-	if(in.eof()) {
+	if ( in.eof ( ) || character == EOF ) {
 		token.type = TokenType::TEOF;
 		return token;
 	} else if(character == ' ' || character == '\n' || character == '\t') {

alib2str/src/regexp/RegExpFromStringLexer.cpp

@@ -18,7 +18,7 @@ RegExpFromStringLexer::Token RegExpFromStringLexer::next(std::istream& in) {
 L0:
 	character = in.get();
-	if(in.eof()) {
+	if ( in.eof ( ) || character == EOF ) {
 		token.type = TokenType::TEOF;
 		return token;
 	} else if(character == ' ' || character == '\n' || character == '\t') {

alib2str/src/string/StringFromStringLexer.cpp

@@ -18,8 +18,7 @@ StringFromStringLexer::Token StringFromStringLexer::next(std::istream& in) {
 L0:
 	character = in.get();
-
-	if(in.eof()) {
+	if ( in.eof ( ) || character == EOF ) {
 		token.type = TokenType::TEOF;
 		return token;
 	} else if(character == ' ' || character == '\n' || character == '\t') {

alib2str/src/tree/TreeFromStringLexer.cpp

@@ -17,9 +17,9 @@ TreeFromStringLexer::Token TreeFromStringLexer::next ( std::istream & in ) {
 	token.raw = "";
 	char character;
-L0:	character = in.get ( );
-
-	if ( in.eof ( ) ) {
+L0:
+	character = in.get ( );
+	if ( in.eof ( ) || character == EOF ) {
 		token.type = TokenType::TEOF;
 		return token;
 	} else if ( ( character == ' ' ) || ( character == '\n' ) || ( character == '\t' ) ) {