[Mulgara-svn] r593 - in branches/mgr-61-sparql: . lib src/jar/sparql src/jar/sparql/grammar src/jar/sparql/java src/jar/sparql/java/org src/jar/sparql/java/org/mulgara src/jar/sparql/java/org/mulgara/sparql src/jar/sparql/java/org/mulgara/sparql/cst

pag at mulgara.org pag at mulgara.org
Mon Dec 3 22:12:34 UTC 2007


Author: pag
Date: 2007-12-03 16:12:33 -0600 (Mon, 03 Dec 2007)
New Revision: 593

Added:
   branches/mgr-61-sparql/lib/beaver-0.9.6.1.jar
   branches/mgr-61-sparql/src/jar/sparql/java/
   branches/mgr-61-sparql/src/jar/sparql/java/org/
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/AndExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BinExpr.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BinaryExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BoundBuiltinCall.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BuiltinCall.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/ConstantPredicate.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Constraint.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DatatypeBuiltinCall.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DecimalExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DivExpr.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DivExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DoubleExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/EqualsExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/ErrExpr.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Expr.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Expression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/FilterElement.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/From.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/FunctionCall.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphElement.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphElementVisitable.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphElementVisitor.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphGraphPatternElement.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GreaterThanEqualsExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GreaterThanExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GroupGraphPattern.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GroupGraphPatternVisitor.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GroupOrUnionGraphPatternElement.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IRIPredicate.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IntegerExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsBlankBuiltinCall.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsIRIBuiltinCall.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsLiteralBuiltinCall.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsURIBuiltinCall.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LangBuiltinCall.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LangMatchesBuiltinCall.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LessThanEqualsExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LessThanExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LimitOffset.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MinusExpr.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MinusExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MinusPrimaryExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MultExpr.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MultExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NegExpr.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Node.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NonTriple.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NotEqualsExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NotPrimaryExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NumExpr.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/OptionalGraphPatternElement.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/OrExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/OrderByClause.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PlusExpr.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PlusExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PlusPrimaryExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Predicate.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PredicateVisitable.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PredicateVisitor.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PrimaryExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/RDFObject.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/RegularExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/SameTermBuiltinCall.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/SelectQuery.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/SolutionModifier.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/StrBuiltinCall.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/TreeWalker.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Triple.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/URIPredicate.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Variable.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/VariableExpression.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/VariablePredicate.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Where.java
   branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/convert.sh
Modified:
   branches/mgr-61-sparql/build.properties
   branches/mgr-61-sparql/src/jar/sparql/build.xml
   branches/mgr-61-sparql/src/jar/sparql/grammar/expr.flex
   branches/mgr-61-sparql/src/jar/sparql/grammar/expr.grammar
   branches/mgr-61-sparql/src/jar/sparql/sparql-build.properties
Log:
Integrated in the SPARQL parsing code, build scripts, and required libraries - exclusing JFlex which cannot be distributed as it is GPL

Modified: branches/mgr-61-sparql/build.properties
===================================================================
--- branches/mgr-61-sparql/build.properties	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/build.properties	2007-12-03 22:12:33 UTC (rev 593)
@@ -147,7 +147,7 @@
 xerces.jar               =xercesImpl.jar
 xmlParserAPIs.jar        =xmlParserAPIs.jar
 xom.jar                  =xom-1.0d21.jar
-beaver.jar               =beaver.jar
+beaver.jar               =beaver-0.9.6.1.jar
 
 drools-version  =2.0-beta-15
 drools-base.jar =drools-base-${drools-version}.jar

Added: branches/mgr-61-sparql/lib/beaver-0.9.6.1.jar
===================================================================
(Binary files differ)


Property changes on: branches/mgr-61-sparql/lib/beaver-0.9.6.1.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/mgr-61-sparql/src/jar/sparql/build.xml
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/build.xml	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/build.xml	2007-12-03 22:12:33 UTC (rev 593)
@@ -19,6 +19,7 @@
   <!-- =================================================================== -->
   <path id="sparql-classpath">
     <path refid="common-classpath"/>
+    <fileset file="${lib.dir}/${beaver.jar}"/>
     <fileset file="${query.dist.dir}/${query.jar}"/>
   </path>
 
@@ -26,7 +27,7 @@
     <path refid="sparql-classpath"/>
   </path>
 
-  <available file="${jflex_jar}" type="file" property="jflex.file.local"/>
+  <available file="${lib.dir}/${jflex.jar}" type="file" property="jflex.file.local"/>
 
   <target name="sparql-clean" description="Removes all compile generated files for sparql">
     <tstamp/>
@@ -45,10 +46,10 @@
 
   <target name="download-jflex" unless="jflex.file.local" description="Gets JFlex Jar if it is not available">
     <mkdir dir="${tmp.dir}"/>
-    <get src="jflex.location" dest="${tmp.dir}/jflex-1.4.1.zip" usetimestamp="true"/>
-    <unzip src="${tmp.dir}/jflex-1.4.1.zip" dest="${lib.dir}">
+    <get src="${jflex.location}" dest="${tmp.dir}/jflex.zip" usetimestamp="true"/>
+    <unzip src="${tmp.dir}/jflex.zip" dest="${lib.dir}">
       <patternset>
-        <include name="**/JFlex.jar"/>
+        <include name="**/${jflex.jar}"/>
       </patternset>
       <mapper type="flatten"/>
     </unzip>
@@ -56,7 +57,7 @@
 
   <!-- Create the JFlex task for use further down -->
   <target name="jflextask" unless="jflex.already.available" depends="download-jflex" description="creates JFlex Ant task">
