diff options
| author | paltherr <paltherr@epfl.ch> | 2003-10-29 14:01:48 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2003-10-29 14:01:48 +0000 |
| commit | b0cd565a51d819847de0691fe5f9098fd17dce71 (patch) | |
| tree | ab84c02ae6d0bb3c14d65ff2c1202fe585e27547 /sources/scalac/typechecker | |
| parent | 6191a1cea724f848a4751e0595ebe4b1bc71f609 (diff) | |
| download | scala-b0cd565a51d819847de0691fe5f9098fd17dce71.tar.gz scala-b0cd565a51d819847de0691fe5f9098fd17dce71.tar.bz2 scala-b0cd565a51d819847de0691fe5f9098fd17dce71.zip | |
- Replaced most of the Definition <...>_TYPE fi...
- Replaced most of the Definition <...>_TYPE fields by methods
Diffstat (limited to 'sources/scalac/typechecker')
| -rw-r--r-- | sources/scalac/typechecker/Analyzer.java | 6 | ||||
| -rw-r--r-- | sources/scalac/typechecker/RefCheck.java | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sources/scalac/typechecker/Analyzer.java b/sources/scalac/typechecker/Analyzer.java index 4595a33249..2954a56e3d 100644 --- a/sources/scalac/typechecker/Analyzer.java +++ b/sources/scalac/typechecker/Analyzer.java @@ -601,7 +601,7 @@ public class Analyzer extends Transformer implements Modifiers, Kinds { else if (value instanceof Long) return definitions.LONG_TYPE; else if (value instanceof Float) return definitions.FLOAT_TYPE; else if (value instanceof Double) return definitions.DOUBLE_TYPE; - else if (value instanceof String) return definitions.JAVA_STRING_TYPE; + else if (value instanceof String) return definitions.JAVA_STRING_TYPE(); else if (value instanceof Boolean) return definitions.BOOLEAN_TYPE; else throw new ApplicationError(); } @@ -2084,7 +2084,7 @@ public class Analyzer extends Transformer implements Modifiers, Kinds { case Throw(Tree expr): Tree expr1 = transform( - expr, EXPRmode, definitions.JAVA_THROWABLE_TYPE); + expr, EXPRmode, definitions.JAVA_THROWABLE_TYPE()); return gen.Select(tree.pos, expr1, definitions.THROW); case Return(Tree expr): @@ -2096,7 +2096,7 @@ public class Analyzer extends Transformer implements Modifiers, Kinds { Tree expr1 = transform( expr, EXPRmode, enclFun.type().resultType()); return copy.Return(tree, expr1) - .setSymbol(enclFun).setType(definitions.ALL_TYPE); + .setSymbol(enclFun).setType(definitions.ALL_TYPE()); } else { return error(tree.pos, "return outside method definition"); } diff --git a/sources/scalac/typechecker/RefCheck.java b/sources/scalac/typechecker/RefCheck.java index 1f4b75ed09..b27def2224 100644 --- a/sources/scalac/typechecker/RefCheck.java +++ b/sources/scalac/typechecker/RefCheck.java @@ -164,7 +164,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds { case MethodType(Symbol[] tparams, Type restp): return Type.MethodType(tparams, Type.AnyType); default: - return defs.ANY_TYPE; + return defs.ANY_TYPE(); } } private void abstractClassError(Symbol clazz, String msg) { @@ -518,7 +518,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds { // { if (null == m$) m$ = new m$class; m$ } Symbol eqMethod = getUnaryMemberMethod( - sym.type(), Names.EQEQ, defs.ANY_TYPE); + sym.type(), Names.EQEQ, defs.ANY_TYPE()); Tree body = gen.Block(new Tree[]{ gen.If( gen.Apply( @@ -640,7 +640,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds { Symbol equalsSym = new TermSymbol(clazz.pos, Names.equals, clazz, OVERRIDE); Symbol equalsParam = new TermSymbol(clazz.pos, Names.that, equalsSym, PARAM) - .setInfo(defs.ANY_TYPE); + .setInfo(defs.ANY_TYPE()); equalsSym.setInfo( Type.MethodType(new Symbol[]{equalsParam}, defs.BOOLEAN_TYPE)); clazz.info().members().enter(equalsSym); @@ -651,7 +651,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds { if (tparams.length != 0) { Type[] targs = new Type[tparams.length]; for (int i = 0; i < targs.length; i++) - targs[i] = defs.ANY_TYPE; + targs[i] = defs.ANY_TYPE(); testtp = testtp.subst(tparams, targs); } } |