summary refs log tree commit diff stats
path: root/TODO
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-03-28 01:59:17 +0100
committerhut <hut@lavabit.com>2010-03-28 01:59:17 +0100
commit636f69d346e31ee59702c814574c1379aa9cb8e6 (patch)
tree4ee5a2f415d87cc964ef908f5d01a2ea592cd790 /TODO
parentd3c262a924eebdab926b9569ecdb225b3be1e4a9 (diff)
downloadranger-636f69d346e31ee59702c814574c1379aa9cb8e6.tar.gz
closed issue #70: mouse click handler for the titlebar
Diffstat (limited to 'TODO')
-rw-r--r--TODO2
1 files changed, 1 insertions, 1 deletions
diff --git a/TODO b/TODO
index 7da64db5..464f8ffb 100644
--- a/TODO
+++ b/TODO
@@ -47,7 +47,7 @@ General
    (X) #63  10/02/15  limit filesize in previews
    ( ) #64  10/02/25  scroll in previews
    (X) #66  10/02/28  explain how colorschemes work
-   ( ) #70  10/03/14  mouse handler for titlebar
+   (X) #70  10/03/14  mouse handler for titlebar
    (X) #71  10/03/21  previews: black/whitelist + read file
 
 
<vc@akkartik.com> 2018-09-29 17:45:00 -0700 4619 - new syscall: mmap()' href='/akkartik/mu/commit/subx/examples/ex12.subx?h=hlt&id=2ec6d1e5250e5a36c919354649c3bc3f17261140'>2ec6d1e5 ^
294a1520 ^
ecfbbfb5 ^
33352536 ^
ecfbbfb5 ^
2ec6d1e5 ^
33352536 ^

2ec6d1e5 ^
ecfbbfb5 ^
33352536 ^
ecfbbfb5 ^
2ec6d1e5 ^
ecfbbfb5 ^
e5cbbea4 ^
2ec6d1e5 ^
e59a91b7 ^
6030d7e2 ^
9b16f190 ^
6030d7e2 ^
9b16f190 ^
6030d7e2 ^
9b16f190 ^
6030d7e2 ^
9b16f190 ^
6030d7e2 ^
9b16f190 ^
6030d7e2 ^
9b16f190 ^
2ec6d1e5 ^
ee9a9237 ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
                               

                                                                 
         
                                                                     
                              

                                         
       


                                                                                                                                                 
 
      
                                 
                                          
                                
 

                                                                                                                                                                    
 
               
                                                                                                                                                                       
                                
 
       
 
                                                                                             
                                         
          
           
         
               
                      
                                     
                   
                                             
        
                                                
            
                                               
 
                            
7;scenario' implementation' href='/akkartik/mu/commit/cpp/050scenario.cc?h=main&id=255cc28813b9f53dd678c78551e3adb036002553'>255cc288 ^





ac0e9db5 ^
6c1376f8 ^
0487a30e ^
255cc288 ^


a70d593d ^
ba32c4f0 ^





a70d593d ^


77469816 ^

255cc288 ^
22b30692 ^
77469816 ^
de49fb42 ^
6c1376f8 ^
de49fb42 ^




2c7e84c2 ^
c5e965d8 ^
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-11-23 03:54:10 +0000
ing operator[] in map' href='/akkartik/mu/commit/050scenario.cc?h=main&id=795f5244abc9b9f26ff621fd1997db427289d2ba'>795f5244 ^
a1557e08 ^
260c3de2 ^
a1557e08 ^


77469816 ^

255cc288 ^





167d0ca0 ^



0f125d5f ^
255cc288 ^




ac0e9db5 ^
255cc288 ^
05d17773 ^

255cc288 ^


5f98a10c ^
255cc288 ^

ac0e9db5 ^
cdd6fd09 ^
795f5244 ^
260c3de2 ^
795f5244 ^
047296d8 ^
795f5244 ^
260c3de2 ^
047296d8 ^




