summaryrefslogtreecommitdiff
path: root/sources/meta
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2003-05-01 09:01:16 +0000
committerMartin Odersky <odersky@gmail.com>2003-05-01 09:01:16 +0000
commita5d85a9e9620699775e77ca0bfc4f1390e05229f (patch)
treebf493aa060133fb138dbc805b7ebf1ca7359fd7b /sources/meta
parentd02f69f6023d73f6c6a956db5fbd9dd9dd7c91d2 (diff)
downloadscala-a5d85a9e9620699775e77ca0bfc4f1390e05229f.tar.gz
scala-a5d85a9e9620699775e77ca0bfc4f1390e05229f.tar.bz2
scala-a5d85a9e9620699775e77ca0bfc4f1390e05229f.zip
*** empty log message ***
Diffstat (limited to 'sources/meta')
-rw-r--r--sources/meta/scala/MetaFunction.java2
-rw-r--r--sources/meta/scalac/ast/Tree.java8
2 files changed, 2 insertions, 8 deletions
diff --git a/sources/meta/scala/MetaFunction.java b/sources/meta/scala/MetaFunction.java
index 3bcf4cc4c6..4f8c441e72 100644
--- a/sources/meta/scala/MetaFunction.java
+++ b/sources/meta/scala/MetaFunction.java
@@ -38,7 +38,7 @@ public class MetaFunction extends AbstractJavaExpander {
public void printClassScalaTParams() {
for (int i = 0; i < arity; i++)
writer.print("?A").print(i).print(", ");
- writer.print("?R");
+ writer.print("+ ?R");
}
public void printApplyScalaSignature() {
diff --git a/sources/meta/scalac/ast/Tree.java b/sources/meta/scalac/ast/Tree.java
index 02bb466d08..d596549522 100644
--- a/sources/meta/scalac/ast/Tree.java
+++ b/sources/meta/scalac/ast/Tree.java
@@ -100,8 +100,7 @@ public class Tree {
n_SelectFromType = node("SelectFromType", Type, HasSym),
n_FunType = node("FunType" , Type, NoSym),
n_CompoundType = node("CompoundType" , Type, NoSym),
- n_AppliedType = node("AppliedType" , Type, NoSym),
- n_CovariantType = node("CovariantType" , Type, NoSym);
+ n_AppliedType = node("AppliedType" , Type, NoSym);
public final TreeNode[] nodes;
public int arrays;
@@ -323,11 +322,6 @@ public class Tree {
addField(t_TypeTree, "tpe").
addField(t_TypeTrees, "args");
- n_CovariantType.
- setDescription("Covariant type").
- setRange(Phase.PARSER, Phase.ANALYZER).
- addField(t_TypeTree, "tpe");
-
}
//########################################################################