summaryrefslogtreecommitdiff
path: root/sources/meta
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2003-11-18 09:46:06 +0000
committerpaltherr <paltherr@epfl.ch>2003-11-18 09:46:06 +0000
commit35ff40f25baac698b0794701961c420f94174e35 (patch)
treea39cd180872be10f8cd5eefdee785ffc9998d173 /sources/meta
parentf28a8a337ed290b1f7dbb0bc493d83f576fb6352 (diff)
downloadscala-35ff40f25baac698b0794701961c420f94174e35.tar.gz
scala-35ff40f25baac698b0794701961c420f94174e35.tar.bz2
scala-35ff40f25baac698b0794701961c420f94174e35.zip
- Added some end phases
Diffstat (limited to 'sources/meta')
-rw-r--r--sources/meta/scalac/Phase.java24
-rw-r--r--sources/meta/scalac/ast/Tree.java8
2 files changed, 16 insertions, 16 deletions
diff --git a/sources/meta/scalac/Phase.java b/sources/meta/scalac/Phase.java
index 023ec454e2..8092d6125b 100644
--- a/sources/meta/scalac/Phase.java
+++ b/sources/meta/scalac/Phase.java
@@ -15,18 +15,18 @@ public class Phase {
// Public Constants
public static final Phase
- START = new Phase("start", null),
- PARSER = new Phase("parser", "PARSER"),
- ANALYZER = new Phase("analyzer", "ANALYZER"),
- DESUGARIZER = new Phase("desugarizer", "ANALYZER"),
- REFCHECK = new Phase("refcheck", "REFCHECK"),
- UNCURRY = new Phase("uncurry", "UNCURRY"),
- LAMBDALIFT = new Phase("lambdalift", "LAMBDALIFT"),
- TRANSMATCH = new Phase("transmatch", "TRANSMATCH"),
- OPTIMIZER = new Phase("optimizer", null), // !!! "OPTIMIZE"
- ERASURE = new Phase("erasure", "ERASURE"),
- UNKNOWN = new Phase("? !!!", null),
- END = new Phase("-", null);
+ START = new Phase("start", null),
+ PARSER = new Phase("parser", "PARSER"),
+ DESUGARIZER = new Phase("desugarizer", "ANALYZER"),
+ ANALYZER = new Phase("analyzer", "ANALYZER"),
+ REFCHECK = new Phase("refcheck", "REFCHECK"),
+ UNCURRY = new Phase("uncurry", "UNCURRY"),
+ TRANSMATCH = new Phase("transmatch", "TRANSMATCH"),
+ LAMBDALIFT = new Phase("lambdalift", "LAMBDALIFT"),
+ EXPLICITOUTER = new Phase("explicitouter", "EXPLICITOUTER"),
+ ERASURE = new Phase("erasure", "ERASURE"),
+ UNKNOWN = new Phase("? !!!", null),
+ END = new Phase("-", null);
//########################################################################
// Public Fields
diff --git a/sources/meta/scalac/ast/Tree.java b/sources/meta/scalac/ast/Tree.java
index b1af55a774..d3f9847f37 100644
--- a/sources/meta/scalac/ast/Tree.java
+++ b/sources/meta/scalac/ast/Tree.java
@@ -180,7 +180,7 @@ public class Tree {
n_AbsTypeDef.
setDescription("Type declaration").
- setRange(Phase.PARSER, Phase.ERASURE). // !!! could/should be removed earlier?)
+ setRange(Phase.PARSER, Phase.END). // !!! needed for type params
addField(t_int, "mods", SymFlags).
addField(t_TypeName, "name", SymName).
addField(t_TypeTree, "rhs").
@@ -188,7 +188,7 @@ public class Tree {
n_AliasTypeDef.
setDescription("Type alias").
- setRange(Phase.PARSER, Phase.ERASURE). // !!! could/should be removed earlier?)
+ setRange(Phase.PARSER, Phase.EXPLICITOUTER).
addField(t_int, "mods", SymFlags).
addField(t_TypeName, "name", SymName).
addField(n_AbsTypeDef.getType(1), "tparams").
@@ -202,7 +202,7 @@ public class Tree {
n_CaseDef.
setDescription("Case declaration").
- setRange(Phase.PARSER, Phase.UNKNOWN).
+ setRange(Phase.PARSER, Phase.TRANSMATCH).
addField(t_TermTree, "pat").
addField(t_TermTree, "guard").
addField(t_TermTree, "body");
@@ -293,7 +293,7 @@ public class Tree {
n_Typed.
setDescription("Type annotation").
- setRange(Phase.PARSER, Phase.UNKNOWN). // !!! could be removed by analyzer?
+ setRange(Phase.PARSER, Phase.EXPLICITOUTER).
addField(t_TermTree, "expr").
addField(t_TypeTree, "tpe");