1229

7 files changed, 19 insertions, 19 deletions

diff --git a/cpp/.traces/new_concurrent b/cpp/.traces/new_concurrent
index a21c2fe6..fe3a1a01 100644
--- a/cpp/.traces/new_concurrent
+++ b/cpp/.traces/new_concurrent
@@ -1,4 +1,4 @@
-parse/0: instruction: run
+parse/0: instruction: start-running
 parse/0:   ingredient: {name: "f2", value: 0, type: 0, properties: ["f2": "recipe"]}
 parse/0: instruction: new
 parse/0:   ingredient: {name: "integer", value: 0, type: 0, properties: ["integer": "type"]}
@@ -13,7 +13,7 @@ parse/0:   product: {name: "3", value: 0, type: 3, properties: ["3": "boolean",
 new/0: integer -> 1
 new/0: integer -> 1
 after-brace/0: recipe f1
-after-brace/0: run ...
+after-brace/0: start-running ...
 after-brace/0: new ...
 after-brace/0: recipe f2
 after-brace/0: new ...
@@ -21,7 +21,7 @@ after-brace/0: equal ...
 new/0: routine allocated memory from 1000 to 101000
 schedule/0: f1
 run/0: instruction f1/0
-run/0: run {name: "f2", value: 0, type: 0, properties: ["f2": "recipe"]}
+run/0: start-running {name: "f2", value: 0, type: 0, properties: ["f2": "recipe"]}
 run/0: ingredient 0 is f2
 new/0: routine allocated memory from 101000 to 201000
 run/0: instruction f1/1
diff --git a/cpp/.traces/scheduler b/cpp/.traces/scheduler
index 072dbcdb..a2124020 100644
--- a/cpp/.traces/scheduler
+++ b/cpp/.traces/scheduler
@@ -1,4 +1,4 @@
-parse/0: instruction: run
+parse/0: instruction: start-running
 parse/0:   ingredient: {name: "f2", value: 0, type: 0, properties: ["f2": "recipe"]}
 parse/0: instruction: copy
 parse/0:   ingredient: {name: "3", value: 0, type: 0, properties: ["3": "literal"]}
@@ -7,14 +7,14 @@ parse/0: instruction: copy
 parse/0:   ingredient: {name: "4", value: 0, type: 0, properties: ["4": "literal"]}
 parse/0:   product: {name: "2", value: 0, type: 1, properties: ["2": "integer"]}
 after-brace/0: recipe f1
-after-brace/0: run ...
+after-brace/0: start-running ...
 after-brace/0: copy ...
 after-brace/0: recipe f2
 after-brace/0: copy ...
 new/0: routine allocated memory from 1000 to 101000
 schedule/0: f1
 run/0: instruction f1/0
-run/0: run {name: "f2", value: 0, type: 0, properties: ["f2": "recipe"]}
+run/0: start-running {name: "f2", value: 0, type: 0, properties: ["f2": "recipe"]}
 run/0: ingredient 0 is f2
 new/0: routine allocated memory from 101000 to 201000
 run/0: instruction f1/1
diff --git a/cpp/.traces/scheduler_interleaves_routines b/cpp/.traces/scheduler_interleaves_routines
index 35b25d6e..60b6cda4 100644
--- a/cpp/.traces/scheduler_interleaves_routines
+++ b/cpp/.traces/scheduler_interleaves_routines
@@ -1,4 +1,4 @@
-parse/0: instruction: run
+parse/0: instruction: start-running
 parse/0:   ingredient: {name: "f2", value: 0, type: 0, properties: ["f2": "recipe"]}
 parse/0: instruction: copy
 parse/0:   ingredient: {name: "0", value: 0, type: 0, properties: ["0": "literal"]}
@@ -13,7 +13,7 @@ parse/0: instruction: copy
 parse/0:   ingredient: {name: "4", value: 0, type: 0, properties: ["4": "literal"]}
 parse/0:   product: {name: "4", value: 0, type: 1, properties: ["4": "integer"]}
 after-brace/0: recipe f1
-after-brace/0: run ...
+after-brace/0: start-running ...
 after-brace/0: copy ...
 after-brace/0: copy ...
 after-brace/0: recipe f2
@@ -22,7 +22,7 @@ after-brace/0: copy ...
 new/0: routine allocated memory from 1000 to 101000
 schedule/0: f1
 run/0: instruction f1/0
-run/0: run {name: "f2", value: 0, type: 0, properties: ["f2": "recipe"]}
+run/0: start-running {name: "f2", value: 0, type: 0, properties: ["f2": "recipe"]}
 run/0: ingredient 0 is f2
 new/0: routine allocated memory from 101000 to 201000
 schedule/0: f2
diff --git a/cpp/.traces/wait_for_location b/cpp/.traces/wait_for_location
index 1cabe1a7..2c357378 100644
--- a/cpp/.traces/wait_for_location
+++ b/cpp/.traces/wait_for_location
@@ -1,7 +1,7 @@
 parse/0: instruction: copy
 parse/0:   ingredient: {name: "0", value: 0, type: 0, properties: ["0": "literal"]}
 parse/0:   product: {name: "1", value: 0, type: 1, properties: ["1": "integer"]}
-parse/0: instruction: run
+parse/0: instruction: start-running
 parse/0:   ingredient: {name: "f2", value: 0, type: 0, properties: ["f2": "recipe"]}
 parse/0: instruction: wait-for-location
 parse/0:   ingredient: {name: "1", value: 0, type: 1, properties: ["1": "integer"]}
@@ -13,7 +13,7 @@ parse/0:   ingredient: {name: "34", value: 0, type: 0, properties: ["34": "liter
 parse/0:   product: {name: "1", value: 0, type: 1, properties: ["1": "integer"]}
 after-brace/0: recipe f1
 after-brace/0: copy ...
-after-brace/0: run ...
+after-brace/0: start-running ...
 after-brace/0: wait-for-location ...
 after-brace/0: copy ...
 after-brace/0: recipe f2
@@ -25,7 +25,7 @@ run/0: {name: "1", value: 1, type: 1, properties: ["1": "integer"]} <- copy {nam
 run/0: ingredient 0 is 0
 mem/0: storing 0 in location 1
 run/0: instruction f1/1
-run/0: run {name: "f2", value: 0, type: 0, properties: ["f2": "recipe"]}
+run/0: start-running {name: "f2", value: 0, type: 0, properties: ["f2": "recipe"]}
 run/0: ingredient 0 is f2
 new/0: routine allocated memory from 101000 to 201000
 run/0: instruction f1/2
diff --git a/cpp/038scheduler.cc b/cpp/038scheduler.cc
index 76b90933..3550ff1f 100644
--- a/cpp/038scheduler.cc
+++ b/cpp/038scheduler.cc
@@ -3,7 +3,7 @@
 
 :(scenario scheduler)
 recipe f1 [
-  run f2:recipe
+  start-running f2:recipe
   1:integer <- copy 3:literal
 ]
 recipe f2 [
@@ -86,11 +86,11 @@ for (size_t i = 0; i < Routines.size(); ++i)
 Routines.clear();
 
 :(before "End Primitive Recipe Declarations")
-RUN,
+START_RUNNING,
 :(before "End Primitive Recipe Numbers")
-Recipe_number["run"] = RUN;
+Recipe_number["start-running"] = START_RUNNING;
 :(before "End Primitive Recipe Implementations")
-case RUN: {
+case START_RUNNING: {
   trace("run") << "ingredient 0 is " << current_instruction().ingredients[0].name;
   assert(!current_instruction().ingredients[0].initialized);
   Routines.push_back(new routine(Recipe_number[current_instruction().ingredients[0].name]));
@@ -100,7 +100,7 @@ case RUN: {
 :(scenario scheduler_interleaves_routines)
 % Scheduling_interval = 1;
 recipe f1 [
-  run f2:recipe
+  start-running f2:recipe
   1:integer <- copy 0:literal
   2:integer <- copy 0:literal
 ]
diff --git a/cpp/039wait.cc b/cpp/039wait.cc
index 56707b7c..b9cf6bcf 100644
--- a/cpp/039wait.cc
+++ b/cpp/039wait.cc
@@ -6,7 +6,7 @@
 :(scenario "wait_for_location")
 recipe f1 [
   1:integer <- copy 0:literal
-  run f2:recipe
+  start-running f2:recipe
   wait-for-location 1:integer
   # now wait for f2 to run and modify location 1 before using its value
   2:integer <- copy 1:integer
diff --git a/cpp/042new.cc b/cpp/042new.cc
index 4639beb5..e1dc7d36 100644
--- a/cpp/042new.cc
+++ b/cpp/042new.cc
@@ -109,7 +109,7 @@ recipe main [
 //: Make sure that each routine gets a different alloc to start.
 :(scenario new_concurrent)
 recipe f1 [
-  run f2:recipe
+  start-running f2:recipe
   1:address:integer/raw <- new integer:type
 ]
 recipe f2 [