- Removed old methods Nil and Cons in TreeGen

2 files changed, 11 insertions, 11 deletions

diff --git a/sources/scalac/transformer/matching/LeftTracerInScala.java b/sources/scalac/transformer/matching/LeftTracerInScala.java
index e46434bbe6..6fd2f2209d 100644
--- a/sources/scalac/transformer/matching/LeftTracerInScala.java
+++ b/sources/scalac/transformer/matching/LeftTracerInScala.java
@@ -90,10 +90,10 @@ public class LeftTracerInScala extends TracerInScala {
           _ref( accumSym ));
         */
         Tree hd = cf.newPair( gen.mkIntLit(cf.pos, i), currentElem() );
-        Tree newAcc = gen.Cons(cf.pos,
-                               accumTypeArg,
-                               hd,
-                               gen.Ident( cf.pos, accumSym ));
+        Tree newAcc = gen.mkNewCons( cf.pos,
+                                     accumTypeArg,
+                                     hd,
+                                     gen.Ident( cf.pos, accumSym ));
 
         return callFun( new Tree[] { newAcc , _iter(), gen.mkIntLit( cf.pos, target )} );
     }
@@ -170,7 +170,7 @@ public class LeftTracerInScala extends TracerInScala {
         // `def leftTracer(...) = ...'                 the function definition
         v.add( theDefDef );
 
-        Tree emptyAcc    = gen.Nil( cf.pos ); //cf._seqTraceNil( elementType );
+        Tree emptyAcc    = gen.mkNil( cf.pos ); //cf._seqTraceNil( elementType );
 
         // the valdef is needed, because passing emptyAcc as a parameter
         //   results in a ClassCastException at runtime (?!)
@@ -237,10 +237,10 @@ public class LeftTracerInScala extends TracerInScala {
                               gen.mkDefaultValue(cf.pos,
                                                  elementType));
         //System.err.println(hd.type);
-        return gen.Cons(  cf.pos,
-                          accumTypeArg,
-                          hd,
-                          gen.Ident( cf.pos, accumSym ));
+        return gen.mkNewCons(  cf.pos,
+                               accumTypeArg,
+                               hd,
+                               gen.Ident( cf.pos, accumSym ));
     }
 
 }
diff --git a/sources/scalac/transformer/matching/RightTracerInScala.java b/sources/scalac/transformer/matching/RightTracerInScala.java
index 8a493e703b..a28f4476e3 100644
--- a/sources/scalac/transformer/matching/RightTracerInScala.java
+++ b/sources/scalac/transformer/matching/RightTracerInScala.java
@@ -104,7 +104,7 @@ public class RightTracerInScala extends TracerInScala  {
         if( keepType )
             rhs = gen.mkDefaultValue( cf.pos, realVar.type() );
         else
-            rhs = gen.Nil( cf.pos );
+            rhs = gen.mkNil( cf.pos );
         helpVar.flags |= Modifiers.MUTABLE;
         Tree varDef = gen.ValDef( helpVar, rhs );
         //((ValDef) varDef).kind = Kinds.VAR;
@@ -114,7 +114,7 @@ public class RightTracerInScala extends TracerInScala  {
 
     Tree prependToHelpVar( Symbol realVar, Tree elem ) {
         Tree hv = refHelpVar( realVar );
-        return gen.Assign( hv, gen.Cons( cf.pos, elementType, elem, hv ));
+        return gen.Assign( hv, gen.mkNewCons( cf.pos, elementType, elem, hv ));
         /*
           return cf.Block(pos,
           new Tree [] {