diff options
| -rw-r--r-- | 034address.cc | 8 | ||||
| -rw-r--r-- | 038new_text.cc | 2 | ||||
| -rw-r--r-- | html/034address.cc.html | 304 | ||||
| -rw-r--r-- | html/038new_text.cc.html | 2 |
4 files changed, 166 insertions, 150 deletions
diff --git a/034address.cc b/034address.cc index c8a171ec..27f7af87 100644 --- a/034address.cc +++ b/034address.cc @@ -277,6 +277,7 @@ void transform_new_to_allocate(const recipe_ordinal r) { instruction& inst = get(Recipe, r).steps.at(i); // Convert 'new' To 'allocate' if (inst.name == "new") { + if (inst.ingredients.empty()) return; // error raised elsewhere inst.operation = ALLOCATE; type_tree* type = new_type_tree(inst.ingredients.at(0).name); inst.ingredients.at(0).set_value(size_of(type)); @@ -425,3 +426,10 @@ def main [ ] +new: routine allocated memory from 1000 to 1003 +new: routine allocated memory from 1003 to 1006 + +:(scenario new_without_ingredient) +% Hide_errors = true; +def main [ + 1:address:number <- new # missing ingredient +] ++error: main: 'new' requires one or two ingredients, but got '1:address:number <- new' diff --git a/038new_text.cc b/038new_text.cc index 41a29b6e..95a394c1 100644 --- a/038new_text.cc +++ b/038new_text.cc @@ -25,7 +25,7 @@ def main [ :(before "End NEW Check Special-cases") if (is_literal_text(inst.ingredients.at(0))) break; :(before "Convert 'new' To 'allocate'") -if (inst.name == "new" && is_literal_text(inst.ingredients.at(0))) continue; +if (inst.name == "new" && !inst.ingredients.empty() && is_literal_text(inst.ingredients.at(0))) continue; :(after "case NEW" following "Primitive Recipe Implementations") if (is_literal_text(current_instruction().ingredients.at(0))) { products.resize(1); diff --git a/html/034address.cc.html b/html/034address.cc.html index 36424d9e..38fdd16d 100644 --- a/html/034address.cc.html +++ b/html/034address.cc.html @@ -341,154 +341,162 @@ if ('onhashchange' in window) { <span id="L277" class="LineNr">277 </span> <span class="Conceal">¦</span> instruction& inst = get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>steps<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span> <span id="L278" class="LineNr">278 </span> <span class="Conceal">¦</span> <span class="Comment">// Convert 'new' To 'allocate'</span> <span id="L279" class="LineNr">279 </span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">"new"</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L280" class="LineNr">280 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> inst<span class="Delimiter">.</span>operation = ALLOCATE<span class="Delimiter">;</span> -<span id="L281" class="LineNr">281 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> type_tree* type = <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">);</span> -<span id="L282" class="LineNr">282 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>size_of<span class="Delimiter">(</span>type<span class="Delimiter">));</span> -<span id="L283" class="LineNr">283 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">"new"</span><span class="Delimiter">)</span> << <span class="Constant">"size of '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name << <span class="Constant">"' is "</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>value << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> -<span id="L284" class="LineNr">284 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">delete</span> type<span class="Delimiter">;</span> -<span id="L285" class="LineNr">285 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> -<span id="L286" class="LineNr">286 </span> <span class="Delimiter">}</span> -<span id="L287" class="LineNr">287 </span><span class="Delimiter">}</span> -<span id="L288" class="LineNr">288 </span> -<span id="L289" class="LineNr">289 </span><span class="Comment">//: implement 'allocate' based on size</span> -<span id="L290" class="LineNr">290 </span> -<span id="L291" class="LineNr">291 </span><span class="Delimiter">:(before "End Globals")</span> -<span id="L292" class="LineNr">292 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> Reserved_for_tests = <span class="Constant">1000</span><span class="Delimiter">;</span> -<span id="L293" class="LineNr">293 </span><span class="Normal">int</span> Memory_allocated_until = Reserved_for_tests<span class="Delimiter">;</span> -<span id="L294" class="LineNr">294 </span><span class="Normal">int</span> Initial_memory_per_routine = <span class="Constant">100000</span><span class="Delimiter">;</span> -<span id="L295" class="LineNr">295 </span><span class="Delimiter">:(before "End Setup")</span> -<span id="L296" class="LineNr">296 </span>Memory_allocated_until = Reserved_for_tests<span class="Delimiter">;</span> -<span id="L297" class="LineNr">297 </span>Initial_memory_per_routine = <span class="Constant">100000</span><span class="Delimiter">;</span> -<span id="L298" class="LineNr">298 </span><span class="Delimiter">:(before "End routine Fields")</span> -<span id="L299" class="LineNr">299 </span><span class="Normal">int</span> alloc<span class="Delimiter">,</span> alloc_max<span class="Delimiter">;</span> -<span id="L300" class="LineNr">300 </span><span class="Delimiter">:(before "End routine Constructor")</span> -<span id="L301" class="LineNr">301 </span>alloc = Memory_allocated_until<span class="Delimiter">;</span> -<span id="L302" class="LineNr">302 </span>Memory_allocated_until += Initial_memory_per_routine<span class="Delimiter">;</span> -<span id="L303" class="LineNr">303 </span>alloc_max = Memory_allocated_until<span class="Delimiter">;</span> -<span id="L304" class="LineNr">304 </span><a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"new"</span><span class="Delimiter">)</span> << <span class="Constant">"routine allocated memory from "</span> << alloc << <span class="Constant">" to "</span> << alloc_max << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> -<span id="L305" class="LineNr">305 </span> -<span id="L306" class="LineNr">306 </span><span class="Delimiter">:(before "End Primitive Recipe Declarations")</span> -<span id="L307" class="LineNr">307 </span>ALLOCATE<span class="Delimiter">,</span> -<span id="L308" class="LineNr">308 </span><span class="Delimiter">:(before "End Primitive Recipe Numbers")</span> -<span id="L309" class="LineNr">309 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"allocate"</span><span class="Delimiter">,</span> ALLOCATE<span class="Delimiter">);</span> -<span id="L310" class="LineNr">310 </span><span class="Delimiter">:(before "End Primitive Recipe Implementations")</span> -<span id="L311" class="LineNr">311 </span><span class="Normal">case</span> ALLOCATE: <span class="Delimiter">{</span> -<span id="L312" class="LineNr">312 </span> <span class="Comment">// compute the space we need</span> -<span id="L313" class="LineNr">313 </span> <span class="Normal">int</span> size = ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> -<span id="L314" class="LineNr">314 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">)</span> > <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L315" class="LineNr">315 </span> <span class="Conceal">¦</span> <span class="Comment">// array allocation</span> -<span id="L316" class="LineNr">316 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"mem"</span><span class="Delimiter">)</span> << <span class="Constant">"array length is "</span> << ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> -<span id="L317" class="LineNr">317 </span> <span class="Conceal">¦</span> size = <span class="Comment">/*</span><span class="Comment">space for length</span><span class="Comment">*/</span><span class="Constant">1</span> + size*ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> -<span id="L318" class="LineNr">318 </span> <span class="Delimiter">}</span> -<span id="L319" class="LineNr">319 </span> <span class="Normal">int</span> result = allocate<span class="Delimiter">(</span>size<span class="Delimiter">);</span> -<span id="L320" class="LineNr">320 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">)</span> > <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L321" class="LineNr">321 </span> <span class="Conceal">¦</span> <span class="Comment">// initialize array length</span> -<span id="L322" class="LineNr">322 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"mem"</span><span class="Delimiter">)</span> << <span class="Constant">"storing "</span> << ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> << <span class="Constant">" in location "</span> << result+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span> << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> -<span id="L323" class="LineNr">323 </span> <span class="Conceal">¦</span> <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> result+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> -<span id="L324" class="LineNr">324 </span> <span class="Delimiter">}</span> -<span id="L325" class="LineNr">325 </span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> -<span id="L326" class="LineNr">326 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>result<span class="Delimiter">);</span> -<span id="L327" class="LineNr">327 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> -<span id="L328" class="LineNr">328 </span><span class="Delimiter">}</span> -<span id="L329" class="LineNr">329 </span><span class="Delimiter">:(code)</span> -<span id="L330" class="LineNr">330 </span><span class="Normal">int</span> allocate<span class="Delimiter">(</span><span class="Normal">int</span> size<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L331" class="LineNr">331 </span> <span class="Comment">// include space for refcount</span> -<span id="L332" class="LineNr">332 </span> ++size<span class="Delimiter">;</span> -<span id="L333" class="LineNr">333 </span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"mem"</span><span class="Delimiter">)</span> << <span class="Constant">"allocating size "</span> << size << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> -<span id="L334" class="LineNr">334 </span><span class="CommentedCode">//? Total_alloc += size;</span> -<span id="L335" class="LineNr">335 </span><span class="CommentedCode">//? ++Num_alloc;</span> -<span id="L336" class="LineNr">336 </span> <span class="Comment">// Allocate Special-cases</span> -<span id="L337" class="LineNr">337 </span> <span class="Comment">// compute the region of memory to return</span> -<span id="L338" class="LineNr">338 </span> <span class="Comment">// really crappy at the moment</span> -<span id="L339" class="LineNr">339 </span> ensure_space<span class="Delimiter">(</span>size<span class="Delimiter">);</span> -<span id="L340" class="LineNr">340 </span> <span class="Normal">const</span> <span class="Normal">int</span> result = Current_routine<span class="Delimiter">-></span>alloc<span class="Delimiter">;</span> -<span id="L341" class="LineNr">341 </span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"mem"</span><span class="Delimiter">)</span> << <span class="Constant">"new alloc: "</span> << result << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> -<span id="L342" class="LineNr">342 </span> <span class="Comment">// initialize allocated space</span> -<span id="L343" class="LineNr">343 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L76'>address</a> = result<span class="Delimiter">;</span> <a href='043space.cc.html#L76'>address</a> < result+size<span class="Delimiter">;</span> ++address<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L344" class="LineNr">344 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"mem"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0 in location "</span> << <a href='043space.cc.html#L76'>address</a> << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> -<span id="L345" class="LineNr">345 </span> <span class="Conceal">¦</span> <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span> -<span id="L346" class="LineNr">346 </span> <span class="Delimiter">}</span> -<span id="L347" class="LineNr">347 </span> Current_routine<span class="Delimiter">-></span>alloc += size<span class="Delimiter">;</span> -<span id="L348" class="LineNr">348 </span> <span class="Comment">// no support yet for reclaiming memory between routines</span> -<span id="L349" class="LineNr">349 </span> assert<span class="Delimiter">(</span>Current_routine<span class="Delimiter">-></span>alloc <= Current_routine<span class="Delimiter">-></span>alloc_max<span class="Delimiter">);</span> -<span id="L350" class="LineNr">350 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> -<span id="L351" class="LineNr">351 </span><span class="Delimiter">}</span> -<span id="L352" class="LineNr">352 </span> -<span id="L353" class="LineNr">353 </span><span class="Comment">//: statistics for debugging</span> -<span id="L354" class="LineNr">354 </span><span class="CommentedCode">//? :(before "End Globals")</span> -<span id="L355" class="LineNr">355 </span><span class="CommentedCode">//? int Total_alloc = 0;</span> -<span id="L356" class="LineNr">356 </span><span class="CommentedCode">//? int Num_alloc = 0;</span> -<span id="L357" class="LineNr">357 </span><span class="CommentedCode">//? int Total_free = 0;</span> -<span id="L358" class="LineNr">358 </span><span class="CommentedCode">//? int Num_free = 0;</span> -<span id="L359" class="LineNr">359 </span><span class="CommentedCode">//? :(before "End Setup")</span> -<span id="L360" class="LineNr">360 </span><span class="CommentedCode">//? Total_alloc = Num_alloc = Total_free = Num_free = 0;</span> -<span id="L361" class="LineNr">361 </span><span class="CommentedCode">//? :(before "End Teardown")</span> -<span id="L362" class="LineNr">362 </span><span class="CommentedCode">//? cerr << Total_alloc << "/" << Num_alloc</span> -<span id="L363" class="LineNr">363 </span><span class="CommentedCode">//? << " vs " << Total_free << "/" << Num_free << '\n';</span> -<span id="L364" class="LineNr">364 </span><span class="CommentedCode">//? cerr << SIZE(Memory) << '\n';</span> -<span id="L365" class="LineNr">365 </span> -<span id="L366" class="LineNr">366 </span><span class="Delimiter">:(code)</span> -<span id="L367" class="LineNr">367 </span><span class="Normal">void</span> ensure_space<span class="Delimiter">(</span><span class="Normal">int</span> size<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L368" class="LineNr">368 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>size > Initial_memory_per_routine<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L369" class="LineNr">369 </span> <span class="Conceal">¦</span> tb_shutdown<span class="Delimiter">();</span> -<span id="L370" class="LineNr">370 </span> <span class="Conceal">¦</span> cerr << <span class="Constant">"can't allocate "</span> << size << <span class="Constant">" locations, that's too much compared to "</span> << Initial_memory_per_routine << <span class="Constant">".</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> -<span id="L371" class="LineNr">371 </span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> -<span id="L372" class="LineNr">372 </span> <span class="Delimiter">}</span> -<span id="L373" class="LineNr">373 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-></span>alloc + size > Current_routine<span class="Delimiter">-></span>alloc_max<span class="Delimiter">)</span> <span class="Delimiter">{</span> -<span id="L374" class="LineNr">374 </span> <span class="Conceal">¦</span> <span class="Comment">// waste the remaining space and create a new chunk</span> -<span id="L375" class="LineNr">375 </span> <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-></span>alloc = Memory_allocated_until<span class="Delimiter">;</span> -<span id="L376" class="LineNr">376 </span> <span class="Conceal">¦</span> Memory_allocated_until += Initial_memory_per_routine<span class="Delimiter">;</span> -<span id="L377" class="LineNr">377 </span> <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-></span>alloc_max = Memory_allocated_until<span class="Delimiter">;</span> -<span id="L378" class="LineNr">378 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"new"</span><span class="Delimiter">)</span> << <span class="Constant">"routine allocated memory from "</span> << Current_routine<span class="Delimiter">-></span>alloc << <span class="Constant">" to "</span> << Current_routine<span class="Delimiter">-></span>alloc_max << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> -<span id="L379" class="LineNr">379 </span> <span class="Delimiter">}</span> -<span id="L380" class="LineNr">380 </span><span class="Delimiter">}</span> -<span id="L381" class="LineNr">381 </span> -<span id="L382" class="LineNr">382 </span><span class="Delimiter">:(scenario new_initializes)</span> -<span id="L383" class="LineNr">383 </span><span class="Special">% Memory_allocated_until = 10;</span> -<span id="L384" class="LineNr">384 </span><span class="Special">% put(Memory, Memory_allocated_until, 1);</span> -<span id="L385" class="LineNr">385 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ -<span id="L386" class="LineNr">386 </span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> <- </span><span class="Normal">new</span> <span class="Constant">number:type</span> -<span id="L387" class="LineNr">387 </span>] -<span id="L388" class="LineNr">388 </span><span class="traceContains">+mem: storing 0 in location 10</span> -<span id="L389" class="LineNr">389 </span> -<span id="L390" class="LineNr">390 </span><span class="Delimiter">:(scenario new_size)</span> -<span id="L391" class="LineNr">391 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ -<span id="L392" class="LineNr">392 </span> <span class="Constant">11</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">number:type</span> -<span id="L393" class="LineNr">393 </span> <span class="Constant">12</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">number:type</span> -<span id="L394" class="LineNr">394 </span> <span class="Constant">13</span>:num/<span class="Special">raw <- </span>subtract <span class="Constant">12</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">11</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw</span> -<span id="L395" class="LineNr">395 </span>] -<span id="L396" class="LineNr">396 </span><span class="Comment"># size of number + refcount</span> -<span id="L397" class="LineNr">397 </span><span class="traceContains">+mem: storing 2 in location 13</span> -<span id="L398" class="LineNr">398 </span> -<span id="L399" class="LineNr">399 </span><span class="Delimiter">:(scenario new_array_size)</span> -<span id="L400" class="LineNr">400 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ -<span id="L401" class="LineNr">401 </span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">5</span> -<span id="L402" class="LineNr">402 </span> <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">number:type</span> -<span id="L403" class="LineNr">403 </span> <span class="Constant">3</span>:num/<span class="Special">raw <- </span>subtract <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num/<span class="Special">raw</span> -<span id="L404" class="LineNr">404 </span>] -<span id="L405" class="LineNr">405 </span><span class="Comment"># 5 locations for array contents + array length + refcount</span> -<span id="L406" class="LineNr">406 </span><span class="traceContains">+mem: storing 7 in location 3</span> -<span id="L407" class="LineNr">407 </span> -<span id="L408" class="LineNr">408 </span><span class="Delimiter">:(scenario new_empty_array)</span> -<span id="L409" class="LineNr">409 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ -<span id="L410" class="LineNr">410 </span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">0</span> -<span id="L411" class="LineNr">411 </span> <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">number:type</span> -<span id="L412" class="LineNr">412 </span> <span class="Constant">3</span>:num/<span class="Special">raw <- </span>subtract <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num/<span class="Special">raw</span> -<span id="L413" class="LineNr">413 </span>] -<span id="L414" class="LineNr">414 </span><span class="traceContains">+run: {1: ("address" "array" "number"), "raw": ()} <- new {number: "type"}, {0: "literal"}</span> -<span id="L415" class="LineNr">415 </span><span class="traceContains">+mem: array length is 0</span> -<span id="L416" class="LineNr">416 </span><span class="Comment"># one location for array length, and one for the refcount</span> -<span id="L417" class="LineNr">417 </span><span class="traceContains">+mem: storing 2 in location 3</span> -<span id="L418" class="LineNr">418 </span> -<span id="L419" class="LineNr">419 </span><span class="Comment">//: If a routine runs out of its initial allocation, it should allocate more.</span> -<span id="L420" class="LineNr">420 </span><span class="Delimiter">:(scenario new_overflow)</span> -<span id="L421" class="LineNr">421 </span><span class="Special">% Initial_memory_per_routine = 3; // barely enough room for point allocation below</span> -<span id="L422" class="LineNr">422 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ -<span id="L423" class="LineNr">423 </span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">number:type</span> -<span id="L424" class="LineNr">424 </span> <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:point/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">point:type</span> <span class="Comment"># not enough room in initial page</span> -<span id="L425" class="LineNr">425 </span>] -<span id="L426" class="LineNr">426 </span><span class="traceContains">+new: routine allocated memory from 1000 to 1003</span> -<span id="L427" class="LineNr">427 </span><span class="traceContains">+new: routine allocated memory from 1003 to 1006</span> +<span id="L280" class="LineNr">280 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span> <span class="Comment">// error raised elsewhere</span> +<span id="L281" class="LineNr">281 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> inst<span class="Delimiter">.</span>operation = ALLOCATE<span class="Delimiter">;</span> +<span id="L282" class="LineNr">282 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> type_tree* type = <a href='018type_abbreviations.cc.html#L58'>new_type_tree</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name<span class="Delimiter">);</span> +<span id="L283" class="LineNr">283 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='010vm.cc.html#L65'>set_value</a><span class="Delimiter">(</span>size_of<span class="Delimiter">(</span>type<span class="Delimiter">));</span> +<span id="L284" class="LineNr">284 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9992</span><span class="Delimiter">,</span> <span class="Constant">"new"</span><span class="Delimiter">)</span> << <span class="Constant">"size of '"</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name << <span class="Constant">"' is "</span> << inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>value << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> +<span id="L285" class="LineNr">285 </span> <span class="Conceal">¦</span> <span class="Conceal">¦</span> <span class="Normal">delete</span> type<span class="Delimiter">;</span> +<span id="L286" class="LineNr">286 </span> <span class="Conceal">¦</span> <span class="Delimiter">}</span> +<span id="L287" class="LineNr">287 </span> <span class="Delimiter">}</span> +<span id="L288" class="LineNr">288 </span><span class="Delimiter">}</span> +<span id="L289" class="LineNr">289 </span> +<span id="L290" class="LineNr">290 </span><span class="Comment">//: implement 'allocate' based on size</span> +<span id="L291" class="LineNr">291 </span> +<span id="L292" class="LineNr">292 </span><span class="Delimiter">:(before "End Globals")</span> +<span id="L293" class="LineNr">293 </span><span class="Normal">extern</span> <span class="Normal">const</span> <span class="Normal">int</span> Reserved_for_tests = <span class="Constant">1000</span><span class="Delimiter">;</span> +<span id="L294" class="LineNr">294 </span><span class="Normal">int</span> Memory_allocated_until = Reserved_for_tests<span class="Delimiter">;</span> +<span id="L295" class="LineNr">295 </span><span class="Normal">int</span> Initial_memory_per_routine = <span class="Constant">100000</span><span class="Delimiter">;</span> +<span id="L296" class="LineNr">296 </span><span class="Delimiter">:(before "End Setup")</span> +<span id="L297" class="LineNr">297 </span>Memory_allocated_until = Reserved_for_tests<span class="Delimiter">;</span> +<span id="L298" class="LineNr">298 </span>Initial_memory_per_routine = <span class="Constant">100000</span><span class="Delimiter">;</span> +<span id="L299" class="LineNr">299 </span><span class="Delimiter">:(before "End routine Fields")</span> +<span id="L300" class="LineNr">300 </span><span class="Normal">int</span> alloc<span class="Delimiter">,</span> alloc_max<span class="Delimiter">;</span> +<span id="L301" class="LineNr">301 </span><span class="Delimiter">:(before "End routine Constructor")</span> +<span id="L302" class="LineNr">302 </span>alloc = Memory_allocated_until<span class="Delimiter">;</span> +<span id="L303" class="LineNr">303 </span>Memory_allocated_until += Initial_memory_per_routine<span class="Delimiter">;</span> +<span id="L304" class="LineNr">304 </span>alloc_max = Memory_allocated_until<span class="Delimiter">;</span> +<span id="L305" class="LineNr">305 </span><a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"new"</span><span class="Delimiter">)</span> << <span class="Constant">"routine allocated memory from "</span> << alloc << <span class="Constant">" to "</span> << alloc_max << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> +<span id="L306" class="LineNr">306 </span> +<span id="L307" class="LineNr">307 </span><span class="Delimiter">:(before "End Primitive Recipe Declarations")</span> +<span id="L308" class="LineNr">308 </span>ALLOCATE<span class="Delimiter">,</span> +<span id="L309" class="LineNr">309 </span><span class="Delimiter">:(before "End Primitive Recipe Numbers")</span> +<span id="L310" class="LineNr">310 </span><a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">"allocate"</span><span class="Delimiter">,</span> ALLOCATE<span class="Delimiter">);</span> +<span id="L311" class="LineNr">311 </span><span class="Delimiter">:(before "End Primitive Recipe Implementations")</span> +<span id="L312" class="LineNr">312 </span><span class="Normal">case</span> ALLOCATE: <span class="Delimiter">{</span> +<span id="L313" class="LineNr">313 </span> <span class="Comment">// compute the space we need</span> +<span id="L314" class="LineNr">314 </span> <span class="Normal">int</span> size = ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> +<span id="L315" class="LineNr">315 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>ingredients<span class="Delimiter">)</span> > <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L316" class="LineNr">316 </span> <span class="Conceal">¦</span> <span class="Comment">// array allocation</span> +<span id="L317" class="LineNr">317 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"mem"</span><span class="Delimiter">)</span> << <span class="Constant">"array length is "</span> << ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> +<span id="L318" class="LineNr">318 </span> <span class="Conceal">¦</span> size = <span class="Comment">/*</span><span class="Comment">space for length</span><span class="Comment">*/</span><span class="Constant">1</span> + size*ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> +<span id="L319" class="LineNr">319 </span> <span class="Delimiter">}</span> +<span id="L320" class="LineNr">320 </span> <span class="Normal">int</span> result = allocate<span class="Delimiter">(</span>size<span class="Delimiter">);</span> +<span id="L321" class="LineNr">321 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L138'>SIZE</a><span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">)</span> > <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L322" class="LineNr">322 </span> <span class="Conceal">¦</span> <span class="Comment">// initialize array length</span> +<span id="L323" class="LineNr">323 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"mem"</span><span class="Delimiter">)</span> << <span class="Constant">"storing "</span> << ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)</span> << <span class="Constant">" in location "</span> << result+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span> << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> +<span id="L324" class="LineNr">324 </span> <span class="Conceal">¦</span> <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> result+<span class="Comment">/*</span><span class="Comment">skip refcount</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">,</span> ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span> +<span id="L325" class="LineNr">325 </span> <span class="Delimiter">}</span> +<span id="L326" class="LineNr">326 </span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> +<span id="L327" class="LineNr">327 </span> products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>push_back<span class="Delimiter">(</span>result<span class="Delimiter">);</span> +<span id="L328" class="LineNr">328 </span> <span class="Identifier">break</span><span class="Delimiter">;</span> +<span id="L329" class="LineNr">329 </span><span class="Delimiter">}</span> +<span id="L330" class="LineNr">330 </span><span class="Delimiter">:(code)</span> +<span id="L331" class="LineNr">331 </span><span class="Normal">int</span> allocate<span class="Delimiter">(</span><span class="Normal">int</span> size<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L332" class="LineNr">332 </span> <span class="Comment">// include space for refcount</span> +<span id="L333" class="LineNr">333 </span> ++size<span class="Delimiter">;</span> +<span id="L334" class="LineNr">334 </span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"mem"</span><span class="Delimiter">)</span> << <span class="Constant">"allocating size "</span> << size << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> +<span id="L335" class="LineNr">335 </span><span class="CommentedCode">//? Total_alloc += size;</span> +<span id="L336" class="LineNr">336 </span><span class="CommentedCode">//? ++Num_alloc;</span> +<span id="L337" class="LineNr">337 </span> <span class="Comment">// Allocate Special-cases</span> +<span id="L338" class="LineNr">338 </span> <span class="Comment">// compute the region of memory to return</span> +<span id="L339" class="LineNr">339 </span> <span class="Comment">// really crappy at the moment</span> +<span id="L340" class="LineNr">340 </span> ensure_space<span class="Delimiter">(</span>size<span class="Delimiter">);</span> +<span id="L341" class="LineNr">341 </span> <span class="Normal">const</span> <span class="Normal">int</span> result = Current_routine<span class="Delimiter">-></span>alloc<span class="Delimiter">;</span> +<span id="L342" class="LineNr">342 </span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"mem"</span><span class="Delimiter">)</span> << <span class="Constant">"new alloc: "</span> << result << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> +<span id="L343" class="LineNr">343 </span> <span class="Comment">// initialize allocated space</span> +<span id="L344" class="LineNr">344 </span> <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> <a href='043space.cc.html#L76'>address</a> = result<span class="Delimiter">;</span> <a href='043space.cc.html#L76'>address</a> < result+size<span class="Delimiter">;</span> ++address<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L345" class="LineNr">345 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"mem"</span><span class="Delimiter">)</span> << <span class="Constant">"storing 0 in location "</span> << <a href='043space.cc.html#L76'>address</a> << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> +<span id="L346" class="LineNr">346 </span> <span class="Conceal">¦</span> <a href='001help.cc.html#L218'>put</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L76'>address</a><span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">);</span> +<span id="L347" class="LineNr">347 </span> <span class="Delimiter">}</span> +<span id="L348" class="LineNr">348 </span> Current_routine<span class="Delimiter">-></span>alloc += size<span class="Delimiter">;</span> +<span id="L349" class="LineNr">349 </span> <span class="Comment">// no support yet for reclaiming memory between routines</span> +<span id="L350" class="LineNr">350 </span> assert<span class="Delimiter">(</span>Current_routine<span class="Delimiter">-></span>alloc <= Current_routine<span class="Delimiter">-></span>alloc_max<span class="Delimiter">);</span> +<span id="L351" class="LineNr">351 </span> <span class="Identifier">return</span> result<span class="Delimiter">;</span> +<span id="L352" class="LineNr">352 </span><span class="Delimiter">}</span> +<span id="L353" class="LineNr">353 </span> +<span id="L354" class="LineNr">354 </span><span class="Comment">//: statistics for debugging</span> +<span id="L355" class="LineNr">355 </span><span class="CommentedCode">//? :(before "End Globals")</span> +<span id="L356" class="LineNr">356 </span><span class="CommentedCode">//? int Total_alloc = 0;</span> +<span id="L357" class="LineNr">357 </span><span class="CommentedCode">//? int Num_alloc = 0;</span> +<span id="L358" class="LineNr">358 </span><span class="CommentedCode">//? int Total_free = 0;</span> +<span id="L359" class="LineNr">359 </span><span class="CommentedCode">//? int Num_free = 0;</span> +<span id="L360" class="LineNr">360 </span><span class="CommentedCode">//? :(before "End Setup")</span> +<span id="L361" class="LineNr">361 </span><span class="CommentedCode">//? Total_alloc = Num_alloc = Total_free = Num_free = 0;</span> +<span id="L362" class="LineNr">362 </span><span class="CommentedCode">//? :(before "End Teardown")</span> +<span id="L363" class="LineNr">363 </span><span class="CommentedCode">//? cerr << Total_alloc << "/" << Num_alloc</span> +<span id="L364" class="LineNr">364 </span><span class="CommentedCode">//? << " vs " << Total_free << "/" << Num_free << '\n';</span> +<span id="L365" class="LineNr">365 </span><span class="CommentedCode">//? cerr << SIZE(Memory) << '\n';</span> +<span id="L366" class="LineNr">366 </span> +<span id="L367" class="LineNr">367 </span><span class="Delimiter">:(code)</span> +<span id="L368" class="LineNr">368 </span><span class="Normal">void</span> ensure_space<span class="Delimiter">(</span><span class="Normal">int</span> size<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L369" class="LineNr">369 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>size > Initial_memory_per_routine<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L370" class="LineNr">370 </span> <span class="Conceal">¦</span> tb_shutdown<span class="Delimiter">();</span> +<span id="L371" class="LineNr">371 </span> <span class="Conceal">¦</span> cerr << <span class="Constant">"can't allocate "</span> << size << <span class="Constant">" locations, that's too much compared to "</span> << Initial_memory_per_routine << <span class="Constant">".</span><span class="cSpecial">\n</span><span class="Constant">"</span><span class="Delimiter">;</span> +<span id="L372" class="LineNr">372 </span> <span class="Conceal">¦</span> exit<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span> +<span id="L373" class="LineNr">373 </span> <span class="Delimiter">}</span> +<span id="L374" class="LineNr">374 </span> <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">-></span>alloc + size > Current_routine<span class="Delimiter">-></span>alloc_max<span class="Delimiter">)</span> <span class="Delimiter">{</span> +<span id="L375" class="LineNr">375 </span> <span class="Conceal">¦</span> <span class="Comment">// waste the remaining space and create a new chunk</span> +<span id="L376" class="LineNr">376 </span> <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-></span>alloc = Memory_allocated_until<span class="Delimiter">;</span> +<span id="L377" class="LineNr">377 </span> <span class="Conceal">¦</span> Memory_allocated_until += Initial_memory_per_routine<span class="Delimiter">;</span> +<span id="L378" class="LineNr">378 </span> <span class="Conceal">¦</span> Current_routine<span class="Delimiter">-></span>alloc_max = Memory_allocated_until<span class="Delimiter">;</span> +<span id="L379" class="LineNr">379 </span> <span class="Conceal">¦</span> <a href='003trace.cc.html#L161'>trace</a><span class="Delimiter">(</span><span class="Constant">9999</span><span class="Delimiter">,</span> <span class="Constant">"new"</span><span class="Delimiter">)</span> << <span class="Constant">"routine allocated memory from "</span> << Current_routine<span class="Delimiter">-></span>alloc << <span class="Constant">" to "</span> << Current_routine<span class="Delimiter">-></span>alloc_max << <a href='003trace.cc.html#L185'>end</a><span class="Delimiter">();</span> +<span id="L380" class="LineNr">380 </span> <span class="Delimiter">}</span> +<span id="L381" class="LineNr">381 </span><span class="Delimiter">}</span> +<span id="L382" class="LineNr">382 </span> +<span id="L383" class="LineNr">383 </span><span class="Delimiter">:(scenario new_initializes)</span> +<span id="L384" class="LineNr">384 </span><span class="Special">% Memory_allocated_until = 10;</span> +<span id="L385" class="LineNr">385 </span><span class="Special">% put(Memory, Memory_allocated_until, 1);</span> +<span id="L386" class="LineNr">386 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ +<span id="L387" class="LineNr">387 </span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num<span class="Special"> <- </span><span class="Normal">new</span> <span class="Constant">number:type</span> +<span id="L388" class="LineNr">388 </span>] +<span id="L389" class="LineNr">389 </span><span class="traceContains">+mem: storing 0 in location 10</span> +<span id="L390" class="LineNr">390 </span> +<span id="L391" class="LineNr">391 </span><span class="Delimiter">:(scenario new_size)</span> +<span id="L392" class="LineNr">392 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ +<span id="L393" class="LineNr">393 </span> <span class="Constant">11</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">number:type</span> +<span id="L394" class="LineNr">394 </span> <span class="Constant">12</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">number:type</span> +<span id="L395" class="LineNr">395 </span> <span class="Constant">13</span>:num/<span class="Special">raw <- </span>subtract <span class="Constant">12</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">11</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw</span> +<span id="L396" class="LineNr">396 </span>] +<span id="L397" class="LineNr">397 </span><span class="Comment"># size of number + refcount</span> +<span id="L398" class="LineNr">398 </span><span class="traceContains">+mem: storing 2 in location 13</span> +<span id="L399" class="LineNr">399 </span> +<span id="L400" class="LineNr">400 </span><span class="Delimiter">:(scenario new_array_size)</span> +<span id="L401" class="LineNr">401 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ +<span id="L402" class="LineNr">402 </span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">5</span> +<span id="L403" class="LineNr">403 </span> <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">number:type</span> +<span id="L404" class="LineNr">404 </span> <span class="Constant">3</span>:num/<span class="Special">raw <- </span>subtract <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num/<span class="Special">raw</span> +<span id="L405" class="LineNr">405 </span>] +<span id="L406" class="LineNr">406 </span><span class="Comment"># 5 locations for array contents + array length + refcount</span> +<span id="L407" class="LineNr">407 </span><span class="traceContains">+mem: storing 7 in location 3</span> +<span id="L408" class="LineNr">408 </span> +<span id="L409" class="LineNr">409 </span><span class="Delimiter">:(scenario new_empty_array)</span> +<span id="L410" class="LineNr">410 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ +<span id="L411" class="LineNr">411 </span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">number:type</span><span class="Delimiter">,</span> <span class="Constant">0</span> +<span id="L412" class="LineNr">412 </span> <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">number:type</span> +<span id="L413" class="LineNr">413 </span> <span class="Constant">3</span>:num/<span class="Special">raw <- </span>subtract <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw</span><span class="Delimiter">,</span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:array:num/<span class="Special">raw</span> +<span id="L414" class="LineNr">414 </span>] +<span id="L415" class="LineNr">415 </span><span class="traceContains">+run: {1: ("address" "array" "number"), "raw": ()} <- new {number: "type"}, {0: "literal"}</span> +<span id="L416" class="LineNr">416 </span><span class="traceContains">+mem: array length is 0</span> +<span id="L417" class="LineNr">417 </span><span class="Comment"># one location for array length, and one for the refcount</span> +<span id="L418" class="LineNr">418 </span><span class="traceContains">+mem: storing 2 in location 3</span> +<span id="L419" class="LineNr">419 </span> +<span id="L420" class="LineNr">420 </span><span class="Comment">//: If a routine runs out of its initial allocation, it should allocate more.</span> +<span id="L421" class="LineNr">421 </span><span class="Delimiter">:(scenario new_overflow)</span> +<span id="L422" class="LineNr">422 </span><span class="Special">% Initial_memory_per_routine = 3; // barely enough room for point allocation below</span> +<span id="L423" class="LineNr">423 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ +<span id="L424" class="LineNr">424 </span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:num/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">number:type</span> +<span id="L425" class="LineNr">425 </span> <span class="Constant">2</span>:<a href='043space.cc.html#L76'>address</a>:point/<span class="Special">raw <- </span><span class="Normal">new</span> <span class="Constant">point:type</span> <span class="Comment"># not enough room in initial page</span> +<span id="L426" class="LineNr">426 </span>] +<span id="L427" class="LineNr">427 </span><span class="traceContains">+new: routine allocated memory from 1000 to 1003</span> +<span id="L428" class="LineNr">428 </span><span class="traceContains">+new: routine allocated memory from 1003 to 1006</span> +<span id="L429" class="LineNr">429 </span> +<span id="L430" class="LineNr">430 </span><span class="Delimiter">:(scenario new_without_ingredient)</span> +<span id="L431" class="LineNr">431 </span><span class="Special">% Hide_errors = true;</span> +<span id="L432" class="LineNr">432 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [ +<span id="L433" class="LineNr">433 </span> <span class="Constant">1</span>:<a href='043space.cc.html#L76'>address</a>:number<span class="Special"> <- </span><span class="Normal">new</span> <span class="Comment"># missing ingredient</span> +<span id="L434" class="LineNr">434 </span>] +<span id="L435" class="LineNr">435 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: 'new' requires one or two ingredients, but got '1:address:number <- new'</span> </pre> </body> </html> diff --git a/html/038new_text.cc.html b/html/038new_text.cc.html index 207543cc..62c63ce6 100644 --- a/html/038new_text.cc.html +++ b/html/038new_text.cc.html @@ -90,7 +90,7 @@ if ('onhashchange' in window) { <span id="L25" class="LineNr"> 25 </span><span class="Delimiter">:(before "End NEW Check Special-cases")</span> <span id="L26" class="LineNr"> 26 </span><span class="Normal">if</span> <span class="Delimiter">(</span><a href='014literal_string.cc.html#L126'>is_literal_text</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Identifier">break</span><span class="Delimiter">;</span> <span id="L27" class="LineNr"> 27 </span><span class="Delimiter">:(before "Convert 'new' To 'allocate'")</span> -<span id="L28" class="LineNr"> 28 </span><span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">"new"</span> && <a href='014literal_string.cc.html#L126'>is_literal_text</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> +<span id="L28" class="LineNr"> 28 </span><span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span>name == <span class="Constant">"new"</span> && !inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">()</span> && <a href='014literal_string.cc.html#L126'>is_literal_text</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span> <span id="L29" class="LineNr"> 29 </span><span class="Delimiter">:(after "case NEW" following "Primitive Recipe Implementations")</span> <span id="L30" class="LineNr"> 30 </span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='014literal_string.cc.html#L126'>is_literal_text</a><span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">)))</span> <span class="Delimiter">{</span> <span id="L31" class="LineNr"> 31 </span> <span class="Conceal">¦</span> products<span class="Delimiter">.</span>resize<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span> |