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/10/14 17:01:37 UTC
svn commit: r1531932 - in
/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas:
io/CharStreamBuffered.java io/PeekReader.java json/io/parser/JSONP.java
json/io/parser/JSONParserBase.java json/io/parser/ParserBase.java
json/io/parser/TokenizerJSON.java
Author: andy
Date: Mon Oct 14 15:01:37 2013
New Revision: 1531932
URL: http://svn.apache.org/r1531932
Log:
JENA-564
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONParserBase.java
- copied, changed from r1531810, jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/ParserBase.java
Removed:
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/ParserBase.java
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamBuffered.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PeekReader.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONP.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamBuffered.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamBuffered.java?rev=1531932&r1=1531931&r2=1531932&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamBuffered.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/CharStreamBuffered.java Mon Oct 14 15:01:37 2013
@@ -31,8 +31,6 @@ import java.io.Reader ;
public final class CharStreamBuffered extends CharStreamReader
{
- // ARQ to v2.8.7
- // /*package*/ static final int CB_SIZE = 16 * 1024 ;
/*package*/ static final int CB_SIZE = 128 * 1024 ;
private final char[] chars ; // CharBuffer?
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PeekReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PeekReader.java?rev=1531932&r1=1531931&r2=1531932&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PeekReader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/PeekReader.java Mon Oct 14 15:01:37 2013
@@ -74,15 +74,9 @@ public final class PeekReader extends Re
public static PeekReader make(Reader r, int bufferSize)
{
-// if ( r instanceof BufferedReader )
-// {
-// // Already buffered - and we can't unbuffer it.
-// // Still worth our buffering because of the synchronized on one char reads
-// return new PeekReader(new CharStreamBuffered(r, bufferSize)) ;
-// }
+ // It is worth our own buffering evcen if a BufferedReader
+ // because of the synchronized on one char reads in BufferedReader.
return new PeekReader(new CharStreamBuffered(r, bufferSize)) ;
- // Particularly slow to start with.
- //return new PeekReader(new CharStreamBasic(new BufferedReader(r, bufferSize))) ;
}
/** Make PeekReader where the input is UTF8 */
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONP.java?rev=1531932&r1=1531931&r2=1531932&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONP.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONP.java Mon Oct 14 15:01:37 2013
@@ -33,7 +33,7 @@ import org.apache.jena.atlas.json.io.JSO
* Hex numbers
* Objects with duplicate keys are a warning (keeps last)
*/
-public class JSONP extends ParserBase
+public class JSONP extends JSONParserBase
{
private JSONHandler handler ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONParserBase.java (from r1531810, jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/ParserBase.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONParserBase.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONParserBase.java&p1=jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/ParserBase.java&r1=1531810&r2=1531932&rev=1531932&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/ParserBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONParserBase.java Mon Oct 14 15:01:37 2013
@@ -26,7 +26,7 @@ import org.apache.jena.riot.tokens.Token
import org.apache.jena.riot.tokens.Tokenizer ;
-public class ParserBase
+class JSONParserBase
{
protected boolean VERBOSE = true ;
private Tokenizer tokens ;
@@ -34,13 +34,13 @@ public class ParserBase
protected long currLine = -1 ;
protected long currCol = -1 ;
- ParserBase(Tokenizer tokens)
+ protected JSONParserBase(Tokenizer tokens)
{
this.tokens = tokens ;
peekTokens = new PeekIterator<Token>(tokens) ;
}
- private static Token tokenEOF = null ;
+ private Token tokenEOF = null ;
final protected boolean eof()
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java?rev=1531932&r1=1531931&r2=1531932&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java Mon Oct 14 15:01:37 2013
@@ -36,10 +36,6 @@ import org.apache.jena.riot.tokens.Token
public class TokenizerJSON implements Tokenizer
{
- // TODO Various allow/deny options
-
- public static final int CTRL_CHAR = CH_STAR ;
-
private Token token = null ;
private final StringBuilder sb = new StringBuilder() ;
private final PeekReader reader ;
@@ -144,18 +140,6 @@ public class TokenizerJSON implements To
return token ;
}
- // Control (not JSON)
- if ( ch == CTRL_CHAR )
- {
- reader.readChar() ;
- token.setType(TokenType.CNTRL) ;
- ch = reader.readChar() ;
- if ( ch == EOF )
- exception("EOF found after "+CTRL_CHAR) ;
- token.cntrlCode = (char)ch ;
- return token ;
- }
-
switch(ch)
{
// DOT can't start a decimal in JSON. Check for digit.