Implemented RAII Type to set current program phase (#2886)

Within `explorer/common/trace_stream.h`, implemented RAII Type `SetProgramPhase`.
This RAII type simplifies the process by automatically setting the desired program phase upon construction and restoring the previous phase upon destruction.

Co-authored-by: Richard Smith <richard@metafoo.co.uk>
This commit is contained in:
Prabhat Sachdeva
2023-06-13 16:19:13 -07:00
committed by GitHub
co-authored by Richard Smith
parent 202d3f5993
commit aa8cdd526f
5 changed files with 84 additions and 15 deletions
+9 -9
View File
@@ -23,7 +23,8 @@ namespace Carbon {
auto AnalyzeProgram(Nonnull<Arena*> arena, AST ast,
Nonnull<TraceStream*> trace_stream,
Nonnull<llvm::raw_ostream*> print_stream) -> ErrorOr<AST> {
trace_stream->set_current_phase(ProgramPhase::SourceProgram);
SetProgramPhase set_prog_phase(*trace_stream, ProgramPhase::SourceProgram);
if (trace_stream->is_enabled()) {
*trace_stream << "********** source program **********\n";
for (int i = ast.num_prelude_declarations;
@@ -36,34 +37,35 @@ auto AnalyzeProgram(Nonnull<Arena*> arena, AST ast,
ast.main_call = arena->New<CallExpression>(
source_loc, arena->New<IdentifierExpression>(source_loc, "Main"),
arena->New<TupleLiteral>(source_loc));
// Although name resolution is currently done once, generic programming
// (particularly templates) may require more passes.
trace_stream->set_current_phase(ProgramPhase::NameResolution);
set_prog_phase.update_phase(ProgramPhase::NameResolution);
if (trace_stream->is_enabled()) {
*trace_stream << "********** resolving names **********\n";
}
CARBON_RETURN_IF_ERROR(ResolveNames(ast));
trace_stream->set_current_phase(ProgramPhase::ControlFlowResolution);
set_prog_phase.update_phase(ProgramPhase::ControlFlowResolution);
if (trace_stream->is_enabled()) {
*trace_stream << "********** resolving control flow **********\n";
}
CARBON_RETURN_IF_ERROR(ResolveControlFlow(ast));
trace_stream->set_current_phase(ProgramPhase::TypeChecking);
set_prog_phase.update_phase(ProgramPhase::TypeChecking);
if (trace_stream->is_enabled()) {
*trace_stream << "********** type checking **********\n";
}
CARBON_RETURN_IF_ERROR(
TypeChecker(arena, trace_stream, print_stream).TypeCheck(ast));
trace_stream->set_current_phase(ProgramPhase::UnformedVariableResolution);
set_prog_phase.update_phase(ProgramPhase::UnformedVariableResolution);
if (trace_stream->is_enabled()) {
*trace_stream << "********** resolving unformed variables **********\n";
}
CARBON_RETURN_IF_ERROR(ResolveUnformed(ast));
trace_stream->set_current_phase(ProgramPhase::Declarations);
set_prog_phase.update_phase(ProgramPhase::Declarations);
if (trace_stream->is_enabled()) {
*trace_stream << "********** printing declarations **********\n";
for (int i = ast.num_prelude_declarations;
@@ -71,14 +73,13 @@ auto AnalyzeProgram(Nonnull<Arena*> arena, AST ast,
*trace_stream << *ast.declarations[i];
}
}
trace_stream->set_current_phase(ProgramPhase::Unknown);
return ast;
}
auto ExecProgram(Nonnull<Arena*> arena, AST ast,
Nonnull<TraceStream*> trace_stream,
Nonnull<llvm::raw_ostream*> print_stream) -> ErrorOr<int> {
trace_stream->set_current_phase(ProgramPhase::Execution);
SetProgramPhase set_program_phase(*trace_stream, ProgramPhase::Execution);
if (trace_stream->is_enabled()) {
*trace_stream << "********** starting execution **********\n";
}
@@ -88,7 +89,6 @@ auto ExecProgram(Nonnull<Arena*> arena, AST ast,
if (trace_stream->is_enabled()) {
*trace_stream << "interpreter result: " << interpreter_result << "\n";
}
trace_stream->set_current_phase(ProgramPhase::Unknown);
return interpreter_result;
}