From 7831e3e7d08b1e62eead1fee69f746429bcb4d70 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 28 Nov 2015 17:25:07 +0000
Subject: Return list of formal arguments

---
 .../org/zwobble/couscous/frontends/java/JavaReader.java   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/main/java/org')

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 8ca1a5f..5c35f31 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
@@ -50,7 +50,7 @@ public class JavaReader {
         LambdaDeclarationAdaptor lambda = new LambdaDeclarationAdaptor(expression);
         List<VariableDeclaration> freeVariables = findFreeVariables(
             Stream.concat(
-                lambda.getFormalArguments(),
+                lambda.getFormalArguments().stream(),
                 lambda.getBody().stream()).collect(Collectors.toList()));
 
         ClassNode classNode = new ClassNodeBuilder(className)
@@ -153,7 +153,7 @@ public class JavaReader {
 
     private interface FunctionDeclaration {
         List<IAnnotationBinding> getAnnotations();
-        Stream<FormalArgumentNode> getFormalArguments();
+        List<FormalArgumentNode> getFormalArguments();
         // TODO: add tests around void methods
         List<StatementNode> getBody();
     }
@@ -176,10 +176,12 @@ public class JavaReader {
         }
 
         @Override
-        public Stream<FormalArgumentNode> getFormalArguments() {
+        public List<FormalArgumentNode> getFormalArguments() {
             @SuppressWarnings("unchecked")
             List<SingleVariableDeclaration> parameters = method.parameters();
-            return parameters.stream().map(parameter -> readSingleVariableDeclaration(parameter));
+            return parameters.stream()
+                .map(parameter -> readSingleVariableDeclaration(parameter))
+                .collect(Collectors.toList());
         }
 
         @Override
@@ -207,9 +209,10 @@ public class JavaReader {
         }
 
         @Override
-        public Stream<FormalArgumentNode> getFormalArguments() {
+        public List<FormalArgumentNode> getFormalArguments() {
             return ((List<?>)expression.parameters()).stream()
-                .map(this::readParameter);
+                .map(this::readParameter)
+                .collect(Collectors.toList());
         }
 
         private FormalArgumentNode readParameter(Object parameter) {
-- 
cgit v1.2.3