255cc288 ^
ac0e9db5 ^
cdd6fd09 ^
795f5244 ^
260c3de2 ^
a1557e08 ^
795f5244 ^
a1557e08 ^


795f5244 ^
a1557e08 ^
260c3de2 ^
047296d8 ^




255cc288 ^



260c3de2 ^
5f98a10c ^
255cc288 ^





5f98a10c ^
255cc288 ^

260c3de2 ^
5f98a10c ^
255cc288 ^
bc643692 ^



255cc288 ^
167d0ca0 ^
255cc288 ^

5f98a10c ^
255cc288 ^


bc643692 ^



255cc288 ^
167d0ca0 ^
255cc288 ^












5f98a10c ^
260c3de2 ^
5f98a10c ^
255cc288 ^





5f98a10c ^
255cc288 ^



795f5244 ^
166e3c0d ^



255cc288 ^

b2c86f7a ^
0487a30e ^
255cc288 ^



5f98a10c ^
255cc288 ^


5feb36ff ^
255cc288 ^
ac0e9db5 ^
5feb36ff ^


255cc288 ^

ac0e9db5 ^
4071055a ^

255cc288 ^

5f98a10c ^

255cc288 ^

d9cd13ad ^

5feb36ff ^
255cc288 ^
5feb36ff ^
ac0e9db5 ^
0487a30e ^

ac0e9db5 ^
5feb36ff ^
255cc288 ^



5f98a10c ^
260c3de2 ^
5f98a10c ^
255cc288 ^

65b3db5d ^
255cc288 ^





5f98a10c ^
255cc288 ^

260c3de2 ^
5f98a10c ^
255cc288 ^

65b3db5d ^
255cc288 ^




5f98a10c ^

255cc288 ^




5f98a10c ^
260c3de2 ^
5f98a10c ^
255cc288 ^

65b3db5d ^
255cc288 ^




5f98a10c ^
255cc288 ^



795f5244 ^
166e3c0d ^



255cc288 ^

b2c86f7a ^
0487a30e ^
255cc288 ^



5f98a10c ^
255cc288 ^


5feb36ff ^
ac0e9db5 ^
5feb36ff ^
5f98a10c ^
255cc288 ^







260c3de2 ^
5f98a10c ^
255cc288 ^




5f98a10c ^

255cc288 ^
5f98a10c ^
260c3de2 ^
5f98a10c ^
255cc288 ^

65b3db5d ^
255cc288 ^





5f98a10c ^
255cc288 ^
2ef12021 ^










795f5244 ^
166e3c0d ^
2ef12021 ^
166e3c0d ^
795f5244 ^
2ef12021 ^

5f98a10c ^
795f5244 ^
2ef12021 ^

166e3c0d ^
795f5244 ^
2ef12021 ^

166e3c0d ^





2ef12021 ^




5f98a10c ^
2ef12021 ^
5f98a10c ^
2ef12021 ^


5f98a10c ^
2ef12021 ^










5f98a10c ^
2ef12021 ^





5f98a10c ^
2ef12021 ^
805fde84 ^




b39ceb27 ^

22b30692 ^
255cc288 ^

a632ccef ^
255cc288 ^

1326a4ec ^
255cc288 ^
255cc288 ^



