X-Git-Url: http://git.tdb.fi/?p=libs%2Fdatafile.git;a=blobdiff_plain;f=source%2Fparser.cpp;h=c47969bb2f3f30c5e194f534fbae6ff72884a3ad;hp=f74be86396881917caf46fec861a923d954f5293;hb=ec2bce20b19a20b4ebc17e4cb82a0bfbcda15c50;hpb=47597fd1b0b11c915466dd7f3f1281906442377c

diff --git a/source/parser.cpp b/source/parser.cpp
index f74be86..c47969b 100644
--- a/source/parser.cpp
+++ b/source/parser.cpp
@@ -5,7 +5,7 @@ Distributed under the LGPL
 */
 #include <cctype>
 #include <sstream>
-#include <msp/error.h>
+#include "error.h"
 #include "parser.h"
 #include "statement.h"
 #include "token.h"
@@ -25,7 +25,7 @@ Statement Parser::parse()
 {
 	if(!good)
 		throw Exception("Parser is not good");
-	
+
 	try
 	{
 		return parse_(0);
@@ -42,7 +42,7 @@ Statement Parser::parse_(const Token *t)
 	Statement result;
 	bool      sub=false;
 	bool      finish=false;
-	
+
 	while(in)
 	{
 		Token token;
@@ -53,13 +53,13 @@ Statement Parser::parse_(const Token *t)
 		}
 		else
 			token=parse_token();
-		
+
 		if(result.keyword.empty())
 		{
 			if(token.str.empty())
 				break;
 			else if(token.type!=Token::IDENTIFIER)
-				throw DataError(get_location()+": Syntax error at token '"+token.str+"' (expected an identifier)");
+				throw ParseError(get_location()+": Syntax error at token '"+token.str+"' (expected an identifier)", src, in.get_line_number());
 			result.keyword=token.str;
 			result.valid=true;
 			result.source=src;
@@ -81,7 +81,7 @@ Statement Parser::parse_(const Token *t)
 		else if(finish)
 		{
 			if(token.str!=";")
-				throw DataError(get_location()+": Syntax error at token '"+token.str+"' (Expected a ';')");
+				throw ParseError(get_location()+": Syntax error at token '"+token.str+"' (Expected a ';')", src, in.get_line_number());
 			break;
 		}
 		else if(token.str=="{")
@@ -105,9 +105,9 @@ Statement Parser::parse_(const Token *t)
 			//result.args.push_back(resolve_identifiertoken.str);
 		}
 		else if(token.str=="")
-			throw DataError(src+": Unexcepted EOF");
+			throw ParseError(src+": Unexcepted EOF", src, in.get_line_number());
 		else
-			throw DataError(get_location()+": Syntax error");
+			throw ParseError(get_location()+": Syntax error", src, in.get_line_number());
 	}
 
 	return result;
@@ -115,15 +115,15 @@ Statement Parser::parse_(const Token *t)
 
 Token Parser::parse_token()
 {
-	int c;
+	int c=0;
 	unsigned comment=0;
+
+	// Skip over comments and whitespace
 	while(in)
 	{
 		c=in.get();
 		int next=in.peek();
 
-		//cout<<c<<' '<<next<<'\n';
-
 		if(c=='/' && next=='/')
 			comment=1;
 		else if(c=='/' && next=='*')
@@ -137,9 +137,10 @@ Token Parser::parse_token()
 		else if(!isspace(c) && !comment)
 			break;
 	}
-	if(comment)
-		throw DataError(src+": Unfinished comment");
-	
+
+	if(comment)  // Didn't hit any non-whitespace
+		throw ParseError(src+": Unfinished comment", src, in.get_line_number());
+
 	enum ParseState
 	{
 		INIT,
@@ -183,7 +184,7 @@ Token Parser::parse_token()
 		if(state!=INIT)
 			c=in.get();
 		int next=in.peek();
-		
+
 		buf+=c;
 
 		switch(state)
@@ -206,7 +207,7 @@ Token Parser::parse_token()
 			else
 				parse_error(c, state);
 			break;
-		
+
 		case SIGN:
 			if(c=='0')
 				state=ZERO;
@@ -282,7 +283,7 @@ Token Parser::parse_token()
 			else
 				escape=false;
 			break;
-		
+
 		case IDENTIFIER:
 			if(!isalpha(c) && !isdigit(c) && c!='_')
 				parse_error(c, state);
@@ -329,7 +330,7 @@ string Parser::unescape_string(const string &str)
 			else if(*i=='x')
 				hexcape=0x100;
 			else
-				throw DataError("Invalid escape");
+				throw ParseError("Invalid escape", src, in.get_line_number());
 			escape=false;
 		}
 		else if(hexcape)
@@ -342,7 +343,7 @@ string Parser::unescape_string(const string &str)
 			else if(*i>='A' && *i<='F')
 				digit=*i-'A'+10;
 			else
-				throw DataError("Invalid hex digit");
+				throw ParseError("Invalid hex digit", src, in.get_line_number());
 
 			hexcape=(hexcape<<4)|digit;
 			if(hexcape&0x10000)
@@ -371,7 +372,7 @@ void Parser::parse_error(int c, int state)
 {
 	ostringstream ss;
 	ss<<get_location()<<": Parse error at '"<<(char)c<<"' (state "<<state<<')';
-	throw DataError(ss.str());
+	throw ParseError(ss.str(), src, in.get_line_number());
 }
 
 } // namespace Parser