summaryrefslogtreecommitdiff
path: root/sources/scalac/backend/msil
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2004-07-01 14:03:41 +0000
committerMartin Odersky <odersky@gmail.com>2004-07-01 14:03:41 +0000
commitcffaae565155f3ffa95865dc469c1a1d7cbe0498 (patch)
tree4db08d4a30af008e2deeb4ee2ea45f0d69aa7654 /sources/scalac/backend/msil
parentc8065927475a558d9ad4580dedcc1b91296f9da4 (diff)
downloadscala-cffaae565155f3ffa95865dc469c1a1d7cbe0498.tar.gz
scala-cffaae565155f3ffa95865dc469c1a1d7cbe0498.tar.bz2
scala-cffaae565155f3ffa95865dc469c1a1d7cbe0498.zip
*** empty log message ***
Diffstat (limited to 'sources/scalac/backend/msil')
-rw-r--r--sources/scalac/backend/msil/GenMSIL.java6
-rw-r--r--sources/scalac/backend/msil/GenMSILPhase.java4
-rw-r--r--sources/scalac/backend/msil/TypeCreator.java10
3 files changed, 10 insertions, 10 deletions
diff --git a/sources/scalac/backend/msil/GenMSIL.java b/sources/scalac/backend/msil/GenMSIL.java
index 867f175209..c1c890442a 100644
--- a/sources/scalac/backend/msil/GenMSIL.java
+++ b/sources/scalac/backend/msil/GenMSIL.java
@@ -9,7 +9,7 @@
package scalac.backend.msil;
import scalac.Global;
-import scalac.Unit;
+import scalac.CompilationUnit;
import scalac.util.Debug;
@@ -92,13 +92,13 @@ public final class GenMSIL {
}
// keeps track of the current compilation unit for better error reporting
- private Unit currUnit;
+ private CompilationUnit currUnit;
/**
* The main entry point into the code generator. Called from GenMSILPhase
* for every compilation unit.
*/
- public void apply(Unit unit) {
+ public void apply(CompilationUnit unit) {
currUnit = unit;
// try {
for (int i = 0; i < unit.body.length; i++) {
diff --git a/sources/scalac/backend/msil/GenMSILPhase.java b/sources/scalac/backend/msil/GenMSILPhase.java
index 86d0b63307..a12a0c2d52 100644
--- a/sources/scalac/backend/msil/GenMSILPhase.java
+++ b/sources/scalac/backend/msil/GenMSILPhase.java
@@ -11,7 +11,7 @@ package scalac.backend.msil;
import scalac.Global;
import scalac.Phase;
import scalac.PhaseDescriptor;
-import scalac.Unit;
+import scalac.CompilationUnit;
import java.util.HashMap;
@@ -45,7 +45,7 @@ public class GenMSILPhase extends Phase {
// Public Methods
/** Applies this phase to the given compilation units. */
- public void apply(Unit[] units) {
+ public void apply(CompilationUnit[] units) {
tc.init();
tc.collectSymbols(units);
tc.initAssembly();
diff --git a/sources/scalac/backend/msil/TypeCreator.java b/sources/scalac/backend/msil/TypeCreator.java
index 1e8cd25384..35c01d4615 100644
--- a/sources/scalac/backend/msil/TypeCreator.java
+++ b/sources/scalac/backend/msil/TypeCreator.java
@@ -9,7 +9,7 @@
package scalac.backend.msil;
import scalac.Global;
-import scalac.Unit;
+import scalac.CompilationUnit;
import scalac.ApplicationError;
import scalac.ast.Tree;
import scalac.ast.Traverser;
@@ -442,7 +442,7 @@ final class TypeCreator {
return moreThanOneEntryPoint;
}
- private Unit entryPointUnit;
+ private CompilationUnit entryPointUnit;
private int entryPointPos;
@@ -450,7 +450,7 @@ final class TypeCreator {
* - collects all entry points
* - gives the name of the new assembly
*/
- public void collectSymbols(Unit[] units) {
+ public void collectSymbols(CompilationUnit[] units) {
types2create.clear();
entryPoint = null;
new CollectSymbols().traverse(units);
@@ -491,8 +491,8 @@ final class TypeCreator {
* in the program and all entry points.
*/
private final class CollectSymbols extends Traverser {
- private Unit currUnit;
- public void traverse(Unit unit) {
+ private CompilationUnit currUnit;
+ public void traverse(CompilationUnit unit) {
currUnit = unit;
if (entryPointUnit == null)
entryPointUnit = unit;