about summary refs log tree commit diff stats
path: root/html/fork.mu.html
Commit message (Collapse)AuthorAgeFilesLines
* 2812Kartik K. Agaram2016-03-271-8/+17
|
* 2744Kartik K. Agaram2016-03-091-2/+2
| | | | Tweak colors and font-sizes in generated html.
* 2743Kartik K. Agaram2016-03-091-18/+9
| | | | | Looks like "TOhtml | <other command>" doesn't work on Mac OS X for some reason..
* 2605Kartik K. Agaram2016-01-261-2/+2
|
* 2423 - describe shape-shifting in html docsKartik K. Agaram2015-11-101-1/+1
|
* 2177Kartik K. Agaram2015-09-071-12/+15
|
* 2175Kartik K. Agaram2015-09-061-15/+12
|
* 2062Kartik K. Agaram2015-08-231-2/+2
|
* 1949Kartik K. Agaram2015-08-061-1/+1
|
* 1925Kartik K. Agaram2015-08-031-3/+3
|
* 1885Kartik K. Agaram2015-07-291-3/+3
|
* 1853Kartik K. Agaram2015-07-251-1/+1
|
* 1778Kartik K. Agaram2015-07-131-1/+1
|
* 1631 - update html versionsKartik K. Agaram2015-06-231-5/+5
| | | | | | Html is a little more readable thanks to feedback from J David Eisenberg (https://news.ycombinator.com/item?id=9766330), in particular the suggestion to use https://addons.mozilla.org/En-us/firefox/addon/wcag-contrast-checker.
* 1556Kartik K. Agaram2015-06-121-5/+5
|
* 1549Kartik K. Agaram2015-06-091-2/+2
|
* 1517Kartik K. Agaram2015-05-301-3/+3
|
* 1471Kartik K. Agaram2015-05-261-1/+1
|
* 1459Kartik K. Agaram2015-05-251-0/+51
5084695'>^
6f8f9fb5 ^
decaddb4 ^

dd2e01e4 ^
6f8f9fb5 ^
decaddb4 ^

6f8f9fb5 ^
ac0e9db5 ^
05d17773 ^
4c879fa1 ^


decaddb4 ^
4c879fa1 ^


decaddb4 ^
4c879fa1 ^
e6692482 ^






4c879fa1 ^
c062697c ^
e85cb85b ^
e6692482 ^
e85cb85b ^
e6692482 ^
e85cb85b ^


4c879fa1 ^
e6692482 ^



4c879fa1 ^
e6692482 ^
4c879fa1 ^
e6692482 ^
4c879fa1 ^
ab6ed192 ^
e6692482 ^
4c879fa1 ^
32f6079f ^

decaddb4 ^
4c879fa1 ^

dd2e01e4 ^
4c879fa1 ^

decaddb4 ^
4c879fa1 ^

c6034af3 ^
4c879fa1 ^

e6692482 ^

4c879fa1 ^

4ce90b39 ^
4c879fa1 ^

e6692482 ^
dd2e01e4 ^
e6692482 ^

decaddb4 ^


6f8f9fb5 ^

4ce90b39 ^
1fba5d5d ^
6f8f9fb5 ^
7ac221e4 ^
decaddb4 ^
7ac221e4 ^
decaddb4 ^
5f98a10c ^
4ce90b39 ^
decaddb4 ^

e6692482 ^
1848b18f ^









9ea76483 ^
363be37f ^





9ea76483 ^
88be3dbc ^
decaddb4 ^
bc643692 ^

decaddb4 ^
bc643692 ^
decaddb4 ^


dd2e01e4 ^




3d45bf38 ^
88be3dbc ^
3d45bf38 ^
bc643692 ^
3d45bf38 ^



dd2e01e4 ^


3d45bf38 ^
88be3dbc ^
3d45bf38 ^
bc643692 ^
3d45bf38 ^






dd2e01e4 ^



3d45bf38 ^
051c4738 ^
3d45bf38 ^
bc643692 ^

3d45bf38 ^

bc643692 ^
3d45bf38 ^




dd2e01e4 ^





c062697c ^
88be3dbc ^
c062697c ^
bc643692 ^

c062697c ^
5497090a ^
bc643692 ^
c062697c ^




dd2e01e4 ^





c062697c ^
88be3dbc ^
c062697c ^
bc643692 ^
c062697c ^
bc643692 ^
c062697c ^

bc643692 ^
c062697c ^
bc643692 ^
c062697c ^

dd2e01e4 ^
c062697c ^
88be3dbc ^
c062697c ^
bc643692 ^
c062697c ^
bc643692 ^
c062697c ^


bc643692 ^
c062697c ^

dd2e01e4 ^
c062697c ^
051c4738 ^
c062697c ^
bc643692 ^
c062697c ^
bc643692 ^
c062697c ^




dd2e01e4 ^
c062697c ^
88be3dbc ^
5f98a10c ^
c062697c ^
bc643692 ^
c062697c ^
3ba63579 ^
c062697c ^

dd2e01e4 ^
32f6079f ^
88be3dbc ^
32f6079f ^
bc643692 ^

32f6079f ^
5497090a ^
bc643692 ^
32f6079f ^

dd2e01e4 ^




32f6079f ^
88be3dbc ^
32f6079f ^
bc643692 ^

32f6079f ^
5497090a ^
bc643692 ^
32f6079f ^

dd2e01e4 ^




15ab959d ^
88be3dbc ^
15ab959d ^
bc643692 ^
15ab959d ^
bc643692 ^
15ab959d ^
bc643692 ^
15ab959d ^

bc643692 ^
15ab959d ^

dd2e01e4 ^

15ab959d ^
88be3dbc ^
15ab959d ^
bc643692 ^
15ab959d ^
bc643692 ^
15ab959d ^
dd2e01e4 ^


15ab959d ^


88be3dbc ^
3c6784a8 ^
bc643692 ^

15ab959d ^
bc643692 ^
15ab959d ^
5497090a ^

bc643692 ^
15ab959d ^

5497090a ^
15ab959d ^
827898fc ^
4c879fa1 ^
5f98a10c ^

4c879fa1 ^


5f98a10c ^
e85cb85b ^
5f98a10c ^

e85cb85b ^




5f98a10c ^
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

                          
                                                                    









                                                                         

                                                                           





                                                                              
                      
                            


             
                      

   


                                                


                   
                                        

       
                                               
                                

                                                                              
                                                                                            
                                                                         
                                                        
                            
                                                                                                   
                                                             

                            
                                                                           
                                                              

     
                                           
                                                                         
                                                  


                              
     


                            
     
                                






                                                                   
               
     
                       
                                                                                                     
                                     
                                                                                               


                 
                                   



                                                           
        
                         
                                            
                                                                                                     
                                         
                                                                             
                                                                                                          
                 

       
          

                                                                            
                                                                                                 

                 
     

                                  
                                                        

                            

                                                                       

                                                
                                                                                 

                                       
                            
                                                                                               

                                                                                                                                               


   

                                                                         
                                                                                                                    
                    
                                                                                                    
                                    
                                     
                                         
   
                                                                      
                                                        

 
                









                                                                            
                                        





                                              
 
                
             

                    
   
                      


        




                                                
 
                             
             
                    



         


                                                
 
                           
             
                    






         



                                                
 
                             
             

                    

         
                      




         





                                                
 
                    
             

                    
   
                     
                      




         





                                                
 
                        
             
                    
   
                      

         
                        
     
                      

   
                         
 
                                   
             
                    
   
                      


         
                      

   
                         
 
                                     
             
                    
   
                      




         
                         
 
                       
                     
             
                    
   
                     

   
                            
 
                        
             

                    
   
                         
                      

   




                                                
 
                       
             

                    
   
                        
                      

   




                                                
 
                       
             
                    
   
                      
     
                        

                     
                      

   

                                                
 
                      
             
                    
      
                    
 


                                                


                                
                                    
                       

                    
   
                                  
                      

                                           
                                    

        
                                             
 
                       
 

                                      


             
                                
 

                                                      




             
                                                         
//: Structured programming
//:
//: Our jump recipes are quite inconvenient to use, so mu provides a
//: lightweight tool called 'transform_braces' to work in a slightly more
//: convenient format with nested braces:
//:
//:   {
//:     some instructions
//:     {
//:       more instructions
//:     }
//:   }
//:
//: Braces are just labels, they require no special parsing. The pseudo
//: recipes 'loop' and 'break' jump to just after the enclosing '{' and '}'
//: respectively.
//:
//: Conditional and unconditional 'loop' and 'break' should give us 80% of the
//: benefits of the control-flow primitives we're used to in other languages,
//: like 'if', 'while', 'for', etc.

:(scenarios transform)
:(scenario brace_conversion)
recipe main [
  {
    break
    1:number <- copy 0
  }
]
+transform: --- transform braces for recipe main
+transform: jump 1:offset
+transform: copy ...

//: one-time setup
:(after "int main")
  Transform.push_back(transform_braces);

:(code)
void transform_braces(const recipe_ordinal r) {
  const int OPEN = 0, CLOSE = 1;
  // use signed integer for step index because we'll be doing arithmetic on it
  list<pair<int/*OPEN/CLOSE*/, /*step*/long long int> > braces;
  trace(9991, "transform") << "--- transform braces for recipe " << Recipe[r].name << end();
  for (long long int index = 0; index < SIZE(Recipe[r].steps); ++index) {
    const instruction& inst = Recipe[r].steps.at(index);
    if (inst.label == "{") {
      trace(9993, "transform") << maybe(Recipe[r].name) << "push (open, " << index << ")" << end();
      braces.push_back(pair<int,long long int>(OPEN, index));
    }
    if (inst.label == "}") {
      trace(9993, "transform") << "push (close, " << index << ")" << end();
      braces.push_back(pair<int,long long int>(CLOSE, index));
    }
  }
  stack</*step*/long long int> open_braces;
  for (long long int index = 0; index < SIZE(Recipe[r].steps); ++index) {
    instruction& inst = Recipe[r].steps.at(index);
    if (inst.label == "{") {
      open_braces.push(index);
      continue;
    }
    if (inst.label == "}") {
      open_braces.pop();
      continue;
    }
    if (inst.is_label) continue;
    if (inst.old_name != "loop"
         && inst.old_name != "loop-if"
         && inst.old_name != "loop-unless"
         && inst.old_name != "break"
         && inst.old_name != "break-if"
         && inst.old_name != "break-unless") {
      trace(9991, "transform") << inst.old_name << " ..." << end();
      continue;
    }
    // check for errors
    if (inst.old_name.find("-if") != string::npos || inst.old_name.find("-unless") != string::npos) {
      if (inst.ingredients.empty()) {
        raise_error << inst.old_name << " expects 1 or 2 ingredients, but got none\n" << end();
        continue;
      }
    }
    // update instruction operation
    if (inst.old_name.find("-if") != string::npos)
      inst.name = "jump-if";
    else if (inst.old_name.find("-unless") != string::npos)
      inst.name = "jump-unless";
    else
      inst.name = "jump";
    // check for explicitly provided targets
    if (inst.old_name.find("-if") != string::npos || inst.old_name.find("-unless") != string::npos) {
      // conditional branches check arg 1
      if (SIZE(inst.ingredients) > 1 && is_literal(inst.ingredients.at(1))) {
        trace(9991, "transform") << inst.name << ' ' << inst.ingredients.at(1).name << ":offset" << end();
        continue;
      }
    }
    else {
      // unconditional branches check arg 0
      if (!inst.ingredients.empty() && is_literal(inst.ingredients.at(0))) {
        trace(9991, "transform") << "jump " << inst.ingredients.at(0).name << ":offset" << end();
        continue;
      }
    }
    // if implicit, compute target
    reagent target;
    target.type = new type_tree(Type_ordinal["offset"]);
    target.set_value(0);
    if (open_braces.empty())
      raise_error << inst.old_name << " needs a '{' before\n" << end();
    else if (inst.old_name.find("loop") != string::npos)
      target.set_value(open_braces.top()-index);
    else  // break instruction
      target.set_value(matching_brace(open_braces.top(), braces, r) - index - 1);
    inst.ingredients.push_back(target);
    // log computed target
    if (inst.name == "jump")
      trace(9991, "transform") << "jump " << no_scientific(target.value) << ":offset" << end();
    else
      trace(9991, "transform") << inst.name << ' ' << inst.ingredients.at(0).name << ", " << no_scientific(target.value) << ":offset" << end();
  }
}

// returns a signed integer not just so that we can return -1 but also to
// enable future signed arithmetic
long long int matching_brace(long long int index, const list<pair<int, long long int> >& braces, recipe_ordinal r) {
  int stacksize = 0;
  for (list<pair<int, long long int> >::const_iterator p = braces.begin(); p != braces.end(); ++p) {
    if (p->second < index) continue;
    stacksize += (p->first ? 1 : -1);
    if (stacksize == 0) return p->second;
  }
  raise_error << maybe(Recipe[r].name) << "unbalanced '{'\n" << end();
  return SIZE(Recipe[r].steps);  // exit current routine
}

// todo: remove?
//: Make sure these pseudo recipes get consistent numbers in all tests, even
//: though they aren't implemented.

:(before "End Primitive Recipe Declarations")
BREAK,
BREAK_IF,
BREAK_UNLESS,
LOOP,
LOOP_IF,
LOOP_UNLESS,
:(before "End Primitive Recipe Numbers")
Recipe_ordinal["break"] = BREAK;
Recipe_ordinal["break-if"] = BREAK_IF;
Recipe_ordinal["break-unless"] = BREAK_UNLESS;
Recipe_ordinal["loop"] = LOOP;
Recipe_ordinal["loop-if"] = LOOP_IF;
Recipe_ordinal["loop-unless"] = LOOP_UNLESS;

:(scenario loop)
recipe main [
  1:number <- copy 0
  2:number <- copy 0
  {
    3:number <- copy 0
    loop
  }
]
+transform: --- transform braces for recipe main
+transform: copy ...
+transform: copy ...
+transform: copy ...
+transform: jump -2:offset

:(scenario break_empty_block)
recipe main [
  1:number <- copy 0
  {
    break
  }
]
+transform: --- transform braces for recipe main
+transform: copy ...
+transform: jump 0:offset

:(scenario break_cascading)
recipe main [
  1:number <- copy 0
  {
    break
  }
  {
    break
  }
]
+transform: --- transform braces for recipe main
+transform: copy ...
+transform: jump 0:offset
+transform: jump 0:offset

:(scenario break_cascading_2)
recipe main [
  1:number <- copy 0
  2:number <- copy 0
  {
    break
    3:number <- copy 0
  }
  {
    break
  }
]
+transform: --- transform braces for recipe main
+transform: copy ...
+transform: copy ...
+transform: jump 1:offset
+transform: copy ...
+transform: jump 0:offset

:(scenario break_if)
recipe main [
  1:number <- copy 0
  2:number <- copy 0
  {
    break-if 2:number
    3:number <- copy 0
  }
  {
    break
  }
]
+transform: --- transform braces for recipe main
+transform: copy ...
+transform: copy ...
+transform: jump-if 2, 1:offset
+transform: copy ...
+transform: jump 0:offset

:(scenario break_nested)
recipe main [
  1:number <- copy 0
  {
    2:number <- copy 0
    break
    {
      3:number <- copy 0
    }
    4:number <- copy 0
  }
]
+transform: jump 4:offset

:(scenario break_nested_degenerate)
recipe main [
  1:number <- copy 0
  {
    2:number <- copy 0
    break
    {
    }
    4:number <- copy 0
  }
]
+transform: jump 3:offset

:(scenario break_nested_degenerate_2)
recipe main [
  1:number <- copy 0
  {
    2:number <- copy 0
    break
    {
    }
  }
]
+transform: jump 2:offset

:(scenario break_label)
% Hide_errors = true;
recipe main [
  1:number <- copy 0
  {
    break +foo:offset
  }
]
+transform: jump +foo:offset

:(scenario break_unless)
recipe main [
  1:number <- copy 0
  2:number <- copy 0
  {
    break-unless 2:number
    3:number <- copy 0
  }
]
+transform: --- transform braces for recipe main
+transform: copy ...
+transform: copy ...
+transform: jump-unless 2, 1:offset
+transform: copy ...

:(scenario loop_unless)
recipe main [
  1:number <- copy 0
  2:number <- copy 0
  {
    loop-unless 2:number
    3:number <- copy 0
  }
]
+transform: --- transform braces for recipe main
+transform: copy ...
+transform: copy ...
+transform: jump-unless 2, -1:offset
+transform: copy ...

:(scenario loop_nested)
recipe main [
  1:number <- copy 0
  {
    2:number <- copy 0
    {
      3:number <- copy 0
    }
    loop-if 4:boolean
    5:number <- copy 0
  }
]
+transform: --- transform braces for recipe main
+transform: jump-if 4, -5:offset

:(scenario loop_label)
recipe main [
  1:number <- copy 0
  +foo
  2:number <- copy 0
]
+transform: --- transform braces for recipe main
+transform: copy ...
+transform: copy ...

//: test how things actually run
:(scenarios run)
:(scenario brace_conversion_and_run)
recipe test-factorial [
  1:number <- copy 5
  2:number <- copy 1
  {
    3:boolean <- equal 1:number, 1
    break-if 3:boolean
#    $print 1:number
    2:number <- multiply 2:number, 1:number
    1:number <- subtract 1:number, 1
    loop
  }
  4:number <- copy 2:number  # trigger a read
]
+mem: location 2 is 120

:(scenario break_outside_braces_fails)
% Hide_errors = true;
recipe main [
  break
]
+error: break needs a '{' before

:(scenario break_conditional_without_ingredient_fails)
% Hide_errors = true;
recipe main [
  {
    break-if
  }
]
+error: break-if expects 1 or 2 ingredients, but got none