X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftextparser.cpp;h=c87a32df666924e163ee83e8d53f06d7d181b2e3;hb=ed78b585cfc4ecb44972e346857e887b183fd7a7;hp=9bed08ac9e0ea5a154208b24cda76dc75925267b;hpb=eec12aaf350ef69b79d149adbc3585cf784552ad;p=libs%2Fdatafile.git

diff --git a/source/textparser.cpp b/source/textparser.cpp
index 9bed08a..c87a32d 100644
--- a/source/textparser.cpp
+++ b/source/textparser.cpp
@@ -1,5 +1,6 @@
 #include <msp/strings/format.h>
 #include <msp/strings/utils.h>
+#include "except.h"
 #include "input.h"
 #include "textparser.h"
 #include "token.h"
@@ -9,28 +10,6 @@ using namespace std;
 namespace Msp {
 namespace DataFile {
 
-class parse_error: public runtime_error
-{
-public:
-	parse_error(const std::string &t):
-		runtime_error(t.empty() ? "at end of input" : format("after '%s'", t))
-	{ }
-
-	virtual ~parse_error() throw() { }
-};
-
-
-class syntax_error: public runtime_error
-{
-public:
-	syntax_error(const std::string &t):
-		runtime_error(t.empty() ? "at end of input" : format("at '%s'", t))
-	{ }
-
-	virtual ~syntax_error() throw() { }
-};
-
-
 TextParser::TextParser(Input &i, const string &s):
 	ParserMode(i, s)
 { }
@@ -124,9 +103,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;