- Forced loading of Interpreter.scala only with...

- Forced loading of Interpreter.scala only with siris

3 files changed, 4 insertions, 4 deletions

diff --git a/sources/scala/Interpreter.scala b/sources/scala/Interpreter.scala
index 37b4e71108..a6b3f4a4c3 100644
--- a/sources/scala/Interpreter.scala
+++ b/sources/scala/Interpreter.scala
@@ -12,6 +12,8 @@ package scala;
 
 module Interpreter {
 
+  def initialize: Boolean = true;
+
   def printValue(value: Any): Unit = {
     if (value == null)
       java.lang.System.out.print("null");
diff --git a/sources/scala/tools/scalai/Interpreter.java b/sources/scala/tools/scalai/Interpreter.java
index 607b21cf0a..e5cfcc0702 100644
--- a/sources/scala/tools/scalai/Interpreter.java
+++ b/sources/scala/tools/scalai/Interpreter.java
@@ -113,9 +113,9 @@ public class Interpreter {
         if (interactive) showBanner();
         if (program.length > 0) load(lfiles = program);
         if (global.reporter.errors() == 0 && main != null) call(main, args);
-        // Compute something to start compiler and force loading of Predef
+        // Compute something to force loading of Predef & Interpreter
         if (interactive && program.length == 0 && main == null)
-            load("module $init$ {}");
+            load("module $init$ { Interpreter.initialize }");
         if (interactive) while (handle(read()));
         global.stop("total");
         if (!interactive) global.reporter.printSummary();
diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java
index 130f41bd1d..15eb81baf8 100644
--- a/sources/scalac/Global.java
+++ b/sources/scalac/Global.java
@@ -325,8 +325,6 @@ public class  Global {
     private List imports = new ArrayList();
 
     private void fix1() {
-        // make sure that Interpreter.scala is compiled
-        if (target == TARGET_INT) SHOW_DEFINITION();
         for (int i = 0; i < units.length; i++) {
             if (units[i].console) fix1(units[i]);
         }