Move all the files form QL project to QL package

src/main/java/nl/uva/softwcons/Questionnaire.java → src/main/java/nl/uva/softwcons/ql/Questionnaire.java

@@ -1,12 +1,12 @@
-package nl.uva.softwcons;
+package nl.uva.softwcons.ql;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import nl.uva.softwcons.ast.ASTBuilderVisitor;
-import nl.uva.softwcons.ast.form.Form;
 import nl.uva.softwcons.generated.QLLexer;
 import nl.uva.softwcons.generated.QLParser;
+import nl.uva.softwcons.ql.ast.ASTBuilderVisitor;
+import nl.uva.softwcons.ql.ast.form.Form;
 
 import org.antlr.v4.runtime.ANTLRInputStream;
 import org.antlr.v4.runtime.CommonTokenStream;

src/main/java/nl/uva/softwcons/ast/ASTBuilderVisitor.java → src/main/java/nl/uva/softwcons/ql/ast/ASTBuilderVisitor.java

@@ -1,39 +1,8 @@
-package nl.uva.softwcons.ast;
+package nl.uva.softwcons.ql.ast;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
-import nl.uva.softwcons.ast.expression.Expression;
-import nl.uva.softwcons.ast.expression.binary.BinaryExpression;
-import nl.uva.softwcons.ast.expression.binary.arithmetic.Addition;
-import nl.uva.softwcons.ast.expression.binary.arithmetic.Division;
-import nl.uva.softwcons.ast.expression.binary.arithmetic.Multiplication;
-import nl.uva.softwcons.ast.expression.binary.arithmetic.Subtraction;
-import nl.uva.softwcons.ast.expression.binary.comparison.Equal;
-import nl.uva.softwcons.ast.expression.binary.comparison.GreaterOrEqual;
-import nl.uva.softwcons.ast.expression.binary.comparison.GreaterThan;
-import nl.uva.softwcons.ast.expression.binary.comparison.LowerOrEqual;
-import nl.uva.softwcons.ast.expression.binary.comparison.LowerThan;
-import nl.uva.softwcons.ast.expression.binary.comparison.NotEqual;
-import nl.uva.softwcons.ast.expression.binary.logical.And;
-import nl.uva.softwcons.ast.expression.binary.logical.Or;
-import nl.uva.softwcons.ast.expression.identifier.Identifier;
-import nl.uva.softwcons.ast.expression.literal.BooleanLiteral;
-import nl.uva.softwcons.ast.expression.literal.NumberLiteral;
-import nl.uva.softwcons.ast.expression.literal.StringLiteral;
-import nl.uva.softwcons.ast.expression.unary.UnaryExpression;
-import nl.uva.softwcons.ast.expression.unary.logical.Not;
-import nl.uva.softwcons.ast.form.Form;
-import nl.uva.softwcons.ast.statement.ComputedQuestion;
-import nl.uva.softwcons.ast.statement.Conditional;
-import nl.uva.softwcons.ast.statement.Question;
-import nl.uva.softwcons.ast.statement.Statement;
-import nl.uva.softwcons.ast.type.BooleanType;
-import nl.uva.softwcons.ast.type.DateType;
-import nl.uva.softwcons.ast.type.NumberType;
-import nl.uva.softwcons.ast.type.StringType;
-import nl.uva.softwcons.ast.type.Type;
-import nl.uva.softwcons.ast.type.UndefinedType;
 import nl.uva.softwcons.generated.QLBaseVisitor;
 import nl.uva.softwcons.generated.QLParser.BinaryExprContext;
 import nl.uva.softwcons.generated.QLParser.BooleanContext;
@@ -46,7 +15,38 @@
 import nl.uva.softwcons.generated.QLParser.ParenthesisContext;
 import nl.uva.softwcons.generated.QLParser.SimpleQuestionContext;
 import nl.uva.softwcons.generated.QLParser.StringContext;
