diff options
Diffstat (limited to 'sources/scalac/transformer')
7 files changed, 18 insertions, 18 deletions
diff --git a/sources/scalac/transformer/AddConstructors.java b/sources/scalac/transformer/AddConstructors.java index 4fdf9f6221..bb71b167df 100644 --- a/sources/scalac/transformer/AddConstructors.java +++ b/sources/scalac/transformer/AddConstructors.java @@ -85,7 +85,7 @@ public class AddConstructors extends Transformer { Type constrType = Type.MethodType (paramSyms, forJVM ? - global.definitions.UNIT_TYPE : owner.type()); + global.definitions.UNIT_TYPE() : owner.type()); if (tparamSyms.length != 0) constrType = Type.PolyType(tparamSyms, constrType); diff --git a/sources/scalac/transformer/matching/AlgebraicMatcher.java b/sources/scalac/transformer/matching/AlgebraicMatcher.java index 191aa17fd3..20c9e2536c 100644 --- a/sources/scalac/transformer/matching/AlgebraicMatcher.java +++ b/sources/scalac/transformer/matching/AlgebraicMatcher.java @@ -461,7 +461,7 @@ public class AlgebraicMatcher extends PatternMatcher { Matcher m = new Matcher( _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 49b18f2943..13cb939ae3 100644 --- a/sources/scalac/transformer/matching/Autom2Scala.java +++ b/sources/scalac/transformer/matching/Autom2Scala.java @@ -99,17 +99,17 @@ public class Autom2Scala { .setType( cf._seqIterType( elementType ) ) ; this.stateSym = newParam("q") - .setType( defs.INT_TYPE ) ; + .setType( defs.INT_TYPE() ) ; this.resultSym = new TermSymbol( pos, cf.fresh.newName("swRes"), owner, 0 ) - .setType( defs.INT_TYPE ) ; + .setType( defs.INT_TYPE() ) ; this.funSym .setType( new Type.MethodType( new Symbol[] { - iterSym, stateSym }, defs.INT_TYPE )); + iterSym, stateSym }, defs.INT_TYPE() )); this.curSym = new TermSymbol( pos, CURRENT_ELEM, @@ -121,7 +121,7 @@ public class Autom2Scala { HASNEXT, funSym, 0) - .setType( defs.BOOLEAN_TYPE ); + .setType( defs.BOOLEAN_TYPE() ); } @@ -250,7 +250,7 @@ public class Autom2Scala { Tree _cur_match( Tree pat ) { Matcher m = new Matcher( funSym,//this.funSym, currentElem(), - defs.BOOLEAN_TYPE ); + defs.BOOLEAN_TYPE() ); 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 ee501e692f..832d75fc7b 100644 --- a/sources/scalac/transformer/matching/CodeFactory.java +++ b/sources/scalac/transformer/matching/CodeFactory.java @@ -48,7 +48,7 @@ class CodeFactory extends PatternTool { /** returns `List[ Tuple2[ scala.Int, <elemType> ] ]' */ Type SeqTraceType( Type elemType ) { - return defs.listType(pairType(defs.INT_TYPE, elemType)); + return defs.listType(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 df9e3b71ee..d85d4b2e37 100644 --- a/sources/scalac/transformer/matching/LeftTracerInScala.java +++ b/sources/scalac/transformer/matching/LeftTracerInScala.java @@ -265,7 +265,7 @@ public class LeftTracerInScala extends TracerInScala { Matcher m = new Matcher( funSym, 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 3ece11b531..4572d565ba 100644 --- a/sources/scalac/transformer/matching/PatternMatcher.java +++ b/sources/scalac/transformer/matching/PatternMatcher.java @@ -477,7 +477,7 @@ public class PatternMatcher extends PatternTool { switch (t.type()) { case OverloadedType(Symbol[] alts, Type[] alttypes): infer.methodAlternative(t, alts, alttypes, - new Type[]{defs.INT_TYPE}, seqType); + new Type[]{defs.INT_TYPE()}, seqType); } t = gen.mkApply_V(t, new Tree[]{gen.mkIntLit(pat.pos, index)}); */ @@ -582,7 +582,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; @@ -922,7 +922,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 a991ffba84..91d84091af 100644 --- a/sources/scalac/transformer/matching/RightTracerInScala.java +++ b/sources/scalac/transformer/matching/RightTracerInScala.java @@ -133,7 +133,7 @@ public class RightTracerInScala extends TracerInScala { new Tree [] { cf.debugPrintRuntime( "ASSIGN" ), gen.Assign( hv, cf.newSeqCons( elem, hv )) - }, defs.UNIT_TYPE); + }, defs.UNIT_TYPE()); */ } @@ -151,7 +151,7 @@ public class RightTracerInScala extends TracerInScala { cf.fresh.newName("q"), funSym, 0 ) - .setType( defs.INT_TYPE ) ; + .setType( defs.INT_TYPE() ) ; this.elemSym = new TermSymbol( pos, cf.fresh.newName("elem"), @@ -163,17 +163,17 @@ public class RightTracerInScala extends TracerInScala { cf.fresh.newName("trgt"), funSym, 0) - .setType( defs.INT_TYPE ) ; + .setType( defs.INT_TYPE() ) ; funSym.setType( new Type.MethodType( new Symbol[] { - iterSym, stateSym }, defs.UNIT_TYPE )); + iterSym, stateSym }, defs.UNIT_TYPE() )); } // same as in LeftTracer Tree code_fail() { - return cf.ThrowMatchError( _m.pos, defs.UNIT_TYPE ); + return cf.ThrowMatchError( _m.pos, defs.UNIT_TYPE() ); } public Tree code_body() { @@ -311,7 +311,7 @@ public class RightTracerInScala extends TracerInScala { Matcher m = new Matcher( funSym,//this.funSym, currentElem(), - defs.BOOLEAN_TYPE ); + defs.BOOLEAN_TYPE() ); // there could be variables in regular expressions under Sequence node, // export those later |