From 6eec184e408fdc70497edabd59415cf14e394bcf Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Fri, 20 Feb 2015 23:23:09 -0800
Subject: 803

---
 cpp/017and-record | 115 ------------------------------------------------------
 cpp/017record     | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+), 115 deletions(-)
 delete mode 100644 cpp/017and-record
 create mode 100644 cpp/017record

(limited to 'cpp')

diff --git a/cpp/017and-record b/cpp/017and-record
deleted file mode 100644
index 359fd2bc..00000000
--- a/cpp/017and-record
+++ /dev/null
@@ -1,115 +0,0 @@
-// Support for records.
-:(before "End Mu Types")
-// We'll use this record as a running example, with two fields: an integer and
-// a boolean.
-int integer_boolean = Type_number["integer-boolean"] = Next_type_number++;
-Type[integer_boolean].size = 2;
-Type[integer_boolean].is_record = true;
-vector<type_number> i;
-i.push_back(integer);
-Type[integer_boolean].elements.push_back(i);
-vector<type_number> b;
-b.push_back(boolean);
-Type[integer_boolean].elements.push_back(b);
-
-:(scenario copy_multiple_locations)
-# Records can be copied around with a single instruction just like integers,
-# no matter how large they are.
-recipe main [
-  1:integer <- copy 34:literal
-  2:boolean <- copy 0:literal
-  3:integer-boolean <- copy 1:integer-boolean
-]
-+run: ingredient 0 is 1
-+mem: location 1 is 34
-+mem: location 2 is 0
-+mem: storing in location 3
-+mem: storing in location 4
-
-:(before "End Globals")
-// Operator to look at fields of records.
-const int GET = 18;
-:(before "End Primitive Recipe Numbers")
-Recipe_number["get"] = GET;
-Next_recipe_number++;
-:(before "End Primitive Recipe Implementations")
-case GET: {
-  trace("run") << "ingredient 0 is " << instructions[pc].ingredients[0].name;
-  int base_address = to_int(instructions[pc].ingredients[0].name);
-  trace("run") << "base address " << base_address;
-  int base_type = instructions[pc].ingredients[0].types[0];
-  trace("run") << "base type is " << base_type;
-  trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name;
-  assert(instructions[pc].ingredients[1].types.size() == 1);
-  assert(instructions[pc].ingredients[1].types[0] == 0);  // must be literal
-  size_t offset = to_int(instructions[pc].ingredients[1].name);
-  int src = base_address+offset;
-  trace("run") << "address to copy is " << src;
-  assert(Type[base_type].is_record);
-  assert(Type[base_type].elements.size() > offset);
-  int src_type = Type[base_type].elements[offset][0];
-  trace("run") << "its type is " << src_type;
-  ostringstream s;
-  s << src;
-  reagent tmp(s.str());
-  tmp.types[0] = src_type;
-  vector<int> result(read_memory(tmp));
-  trace("run") << "product 0 is " << result[0];
-  write_memory(instructions[pc].products[0], result);
-  break;
-}
-
-:(scenario "get")
-recipe main [
-  12:integer <- copy 34:literal
-  13:boolean <- copy 0:literal
-  15:boolean <- get 12:integer-boolean, 1:offset
-]
-+run: instruction 2
-+run: ingredient 0 is 12
-+run: base address 12
-+run: ingredient 1 is 1
-+run: address to copy is 13
-+run: its type is 2
-+mem: location 13 is 0
-+run: product 0 is 0
-+mem: storing in location 15
-
-:(before "End Globals")
-// To write to fields of records, you need their address.
-const int GET_ADDRESS = 19;
-:(before "End Primitive Recipe Numbers")
-Recipe_number["get-address"] = GET_ADDRESS;
-Next_recipe_number++;
-:(before "End Primitive Recipe Implementations")
-case GET_ADDRESS: {
-  trace("run") << "ingredient 0 is " << instructions[pc].ingredients[0].name;
-  int base_address = to_int(instructions[pc].ingredients[0].name);
-  trace("run") << "base address " << base_address;
-  int base_type = instructions[pc].ingredients[0].types[0];
-  trace("run") << "base type is " << base_type;
-  trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name;
-  assert(instructions[pc].ingredients[1].types.size() == 1);
-  assert(instructions[pc].ingredients[1].types[0] == 0);  // must be literal
-  size_t offset = to_int(instructions[pc].ingredients[1].name);
-  int src = base_address+offset;
-  trace("run") << "address to copy is " << src;
-  vector<int> result;
-  result.push_back(src);
-  trace("run") << "product 0 is " << result[0];
-  write_memory(instructions[pc].products[0], result);
-  break;
-}
-
-:(scenario "get_address")
-recipe main [
-  12:integer <- copy 34:literal
-  13:boolean <- copy 0:literal
-  15:integer <- get-address 12:integer-boolean, 1:offset  # todo: product is an address
-]
-+run: instruction 2
-+run: ingredient 0 is 12
-+run: base address 12
-+run: ingredient 1 is 1
-+run: address to copy is 13
-+mem: storing in location 15
diff --git a/cpp/017record b/cpp/017record
new file mode 100644
index 00000000..359fd2bc
--- /dev/null
+++ b/cpp/017record
@@ -0,0 +1,115 @@
+// Support for records.
+:(before "End Mu Types")
+// We'll use this record as a running example, with two fields: an integer and
+// a boolean.
+int integer_boolean = Type_number["integer-boolean"] = Next_type_number++;
+Type[integer_boolean].size = 2;
+Type[integer_boolean].is_record = true;
+vector<type_number> i;
+i.push_back(integer);
+Type[integer_boolean].elements.push_back(i);
+vector<type_number> b;
+b.push_back(boolean);
+Type[integer_boolean].elements.push_back(b);
+
+:(scenario copy_multiple_locations)
+# Records can be copied around with a single instruction just like integers,
+# no matter how large they are.
+recipe main [
+  1:integer <- copy 34:literal
+  2:boolean <- copy 0:literal
+  3:integer-boolean <- copy 1:integer-boolean
+]
++run: ingredient 0 is 1
++mem: location 1 is 34
++mem: location 2 is 0
++mem: storing in location 3
++mem: storing in location 4
+
+:(before "End Globals")
+// Operator to look at fields of records.
+const int GET = 18;
+:(before "End Primitive Recipe Numbers")
+Recipe_number["get"] = GET;
+Next_recipe_number++;
+:(before "End Primitive Recipe Implementations")
+case GET: {
+  trace("run") << "ingredient 0 is " << instructions[pc].ingredients[0].name;
+  int base_address = to_int(instructions[pc].ingredients[0].name);
+  trace("run") << "base address " << base_address;
+  int base_type = instructions[pc].ingredients[0].types[0];
+  trace("run") << "base type is " << base_type;
+  trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name;
+  assert(instructions[pc].ingredients[1].types.size() == 1);
+  assert(instructions[pc].ingredients[1].types[0] == 0);  // must be literal
+  size_t offset = to_int(instructions[pc].ingredients[1].name);
+  int src = base_address+offset;
+  trace("run") << "address to copy is " << src;
+  assert(Type[base_type].is_record);
+  assert(Type[base_type].elements.size() > offset);
+  int src_type = Type[base_type].elements[offset][0];
+  trace("run") << "its type is " << src_type;
+  ostringstream s;
+  s << src;
+  reagent tmp(s.str());
+  tmp.types[0] = src_type;
+  vector<int> result(read_memory(tmp));
+  trace("run") << "product 0 is " << result[0];
+  write_memory(instructions[pc].products[0], result);
+  break;
+}
+
+:(scenario "get")
+recipe main [
+  12:integer <- copy 34:literal
+  13:boolean <- copy 0:literal
+  15:boolean <- get 12:integer-boolean, 1:offset
+]
++run: instruction 2
++run: ingredient 0 is 12
++run: base address 12
++run: ingredient 1 is 1
++run: address to copy is 13
++run: its type is 2
++mem: location 13 is 0
++run: product 0 is 0
++mem: storing in location 15
+
+:(before "End Globals")
+// To write to fields of records, you need their address.
+const int GET_ADDRESS = 19;
+:(before "End Primitive Recipe Numbers")
+Recipe_number["get-address"] = GET_ADDRESS;
+Next_recipe_number++;
+:(before "End Primitive Recipe Implementations")
+case GET_ADDRESS: {
+  trace("run") << "ingredient 0 is " << instructions[pc].ingredients[0].name;
+  int base_address = to_int(instructions[pc].ingredients[0].name);
+  trace("run") << "base address " << base_address;
+  int base_type = instructions[pc].ingredients[0].types[0];
+  trace("run") << "base type is " << base_type;
+  trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name;
+  assert(instructions[pc].ingredients[1].types.size() == 1);
+  assert(instructions[pc].ingredients[1].types[0] == 0);  // must be literal
+  size_t offset = to_int(instructions[pc].ingredients[1].name);
+  int src = base_address+offset;
+  trace("run") << "address to copy is " << src;
+  vector<int> result;
+  result.push_back(src);
+  trace("run") << "product 0 is " << result[0];
+  write_memory(instructions[pc].products[0], result);
+  break;
+}
+
+:(scenario "get_address")
+recipe main [
+  12:integer <- copy 34:literal
+  13:boolean <- copy 0:literal
+  15:integer <- get-address 12:integer-boolean, 1:offset  # todo: product is an address
+]
++run: instruction 2
++run: ingredient 0 is 12
++run: base address 12
++run: ingredient 1 is 1
++run: address to copy is 13
++mem: storing in location 15
-- 
cgit 1.4.1-2-gfad0