Removed HeapVariable from everywhere now that it is encapsulated in the Heap component.

5 files changed, 1 insertions, 13 deletions

diff --git a/BCT/BytecodeTranslator/ExpressionTraverser.cs b/BCT/BytecodeTranslator/ExpressionTraverser.cs
index bfe90f10..cf98f27a 100644
--- a/BCT/BytecodeTranslator/ExpressionTraverser.cs
+++ b/BCT/BytecodeTranslator/ExpressionTraverser.cs
@@ -23,8 +23,6 @@ namespace BytecodeTranslator
   public class ExpressionTraverser : BaseCodeTraverser

   {

 

-    // warning! this has to be replaced by a HeapVariable from outside

-    public readonly Bpl.Variable HeapVariable;

     public readonly Bpl.Variable ArrayContentsVariable;

     public readonly Bpl.Variable ArrayLengthVariable;

 

@@ -53,7 +51,6 @@ namespace BytecodeTranslator
     public ExpressionTraverser(Sink sink, StatementTraverser/*?*/ statementTraverser)

     {

       this.sink = sink;

-      HeapVariable = sink.HeapVariable;

       ArrayContentsVariable = sink.ArrayContentsVariable;

       ArrayLengthVariable = sink.ArrayLengthVariable;

       this.StmtTraverser = statementTraverser;

diff --git a/BCT/BytecodeTranslator/Heap.cs b/BCT/BytecodeTranslator/Heap.cs
index 1d5cb352..4fa5d2db 100644
--- a/BCT/BytecodeTranslator/Heap.cs
+++ b/BCT/BytecodeTranslator/Heap.cs
@@ -25,7 +25,7 @@ namespace BytecodeTranslator {
     public Heap(){

     }

 

-    public Bpl.Variable HeapVariable {

+    private Bpl.Variable HeapVariable {

       get { 

         if (this.heapVariable == null)

           this.heapVariable = new Bpl.GlobalVariable(Bpl.Token.NoToken, new Bpl.TypedIdent(Bpl.Token.NoToken, "$Heap", Bpl.Type.Int));

diff --git a/BCT/BytecodeTranslator/Readme.txt b/BCT/BytecodeTranslator/Readme.txt
index ed4652db..64cb820d 100644
--- a/BCT/BytecodeTranslator/Readme.txt
+++ b/BCT/BytecodeTranslator/Readme.txt
@@ -1,8 +1,5 @@
 Current Issues:

 

--	Just moved the assignement translation from statementtraverser to expressiontraverser

-	since it is in fact an expression. need to test it

-	

 -	The ordering of out params in a method call might be wrong // should be correct by now

 

 -	Testing the svn
\ No newline at end of file
diff --git a/BCT/BytecodeTranslator/Sink.cs b/BCT/BytecodeTranslator/Sink.cs
index 05166313..858444a6 100644
--- a/BCT/BytecodeTranslator/Sink.cs
+++ b/BCT/BytecodeTranslator/Sink.cs
@@ -36,10 +36,6 @@ namespace BytecodeTranslator {
     }

     readonly Heap heap;

 

-    public Bpl.Variable HeapVariable {

-      get { return this.Heap.HeapVariable; }

-    }

-

     public Bpl.Variable ArrayContentsVariable

     {

         get { return this.arrayContentsVariable; }

diff --git a/BCT/BytecodeTranslator/StatementTraverser.cs b/BCT/BytecodeTranslator/StatementTraverser.cs
index 446102e0..d29fe0e8 100644
--- a/BCT/BytecodeTranslator/StatementTraverser.cs
+++ b/BCT/BytecodeTranslator/StatementTraverser.cs
@@ -28,7 +28,6 @@ namespace BytecodeTranslator
 

     public readonly PdbReader/*?*/ PdbReader;

 

-    private readonly Bpl.Variable HeapVariable;

     private readonly Bpl.Variable ArrayContentsVariable;

     private readonly Bpl.Variable ArrayLengthVariable;

 

@@ -38,7 +37,6 @@ namespace BytecodeTranslator
     public StatementTraverser(Sink sink, PdbReader/*?*/ pdbReader) {

       this.sink = sink;

       this.factory = sink.Factory;

-      HeapVariable = sink.HeapVariable;

       PdbReader = pdbReader;

 

       ArrayContentsVariable = sink.ArrayContentsVariable;