From 5e320aa049bc1d5ad78eec23be0127f4a8d6ec3d Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sun, 21 May 2017 22:19:28 -0700 Subject: 3876 Thanks Ella Couch for reporting this issue. --- 053recipe_header.cc | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to '053recipe_header.cc') diff --git a/053recipe_header.cc b/053recipe_header.cc index d9495f46..9128f3bb 100644 --- a/053recipe_header.cc +++ b/053recipe_header.cc @@ -499,14 +499,15 @@ void fill_in_return_ingredients(const recipe_ordinal r) { add_header_products(inst, caller_recipe); } // fall through return - if (caller_recipe.steps.empty()) return; // error will be raised elsewhere if there's a product in the header; just give up - const instruction& final_instruction = caller_recipe.steps.at(SIZE(caller_recipe.steps)-1); - if (final_instruction.name != "reply" && final_instruction.name != "return") { - instruction inst; - inst.name = "return"; - add_header_products(inst, caller_recipe); - caller_recipe.steps.push_back(inst); + if (!caller_recipe.steps.empty()) { + const instruction& final_instruction = caller_recipe.steps.at(SIZE(caller_recipe.steps)-1); + if (final_instruction.name == "reply" || final_instruction.name == "return") + return; } + instruction inst; + inst.name = "return"; + add_header_products(inst, caller_recipe); + caller_recipe.steps.push_back(inst); } void add_header_products(instruction& inst, const recipe& caller_recipe) { @@ -565,6 +566,12 @@ def add2 x:num, y:num -> z:num [ -transform: instruction: return z:num +mem: storing 8 in location 1 +:(scenario return_causes_error_in_empty_recipe) +% Hide_errors = true; +def foo -> x:num [ +] ++error: foo: tried to read ingredient 'x' in 'return x:num' but it hasn't been written to yet + :(scenario return_after_conditional_return_based_on_header) def main [ 1:num/raw <- add2 3, 5 -- cgit 1.4.1-2-gfad0 den' name='id' value='c2aa585615d35186fbf8ada94f8974bcb386ce8d'/>
path: root/themes/boothj5_slack
blob: d1546d055ae1b4b6fd037a637db9cd1fced6ea4f (plain) (tree) 
3666eb4f ^

















fcf4d143 ^

3666eb4f ^







ffa01a1a ^

3666eb4f ^


f0837abf ^

3666eb4f ^






f0837abf ^



3666eb4f ^

f0837abf ^

3666eb4f ^


71679a31 ^


3666eb4f ^




2f82f50a ^


1a3dc91e ^


3666eb4f ^























f0837abf ^


3666eb4f ^











a952776b ^

3666eb4f ^

503e0ae3 ^

3666eb4f ^



f0837abf ^

3666eb4f ^

f0837abf ^

3666eb4f ^



f0837abf ^

3666eb4f ^




f0837abf ^

3666eb4f ^

f0837abf ^

3666eb4f ^

f4759cf3 ^

3666eb4f ^

3666eb4f ^


f0837abf ^

3666eb4f ^


abc2f0de ^

3666eb4f ^


f0837abf ^

3666eb4f ^

f4759cf3 ^


f0837abf ^




3666eb4f ^






84ccee20 ^

3666eb4f ^

f0837abf ^

72c1c496 ^

bab75cae ^

d3cc5bd7 ^





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