mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-25 17:30:16 +01:00
Jon Meow
b87747306f
Breaks `--trace` into two flags: - `--parser_debug`, which sets the parser debug level (which I haven't dug into piping with `--trace`, but seemed likely to be troublesome) - `--trace_file`, which now the type checker and interpreter will use for trace information (note compile errors should use a different channel) Most of the file edits are just mechanical testdata flag updates: `sed -i 's/--trace/--parser_debug --trace_file=-/' testdata/**/*.carbon` To explain the output paths: - parse/compile errors: stderr - print() calls: stdout - parser tracing: `--parser_debug` option, stdout (formerly stdout if `--trace`) - type check/compile tracing: `--trace_file=<file>`, giving `-` uses stdout (formerly stdout if `--trace`) - return code of executed Carbon code: `--trace_file` if set, stdout if not (formerly stdout always)
27 lines
1.1 KiB
C++
27 lines
1.1 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "executable_semantics/syntax/parse_and_lex_context.h"
|
|
|
|
namespace Carbon {
|
|
|
|
auto ParseAndLexContext::RecordSyntaxError(const std::string& message,
|
|
bool prefix_with_newline)
|
|
-> Parser::symbol_type {
|
|
// Optionally adds a newline in trace mode because trace prints an incomplete
|
|
// line "Reading a token: " which can prevent LIT from finding expected
|
|
// patterns.
|
|
// TODO: support formatting of `SourceLocation` instances with formatv().
|
|
std::string full_message;
|
|
llvm::raw_string_ostream(full_message)
|
|
<< (prefix_with_newline && parser_debug() ? "\n" : "")
|
|
<< "COMPILATION ERROR: " << source_loc() << ": " << message;
|
|
error_messages_.push_back(full_message);
|
|
|
|
// TODO: use `YYerror` token once bison is upgraded to at least 3.5.
|
|
return Parser::make_END_OF_FILE(current_token_position);
|
|
}
|
|
|
|
} // namespace Carbon
|