-    <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${jflex_jar}"/>
+    <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${lib.dir}/${jflex.jar}"/>
     <property name="jflex.already.available" value="yes"/>
   </target>
 
@@ -86,7 +87,7 @@
 
   <target name="sparql-compile" depends="gen-sparql-parser,driver-jar" description="Compiles all sparql related files included generated source code">
     <copy todir="${sparql.obj.dir}/java/" preservelastmodified="yes">
-      <fileset dir="${sparql.src.dir}/java/" includes="**/*.java"/>
+      <fileset dir="${sparql.src.dir}" includes="**/*.java"/>
     </copy>
     <javac destdir="${sparql.obj.dir}/classes" debug="on" deprecation="on" source="1.5" classpathref="sparql-classpath">
       <src path="${sparql.obj.dir}/java"/>

Modified: branches/mgr-61-sparql/src/jar/sparql/grammar/expr.flex
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/grammar/expr.flex	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/grammar/expr.flex	2007-12-03 22:12:33 UTC (rev 593)
@@ -1,9 +1,9 @@
-package org.mulgara.sparql;
+package org.mulgara.sparql.compiler;
 
 import beaver.Symbol;
 import beaver.Scanner;
 
-import org.mulgara.sparql.ExpressionParser.Terminals;
+import org.mulgara.sparql.compiler.ExpressionParser.Terminals;
 
 %%
 

