From 1010a324f20dfa1221f506d67700d748e6ed79d4 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Mon, 15 Jul 2013 17:51:44 -0700
Subject: SI-7488 REPL javap finds new style delayedEndpoint

The REPL :java -app command is a convenience to locate
the body of DelayedInit code.  Now it will look for
new style delayedEndpoints on the class before it
falls back to showing the apply method of the
delayedInit$body closure.

```
apm@mara:~/tmp$ skala
Welcome to Scala version 2.11.0-20130711-153246-eb1c3137f5 (OpenJDK 64-Bit Server VM, Java 1.7.0_21).
Type in expressions to have them evaluated.
Type :help for more information.

scala> :javap -pv -app delayed.C
  public final void delayedEndpoint$delayed$C$1();
    flags: ACC_PUBLIC, ACC_FINAL
    Code:
      stack=2, locals=1, args_size=1
         0: getstatic     #29                 // Field scala/Predef$.MODULE$:Lscala/Predef$;
         3: ldc           #31                 // String this is the initialization code of C
         5: invokevirtual #35                 // Method scala/Predef$.println:(Ljava/lang/Object;)V
         8: return
      LocalVariableTable:
        Start  Length  Slot  Name   Signature
               0       9     0  this   Ldelayed/C;
      LineNumberTable:
        line 11: 0

scala> :q
apm@mara:~/tmp$ rm delayed/*.class
apm@mara:~/tmp$ scalac delayed.scala
apm@mara:~/tmp$ skala
Welcome to Scala version 2.11.0-20130711-153246-eb1c3137f5 (OpenJDK 64-Bit Server VM, Java 1.7.0_21).
Type in expressions to have them evaluated.
Type :help for more information.

scala> :javap -pv -app delayed.C
  public final java.lang.Object apply();
    flags: ACC_PUBLIC, ACC_FINAL
    Code:
      stack=2, locals=1, args_size=1
         0: getstatic     #13                 // Field scala/Predef$.MODULE$:Lscala/Predef$;
         3: ldc           #15                 // String this is the initialization code of C
         5: invokevirtual #19                 // Method scala/Predef$.println:(Ljava/lang/Object;)V
         8: getstatic     #25                 // Field scala/runtime/BoxedUnit.UNIT:Lscala/runtime/BoxedUnit;
        11: areturn
      LocalVariableTable:
        Start  Length  Slot  Name   Signature
               0      12     0  this   Ldelayed/C$delayedInit$body;
      LineNumberTable:
        line 11: 0
        line 10: 8
```
---
 test/files/run/repl-javap-app.check | 39 +++++++++++++++++++++++++++++++++++++
 test/files/run/repl-javap-app.scala | 10 ++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 test/files/run/repl-javap-app.check
 create mode 100644 test/files/run/repl-javap-app.scala

(limited to 'test')

diff --git a/test/files/run/repl-javap-app.check b/test/files/run/repl-javap-app.check
new file mode 100644
index 0000000000..db1f09b977
--- /dev/null
+++ b/test/files/run/repl-javap-app.check
@@ -0,0 +1,39 @@
+#partest java6
+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> :javap -app MyApp$
+public final void delayedEndpoint$MyApp$1();
+  Code:
+   Stack=2, Locals=1, Args_size=1
+   0: getstatic   #61; //Field scala/Console$.MODULE$:Lscala/Console$;
+   3: ldc #63; //String Hello, delayed world.
+   5: invokevirtual   #67; //Method scala/Console$.println:(Ljava/lang/Object;)V
+   8: return
+  LocalVariableTable: 
+   Start  Length  Slot  Name   Signature
+   0      9      0    this       LMyApp$;
+}
+
+scala> 
+#partest !java6
+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> :javap -app MyApp$
+  public final void delayedEndpoint$MyApp$1();
+    flags: ACC_PUBLIC, ACC_FINAL
+    Code:
+      stack=2, locals=1, args_size=1
+         0: getstatic     #61                 // Field scala/Console$.MODULE$:Lscala/Console$;
+         3: ldc           #63                 // String Hello, delayed world.
+         5: invokevirtual #67                 // Method scala/Console$.println:(Ljava/lang/Object;)V
+         8: return        
+      LocalVariableTable:
+        Start  Length  Slot  Name   Signature
+               0       9     0  this   LMyApp$;
+      LineNumberTable:
+        line 5: 0
+}
+
+scala> 
diff --git a/test/files/run/repl-javap-app.scala b/test/files/run/repl-javap-app.scala
new file mode 100644
index 0000000000..be04920be1
--- /dev/null
+++ b/test/files/run/repl-javap-app.scala
@@ -0,0 +1,10 @@
+
+import scala.tools.partest.ReplTest
+
+object MyApp extends App {
+  Console println "Hello, delayed world."
+}
+
+object Test extends ReplTest {
+  def code = ":javap -app MyApp$"
+}
-- 
cgit v1.2.3