implemented parsing without query flattening

pom.xml

@@ -7,7 +7,6 @@
     <version>0.3.5-SNAPSHOT</version>
 
 
-
     <name>GDL - Graph Definition Language</name>
     <description>ANTLR Grammar for the definition of extended property graphs.</description>
     <url>http://github.com/s1ck/gdl.git</url>

src/main/antlr4/org/s1ck/gdl/GDL.g4

@@ -196,8 +196,8 @@ timeSelector
     ;
 
 complexTimePoint
-    : 'MAX(' complexTimePointArgument ',' complexTimePointArgument (','complexTimePointArgument) ')'
-    | 'MIN(' complexTimePointArgument ',' complexTimePointArgument (','complexTimePointArgument) ')'
+    : 'MAX(' complexTimePointArgument (',' complexTimePointArgument)+ ')'
+    | 'MIN(' complexTimePointArgument (',' complexTimePointArgument)+ ')'
     ;
 
 complexTimePointArgument
@@ -215,6 +215,7 @@ intervalFunc
             | immediatelyPrecedesOperator
             | immediatelySucceedsOperator
             | equalsOperator
+            | longerThanOperator
             ;
 overlapsIntervallOperator
     : 'overlaps(' interval ')'
@@ -254,6 +255,14 @@ equalsOperator
     : 'equals(' interval ')'
     ;
 
+longerThanOperator
+    : 'longerThan(' timeConstant ')'
+    ;
+
+timeConstant
+    : IntegerLiteral ('days'|'hours'|'minutes'|'seconds'|'millis')
+    ;
+
 stampFunc
     : beforePointOperator
     | afterPointOperator

src/main/java/org/s1ck/gdl/GDLLoader.java

@@ -22,6 +22,7 @@
 import org.s1ck.gdl.model.*;
 import org.s1ck.gdl.model.comparables.ElementSelector;
 import org.s1ck.gdl.model.comparables.time.*;
+import org.s1ck.gdl.model.comparables.time.util.TimeConstant;
 import org.s1ck.gdl.model.predicates.booleans.And;
 import org.s1ck.gdl.model.predicates.expressions.Comparison;
 import org.s1ck.gdl.model.predicates.Predicate;