-import nl.uva.softwcons.util.Utils;
+import nl.uva.softwcons.ql.ast.expression.Expression;
+import nl.uva.softwcons.ql.ast.expression.binary.BinaryExpression;
+import nl.uva.softwcons.ql.ast.expression.binary.arithmetic.Addition;
+import nl.uva.softwcons.ql.ast.expression.binary.arithmetic.Division;
+import nl.uva.softwcons.ql.ast.expression.binary.arithmetic.Multiplication;
+import nl.uva.softwcons.ql.ast.expression.binary.arithmetic.Subtraction;
+import nl.uva.softwcons.ql.ast.expression.binary.comparison.Equal;
+import nl.uva.softwcons.ql.ast.expression.binary.comparison.GreaterOrEqual;
+import nl.uva.softwcons.ql.ast.expression.binary.comparison.GreaterThan;
+import nl.uva.softwcons.ql.ast.expression.binary.comparison.LowerOrEqual;
+import nl.uva.softwcons.ql.ast.expression.binary.comparison.LowerThan;
+import nl.uva.softwcons.ql.ast.expression.binary.comparison.NotEqual;
+import nl.uva.softwcons.ql.ast.expression.binary.logical.And;
+import nl.uva.softwcons.ql.ast.expression.binary.logical.Or;
+import nl.uva.softwcons.ql.ast.expression.identifier.Identifier;
+import nl.uva.softwcons.ql.ast.expression.literal.BooleanLiteral;
+import nl.uva.softwcons.ql.ast.expression.literal.NumberLiteral;
+import nl.uva.softwcons.ql.ast.expression.literal.StringLiteral;
+import nl.uva.softwcons.ql.ast.expression.unary.UnaryExpression;
+import nl.uva.softwcons.ql.ast.expression.unary.logical.Not;
+import nl.uva.softwcons.ql.ast.form.Form;
+import nl.uva.softwcons.ql.ast.statement.ComputedQuestion;
+import nl.uva.softwcons.ql.ast.statement.Conditional;
+import nl.uva.softwcons.ql.ast.statement.Question;
+import nl.uva.softwcons.ql.ast.statement.Statement;
+import nl.uva.softwcons.ql.ast.type.BooleanType;
+import nl.uva.softwcons.ql.ast.type.DateType;
+import nl.uva.softwcons.ql.ast.type.NumberType;
+import nl.uva.softwcons.ql.ast.type.StringType;
+import nl.uva.softwcons.ql.ast.type.Type;
+import nl.uva.softwcons.ql.ast.type.UndefinedType;
+import nl.uva.softwcons.ql.util.Utils;
 
 import org.antlr.v4.runtime.Token;
 

src/main/java/nl/uva/softwcons/ast/ASTNode.java → src/main/java/nl/uva/softwcons/ql/ast/ASTNode.java

