X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftextparser.cpp;h=05521a90456a617e2e82b1fb664225d512a22af4;hb=29fafaa2c570b0cf92f41eeb534cfb65a841a892;hp=c4eb03c7d91ef21e2b1af8d707e2f1363cc7fc4e;hpb=d14b7ddd81404b909a4c4763a36a23b94998a089;p=libs%2Fdatafile.git

diff --git a/source/textparser.cpp b/source/textparser.cpp
index c4eb03c..05521a9 100644
--- a/source/textparser.cpp
+++ b/source/textparser.cpp
@@ -124,9 +124,9 @@ Token TextParser::parse_token()
 		c = in.get();
 		int next = in.peek();
 
-		if(c=='/' && next=='/')
+		if(c=='/' && next=='/' && !comment)
 			comment = 1;
-		else if(c=='/' && next=='*')
+		else if(c=='/' && next=='*' && !comment)
 			comment = 2;
 		else if(c=='\n' && comment==1)
 			comment = 0;
@@ -237,6 +237,8 @@ Token TextParser::parse_token()
 		case DECIMAL:
 			if(c=='.')
 				state = FLOAT;
+			else if(c=='e' || c=='E')
+				state = FLOATEXPINIT;
 			else if(!isdigit(c))
 				throw parse_error(buf);
 			break;