@@ -91,6 +92,9 @@ class GDLLoader extends GDLBaseListener {
   private static final String ANONYMOUS_VERTEX_VARIABLE = "__v%d";
   private static final String ANONYMOUS_EDGE_VARIABLE = "__e%d";
 
+  // should predicates be reformulated to simple comparisons?
+  private boolean processPredicates = true;
+
 
   /**
    * Initializes a new GDL Loader.
@@ -104,6 +108,20 @@ class GDLLoader extends GDLBaseListener {
       true, true, true);
   }
 
+  /**
+   * Initializes a new GDL Loader.
+   *
+   * @param defaultGraphLabel   graph label to be used if no label is given in the GDL script
+   * @param defaultVertexLabel  vertex label to be used if no label is given in the GDL script
+   * @param defaultEdgeLabel    edge label to be used if no label is given in the GDL script
+   * @param processPredicates   true iff predicates should be reformulated to simple (atomic) comparisons
+   */
+  GDLLoader(String defaultGraphLabel, String defaultVertexLabel, String defaultEdgeLabel,
+            boolean processPredicates) {
+    this(defaultGraphLabel, defaultVertexLabel, defaultEdgeLabel);
+    this.processPredicates = processPredicates;
+  }
+
   /**
    * Initializes a new GDL Loader.
    *
@@ -142,6 +160,25 @@ class GDLLoader extends GDLBaseListener {
     currentPredicates = new ArrayDeque<>();
   }
 
+  /**
+   * Initializes a new GDL Loader.
+   *
+   * @param defaultGraphLabel     graph label to be used if no label is given in the GDL script
+   * @param defaultVertexLabel    vertex label to be used if no label is given in the GDL script
+   * @param defaultEdgeLabel      edge label to be used if no label is given in the GDL script
+   * @param useDefaultGraphLabel  enable default graph label
+   * @param useDefaultVertexLabel enable default vertex label
+   * @param useDefaultEdgeLabel   enable default edge label
+   */
+  GDLLoader(String defaultGraphLabel, String defaultVertexLabel, String defaultEdgeLabel,
+            boolean useDefaultGraphLabel, boolean useDefaultVertexLabel, boolean useDefaultEdgeLabel,
+            boolean processPredicates) {
+
+    this(defaultGraphLabel, defaultVertexLabel, defaultEdgeLabel, useDefaultGraphLabel, useDefaultVertexLabel,
+            useDefaultEdgeLabel);
+    this.processPredicates = processPredicates;
+  }
+
   /**
    * Returns the default graph label.
    *
@@ -312,7 +349,9 @@ public void exitGraph(GDLParser.GraphContext ctx) {
    */
   @Override
   public void exitQuery(GDLParser.QueryContext ctx) {
-    postprocessPredicates();
+    if(processPredicates) {
+      postprocessPredicates();
+    }
     for(Vertex v : vertices) {
       addPredicates(Predicate.fromGraphElement(v, getDefaultVertexLabel()));
     }
@@ -502,6 +541,9 @@ else if(intervalFunc.immediatelySucceedsOperator()!=null){
     else if(intervalFunc.equalsOperator()!=null){
       return createEqualsPredicates(from, to, intervalFunc.equalsOperator());
     }
+    else if(intervalFunc.longerThanOperator()!=null){
+      return createLongerThanPredicates(from, to, intervalFunc.longerThanOperator());
+    }
     return null;
   }
 
@@ -631,6 +673,34 @@ private Predicate createEqualsPredicates(TimePoint from, TimePoint to, GDLParser
     );
   }
 
+  private Predicate createLongerThanPredicates(TimePoint from, TimePoint to, GDLParser.LongerThanOperatorContext ctx){
+    TimeConstant constant = buildTimeConstant(ctx.timeConstant());
+    Comparison c = new Comparison(new PlusTimePoint(from, constant), LT, to);
+    return new Comparison(
+            new PlusTimePoint(from, constant), LT, to
+    );
+  }
+
+  private TimeConstant buildTimeConstant(GDLParser.TimeConstantContext ctx){
+    int value = Integer.parseInt(ctx.IntegerLiteral().getText());
+    if(ctx.getText().contains("days")){
+      return new TimeConstant(value,0,0,0,0);
+    }
+    else if(ctx.getText().contains("hours")){
+      return new TimeConstant(0, value, 0, 0, 0);
+    }
+    else if(ctx.getText().contains("minutes")){
+      return new TimeConstant(0, 0, value, 0, 0);
+    }
+    else if(ctx.getText().contains("seconds")){
+      return new TimeConstant(0, 0, 0, value, 0);
+    }
+    else if(ctx.getText().contains("milliseconds") || ctx.getText().contains("millis")){
+      return new TimeConstant(0, 0, 0, 0, value);
+    }
+    return null;
+  }
+
   /**
    * Creates an array {@code {from, to}} representing an intervall.
    * @param ctx context from which to derive {@code from} and {@code to}

src/main/java/org/s1ck/gdl/model/comparables/ComparableExpression.java

@@ -34,5 +34,10 @@ public interface ComparableExpression extends Serializable{
    */
   boolean containsSelectorType(TimeSelector.TimeField type);
 
+  /**
+   * Checks whether a global time selector is contained.
+   * @return true iff a global time selector is contained
+   */
+  boolean isGlobal();
 
 }

src/main/java/org/s1ck/gdl/model/comparables/ElementSelector.java

@@ -51,6 +51,11 @@ public boolean containsSelectorType(TimeSelector.TimeField type){
     return false;
   }
 
+  @Override
+  public boolean isGlobal(){
+    return false;
+  }
+
   @Override
   public String toString() {
     return variable;

src/main/java/org/s1ck/gdl/model/comparables/Literal.java

@@ -55,6 +55,11 @@ public boolean containsSelectorType(TimeSelector.TimeField type){
     return false;
   }
 
+  @Override
+  public boolean isGlobal(){
+    return false;
+  }
+
   @Override
   public String toString() {
     return value.toString();

src/main/java/org/s1ck/gdl/model/comparables/PropertySelector.java

@@ -61,6 +61,11 @@ public boolean containsSelectorType(TimeSelector.TimeField type){
     return false;
   }
 
+  @Override
+  public boolean isGlobal(){
+    return false;
+  }
+
   @Override
   public String toString() {
     return variable + "." + propertyName;

src/main/java/org/s1ck/gdl/model/comparables/time/MaxTimePoint.java

@@ -212,4 +212,14 @@ public boolean equals(Object o) {
         return true;
     }
 
+    @Override
+    public boolean isGlobal(){
+        for(TimePoint arg: args){
+            if(arg.isGlobal()){
+                return true;
+            }
+        }
+        return false;
+    }
+
 }

src/main/java/org/s1ck/gdl/model/comparables/time/MinTimePoint.java

@@ -213,5 +213,15 @@ public boolean equals(Object o) {
         return true;
     }
 
+    @Override
+    public boolean isGlobal(){
+        for(TimePoint arg: args){
+            if(arg.isGlobal()){
+                return true;
+            }
+        }
+        return false;
+    }
+
 
 }