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/03/21 19:03:30 UTC

svn commit: r1459426 - in /jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql: algebra/TransformCopy.java algebra/Transformer.java syntax/Element1.java syntax/ElementWalker.java syntax/PatternVars.java

Author: andy
Date: Thu Mar 21 18:03:30 2013
New Revision: 1459426

URL: http://svn.apache.org/r1459426
Log:
Add before/after to Element walking
Fix comments

Modified:
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformCopy.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/Element1.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementWalker.java
    jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/PatternVars.java

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformCopy.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformCopy.java?rev=1459426&r1=1459425&r2=1459426&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformCopy.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformCopy.java Thu Mar 21 18:03:30 2013
@@ -23,7 +23,7 @@ import java.util.List ;
 import com.hp.hpl.jena.sparql.algebra.op.* ;
 
 /** One step in the transformation process.
- *  Used with Transformer, performs a a bottom-up rewrite.
+ *  Used with Transformer, performs a bottom-up rewrite.
  */
 public class TransformCopy implements Transform
 {

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java?rev=1459426&r1=1459425&r2=1459426&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java Thu Mar 21 18:03:30 2013
@@ -31,7 +31,7 @@ import com.hp.hpl.jena.sparql.core.VarEx
 import com.hp.hpl.jena.sparql.expr.* ;
 import com.hp.hpl.jena.sparql.expr.aggregate.Aggregator ;
 
-/** A botton-top application of a transformation of SPARQL algebra */  
+/** A bottom-top application of a transformation of SPARQL algebra */  
 public class Transformer
 {
     private static Transformer singleton = new Transformer();

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/Element1.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/Element1.java?rev=1459426&r1=1459425&r2=1459426&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/Element1.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/Element1.java Thu Mar 21 18:03:30 2013
@@ -24,8 +24,8 @@ package com.hp.hpl.jena.sparql.syntax;
 public abstract class Element1 extends Element
 {
     // Not used very widely.
-    // For historicial rasons ElementOptional does not use this.
-    // It foudn do - it just doesn't. 
+    // For historicial reasons ElementOptional does not use this.
+    // It could do - it just doesn't. 
     private Element element ;
 
     protected Element1(Element element) { this.element = element ; }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementWalker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementWalker.java?rev=1459426&r1=1459425&r2=1459426&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementWalker.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementWalker.java Thu Mar 21 18:03:30 2013
@@ -28,114 +28,153 @@ package com.hp.hpl.jena.sparql.syntax;
 
 public class ElementWalker 
 {
-    // See also RecursiveElementVisitor
-    
     public static void walk(Element el, ElementVisitor visitor)
     {
-        walk(el, new Walker(visitor)) ;
+        walk(el, visitor, null, null) ;
+    }
+    
+    public static void walk(Element el, ElementVisitor visitor, ElementVisitor beforeVisitor, ElementVisitor afterVisitor)
+    {
+        Walker w = new Walker(visitor, beforeVisitor, afterVisitor) ;
+        el.visit(w) ;
     }
 
-    public static void walk(Element el, Walker walker)
+    protected static void walk$(Element el, Walker walker)
     {
         el.visit(walker) ;
     }
 
-    
-//    public void walk(Element el)
-//    {
-//        el.visit(new Walker(proc)) ;
-//    }
-    
     static public class Walker implements ElementVisitor
     {
-        protected ElementVisitor proc ;
-        protected Walker(ElementVisitor visitor)
+        protected final ElementVisitor proc ;
+        protected final ElementVisitor beforeVisitor ;
+        protected final ElementVisitor afterVisitor ;
+        
+        protected Walker(ElementVisitor visitor, ElementVisitor beforeVisitor, ElementVisitor afterVisitor)
         { 
             proc = visitor ;
+            this.beforeVisitor= beforeVisitor ; 
+            this.afterVisitor = afterVisitor ;
+        }
+        
+        private void before(Element elt)
+        {
+            if ( beforeVisitor != null )
+                elt.visit(beforeVisitor) ;
+        }
+        
+        private void after(Element elt)
+        {
+            if ( afterVisitor != null )
+                elt.visit(afterVisitor) ;
         }
         
         @Override
         public void visit(ElementTriplesBlock el)
         {
+            before(el) ;
             proc.visit(el) ;
+            after(el) ;
         }
         
         @Override
         public void visit(ElementFilter el)
         {
+            before(el) ;
             proc.visit(el) ;
+            after(el) ;
         }
 
         @Override
         public void visit(ElementAssign el)
         {
+            before(el) ;
             proc.visit(el) ;
+            after(el) ;
         }
         
         @Override
         public void visit(ElementBind el)
         {
+            before(el) ;
             proc.visit(el) ;
+            after(el) ;
         }
         
         @Override
         public void visit(ElementData el)
         {
+            before(el) ;
             proc.visit(el) ;
+            after(el) ;
         }
         
         @Override
         public void visit(ElementUnion el)
         {
+            before(el) ;
             for ( Element e : el.getElements() )
                 e.visit(this) ;
             proc.visit(el) ;
+            after(el) ;
         }
         
         @Override
         public void visit(ElementGroup el)
         {
+            before(el) ;
             for (Element e : el.getElements())
                 e.visit(this) ;
             proc.visit(el) ;
+            after(el) ;
         }
     
         @Override
         public void visit(ElementOptional el)
         {
+            before(el) ;
             if ( el.getOptionalElement() != null )
                 el.getOptionalElement().visit(this) ;
             proc.visit(el) ;
+            after(el) ;
         }
         
         @Override
         public void visit(ElementDataset el)
         {
+            before(el) ;
             if ( el.getPatternElement() != null )
                 el.getPatternElement().visit(this) ;
             proc.visit(el) ;
+            after(el) ;
         }
 
         @Override
         public void visit(ElementNamedGraph el)
         {
+            before(el) ;
             if ( el.getElement() != null )
                 el.getElement().visit(this) ;
             proc.visit(el) ;
+            after(el) ;
         }
     
         @Override
         public void visit(ElementService el)
         {
+            before(el) ;
             if ( el.getElement() != null )
                 el.getElement().visit(this) ;
             proc.visit(el) ;
+            after(el) ;
         }
 
         @Override
         public void visit(ElementFetch el)
         {
+            before(el) ;
             proc.visit(el) ;
+            after(el) ;
         }
 
         // EXISTs, NOT EXISTs also occur in FILTERs via expressions.
@@ -143,33 +182,43 @@ public class ElementWalker 
         @Override
         public void visit(ElementExists el)
         {
+            before(el) ;
             proc.visit(el) ;
+            after(el) ;
         }
 
         @Override
         public void visit(ElementNotExists el)
         {
+            before(el) ;
             proc.visit(el) ;
+            after(el) ;
         }
 
         @Override
         public void visit(ElementMinus el)
         {
+            before(el) ;
             if ( el.getMinusElement() != null )
                 el.getMinusElement().visit(this) ;
             proc.visit(el) ;
+            after(el) ;
         }
         
         @Override
         public void visit(ElementSubQuery el)
         {
+            before(el) ;
             proc.visit(el) ;
+            after(el) ;
         }
 
         @Override
         public void visit(ElementPathBlock el)
         {
+            before(el) ;
             proc.visit(el) ;
+            after(el) ;
         }
     }
 }

Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/PatternVars.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/PatternVars.java?rev=1459426&r1=1459425&r2=1459426&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/PatternVars.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/PatternVars.java Thu Mar 21 18:03:30 2013
@@ -41,14 +41,14 @@ public class PatternVars
     public static void vars(Element element, PatternVarsVisitor visitor)
     {
         ElementWalker.Walker walker = new WalkerSkipMinus(visitor) ;
-        ElementWalker.walk(element, walker) ;
+        ElementWalker.walk$(element, walker) ;
     }
     
     public static class WalkerSkipMinus extends ElementWalker.Walker
     {
         protected WalkerSkipMinus(ElementVisitor visitor)
         {
-            super(visitor) ;
+            super(visitor, null, null) ;
         }
         
         @Override