Skip to content
Snippets Groups Projects
Commit 2f94c910 authored by Jens Bendisposto's avatar Jens Bendisposto
Browse files

Merge branch 'release/3.2.6'

parents 9e1f31d5 1f32ea66
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,7 @@ apply plugin: 'eclipse' ...@@ -3,7 +3,7 @@ apply plugin: 'eclipse'
apply plugin: 'maven' apply plugin: 'maven'
project.version = '3.2.5' project.version = '3.2.6'
project.group = 'de.stups' project.group = 'de.stups'
repositories { repositories {
......
...@@ -382,7 +382,7 @@ Macro:ParserParseTail ...@@ -382,7 +382,7 @@ Macro:ParserParseTail
} }
case ERROR: case ERROR:
throw new ParserException(this.last_token, throw new ParserException(this.last_token,
"[" + this.last_line + "," + this.last_pos + "] " + "[" + this.last_line + "," + this.last_pos + "] " ,
Parser.errorMessages[Parser.errors[this.action[1]]]); Parser.errorMessages[Parser.errors[this.action[1]]]);
} }
} }
...@@ -673,6 +673,7 @@ import $1$.*; ...@@ -673,6 +673,7 @@ import $1$.*;
public class ParserException extends Exception public class ParserException extends Exception
{ {
Token token; Token token;
String realMsg;
public ParserException( Token token, String message) public ParserException( Token token, String message)
{ {
...@@ -680,10 +681,22 @@ public class ParserException extends Exception ...@@ -680,10 +681,22 @@ public class ParserException extends Exception
this.token = token; this.token = token;
} }
public ParserException( Token token, String prefix, String message)
{
super(prefix+message);
this.realMsg = message;
this.token = token;
}
public Token getToken() public Token getToken()
{ {
return this.token; return this.token;
} }
public String getRealMsg()
{
return this.realMsg;
}
} }
$ $
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment