about summary refs log tree commit diff stats
path: root/TODO
Commit message (Expand)AuthorAgeFilesLines
* modified TODOhut2009-07-181-0/+5
* modified TODO and added commentshut2009-07-181-0/+2
* just some formatting in TODOhut2009-07-171-11/+11
* "Required for next Release" in todo listhut2009-07-171-2/+14
* extended todo listhut2009-07-171-14/+35
* things to dohut2009-07-161-1/+4
* donehut2009-07-121-1/+0
* donehut2009-07-041-1/+0
* ideahut2009-07-041-0/+1
* ideashut2009-07-031-1/+2
* ideahut2009-07-031-0/+1
* todohut2009-07-031-0/+4
* bars fixedhut2009-06-291-1/+0
* comments, todohut2009-06-221-0/+1
* new help screen, overview of bookmarkshut2009-06-221-1/+0
* more stuff to do~hut2009-06-181-0/+2
* more stuff to dohut2009-06-181-0/+2
* new thing to dohut2009-06-151-0/+1
* fix the (copy/move) bars please :)hut2009-06-131-0/+1
* cleaned uphut2009-06-131-5/+1
* interrupts?hut2009-06-111-0/+1
* poopoohut2009-06-041-0/+4
21029f84b45aa50176'>^
37421f8a ^
b0bf5321 ^
37421f8a ^


3a9ff084 ^
78c50205 ^
6c96a437 ^
37421f8a ^






b24eb476 ^
3473c63a ^
f6c7b415 ^
3377364a ^
6c96a437 ^
3473c63a ^
067c8ed6 ^
37421f8a ^





37421f8a ^
b55b15a9 ^
b24eb476 ^

6c96a437 ^
3473c63a ^
37e71785 ^
37421f8a ^


3adc9e08 ^
37421f8a ^



37421f8a ^
b55b15a9 ^
af023b32 ^
b24eb476 ^
3473c63a ^
05331766 ^
37e71785 ^
af023b32 ^
37421f8a ^

















7a84094a ^
08f4628e ^
37421f8a ^
1ead3562 ^
37421f8a ^
7a84094a ^

37421f8a ^
7a84094a ^


37421f8a ^






7a84094a ^
37421f8a ^

7a84094a ^

37421f8a ^
1ead3562 ^
37421f8a ^
7a84094a ^

37421f8a ^
7a84094a ^


37421f8a ^



37e71785 ^

7a84094a ^
08f4628e ^
37e71785 ^
1ead3562 ^
37e71785 ^
7a84094a ^

37e71785 ^
7a84094a ^


37e71785 ^



37421f8a ^



1ead3562 ^
760f683f ^

37421f8a ^





1ead3562 ^
7a84094a ^


37421f8a ^



1ead3562 ^
7a84094a ^



a0331a9b ^
7a84094a ^
d559f68b ^
7a84094a ^


37421f8a ^



1ead3562 ^
760f683f ^





7a84094a ^
37421f8a ^




1ead3562 ^
760f683f ^


7a84094a ^
37421f8a ^
760f683f ^

7a84094a ^

37421f8a ^





7a84094a ^
08f4628e ^
37421f8a ^

7a84094a ^
08f4628e ^
37421f8a ^
1ead3562 ^
37421f8a ^
7a84094a ^

37421f8a ^
7a84094a ^


37421f8a ^





7a84094a ^
08f4628e ^
760f683f ^
37421f8a ^
1ead3562 ^
760f683f ^


7a84094a ^

760f683f ^


7a84094a ^


37421f8a ^





7a84094a ^
08f4628e ^
37421f8a ^


7a84094a ^

37421f8a ^
1ead3562 ^
37421f8a ^
7a84094a ^

37421f8a ^
7a84094a ^


37421f8a ^






7a84094a ^
37421f8a ^

7a84094a ^

37421f8a ^
1ead3562 ^
37421f8a ^
7a84094a ^

37421f8a ^
7a84094a ^


37421f8a ^








1ead3562 ^
d559f68b ^
7a84094a ^


37421f8a ^









2b250717 ^
37421f8a ^

78c50205 ^
0f2781f8 ^
d5fe534d ^




37421f8a ^
78c50205 ^
d5fe534d ^

