- Removed use of Symbol.fullName

3 files changed, 17 insertions, 19 deletions

diff --git a/sources/scala/tools/scalai/Evaluator.java b/sources/scala/tools/scalai/Evaluator.java
index a14040bc1a..cb2c77e89b 100644
--- a/sources/scala/tools/scalai/Evaluator.java
+++ b/sources/scala/tools/scalai/Evaluator.java
@@ -21,6 +21,7 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 
+import ch.epfl.lamp.util.Position;
 import ch.epfl.lamp.util.SourceFile;
 
 import scala.runtime.RunTime;
@@ -133,7 +134,16 @@ public class Evaluator {
                 return throw_(exception, "trace");
             }
         } catch (EvaluatorException exception) {
-            exception.addScalaCall(stack.symbol, stack.source, stack.pos);
+            StringBuffer buffer = new StringBuffer();
+            buffer.append(getClassName(stack.symbol.owner()));
+            buffer.append('.');
+            buffer.append(stack.symbol.nameString());
+            buffer.append('(');
+            buffer.append(stack.source.getShortName());
+            int line = Position.line(stack.pos);
+            if (line != 0) buffer.append(':').append(line);
+            buffer.append(")");
+            exception.addScalaCall(buffer.toString());
             throw exception;
         } finally {
             stack = stack.stack;
@@ -547,7 +557,7 @@ public class Evaluator {
         for (Iterator i = scalas.iterator(); i.hasNext(); separator = true) {
             if (separator) buffer.append(" | ");
             ScalaTemplate scala = (ScalaTemplate)i.next();
-            buffer.append(scala.getSymbol().fullName());
+            buffer.append(getClassName(scala.getSymbol()));
         }
         if (scalas.size() != 1) buffer.append(')');
         return buffer.toString();
@@ -556,7 +566,7 @@ public class Evaluator {
     private String getClassName(Type type) {
         switch (type) {
         case TypeRef(_, Symbol symbol, _):
-            return symbol.fullNameString();
+            return getClassName(symbol);
         case UnboxedArrayType(Type element):
             return getClassName(element) + "[]";
         case UnboxedType(_):
diff --git a/sources/scala/tools/scalai/EvaluatorException.java b/sources/scala/tools/scalai/EvaluatorException.java
index e0989d58b2..f8c32cca8b 100644
--- a/sources/scala/tools/scalai/EvaluatorException.java
+++ b/sources/scala/tools/scalai/EvaluatorException.java
@@ -13,9 +13,6 @@ import java.io.PrintWriter;
 import java.util.List;
 import java.util.ArrayList;
 
-import ch.epfl.lamp.util.Position;
-import ch.epfl.lamp.util.SourceFile;
-
 import scalac.Global;
 import scalac.symtab.Symbol;
 
@@ -51,17 +48,8 @@ public class EvaluatorException extends RuntimeException {
         return cause;
     }
 
-    public void addScalaCall(Symbol method, SourceFile source, int pos) {
-        StringBuffer buffer = new StringBuffer();
-        buffer.append(method.owner().fullNameString());
-        buffer.append('.');
-        buffer.append(method.nameString());
-        buffer.append('(');
-        buffer.append(source.getShortName());
-        int line = Position.line(pos);
-        if (line != 0) buffer.append(':').append(line);
-        buffer.append(")");
-        stack.add(buffer);
+    public void addScalaCall(String location) {
+        stack.add(location);
     }
 
     public void addScalaEntryPoint() {
diff --git a/sources/scala/tools/scalai/ScalaTemplate.java b/sources/scala/tools/scalai/ScalaTemplate.java
index 7024443037..3edb48e189 100644
--- a/sources/scala/tools/scalai/ScalaTemplate.java
+++ b/sources/scala/tools/scalai/ScalaTemplate.java
@@ -46,8 +46,8 @@ public class ScalaTemplate {
     //########################################################################
     // Public Methods - ScalaTemplate interface
 
-    public Name getName() {
-        return symbol.fullName();
+    public String getName() {
+        return evaluator.getClassName(symbol);
     }
 
     public Symbol getSymbol() {