summaryrefslogtreecommitdiff
path: root/sources
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2003-06-18 15:56:54 +0000
committerpaltherr <paltherr@epfl.ch>2003-06-18 15:56:54 +0000
commit4a809abfa53cdfad182a245f479d29e401b5f767 (patch)
tree3fbc9dea313013a9ea94c2da8d4101a5ac5acca2 /sources
parentd647b1e479db5f4ec643ddaba4232dff98bc7872 (diff)
downloadscala-4a809abfa53cdfad182a245f479d29e401b5f767.tar.gz
scala-4a809abfa53cdfad182a245f479d29e401b5f767.tar.bz2
scala-4a809abfa53cdfad182a245f479d29e401b5f767.zip
- Fixed evaluation of IsScala
Diffstat (limited to 'sources')
-rw-r--r--sources/scala/tools/scalai/Evaluator.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/scala/tools/scalai/Evaluator.java b/sources/scala/tools/scalai/Evaluator.java
index 60eb4dd6ee..6ee618f252 100644
--- a/sources/scala/tools/scalai/Evaluator.java
+++ b/sources/scala/tools/scalai/Evaluator.java
@@ -166,7 +166,7 @@ public class Evaluator {
case IsScala(Code target, Symbol symbol):
Object object = evaluate(target);
- if (object == null) return Boolean.FALSE;
+ if (object == null || !isScalaObject(object)) return Boolean.FALSE;
Symbol actual = getScalaObject(object).template.getSymbol();
return new Boolean(actual.isSubClass(symbol));