@@ -1,4 +1,4 @@
-package nl.uva.softwcons.ast;
+package nl.uva.softwcons.ql.ast;
 
 public interface ASTNode {
 

src/main/java/nl/uva/softwcons/ast/I18n.java → src/main/java/nl/uva/softwcons/ql/ast/I18n.java

@@ -1,4 +1,4 @@
-package nl.uva.softwcons.ast;
+package nl.uva.softwcons.ql.ast;
 
 import java.text.MessageFormat;
 import java.util.MissingResourceException;

src/main/java/nl/uva/softwcons/ast/LineInfo.java → src/main/java/nl/uva/softwcons/ql/ast/LineInfo.java

@@ -1,4 +1,4 @@
-package nl.uva.softwcons.ast;
+package nl.uva.softwcons.ql.ast;
 
 public class LineInfo {
 

src/main/java/nl/uva/softwcons/ast/expression/Expression.java → src/main/java/nl/uva/softwcons/ql/ast/expression/Expression.java

@@ -1,6 +1,6 @@
-package nl.uva.softwcons.ast.expression;
+package nl.uva.softwcons.ql.ast.expression;
 
-import nl.uva.softwcons.ast.ASTNode;
+import nl.uva.softwcons.ql.ast.ASTNode;
 
 public abstract class Expression implements ASTNode {
 

src/main/java/nl/uva/softwcons/ql/ast/expression/ExpressionVisitor.java

@@ -0,0 +1,76 @@
+package nl.uva.softwcons.ql.ast.expression;
+
+import nl.uva.softwcons.ql.ast.expression.binary.BinaryExpression;
+import nl.uva.softwcons.ql.ast.expression.binary.arithmetic.Addition;
+import nl.uva.softwcons.ql.ast.expression.binary.arithmetic.Division;
+import nl.uva.softwcons.ql.ast.expression.binary.arithmetic.Multiplication;
+import nl.uva.softwcons.ql.ast.expression.binary.arithmetic.Subtraction;
+import nl.uva.softwcons.ql.ast.expression.binary.comparison.Equal;
+import nl.uva.softwcons.ql.ast.expression.binary.comparison.GreaterOrEqual;
+import nl.uva.softwcons.ql.ast.expression.binary.comparison.GreaterThan;
+import nl.uva.softwcons.ql.ast.expression.binary.comparison.LowerOrEqual;
+import nl.uva.softwcons.ql.ast.expression.binary.comparison.LowerThan;
+import nl.uva.softwcons.ql.ast.expression.binary.comparison.NotEqual;
+import nl.uva.softwcons.ql.ast.expression.binary.logical.And;
+import nl.uva.softwcons.ql.ast.expression.binary.logical.Or;
+import nl.uva.softwcons.ql.ast.expression.identifier.Identifier;
+import nl.uva.softwcons.ql.ast.expression.literal.BooleanLiteral;
+import nl.uva.softwcons.ql.ast.expression.literal.NumberLiteral;
+import nl.uva.softwcons.ql.ast.expression.literal.StringLiteral;
+import nl.uva.softwcons.ql.ast.expression.unary.UnaryExpression;
+import nl.uva.softwcons.ql.ast.expression.unary.logical.Not;
+
+public interface ExpressionVisitor<T> {
+
+    /* Binary arithmetic expressions */
+    T visit(Addition expr);
+
+    T visit(Division expr);
+
+    T visit(Multiplication expr);
+
+    T visit(Subtraction expr);
+
+    /* Binary comparison expressions */
+    T visit(Equal expr);
+
+    T visit(GreaterOrEqual expr);
+
+    T visit(GreaterThan expr);
+
+    T visit(LowerOrEqual expr);
+
+    T visit(LowerThan expr);
+
+    T visit(NotEqual expr);
+
+    /* Binary logical expressions */
+    T visit(And expr);
+
+    T visit(Or expr);
+
+    /* Unary logical expressions */
+    T visit(Not expr);
+
+    /* Literal and identifier expressions */
+    T visit(Identifier expr);
+
+    T visit(BooleanLiteral expr);
+
+    T visit(StringLiteral expr);
+
+    T visit(NumberLiteral expr);
+
+    default T leftOperand(BinaryExpression expr) {
+        return expr.getLeftExpression().accept(this);
+    }
+
+    default T rightOperand(BinaryExpression expr) {
+        return expr.getRightExpression().accept(this);
+    }
+
+    default T unaryOperand(UnaryExpression expr) {
+        return expr.getExpression().accept(this);
+    }
+
+}

src/main/java/nl/uva/softwcons/ast/expression/binary/BinaryExpression.java → src/main/java/nl/uva/softwcons/ql/ast/expression/binary/BinaryExpression.java

@@ -1,8 +1,8 @@
-package nl.uva.softwcons.ast.expression.binary;
+package nl.uva.softwcons.ql.ast.expression.binary;
 
-import nl.uva.softwcons.ast.LineInfo;
-import nl.uva.softwcons.ast.expression.Expression;
-import nl.uva.softwcons.ast.type.Type;
+import nl.uva.softwcons.ql.ast.LineInfo;
+import nl.uva.softwcons.ql.ast.expression.Expression;
+import nl.uva.softwcons.ql.ast.type.Type;
 
 public abstract class BinaryExpression extends Expression {
 

src/main/java/nl/uva/softwcons/ast/expression/binary/arithmetic/Addition.java → src/main/java/nl/uva/softwcons/ql/ast/expression/binary/arithmetic/Addition.java

@@ -1,8 +1,8 @@
-package nl.uva.softwcons.ast.expression.binary.arithmetic;
+package nl.uva.softwcons.ql.ast.expression.binary.arithmetic;
 
-import nl.uva.softwcons.ast.LineInfo;
-import nl.uva.softwcons.ast.expression.Expression;
-import nl.uva.softwcons.ast.expression.ExpressionVisitor;
+import nl.uva.softwcons.ql.ast.LineInfo;
+import nl.uva.softwcons.ql.ast.expression.Expression;
+import nl.uva.softwcons.ql.ast.expression.ExpressionVisitor;
 
 public class Addition extends ArithmeticExpression {
 

src/main/java/nl/uva/softwcons/ast/expression/binary/arithmetic/ArithmeticExpression.java → src/main/java/nl/uva/softwcons/ql/ast/expression/binary/arithmetic/ArithmeticExpression.java

@@ -1,11 +1,11 @@
-package nl.uva.softwcons.ast.expression.binary.arithmetic;
+package nl.uva.softwcons.ql.ast.expression.binary.arithmetic;
 
-import nl.uva.softwcons.ast.LineInfo;
-import nl.uva.softwcons.ast.expression.Expression;
-import nl.uva.softwcons.ast.expression.binary.BinaryExpression;
-import nl.uva.softwcons.ast.type.NumberType;
-import nl.uva.softwcons.ast.type.Type;
-import nl.uva.softwcons.ast.type.UndefinedType;
+import nl.uva.softwcons.ql.ast.LineInfo;
+import nl.uva.softwcons.ql.ast.expression.Expression;
+import nl.uva.softwcons.ql.ast.expression.binary.BinaryExpression;
+import nl.uva.softwcons.ql.ast.type.NumberType;
+import nl.uva.softwcons.ql.ast.type.Type;
+import nl.uva.softwcons.ql.ast.type.UndefinedType;
 
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Table;

src/main/java/nl/uva/softwcons/ast/expression/binary/arithmetic/Division.java → src/main/java/nl/uva/softwcons/ql/ast/expression/binary/arithmetic/Division.java

@@ -1,8 +1,8 @@
-package nl.uva.softwcons.ast.expression.binary.arithmetic;
+package nl.uva.softwcons.ql.ast.expression.binary.arithmetic;
 
-import nl.uva.softwcons.ast.LineInfo;
-import nl.uva.softwcons.ast.expression.Expression;
-import nl.uva.softwcons.ast.expression.ExpressionVisitor;
+import nl.uva.softwcons.ql.ast.LineInfo;
+import nl.uva.softwcons.ql.ast.expression.Expression;
+import nl.uva.softwcons.ql.ast.expression.ExpressionVisitor;
 
 public class Division extends ArithmeticExpression {
 

src/main/java/nl/uva/softwcons/ast/expression/binary/arithmetic/Multiplication.java → src/main/java/nl/uva/softwcons/ql/ast/expression/binary/arithmetic/Multiplication.java

@@ -1,8 +1,8 @@
-package nl.uva.softwcons.ast.expression.binary.arithmetic;
+package nl.uva.softwcons.ql.ast.expression.binary.arithmetic;
 
-import nl.uva.softwcons.ast.LineInfo;
-import nl.uva.softwcons.ast.expression.Expression;
-import nl.uva.softwcons.ast.expression.ExpressionVisitor;
+import nl.uva.softwcons.ql.ast.LineInfo;
+import nl.uva.softwcons.ql.ast.expression.Expression;
+import nl.uva.softwcons.ql.ast.expression.ExpressionVisitor;
 
 public class Multiplication extends ArithmeticExpression {
 

src/main/java/nl/uva/softwcons/ast/expression/binary/arithmetic/Subtraction.java → src/main/java/nl/uva/softwcons/ql/ast/expression/binary/arithmetic/Subtraction.java

@@ -1,8 +1,8 @@
-package nl.uva.softwcons.ast.expression.binary.arithmetic;
+package nl.uva.softwcons.ql.ast.expression.binary.arithmetic;
 
-import nl.uva.softwcons.ast.LineInfo;
-import nl.uva.softwcons.ast.expression.Expression;
-import nl.uva.softwcons.ast.expression.ExpressionVisitor;
+import nl.uva.softwcons.ql.ast.LineInfo;
+import nl.uva.softwcons.ql.ast.expression.Expression;
+import nl.uva.softwcons.ql.ast.expression.ExpressionVisitor;
 
 public class Subtraction extends ArithmeticExpression {