From 3076bab4b62ce2b56c53db6d0b1715429c5bda27 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Thu, 26 Mar 2015 20:24:38 -0700 Subject: 979 --- cpp/013run | 5 ++++- cpp/018record | 12 +++--------- cpp/019address | 10 +++------- cpp/020array | 23 ++++++++--------------- 4 files changed, 18 insertions(+), 32 deletions(-) diff --git a/cpp/013run b/cpp/013run index ef608cb6..9790bfdd 100644 --- a/cpp/013run +++ b/cpp/013run @@ -147,7 +147,10 @@ void write_memory(reagent x, vector data) { :(code) size_t size_of(const reagent& r) { - type_info t = Type[r.types[0]]; + return size_of(r.types); +} +size_t size_of(const vector& types) { + type_info t = Type[types[0]]; // End size_of Cases. return t.size; } diff --git a/cpp/018record b/cpp/018record index 5c1715a4..55c4df0d 100644 --- a/cpp/018record +++ b/cpp/018record @@ -43,9 +43,7 @@ case GET: { size_t offset = instructions[pc].ingredients[1].value; int src = base_address; for (size_t i = 0; i < offset; ++i) { - reagent tmp; - tmp.types.push_back(Type[base_type].elements[i][0]); - src += size_of(tmp); + src += size_of(Type[base_type].elements[i]); } trace("run") << "address to copy is " << src; assert(Type[base_type].elements.size() > offset); @@ -121,9 +119,7 @@ case GET_ADDRESS: { size_t offset = instructions[pc].ingredients[1].value; int src = base_address; for (size_t i = 0; i < offset; ++i) { - reagent tmp; - tmp.types.push_back(Type[base_type].elements[i][0]); - src += size_of(tmp); + src += size_of(Type[base_type].elements[i]); } trace("run") << "address to copy is " << src; vector result; @@ -158,9 +154,7 @@ recipe main [ if (t.is_record) { size_t result = 0; for (size_t i = 0; i < t.elements.size(); ++i) { - reagent x; - x.types.push_back(t.elements[i][0]); - result += size_of(x); + result += size_of(t.elements[i]); } return result; } diff --git a/cpp/019address b/cpp/019address index be1ce74c..13d59465 100644 --- a/cpp/019address +++ b/cpp/019address @@ -49,7 +49,7 @@ bool has_property(reagent x, string name) { reagent deref(reagent x) { //? cout << "deref\n"; //? 1 static const int ADDRESS = Type_number["address"]; - reagent result(""); + reagent result; assert(x.types[0] == ADDRESS); // compute value @@ -110,9 +110,7 @@ case GET: { size_t offset = instructions[pc].ingredients[1].value; int src = base_address; for (size_t i = 0; i < offset; ++i) { - reagent tmp; - tmp.types.push_back(Type[base_type].elements[i][0]); - src += size_of(tmp); + src += size_of(Type[base_type].elements[i]); } trace("run") << "address to copy is " << src; assert(Type[base_type].is_record); @@ -152,9 +150,7 @@ case GET_ADDRESS: { size_t offset = instructions[pc].ingredients[1].value; int src = base_address; for (size_t i = 0; i < offset; ++i) { - reagent tmp; - tmp.types.push_back(Type[base_type].elements[i][0]); - src += size_of(tmp); + src += size_of(Type[base_type].elements[i]); } trace("run") << "address to copy is " << src; vector result; diff --git a/cpp/020array b/cpp/020array index 96591366..5e086ebc 100644 --- a/cpp/020array +++ b/cpp/020array @@ -32,15 +32,12 @@ recipe main [ +mem: storing 15 in location 7 +mem: storing 16 in location 8 -:(before "End size_of Cases") -if (t.is_array) { - int base = r.value; - if (Memory[base] == 0) return 0; - reagent x; - x.set_value(base+1); - x.types.push_back(t.element[0]); - return 1 + Memory[base]*size_of(x); -} +:(after "size_t size_of(const reagent& r)") + const type_info& t = Type[r.types[0]]; + if (t.is_array) { + int base = r.value; + return 1 + Memory[base]*size_of(t.element); + } :(before "End Globals") // Operator to look at elements of arrays. @@ -58,9 +55,7 @@ case INDEX: { assert(Type[base_type].is_array); trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name; size_t offset = instructions[pc].ingredients[1].value; - reagent elem; - elem.types.push_back(Type[base_type].element[0]); - int src = base_address + 1 + offset*size_of(elem); + int src = base_address + 1 + offset*size_of(Type[base_type].element); trace("run") << "address to copy is " << src; int src_type = Type[base_type].element[0]; trace("run") << "its type is " << src_type; @@ -106,9 +101,7 @@ case INDEX_ADDRESS: { assert(Type[base_type].is_array); trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name; size_t offset = instructions[pc].ingredients[1].value; - reagent elem; - elem.types.push_back(Type[base_type].element[0]); - int src = base_address + 1 + offset*size_of(elem); + int src = base_address + 1 + offset*size_of(Type[base_type].element); trace("run") << "address to copy is " << src; vector result; result.push_back(src); -- cgit 1.4.1-2-gfad0 ' href='#n66'>66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240