6c96a437 ^
d5fe534d ^












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









                                                                              






                                             
                                                                                                                                             

          



                                                
                                                                 







                                                                                       
                                          
              
                                     
                              



















                                                                          
                                                                                                                   
                                              


                                                                      
   
                               


                    
                                                 
                                                              
                                           






                                                       
                                            
                           
                   
                                         
                                                                                 
                               
                           





                                                           
                                                      
                                                            

                        
                                                   
                                                      
                                                           


                                       
                                                



           
                                                                
                                                
                      
                                 
                                                 
                                                       
                                               
                                                                                                               

















                                              
       
        
 
          
                         

                     
                         


                              






                                                        
       

               

       
 
          
                            

                     
                            


                              



                                          

                                              
       
                        
 
          
                         

                     
                         


                              



                                         



                                                                       
          

                       





                                                                            
          


                              



                                        
          



                   
                               
                     
                     


                              



                                      
          





                            
                              




                                                                                      
          


                            
                     
                      

                         

                              





                                                   
       
        

               
       
        
 
          
                         

                     
                         


                              





                                                            
       
        
         
 
          


                                  

                     


                                  


                                





                                                                   
       
        


               

       
 
          
                                 

                     
                                 


                                






                                                                   
       

               

       
 
          
                            

                     
                       


                              








                                                                       
          
                     


                              









                                             
                                                                                                                                                 

          
                                            
                                                                                                                                                                                       




                                                
                
                                                       

                
                                           












                                          
// A universal hash function that can handle objects of any type.
//
// The way it's currently implemented, two objects will have the same hash if
// all their non-address fields (all the way down) expand to the same sequence
// of scalar values. In particular, a container with all zero addresses hashes
// to 0. Hopefully this won't be an issue because we are usually hashing
// objects of a single type in any given hash table.
//
// Based on http://burtleburtle.net/bob/hash/hashfaq.html

:(before "End Primitive Recipe Declarations")
HASH,
:(before "End Primitive Recipe Numbers")
put(Recipe_ordinal, "hash", HASH);
:(before "End Primitive Recipe Checks")
case HASH: {
  if (SIZE(inst.ingredients) != 1) {
    raise << maybe(get(Recipe, r).name) << "'hash' takes exactly one ingredient rather than '" << to_original_string(inst) << "'\n" << end();
    break;
  }
  break;
}
:(before "End Primitive Recipe Implementations")
case HASH: {
  const reagent& input = current_instruction().ingredients.at(0);
  products.resize(1);
  products.at(0).push_back(hash(0, input));
  break;
}

//: in all the code below, the intermediate results of hashing are threaded through 'h'

:(code)
size_t hash(size_t h, reagent/*copy*/ r) {
  canonize(r);
  if (is_mu_text(r))  // optimization
    return hash_mu_text(h, r);
  else if (is_mu_address(r))
    return hash_mu_address(h, r);
  else if (is_mu_scalar(r))
    return hash_mu_scalar(h, r);
  else if (is_mu_array(r))
    return hash_mu_array(h, r);
  else if (is_mu_container(r))
    return hash_mu_container(h, r);
  else if (is_mu_exclusive_container(r))
    return hash_mu_exclusive_container(h, r);
  assert(false);
}

size_t hash_mu_scalar(size_t h, const reagent& r) {
  double input = is_literal(r) ? r.value : get_or_insert(Memory, r.value);
  return hash_iter(h, static_cast<size_t>(input));
}

size_t hash_mu_address(size_t h, reagent& r) {
  if (r.value == 0) return 0;
  trace(9999, "mem") << "location " << r.value << " is " << no_scientific(get_or_insert(Memory, r.value)) << end();
  r.set_value(get_or_insert(Memory, r.value));
  if (r.value != 0) {
    trace(9999, "mem") << "skipping refcount at " << r.value << end();
    r.set_value(r.value+1);  // skip refcount
  }
  drop_from_type(r, "address");
  return hash(h, r);
}

size_t hash_mu_text(size_t h, const reagent& r) {
  string input = read_mu_text(get_or_insert(Memory, r.value));
  for (int i = 0;  i < SIZE(input);  ++i) {
    h = hash_iter(h, static_cast<size_t>(input.at(i)));
//?     cerr << i << ": " << h << '\n';
  }
  return h;
}

