Adding changes to support options as user defined aggregations

src/java/boa/compiler/UserDefinedAgg.java

@@ -1,9 +1,15 @@
 package boa.compiler;
 
+
+import boa.compiler.ast.statements.VarDeclStatement;
+import boa.compiler.ast.types.AbstractType;
 import org.stringtemplate.v4.ST;
 import org.stringtemplate.v4.STGroup;
 import org.stringtemplate.v4.STGroupFile;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class UserDefinedAgg {
     private final String userGivenName;
     private final String code;
@@ -34,7 +40,28 @@ public static class Builder {
         private String userGivenFuncArg = null;  // user given param names
         private String funcArgType = null; // funcVarName of the compiler generated userGivenParams
         private boolean isAggregator = false;
-        private String assignedToVar;
+        private List<String> aggregatorOptionParamId = new ArrayList<String>();
+        private List<String> aggregatorOptionParamInitializer = new ArrayList<String>();
+        private List<AbstractType> aggregatorOutputParamTypes = new ArrayList<AbstractType>();
+
+
+        public List<String> getAggregatorOptionParamId() {
+            return aggregatorOptionParamId;
+        }
+
+        public boolean addAggregatorOptionParamId(String code, int index) {
+            return this.aggregatorOptionParamId.add(aggregatorOutputParamTypes.get(index).type.toJavaType() + " " + code + ";\n");
+        }
+
+        public boolean addAggregatorOptionParamInitializer(String initializer) {
+            return this.aggregatorOptionParamInitializer.add(initializer);
+        }
+
+        public void setAggregatorOptionParamType(List<VarDeclStatement> params) {
+            for(VarDeclStatement stmt: params) {
+                this.aggregatorOutputParamTypes.add(stmt.getType());
+            }
+        }
 
         public UserDefinedAgg build(){
             return new UserDefinedAgg(this.funcVarName, this.generateCode());
@@ -129,6 +156,7 @@ private String generateCode() {
             st.add("lambdaType", this.lambdaType);
             st.add("lambdaName", this.lambdaName);
             st.add("interface", fulQualifiedNameGne(this.lambdaInterface));
+            st.add("aggParams", getAggregatorOptionParamId());
             if(this.funcArgType != null) {
                 st.add("funcArg", fulQualifiedNameGne(funcArgType));
             }else {
@@ -197,5 +225,6 @@ private String typeParser(String typeName) {
             }
             return result;
         }
+
     }
 }

src/java/boa/compiler/ast/types/OutputType.java

@@ -22,6 +22,7 @@
 import boa.compiler.ast.Component;
 import boa.compiler.ast.Identifier;
 import boa.compiler.ast.expressions.Expression;
+import boa.compiler.ast.statements.VarDeclStatement;
 import boa.compiler.visitors.AbstractVisitor;
 import boa.compiler.visitors.AbstractVisitorNoArg;
 import boa.compiler.visitors.AbstractVisitorNoReturn;
@@ -35,6 +36,7 @@ public class OutputType extends AbstractType {
 	protected Identifier id;
 	protected final List<Expression> args = new ArrayList<Expression>();
 	protected final List<Component> indices = new ArrayList<Component>();
+	protected final List<VarDeclStatement> params = new ArrayList<VarDeclStatement>();
 	protected Component t;
 	protected Component weight;
 
@@ -72,6 +74,18 @@ public void setArgs(final List<Expression> args) {
 		}
 	}
 
+	public void setParams(final List<VarDeclStatement> params) {
+		this.params.clear();
+		for (final VarDeclStatement e : params) {
+			e.setParent(this);
+			this.params.add(e);
+		}
+	}
+
+	public List<VarDeclStatement> getParams() {
+		return params;
+	}
+
 	public List<Component> getIndices() {
 		return indices;
 	}

src/java/boa/compiler/visitors/CodeGeneratingVisitor.java

@@ -182,6 +182,7 @@ public void visit(final VarDeclStatement n) {
 				UserDefinedAgg.Builder function = UserDefinedAggregators.findByUserGivenName(((OutputType)n.getType()).getId().getToken());
 				if(function != null) {
 					function.isAggregator(true);
+					function.setAggregatorOptionParamType(((OutputType)n.getType()).getParams());
 				}
 				return;
 			}
@@ -839,6 +840,7 @@ public void visit(final Factor n) {
 			String accept = "";
 			abortGeneration = false;
 
+			n.env.setOperandType(n.getOperand().type);
 			if (!(n.getOp(0) instanceof Call)) {
 				n.getOperand().accept(this);
 				n.env.setOperandType(n.getOperand().type);
@@ -1370,6 +1372,18 @@ public void visit(final VarDeclStatement n) {
 				n.getInitializer().accept(this);
 				function.lambdaInit(code.removeLast());
 			}
+			if(n.getType() instanceof OutputType) {
+				function = UserDefinedAggregators.findByUserGivenName(((OutputType) n.getType()).getId().getToken());
+				if(function != null) {
+					int counter = 0;
+					for(VarDeclStatement stmt: ((OutputType) n.getType()).getParams()) {
+						stmt.accept(this);
+						String[] argCode = code.removeLast().split("=");
+						function.addAggregatorOptionParamId(argCode[0], counter++);
+						function.addAggregatorOptionParamInitializer(argCode[1]);
+					}
+				}
+			}
 			code.add("");
 			return;
 		}

src/java/boa/compiler/visitors/TypeCheckingVisitor.java

@@ -1400,6 +1400,10 @@ public void visit(final OutputType n, final SymbolTable env) {
 		if (n.getArgsSize() > 0 && annotation.formalParameters().length == 0)
 			throw new TypeCheckException(n.getArgs(), "output aggregator '" + n.getId().getToken() + "' takes no arguments");
 
+		for(VarDeclStatement stmt: n.getParams()) {
+			stmt.accept(this, env);
+		}
+
 		n.type = new BoaTable(type, indexTypes, tweight, annotation.canOmitWeight());
 		env.set(n.getId().getToken(), n.type);
 		n.getId().accept(this, env);