summaryrefslogtreecommitdiff
path: root/sources/scalac/transformer/matching
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2004-03-06 14:44:20 +0000
committerpaltherr <paltherr@epfl.ch>2004-03-06 14:44:20 +0000
commit45df364c3beed61dbea70b1e1e1cc8420968fa66 (patch)
treed90b934302b461c806a1e072990f2b25eb9aac88 /sources/scalac/transformer/matching
parent46e374a5c070305dd8d0fd6fb4f423406d84d6bd (diff)
downloadscala-45df364c3beed61dbea70b1e1e1cc8420968fa66.tar.gz
scala-45df364c3beed61dbea70b1e1e1cc8420968fa66.tar.bz2
scala-45df364c3beed61dbea70b1e1e1cc8420968fa66.zip
- Removed alias scala.String
- Renamed in Definitions: OBJECT_CLASS into SCALAOBJECT_CLASS - Renamed in Definitions: JAVA_<X> into <X> Renamed in Definitions: - ANYREF_SYNCHRONIZED into OBJECT_SYNCHRONIZED
Diffstat (limited to 'sources/scalac/transformer/matching')
-rw-r--r--sources/scalac/transformer/matching/PatternMatcher.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/scalac/transformer/matching/PatternMatcher.java b/sources/scalac/transformer/matching/PatternMatcher.java
index 53365bbb38..935a3ac93e 100644
--- a/sources/scalac/transformer/matching/PatternMatcher.java
+++ b/sources/scalac/transformer/matching/PatternMatcher.java
@@ -815,7 +815,7 @@ public class PatternMatcher extends PatternTool {
}
protected boolean optimize(Type selType, PatternNode alternatives) {
- if (!optimize || !selType.isSubType(defs.OBJECT_TYPE()))
+ if (!optimize || !selType.isSubType(defs.SCALAOBJECT_TYPE()))
return false;
int cases = 0;
while (alternatives != null) {
@@ -898,7 +898,7 @@ public class PatternMatcher extends PatternTool {
cases = cases.next;
}
return gen.Switch(
- gen.mkApply__(gen.Select(selector.duplicate(), defs.OBJECT_TAG())),
+ gen.mkApply__(gen.Select(selector.duplicate(), defs.SCALAOBJECT_TAG())),
tags,
bodies,
(defaultCase == null) ? gen.mkBooleanLit(selector.pos, false)