summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sources/scalac/transformer/AddAccessorsPhase.java3
-rw-r--r--sources/scalac/transformer/AddConstructorsPhase.java11
-rw-r--r--sources/scalac/transformer/AddInterfacesPhase.java3
-rw-r--r--sources/scalac/transformer/ErasurePhase.java4
-rw-r--r--sources/scalac/transformer/ExpandMixinsPhase.java3
-rw-r--r--sources/scalac/transformer/ExplicitOuterClassesPhase.java16
-rw-r--r--sources/scalac/transformer/LambdaLiftPhase.java3
-rw-r--r--sources/scalac/transformer/TransMatchPhase.java3
-rw-r--r--sources/scalac/transformer/UnCurryPhase.java3
-rw-r--r--sources/scalac/typechecker/AnalyzerPhase.java5
-rw-r--r--sources/scalac/typechecker/RefCheckPhase.java5
11 files changed, 38 insertions, 21 deletions
diff --git a/sources/scalac/transformer/AddAccessorsPhase.java b/sources/scalac/transformer/AddAccessorsPhase.java
index 7a55df17a8..7b65699989 100644
--- a/sources/scalac/transformer/AddAccessorsPhase.java
+++ b/sources/scalac/transformer/AddAccessorsPhase.java
@@ -36,7 +36,8 @@ public class AddAccessorsPhase extends PhaseDescriptor {
return new Checker[] {
new CheckSymbols(global),
new CheckTypes(global),
- new CheckOwners(global)
+ new CheckOwners(global),
+ new CheckNames(global)
};
}
}
diff --git a/sources/scalac/transformer/AddConstructorsPhase.java b/sources/scalac/transformer/AddConstructorsPhase.java
index 927d368bb3..7ea83ae584 100644
--- a/sources/scalac/transformer/AddConstructorsPhase.java
+++ b/sources/scalac/transformer/AddConstructorsPhase.java
@@ -12,7 +12,7 @@ package scalac.transformer;
import java.util.HashMap;
-//import scala.compiler.*;
+import scalac.checkers.*;
import scalac.Global;
import scalac.Phase;
import scalac.PhaseDescriptor;
@@ -38,4 +38,13 @@ public class AddConstructorsPhase extends PhaseDescriptor {
public Phase createPhase(Global global) {
return new AddConstructors(global, this, constructors);
}
+
+ public Checker[] postCheckers(Global global) {
+ return new Checker[] {
+ new CheckSymbols(global),
+ new CheckTypes(global),
+ new CheckOwners(global),
+ new CheckNames(global)
+ };
+ }
}
diff --git a/sources/scalac/transformer/AddInterfacesPhase.java b/sources/scalac/transformer/AddInterfacesPhase.java
index 47b30761c0..9f5caf9238 100644
--- a/sources/scalac/transformer/AddInterfacesPhase.java
+++ b/sources/scalac/transformer/AddInterfacesPhase.java
@@ -48,7 +48,8 @@ public class AddInterfacesPhase extends PhaseDescriptor {
return new Checker[] {
new CheckSymbols(global),
new CheckTypes(global),
- new CheckOwners(global)
+ new CheckOwners(global),
+ new CheckNames(global)
};
}
}
diff --git a/sources/scalac/transformer/ErasurePhase.java b/sources/scalac/transformer/ErasurePhase.java
index ed1ab1224e..3ba2294ccb 100644
--- a/sources/scalac/transformer/ErasurePhase.java
+++ b/sources/scalac/transformer/ErasurePhase.java
@@ -19,6 +19,7 @@ import scalac.checkers.Checker;
import scalac.checkers.CheckOwners;
import scalac.checkers.CheckSymbols;
import scalac.checkers.CheckTypes;
+import scalac.checkers.CheckNames;
import scalac.symtab.Definitions;
import scalac.symtab.Symbol;
import scalac.symtab.Type;
@@ -84,7 +85,8 @@ public class ErasurePhase extends PhaseDescriptor {
return new Checker[] {
new CheckSymbols(global),
new CheckTypes(global),
- new CheckOwners(global)
+ new CheckOwners(global),
+ new CheckNames(global)
};
}
}
diff --git a/sources/scalac/transformer/ExpandMixinsPhase.java b/sources/scalac/transformer/ExpandMixinsPhase.java
index fe9bfc259f..a1168b98cd 100644
--- a/sources/scalac/transformer/ExpandMixinsPhase.java
+++ b/sources/scalac/transformer/ExpandMixinsPhase.java
@@ -39,7 +39,8 @@ public class ExpandMixinsPhase extends PhaseDescriptor {
return new Checker[] {
new CheckSymbols(global),
new CheckTypes(global),
- new CheckOwners(global)
+ new CheckOwners(global),
+ new CheckNames(global)
};
}
}
diff --git a/sources/scalac/transformer/ExplicitOuterClassesPhase.java b/sources/scalac/transformer/ExplicitOuterClassesPhase.java
index 2e19af7fc0..d481ef329c 100644
--- a/sources/scalac/transformer/ExplicitOuterClassesPhase.java
+++ b/sources/scalac/transformer/ExplicitOuterClassesPhase.java
@@ -11,6 +11,7 @@
package scalac.transformer;
import scalac.*;
+import scalac.checkers.*;
public class ExplicitOuterClassesPhase extends PhaseDescriptor {
public String name () {
@@ -29,11 +30,12 @@ public class ExplicitOuterClassesPhase extends PhaseDescriptor {
return new ExplicitOuterClasses(global, this);
}
-// public Checker[] postCheckers(Global global) {
-// return new Checker[] {
-// new CheckSymbols(global),
-// new CheckTypes(global),
-// new CheckOwners(global)
-// };
-// }
+ public Checker[] postCheckers(Global global) {
+ return new Checker[] {
+ new CheckSymbols(global),
+ new CheckTypes(global),
+ new CheckOwners(global),
+ new CheckNames(global)
+ };
+ }
}
diff --git a/sources/scalac/transformer/LambdaLiftPhase.java b/sources/scalac/transformer/LambdaLiftPhase.java
index 0bfc7f6812..4b86c37acf 100644
--- a/sources/scalac/transformer/LambdaLiftPhase.java
+++ b/sources/scalac/transformer/LambdaLiftPhase.java
@@ -132,7 +132,8 @@ public class LambdaLiftPhase extends PhaseDescriptor implements Kinds, Modifiers
return new Checker[] {
new CheckSymbols(global),
new CheckTypes(global),
- new CheckOwners(global)
+ new CheckOwners(global),
+ new CheckNames(global)
};
}
}
diff --git a/sources/scalac/transformer/TransMatchPhase.java b/sources/scalac/transformer/TransMatchPhase.java
index f27923af93..8c5692db91 100644
--- a/sources/scalac/transformer/TransMatchPhase.java
+++ b/sources/scalac/transformer/TransMatchPhase.java
@@ -33,7 +33,8 @@ public class TransMatchPhase extends PhaseDescriptor {
return new Checker[] {
new CheckSymbols(global),
new CheckTypes(global),
- new CheckOwners(global)
+ new CheckOwners(global),
+ new CheckNames(global)
};
}
}
diff --git a/sources/scalac/transformer/UnCurryPhase.java b/sources/scalac/transformer/UnCurryPhase.java
index 8d8ea7c87c..ed18af3a14 100644
--- a/sources/scalac/transformer/UnCurryPhase.java
+++ b/sources/scalac/transformer/UnCurryPhase.java
@@ -109,7 +109,8 @@ public class UnCurryPhase extends PhaseDescriptor implements Modifiers {
return new Checker[] {
new CheckSymbols(global),
new CheckTypes(global),
- new CheckOwners(global)
+ new CheckOwners(global),
+ new CheckNames(global)
};
}
}
diff --git a/sources/scalac/typechecker/AnalyzerPhase.java b/sources/scalac/typechecker/AnalyzerPhase.java
index 1ad29b872a..e0802f50b3 100644
--- a/sources/scalac/typechecker/AnalyzerPhase.java
+++ b/sources/scalac/typechecker/AnalyzerPhase.java
@@ -97,11 +97,10 @@ public class AnalyzerPhase extends PhaseDescriptor {
public Checker[] postCheckers(Global global) {
return new Checker[] {
- /* todo: uncomment
new CheckSymbols(global),
new CheckTypes(global),
- new CheckOwners(global)
- */
+ new CheckOwners(global),
+ new CheckNames(global)
};
}
}
diff --git a/sources/scalac/typechecker/RefCheckPhase.java b/sources/scalac/typechecker/RefCheckPhase.java
index 6c1fdb08a2..855731f450 100644
--- a/sources/scalac/typechecker/RefCheckPhase.java
+++ b/sources/scalac/typechecker/RefCheckPhase.java
@@ -32,11 +32,10 @@ public class RefCheckPhase extends PhaseDescriptor {
public Checker[] postCheckers(Global global) {
return new Checker[] {
- /* todo: uncomment
new CheckSymbols(global),
new CheckTypes(global),
- new CheckOwners(global)
- */
+ new CheckOwners(global),
+ new CheckNames(global)
};
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 07:04:14 +0000