Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 67BC4200C5B for ; Wed, 12 Apr 2017 11:49:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6677E160B8A; Wed, 12 Apr 2017 09:49:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B4F7E160B95 for ; Wed, 12 Apr 2017 11:49:35 +0200 (CEST) Received: (qmail 41755 invoked by uid 500); 12 Apr 2017 09:49:35 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 41722 invoked by uid 99); 12 Apr 2017 09:49:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Apr 2017 09:49:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 55EF1DF984; Wed, 12 Apr 2017 09:49:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andy@apache.org To: commits@jena.apache.org Date: Wed, 12 Apr 2017 09:49:34 -0000 Message-Id: <9eb7b9ba55bc4d83ae8c7f21dcd84820@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/4] jena git commit: JENA-1318: Parse error for unterminated list archived-at: Wed, 12 Apr 2017 09:49:36 -0000 JENA-1318: Parse error for unterminated list Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7c280ddc Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7c280ddc Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7c280ddc Branch: refs/heads/master Commit: 7c280ddc590756ae1418ba9e2e281d31ab67df4e Parents: f4076ed Author: Andy Seaborne Authored: Wed Apr 12 09:55:59 2017 +0100 Committer: Andy Seaborne Committed: Wed Apr 12 09:55:59 2017 +0100 ---------------------------------------------------------------------- .../apache/jena/riot/lang/LangTurtleBase.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/7c280ddc/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java index ae813a6..5215d66 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java @@ -301,11 +301,13 @@ public abstract class LangTurtleBase extends LangBase { String image = peekToken().getImage() ; if ( image.equals(KW_A) ) return NodeConst.nodeRDFType ; + // N3-isms if ( !strict && image.equals(KW_SAME_AS) ) return nodeSameAs ; - if ( !strict && image.equals(KW_LOG_IMPLIES) ) - return NodeConst.nodeRDFType ; - exception(tErr, "Unrecognized: " + image) ; + // Relationship between two formulae in N3. +// if ( false && !strict && image.equals(KW_LOG_IMPLIES) ) +// return log:implies. + exception(tErr, "Unrecognized keyword: " + image) ; } Node n = node() ; @@ -404,7 +406,7 @@ public abstract class LangTurtleBase extends LangBase { return triplesFormula() ; if ( lookingAt(LPAREN) ) return triplesList() ; - exception(peekToken(), "Unrecognized: " + peekToken()) ; + exception(peekToken(), "Unrecognized (expected an RDF Term): " + peekToken()) ; return null ; } @@ -459,21 +461,18 @@ public abstract class LangTurtleBase extends LangBase { lastCell = nextCell ; emitTriple(nextCell, NodeConst.nodeFirst, n) ; - - if ( !moreTokens() ) // Error. - break ; } // On exit, just after the RPARENS - if ( lastCell == null ) + if ( lastCell == null ) { // Simple () + finishList(); return NodeConst.nodeNil ; + } // Finish list. emitTriple(lastCell, NodeConst.nodeRest, NodeConst.nodeNil) ; - finishList() ; - return listHead ; }