From 36b8ac144eed4fa94c8dd559b449604b0255ffb4 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sat, 17 Oct 2015 16:23:14 +0100
Subject: Java: read implicit static method calls

---
 .../org/zwobble/couscous/frontends/java/JavaReader.java | 17 ++++++++++++-----
 .../couscous/tests/frontends/java/JavaReaderTests.java  | 16 ++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

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 c3898c5..d0b3f17 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java
@@ -15,6 +15,7 @@ import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
 import org.eclipse.jdt.core.dom.IVariableBinding;
 import org.eclipse.jdt.core.dom.MethodInvocation;
+import org.eclipse.jdt.core.dom.Modifier;
 import org.eclipse.jdt.core.dom.NumberLiteral;
 import org.eclipse.jdt.core.dom.ReturnStatement;
 import org.eclipse.jdt.core.dom.SimpleName;
@@ -163,11 +164,17 @@ public class JavaReader {
         val arguments = readArguments(expression.arguments());
         if (expression.getExpression() == null) {
             val methodBinding = expression.resolveMethodBinding();
-            return MethodCallNode.methodCall(
-                ThisReferenceNode.thisReference(typeOf(methodBinding.getDeclaringClass())),
-                methodName,
-                arguments,
-                typeOf(expression));
+            val receiverType = typeOf(methodBinding.getDeclaringClass());
+            if ((methodBinding.getModifiers() & Modifier.STATIC) != 0) {
+                return StaticMethodCallNode.staticMethodCall(
+                    receiverType, methodName, arguments);
+            } else {
+                return MethodCallNode.methodCall(
+                    ThisReferenceNode.thisReference(receiverType),
+                    methodName,
+                    arguments,
+                    typeOf(expression));   
+            }
         } else if (expression.getExpression().getNodeType() == ASTNode.SIMPLE_NAME) {
             val receiver = expression.getExpression();
             return StaticMethodCallNode.staticMethodCall(typeOf(receiver), methodName, arguments);
diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java
index 0864b74..c62b9a7 100644
--- a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java
@@ -100,6 +100,22 @@ public class JavaReaderTests {
             readExpression("Integer.parseInt(\"42\")"));
     }
     
+    @Test
+    public void canReadImplicitStaticMethodCalls() {
+        val classNode = readClass(
+            "public static String loop() {" +
+            "    return loop();" +
+            "}");
+        val returnNode = (ReturnNode) classNode.getMethods().get(0).getBody().get(0);
+        
+        assertEquals(
+            staticMethodCall(
+                TypeName.of("com.example.Example"),
+                "loop",
+                asList()),
+            returnNode.getValue());
+    }
+    
     @Test
     public void canReadConstructorCalls() {
         assertEquals(
-- 
cgit v1.2.3