diff options
| author | paltherr <paltherr@epfl.ch> | 2003-10-10 16:35:44 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2003-10-10 16:35:44 +0000 |
| commit | 9e75e356d90ed068ae01291e7970747925a4e77a (patch) | |
| tree | 18f78385ea67d056a9ff8c749e1fd819c1521901 /sources/scalac/transformer | |
| parent | fa73acda7c2e71076f1407b939ea6c00bcf4114b (diff) | |
| download | scala-9e75e356d90ed068ae01291e7970747925a4e77a.tar.gz scala-9e75e356d90ed068ae01291e7970747925a4e77a.tar.bz2 scala-9e75e356d90ed068ae01291e7970747925a4e77a.zip | |
- Removed Autom2Scala._applyNone
- Replaced make by gen
Diffstat (limited to 'sources/scalac/transformer')
3 files changed, 5 insertions, 18 deletions
diff --git a/sources/scalac/transformer/matching/AlgebraicMatcher.java b/sources/scalac/transformer/matching/AlgebraicMatcher.java index 3fb06775ec..57ba2ce7fe 100644 --- a/sources/scalac/transformer/matching/AlgebraicMatcher.java +++ b/sources/scalac/transformer/matching/AlgebraicMatcher.java @@ -310,14 +310,7 @@ public class AlgebraicMatcher extends PatternMatcher { target.and = curHeader = mk.Header(pat.pos, castType, - make.Apply(pat.pos, - make.Select(pat.pos, - gen.Ident(pat.pos, casted), - typeSym.name) - .setType(Type.MethodType(Symbol.EMPTY_ARRAY, - castType)) - .setSymbol( typeSym ), - Tree.EMPTY_ARRAY).setType( castType )); + gen.mkApply__(gen.Select(gen.Ident(pat.pos, casted), typeSym))); // translate the root of `pat' curHeader.or = patternNode(pat, curHeader.type, @@ -388,11 +381,11 @@ public class AlgebraicMatcher extends PatternMatcher { gen.Ident( _m.pos, resultVar ), cf.ThrowMatchError( _m.pos, _m.resultType ))); /* - make.If( + gen.If( _m.pos, toTree(root.and), gen.Ident( _m.pos, resultVar ), - cf.ThrowMatchError( _m.resultType )).type( _m.resultType )); + cf.ThrowMatchError( _m.resultType )); */ return gen.mkBlock(_m.pos, ts.toArray()); } @@ -474,7 +467,7 @@ public class AlgebraicMatcher extends PatternMatcher { Tree selector) { /* ???????????????????????? necessary to test whether is a Seq? - make.If(selector.pos, + gen.If(selector.pos, maybe cf.And( cf.Is(selector, seqpat.type()) ... */ diff --git a/sources/scalac/transformer/matching/Autom2Scala.java b/sources/scalac/transformer/matching/Autom2Scala.java index 5dbefea142..d380172993 100644 --- a/sources/scalac/transformer/matching/Autom2Scala.java +++ b/sources/scalac/transformer/matching/Autom2Scala.java @@ -184,11 +184,6 @@ public class Autom2Scala { return gen.ValDef( sym, init ); } - // the caller needs to set the type ! - Tree _applyNone( Tree arg ) { - return cf.make.Apply(pos, arg, Tree.EMPTY_ARRAY/*None*/ ); - } - Tree _scala() { return gen.Ident(pos, defs.SCALA ); } diff --git a/sources/scalac/transformer/matching/WordAutomInScala.java b/sources/scalac/transformer/matching/WordAutomInScala.java index 1654f69161..e048cb205d 100644 --- a/sources/scalac/transformer/matching/WordAutomInScala.java +++ b/sources/scalac/transformer/matching/WordAutomInScala.java @@ -49,8 +49,7 @@ public class WordAutomInScala extends Autom2Scala { result = cf.Switch( selector, cond, body, failTree ); - result = cf.make.Block( pos, new Tree[] { theDefDef, run, result } ) - .setType( resultType ); + result = cf.gen.mkBlock( pos, new Tree[] { theDefDef, run, result } ); //unit.global.debugPrinter.print( result ); return result; } |