1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
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
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657

                                                                        
 


                                                                            



                            
                       





                            
 
                                    

              
                       




                         
                       
   


                         

   
 
                                           

              
                       
                         
   







                            

   
 









                           
                           






                                          

 
       
                                      

                              
                                                
                                                                               
                                     



                                                                            

                                   
                                     
                            
                                                         
                                             
                

 


                                                 
                    
 
                        






                                                                  





                                                                       
                                                     
                                                        
                                   


                          
                                             





                                                     


   

                                        
       
                                         
                        
                                               
                             




                                    
                           
                                                                                   


                                         
                                                
               




                                                  
                    
   
                          

 




                                                                             
                                   
                     
                     


                     
                     



                                                           
                                                      
 




                                                                  
               

             
                       






                                             
                                



                                       

                                                
                    
                                                                                                              
                              
                                                      
                              
                                                
                                   
                  
                      

                                    
                                                                                                              

                                                                           
                                                            
                                                                          

 


                                                                    
                                                    



                                           


                        
                       

       
                       




                              
                                                                                  

                                                            




                                       
                        
                                   
                     





                         
                                                   



                                             
                                                                    



                                       

                                                
                     
                                                             






                                    
                                       

                                     
                             
                               
                           


                          
                                            


                                                             
                                   
                                                 
                                                                                       
                                                                   
                                                  
                                                           
                                    
                                                                                                                                                                                                                          


                                        
                                                                                                                                                                                  
       
                                       


                       

             





                                                 



                                                                   
                                    




                                     
                                    
                               

                                                                     


                                   
                                                                               

 
                                                                 
                                                                         
                                                        
                                                       
                                                                                                                                                                                                                                                      
        
                                                                                                                                                                                                              
                                     




                     
                                
                                                     
                                                                     
                                                            
                                                           
                                    
                                                                                                                                                                                                                         


                                        
                                                                                                                                                                                 
       
                                       




                       



                                 
                                   
                     





                         
                                            

                                      
                                   
                     
             



                            
                         
                             

   
                                                                        


                               



                            
                         
                              












                                                                            
                             
                                   
                     





                        
                                         



                                             
                                                                  



                                       

                                                
                     
                                                            



        
                                                                        


                                          
                                                            
                                          
                                       


                                                                                                                     

                         
                                                     

                  

   

                                                                                                        

                 

 
                                                        
                                             
                            
                                                 

                                    
                                               
                                                                                                     



                
                                              
                                   
                     

             
                     





                        
                                         

                                       
                                   
                     

             
                     




                        

                                         




                                                                            
                                      
                                   
                     

             
                     




                            
                                            



                                             
                                                                          



                                       

                                                
                     
                                                                    



        
                                                                        


                                            
                                             
                                                   
                                                                    
                                                                                                                              







                                                
                                   
                     




                            

                                            
 
                                                             
                                   
                     

             
                     





                            
                                            
 










                                             
                                                                                
                                       
                                   
                                    
                                                                                                                                                             

          
                                              
                                                                                                                                                                                               

          
                                                   
                                                                                                                                                                                                        

          





                                                         




                                                              
                                                                                                                                                                                            
                  
                  


                                      
                                                                                                                                                       










                                     
                     





                                    
                                                             
 




                                                                          

            
       

                                                         
                         

                         
                                   
                                   



                                  
//: Mu scenarios. This will get long, but these are the tests we want to
//: support in this layer.

//: You can use variable names in scenarios, but for the most part we'll use
//: raw location numbers, because that lets us make assertions on memory.
//: Tests should avoid abstraction as far as possible.
:(scenarios run_mu_scenario)
:(scenario scenario_block)
scenario foo [
  run [
    1:number <- copy 13
  ]
  memory-should-contain [
    1 <- 13
  ]
]
# checks are inside scenario

:(scenario scenario_multiple_blocks)
scenario foo [
  run [
    1:number <- copy 13
  ]
  memory-should-contain [
    1 <- 13
  ]
  run [
    2:number <- copy 13
  ]
  memory-should-contain [
    1 <- 13
    2 <- 13
  ]
]

:(scenario scenario_check_memory_and_trace)
scenario foo [
  run [
    1:number <- copy 13
    trace 1, [a], [a b c]
  ]
  memory-should-contain [
    1 <- 13
  ]
  trace-should-contain [
    a: a b c
  ]
  trace-should-not-contain [
    a: x y z
  ]
]

//:: Core data structure

:(before "End Types")
struct scenario {
  string name;
  string to_run;
};

:(before "End Globals")
vector<scenario> Scenarios;
set<string> Scenario_names;

//:: Parse the 'scenario' form.
//: Simply store the text of the scenario.

:(before "End Command Handlers")
else if (command == "scenario") {
  Scenarios.push_back(parse_scenario(in));
}

