about summary refs log tree commit diff stats
path: root/Dockerfile.debian
diff options
context:
space:
mode:
authorMichael Vetter <jubalh@iodoru.org>2019-07-09 15:48:47 +0200
committerGitHub <noreply@github.com>2019-07-09 15:48:47 +0200
commit80ac245b8982a703c4c0bb7504c11b9ad15e4165 (patch)
tree1557b6ec39cba3f4a4ae3e4f476f985b3bfbf7ea /Dockerfile.debian
parent63552720916dbe82cdb001eee74b7c08723b823a (diff)
parent89d8fc846e17001551c7830524229820665e3abe (diff)
downloadprofani-tty-80ac245b8982a703c4c0bb7504c11b9ad15e4165.tar.gz
Merge pull request #1149 from profanity-im/fix/1148-segfault
Fix double free regarding iq handlers
Diffstat (limited to 'Dockerfile.debian')
0 files changed, 0 insertions, 0 deletions
1:54:30 -0700 2864 - replace all address:shared with just address' href='/akkartik/mu/commit/071rewrite_stash.cc?h=hlt&id=b0bf5321de2ba32f3b92c2faf6b7b68a06b6b432'>b0bf5321 ^
d57bf669 ^
21fc6180 ^
d63cddea ^
21fc6180 ^
7a84094a ^
21fc6180 ^




d57bf669 ^



d63cddea ^
d57bf669 ^
a0331a9b ^
d57bf669 ^

b0bf5321 ^

093b45e7 ^
8e60380e ^
d63cddea ^
8e60380e ^
a0331a9b ^
8e60380e ^



84393683 ^

7a84094a ^
84393683 ^
d63cddea ^
84393683 ^









e9390236 ^
093b45e7 ^

d8509b41 ^
093b45e7 ^
eb45abde ^
093b45e7 ^

eb45abde ^
093b45e7 ^

eb45abde ^
093b45e7 ^
6c96a437 ^
093b45e7 ^
b75d9d45 ^
093b45e7 ^
6c96a437 ^
78c50205 ^
093b45e7 ^
b0bf5321 ^
eb45abde ^
21fc6180 ^


6c96a437 ^
78c50205 ^
21fc6180 ^

eb45abde ^
093b45e7 ^

85553e52 ^
b75d9d45 ^




78c50205 ^
cfa5a9f8 ^
b75d9d45 ^





093b45e7 ^




dad3bedd ^
21fc6180 ^

eb45abde ^
21fc6180 ^
78c50205 ^
21fc6180 ^



3c4c9c08 ^
21fc6180 ^




3c4c9c08 ^
21fc6180 ^








3473c63a ^
af023b32 ^

d57bf669 ^
af023b32 ^
d57bf669 ^

3473c63a ^
8e60380e ^
af023b32 ^
8e60380e ^

514f0e34 ^








b75d9d45 ^



7a84094a ^
377b00b0 ^
864cbf9d ^

d52406cc ^
b75d9d45 ^

dad3bedd ^


dad3bedd ^


7a84094a ^

dad3bedd ^
d63cddea ^
dad3bedd ^




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
                                                                                       


                                   
          
             
                  

         

                                                                                      
 
                                  
          
             
                  




                                                                                                         



                                                                            
          
             
                                 

          

                                                                                                                
 
                                           
          
             
                           



                                             

                                                     
       
 
                  









                                                                              
                                                                

       
                                                          
                                  
                                                                                                        

                                                                        
                                      

 
                                                  
                                       
                                                  
                                           
                                                                          
                               
                                                          
                                                              
                                      
                                                                                   
                                                                                                    


                                    
                                                                  
                                                              

                                                                                   
                                                                                                    

       
                                                    




                                                                             
                                                                                          
                                                                         





                                                                                                      




                                                         
 

                                                                        
                                                                                              
                                                           
                            



                                         
                                    




                                   
                              








                                                      
                                                       

                                                    
                                      
                        

 
                                        
                       
                                                                              

 








                                                                           



                                      
                  
                      

                                  
                                  

 


                                                                          


                                                                          

       
 
          




                       
//: make some recipes more friendly by trying to auto-convert their ingredients to text

:(scenarios transform)
:(scenario rewrite_stashes_to_text)
def main [
  local-scope
  n:num <- copy 34
  stash n
]
+transform: {stash_2_0: ("address" "array" "character")} <- to-text-line {n: "number"}
+transform: stash {stash_2_0: ("address" "array" "character")}

:(scenario rewrite_traces_to_text)
def main [
  local-scope
  n:num <- copy 34
  trace 2, [app], n
]
+transform: {trace_2_2: ("address" "array" "character")} <- to-text-line {n: "number"}
+transform: trace {2: "literal"}, {"app": "literal-string"}, {trace_2_2: ("address" "array" "character")}

//: special case: rewrite attempts to stash contents of most arrays to avoid
//: passing addresses around

:(scenario rewrite_stashes_of_arrays)
def main [
  local-scope
  n:&:@:num <- new number:type, 3
  stash *n
]
+transform: {stash_2_0: ("address" "array" "character")} <- array-to-text-line {n: ("address" "array" "number")}
+transform: stash {stash_2_0: ("address" "array" "character")}

