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 2012/11/04 19:58:48 UTC
svn commit: r1405608 - in /jena/trunk/jena-arq/src/main/java:
org/openjena/riot/ org/openjena/riot/lang/ org/openjena/riot/system/ riotcmd/
Author: andy
Date: Sun Nov 4 18:58:47 2012
New Revision: 1405608
URL: http://svn.apache.org/viewvc?rev=1405608&view=rev
Log:
Mode strict mode parsing flag into the ParserProfile.
Modified:
jena/trunk/jena-arq/src/main/java/org/openjena/riot/RIOT.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/SysRIOT.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTuple.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtle.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfile.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfileBase.java
jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/RIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/RIOT.java?rev=1405608&r1=1405607&r2=1405608&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/RIOT.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/RIOT.java Sun Nov 4 18:58:47 2012
@@ -18,8 +18,6 @@
package org.openjena.riot;
-import org.openjena.riot.lang.LangTurtleBase ;
-
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.SystemARQ ;
import com.hp.hpl.jena.sparql.mgt.ARQMgt ;
@@ -51,7 +49,8 @@ public class RIOT
public static void setStrictMode(boolean state)
{
- LangTurtleBase.strict = state ;
+ SysRIOT.strictMode = state ;
+ SysRIOT.StrictXSDLexicialForms = state ;
}
static boolean initialized = false ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/SysRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/SysRIOT.java?rev=1405608&r1=1405607&r2=1405608&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/SysRIOT.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/SysRIOT.java Sun Nov 4 18:58:47 2012
@@ -37,6 +37,7 @@ public class SysRIOT
public static final EventType finishRead = new EventType(SysRIOT.class, "FinishRead") ;
public static boolean StrictXSDLexicialForms = false ;
+ public static boolean strictMode = false ;
public static final String BNodeGenIdPrefix = "genid" ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTuple.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTuple.java?rev=1405608&r1=1405607&r2=1405608&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTuple.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangNTuple.java Sun Nov 4 18:58:47 2012
@@ -50,7 +50,6 @@ public abstract class LangNTuple<X> exte
{
private static Logger log = LoggerFactory.getLogger(LangNTuple.class) ;
- public static final boolean STRICT = false ;
protected boolean skipOnBadTerm = false ;
protected LangNTuple(Tokenizer tokens,
@@ -124,7 +123,7 @@ public abstract class LangNTuple<X> exte
case LITERAL_LANG:
return ;
case STRING1:
- if ( STRICT )
+ if ( profile.isStrictMode() )
exception(token, "Illegal single quoted string: %s", token) ;
break ;
default:
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtle.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtle.java?rev=1405608&r1=1405607&r2=1405608&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtle.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtle.java Sun Nov 4 18:58:47 2012
@@ -51,7 +51,7 @@ public class LangTurtle extends LangTurt
{
// The DOT is required by Turtle (strictly).
// It is not in N3 and SPARQL.
- if ( strict )
+ if ( profile.isStrictMode() )
expect("Triples not terminated by DOT", DOT) ;
else
expectOrEOF("Triples not terminated by DOT", DOT) ;
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java?rev=1405608&r1=1405607&r2=1405608&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java Sun Nov 4 18:58:47 2012
@@ -92,8 +92,6 @@ public abstract class LangTurtleBase<X>
protected final static boolean VERBOSE = false ;
//protected final static boolean CHECKING = true ;
- public static boolean strict = false ;
-
// Current graph - null for default graph
private Node currentGraph = null ;
@@ -345,6 +343,7 @@ public abstract class LangTurtleBase<X>
if ( t.hasType(TokenType.KEYWORD) )
{
+ boolean strict = profile.isStrictMode() ;
Token tErr = peekToken() ;
String image = peekToken().getImage() ;
if ( image.equals(KW_A) )
@@ -368,6 +367,7 @@ public abstract class LangTurtleBase<X>
if ( lookingAt(TokenType.KEYWORD) )
{
String image = peekToken().getImage() ;
+ boolean strict = profile.isStrictMode() ;
if ( image.equals(KW_A) )
return true ;
if ( !strict && image.equals(KW_SAME_AS) )
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfile.java?rev=1405608&r1=1405607&r2=1405608&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfile.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfile.java Sun Nov 4 18:58:47 2012
@@ -58,4 +58,7 @@ public interface ParserProfile
public Prologue getPrologue() ;
public void setPrologue(Prologue prologue) ;
+
+ public boolean isStrictMode() ;
+ public void setStrictMode(boolean mode) ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfileBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfileBase.java?rev=1405608&r1=1405607&r2=1405608&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfileBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/ParserProfileBase.java Sun Nov 4 18:58:47 2012
@@ -18,8 +18,10 @@
package org.openjena.riot.system;
+import org.apache.jena.iri.IRI ;
import org.openjena.riot.ErrorHandler ;
import org.openjena.riot.RiotException ;
+import org.openjena.riot.SysRIOT ;
import org.openjena.riot.lang.LabelToNode ;
import org.openjena.riot.tokens.Token ;
import org.openjena.riot.tokens.TokenType ;
@@ -28,7 +30,6 @@ import com.hp.hpl.jena.datatypes.RDFData
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.Triple ;
-import org.apache.jena.iri.IRI ;
import com.hp.hpl.jena.sparql.core.Quad ;
/** Basic profile of things, with key operations based on a simple
@@ -39,6 +40,7 @@ public class ParserProfileBase implement
protected ErrorHandler errorHandler ;
protected Prologue prologue ;
protected LabelToNode labelMapping ;
+ protected boolean strictMode = SysRIOT.strictMode ;
public ParserProfileBase(Prologue prologue, ErrorHandler errorHandler)
{
@@ -220,4 +222,11 @@ public class ParserProfileBase implement
errorHandler.fatal("Undefined prefix: "+prefix, token.getLine(), token.getColumn()) ;
return expansion ;
}
+
+ @Override
+ public boolean isStrictMode() { return strictMode ; }
+
+ @Override
+ public void setStrictMode(boolean mode) { strictMode = mode ; }
+
}
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java?rev=1405608&r1=1405607&r2=1405608&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java Sun Nov 4 18:58:47 2012
@@ -36,7 +36,6 @@ import org.openjena.riot.* ;
import org.openjena.riot.lang.LabelToNode ;
import org.openjena.riot.lang.LangRDFXML ;
import org.openjena.riot.lang.LangRIOT ;
-import org.openjena.riot.lang.LangTurtleBase ;
import org.openjena.riot.out.NodeToLabel ;
import org.openjena.riot.out.SinkQuadOutput ;
import org.openjena.riot.out.SinkTripleOutput ;
@@ -177,10 +176,7 @@ public abstract class CmdLangParse exten
protected void exec()
{
if ( modLangParse.strictMode() )
- {
- SysRIOT.StrictXSDLexicialForms = true ;
- LangTurtleBase.strict = true ;
- }
+ RIOT.setStrictMode(true) ;
if ( modLangParse.getRDFSVocab() != null )
setup = new InferenceSetupRDFS(modLangParse.getRDFSVocab()) ;