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 2011/10/05 18:26:49 UTC
svn commit: r1179304 - in /incubator/jena:
Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/
Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/
Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/
Author: andy
Date: Wed Oct 5 16:26:48 2011
New Revision: 1179304
URL: http://svn.apache.org/viewvc?rev=1179304&view=rev
Log: (empty)
Modified:
incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/ActionBuilderManifest.scala
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/RiotChars.java
incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerText.java
Modified: incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/ActionBuilderManifest.scala
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/ActionBuilderManifest.scala?rev=1179304&r1=1179303&r2=1179304&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/ActionBuilderManifest.scala (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/ActionBuilderManifest.scala Wed Oct 5 16:26:48 2011
@@ -14,7 +14,6 @@ import com.hp.hpl.jena.query.QueryFactor
import com.hp.hpl.jena.query.Query
class ActionBuilderManifest(filename: String) extends ActionBuilder {
-
private val prefixes = List(
("rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns#"),
("rdfs", "http://www.w3.org/2000/01/rdf-schema#"),
@@ -50,8 +49,7 @@ class ActionBuilderManifest(filename: St
return (b.get("label").get, b.get("endpoint").get)
}
- // Find warm up and actual run.
- // Currently, single threaded.
+ // ---- Mixes.
private def getMix(prop:String): List[Entry] = {
var qs = "SELECT ?name ?action " +
@@ -91,11 +89,8 @@ class ActionBuilderManifest(filename: St
private def selectQuery(q:Query): List[Map[String, Node]] = {
import collection.JavaConversions._
val vars = q.getProjectVars().map(_.getVarName())
- var x:List[Map[String, Node]] = Nil
- // Better scala?
- for(row <- rows(q))
- x = varsFromRow(row, vars) :: x
- x
+ for(row <- rows(q))
+ yield varsFromRow(row, vars)
}
private def varsFromRow(row:QuerySolution, vars:Seq[String]): Map[String, Node]= {
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/RiotChars.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/RiotChars.java?rev=1179304&r1=1179303&r2=1179304&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/RiotChars.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/system/RiotChars.java Wed Oct 5 16:26:48 2011
@@ -91,6 +91,12 @@ PN_LOCAL ::= ( PN_CHARS_U | [0-9]
return isPNCharsBase(ch) || ( ch == '_' ) ;
}
+ public static boolean isPNChars(int ch)
+ {
+ // #x00B7 | [#x0300-#x036F] | [#x203F-#x2040]
+ return isPNChars_U(ch) || ( ch == '-' ) || ch == 0x00B7 || r(ch, 0x306, 0x036F) || r(ch, 0x203F, 0x2040) ;
+ }
+
public static int valHexChar(int ch)
Modified: incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerText.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerText.java?rev=1179304&r1=1179303&r2=1179304&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerText.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/main/java/org/openjena/riot/tokens/TokenizerText.java Wed Oct 5 16:26:48 2011
@@ -26,6 +26,7 @@ import java.util.NoSuchElementException
import org.openjena.atlas.AtlasException ;
import org.openjena.atlas.io.IO ;
import org.openjena.atlas.io.PeekReader ;
+import org.openjena.atlas.lib.Chars ;
import org.openjena.riot.RiotParseException ;
import org.openjena.riot.system.RiotChars ;
@@ -485,7 +486,8 @@ public final class TokenizerText impleme
/*
The token rules from SPARQL and Turtle.
PNAME_NS ::= PN_PREFIX? ':'
- PNAME_LN ::= PNAME_NS PN_LOCAL[131] BLANK_NODE_LABEL ::= '_:' PN_LOCAL
+ PNAME_LN ::= PNAME_NS PN_LOCAL
+
PN_CHARS_BASE ::= [A-Z] | [a-z] | [#x00C0-#x00D6] | [#x00D8-#x00F6] | [#x00F8-#x02FF] | [#x0370-#x037D] | [#x037F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
PN_CHARS_U ::= PN_CHARS_BASE | '_'
VARNAME ::= ( PN_CHARS_U | [0-9] ) ( PN_CHARS_U | [0-9] | #x00B7 | [#x0300-#x036F] | [#x203F-#x2040] )*
@@ -498,6 +500,42 @@ public final class TokenizerText impleme
private String readLocalPart()
{ return readWordSub(true, false) ; }
+ private String readPrefixPart1()
+ {
+ // PN_CHARS_BASE ((PN_CHARS|'.')* PN_CHARS)?
+ stringBuilder.setLength(0) ;
+
+ // First character
+ int ch = reader.peekChar() ;
+ if ( ch == EOF )
+ return "" ;
+ if ( ! RiotChars.isPNCharsBase(ch) )
+ return "" ;
+ stringBuilder.append((char)ch) ;
+ reader.readChar() ;
+
+ boolean canBeLast = true ;
+ for (;;)
+ {
+ // Put previous chacarer in buffer
+ stringBuilder.append((char)ch) ;
+ reader.readChar() ;
+
+ ch = reader.peekChar() ;
+ if ( ! RiotChars.isPNChars(ch) && ch == Chars.CH_DOT )
+ break ;
+ }
+ // End condition.
+ if ( ch != Chars.CH_DOT )
+ {
+ stringBuilder.append((char)ch) ;
+ reader.readChar() ;
+ }
+ return stringBuilder.toString() ;
+ }
+
+
+
private String readPrefixPart()
{ return readWordSub(false, false) ; }