Fixes aforementioned index_of issue.

2 files changed, 16 insertions, 7 deletions

diff --git a/src/core/src/tonkadur/wyrd/v1/compiler/fate/v1/ComputationCompiler.java b/src/core/src/tonkadur/wyrd/v1/compiler/fate/v1/ComputationCompiler.java
index 2731e78..7a9d223 100644
--- a/src/core/src/tonkadur/wyrd/v1/compiler/fate/v1/ComputationCompiler.java
+++ b/src/core/src/tonkadur/wyrd/v1/compiler/fate/v1/ComputationCompiler.java
@@ -177,6 +177,8 @@ implements tonkadur.fate.v1.lang.meta.ComputationVisitor
 
       n.get_parent().get_visited_by(cc);
 
+      assimilate(cc);
+
       target_type = TypeCompiler.compile(compiler, n.get_type());
 
       if (target_type.equals(cc.get_computation().get_type()))
@@ -1324,10 +1326,16 @@ implements tonkadur.fate.v1.lang.meta.ComputationVisitor
    )
    throws Throwable
    {
-      n.get_value().get_visited_by(this);
+      final ComputationCompiler cc;
+
+      cc = new ComputationCompiler(compiler);
+
+      n.get_value().get_visited_by(cc);
+
+      assimilate(cc);
 
       result_as_computation =
-         new RichText(Collections.singletonList(get_computation()));
+         new RichText(Collections.singletonList(cc.get_computation()));
    }
 
    @Override
diff --git a/src/core/src/tonkadur/wyrd/v1/compiler/fate/v1/InstructionCompiler.java b/src/core/src/tonkadur/wyrd/v1/compiler/fate/v1/InstructionCompiler.java
index 3ae8a3a..3bbde05 100644
--- a/src/core/src/tonkadur/wyrd/v1/compiler/fate/v1/InstructionCompiler.java
+++ b/src/core/src/tonkadur/wyrd/v1/compiler/fate/v1/InstructionCompiler.java
@@ -194,7 +194,6 @@ implements tonkadur.fate.v1.lang.meta.InstructionVisitor
 
       ae.get_collection().get_visited_by(reference_compiler);
 
-      collection_as_ref = reference_compiler.get_ref();
 
       if (reference_compiler.has_init())
       {
@@ -206,6 +205,8 @@ implements tonkadur.fate.v1.lang.meta.InstructionVisitor
          result.add(element_compiler.get_init());
       }
 
+      collection_as_ref = reference_compiler.get_ref();
+
       result.add
       (
          new SetValue
@@ -320,13 +321,13 @@ implements tonkadur.fate.v1.lang.meta.InstructionVisitor
 
       c.get_collection().get_visited_by(reference_compiler);
 
-      collection_ref = reference_compiler.get_ref();
-
       if (reference_compiler.has_init())
       {
          result.add(reference_compiler.get_init());
       }
 
+      collection_ref = reference_compiler.get_ref();
+
       result.add
       (
          Clear.generate
@@ -359,13 +360,13 @@ implements tonkadur.fate.v1.lang.meta.InstructionVisitor
 
       n.get_collection().get_visited_by(reference_compiler);
 
-      collection_ref = reference_compiler.get_ref();
-
       if (reference_compiler.has_init())
       {
          result.add(reference_compiler.get_init());
       }
 
+      collection_ref = reference_compiler.get_ref();
+
       result.add
       (
          ReverseList.generate