summaryrefslogtreecommitdiff
path: root/sources/scalac/symtab
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2003-07-16 10:49:15 +0000
committerMartin Odersky <odersky@gmail.com>2003-07-16 10:49:15 +0000
commit0a0595a1c73b956f8582879d518c75970b910c23 (patch)
tree5bffa1f28df8a5cb2b7451c18fc3a9acf85c3722 /sources/scalac/symtab
parent9aaa79cdba130a6e22e9b761d5a1f78720a2a180 (diff)
downloadscala-0a0595a1c73b956f8582879d518c75970b910c23.tar.gz
scala-0a0595a1c73b956f8582879d518c75970b910c23.tar.bz2
scala-0a0595a1c73b956f8582879d518c75970b910c23.zip
*** empty log message ***
Diffstat (limited to 'sources/scalac/symtab')
-rw-r--r--sources/scalac/symtab/SourceCompleter.java2
-rw-r--r--sources/scalac/symtab/Symbol.java17
2 files changed, 9 insertions, 10 deletions
diff --git a/sources/scalac/symtab/SourceCompleter.java b/sources/scalac/symtab/SourceCompleter.java
index 9475e79ffe..1fe722abac 100644
--- a/sources/scalac/symtab/SourceCompleter.java
+++ b/sources/scalac/symtab/SourceCompleter.java
@@ -33,7 +33,7 @@ public class SourceCompleter extends Type.LazyType {
*/
public void complete(Symbol c) {
if (completed) {
- c.setInfo(Type.ErrorType);
+ c.setInfo(Type.NoType);
} else if (filename != null) {
try {
String fname = filename;
diff --git a/sources/scalac/symtab/Symbol.java b/sources/scalac/symtab/Symbol.java
index a67669075a..f6466931d7 100644
--- a/sources/scalac/symtab/Symbol.java
+++ b/sources/scalac/symtab/Symbol.java
@@ -187,8 +187,7 @@ public abstract class Symbol implements Modifiers, Kinds {
public final boolean isStable() {
return kind == VAL &&
((flags & STABLE) != 0 ||
- (flags & MUTABLE) == 0 && type().isObjectType()) &&
- !owner.isPrimaryConstructor();
+ (flags & MUTABLE) == 0 && type().isObjectType());
}
/** Does this symbol denote a variable? */
@@ -560,13 +559,13 @@ public abstract class Symbol implements Modifiers, Kinds {
info.complete(this);
flags = flags & ~LOCKED;
if (info instanceof SourceCompleter && (flags & SNDTIME) == 0) {
- flags |= SNDTIME;
- Type tp = info();
- flags &= ~SNDTIME;
- } else {
- assert !(rawInfoAt(id) instanceof Type.LazyType) : this;
- flags |= INITIALIZED;
- }
+ flags |= SNDTIME;
+ Type tp = info();
+ flags &= ~SNDTIME;
+ } else {
+ assert !(rawInfoAt(id) instanceof Type.LazyType) : this;
+ flags |= INITIALIZED;
+ }
//System.out.println("done: " + this.name);//DEBUG
}
return rawInfoAt(id);