diff options
author | paltherr <paltherr@epfl.ch> | 2003-05-20 15:18:31 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2003-05-20 15:18:31 +0000 |
commit | 8f1264daa9a230a81dc4b0a9b9f2c4751ed24229 (patch) | |
tree | e57ef85d2994b380a3cb1eface4b34a2dac74419 /sources | |
parent | fb71c50b8f7566d53b058914beea7db286c9593f (diff) | |
download | scala-8f1264daa9a230a81dc4b0a9b9f2c4751ed24229.tar.gz scala-8f1264daa9a230a81dc4b0a9b9f2c4751ed24229.tar.bz2 scala-8f1264daa9a230a81dc4b0a9b9f2c4751ed24229.zip |
- Changed log method in class Debug
- Adapated calls to these log methods
- Added a log about symbol overrides
Diffstat (limited to 'sources')
-rw-r--r-- | sources/scala/tools/scalai/Environment.java | 15 | ||||
-rw-r--r-- | sources/scala/tools/scalai/ExpressionContext.java | 4 | ||||
-rw-r--r-- | sources/scala/tools/scalai/JavaMirror.java | 8 | ||||
-rw-r--r-- | sources/scalac/util/Debug.java | 22 |
4 files changed, 32 insertions, 17 deletions
diff --git a/sources/scala/tools/scalai/Environment.java b/sources/scala/tools/scalai/Environment.java index f221c8f4db..21360d1f50 100644 --- a/sources/scala/tools/scalai/Environment.java +++ b/sources/scala/tools/scalai/Environment.java @@ -51,7 +51,7 @@ public class Environment { public ClassDef insertClassDef(Symbol symbol, ClassDef classdef) { assert symbol.isType() : Debug.show(symbol); - assert Debug.log("insert classdef", symbol); + assert Debug.log("insert classdef: ", symbol); Object value = classdefs.put(symbol, classdef); assert value == null : Debug.show(symbol); assert !templates.containsKey(symbol) : Debug.show(symbol); @@ -60,7 +60,7 @@ public class Environment { private Template insertTemplate(Symbol symbol, Template template) { assert symbol.isType() : Debug.show(symbol); - assert Debug.log("insert template", symbol); + assert Debug.log("insert template: ", symbol); Object value = templates.put(symbol, template); assert !classdefs.containsKey(symbol) : Debug.show(symbol); assert value == null : Debug.show(symbol); @@ -69,7 +69,7 @@ public class Environment { public Function insertFunction(Symbol symbol, Function function) { assert symbol.isTerm() : Debug.show(symbol); - assert Debug.log("insert function", symbol); + assert Debug.log("insert function: ", symbol); Object value = functions.put(symbol, function); assert value == null : Debug.show(symbol); return function; @@ -77,7 +77,7 @@ public class Environment { public Variable insertVariable(Symbol symbol, Variable variable) { assert symbol.isTerm() : Debug.show(symbol); - assert Debug.log("insert variable", symbol); + assert Debug.log("insert variable: ", symbol); Object value = variables.put(symbol, variable); assert value == null : Debug.show(symbol); return variable; @@ -85,7 +85,7 @@ public class Environment { public Override insertOverride(Symbol symbol, Override override) { assert symbol.isTerm() : Debug.show(symbol); - assert Debug.log("insert override", symbol); + assert Debug.log("insert override: ", symbol); Object value = overrides.put(symbol, override); assert value == null : Debug.show(symbol); return override; @@ -150,7 +150,7 @@ public class Environment { } private void loadOwner(String what, Symbol symbol) { - assert Debug.log("search " + what, symbol); + assert Debug.log("search ", what, ": ", symbol); assert symbol.owner().isType() : Debug.show(symbol); assert!symbol.owner().isJava() : Debug.show(symbol); loadTemplate(symbol.owner()); @@ -176,7 +176,7 @@ public class Environment { // Private Methods - override loading private Override loadOwnerOverridesThenGet(Symbol symbol) { - assert Debug.log("search override", symbol); + assert Debug.log("search override: ", symbol); assert symbol.owner().isType() : Debug.show(symbol); loadTemplateOverrides(symbol.owner()); Object value = overrides.get(symbol); @@ -197,6 +197,7 @@ public class Environment { for (int i = 0; i < bases.length; i++) { Symbol overridden = symbol.overriddenSymbol(bases[i]); if (overridden == Symbol.NONE) continue; + assert Debug.log("update override: ", overridden, " -> ", symbol); override.insert(lookupOverride(overridden)); } insertOverride(symbol, override); diff --git a/sources/scala/tools/scalai/ExpressionContext.java b/sources/scala/tools/scalai/ExpressionContext.java index dfc47c4401..54c60e29e8 100644 --- a/sources/scala/tools/scalai/ExpressionContext.java +++ b/sources/scala/tools/scalai/ExpressionContext.java @@ -45,14 +45,14 @@ public class ExpressionContext { public Function insertLabel(Symbol symbol) { Function function = Function.Label(symbol); - assert Debug.log("insert label ", Debug.show(symbol)); + assert Debug.log("insert label : ", symbol); assert !functions.containsKey(symbol) : Debug.show(symbol); functions.put(symbol, function); return function; } public Variable insertVariable(Symbol symbol, Variable variable) { - assert Debug.log("insert variable", Debug.show(symbol)); + assert Debug.log("insert variable: ", symbol); assert !variables.containsKey(symbol) : Debug.show(symbol); variables.put(symbol, variable); return variable; diff --git a/sources/scala/tools/scalai/JavaMirror.java b/sources/scala/tools/scalai/JavaMirror.java index b84a18dd36..87889bad73 100644 --- a/sources/scala/tools/scalai/JavaMirror.java +++ b/sources/scala/tools/scalai/JavaMirror.java @@ -137,7 +137,7 @@ public class JavaMirror { Object value = classes.get(symbol); if (value != null) return (Class)value; Class mirror = getClass0(symbol); - assert Debug.log("java mirror", Debug.show(symbol) + " -> " + mirror); + assert Debug.log("java mirror: ", symbol, " -> ", mirror); classes.put(symbol, mirror); return mirror; } @@ -157,7 +157,7 @@ public class JavaMirror { Object value = fields.get(symbol); if (value != null) return (Field)value; Field mirror = getField0(symbol); - assert Debug.log("java mirror", Debug.show(symbol) + " -> " + mirror); + assert Debug.log("java mirror: ", symbol, " -> ", mirror); fields.put(symbol, mirror); return mirror; } @@ -178,7 +178,7 @@ public class JavaMirror { Object value = methods.get(symbol); if (value != null) return (Method)value; Method mirror = getMethod0(symbol); - assert Debug.log("java mirror", Debug.show(symbol) + " -> " + mirror); + assert Debug.log("java mirror: ", symbol, " -> ", mirror); methods.put(symbol, mirror); return mirror; } @@ -200,7 +200,7 @@ public class JavaMirror { Object value = constructors.get(symbol); if (value != null) return (Constructor)value; Constructor mirror = getConstructor0(symbol); - assert Debug.log("java mirror", Debug.show(symbol) + " -> " + mirror); + assert Debug.log("java mirror: ", symbol, " -> ", mirror); constructors.put(symbol, mirror); return mirror; } diff --git a/sources/scalac/util/Debug.java b/sources/scalac/util/Debug.java index 24e087b3bc..a2bf0d4097 100644 --- a/sources/scalac/util/Debug.java +++ b/sources/scalac/util/Debug.java @@ -72,12 +72,26 @@ public abstract class Debug { //######################################################################## // Debug interface - log - public static boolean log(String message) { - return Global.instance.log(message); + public static boolean log(Object a) { + return log(new Object[] {a}); } - public static boolean log(String message, Object object) { - return log(message + ": " + show(object)); + public static boolean log(Object a, Object b) { + return log(new Object[] {a, b}); + } + + public static boolean log(Object a, Object b, Object c) { + return log(new Object[] {a, b, c}); + } + + public static boolean log(Object a, Object b, Object c, Object d) { + return log(new Object[] {a, b, c, d}); + } + + public static boolean log(Object[] args) { + StringBuffer buffer = new StringBuffer(); + for (int i = 0; i < args.length; i++) append(buffer, args[i]); + return Global.instance.log(buffer.toString()); } //######################################################################## |