diff options
| author | Martin Odersky <odersky@gmail.com> | 2003-02-20 14:31:40 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2003-02-20 14:31:40 +0000 |
| commit | f9517d67543763ea2217d1ae09afe24f9ad83d78 (patch) | |
| tree | 11cacdee5deeccf936211e5948c48e770aa85eae /sources | |
| parent | 17bd66e3cf7734ccf1ccd3a0adb987feb880d325 (diff) | |
| download | scala-f9517d67543763ea2217d1ae09afe24f9ad83d78.tar.gz scala-f9517d67543763ea2217d1ae09afe24f9ad83d78.tar.bz2 scala-f9517d67543763ea2217d1ae09afe24f9ad83d78.zip | |
*** empty log message ***
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/scala/Iterator.scala | 4 | ||||
| -rw-r--r-- | sources/scalac/Global.java | 6 | ||||
| -rw-r--r-- | sources/scalac/typechecker/Analyzer.java | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sources/scala/Iterator.scala b/sources/scala/Iterator.scala index e42ddb6bfb..90a1b0cbca 100644 --- a/sources/scala/Iterator.scala +++ b/sources/scala/Iterator.scala @@ -25,7 +25,7 @@ trait Iterator[a] { } def filter(p: a => Boolean): Iterator[a] = new BufferedIterator[a] { - private val source = + private val source: BufferedIterator[a] = Iterator.this.buffered; private def skip: Unit = while (source.hasNext && !p(source.head)) { source.next; () } @@ -54,7 +54,7 @@ trait Iterator[a] { else head; def hasNext: Boolean = ahead || Iterator.this.hasNext; - override def buffered = this; + override def buffered: BufferedIterator[a] = this; } } diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java index d9aa03947b..6cfcb77ba5 100644 --- a/sources/scalac/Global.java +++ b/sources/scalac/Global.java @@ -15,7 +15,7 @@ import scalac.ast.*; import scalac.ast.parser.*; import scalac.symtab.Definitions; import scalac.ast.printer.*; -//import scalac.backend.Primitives; +import scalac.backend.Primitives; /** The global environment of a compiler run @@ -90,7 +90,7 @@ public class Global { /** the global primitives */ - //public Primitives primitives; + public Primitives primitives; /** compilation phases. */ @@ -165,7 +165,7 @@ public class Global { this.make = new TreeCreator(); this.currentPhase = PhaseDescriptor.INITIAL; this.definitions = new Definitions(this); - //this.primitives = new Primitives(this); + this.primitives = new Primitives(this); this.treeGen = new TreeGen(this, make); this.PHASE = args.phases; List phases = new ArrayList(); diff --git a/sources/scalac/typechecker/Analyzer.java b/sources/scalac/typechecker/Analyzer.java index b6b7f4906f..232ba4a0c9 100644 --- a/sources/scalac/typechecker/Analyzer.java +++ b/sources/scalac/typechecker/Analyzer.java @@ -301,7 +301,7 @@ public class Analyzer extends Transformer implements Modifiers, Kinds { Type[] grandparents = parents[i].parents(); if (grandparents.length > 0 && !parents[0].isSubType(grandparents[0])) error(constrs[i].pos, "illegal inheritance;\n " + parents[0] + - "does not conform to " + parents[i] + "'s supertype"); + " does not conform to " + parents[i] + "'s supertype"); Symbol bsym = parents[i].symbol(); if ((bsym.flags & FINAL) != 0) { // are we in same scope as base type definition? @@ -444,7 +444,7 @@ public class Analyzer extends Transformer implements Modifiers, Kinds { try { return checkNoEscapeMap.apply(tp); } catch (Type.Error ex) { - error(pos, ex.msg); + error(pos, tp + "///" + ex.msg); return Type.ErrorType; } } |