carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-25 18:00:10 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Add the ability to pipe trace output to a file. (#1183)

Browse Source 
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)
This commit is contained in:
Jon Meow
2022-04-14 11:20:56 -07:00
committed by GitHub
parent 0948582023
commit b87747306f
198 changed files with 405 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/interpreter/exec_program.cpp
+19 -19
View File
@@ -17,11 +17,13 @@
namespace Carbon {
auto ExecProgram(Nonnull<Arena*> arena, AST ast, bool trace) -> ErrorOr<int> {
if (trace) {
llvm::outs() << "********** source program **********\n";
auto ExecProgram(Nonnull<Arena*> arena, AST ast,
std::optional<Nonnull<llvm::raw_ostream*>> trace_stream)
-> ErrorOr<int> {
if (trace_stream) {
**trace_stream << "********** source program **********\n";
for (const auto decl : ast.declarations) {
llvm::outs() << *decl;
**trace_stream << *decl;
}
}
SourceLocation source_loc("<Main()>", 0);
@@ -30,29 +32,27 @@ auto ExecProgram(Nonnull<Arena*> arena, AST ast, bool trace) -> ErrorOr<int> {
arena->New<TupleLiteral>(source_loc));
// Although name resolution is currently done once, generic programming
// (particularly templates) may require more passes.
if (trace) {
llvm::outs() << "********** resolving names **********\n";
if (trace_stream) {
**trace_stream << "********** resolving names **********\n";
}
RETURN_IF_ERROR(ResolveNames(ast));
if (trace) {
llvm::outs() << "********** resolving control flow **********\n";
if (trace_stream) {
**trace_stream << "********** resolving control flow **********\n";
}
RETURN_IF_ERROR(ResolveControlFlow(ast));
if (trace) {
llvm::outs() << "********** type checking **********\n";
if (trace_stream) {
**trace_stream << "********** type checking **********\n";
}
RETURN_IF_ERROR(TypeChecker(arena, trace).TypeCheck(ast));
if (trace) {
llvm::outs() << "\n";
llvm::outs() << "********** type checking complete **********\n";
RETURN_IF_ERROR(TypeChecker(arena, trace_stream).TypeCheck(ast));
if (trace_stream) {
**trace_stream << "\n";
**trace_stream << "********** type checking complete **********\n";
for (const auto decl : ast.declarations) {
llvm::outs() << *decl;
**trace_stream << *decl;
}
llvm::outs() << "********** starting execution **********\n";
**trace_stream << "********** starting execution **********\n";
}
ASSIGN_OR_RETURN(const int result, InterpProgram(ast, arena, trace));
llvm::outs() << "result: " << result << "\n";
return result;
return InterpProgram(ast, arena, trace_stream);
}
} // namespace Carbon