Make MGenc a little less mutable

Signed-off-by: Stefan Marr <[email protected]>
SOM-st · Aug 25, 2020 · 7b2697d · 7b2697d
1 parent 16d08aa
commit 7b2697d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/src/som/compiler/MethodGenerationContext.java b/src/som/compiler/MethodGenerationContext.java
@@ -55,9 +55,10 @@
 
 public class MethodGenerationContext {
 
-  private ClassGenerationContext      holderGenc;
-  private MethodGenerationContext     outerGenc;
-  private boolean                     blockMethod;
+  private final ClassGenerationContext  holderGenc;
+  private final MethodGenerationContext outerGenc;
+  private final boolean                 blockMethod;
+
   private SSymbol                     signature;
   private final List<String>          arguments = new ArrayList<String>();
   private boolean                     primitive;
@@ -66,8 +67,21 @@ public class MethodGenerationContext {
   private boolean                     finished;
   private final ArrayList<Byte>       bytecode  = new ArrayList<>();
 
-  public void setHolder(final ClassGenerationContext cgenc) {
-    holderGenc = cgenc;
+  /**
+   * Constructor used for block methods.
+   */
+  public MethodGenerationContext(final ClassGenerationContext holderGenc,
+      final MethodGenerationContext outerGenc) {
+    this.holderGenc = holderGenc;
+    this.outerGenc = outerGenc;
+    blockMethod = outerGenc != null;
+  }
+
+  /**
+   * Constructor used for normal methods.
+   */
+  public MethodGenerationContext(final ClassGenerationContext holderGenc) {
+    this(holderGenc, null);
   }
 
   public void addArgument(final String arg) {
@@ -229,18 +243,10 @@ public boolean addLiteralIfAbsent(final SAbstractObject lit) {
     return true;
   }
 
-  public void setIsBlockMethod(final boolean isBlock) {
-    blockMethod = isBlock;
-  }
-
   public ClassGenerationContext getHolder() {
     return holderGenc;
   }
 
-  public void setOuter(final MethodGenerationContext mgenc) {
-    outerGenc = mgenc;
-  }
-
   public byte addLiteral(final SAbstractObject lit) {
     int i = literals.size();
     assert i < 128;

diff --git a/src/som/compiler/Parser.java b/src/som/compiler/Parser.java
@@ -202,8 +202,7 @@ public void classdef(final ClassGenerationContext cgenc) throws ProgramDefinitio
     instanceFields(cgenc);
     while (sym == Identifier || sym == Keyword || sym == OperatorSequence
         || symIn(binaryOpSyms)) {
-      MethodGenerationContext mgenc = new MethodGenerationContext();
-      mgenc.setHolder(cgenc);
+      MethodGenerationContext mgenc = new MethodGenerationContext(cgenc);
       mgenc.addArgument("self");
 
       method(mgenc);
@@ -220,8 +219,7 @@ public void classdef(final ClassGenerationContext cgenc) throws ProgramDefinitio
       classFields(cgenc);
       while (sym == Identifier || sym == Keyword || sym == OperatorSequence
           || symIn(binaryOpSyms)) {
-        MethodGenerationContext mgenc = new MethodGenerationContext();
-        mgenc.setHolder(cgenc);
+        MethodGenerationContext mgenc = new MethodGenerationContext(cgenc);
         mgenc.addArgument("self");
 
         method(mgenc);
@@ -561,11 +559,7 @@ private boolean primary(final MethodGenerationContext mgenc)
         nestedTerm(mgenc);
         break;
       case NewBlock: {
-        MethodGenerationContext bgenc = new MethodGenerationContext();
-        bgenc.setIsBlockMethod(true);
-        bgenc.setHolder(mgenc.getHolder());
-        bgenc.setOuter(mgenc);
-
+        MethodGenerationContext bgenc = new MethodGenerationContext(mgenc.getHolder(), mgenc);
         nestedBlock(bgenc);
 
         SMethod blockMethod = bgenc.assemble(universe);