:(code)
scenario parse_scenario(istream& in) {
  scenario result;
  result.name = next_word(in);
  if (contains_key(Scenario_names, result.name))
    raise_error << "duplicate scenario name: " << result.name << '\n' << end();
  Scenario_names.insert(result.name);
  skip_whitespace_and_comments(in);
  assert(in.peek() == '[');
  // scenarios are take special 'code' strings so we need to ignore brackets
  // inside comments
  result.to_run = slurp_quoted(in);
  // delete [] delimiters
  assert(result.to_run.at(0) == '[');
  result.to_run.erase(0, 1);
  assert(result.to_run.at(SIZE(result.to_run)-1) == ']');
  result.to_run.erase(SIZE(result.to_run)-1);
  return result;
}

:(scenario read_scenario_with_bracket_in_comment)
scenario foo [
  # ']' in comment
  1:number <- copy 0
]
+run: 1:number <- copy 0

:(scenario read_scenario_with_bracket_in_comment_in_nested_string)
scenario foo [
  1:address:array:character <- new [# not a comment]
]
+run: 1:address:array:character <- new [# not a comment]

//:: Run scenarios when we run 'mu test'.
//: Treat the text of the scenario as a regular series of instructions.

:(before "End Tests")
time_t mu_time; time(&mu_time);
cerr << "\nMu tests: " << ctime(&mu_time);
for (long long int i = 0; i < SIZE(Scenarios); ++i) {
//?   cerr << i << ": " << Scenarios.at(i).name << '\n';
  run_mu_scenario(Scenarios.at(i));
  if (Passed) cerr << ".";
}

//: Convenience: run a single named scenario.
:(after "Test Runs")
for (long long int i = 0; i < SIZE(Scenarios); ++i) {
  if (Scenarios.at(i).name == argv[argc-1]) {
    run_mu_scenario(Scenarios.at(i));
    if (Passed) cerr << ".\n";
    return 0;
  }
}

:(before "End Globals")
const scenario* Current_scenario = NULL;
:(code)
void run_mu_scenario(const scenario& s) {
  Current_scenario = &s;
  bool not_already_inside_test = !Trace_stream;
//?   cerr << s.name << '\n';
  if (not_already_inside_test) {
    Trace_file = s.name;
    Trace_stream = new trace_stream;
    setup();
  }
  assert(Routines.empty());
  vector<recipe_ordinal> tmp = load("recipe scenario-"+s.name+" [ "+s.to_run+" ]");
  bind_special_scenario_names(tmp.at(0));
  transform_all();
  run(tmp.front());
  if (not_already_inside_test && Trace_stream) {
    teardown();
    ofstream fout((Trace_dir+Trace_file).c_str());
    fout << Trace_stream->readable_contents("");
    fout.close();
    delete Trace_stream;
    Trace_stream = NULL;
    Trace_file = "";
  }
  Current_scenario = NULL;
}

//: Watch out for redefinitions of scenario routines. We should never ever be
//: doing that, regardless of anything else.
:(scenarios run)
:(scenario warn_on_redefine_scenario)
% Hide_warnings = true;
% Disable_redefine_warnings = true;
recipe scenario-foo [
  1:number <- copy 34
]

recipe scenario-foo [
  1:number <- copy 35
]
+warn: redefining recipe scenario-foo

:(after "bool warn_on_redefine(const string& recipe_name)")
  if (recipe_name.find("scenario-") == 0) return true;

//:: The special instructions we want to support inside scenarios.
//: In a compiler for the mu VM these will require more work.

//: 'run' interprets a string as a set of instructions

:(scenario run)
recipe main [
  run [
    1:number <- copy 13
  ]
]
+mem: storing 13 in location 1

:(before "End Primitive Recipe Declarations")
RUN,
:(before "End Primitive Recipe Numbers")
put(Recipe_ordinal, "run", RUN);
:(before "End Primitive Recipe Checks")
case RUN: {
  break;
}
:(before "End Primitive Recipe Implementations")
case RUN: {
  ostringstream tmp;
  tmp << "recipe run" << Next_recipe_ordinal << " [ " << current_instruction().ingredients.at(0).name << " ]";
//?   cerr << "before load\n";
  vector<recipe_ordinal> tmp_recipe = load(tmp.str());
//?   cerr << "before bind\n";
  bind_special_scenario_names(tmp_recipe.at(0));
//?   cerr << "before transform\n";
  transform_all();
//?   cerr << "end\n";
  if (Trace_stream) {
    ++Trace_stream->callstack_depth;
    trace(9998, "trace") << "run: incrementing callstack depth to " << Trace_stream->callstack_depth << end();
    assert(Trace_stream->callstack_depth < 9000);  // 9998-101 plus cushion
  }
  Current_routine->calls.push_front(call(tmp_recipe.at(0)));
  continue;  // not done with caller; don't increment current_step_index()
}

// Some variables for fake resources always get special addresses in
// scenarios.
:(code)
void bind_special_scenario_names(recipe_ordinal r) {
  // Special Scenario Variable Names(r)
  // End Special Scenario Variable Names(r)
}

:(scenario run_multiple)
recipe main [
  run [
    1:number <- copy 13
  ]
  run [
    2:number <- copy 13
  ]
]
+mem: storing 13 in location 1
+mem: storing 13 in location 2

//: 'memory-should-contain' raises errors if specific locations aren't as expected
//: Also includes some special support for checking strings.

:(before "End Globals")
bool Scenario_testing_scenario = false;
:(before "End Setup")
Scenario_testing_scenario = false;

:(scenario memory_check)
% Scenario_testing_scenario = true;
% Hide_errors = true;
recipe main [
  memory-should-contain [
    1 <- 13
  ]
]
+run: checking location 1
+error: expected location 1 to contain 13 but saw 0

:(before "End Primitive Recipe Declarations")
MEMORY_SHOULD_CONTAIN,
:(before "End Primitive Recipe Numbers")
put(Recipe_ordinal, "memory-should-contain", MEMORY_SHOULD_CONTAIN);
:(before "End Primitive Recipe Checks")
case MEMORY_SHOULD_CONTAIN: {
  break;
}
:(before "End Primitive Recipe Implementations")
case MEMORY_SHOULD_CONTAIN: {
  if (!Passed) break;
  check_memory(current_instruction().ingredients.at(0).name);
  break;
}

:(code)
void check_memory(const string& s) {
  istringstream in(s);
  in >> std::noskipws;
  set<long long int> locations_checked;
  while (true) {
    skip_whitespace_and_comments(in);
    if (!has_data(in)) break;
    string lhs = next_word(in);
    if (!is_integer(lhs)) {
      check_type(lhs, in);
      continue;
    }
    long long int address = to_integer(lhs);
    skip_whitespace_and_comments(in);
    string _assign;  in >> _assign;  assert(_assign == "<-");
    skip_whitespace_and_comments(in);
    double value = 0;  in >> value;
    if (contains_key(locations_checked, address))
      raise_error << "duplicate expectation for location " << address << '\n' << end();
    trace(9999, "run") << "checking location " << address << end();
    if (get_or_insert(Memory, address) != value) {
      if (Current_scenario && !Scenario_testing_scenario) {
        // genuine test in a mu file
        raise_error << "\nF - " << Current_scenario->name << ": expected location " << address << " to contain " << no_scientific(value) << " but saw " << no_scientific(get_or_insert(Memory, address)) << '\n' << end();
      }
      else {
        // just testing scenario support
        raise_error << "expected location " << address << " to contain " << no_scientific(value) << " but saw " << no_scientific(get_or_insert(Memory, address)) << '\n' << end();
      }
      if (!Scenario_testing_scenario) {
        Passed = false;
        ++Num_failures;
      }
      return;
    }
    locations_checked.insert(address);
  }
}

void check_type(const string& lhs, istream& in) {
  reagent x(lhs);
  const string_tree* type_name = x.properties.at(0).second;
  if (type_name->value == "array"
      && type_name->right && type_name->right->value == "character"
      && !type_name->right->right) {
    x.set_value(to_integer(x.name));
    skip_whitespace_and_comments(in);
    string _assign = next_word(in);
    assert(_assign == "<-");
    skip_whitespace_and_comments(in);
    string literal = next_word(in);
    long long int address = x.value;
    // exclude quoting brackets
    assert(*literal.begin() == '[');  literal.erase(literal.begin());
    assert(*--literal.end() == ']');  literal.erase(--literal.end());
    check_string(address, literal);
    return;
  }
  raise_error << "don't know how to check memory for " << lhs << '\n' << end();
}

void check_string(long long int address, const string& literal) {
  trace(9999, "run") << "checking string length at " << address << end();
  if (get_or_insert(Memory, address) != SIZE(literal)) {
    if (Current_scenario && !Scenario_testing_scenario)
      raise_error << "\nF - " << Current_scenario->name << ": expected location " << address << " to contain length " << SIZE(literal) << " of string [" << literal << "] but saw " << no_scientific(get_or_insert(Memory, address)) << '\n' << end();
    else
      raise_error << "expected location " << address << " to contain length " << SIZE(literal) << " of string [" << literal << "] but saw " << no_scientific(get_or_insert(Memory, address)) << '\n' << end();
    if (!Scenario_testing_scenario) {
      Passed = false;
      ++Num_failures;
    }
    return;
  }
  ++address;  // now skip length
  for (long long int i = 0; i < SIZE(literal); ++i) {
    trace(9999, "run") << "checking location " << address+i << end();
    if (get_or_insert(Memory, address+i) != literal.at(i)) {
      if (Current_scenario && !Scenario_testing_scenario) {
        // genuine test in a mu file
        raise_error << "\nF - " << Current_scenario->name << ": expected location " << (address+i) << " to contain " << literal.at(i) << " but saw " << no_scientific(get_or_insert(Memory, address+i)) << '\n' << end();
      }
      else {
        // just testing scenario support
        raise_error << "expected location " << (address+i) << " to contain " << literal.at(i) << " but saw " << no_scientific(get_or_insert(Memory, address+i)) << '\n' << end();
      }
      if (!Scenario_testing_scenario) {
        Passed = false;
        ++Num_failures;
      }
      return;
    }
  }
}

:(scenario memory_check_multiple)
% Scenario_testing_scenario = true;
% Hide_errors = true;
recipe main [
  memory-should-contain [
    1 <- 0
    1 <- 0
  ]
]
+error: duplicate expectation for location 1

:(scenario memory_check_string_length)
% Scenario_testing_scenario = true;
% Hide_errors = true;
recipe main [
  1:number <- copy 3
  2:number <- copy 97  # 'a'
  3:number <- copy 98  # 'b'
  4:number <- copy 99  # 'c'
  memory-should-contain [
    1:array:character <- [ab]
  ]
]
+error: expected location 1 to contain length 2 of string [ab] but saw 3

:(scenario memory_check_string)
recipe main [
  1:number <- copy 3
  2:number <- copy 97  # 'a'
  3:number <- copy 98  # 'b'
  4:number <- copy 99  # 'c'
  memory-should-contain [
    1:array:character <- [abc]
  ]
]
+run: checking string length at 1
+run: checking location 2
+run: checking location 3
+run: checking location 4

:(code)
//: 'trace-should-contain' is like the '+' lines in our scenarios so far
// Like runs of contiguous '+' lines, order is important. The trace checks
// that the lines are present *and* in the specified sequence. (There can be
// other lines in between.)

:(scenario trace_check_fails)
% Scenario_testing_scenario = true;
% Hide_errors = true;
recipe main [
  trace-should-contain [
    a: b
    a: d
  ]
]
+error: missing [b] in trace with label a

:(before "End Primitive Recipe Declarations")
TRACE_SHOULD_CONTAIN,
:(before "End Primitive Recipe Numbers")
put(Recipe_ordinal, "trace-should-contain", TRACE_SHOULD_CONTAIN);
:(before "End Primitive Recipe Checks")
case TRACE_SHOULD_CONTAIN: {
  break;
}
:(before "End Primitive Recipe Implementations")
case TRACE_SHOULD_CONTAIN: {
  if (!Passed) break;
  check_trace(current_instruction().ingredients.at(0).name);
  break;
}

:(code)
// simplified version of check_trace_contents() that emits errors rather
// than just printing to stderr
bool check_trace(const string& expected) {
  Trace_stream->newline();
  vector<trace_line> expected_lines = parse_trace(expected);
  if (expected_lines.empty()) return true;
  long long int curr_expected_line = 0;
  for (vector<trace_line>::iterator p = Trace_stream->past_lines.begin(); p != Trace_stream->past_lines.end(); ++p) {
    if (expected_lines.at(curr_expected_line).label != p->label) continue;
    if (expected_lines.at(curr_expected_line).contents != trim(p->contents)) continue;
    // match
    ++curr_expected_line;
    if (curr_expected_line == SIZE(expected_lines)) {
      return true;
    }
  }

  raise_error << "missing [" << expected_lines.at(curr_expected_line).contents << "] "
              << "in trace with label " << expected_lines.at(curr_expected_line).label << '\n' << end();
  Passed = false;
  return false;
}

vector<trace_line> parse_trace(const string& expected) {
  vector<string> buf = split(expected, "\n");
  vector<trace_line> result;
  for (long long int i = 0; i < SIZE(buf); ++i) {
    buf.at(i) = trim(buf.at(i));
    if (buf.at(i).empty()) continue;
    long long int delim = buf.at(i).find(": ");
    result.push_back(trace_line(trim(buf.at(i).substr(0, delim)),  trim(buf.at(i).substr(delim+2))));
  }
  return result;
}

:(scenario trace_check_fails_in_nonfirst_line)
% Scenario_testing_scenario = true;
% Hide_errors = true;
recipe main [
  run [
    trace 1, [a], [b]
  ]
  trace-should-contain [
    a: b
    a: d
  ]
]
+error: missing [d] in trace with label a

:(scenario trace_check_passes_silently)
% Scenario_testing_scenario = true;
% Hide_errors = true;
recipe main [
  run [
    trace 1, [a], [b]
  ]
  trace-should-contain [
    a: b
  ]
]
-error: missing [b] in trace with label a
$error: 0

//: 'trace-should-not-contain' is like the '-' lines in our scenarios so far
//: Each trace line is separately checked for absense. Order is *not*
//: important, so you can't say things like "B should not exist after A."

:(scenario trace_negative_check_fails)
% Scenario_testing_scenario = true;
% Hide_errors = true;
recipe main [
  run [
    trace 1, [a], [b]
  ]
  trace-should-not-contain [
    a: b
  ]
]
+error: unexpected [b] in trace with label a

:(before "End Primitive Recipe Declarations")
TRACE_SHOULD_NOT_CONTAIN,
:(before "End Primitive Recipe Numbers")
put(Recipe_ordinal, "trace-should-not-contain", TRACE_SHOULD_NOT_CONTAIN);
:(before "End Primitive Recipe Checks")
case TRACE_SHOULD_NOT_CONTAIN: {
  break;
}
:(before "End Primitive Recipe Implementations")
case TRACE_SHOULD_NOT_CONTAIN: {
  if (!Passed) break;
  check_trace_missing(current_instruction().ingredients.at(0).name);
  break;
}

:(code)
// simplified version of check_trace_contents() that emits errors rather
// than just printing to stderr
bool check_trace_missing(const string& in) {
  Trace_stream->newline();
  vector<trace_line> lines = parse_trace(in);
  for (long long int i = 0; i < SIZE(lines); ++i) {
    if (trace_count(lines.at(i).label, lines.at(i).contents) != 0) {
      raise_error << "unexpected [" << lines.at(i).contents << "] in trace with label " << lines.at(i).label << '\n' << end();
      Passed = false;
      return false;
    }
  }
  return true;
}

:(scenario trace_negative_check_passes_silently)
% Scenario_testing_scenario = true;
% Hide_errors = true;
recipe main [
  trace-should-not-contain [
    a: b
  ]
]
-error: unexpected [b] in trace with label a
$error: 0

:(scenario trace_negative_check_fails_on_any_unexpected_line)
% Scenario_testing_scenario = true;
% Hide_errors = true;
recipe main [
  run [
    trace 1, [a], [d]
  ]
  trace-should-not-contain [
    a: b
    a: d
  ]
]
+error: unexpected [d] in trace with label a

:(scenario trace_count_check)
recipe main [
  run [
    trace 1, [a], [foo]
  ]
  check-trace-count-for-label 1, [a]
]

:(before "End Primitive Recipe Declarations")
CHECK_TRACE_COUNT_FOR_LABEL,
:(before "End Primitive Recipe Numbers")
put(Recipe_ordinal, "check-trace-count-for-label", CHECK_TRACE_COUNT_FOR_LABEL);
:(before "End Primitive Recipe Checks")
case CHECK_TRACE_COUNT_FOR_LABEL: {
  if (SIZE(inst.ingredients) != 2) {
    raise_error << maybe(get(Recipe, r).name) << "'check-trace-for-label' requires exactly two ingredients, but got '" << inst.to_string() << "'\n" << end();
    break;
  }
  if (!is_mu_number(inst.ingredients.at(0))) {
    raise_error << maybe(get(Recipe, r).name) << "first ingredient of 'check-trace-for-label' should be a number (count), but got " << inst.ingredients.at(0).original_string << '\n' << end();
    break;
  }
  if (!is_literal_string(inst.ingredients.at(1))) {
    raise_error << maybe(get(Recipe, r).name) << "second ingredient of 'check-trace-for-label' should be a literal string (label), but got " << inst.ingredients.at(1).original_string << '\n' << end();
    break;
  }
  break;
}
:(before "End Primitive Recipe Implementations")
case CHECK_TRACE_COUNT_FOR_LABEL: {
  if (!Passed) break;
  long long int expected_count = ingredients.at(0).at(0);
  string label = current_instruction().ingredients.at(1).name;
  long long int count = trace_count(label);
  if (count != expected_count) {
    if (Current_scenario && !Scenario_testing_scenario) {
      // genuine test in a mu file
      raise_error << "\nF - " << Current_scenario->name << ": " << maybe(current_recipe_name()) << "expected " << expected_count << " lines in trace with label " << label << " in trace: ";
      DUMP(label);
      raise_error;
    }
    else {
      // just testing scenario support
      raise_error << maybe(current_recipe_name()) << "expected " << expected_count << " lines in trace with label " << label << " in trace\n" << end();
    }
    if (!Scenario_testing_scenario) {
      Passed = false;
      ++Num_failures;
    }
  }
  break;
}

:(scenario trace_count_check_2)
% Scenario_testing_scenario = true;
% Hide_errors = true;
recipe main [
  run [
    trace 1, [a], [foo]
  ]
  check-trace-count-for-label 2, [a]
]
+error: main: expected 2 lines in trace with label a in trace

//: Minor detail: ignore 'system' calls in scenarios, since anything we do
//: with them is by definition impossible to test through mu.
:(after "case _SYSTEM:")
  if (Current_scenario) break;

//:: Helpers

:(code)
// just for the scenarios running scenarios in C++ layers
void run_mu_scenario(const string& form) {
  Scenario_names.clear();
  istringstream in(form);
  in >> std::noskipws;
  skip_whitespace_and_comments(in);
  string _scenario = next_word(in);
  assert(_scenario == "scenario");
  scenario s = parse_scenario(in);
  run_mu_scenario(s);
}