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 2015/08/17 17:09:58 UTC
[19/50] [abbrv] jena git commit: No need to write the package name -
add an import
No need to write the package name - add an import
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/44d80106
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/44d80106
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/44d80106
Branch: refs/heads/JENA-491-construct-quads
Commit: 44d8010659bbc813dddee9ffca8ef529f716ad11
Parents: 7d0986f
Author: confidencesun <co...@gmail.com>
Authored: Sat Jul 25 07:39:32 2015 +0800
Committer: confidencesun <co...@gmail.com>
Committed: Sat Jul 25 07:39:32 2015 +0800
----------------------------------------------------------------------
jena-arq/Grammar/arq.jj | 3 +-
jena-arq/Grammar/master.jj | 5 +-
.../apache/jena/sparql/lang/arq/ARQParser.java | 51 ++++++++++----------
.../sparql/lang/arq/ARQParserTokenManager.java | 1 +
4 files changed, 33 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/44d80106/jena-arq/Grammar/arq.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/arq.jj b/jena-arq/Grammar/arq.jj
index 25d5bc4..3e0f9d4 100644
--- a/jena-arq/Grammar/arq.jj
+++ b/jena-arq/Grammar/arq.jj
@@ -33,6 +33,7 @@ import org.apache.jena.sparql.path.* ;
import org.apache.jena.sparql.expr.aggregate.* ;
import org.apache.jena.update.* ;
import org.apache.jena.sparql.modify.request.* ;
+import org.apache.jena.sparql.core.Quad ;
public class ARQParser extends ARQParserBase
{
boolean allowAggregatesInExpressions = false ;
@@ -507,7 +508,7 @@ void ConstructQuads(QuadAcc acc) : {}
(TriplesTemplate(acc))?
)*
}
-void ConstructQuadsNotTriples(QuadAccSink acc) : {Node gn = org.apache.jena.sparql.core.Quad.defaultGraphNodeGenerated ; Node prev = acc.getGraph() ; }
+void ConstructQuadsNotTriples(QuadAccSink acc) : {Node gn = Quad.defaultGraphNodeGenerated ; Node prev = acc.getGraph() ; }
{
(
<GRAPH>
http://git-wip-us.apache.org/repos/asf/jena/blob/44d80106/jena-arq/Grammar/master.jj
----------------------------------------------------------------------
diff --git a/jena-arq/Grammar/master.jj b/jena-arq/Grammar/master.jj
index 04217ec..b2ae620 100644
--- a/jena-arq/Grammar/master.jj
+++ b/jena-arq/Grammar/master.jj
@@ -93,6 +93,9 @@ import org.apache.jena.sparql.expr.aggregate.* ;
import org.apache.jena.update.* ;
import org.apache.jena.sparql.modify.request.* ;
#endif
+#ifdef ARQ
+import org.apache.jena.sparql.core.Quad ;
+#endif
public class CLASS extends PARSERBASE
{
@@ -748,7 +751,7 @@ void ConstructQuads(QuadAcc acc) : {}
)*
}
-void ConstructQuadsNotTriples(QuadAccSink acc) : {Node gn = org.apache.jena.sparql.core.Quad.defaultGraphNodeGenerated ; Node prev = acc.getGraph() ; }
+void ConstructQuadsNotTriples(QuadAccSink acc) : {Node gn = Quad.defaultGraphNodeGenerated ; Node prev = acc.getGraph() ; }
{
(
<GRAPH>
http://git-wip-us.apache.org/repos/asf/jena/blob/44d80106/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
index bfa0e85..6a070c2 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java
@@ -9,6 +9,7 @@ import org.apache.jena.sparql.path.* ;
import org.apache.jena.sparql.expr.aggregate.* ;
import org.apache.jena.update.* ;
import org.apache.jena.sparql.modify.request.* ;
+import org.apache.jena.sparql.core.Quad ;
@SuppressWarnings("all")
public class ARQParser extends ARQParserBase implements ARQParserConstants {
@@ -1995,7 +1996,7 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
}
final public void ConstructQuadsNotTriples(QuadAccSink acc) throws ParseException {
- Node gn = org.apache.jena.sparql.core.Quad.defaultGraphNodeGenerated ; Node prev = acc.getGraph() ;
+ Node gn = Quad.defaultGraphNodeGenerated ; Node prev = acc.getGraph() ;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case GRAPH:
jj_consume_token(GRAPH);
@@ -5520,30 +5521,6 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
finally { jj_save(4, xla); }
}
- private boolean jj_3R_172() {
- if (jj_scan_token(INTEGER_POSITIVE)) return true;
- return false;
- }
-
- private boolean jj_3R_167() {
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_172()) {
- jj_scanpos = xsp;
- if (jj_3R_173()) {
- jj_scanpos = xsp;
- if (jj_3R_174()) return true;
- }
- }
- return false;
- }
-
- private boolean jj_3R_72() {
- if (jj_scan_token(DAY)) return true;
- if (jj_scan_token(LPAREN)) return true;
- return false;
- }
-
private boolean jj_3R_71() {
if (jj_scan_token(MONTH)) return true;
if (jj_scan_token(LPAREN)) return true;
@@ -6655,6 +6632,30 @@ public class ARQParser extends ARQParserBase implements ARQParserConstants {
return false;
}
+ private boolean jj_3R_172() {
+ if (jj_scan_token(INTEGER_POSITIVE)) return true;
+ return false;
+ }
+
+ private boolean jj_3R_167() {
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_172()) {
+ jj_scanpos = xsp;
+ if (jj_3R_173()) {
+ jj_scanpos = xsp;
+ if (jj_3R_174()) return true;
+ }
+ }
+ return false;
+ }
+
+ private boolean jj_3R_72() {
+ if (jj_scan_token(DAY)) return true;
+ if (jj_scan_token(LPAREN)) return true;
+ return false;
+ }
+
/** Generated Token Manager. */
public ARQParserTokenManager token_source;
JavaCharStream jj_input_stream;
http://git-wip-us.apache.org/repos/asf/jena/blob/44d80106/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
index 7dc6bff..942d0e2 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParserTokenManager.java
@@ -10,6 +10,7 @@ package org.apache.jena.sparql.lang.arq ;
+
/** Token Manager. */
public class ARQParserTokenManager implements ARQParserConstants
{