910 - c++: call layer more coherent

2 files changed, 20 insertions, 16 deletions

diff --git a/cpp/012run b/cpp/012run
index 1a95f408..46a90b7f 100644
--- a/cpp/012run
+++ b/cpp/012run
@@ -72,22 +72,9 @@ void run(routine rr) {
     }
     // End Primitive Recipe Implementations.
     default: {
-      // unknown op = try to call a defined recipe
-      // TODO: this should be later, in the same layer as next_ingredient
-//?       cout << "non primitive op: " << instructions[pc].operation << '\n'; //? 1
-      if (Recipe.find(instructions[pc].operation) == Recipe.end()) {
-        raise << "undefined operation " << instructions[pc].operation << '\n';
-        break;
-      }
-//?       cout << "calling " << instructions[pc].operation << '\n'; //? 2
-      call callee(instructions[pc].operation);
-      for (vector<reagent>::iterator p = instructions[pc].ingredients.begin(); p != instructions[pc].ingredients.end(); ++p) {
-//?         cout << "push back: " << p->to_string() << '\n'; //? 1
-        callee.incoming_atoms.push_back(read_memory(*p));
-      }
-      rr.calls.push(callee);
-      continue;  // not done with caller; don't increment pc
-    }}
+      cout << "non primitive op: " << instructions[pc].operation << '\n';
+    }
+    }
     ++pc;
   }
 #undef TOP_RECIPE
diff --git a/cpp/020call b/cpp/020call
index 18c54e63..1a7c4b89 100644
--- a/cpp/020call
+++ b/cpp/020call
@@ -7,6 +7,23 @@ recipe f [
 ]
 +mem: storing in location 3
 
+:(replace{} "End Primitive Recipe Implementations." then "default:")
+default: {
+  // unknown op = try to call a defined recipe
+  if (Recipe.find(instructions[pc].operation) == Recipe.end()) {
+    raise << "undefined operation " << instructions[pc].operation << '\n';
+    break;
+  }
+//?   cout << "calling " << instructions[pc].operation << '\n'; //? 2
+  call callee(instructions[pc].operation);
+  for (vector<reagent>::iterator p = instructions[pc].ingredients.begin(); p != instructions[pc].ingredients.end(); ++p) {
+//?     cout << "push back: " << p->to_string() << '\n'; //? 1
+    callee.incoming_atoms.push_back(read_memory(*p));
+  }
+  rr.calls.push(callee);
+  continue;  // not done with caller; don't increment pc
+}
+
 :(scenario "next_ingredient")
 recipe main [
   f 2:literal