size_t hash_mu_array(size_t h, const reagent& r) {
  int size = get_or_insert(Memory, r.value);
  reagent/*copy*/ elem = r;
  delete elem.type;
  elem.type = copy_array_element(r.type);
  for (int i=0, address = r.value+1;  i < size;  ++i, address += size_of(elem)) {
    reagent/*copy*/ tmp = elem;
    tmp.set_value(address);
    h = hash(h, tmp);
//?     cerr << i << " (" << address << "): " << h << '\n';
  }
  return h;
}

size_t hash_mu_container(size_t h, const reagent& r) {
  type_info& info = get(Type, get_base_type(r.type)->value);
  int address = r.value;
  int offset = 0;
  for (int i = 0;  i < SIZE(info.elements);  ++i) {
    reagent/*copy*/ element = element_type(r.type, i);
    if (has_property(element, "ignore-for-hash")) continue;
    element.set_value(address+offset);
    h = hash(h, element);
//?     cerr << i << ": " << h << '\n';
    offset += size_of(info.elements.at(i).type);
  }
  return h;
}

size_t hash_mu_exclusive_container(size_t h, const reagent& r) {
  const type_tree* type = get_base_type(r.type);
  assert(type->value);
  int tag = get(Memory, r.value);
  reagent/*copy*/ variant = variant_type(r, tag);
  // todo: move this error to container definition time
  if (has_property(variant, "ignore-for-hash"))
    raise << get(Type, type->value).name << ": /ignore-for-hash won't work in exclusive containers\n" << end();
  variant.set_value(r.value + /*skip tag*/1);
  h = hash(h, variant);
  return h;
}

size_t hash_iter(size_t h, size_t input) {
  h += input;
  h += (h<<10);
  h ^= (h>>6);

  h += (h<<3);
  h ^= (h>>11);
  h += (h<<15);
  return h;
}

:(scenario hash_container_checks_all_elements)
container foo [
  x:num
  y:char
]
def main [
  1:foo <- merge 34, 97/a
  3:num <- hash 1:foo
  return-unless 3:num
  4:foo <- merge 34, 98/a
  6:num <- hash 4:foo
  return-unless 6:num
  7:bool <- equal 3:num, 6:num
]
# hash on containers includes all elements
+mem: storing 0 in location 7

:(scenario hash_exclusive_container_checks_all_elements)
exclusive-container foo [
  x:bar
  y:num
]
container bar [
  a:num
  b:num
]
def main [
  1:foo <- merge 0/x, 34, 35
  4:num <- hash 1:foo
  return-unless 4:num
  5:foo <- merge 0/x, 34, 36
  8:num <- hash 5:foo
  return-unless 8:num
  9:bool <- equal 4:num, 8:num
]
# hash on containers includes all elements
+mem: storing 0 in location 9

:(scenario hash_can_ignore_container_elements)
container foo [
  x:num
  y:char/ignore-for-hash
]
def main [
  1:foo <- merge 34, 97/a
  3:num <- hash 1:foo
  return-unless 3:num
  4:foo <- merge 34, 98/a
  6:num <- hash 4:foo
  return-unless 6:num
  7:bool <- equal 3:num, 6:num
]
# hashes match even though y is different
+mem: storing 1 in location 7

//: These properties aren't necessary for hash, they just test that the
//: current implementation works like we think it does.

:(scenario hash_of_zero_address)
def main [
  1:&:num <- copy 0
  2:num <- hash 1:&:num
]
+mem: storing 0 in location 2

//: This is probably too aggressive, but we need some way to avoid depending
//: on the precise bit pattern of a floating-point number.
:(scenario hash_of_numbers_ignores_fractional_part)
def main [
  1:num <- hash 1.5
  2:num <- hash 1
  3:bool <- equal 1:num, 2:num
]
+mem: storing 1 in location 3

:(scenario hash_of_array_same_as_string)
def main [
  10:num <- copy 3
  11:num <- copy 97
  12:num <- copy 98
  13:num <- copy 99
  2:num <- hash 10:@:num/unsafe
  return-unless 2:num
  3:text <- new [abc]
  4:num <- hash 3:text
  return-unless 4:num
  5:bool <- equal 2:num, 4:num
]
+mem: storing 1 in location 5

:(scenario hash_ignores_address_value)
def main [
  1:&:num <- new number:type
  *1:&:num <- copy 34
  2:num <- hash 1:&:num
  3:&:num <- new number:type
  *3:&:num <- copy 34
  4:num <- hash 3:&:num
  5:bool <- equal 2:num, 4:num
]
# different addresses hash to the same result as long as the values the point to do so
+mem: storing 1 in location 5

