From 2cb36cd09ba464fe7e1f20e19e291f442ed9f576 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Fri, 31 Jul 2015 18:25:08 -0700 Subject: 1910 - bugfix: unrecognized recipe with result Thanks Britt Crawford. --- 034call.cc | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/034call.cc b/034call.cc index 498dc1a5..08eea8c5 100644 --- a/034call.cc +++ b/034call.cc @@ -81,8 +81,10 @@ inline const instruction& current_instruction() { default: { // not a primitive; try to look up the book of recipes if (Recipe.find(current_instruction().operation) == Recipe.end()) { - raise << "undefined operation " << current_instruction().operation << ": " << current_instruction().to_string() << '\n' << end(); - break; + raise << current_recipe_name() << ": undefined operation in '" << current_instruction().to_string() << "'\n" << end(); + // stop running this instruction immediately + ++current_step_index(); + continue; } Current_routine->calls.push_front(call(current_instruction().operation)); call_housekeeping: @@ -91,6 +93,20 @@ default: { continue; // not done with caller; don't increment current_step_index() } +:(scenario calling_undefined_recipe_warns) +% Hide_warnings = true; +recipe main [ + foo +] ++warn: main: undefined operation in 'foo ' + +:(scenario calling_undefined_recipe_handles_missing_result) +% Hide_warnings = true; +recipe main [ + x:number <- foo +] ++warn: main: undefined operation in 'x:number <- foo ' + //:: finally, we need to fix the termination conditions for the run loop :(replace{} "inline bool routine::completed() const") -- cgit 1.4.1-2-gfad0 4859e33a01ed2bab4'>blame commit diff stats
path: root/subx/017jump_disp8.cc
blob: 22ae6567199986c919dc4566e00c915897c3cb43 (plain) (tree) 
fc455c96 ^

0080c23b ^



0f851e48 ^


0ca791cd ^

4a943d4e ^
















0080c23b ^


fc455c96 ^


c442a5ad ^

0080c23b ^



0080c23b ^



0f851e48 ^

0e0a9042 ^

0ca791cd ^

4a943d4e ^

















0080c23b ^

fc455c96 ^


222c31db ^

0080c23b ^

c442a5ad ^

0080c23b ^





4a943d4e ^

















0080c23b ^



0f851e48 ^

0e0a9042 ^

0ca791cd ^

4a943d4e ^

















0080c23b ^

fc455c96 ^


222c31db ^

0080c23b ^

c442a5ad ^

0080c23b ^





4a943d4e ^

















0080c23b ^



0f851e48 ^

0e0a9042 ^

0ca791cd ^

4a943d4e ^



















0080c23b ^

fc455c96 ^


222c31db ^

0080c23b ^

c442a5ad ^

0080c23b ^





4a943d4e ^



















0080c23b ^



0f851e48 ^

0e0a9042 ^

0ca791cd ^

4a943d4e ^


















0080c23b ^

fc455c96 ^


222c31db ^

0080c23b ^

c442a5ad ^

0080c23b ^





4a943d4e ^


















0080c23b ^



0f851e48 ^

0e0a9042 ^

0ca791cd ^

4a943d4e ^



















0080c23b ^

fc455c96 ^


222c31db ^

0080c23b ^

c442a5ad ^

0080c23b ^





4a943d4e ^



















0080c23b ^



0f851e48 ^

0e0a9042 ^

0ca791cd ^

4a943d4e ^







































0080c23b ^

fc455c96 ^


222c31db ^

0080c23b ^

c442a5ad ^

0080c23b ^





4a943d4e ^



















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