:(scenario ignore_stashes_of_static_arrays)
def main [
  local-scope
  n:@:num:3 <- create-array
  stash n
]
+transform: stash {n: ("array" "number" "3")}

:(scenario rewrite_stashes_of_recipe_header_products)
container foo [
  x:num
]
def bar -> x:foo [
  local-scope
  load-ingredients
  x <- merge 34
  stash x
]
+transform: stash {stash_2_0: ("address" "array" "character")}

//: misplaced; should be in instruction inserting/deleting transforms, but has
//: prerequisites: deduce_types_from_header and check_or_set_types_by_name
:(after "Transform.push_back(deduce_types_from_header)")
Transform.push_back(convert_ingredients_to_text);  // idempotent

:(code)
void convert_ingredients_to_text(const recipe_ordinal r) {
  recipe& caller = get(Recipe, r);
  trace(9991, "transform") << "--- convert some ingredients to text in recipe " << caller.name << end();
  // in recipes without named locations, 'stash' is still not extensible
  if (contains_numeric_locations(caller)) return;
  convert_ingredients_to_text(caller);
}

void convert_ingredients_to_text(recipe& caller) {
  vector<instruction> new_instructions;
  for (int i = 0;  i < SIZE(caller.steps);  ++i) {
    instruction& inst = caller.steps.at(i);
    // all these cases are getting hairy. how can we make this extensible?
    if (inst.name == "stash") {
      for (int j = 0;  j < SIZE(inst.ingredients);  ++j) {
        if (is_literal_text(inst.ingredients.at(j))) continue;
        ostringstream ingredient_name;
        ingredient_name << "stash_" << i << '_' << j << ":address:array:character";
        convert_ingredient_to_text(inst.ingredients.at(j), new_instructions, ingredient_name.str());
      }
    }
    else if (inst.name == "trace") {
      for (int j = /*skip*/2;  j < SIZE(inst.ingredients);  ++j) {
        if (is_literal_text(inst.ingredients.at(j))) continue;
        ostringstream ingredient_name;
        ingredient_name << "trace_" << i << '_' << j << ":address:array:character";
        convert_ingredient_to_text(inst.ingredients.at(j), new_instructions, ingredient_name.str());
      }
    }
    else if (inst.name_before_rewrite == "append") {
      // override only variants that try to append to a string
      // Beware: this hack restricts how much 'append' can be overridden. Any
      // new variants that match:
      //   append _:text, ___
      // will never ever get used.
      if (is_literal_text(inst.ingredients.at(0)) || is_mu_text(inst.ingredients.at(0))) {
        for (int j = /*skip base*/1;  j < SIZE(inst.ingredients);  ++j) {
          ostringstream ingredient_name;
          ingredient_name << "append_" << i << '_' << j << ":address:array:character";
          convert_ingredient_to_text(inst.ingredients.at(j), new_instructions, ingredient_name.str());
        }
      }
    }
    trace(9993, "transform") << to_string(inst) << end();
    new_instructions.push_back(inst);
  }
  caller.steps.swap(new_instructions);
}

// add an instruction to convert reagent 'r' to text in list 'out', then
// replace r with converted text
void convert_ingredient_to_text(reagent& r, vector<instruction>& out, const string& tmp_var) {
  if (!r.type) return;  // error; will be handled elsewhere
  if (is_mu_text(r)) return;
  // don't try to extend static arrays
  if (is_static_array(r)) return;
  instruction def;
  if (is_lookup_of_address_of_array(r)) {
    def.name = "array-to-text-line";
    reagent/*copy*/ tmp = r;
    drop_one_lookup(tmp);
    def.ingredients.push_back(tmp);
  }
  else {
    def.name = "to-text-line";
    def.ingredients.push_back(r);
  }
  def.products.push_back(reagent(tmp_var));
  trace(9993, "transform") << to_string(def) << end();
  out.push_back(def);
  r.clear();  // reclaim old memory
  r = reagent(tmp_var);
}

bool is_lookup_of_address_of_array(reagent/*copy*/ x) {
  if (x.type->atom) return false;
  if (x.type->left->name != "address") return false;
  if (!canonize_type(x)) return false;
  return is_mu_array(x);
}

bool is_static_array(const reagent& x) {
  // no canonize_type()
  return !x.type->atom && x.type->left->atom && x.type->left->name == "array";
}

//: Supporting 'append' above requires remembering what name an instruction
//: had before any rewrites or transforms.
:(before "End instruction Fields")
string name_before_rewrite;
:(before "End instruction Clear")
name_before_rewrite.clear();
:(before "End next_instruction(curr)")
curr->name_before_rewrite = curr->name;

:(scenarios run)
:(scenario append_other_types_to_text)
def main [
  local-scope
  n:num <- copy 11
  c:char <- copy 111/o
  a:text <- append [abc], 10, n, c
  expected:text <- new [abc1011o]
  10:bool/raw <- equal a, expected
]

//: Make sure that the new system is strictly better than just the 'stash'
//: primitive by itself.

:(scenario rewrite_stash_continues_to_fall_back_to_default_implementation)
# type without a to-text implementation
container foo [
  x:num
  y:num
]
def main [
  local-scope
  x:foo <- merge 34, 35
  stash x
]
+app: 34 35