Use list() to create lists of fixed size

6 files changed, 21 insertions, 23 deletions

diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionMethodReferenceReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionMethodReferenceReader.java
index d9a55e3..ab78bdb 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionMethodReferenceReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionMethodReferenceReader.java
@@ -16,6 +16,7 @@ import static org.zwobble.couscous.ast.StaticMethodCallNode.staticMethodCall;
 import static org.zwobble.couscous.ast.sugar.Lambda.lambda;
 import static org.zwobble.couscous.frontends.java.JavaTypes.typeOf;
 import static org.zwobble.couscous.util.ExtraLists.eagerMap;
+import static org.zwobble.couscous.util.ExtraLists.list;
 
 public class JavaExpressionMethodReferenceReader {
     private final JavaReader javaReader;
@@ -30,7 +31,7 @@ public class JavaExpressionMethodReferenceReader {
 
         return lambda(
             formalArguments,
-            ImmutableList.of(returns(JavaExpressionReader.coerceExpression(
+            list(returns(JavaExpressionReader.coerceExpression(
                 typeOf(functionalInterfaceMethod.getReturnType()),
                 generateValue(scope, expression, formalArguments)))));
     }
diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java
index 0e910a1..67c1e04 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java
@@ -18,6 +18,7 @@ import static org.zwobble.couscous.ast.TypeCoercionNode.typeCoercion;
 import static org.zwobble.couscous.frontends.java.JavaOperators.readOperator;
 import static org.zwobble.couscous.frontends.java.JavaTypes.typeOf;
 import static org.zwobble.couscous.util.ExtraLists.concat;
+import static org.zwobble.couscous.util.ExtraLists.list;
 
 public class JavaExpressionReader {
     private final Scope scope;
@@ -261,7 +262,7 @@ public class JavaExpressionReader {
                 MethodCallNode.methodCall(
                     readExpression(IntegerValue.REF, expression.getOperand()),
                     operator.getMethodName(),
-                    asList(literal(1)),
+                    list(literal(1)),
                     IntegerValue.REF));
         }
     }
@@ -295,7 +296,7 @@ public class JavaExpressionReader {
         return MethodCallNode.methodCall(
             left,
             operator.getMethodName(),
-            asList(right),
+            list(right),
             operator.isBoolean() ? BooleanValue.REF : left.getType());
     }
 
diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaLambdaExpressionReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaLambdaExpressionReader.java
index c8b5f4c..ee4fc06 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaLambdaExpressionReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaLambdaExpressionReader.java
@@ -14,6 +14,7 @@ import static org.zwobble.couscous.ast.ReturnNode.returns;
 import static org.zwobble.couscous.ast.sugar.Lambda.lambda;
 import static org.zwobble.couscous.frontends.java.JavaTypes.typeOf;
 import static org.zwobble.couscous.util.ExtraLists.eagerMap;
+import static org.zwobble.couscous.util.ExtraLists.list;
 
 public class JavaLambdaExpressionReader {
     private final JavaReader reader;
@@ -50,7 +51,7 @@ public class JavaLambdaExpressionReader {
             return reader.readStatements(scope, statements, Optional.of(returnType));
         } else {
             Expression body = (Expression) expression.getBody();
-            return asList(returns(reader.readExpression(scope, returnType, body)));
+            return list(returns(reader.readExpression(scope, returnType, body)));
         }
     }
 }
diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaParser.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaParser.java
index 9de85cc..e1addd3 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaParser.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaParser.java
@@ -1,5 +1,12 @@
 package org.zwobble.couscous.frontends.java;
 
+import com.google.common.base.Charsets;
+import com.google.common.collect.Iterables;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.core.dom.AST;
+import org.eclipse.jdt.core.dom.ASTParser;
+import org.eclipse.jdt.core.dom.CompilationUnit;
+
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
@@ -8,17 +15,10 @@ import java.nio.file.Path;
 import java.util.Hashtable;
 import java.util.List;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import com.google.common.base.Charsets;
-
 import static com.google.common.collect.Iterables.concat;
 import static com.google.common.collect.Iterables.transform;
 import static java.util.Arrays.asList;
+import static org.zwobble.couscous.util.ExtraLists.list;
 
 public class JavaParser {
     private final ASTParser parser;
@@ -41,7 +41,7 @@ public class JavaParser {
 
         String[] sourcePathArguments = Iterables.toArray(
             concat(
-                ImmutableList.of("/usr/lib/jvm/java-8-openjdk-amd64/jre/src.zip"),
+                list("/usr/lib/jvm/java-8-openjdk-amd64/jre/src.zip"),
                 transform(sourcePaths, Object::toString)),
             String.class);
 
diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
index 04aa3b8..6c1f503 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
@@ -4,8 +4,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import org.eclipse.jdt.core.dom.*;
 import org.zwobble.couscous.ast.*;
-import org.zwobble.couscous.ast.VariableDeclaration;
-import org.zwobble.couscous.ast.identifiers.Identifier;
 import org.zwobble.couscous.ast.sugar.Lambda;
 import org.zwobble.couscous.util.ExtraLists;
 
@@ -19,7 +17,6 @@ import java.util.function.Function;
 
 import static com.google.common.collect.Iterables.concat;
 import static com.google.common.collect.Iterables.transform;
-import static com.google.common.collect.Maps.immutableEntry;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static org.zwobble.couscous.ast.AnnotationNode.annotation;
@@ -27,13 +24,11 @@ import static org.zwobble.couscous.ast.AssignmentNode.assignStatement;
 import static org.zwobble.couscous.ast.ConstructorNode.constructor;
 import static org.zwobble.couscous.ast.FieldAccessNode.fieldAccess;
 import static org.zwobble.couscous.ast.FieldDeclarationNode.field;
-import static org.zwobble.couscous.ast.FormalArgumentNode.formalArg;
 import static org.zwobble.couscous.ast.ThisReferenceNode.thisReference;
 import static org.zwobble.couscous.ast.VariableReferenceNode.reference;
 import static org.zwobble.couscous.frontends.java.FreeVariables.findFreeVariables;
 import static org.zwobble.couscous.frontends.java.JavaTypes.*;
 import static org.zwobble.couscous.util.ExtraLists.*;
-import static org.zwobble.couscous.util.ExtraMaps.toMap;
 
 public class JavaReader {
     public static List<ClassNode> readClassFromFile(List<Path> sourcePaths, Path sourcePath) throws IOException {
@@ -99,7 +94,7 @@ public class JavaReader {
             name,
             superTypesAndSelf(functionalInterfaceMethod.getDeclaringClass()),
             emptyList(),
-            ImmutableList.of(method));
+            list(method));
 
         classes.add(closure.getClassNode());
         return closure;
diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaStatementReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaStatementReader.java
index 6a12a72..41809b7 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaStatementReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaStatementReader.java
@@ -35,16 +35,16 @@ class JavaStatementReader {
                 return readBlock((Block)statement);
 
             case ASTNode.RETURN_STATEMENT:
-                return asList(readReturnStatement((ReturnStatement)statement));
+                return list(readReturnStatement((ReturnStatement)statement));
 
             case ASTNode.EXPRESSION_STATEMENT:
-                return asList(readExpressionStatement((ExpressionStatement)statement));
+                return list(readExpressionStatement((ExpressionStatement)statement));
 
             case ASTNode.IF_STATEMENT:
-                return asList(readIfStatement((IfStatement)statement));
+                return list(readIfStatement((IfStatement)statement));
 
             case ASTNode.WHILE_STATEMENT:
-                return asList(readWhileStatement((WhileStatement)statement));
+                return list(readWhileStatement((WhileStatement)statement));
 
             case ASTNode.FOR_STATEMENT:
                 return readForStatement((ForStatement)statement);