:(scenario hash_ignores_address_refcount)
def main [
  1:&:num <- new number:type
  *1:&:num <- copy 34
  2:num <- hash 1:&:num
  return-unless 2:num
  # increment refcount
  3:&:num <- copy 1:&:num
  4:num <- hash 3:&:num
  return-unless 4:num
  5:bool <- equal 2:num, 4:num
]
# hash doesn't change when refcount changes
+mem: storing 1 in location 5

:(scenario hash_container_depends_only_on_elements)
container foo [
  x:num
  y:char
]
container bar [
  x:num
  y:char
]
def main [
  1:foo <- merge 34, 97/a
  3:num <- hash 1:foo
  return-unless 3:num
  4:bar <- merge 34, 97/a
  6:num <- hash 4:bar
  return-unless 6:num
  7:bool <- equal 3:num, 6:num
]
# containers with identical elements return identical hashes
+mem: storing 1 in location 7

:(scenario hash_container_depends_only_on_elements_2)
container foo [
  x:num
  y:char
  z:&:num
]
def main [
  1:&:num <- new number:type
  *1:&:num <- copy 34
  2:foo <- merge 34, 97/a, 1:&:num
  5:num <- hash 2:foo
  return-unless 5:num
  6:&:num <- new number:type
  *6:&:num <- copy 34
  7:foo <- merge 34, 97/a, 6:&:num
  10:num <- hash 7:foo
  return-unless 10:num
  11:bool <- equal 5:num, 10:num
]
# containers with identical 'leaf' elements return identical hashes
+mem: storing 1 in location 11

:(scenario hash_container_depends_only_on_elements_3)
container foo [
  x:num
  y:char
  z:bar
]
container bar [
  x:num
  y:num
]
def main [
  1:foo <- merge 34, 97/a, 47, 48
  6:num <- hash 1:foo
  return-unless 6:num
  7:foo <- merge 34, 97/a, 47, 48
  12:num <- hash 7:foo
  return-unless 12:num
  13:bool <- equal 6:num, 12:num
]
# containers with identical 'leaf' elements return identical hashes
+mem: storing 1 in location 13

:(scenario hash_exclusive_container_ignores_tag)
exclusive-container foo [
  x:bar
  y:num
]
container bar [
  a:num
  b:num
]
def main [
  1:foo <- merge 0/x, 34, 35
  4:num <- hash 1:foo
  return-unless 4:num
  5:bar <- merge 34, 35
  7:num <- hash 5:bar
  return-unless 7:num
  8:bool <- equal 4:num, 7:num
]
# hash on containers includes all elements
+mem: storing 1 in location 8

//: An older version that supported only strings.
//: Hash functions are subtle and easy to get wrong, so we keep the old
//: version around and check that the new one is consistent with it.

:(scenario hash_matches_old_version)
def main [
  1:text <- new [abc]
  2:num <- hash 1:text
  3:num <- hash_old 1:text
  4:bool <- equal 2:num, 3:num
]
+mem: storing 1 in location 4

:(before "End Primitive Recipe Declarations")
HASH_OLD,
:(before "End Primitive Recipe Numbers")
put(Recipe_ordinal, "hash_old", HASH_OLD);
:(before "End Primitive Recipe Checks")
case HASH_OLD: {
  if (SIZE(inst.ingredients) != 1) {
    raise << maybe(get(Recipe, r).name) << "'hash_old' takes exactly one ingredient rather than '" << to_original_string(inst) << "'\n" << end();
    break;
  }
  if (!is_mu_text(inst.ingredients.at(0))) {
    raise << maybe(get(Recipe, r).name) << "'hash_old' currently only supports texts (address array character), but got '" << inst.ingredients.at(0).original_string << "'\n" << end();
    break;
  }
  break;
}
:(before "End Primitive Recipe Implementations")
case HASH_OLD: {
  string input = read_mu_text(ingredients.at(0).at(0));
  size_t h = 0 ;

  for (int i = 0;  i < SIZE(input);  ++i) {
    h += static_cast<size_t>(input.at(i));
    h += (h<<10);
    h ^= (h>>6);

    h += (h<<3);
    h ^= (h>>11);
    h += (h<<15);
  }

  products.resize(1);
  products.at(0).push_back(h);
  break;
}