From fda4f09181db880dc5199d191161d75d8b9ad2b4 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 19 Mar 2016 09:14:25 -0700 Subject: 2795 - quick hacks for Caleb It turns out that my extensible stash doesn't yet work well in all situations. If you try to stash an array, you end up trying to create an array local that's not statically sized -- a no-no. Bah, just throw it all out. --- 071rewrite_stash.cc | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100644 071rewrite_stash.cc (limited to '071rewrite_stash.cc') diff --git a/071rewrite_stash.cc b/071rewrite_stash.cc deleted file mode 100644 index ea7c140f..00000000 --- a/071rewrite_stash.cc +++ /dev/null @@ -1,50 +0,0 @@ -//: when encountering other types, try to convert them to strings using -//: 'to-text' - -:(scenarios transform) -:(scenario rewrite_stashes_to_text) -recipe main [ - local-scope - n:number <- copy 34 - stash n -] -+transform: stash_2_0:address:shared:array:character <- to-text-line n -+transform: stash stash_2_0:address:shared:array:character - -:(before "End Instruction Inserting/Deleting Transforms") -Transform.push_back(rewrite_stashes_to_text); - -:(code) -void rewrite_stashes_to_text(recipe_ordinal r) { - recipe& caller = get(Recipe, r); - trace(9991, "transform") << "--- rewrite 'stash' instructions in recipe " << caller.name << end(); - // in recipes without named locations, 'stash' is still not extensible - if (contains_numeric_locations(caller)) return; - rewrite_stashes_to_text(caller); -} - -void rewrite_stashes_to_text(recipe& caller) { - vector new_instructions; - for (int i = 0; i < SIZE(caller.steps); ++i) { - instruction& inst = caller.steps.at(i); - if (inst.name == "stash") { - for (int j = 0; j < SIZE(inst.ingredients); ++j) { - if (is_literal(inst.ingredients.at(j))) continue; - if (is_mu_string(inst.ingredients.at(j))) continue; - instruction def; - def.name = "to-text-line"; - def.ingredients.push_back(inst.ingredients.at(j)); - ostringstream ingredient_name; - ingredient_name << "stash_" << i << '_' << j << ":address:shared:array:character"; - def.products.push_back(reagent(ingredient_name.str())); - trace(9993, "transform") << to_string(def) << end(); - new_instructions.push_back(def); - inst.ingredients.at(j).clear(); // reclaim old memory - inst.ingredients.at(j) = reagent(ingredient_name.str()); - } - } - trace(9993, "transform") << to_string(inst) << end(); - new_instructions.push_back(inst); - } - caller.steps.swap(new_instructions); -} -- cgit 1.4.1-2-gfad0 cc?h=main&id=d36ae5651435a477e34d9e1338ee3ca79d949b1c'>085scenario_console.cc
blob: e97f67f12c42560dd53ff8479dae601023bb0b63 (plain) (blame) 
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