Modified: branches/mgr-61-sparql/src/jar/sparql/grammar/expr.grammar
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/grammar/expr.grammar	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/grammar/expr.grammar	2007-12-03 22:12:33 UTC (rev 593)
@@ -1,5 +1,5 @@
-%package "org.mulgara.sparql";
-%import "cst.*";
+%package "org.mulgara.sparql.compiler";
+%import "org.mulgara.sparql.cst.*";
 %import "java.util.ArrayList";
 %import "java.util.List";
 %class "ExpressionParser";

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/AndExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/AndExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/AndExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,20 @@
+package org.mulgara.sparql.cst;
+
+public class AndExpression extends BinaryExpression {
+
+    public AndExpression (Expression e1, Expression e2) {
+        super(e1, e2);
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<").append(getFirstExpression()).append("> AND <").append(getSecondExpression()).append(">");
+        return sb.toString();
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BinExpr.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BinExpr.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BinExpr.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,14 @@
+package org.mulgara.sparql.cst;
+
+public abstract class BinExpr extends Expr
+{
+    public final Expr l;
+    public final Expr r;
+    
+    protected BinExpr(Expr left, Expr right)
+    {
+        super();
+        l = left;
+        r = right;
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BinaryExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BinaryExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BinaryExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,19 @@
+package org.mulgara.sparql.cst;
+
+public abstract class BinaryExpression extends Expression {
+    private Expression e1;
+    private Expression e2;
+
+    public BinaryExpression(Expression e1, Expression e2) {
+        this.e1 = e1;
+        this.e2 = e2;
+    }
+
+    public Expression getFirstExpression() {
+        return e1;
+    }
+
+    public Expression getSecondExpression() {
+        return e2;
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BoundBuiltinCall.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BoundBuiltinCall.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BoundBuiltinCall.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,22 @@
+package org.mulgara.sparql.cst;
+
+public class BoundBuiltinCall extends BuiltinCall {
+    private String v;
+    public BoundBuiltinCall(String v) {
+        this.v = v;
+    }
+
+    public String toString() {
+        return "langBuiltinCall(" + v + ")";
+    }
+    
+    public String getVariable() {
+        return v;
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BuiltinCall.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BuiltinCall.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/BuiltinCall.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,13 @@
+package org.mulgara.sparql.cst;
+
+public abstract class BuiltinCall extends Expression {
+    Expression expression;
+    public BuiltinCall() {}
+    public BuiltinCall (Expression expression) {
+        this.expression = expression;
+    }
+
+    public Expression getExpression() {
+        return expression;
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/ConstantPredicate.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/ConstantPredicate.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/ConstantPredicate.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,14 @@
+package org.mulgara.sparql.cst;
+public class ConstantPredicate extends Predicate {
+    private static String CONSTANT_VALUE = "a";
+
+    public ConstantPredicate() {
+    super("<" + CONSTANT_VALUE + ">");
+    System.out.println("Constant predicate created.");
+    }
+
+    public void accept(PredicateVisitor visitor) {
+        // TODO Auto-generated method stub
+        
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Constraint.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Constraint.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Constraint.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,10 @@
+package org.mulgara.sparql.cst;
+
+public class Constraint extends NonTriple {
+
+    public void accept(GraphElementVisitor visitor) {
+        // TODO Auto-generated method stub
+        
+    }
+
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DatatypeBuiltinCall.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DatatypeBuiltinCall.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DatatypeBuiltinCall.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,17 @@
+package org.mulgara.sparql.cst;
+
+public class DatatypeBuiltinCall extends BuiltinCall {
+    public DatatypeBuiltinCall(Expression e) {
+        super(e);
+    }
+
+    public String toString() {
+        return "datatypeBuiltinCall(" + getExpression() + ")";
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DecimalExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DecimalExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DecimalExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,14 @@
+package org.mulgara.sparql.cst;
+
+public class DecimalExpression extends Expression {
+    private Float num;
+    public DecimalExpression(Float num) {
+        this.num = num;
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<float>").append(num);
+        return sb.toString();
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DivExpr.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DivExpr.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DivExpr.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,14 @@
+package org.mulgara.sparql.cst;
+
+public class DivExpr extends BinExpr
+{
+    public DivExpr(Expr left, Expr right)
+    {
+        super(left, right);
+    }
+    
+    public void accept(TreeWalker walker)
+    {
+        walker.visit(this);
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DivExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DivExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DivExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,17 @@
+package org.mulgara.sparql.cst;
+
+public class DivExpression extends BinaryExpression {
+    public DivExpression(Expression e1, Expression e2) {
+        super(e1, e2);
+    }
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<").append(getFirstExpression()).append("> / <").append(getSecondExpression()).append(">");
+        return sb.toString();
+    }
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DoubleExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DoubleExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/DoubleExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,14 @@
+package org.mulgara.sparql.cst;
+
+public class DoubleExpression extends Expression {
+    private Double num;
+    public DoubleExpression(Double num) {
+    this.num = num;
+    }
+
+    public String toString() {
+    StringBuffer sb = new StringBuffer();
+    sb.append("<double>").append(num);
+    return sb.toString();
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/EqualsExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/EqualsExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/EqualsExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,19 @@
+package org.mulgara.sparql.cst;
+
+public class EqualsExpression extends BinaryExpression {
+
+    public EqualsExpression (Expression e1, Expression e2) {
+        super(e1, e2);
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<").append(getFirstExpression()).append("> = <").append(getSecondExpression()).append(">");
+        return sb.toString();
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/ErrExpr.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/ErrExpr.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/ErrExpr.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,15 @@
+package org.mulgara.sparql.cst;
+
+public class ErrExpr extends Expr
+{
+    
+    public ErrExpr()
+    {
+        super();
+    }
+    
+    public void accept(TreeWalker walker)
+    {
+        walker.visit(this);
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Expr.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Expr.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Expr.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,6 @@
+package org.mulgara.sparql.cst;
+
+public abstract class Expr extends Node
+{
+
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Expression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Expression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Expression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,4 @@
+package org.mulgara.sparql.cst;
+public class Expression extends Constraint {
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/FilterElement.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/FilterElement.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/FilterElement.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,15 @@
+package org.mulgara.sparql.cst;
+import beaver.Symbol;
+import java.util.*;
+
+public class FilterElement extends GraphElement {
+    private String filter;
+    public FilterElement(String filter) {
+    System.out.println("Filter element created.");
+    this.filter = filter;
+    }
+
+    public String toString() {
+    return super.toString() + "\n" + filter;
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/From.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/From.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/From.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,12 @@
+package org.mulgara.sparql.cst;
+import beaver.Symbol;
+public class From extends Symbol {
+    private String from;
+    public From(String from) {
+    this.from = from;
+    }
+
+    public String toString() {
+    return from;
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/FunctionCall.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/FunctionCall.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/FunctionCall.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,27 @@
+package org.mulgara.sparql.cst;
+
+import java.util.List;
+
+public class FunctionCall extends Constraint {
+    private String iriRef;
+    private List<Expression> args;
+    
+    public FunctionCall(String iriRef, List<Expression> args) {
+        this.iriRef = iriRef;
+        this.args = args;
+    }
+    
+    public String getIRIRef() {
+        return iriRef;
+    }
+    
+    public List<Expression> getArgs() {
+        return args;
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphElement.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphElement.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphElement.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,42 @@
+package org.mulgara.sparql.cst;
+import beaver.Symbol;
+import java.util.*;
+
+public class GraphElement extends Symbol implements GraphElementVisitable {
+    private List<Triple> tripleBlock;
+    private boolean dotted;
+    private NonTriple nonTriple;
+
+    public GraphElement() {
+        System.out.println("graph element created");
+    }
+    
+    public GraphElement(List<Triple> tripleBlock, boolean dotted, NonTriple nonTriple) {
+        this.tripleBlock = tripleBlock;
+        this.dotted = dotted;
+        this.nonTriple = nonTriple;
+    }
+    
+    public GraphElement(NonTriple nonTriple) {
+        this.nonTriple = nonTriple;
+    }
+
+    public void setTripleBlock(List<Triple> tb) {
+        System.out.println("Triple block set");
+        this.tripleBlock = tb;
+    }
+    
+    public void accept(GraphElementVisitor visitor) {
+        nonTriple.accept(visitor);
+    }
+
+    public String toString() {
+        if (tripleBlock != null) {
+            return "GE: " + tripleBlock.toString();
+        }
+        if (nonTriple != null) {
+            return "GE: " + nonTriple.toString();
+        }
+        return ""; 
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphElementVisitable.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphElementVisitable.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphElementVisitable.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,5 @@
+package org.mulgara.sparql.cst;
+
+public interface GraphElementVisitable {
+    void accept(GraphElementVisitor visitor);
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphElementVisitor.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphElementVisitor.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphElementVisitor.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,38 @@
+package org.mulgara.sparql.cst;
+
+public interface GraphElementVisitor {
+    void visit(OptionalGraphPatternElement element);
+    void visit(GroupOrUnionGraphPatternElement element);
+    void visit(GraphGraphPatternElement element);
+    void visit(AndExpression expression);
+    void visit(BoundBuiltinCall call);
+    void visit(DatatypeBuiltinCall call);
+    void visit(DecimalExpression expression);
+    void visit(DivExpression expression);
+    void visit(DoubleExpression expression);
+    void visit(EqualsExpression expression);
+    void visit(IntegerExpression expression);
+    void visit(VariableExpression expression);
+    void visit(OrExpression expression);
+    void visit(NotEqualsExpression expression);
+    void visit(LessThanExpression expression);
+    void visit(GreaterThanExpression expression);
+    void visit(LessThanEqualsExpression expression);
+    void visit(GreaterThanEqualsExpression expression);
+    void visit(PlusExpression expression);
+    void visit(MinusExpression expression);
+    void visit(MultExpression expression);
+    void visit(NotPrimaryExpression expression);
+    void visit(PlusPrimaryExpression expression);
+    void visit(MinusPrimaryExpression expression);
+    void visit(StrBuiltinCall builtin);
+    void visit(LangBuiltinCall builtin);
+    void visit(LangMatchesBuiltinCall builtin);
+    void visit(SameTermBuiltinCall builtin);
+    void visit(IsIRIBuiltinCall builtin);
+    void visit(IsURIBuiltinCall builtin);
+    void visit(IsBlankBuiltinCall builtin);
+    void visit(IsLiteralBuiltinCall builtin);
+    void visit(RegularExpression builtin);
+    void visit(FunctionCall fCall);
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphGraphPatternElement.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphGraphPatternElement.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GraphGraphPatternElement.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,23 @@
+package org.mulgara.sparql.cst;
+
+public class GraphGraphPatternElement extends NonTriple {
+    private GroupGraphPattern ggp;
+    private Predicate varOrIRIRef;
+    
+    public GraphGraphPatternElement(Predicate varOrIRIRef, GroupGraphPattern ggp) {
+        this.varOrIRIRef = varOrIRIRef;
+        this.ggp = ggp;
+    }
+    
+    public GroupGraphPattern getGroupGraphPattern() {
+        return ggp;
+    }
+    
+    public Predicate getVarOrIRIRef() {
+        return varOrIRIRef;
+    }
+    
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GreaterThanEqualsExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GreaterThanEqualsExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GreaterThanEqualsExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,20 @@
+package org.mulgara.sparql.cst;
+
+public class GreaterThanEqualsExpression extends BinaryExpression {
+
+    public GreaterThanEqualsExpression(Expression e1, Expression e2) {
+        super(e1, e2);
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<").append(getFirstExpression()).append("> >= <").append(getSecondExpression()).append(">");
+        return sb.toString();
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GreaterThanExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GreaterThanExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GreaterThanExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,19 @@
+package org.mulgara.sparql.cst;
+
+public class GreaterThanExpression extends BinaryExpression {
+    public GreaterThanExpression(Expression e1, Expression e2) {
+        super(e1, e2);
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<").append(getFirstExpression()).append("> > <").append(getSecondExpression()).append(">");
+        return sb.toString();
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GroupGraphPattern.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GroupGraphPattern.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GroupGraphPattern.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,49 @@
+package org.mulgara.sparql.cst;
+import beaver.Symbol;
+import java.util.*;
+
+public class GroupGraphPattern extends Symbol {
+    private List<Triple> beginningTriples;
+    private List<GraphElement> nonTriples;
+
+    public GroupGraphPattern(List<Triple> beginningTriples, List<GraphElement> nonTriples) {
+        System.out.println("GroupGraphPattern created via triples and graph elements");
+        this.beginningTriples = beginningTriples;
+        this.nonTriples = nonTriples;
+    }
+
+    public GroupGraphPattern(List<GraphElement> nonTriples, boolean x) {
+        System.out.println("GroupGraphPattern created via graph elements => ");
+        System.out.println(nonTriples);
+        this.nonTriples = nonTriples;
+    }
+
+    public GroupGraphPattern(List<Triple> triples) {
+        System.out.println("GroupGraphPattern created via triples");
+        this.beginningTriples = triples;
+    }
+
+    public GroupGraphPattern() {
+        System.out.println("GroupGraphPattern created");
+    }
+    
+    public List<Triple> getInitialTripleBlock() {
+        return beginningTriples;
+    }
+    
+    public List<GraphElement> getNonTriplesGraphPattern() {
+        return nonTriples;
+    }
+
+    public String toString() {
+        if (beginningTriples == null && nonTriples == null) return "EMPTY";
+        StringBuffer sb = new StringBuffer();
+        if (beginningTriples != null) {
+            sb.append("Triples: ").append(beginningTriples.toString()).append('\n');
+        }
+        if (nonTriples != null) {
+            sb.append("Others: ").append(nonTriples.toString()).append('\n');
+        }
+        return sb.toString();
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GroupGraphPatternVisitor.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GroupGraphPatternVisitor.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GroupGraphPatternVisitor.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,5 @@
+package org.mulgara.sparql.cst;
+
+public interface GroupGraphPatternVisitor extends GraphElementVisitor {
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GroupOrUnionGraphPatternElement.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GroupOrUnionGraphPatternElement.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/GroupOrUnionGraphPatternElement.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,23 @@
+package org.mulgara.sparql.cst;
+
+import java.util.List;
+
+public class GroupOrUnionGraphPatternElement extends NonTriple {
+    private List<GroupGraphPattern> ggp;    
+    public GroupOrUnionGraphPatternElement(List<GroupGraphPattern> ggp) {
+        System.out.println("Group or union graph pattern element created.");
+        this.ggp = ggp;
+    }
+    
+    public List<GroupGraphPattern> getUnions() {
+        return ggp;
+    }
+
+    public void accept(GraphElementVisitor visitor) {
+            visitor.visit(this);
+    }
+
+    public String toString() {
+        return "UNION: " + super.toString() + "\n" + getUnions().toString();
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IRIPredicate.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IRIPredicate.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IRIPredicate.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,11 @@
+package org.mulgara.sparql.cst;
+
+public class IRIPredicate extends Predicate {
+    public IRIPredicate(String iriRef) {
+        super(iriRef);
+    }
+
+    public void accept(PredicateVisitor visitor) {
+        visitor.visit(this);
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IntegerExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IntegerExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IntegerExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,24 @@
+package org.mulgara.sparql.cst;
+
+public class IntegerExpression extends Expression {
+    private Integer integer;
+    public IntegerExpression(Integer i) {
+        this.integer = i;
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<int>").append(integer);
+        return sb.toString();
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        // TODO Auto-generated method stub
+        visitor.visit(this);
+    }
+    
+    public Integer getInteger() {
+        return integer;
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsBlankBuiltinCall.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsBlankBuiltinCall.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsBlankBuiltinCall.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,17 @@
+package org.mulgara.sparql.cst;
+
+public class IsBlankBuiltinCall extends BuiltinCall {
+    public IsBlankBuiltinCall(Expression e) {
+        super(e);
+    }
+
+    public String toString() {
+        return "isBlankBuiltinCall(" + getExpression() + ")";
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsIRIBuiltinCall.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsIRIBuiltinCall.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsIRIBuiltinCall.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,16 @@
+package org.mulgara.sparql.cst;
+
+public class IsIRIBuiltinCall extends BuiltinCall {
+    public IsIRIBuiltinCall(Expression e) {
+        super(e);
+    }
+
+    public String toString() {
+        return "isIRIBuiltinCall(" + getExpression() + ")";
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsLiteralBuiltinCall.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsLiteralBuiltinCall.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsLiteralBuiltinCall.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,17 @@
+package org.mulgara.sparql.cst;
+
+public class IsLiteralBuiltinCall extends BuiltinCall {
+    public IsLiteralBuiltinCall(Expression e) {
+        super(e);
+    }
+
+    public String toString() {
+        return "isLiteralBuiltinCall(" + getExpression() + ")";
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsURIBuiltinCall.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsURIBuiltinCall.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/IsURIBuiltinCall.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,17 @@
+package org.mulgara.sparql.cst;
+
+public class IsURIBuiltinCall extends BuiltinCall {
+    public IsURIBuiltinCall(Expression e) {
+        super(e);
+    }
+
+    public String toString() {
+        return "isURIBuiltinCall(" + getExpression() + ")";
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LangBuiltinCall.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LangBuiltinCall.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LangBuiltinCall.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,17 @@
+package org.mulgara.sparql.cst;
+
+public class LangBuiltinCall extends BuiltinCall {
+    public LangBuiltinCall(Expression e) {
+        super(e);
+    }
+
+    public String toString() {
+        return "langBuiltinCall(" + getExpression() + ")";
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LangMatchesBuiltinCall.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LangMatchesBuiltinCall.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LangMatchesBuiltinCall.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,27 @@
+package org.mulgara.sparql.cst;
+
+public class LangMatchesBuiltinCall extends BuiltinCall {
+    Expression arg2;
+    public LangMatchesBuiltinCall(Expression e1, Expression e2) {
+        super(e1);
+        arg2 = e2;
+    }
+
+    public String toString() {
+        return "langMatchesBuiltinCall(" + getExpression() + ", " + arg2 + ")";
+    }
+    
+    public Expression getFirstArgument() {
+        return getExpression();
+    }
+    
+    public Expression getSecondArgument() {
+        return arg2;
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LessThanEqualsExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LessThanEqualsExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LessThanEqualsExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,20 @@
+package org.mulgara.sparql.cst;
+
+public class LessThanEqualsExpression extends BinaryExpression {
+
+    public LessThanEqualsExpression(Expression e1, Expression e2) {
+        super(e1, e2);
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<").append(getFirstExpression()).append("> <= <").append(getSecondExpression()).append(">");
+        return sb.toString();
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LessThanExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LessThanExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LessThanExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,18 @@
+package org.mulgara.sparql.cst;
+
+public class LessThanExpression extends BinaryExpression {
+
+    public LessThanExpression(Expression e1, Expression e2) {
+        super(e1, e2);
+    }
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<").append(getFirstExpression()).append("> < <").append(getSecondExpression()).append(">");
+        return sb.toString();
+    }
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LimitOffset.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LimitOffset.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/LimitOffset.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,41 @@
+package org.mulgara.sparql.cst;
+
+import beaver.Symbol;
+
+public class LimitOffset extends Symbol {
+    private Integer limit;
+    private Integer offset;
+    
+    public LimitOffset(int limit, int offset) {
+        this.limit = limit;
+        this.offset = offset;
+    }
+    
+    public LimitOffset() {
+        
+    }
+    
+    public void setLimit(int limit) {
+        this.limit = limit;
+    }
+    
+    public void setOffset(int offset) {
+        this.offset = offset;
+    }
+    
+    public int getLimit() {
+        return limit;
+    }
+    
+    public int getOffset() {
+        return offset;
+    }
+    
+    public boolean limitSet() {
+        return limit != null;
+    }
+    
+    public boolean offsetSet() {
+        return offset != null;
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MinusExpr.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MinusExpr.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MinusExpr.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,14 @@
+package org.mulgara.sparql.cst;
+
+public class MinusExpr extends BinExpr
+{
+    public MinusExpr(Expr left, Expr right)
+    {
+        super(left, right);
+    }
+    
+    public void accept(TreeWalker walker)
+    {
+        walker.visit(this);
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MinusExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MinusExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MinusExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,19 @@
+package org.mulgara.sparql.cst;
+
+public class MinusExpression extends BinaryExpression {
+    public MinusExpression(Expression e1, Expression e2) {
+        super(e1, e2);
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<").append(getFirstExpression()).append("> - <").append(getSecondExpression()).append(">");
+        return sb.toString();
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MinusPrimaryExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MinusPrimaryExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MinusPrimaryExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,17 @@
+package org.mulgara.sparql.cst;
+
+public class MinusPrimaryExpression extends PrimaryExpression {
+    public MinusPrimaryExpression(Expression e) {
+        super(e);
+    }
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("MINUS <").append(getExpression()).append(">");
+        return sb.toString();
+    }
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MultExpr.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MultExpr.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MultExpr.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,14 @@
+package org.mulgara.sparql.cst;
+
+public class MultExpr extends BinExpr
+{
+    public MultExpr(Expr left, Expr right)
+    {
+        super(left, right);
+    }
+    
+    public void accept(TreeWalker walker)
+    {
+        walker.visit(this);
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MultExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MultExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/MultExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,19 @@
+package org.mulgara.sparql.cst;
+
+public class MultExpression extends BinaryExpression {
+    public MultExpression(Expression e1, Expression e2) {
+        super(e1, e2);
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<").append(getFirstExpression()).append("> * <").append(getSecondExpression()).append(">");
+        return sb.toString();
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NegExpr.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NegExpr.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NegExpr.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,17 @@
+package org.mulgara.sparql.cst;
+
+public class NegExpr extends Expr
+{
+    public final Expr e;
+    
+    public NegExpr(Expr expr)
+    {
+        super();
+        this.e = expr;
+    }
+    
+    public void accept(TreeWalker walker)
+    {
+        walker.visit(this);
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Node.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Node.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Node.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,8 @@
+package org.mulgara.sparql.cst;
+
+import beaver.Symbol;
+
+public abstract class Node extends Symbol
+{
+    public abstract void accept(TreeWalker walker); 
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NonTriple.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NonTriple.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NonTriple.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,7 @@
+package org.mulgara.sparql.cst;
+
+import beaver.Symbol;
+
+public abstract class NonTriple extends Symbol implements GraphElementVisitable {
+
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NotEqualsExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NotEqualsExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NotEqualsExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,20 @@
+package org.mulgara.sparql.cst;
+
+public class NotEqualsExpression extends BinaryExpression {
+
+    public NotEqualsExpression(Expression e1, Expression e2) {
+        super(e1, e2);
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<").append(getFirstExpression()).append("> != <").append(getSecondExpression()).append(">");
+        return sb.toString();
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NotPrimaryExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NotPrimaryExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NotPrimaryExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,19 @@
+package org.mulgara.sparql.cst;
+
+public class NotPrimaryExpression extends PrimaryExpression {
+    public NotPrimaryExpression(Expression e) {
+        super(e);
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("NOT <").append(getExpression()).append(">");
+        return sb.toString();
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NumExpr.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NumExpr.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/NumExpr.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,17 @@
+package org.mulgara.sparql.cst;
+
+public class NumExpr extends Expr
+{
+    public final int value;
+    
+    public NumExpr(Number value)
+    {
+        super();
+        this.value = value.intValue();
+    }
+    
+    public void accept(TreeWalker walker)
+    {
+        walker.visit(this);
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/OptionalGraphPatternElement.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/OptionalGraphPatternElement.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/OptionalGraphPatternElement.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,23 @@
+package org.mulgara.sparql.cst;
+import beaver.Symbol;
+import java.util.*;
+
+public class OptionalGraphPatternElement extends NonTriple implements GraphElementVisitable {
+    private GroupGraphPattern ggp;
+    public OptionalGraphPatternElement(GroupGraphPattern ggp) {
+        System.out.println("Optional graph pattern element created.");
+        this.ggp = ggp;
+    }
+    
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+    public GroupGraphPattern getGraphPattern() {
+        return ggp;
+    }
+
+    public String toString() {
+        return "OPTIONAL: " + super.toString() + "\n" + ggp.toString();
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/OrExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/OrExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/OrExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,20 @@
+package org.mulgara.sparql.cst;
+
+public class OrExpression extends BinaryExpression {
+
+    public OrExpression(Expression e1, Expression e2) {
+        super(e1, e2);
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<").append(getFirstExpression()).append("> OR <").append(getSecondExpression()).append(">");
+        return sb.toString();
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/OrderByClause.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/OrderByClause.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/OrderByClause.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,29 @@
+package org.mulgara.sparql.cst;
+
+import beaver.Symbol;
+
+public class OrderByClause extends Symbol {
+    public enum OrderDirection {
+        ASCENDING,
+        DESCENDING
+    }
+    private Constraint constraint;
+    private OrderDirection orderDirection;
+    
+    public OrderByClause(Constraint constraint, OrderDirection direction) {
+        this.constraint= constraint;
+        this.orderDirection = direction;
+    }
+    
+    public OrderByClause(Constraint constraint) {
+        this.constraint = constraint;
+    }
+    
+    public Constraint getConstraint() {
+        return constraint;
+    }
+    
+    public OrderDirection getOrderDirection() {
+        return orderDirection;
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PlusExpr.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PlusExpr.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PlusExpr.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,14 @@
+package org.mulgara.sparql.cst;
+
+public class PlusExpr extends BinExpr
+{
+    public PlusExpr(Expr left, Expr right)
+    {
+        super(left, right);
+    }
+    
+    public void accept(TreeWalker walker)
+    {
+        walker.visit(this);
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PlusExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PlusExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PlusExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,19 @@
+package org.mulgara.sparql.cst;
+
+public class PlusExpression extends BinaryExpression {
+    public PlusExpression(Expression e1, Expression e2) {
+        super(e1, e2);
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("<").append(getFirstExpression()).append("> + <").append(getSecondExpression()).append(">");
+        return sb.toString();
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PlusPrimaryExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PlusPrimaryExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PlusPrimaryExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,17 @@
+package org.mulgara.sparql.cst;
+
+public class PlusPrimaryExpression extends PrimaryExpression {
+    public PlusPrimaryExpression(Expression e) {
+        super(e);
+    }
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append("PLUS <").append(getExpression()).append(">");
+        return sb.toString();
+    }
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Predicate.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Predicate.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Predicate.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,17 @@
+package org.mulgara.sparql.cst;
+import beaver.Symbol;
+public abstract class Predicate extends Symbol implements PredicateVisitable {
+    private String value;
+    public Predicate(String value) {
+        System.out.println("predicate created");
+        this.value = value;
+    }
+
+    public String toString() {
+        return value;
+    }
+    
+    public String getValue() {
+        return value;
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PredicateVisitable.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PredicateVisitable.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PredicateVisitable.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,5 @@
+package org.mulgara.sparql.cst;
+
+public interface PredicateVisitable {
+    void accept(PredicateVisitor visitor);
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PredicateVisitor.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PredicateVisitor.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PredicateVisitor.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,7 @@
+package org.mulgara.sparql.cst;
+
+public interface PredicateVisitor {
+    void visit(VariablePredicate p);
+    void visit(IRIPredicate p);
+    void visit(URIPredicate p);
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PrimaryExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PrimaryExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/PrimaryExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,13 @@
+package org.mulgara.sparql.cst;
+
+public abstract class PrimaryExpression extends Expression {
+    private Expression expression;
+
+    public PrimaryExpression(Expression expression) {
+        this.expression = expression;
+    }
+
+    public Expression getExpression() {
+        return expression;
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/RDFObject.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/RDFObject.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/RDFObject.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,18 @@
+package org.mulgara.sparql.cst;
+import beaver.Symbol;
+
+public class RDFObject extends Symbol {
+    private String value;
+    public RDFObject(String value) {
+    System.out.println("rdf object created");
+    this.value = value;
+    }
+
+    public String getObject() {
+    return value;
+    }
+
+    public String toString() {
+    return value;
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/RegularExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/RegularExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/RegularExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,36 @@
+package org.mulgara.sparql.cst;
+
+public class RegularExpression extends BuiltinCall {
+    private Expression e2;
+    private Expression e3;
+    public RegularExpression(Expression e1, Expression e2) {
+        super(e1);
+        this.e2 = e2;
+    }
+    
+    public RegularExpression(Expression e1, Expression e2, Expression e3) {
+        this(e1, e2);
+        this.e3 = e3;
+    }
+    
+    public Expression getFirstArgument() {
+        return getExpression();
+    }
+    
+    public Expression getSecondArgument() {
+        return e2;
+    }
+    
+    public Expression getThirdArgument() {
+        return e3;
+    }
+    
+    public boolean hasThreeArguments() {
+        return e3 != null;
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/SameTermBuiltinCall.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/SameTermBuiltinCall.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/SameTermBuiltinCall.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,27 @@
+package org.mulgara.sparql.cst;
+
+public class SameTermBuiltinCall extends BuiltinCall {
+    private Expression arg2;
+    public SameTermBuiltinCall(Expression e1, Expression e2) {
+        super(e1);
+        this.arg2 = e2;
+    }
+
+    public String toString() {
+        return "sameTermBuiltinCall(" + getExpression() + ", " + arg2 + ")";
+    }
+
+    public Expression getFirstArgument() {
+        return getExpression();
+    }
+    
+    public Expression getSecondArgument() {
+        return arg2;
+    }
+    
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/SelectQuery.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/SelectQuery.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/SelectQuery.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,35 @@
+package org.mulgara.sparql.cst;
+import beaver.Symbol;
+public class SelectQuery extends Symbol {
+    private Expr expr;
+    private From from;
+    private String distinct;
+    private GroupGraphPattern where;
+    private SolutionModifier modifier;
+    public SelectQuery(String distinct, From from, GroupGraphPattern where, SolutionModifier modifier) {
+        this.from = from;
+        this.where = where;
+        this.distinct = distinct;
+        this.modifier = modifier;
+    }
+    
+    public String getDistinct() {
+        return distinct;
+    }
+
+    public Expr getExpr() {
+        return expr;
+    }
+
+    public From getFrom() {
+        return from;
+    }
+
+    public GroupGraphPattern getWhere() {
+        return where;
+    }
+    
+    public SolutionModifier getSolutionModifier() {
+        return modifier;
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/SolutionModifier.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/SolutionModifier.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/SolutionModifier.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,39 @@
+package org.mulgara.sparql.cst;
+
+import java.util.List;
+
+import beaver.Symbol;
+
+public class SolutionModifier extends Symbol {
+    private List<OrderByClause> orderClause;
+    private LimitOffset limitOffsetClause;
+    
+    public SolutionModifier(List<OrderByClause> orderClause, LimitOffset limitOffsetClause) {
+        this.orderClause = orderClause;
+        this.limitOffsetClause = limitOffsetClause;
+    }
+    
+    public SolutionModifier(List<OrderByClause> orderClause) {
+        this.orderClause = orderClause;
+    }
+    
+    public SolutionModifier(LimitOffset limitOffsetClause) {
+        this.limitOffsetClause = limitOffsetClause;
+    }
+    
+    public boolean orderClauseSet() {
+        return orderClause != null;
+    }
+    
+    public boolean limitOffsetClauseSet() {
+        return limitOffsetClause != null;
+    }
+    
+    public List<OrderByClause> getOrderClause() {
+        return orderClause;
+    }
+    
+    public LimitOffset getLimitOffsetClause() {
+        return limitOffsetClause;
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/StrBuiltinCall.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/StrBuiltinCall.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/StrBuiltinCall.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,17 @@
+package org.mulgara.sparql.cst;
+
+public class StrBuiltinCall extends BuiltinCall {
+    public StrBuiltinCall(Expression e) {
+        super(e);
+    }
+
+    public String toString() {
+        return "strBuiltinCall(" + getExpression() + ")";
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/TreeWalker.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/TreeWalker.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/TreeWalker.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,48 @@
+package org.mulgara.sparql.cst;
+
+public class TreeWalker
+{
+    public void visit(ErrExpr expr)
+    {
+        // leaf
+    }
+
+    public void visit(NumExpr expr)
+    {
+        // leaf
+    }
+
+    public void visit(NegExpr expr)
+    {
+        expr.e.accept(this);
+    }
+    
+    public void visit(MultExpr expr)
+    {
+        expr.l.accept(this);
+        expr.r.accept(this);
+    }
+    
+    public void visit(DivExpr expr)
+    {
+        expr.l.accept(this);
+        expr.r.accept(this);
+    }
+    
+    public void visit(PlusExpr expr)
+    {
+        expr.l.accept(this);
+        expr.r.accept(this);
+    }
+    
+    public void visit(MinusExpr expr)
+    {
+        expr.l.accept(this);
+        expr.r.accept(this);
+    }
+
+    public void visit(Predicate predicate) {
+    System.out.println("Predicate: " + predicate);
+    }
+
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Triple.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Triple.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Triple.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,45 @@
+package org.mulgara.sparql.cst;
+import beaver.Symbol;
+
+public class Triple extends Symbol {
+    private String subject;
+    private Predicate predicate;
+    private RDFObject object;
+
+    public Triple(String subject, Predicate predicate, RDFObject object) {
+    System.out.println("triple created");
+    this.subject = subject;
+    this.predicate = predicate;
+    this.object = object;
+    }
+
+    public Triple(Predicate predicate, RDFObject object) {
+    System.out.println("triple created");
+    this.predicate = predicate;
+    this.object = object;
+    }
+
+    public String getSubject() {
+    return subject;
+    }
+
+    public void setSubject(String subject) {
+    this.subject = subject;
+    }
+
+    public Predicate getPredicate() {
+    return predicate;
+    }
+
+    public RDFObject getObject() {
+    return object;
+    }
+
+    public String toString() {
+    StringBuffer sb = new StringBuffer();
+    sb.append("<").append(subject).append(">");
+    sb.append("<").append(predicate).append(">");
+    sb.append("<").append(object).append(">");
+    return sb.toString();
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/URIPredicate.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/URIPredicate.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/URIPredicate.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,11 @@
+package org.mulgara.sparql.cst;
+public class URIPredicate extends Predicate {
+    public URIPredicate(String uri) {
+        super(uri);
+        System.out.println("uri predicate created");
+    }
+
+    public void accept(PredicateVisitor visitor) {
+        visitor.visit(this);
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Variable.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Variable.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Variable.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,17 @@
+package org.mulgara.sparql.cst;
+import beaver.Symbol;
+public class Variable extends Symbol {
+    private String variable;
+    public Variable(String variable) {
+    System.out.println("variable created");
+    this.variable = variable;
+    }
+
+    public String getVariable() {
+    return variable;
+    }
+
+    public String toString() {
+    return variable;
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/VariableExpression.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/VariableExpression.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/VariableExpression.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,23 @@
+package org.mulgara.sparql.cst;
+
+public class VariableExpression extends Expression {
+    private String var;
+
+    public VariableExpression(String e) {
+        this.var = e;
+    }
+
+    public String toString() {
+        return "<var>" + var;
+    }
+
+    @Override
+    public void accept(GraphElementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+    public String getVariable() {
+        return var;
+    }
+
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/VariablePredicate.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/VariablePredicate.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/VariablePredicate.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,10 @@
+package org.mulgara.sparql.cst;
+public class VariablePredicate extends Predicate {
+    public VariablePredicate(String variable) {
+        super(variable);
+    }
+
+    public void accept(PredicateVisitor visitor) {
+        visitor.visit(this);
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Where.java
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Where.java	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/Where.java	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,16 @@
+package org.mulgara.sparql.cst;
+import beaver.Symbol;
+import java.util.ArrayList;
+
+public class Where extends Symbol {
+    private ArrayList<Triple> triples;
+    private String where;
+    public Where(String where) {
+    System.out.println("where created");
+    this.where = where;
+    }
+
+    public String toString() {
+    return where;
+    }
+}

Added: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/convert.sh
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/convert.sh	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/convert.sh	2007-12-03 22:12:33 UTC (rev 593)
@@ -0,0 +1,5 @@
+for file in `ls *.java`; do
+        echo $file
+        sed -e 's/expr.tree.ast/cst/g' $file > $file.imp
+        mv $file.imp $file
+done;


Property changes on: branches/mgr-61-sparql/src/jar/sparql/java/org/mulgara/sparql/cst/convert.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: branches/mgr-61-sparql/src/jar/sparql/sparql-build.properties
===================================================================
--- branches/mgr-61-sparql/src/jar/sparql/sparql-build.properties	2007-12-03 06:32:13 UTC (rev 592)
+++ branches/mgr-61-sparql/src/jar/sparql/sparql-build.properties	2007-12-03 22:12:33 UTC (rev 593)
@@ -17,3 +17,4 @@
 sparql.jxtest.dir    =${jxtest.dir}/sparql
 sparql.jar           =sparql-base-${mulgara-version}.jar
 jflex.location       =http://jflex.de/jflex-1.4.1.zip
+jflex.jar            =JFlex.jar




More information about the Mulgara-svn mailing list