From 16ecf053f05fdc9d9f18720a0836bf725586a421 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sun, 2 Aug 2015 12:58:24 -0700 Subject: 1919 Generalize a little layer as a first step to providing traces for other layers. --- 081run_interactive.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/081run_interactive.cc b/081run_interactive.cc index 3b0cf32e..e8032100 100644 --- a/081run_interactive.cc +++ b/081run_interactive.cc @@ -38,7 +38,7 @@ case RUN_INTERACTIVE: { bool new_code_pushed_to_stack = run_interactive(ingredients.at(0).at(0)); if (!new_code_pushed_to_stack) { products.at(0).push_back(0); - products.at(1).push_back(warnings_from_trace()); + products.at(1).push_back(trace_contents("warn")); products.at(2).push_back(0); clean_up_interactive(); break; // done with this instruction @@ -172,7 +172,7 @@ if (current_instruction().operation == RUN_INTERACTIVE && !current_instruction() write_memory(current_instruction().products.at(0), result); if (SIZE(current_instruction().products) >= 2) { vector warnings; - warnings.push_back(warnings_from_trace()); + warnings.push_back(trace_contents("warn")); write_memory(current_instruction().products.at(1), warnings); } if (SIZE(current_instruction().products) >= 3) { @@ -248,12 +248,12 @@ bool is_mu_string(const reagent& x) { && x.types.at(2) == Type_ordinal["character"]; } -long long int warnings_from_trace() { +long long int trace_contents(const string& layer) { if (!Trace_stream) return 0; - if (trace_count("warn") <= 0) return 0; + if (trace_count(layer) <= 0) return 0; ostringstream out; for (vector::iterator p = Trace_stream->past_lines.begin(); p != Trace_stream->past_lines.end(); ++p) { - if (p->label != "warn") continue; + if (p->label != layer) continue; out << p->contents; if (*--p->contents.end() != '\n') out << '\n'; } @@ -290,7 +290,7 @@ case RELOAD: { Trace_stream->newline(); // flush trace Disable_redefine_warnings = false; Hide_warnings = false; - products.at(0).push_back(warnings_from_trace()); + products.at(0).push_back(trace_contents("warn")); if (Trace_stream->collect_layer == "warn") { delete Trace_stream; Trace_stream = NULL; -- cgit 1.4.1-2-gfad0 '/>
path: root/tests/unittests/helpers.c
blob: bc4f8db334540550656da968fdc1f815a9cc58c3 (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