equal
deleted
inserted
replaced
204 } |
204 } |
205 |
205 |
206 val result_json = |
206 val result_json = |
207 JSON.Object( |
207 JSON.Object( |
208 "ok" -> result.ok, |
208 "ok" -> result.ok, |
|
209 "errors" -> |
|
210 (for { |
|
211 (name, status) <- result.nodes if !status.ok |
|
212 (tree, pos) <- result.messages(name) if Protocol.is_error(tree) |
|
213 } yield output_message(tree, pos)), |
209 "nodes" -> |
214 "nodes" -> |
210 (for ((name, st) <- result.nodes) yield |
215 (for ((name, status) <- result.nodes) yield |
211 JSON.Object( |
216 JSON.Object( |
212 "node_name" -> name.node, |
217 "node_name" -> name.node, |
213 "theory" -> name.theory, |
218 "theory" -> name.theory, |
214 "status" -> st.json, |
219 "status" -> status.json, |
215 "messages" -> |
220 "messages" -> |
216 (for ((tree, pos) <- result.messages(name)) yield output_message(tree, pos))))) |
221 (for ((tree, pos) <- result.messages(name)) |
|
222 yield output_message(tree, pos))))) |
217 |
223 |
218 (result_json, result) |
224 (result_json, result) |
219 } |
225 } |
220 } |
226 } |
221 } |
227 } |