You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2013/05/30 22:52:48 UTC
svn commit: r1488006 - in
/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang:
LangEngine.java LangRDFJSON.java LangTurtleBase.java
Author: andy
Date: Thu May 30 20:52:48 2013
New Revision: 1488006
URL: http://svn.apache.org/r1488006
Log:
JENA-463 - Make DOT optional at end of @prefix and @base (does not affect PREFIX or BASE)
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangEngine.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFJSON.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangEngine.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangEngine.java?rev=1488006&r1=1488005&r2=1488006&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangEngine.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangEngine.java Thu May 30 20:52:48 2013
@@ -82,16 +82,6 @@ public class LangEngine
return tokenType == EOF ;
if ( tokenType == NODE )
return peekToken().isNode() ;
-// if ( tokenType == KEYWORD )
-// {
-// String image = tokenRaw().getImage() ;
-// if ( image.equals(KW_TRUE) )
-// return true ;
-// if ( image.equals(KW_FALSE) )
-// return true ;
-// return false ;
-// }
- // NB IRIs and PREFIXED_NAMEs
return peekToken().hasType(tokenType) ;
}
@@ -138,9 +128,13 @@ public class LangEngine
expect(msg, tokenType) ;
}
+ protected final void skipIf(TokenType ttype) {
+ if ( lookingAt(ttype) )
+ nextToken() ;
+ }
+
protected final void expect(String msg, TokenType ttype)
{
-
if ( ! lookingAt(ttype) )
{
Token location = peekToken() ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFJSON.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFJSON.java?rev=1488006&r1=1488005&r2=1488006&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFJSON.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFJSON.java Thu May 30 20:52:48 2013
@@ -436,22 +436,16 @@ public class LangRDFJSON extends LangBas
{
Token t = null;
if (lookingAt(TokenType.STRING1) || lookingAt(TokenType.STRING2))
- {
t = nextToken();
- }
else
- {
exception(peekToken(), "JSON Values given for properties for an Object must be Strings") ;
- }
return t;
}
private void checkColon()
{
if (!lookingAt(TokenType.COLON))
- {
exception(peekToken(), "Expected a : character after a JSON Property Name but got %s", peekToken()) ;
- }
nextToken() ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java?rev=1488006&r1=1488005&r2=1488006&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java Thu May 30 20:52:48 2013
@@ -83,7 +83,7 @@ public abstract class LangTurtleBase<X>
Token t = peekToken() ;
if ( lookingAt(DIRECTIVE) )
{
- directive() ;
+ directive() ; // @form.
continue ;
}
@@ -136,14 +136,16 @@ public abstract class LangTurtleBase<X>
if ( x.equals("base") )
{
directiveBase() ;
- expect("Base directive not terminated by a dot", DOT) ;
+ skipIf(DOT) ;
+ //expect("Base directive not terminated by a dot", DOT) ;
return ;
}
if ( x.equals("prefix") )
{
directivePrefix() ;
- expect("Prefix directive not terminated by a dot", DOT) ;
+ skipIf(DOT) ;
+ //expect("Prefix directive not terminated by a dot", DOT) ;
return ;
}
exception(t, "Unrecognized directive: %s", x) ;
@@ -177,6 +179,7 @@ public abstract class LangTurtleBase<X>
String baseStr = token.getImage() ;
dest.base(baseStr) ;
IRI baseIRI = profile.makeIRI(baseStr, currLine, currCol) ;
+ skipIf(DOT) ;
nextToken() ;
profile.getPrologue().setBaseURI(baseIRI) ;
}