Introduced cloneForInlining

Signed-off-by: Stefan Marr <git@stefan-marr.de>

Author: smarr

src/som/interpreter/nodes/ExpressionNode.java

@@ -29,4 +29,6 @@ public abstract class ExpressionNode extends SOMNode {
 
   public abstract Object executeGeneric(VirtualFrame frame);
 
+  public abstract ExpressionNode cloneForInlining();
+
 }

src/som/interpreter/nodes/FieldNode.java

@@ -58,6 +58,11 @@ public Object executeGeneric(VirtualFrame frame) {
       Object self = getSelfFromMaterialized(ctx);
       return self.getField(fieldIndex);
     }
+
+    @Override
+    public ExpressionNode cloneForInlining() {
+      return this;
+    }
   }
 
   public static class FieldWriteNode extends FieldNode {
@@ -80,5 +85,10 @@ public Object executeGeneric(VirtualFrame frame) {
       self.setField(fieldIndex, value);
       return value;
     }
+
+    @Override
+    public ExpressionNode cloneForInlining() {
+      return new FieldWriteNode(fieldIndex, contextLevel, exp.cloneForInlining());
+    }
   }
 }

src/som/interpreter/nodes/GlobalNode.java

@@ -50,7 +50,7 @@ protected Object getSelfFromVirtual(final VirtualFrame frame) {
 
   public static class GlobalReadNode extends GlobalNode {
 
-    public GlobalReadNode(final Symbol globalName, final Universe  universe) {
+    public GlobalReadNode(final Symbol globalName, final Universe universe) {
       super(globalName, universe);
     }
 
@@ -69,4 +69,9 @@ public Object executeGeneric(VirtualFrame frame) {
       }
     }
   }
+
+  @Override
+  public ExpressionNode cloneForInlining() {
+    return this;
+  }
 }

src/som/interpreter/nodes/LiteralNode.java

@@ -40,6 +40,11 @@ public Object executeGeneric(VirtualFrame frame) {
     return this.value;
   }
 
+  @Override
+  public ExpressionNode cloneForInlining() {
+    return this;
+  }
+
   public static class BlockNode extends LiteralNode {
 
     protected final Universe universe;
@@ -55,5 +60,7 @@ public Object executeGeneric(VirtualFrame frame) {
       Method method = (Method) value;
       return universe.newBlock(method, frame.materialize(), method.getNumberOfArguments());
     }
+
+    // TODO: should we do something else for cloneForInlining() in this class?
   }
 }

src/som/interpreter/nodes/MessageNode.java

@@ -55,6 +55,14 @@ public MessageNode(final ExpressionNode receiver,
     this.universe  = universe;
   }
 
+  /**
+   * @return uninitialized node to allow for specialization
+   */
+  @Override
+  public ExpressionNode cloneForInlining() {
+    return new MessageNode(receiver, arguments, selector, universe);
+  }
+
   protected Object[] determineArguments(final VirtualFrame frame) {
     int numArgs = (arguments == null) ? 0 : arguments.length;
 

src/som/interpreter/nodes/ReturnNonLocalNode.java

@@ -81,4 +81,10 @@ public Object executeGeneric(VirtualFrame frame) {
       return self.sendEscapedBlock(block, universe, frame.pack());
     }
   }
+
+  @Override
+  public ExpressionNode cloneForInlining() {
+    return new ReturnNonLocalNode(expression.cloneForInlining(), contextLevel,
+        universe);
+  }
 }

src/som/interpreter/nodes/SequenceNode.java

@@ -45,4 +45,14 @@ public Object executeGeneric(VirtualFrame frame) {
     return last;
   }
 
+  @Override
+  public ExpressionNode cloneForInlining() {
+    ExpressionNode[] exprs = new ExpressionNode[expressions.length];
+
+    for (int i = 0; i < expressions.length; i++) {
+      exprs[i] = expressions[i].cloneForInlining();
+    }
+
+    return new SequenceNode(exprs);
+  }
 }

src/som/interpreter/nodes/VariableNode.java

@@ -58,6 +58,10 @@ public Object executeGeneric(VirtualFrame frame) {
       }
     }
 
+    @Override
+    public ExpressionNode cloneForInlining() {
+      return this;
+    }
   }
 
   public static class SelfReadNode extends VariableReadNode {
@@ -92,5 +96,10 @@ public Object executeGeneric(VirtualFrame frame) {
       }
       return result;
     }
+
+    @Override
+    public ExpressionNode cloneForInlining() {
+      return new VariableWriteNode(slot, contextLevel, exp.cloneForInlining());
+    }
   }
 }