diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/TurtleJavaccReaderRIOT.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/TurtleJavaccReaderRIOT.java index 0fee9d8cf70..6aa532150ae 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/TurtleJavaccReaderRIOT.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/turtlejcc/TurtleJavaccReaderRIOT.java @@ -83,8 +83,10 @@ private void read(TurtleJavacc parser, String baseURI, ContentType ct, StreamRDF throw ex; } catch (ParseException ex) { - profile.getErrorHandler().error(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn); - throw new RiotParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn); + // The error is at the token after the last successfully consumed token. + var errorToken = ex.currentToken.next != null ? ex.currentToken.next : ex.currentToken; + profile.getErrorHandler().error(ex.getMessage(), errorToken.beginLine, errorToken.beginColumn); + throw new RiotParseException(ex.getMessage(), errorToken.beginLine, errorToken.beginColumn); } catch (TokenMgrError ex) { profile.getErrorHandler().error(ex.getMessage(), -1, -1); diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParserARQ.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParserARQ.java index 7aa082359a0..7a3eb1654ad 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParserARQ.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParserARQ.java @@ -92,7 +92,9 @@ private static void perform(Query query, String string, Action action) { parser.setQuery(query); action.exec(parser); } catch (org.apache.jena.sparql.lang.arq.javacc.ParseException ex) { - throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn); + // The error is at the token after the last successfully consumed token. + var errorToken = ex.currentToken.next != null ? ex.currentToken.next : ex.currentToken; + throw new QueryParseException(ex.getMessage(), errorToken.beginLine, errorToken.beginColumn); } catch (org.apache.jena.sparql.lang.arq.javacc.TokenMgrError tErr) { // Last valid token : not the same as token error message - but this // should not happen diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParserARQUpdate.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParserARQUpdate.java index c735e44a4c0..038117c7edc 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParserARQUpdate.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ParserARQUpdate.java @@ -43,7 +43,9 @@ protected void executeParse(UpdateSink sink, Prologue prologue, Reader r) { parser.setUpdate(prologue, sink); parser.UpdateUnit(); } catch (org.apache.jena.sparql.lang.arq.javacc.ParseException ex) { - throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn); + // The error is at the token after the last successfully consumed token. + var errorToken = ex.currentToken.next != null ? ex.currentToken.next : ex.currentToken; + throw new QueryParseException(ex.getMessage(), errorToken.beginLine, errorToken.beginColumn); } catch (org.apache.jena.sparql.lang.arq.javacc.TokenMgrError tErr) { // Last valid token : not the same as token error message - but this // should not happen diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/ParserSPARQL10.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/ParserSPARQL10.java index ed77e2714e8..a51ecbec2a5 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/ParserSPARQL10.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/ParserSPARQL10.java @@ -75,7 +75,9 @@ private static void perform(Query query, String string, Action action) { parser.setQuery(query); action.exec(parser); } catch (org.apache.jena.sparql.lang.sparql_10.javacc.ParseException ex) { - throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn); + // The error is at the token after the last successfully consumed token. + var errorToken = ex.currentToken.next != null ? ex.currentToken.next : ex.currentToken; + throw new QueryParseException(ex.getMessage(), errorToken.beginLine, errorToken.beginColumn); } catch (org.apache.jena.sparql.lang.sparql_10.javacc.TokenMgrError tErr) { // Last valid token : not the same as token error message - but this // should not happen diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11.java index 7b4d2771122..c48fc1afa74 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11.java @@ -75,7 +75,9 @@ private static void perform(Query query, String string, Action action) { parser.setQuery(query); action.exec(parser); } catch (org.apache.jena.sparql.lang.sparql_11.javacc.ParseException ex) { - throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn); + // The error is at the token after the last successfully consumed token. + var errorToken = ex.currentToken.next != null ? ex.currentToken.next : ex.currentToken; + throw new QueryParseException(ex.getMessage(), errorToken.beginLine, errorToken.beginColumn); } catch (org.apache.jena.sparql.lang.sparql_11.javacc.TokenMgrError tErr) { // Last valid token : not the same as token error message - but this // should not happen diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11Update.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11Update.java index 76597cfcf7d..9a91f8fde40 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11Update.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/ParserSPARQL11Update.java @@ -42,7 +42,9 @@ protected void executeParse(UpdateSink sink, Prologue prologue, Reader r) { parser.setUpdate(prologue, sink); parser.UpdateUnit(); } catch (org.apache.jena.sparql.lang.sparql_11.javacc.ParseException ex) { - throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn); + // The error is at the token after the last successfully consumed token. + var errorToken = ex.currentToken.next != null ? ex.currentToken.next : ex.currentToken; + throw new QueryParseException(ex.getMessage(), errorToken.beginLine, errorToken.beginColumn); } catch (org.apache.jena.sparql.lang.sparql_11.javacc.TokenMgrError tErr) { // Last valid token : not the same as token error message - but this // should not happen diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParserSPARQL12.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParserSPARQL12.java index c58a0f6f2ec..66d67a42fd8 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParserSPARQL12.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParserSPARQL12.java @@ -77,7 +77,9 @@ private static void perform(Query query, String string, Action action) { parser.setQuery(query); action.exec(parser); } catch (org.apache.jena.sparql.lang.sparql_12.javacc.ParseException ex) { - throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn); + // The error is at the token after the last successfully consumed token. + var errorToken = ex.currentToken.next != null ? ex.currentToken.next : ex.currentToken; + throw new QueryParseException(ex.getMessage(), errorToken.beginLine, errorToken.beginColumn); } catch (org.apache.jena.sparql.lang.sparql_12.javacc.TokenMgrError tErr) { // Last valid token : not the same as token error message - but this // should not happen diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParserSPARQL12Update.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParserSPARQL12Update.java index 2bbed2a37f2..531ed80e789 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParserSPARQL12Update.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_12/ParserSPARQL12Update.java @@ -45,7 +45,9 @@ protected void executeParse(UpdateSink sink, Prologue prologue, Reader r) { parser.setUpdate(prologue, sink); parser.UpdateUnit(); } catch (org.apache.jena.sparql.lang.sparql_12.javacc.ParseException ex) { - throw new QueryParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn); + // The error is at the token after the last successfully consumed token. + var errorToken = ex.currentToken.next != null ? ex.currentToken.next : ex.currentToken; + throw new QueryParseException(ex.getMessage(), errorToken.beginLine, errorToken.beginColumn); } catch (org.apache.jena.sparql.lang.sparql_12.javacc.TokenMgrError tErr) { // Last valid token : not the same as token error message - but this // should not happen