From 518e6c5e571077ecc29d28f620f7312cf18bd5d0 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 2 May 2015 15:26:13 -0700 Subject: 1240 - fix a spuriously passing test Running list of non-obvious special cases in tangle: a) trace checks are sometimes grouped, sometimes not (previous commit) b) comments are sometimes passed through, sometimes not --- cpp/011load.cc | 4 +++- cpp/tangle/030tangle.cc | 43 +++++++++++++++++++++++++++++-------------- cpp/tangle/030tangle.test.cc | 14 +++++++++++++- 3 files changed, 45 insertions(+), 16 deletions(-) diff --git a/cpp/011load.cc b/cpp/011load.cc index df64cae7..35a9bf23 100644 --- a/cpp/011load.cc +++ b/cpp/011load.cc @@ -202,7 +202,9 @@ for (size_t i = 0; i < recently_added_recipes.size(); ++i) { recently_added_recipes.clear(); :(scenario parse_comment_outside_recipe) -# comment +# this comment will be dropped by the tangler, so we need a dummy recipe to stop that +recipe f1 [ ] +# this comment will go through to 'load' recipe main [ 1:integer <- copy 23:literal ] diff --git a/cpp/tangle/030tangle.cc b/cpp/tangle/030tangle.cc index fd01deba..5e25c742 100644 --- a/cpp/tangle/030tangle.cc +++ b/cpp/tangle/030tangle.cc @@ -100,6 +100,7 @@ void process_next_hunk(istream& in, const string& directive, const string& filen // first slurp all lines until next directive list hunk; + bool end_of_scenario_input = false; { string curr_line; while (!in.eof()) { @@ -114,15 +115,21 @@ void process_next_hunk(istream& in, const string& directive, const string& filen ++line_number; continue; } - if (cmd == "scenario" && starts_with(curr_line, "#")) { - // scenarios can contain mu comments - ++line_number; - continue; - } - if (cmd == "scenario" && trim(curr_line).empty()) { - // ignore empty lines in scenarios - ++line_number; - continue; + if (cmd == "scenario") { + // ignore mu comments in scenarios, but only after the end of input + if (!starts_with(curr_line, "#") && !is_input(curr_line)) { + // remaining lines are checks + end_of_scenario_input = true; + } + else if (end_of_scenario_input && starts_with(curr_line, "#")) { + ++line_number; + continue; + } + if (trim(curr_line).empty()) { + // ignore empty lines in scenarios, whether in input of after + ++line_number; + continue; + } } hunk.push_back(Line(curr_line, filename, line_number)); ++line_number; @@ -282,15 +289,23 @@ list::iterator balancing_curly(list::iterator curr) { } // A scenario is one or more sessions separated by calls to CLEAR_TRACE ('===') -// A session is one or more lines of input, followed optionally by (in order): -// one or more lines expected in trace in order ('+') -// one or more lines trace shouldn't include ('-') -// one or more lines expressing counts of specific layers emitted in trace ('$') -// a directive to print the trace just for debugging ('?') +// A session is: +// one or more lines of escaped setup in C/C++ ('%') +// followed by one or more lines of input, +// followed optionally by (in order): +// one or more lines expected in trace in order ('+') +// one or more lines trace shouldn't include ('-') +// one or more lines expressing counts of specific layers emitted in trace ('$') +// a directive to print the trace just for debugging ('?') // Remember to update is_input below if you add to this format. void emit_test(const string& name, list& lines, list& result) { result.push_back(Line("TEST("+name+")", front(lines).filename, front(lines).line_number-1)); // use line number of directive while (!lines.empty()) { + // hack: drop mu comments at the start, just in case there's a '%' line after them + // So the tangler only passes through mu comments inside scenarios between + // the first input line and the last input line. + while (!lines.empty() && starts_with(front(lines).contents, "#")) + lines.pop_front(); while (!lines.empty() && starts_with(front(lines).contents, "% ")) { result.push_back(Line(" "+front(lines).contents.substr(strlen("% ")), front(lines))); lines.pop_front(); diff --git a/cpp/tangle/030tangle.test.cc b/cpp/tangle/030tangle.test.cc index c811881d..0d4da899 100644 --- a/cpp/tangle/030tangle.test.cc +++ b/cpp/tangle/030tangle.test.cc @@ -307,7 +307,7 @@ void test_tangle_can_handle_mu_comments_in_scenario() { list lines; tangle(in, lines); CHECK_EQ(lines.front().contents, "TEST(does_bar)"); lines.pop_front(); - CHECK_EQ(lines.front().contents, " run(\"abc def\\n efg\\n\");"); lines.pop_front(); + CHECK_EQ(lines.front().contents, " run(\"abc def\\n# comment1\\n efg\\n # indented comment 2\\n\");"); lines.pop_front(); CHECK_EQ(lines.front().contents, " CHECK_TRACE_CONTENTS(\"layer1: pqrlayer1: xyz\");"); lines.pop_front(); CHECK_EQ(lines.front().contents, " CHECK_TRACE_DOESNT_CONTAIN(\"layer1: z\");"); lines.pop_front(); CHECK_EQ(lines.front().contents, " CHECK_EQ(trace_count(\"layer1\"), 2);"); lines.pop_front(); @@ -315,6 +315,18 @@ void test_tangle_can_handle_mu_comments_in_scenario() { CHECK(lines.empty()); } +void test_tangle_can_handle_escaped_setup_after_mu_comments() { + istringstream in(":(scenario does_bar)\n# comment\n% int x = 1;\nabc\n+layer1: pqr\n"); + list lines; + tangle(in, lines); + CHECK_EQ(lines.front().contents, "TEST(does_bar)"); lines.pop_front(); + CHECK_EQ(lines.front().contents, " int x = 1;"); lines.pop_front(); + CHECK_EQ(lines.front().contents, " run(\"abc\\n\");"); lines.pop_front(); + CHECK_EQ(lines.front().contents, " CHECK_TRACE_CONTENTS(\"layer1: pqr\");"); lines.pop_front(); + CHECK_EQ(lines.front().contents, "}"); lines.pop_front(); + CHECK(lines.empty()); +} + void test_trim() { -- cgit 1.4.1-2-gfad0 cd95c1152'>^ 
672e3e50 ^


a654e4ec ^

e6056999 ^

a654e4ec ^


4690ce81 ^

a654e4ec ^

4690ce81 ^

3e1349d2 ^

4690ce81 ^

a654e4ec ^


70f4e9b6 ^

a654e4ec ^

3e1349d2 ^

672e3e50 ^


a654e4ec ^






672e3e50 ^


a654e4ec ^

672e3e50 ^


513ba330 ^



672e3e50 ^

d990e8f0 ^





672e3e50 ^


3e1349d2 ^

6c69569a ^

9570363a ^

672e3e50 ^

6c69569a ^


672e3e50 ^







672e3e50 ^

e81da299 ^

672e3e50 ^

c5ffb6e1 ^

d059fe74 ^


6c69569a ^

9570363a ^

4bbd3ded ^

6c69569a ^

d059fe74 ^

6c69569a ^


4bbd3ded ^







4bbd3ded ^

e81da299 ^

4bbd3ded ^


3e1349d2 ^

6c69569a ^

9570363a ^

c5ffb6e1 ^

6c69569a ^




c5ffb6e1 ^

4bbd3ded ^

c5ffb6e1 ^


4bbd3ded ^






9570363a ^

4bbd3ded ^






9570363a ^

4bbd3ded ^

c5ffb6e1 ^




c5ffb6e1 ^

e81da299 ^

c5ffb6e1 ^

672e3e50 ^

d5d908dd ^

76755b28 ^

3e1349d2 ^

6c69569a ^

9570363a ^

672e3e50 ^

6c69569a ^


672e3e50 ^








76755b28 ^

c5ffb6e1 ^

4bbd3ded ^

d5d908dd ^

76755b28 ^

4bbd3ded ^

d059fe74 ^

6c69569a ^

9570363a ^

4bbd3ded ^

6c69569a ^


4bbd3ded ^

9570363a ^

4bbd3ded ^






76755b28 ^

4bbd3ded ^

62a52ffb ^

76755b28 ^

d5d908dd ^

3e1349d2 ^

f344b250 ^

62a52ffb ^

76755b28 ^


62a52ffb ^


cd9bb850 ^






672e3e50 ^

44c1aeef ^

a654e4ec ^

672e3e50 ^


672e3e50 ^



44c1aeef ^

672e3e50 ^

8e7b4429 ^


62a52ffb ^


8e7b4429 ^



672e3e50 ^

76755b28 ^

672e3e50 ^

f344b250 ^

4690ce81 ^

dbe12410 ^

cd9bb850 ^








f344b250 ^

cd9bb850 ^


672e3e50 ^


c842d90b ^


d059fe74 ^

c842d90b ^


d059fe74 ^

c842d90b ^

672e3e50 ^




76755b28 ^


4690ce81 ^

cd9bb850 ^




f344b250 ^

cd9bb850 ^



76755b28 ^


672e3e50 ^

4690ce81 ^


67db19a0 ^

4bbd3ded ^







76755b28 ^


4690ce81 ^

cd9bb850 ^








f344b250 ^

cd9bb850 ^



76755b28 ^


4bbd3ded ^

4690ce81 ^


4bbd3ded ^

67db19a0 ^

4bbd3ded ^

672e3e50 ^



c5ffb6e1 ^


4690ce81 ^

a654e4ec ^


4690ce81 ^

c5ffb6e1 ^

4690ce81 ^





c5ffb6e1 ^


672e3e50 ^

4690ce81 ^

a654e4ec ^

4690ce81 ^

672e3e50 ^

32b8fac2 ^

a654e4ec ^

4690ce81 ^

a654e4ec ^

4690ce81 ^

a654e4ec ^

c5ffb6e1 ^


a654e4ec ^

d059fe74 ^

c5ffb6e1 ^

4690ce81 ^

cd9bb850 ^


beea7ce2 ^

cd9bb850 ^


a654e4ec ^

4690ce81 ^




4bbd3ded ^



4690ce81 ^


4bbd3ded ^

4690ce81 ^

9a81d746 ^

4690ce81 ^

2f02189d ^

4bbd3ded ^

4690ce81 ^

4bbd3ded ^

4690ce81 ^

4bbd3ded ^

c842d90b ^

4bbd3ded ^




76755b28 ^

4690ce81 ^


c5ffb6e1 ^

4690ce81 ^

c5ffb6e1 ^

4690ce81 ^


c5ffb6e1 ^

4690ce81 ^

c5ffb6e1 ^


76755b28 ^

4690ce81 ^


9a81d746 ^

4690ce81 ^

65361948 ^


4690ce81 ^

65361948 ^

4690ce81 ^

65361948 ^

c842d90b ^

672e3e50 ^


cd9bb850 ^


beea7ce2 ^

cd9bb850 ^


c5ffb6e1 ^


cd9bb850 ^




c5ffb6e1 ^


4690ce81 ^

c5ffb6e1 ^

4690ce81 ^




c5ffb6e1 ^





4690ce81 ^

c5ffb6e1 ^

4690ce81 ^


c5ffb6e1 ^





4690ce81 ^

c5ffb6e1 ^

4690ce81 ^


c5ffb6e1 ^




4690ce81 ^




c5ffb6e1 ^


4690ce81 ^

c5ffb6e1 ^

4690ce81 ^

672e3e50 ^


65361948 ^




76755b28 ^


4690ce81 ^

76755b28 ^


65361948 ^

4690ce81 ^

65361948 ^





4690ce81 ^

a654e4ec ^

4690ce81 ^

a654e4ec ^

4690ce81 ^

a654e4ec ^

4690ce81 ^

65361948 ^

32b8fac2 ^

a654e4ec ^

76755b28 ^

a654e4ec ^

d059fe74 ^

62a52ffb ^

d059fe74 ^

4690ce81 ^



dbe12410 ^

4bbd3ded ^

65361948 ^

62a52ffb ^

65361948 ^


672e3e50 ^



a654e4ec ^

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
382
383
384

385

386

387
388

389
390
391
392
393

394

395

396
397

398
399
400
401

402
403
404
405

406
407

408

409

410

411
412

413
414
415
416

417
418

419

420
421

422

423

424
425
426
427
428

429

430

431

432

433

434

435

436

437

438

439

440

441

442

443

444
445
446

447

448

449

450

451
452

453
454
455

456