summaryrefslogtreecommitdiff
path: root/sources
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2005-07-27 17:26:55 +0000
committermichelou <michelou@epfl.ch>2005-07-27 17:26:55 +0000
commit2f19f317f455c81de6fb9f1f99409aec4e49ea6b (patch)
treeaa0910bec7e5cee6305fbeb7090697296078fb9b /sources
parent9be1f597f23faa9980cdf55d65d0bdce5917b901 (diff)
downloadscala-2f19f317f455c81de6fb9f1f99409aec4e49ea6b.tar.gz
scala-2f19f317f455c81de6fb9f1f99409aec4e49ea6b.tar.bz2
scala-2f19f317f455c81de6fb9f1f99409aec4e49ea6b.zip
- updated copyright.
Diffstat (limited to 'sources')
-rw-r--r--sources/scala/tools/scalai/Interpreter.java12
-rw-r--r--sources/scala/tools/scalai/InterpreterShell.java16
2 files changed, 14 insertions, 14 deletions
diff --git a/sources/scala/tools/scalai/Interpreter.java b/sources/scala/tools/scalai/Interpreter.java
index 6a6895272a..066e865454 100644
--- a/sources/scala/tools/scalai/Interpreter.java
+++ b/sources/scala/tools/scalai/Interpreter.java
@@ -1,6 +1,6 @@
/* ____ ____ ____ ____ ______ *\
** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala **
-** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL **
+** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002-2005, LAMP/EPFL **
** /_____/\____/\___/\____/____/ **
\* */
@@ -9,22 +9,22 @@
package scala.tools.scalai;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
+import scala.runtime.InterpreterSupport;
+import scala.runtime.InterpreterSupport.EvaluationResult;
import scala.tools.util.Position;
import scalac.CompilationUnit;
import scalac.Global;
import scalac.Phase;
import scalac.symtab.Definitions;
+import scalac.symtab.Modifiers;
import scalac.symtab.Symbol;
import scalac.symtab.Type;
-import scalac.symtab.Modifiers;
import scalac.util.Name;
-import scala.runtime.InterpreterSupport;
-import scala.runtime.InterpreterSupport.EvaluationResult;
public class Interpreter {
@@ -46,7 +46,7 @@ public class Interpreter {
public Interpreter(Global global) {
this.global = global;
- Map templates = new HashMap();
+ Map/*<Class,Set<ScalaTemplate>>*/ templates = new HashMap();
this.evaluator = new Evaluator(templates);
this.compiler = new Compiler(global, templates, evaluator); // !!!
}
diff --git a/sources/scala/tools/scalai/InterpreterShell.java b/sources/scala/tools/scalai/InterpreterShell.java
index 8bd4bb40b3..e032392b0d 100644
--- a/sources/scala/tools/scalai/InterpreterShell.java
+++ b/sources/scala/tools/scalai/InterpreterShell.java
@@ -1,6 +1,6 @@
/* ____ ____ ____ ____ ______ *\
** / __// __ \/ __// __ \/ ____/ SOcos COmpiles Scala **
-** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002, LAMP/EPFL **
+** __\_ \/ /_/ / /__/ /_/ /\_ \ (c) 2002-2005, LAMP/EPFL **
** /_____/\____/\___/\____/____/ **
\* */
@@ -8,23 +8,23 @@
package scala.tools.scalai;
+import java.io.BufferedReader;
import java.io.FileReader;
import java.io.InputStreamReader;
-import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.io.PushbackReader;
import java.io.StringReader;
-import java.io.PrintWriter;
-import java.io.IOException;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
import scala.runtime.InterpreterSupport;
+import scalac.Global;
import scalac.util.Debug;
-import scalac.util.Strings;
import scalac.util.PrefixMatcher;
+import scalac.util.Strings;
-import scalac.Global;
public class InterpreterShell {
@@ -33,7 +33,7 @@ public class InterpreterShell {
public static final String PRODUCT = Main.PRODUCT;
public static final String VERSION = Main.VERSION;
- public static final String COPYRIGHT = "(c) 2002-04, LAMP/EPFL";
+ public static final String COPYRIGHT = "(c) 2002-05, LAMP/EPFL";
//########################################################################
// Private Constants