- Changed _TYPE methods in Definitions for prim...

- Changed _TYPE methods in Definitions for primitive value and array
types

7 files changed, 20 insertions, 20 deletions

diff --git a/sources/scalac/transformer/matching/AlgebraicMatcher.java b/sources/scalac/transformer/matching/AlgebraicMatcher.java
index a366eee16e..044767558c 100644
--- a/sources/scalac/transformer/matching/AlgebraicMatcher.java
+++ b/sources/scalac/transformer/matching/AlgebraicMatcher.java
@@ -158,7 +158,7 @@ public class AlgebraicMatcher extends PatternMatcher {
 
 	  PartialMatcher m = new PartialMatcher( _m.owner,
                                                  selector,
-                                                 defs.BOOLEAN_TYPE() );
+                                                 defs.boolean_TYPE() );
 
 	  Tree pats[] = new Tree[ seqPatNodes.size() ];
 	  Tree body[] = new Tree[ seqPatNodes.size() ];
diff --git a/sources/scalac/transformer/matching/Autom2Scala.java b/sources/scalac/transformer/matching/Autom2Scala.java
index 8453ed8f3a..22d20af9ee 100644
--- a/sources/scalac/transformer/matching/Autom2Scala.java
+++ b/sources/scalac/transformer/matching/Autom2Scala.java
@@ -169,7 +169,7 @@ public class Autom2Scala  {
     Tree _cur_match( Tree pat ) {
         PartialMatcher m = new PartialMatcher( this.funSym,   /* owner*/
                                                currentElem(), /* root */
-                                               defs.BOOLEAN_TYPE() /* restype */);
+                                               defs.boolean_TYPE() /* restype */);
 
         am.construct( m, new CaseDef[] {
             cf.gen.CaseDef( pat,
diff --git a/sources/scalac/transformer/matching/CodeFactory.java b/sources/scalac/transformer/matching/CodeFactory.java
index 2e4f520b1a..0f17b5d2b4 100644
--- a/sources/scalac/transformer/matching/CodeFactory.java
+++ b/sources/scalac/transformer/matching/CodeFactory.java
@@ -46,7 +46,7 @@ class CodeFactory extends PatternTool {
 
     /** returns  `List[ Tuple2[ scala.Int, <elemType> ] ]' */
       Type SeqTraceType( Type elemType ) {
-          return defs.LIST_TYPE(pairType(defs.INT_TYPE(), elemType));
+          return defs.LIST_TYPE(pairType(defs.int_TYPE(), elemType));
       }
 
     /**  returns `Iterator[ elemType ]' */
diff --git a/sources/scalac/transformer/matching/LeftTracerInScala.java b/sources/scalac/transformer/matching/LeftTracerInScala.java
index 4fabce0586..6e7c426c39 100644
--- a/sources/scalac/transformer/matching/LeftTracerInScala.java
+++ b/sources/scalac/transformer/matching/LeftTracerInScala.java
@@ -47,7 +47,7 @@ public class LeftTracerInScala extends TracerInScala {
         this.stateSym = owner.newVariable( pos,
                                            Modifiers.MUTABLE,
                                           cf.fresh.newName( "q" ))
-            .setType( defs.INT_TYPE() ) ;
+            .setType( defs.int_TYPE() ) ;
 
         this.accumType = _accumType( elementType );
         this.accumTypeArg = accumType.typeArgs()[0];
@@ -63,7 +63,7 @@ public class LeftTracerInScala extends TracerInScala {
 
         this.funSym
             .setType( new Type.MethodType( new Symbol[] {  // dummy symbol MethodType
-                funSym.newVParam( pos, 0, cf.fresh.newName( "q" ), defs.INT_TYPE()),
+                funSym.newVParam( pos, 0, cf.fresh.newName( "q" ), defs.int_TYPE()),
                 funSym.newVParam( pos, 0, cf.fresh.newName( "acc" ), accumType ) },
                                            accumType)); // result type = List[T]
 
@@ -76,7 +76,7 @@ public class LeftTracerInScala extends TracerInScala {
             .setType( elementType );
 
         this.hasnSym = owner.newVariable( pos, 0, HASNEXT )
-            .setType( defs.BOOLEAN_TYPE() );
+            .setType( defs.boolean_TYPE() );
 
     }
 
@@ -203,7 +203,7 @@ public class LeftTracerInScala extends TracerInScala {
 
         PartialMatcher m = new PartialMatcher( owner,
                                                currentElem(),
-                                               defs.BOOLEAN_TYPE() );
+                                               defs.boolean_TYPE() );
 
         if( CollectVariableTraverser.containsBinding( pat )) {
             switch( pat ) {
diff --git a/sources/scalac/transformer/matching/PatternMatcher.java b/sources/scalac/transformer/matching/PatternMatcher.java
index dc85594953..b33036abfc 100644
--- a/sources/scalac/transformer/matching/PatternMatcher.java
+++ b/sources/scalac/transformer/matching/PatternMatcher.java
@@ -500,7 +500,7 @@ public class PatternMatcher extends PatternTool {
     }
 
     protected boolean isSimpleIntSwitch() {
-        if (selector.type.widen().isSameAs(defs.INT_TYPE())) {
+        if (selector.type.widen().isSameAs(defs.int_TYPE())) {
             PatternNode patNode = root.and;
             while (patNode != null) {
                 PatternNode node = patNode;
@@ -843,7 +843,7 @@ public class PatternMatcher extends PatternTool {
                           bodies,
                           (defaultCase == null) ? gen.mkBooleanLit(selector.pos, false)
                           : toTree(defaultCase.and),
-                          defs.BOOLEAN_TYPE());
+                          defs.boolean_TYPE());
     }
 
     protected Tree toTree(PatternNode node, Tree selector) {
diff --git a/sources/scalac/transformer/matching/RightTracerInScala.java b/sources/scalac/transformer/matching/RightTracerInScala.java
index a86b041bae..b7ac716183 100644
--- a/sources/scalac/transformer/matching/RightTracerInScala.java
+++ b/sources/scalac/transformer/matching/RightTracerInScala.java
@@ -134,7 +134,7 @@ public class RightTracerInScala extends TracerInScala  {
         this.stateSym = owner.newVariable ( pos,
                                             Modifiers.MUTABLE,
                                             cf.fresh.newName("q"))
-            .setType( defs.INT_TYPE() ) ;
+            .setType( defs.int_TYPE() ) ;
 
         this.curSym = owner.newVariable( pos,
                                          Modifiers.MUTABLE,
@@ -144,12 +144,12 @@ public class RightTracerInScala extends TracerInScala  {
         this.targetSym = owner.newVariable( pos,
                                          Modifiers.MUTABLE,
                                          cf.fresh.newName("p"))
-            .setType( defs.INT_TYPE() ) ;
+            .setType( defs.int_TYPE() ) ;
 
         funSym.setType( new Type.MethodType( new Symbol[] {  // dummy symbol MethodType
             funSym.newVParam( pos, 0, cf.fresh.newName("iter"), cf.SeqTraceType( elementType )),
-            funSym.newVParam( pos, 0, cf.fresh.newName( "q" ), defs.INT_TYPE()) },
-                                             defs.UNIT_TYPE() )); // result
+            funSym.newVParam( pos, 0, cf.fresh.newName( "q" ), defs.int_TYPE()) },
+                                             defs.void_TYPE() )); // result
 
     }
 
@@ -276,7 +276,7 @@ public class RightTracerInScala extends TracerInScala  {
         //System.err.println( "curT"+currentElem().type().widen() );
         PartialMatcher m = new PartialMatcher( owner,//funSym,//this.funSym,
                                                currentElem(),
-                                               defs.BOOLEAN_TYPE() );
+                                               defs.boolean_TYPE() );
 
         final HashMap freshenMap = new HashMap(); // sym2exp -> new sym
         HashMap helpMap3 = new HashMap();         // new sym -> original sym
diff --git a/sources/scalac/transformer/matching/WordAutomInScala.java b/sources/scalac/transformer/matching/WordAutomInScala.java
index 8fde263608..51a3e85c3a 100644
--- a/sources/scalac/transformer/matching/WordAutomInScala.java
+++ b/sources/scalac/transformer/matching/WordAutomInScala.java
@@ -77,23 +77,23 @@ public class WordAutomInScala extends Autom2Scala {
         this.stateSym = owner.newVariable( pos,
                                            Modifiers.MUTABLE,
                                         cf.fresh.newName("q"))
-            .setType( defs.INT_TYPE() ) ;
+            .setType( defs.int_TYPE() ) ;
 
         this.resultSym = owner.newVariable( pos,
                                             Modifiers.MUTABLE,
                                             cf.fresh.newName("swRes"))
-            .setType( defs.INT_TYPE() ) ;
+            .setType( defs.int_TYPE() ) ;
 
         this.funSym
             .setType( new Type.MethodType( new Symbol[] {
-                funSym.newVParam( pos, 0, cf.fresh.newName("q"), defs.INT_TYPE())
-            }, defs.INT_TYPE() ));
+                funSym.newVParam( pos, 0, cf.fresh.newName("q"), defs.int_TYPE())
+            }, defs.int_TYPE() ));
 
         this.curSym = owner.newVariable( pos, 0, CURRENT_ELEM )
             .setType( elementType );
 
         this.hasnSym = owner.newVariable( pos, 0, HASNEXT )
-            .setType( defs.BOOLEAN_TYPE() );
+            .setType( defs.boolean_TYPE() );
 
     }
 
@@ -111,7 +111,7 @@ public class WordAutomInScala extends Autom2Scala {
     Tree _cur_match( Tree pat ) { // TE ST
         PartialMatcher m = new PartialMatcher( this.owner,   /* owner*/
                                                currentElem(), /* root */
-                                               defs.BOOLEAN_TYPE() /* restype */);
+                                               defs.boolean_TYPE() /* restype */);
 
         am.construct( m, new CaseDef[] {
             cf.gen.CaseDef( pat,