summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2004-02-18 10:30:19 +0000
committerpaltherr <paltherr@epfl.ch>2004-02-18 10:30:19 +0000
commit8bb7d003877adc534a30e07d8aaa8ed263b09cfd (patch)
treefcf620d25dcd0ee7efa5e6715115bfd8edc0d030
parent27203be4cdcecefd0ad9ca6c4523f09a8b508037 (diff)
downloadscala-8bb7d003877adc534a30e07d8aaa8ed263b09cfd.tar.gz
scala-8bb7d003877adc534a30e07d8aaa8ed263b09cfd.tar.bz2
scala-8bb7d003877adc534a30e07d8aaa8ed263b09cfd.zip
- Changed scalaint to use the scala version of ...
- Changed scalaint to use the scala version of the compiler
-rw-r--r--sources/scala/tools/scalai/InterpreterShell.java2
-rw-r--r--sources/scala/tools/scalai/Main.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/sources/scala/tools/scalai/InterpreterShell.java b/sources/scala/tools/scalai/InterpreterShell.java
index fada060be7..a26d59c845 100644
--- a/sources/scala/tools/scalai/InterpreterShell.java
+++ b/sources/scala/tools/scalai/InterpreterShell.java
@@ -78,7 +78,7 @@ public class InterpreterShell {
this.reader = reader;
this.writer = writer;
this.matcher = matcher();
- this.global = new Global(command, true);
+ this.global = new scala.tools.scalac.Global$class(command, true);
this.interpreter = new Interpreter(global);
this.printer = new InterpreterPrinter(interpreter, writer);
this.lfiles = new String[0];
diff --git a/sources/scala/tools/scalai/Main.java b/sources/scala/tools/scalai/Main.java
index 967cf0f1f2..be19e26be6 100644
--- a/sources/scala/tools/scalai/Main.java
+++ b/sources/scala/tools/scalai/Main.java
@@ -9,7 +9,7 @@
package scala.tools.scalai;
-import scalac.CompilerPhases;
+import scala.tools.scalac.CompilerPhases$class;
import scalac.util.Reporter;
public class Main {
@@ -28,7 +28,7 @@ public class Main {
public static void main(String[] args) {
Reporter reporter = new Reporter();
InterpreterCommand command = new InterpreterCommand(
- PRODUCT, VERSION, reporter, new CompilerPhases());
+ PRODUCT, VERSION, reporter, new CompilerPhases$class());
if (command.parse(args)) {
InterpreterShell shell = new InterpreterShell(command);
shell.main(command.files.toArray(), command.script.value,