- Changed methods Debug.show to add separators ...

- Changed methods Debug.show to add separators between arguments

8 files changed, 26 insertions, 32 deletions

diff --git a/sources/scalac/symtab/Definitions.java b/sources/scalac/symtab/Definitions.java
index fa057c7ee4..943a8e463f 100644
--- a/sources/scalac/symtab/Definitions.java
+++ b/sources/scalac/symtab/Definitions.java
@@ -895,7 +895,7 @@ public class Definitions {
      */
     private Symbol loadTerm(Symbol clasz, Name name, Type[] vargs) {
         Symbol sym = clasz.lookup(name);
-        assert sym.isTerm(): Debug.show(clasz,"."+name+" - ",vargs," -> ",sym);
+        assert sym.isTerm(): Debug.show(clasz, name, vargs, sym);
         Symbol[] alts = sym.alternativeSymbols();
         for (int i = 0; i < alts.length; i++) {
             switch (alts[i].type()) {
@@ -907,7 +907,7 @@ public class Definitions {
                 continue;
             }
         }
-        throw Debug.abort(Debug.show(clasz,"."+name+" - ",vargs," -> ",alts));
+        throw Debug.abort(Debug.show(clasz, name, vargs, alts));
     }
 
     //########################################################################
diff --git a/sources/scalac/symtab/Symbol.java b/sources/scalac/symtab/Symbol.java
index 828a680e2e..c6c38c33bb 100644
--- a/sources/scalac/symtab/Symbol.java
+++ b/sources/scalac/symtab/Symbol.java
@@ -1330,7 +1330,7 @@ public abstract class Symbol implements Modifiers, Kinds {
     public final Type staticType(Type[] args) {
         Type prefix = owner.staticPrefix();
         if (isType()) return Type.typeRef(prefix, this, args);
-        assert args.length == 0: Debug.show(this, " - ", args);
+        assert args.length == 0: Debug.show(this, args);
         return prefix.memberType(this);
     }
 
diff --git a/sources/scalac/symtab/Type.java b/sources/scalac/symtab/Type.java
index 7d23ab99e3..8f57093823 100644
--- a/sources/scalac/symtab/Type.java
+++ b/sources/scalac/symtab/Type.java
@@ -218,10 +218,10 @@ public class Type implements Modifiers, Kinds, TypeTags, EntryTags {
             if (args.length == params.length)
                 return pre.memberInfo(sym).subst(params, args);
             assert args.length == 0 || args.length == params.length:
-                Debug.show(pre, " - ", sym, " - ", args, " - ", params);
+                Debug.show(pre, sym, args, params);
         }
         assert isLegalTypeRef(pre, sym, args):
-            Debug.show(pre, " - ", sym, " - ", args, " - ", sym.typeParams());
+            Debug.show(pre, sym, args, sym.typeParams());
         return new ExtTypeRef(pre, sym, args);
     }
     private static boolean isLegalTypeRef(Type pre, Symbol sym, Type[] args) {
diff --git a/sources/scalac/symtab/classfile/CLRClassParser.java b/sources/scalac/symtab/classfile/CLRClassParser.java
index 1f71f2aeb0..c7f3e85d95 100644
--- a/sources/scalac/symtab/classfile/CLRClassParser.java
+++ b/sources/scalac/symtab/classfile/CLRClassParser.java
@@ -344,7 +344,7 @@ public class CLRClassParser extends SymbolLoader {
             return AConstant.DOUBLE(((Number)value).doubleValue());
         if (base == global.definitions.STRING_CLASS)
             return AConstant.STRING((String)value);
-    	throw Debug.abort("illegal value", Debug.show(value, " - ", base));
+    	throw Debug.abort("illegal value", Debug.show(value, base));
     }
 
     protected static int translateAttributes(Type type) {
diff --git a/sources/scalac/transformer/AddInterfaces.java b/sources/scalac/transformer/AddInterfaces.java
index 53187d5018..82bd3d4fdd 100644
--- a/sources/scalac/transformer/AddInterfaces.java
+++ b/sources/scalac/transformer/AddInterfaces.java
@@ -252,7 +252,7 @@ public class AddInterfaces extends GenTransformer {
     private Symbol getClassVParam(Symbol vparam) {
         if (paramSubst == null) return vparam;
         Symbol clone = (Symbol)paramSubst.lookupSymbol(vparam);
-        assert clone != null: Debug.show(vparam, " - ", clasz, " - ", member);
+        assert clone != null: Debug.show(vparam, clasz, member);
         return clone;
     }
 
diff --git a/sources/scalac/transformer/ExpandMixinsPhase.java b/sources/scalac/transformer/ExpandMixinsPhase.java
index 07e514fcfc..410a19f56a 100644
--- a/sources/scalac/transformer/ExpandMixinsPhase.java
+++ b/sources/scalac/transformer/ExpandMixinsPhase.java
@@ -259,11 +259,10 @@ public class ExpandMixinsPhase extends Phase {
                 Symbol override = member.overridingSymbol(parents[i]);
                 global.prevPhase();
                 assert !override.isNone():
-                    Debug.show(member, " -- ", clasz, " -- ", parents[i]);
+                    Debug.show(member, clasz, parents[i]);
                 if (i == 0) return override;
                 Symbol clone = (Symbol)clones.get(override);
-                assert clone != null:
-                    Debug.show(member, " -- ", override, " -- ", clasz);
+                assert clone != null: Debug.show(member, override, clasz);
                 return clone;
             }
             // !!! double loop
@@ -273,14 +272,13 @@ public class ExpandMixinsPhase extends Phase {
                 Symbol override = member.overridingSymbol(parents[i]);
                 //global.prevPhase();
                 assert !override.isNone():
-                    Debug.show(member, " -- ", clasz, " -- ", parents[i]);
+                    Debug.show(member, clasz, parents[i]);
                 if (i == 0) return override;
                 Symbol clone = (Symbol)clones.get(override);
-                assert clone != null:
-                    Debug.show(member, " -- ", override, " -- ", clasz);
+                assert clone != null: Debug.show(member, override, clasz);
                 return clone;
             }
-            throw Debug.abort(Debug.show(member, " -- ", clasz));
+            throw Debug.abort(Debug.show(member, clasz));
         }
         public Tree transform(Tree tree) {
             switch (tree) {
diff --git a/sources/scalac/transformer/ExplicitOuterClassesPhase.java b/sources/scalac/transformer/ExplicitOuterClassesPhase.java
index caf52ec499..4f0ed688f5 100644
--- a/sources/scalac/transformer/ExplicitOuterClassesPhase.java
+++ b/sources/scalac/transformer/ExplicitOuterClassesPhase.java
@@ -100,7 +100,7 @@ public class ExplicitOuterClassesPhase extends Phase {
             tparams = Type.symbol(self.typeArgs());
             for (int i = 0; i < tparams.length; i++)
                 assert tparams[i].isParameter() && tparams[i].owner() == symbol:
-                    Debug.show(symbol, " -- ", clasz, " -- ", self);
+                    Debug.show(symbol, clasz, self);
             type = Type.MethodType(vparams, result);
             if (tparams.length != 0) type = Type.PolyType(tparams, type);
         } else {
@@ -548,7 +548,7 @@ public class ExplicitOuterClassesPhase extends Phase {
                     ? context.clasz == member.owner()
                     // !!! This is incorrect without static access methods
                     : context.clasz.isSubClass(member.owner())) break;
-            assert context != null: Debug.show(this.context, " - ", member);
+            assert context != null: Debug.show(this.context, member);
             if (context == this.context) return member;
             Map table = svper != null ? context.supers : context.selfs;
             Symbol access = (Symbol)table.get(member);
@@ -601,9 +601,9 @@ public class ExplicitOuterClassesPhase extends Phase {
             for (int i = 0; i < context.context.outers.length; i++)
                 if (context.context.outers[i].clasz == clasz)
                     tcontext = context.context.outers[i];
-            assert tcontext != null: Debug.show(clasz, " -- ", context.clasz);
+            assert tcontext != null: Debug.show(clasz, context.clasz);
             if (tcontext.isStable) {
-                throw Debug.abort(Debug.show(clasz, " - ", context.clasz));
+                throw Debug.abort(Debug.show(clasz, context.clasz));
                 /*
                 if (!clasz.owner().isPackageClass()) {
                     Tree qualifier = genOuterRef(pos,tcontext.outers[0].clasz);
@@ -615,7 +615,7 @@ public class ExplicitOuterClassesPhase extends Phase {
                 */
             } else {
                 assert context.context.vlink != null:
-                    Debug.show(clasz, " -- ", context.clasz);
+                    Debug.show(clasz, context.clasz);
                 Tree tree = context.method == null || context.method.isConstructor()
                     ? gen.Ident(pos, context.context.vlink)
                     : gen.Select(gen.This(pos, context.clasz), context.context.context.vfield);
@@ -623,11 +623,11 @@ public class ExplicitOuterClassesPhase extends Phase {
                 while (true) {
                     context = context.outer;
                     assert context != null:
-                        Debug.show(clasz, " -- ", this.context.clasz);
+                        Debug.show(clasz, this.context.clasz);
                     while (context.context.isStable) {
                         context = context.outer;
                         assert context != null:
-                            Debug.show(clasz, " -- ", this.context.clasz);
+                            Debug.show(clasz, this.context.clasz);
                     }
                     if (context.clasz == clasz) return tree;
                     Symbol access = getAccessSymbol(context.context.context.vfield, null);
diff --git a/sources/scalac/util/Debug.java b/sources/scalac/util/Debug.java
index efa1cab58f..60697d72b7 100644
--- a/sources/scalac/util/Debug.java
+++ b/sources/scalac/util/Debug.java
@@ -90,7 +90,7 @@ public abstract class Debug {
     }
 
     public static boolean logAll(Object[] args) {
-        return Global.instance.log(showAll(args));
+        return Global.instance.log(showAll(args, true));
     }
 
     //########################################################################
@@ -193,9 +193,14 @@ public abstract class Debug {
     }
 
     public static String showAll(Object[] args) {
+        return showAll(args, false);
+    }
+
+    public static String showAll(Object[] args, boolean nosep) {
         if (args == null) return "null";
         StringBuffer buffer = new StringBuffer();
-        for (int i = 0; i < args.length; i++) append(buffer, args[i]);
+        for (int i = 0; i < args.length; i++)
+            append(nosep || i == 0 ? buffer : buffer.append(" - "), args[i]);
         return buffer.toString();
     }
 
@@ -389,15 +394,6 @@ public interface DebugHandler {
 }
 
 public abstract class DebugAbstractHandler implements DebugHandler {
-
-    //########################################################################
-    // DebugAbstractHandler interface
-
-    public String show(Object that) {
-        return Debug.show(that, this);
-    }
-
-    //########################################################################
 }
 
 public class DebugDefaultHandler extends DebugAbstractHandler {