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

Pass the flag instead of using a global. (#893)

Browse Source 
Arguably missed in #769 

Note, this is reminding me we have more class members to rename for `_`, but I felt it's best to use the new naming instead of adding more to clean up.
This commit is contained in:
Jon Meow
2021-10-19 09:16:57 -07:00
committed by GitHub
parent a3eac75a5b
commit a9eed3dbf1
17 changed files with 43 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/interpreter/exec_program.cpp
+6 -6
View File
@@ -7,7 +7,6 @@
#include "common/check.h"
#include "common/ostream.h"
#include "executable_semantics/common/arena.h"
#include "executable_semantics/common/tracing_flag.h"
#include "executable_semantics/interpreter/interpreter.h"
#include "executable_semantics/interpreter/type_checker.h"
@@ -34,23 +33,23 @@ static void AddIntrinsics(Nonnull<Arena*> arena,
declarations->insert(declarations->begin(), print);
}
void ExecProgram(Nonnull<Arena*> arena, AST ast) {
void ExecProgram(Nonnull<Arena*> arena, AST ast, bool trace) {
AddIntrinsics(arena, &ast.declarations);
if (tracing_output) {
if (trace) {
llvm::outs() << "********** source program **********\n";
for (const auto decl : ast.declarations) {
llvm::outs() << *decl;
}
llvm::outs() << "********** type checking **********\n";
}
TypeChecker type_checker(arena);
TypeChecker type_checker(arena, trace);
TypeChecker::TypeCheckContext p = type_checker.TopLevel(&ast.declarations);
TypeEnv top = p.types;
Env ct_top = p.values;
for (const auto decl : ast.declarations) {
type_checker.TypeCheck(decl, top, ct_top);
}
if (tracing_output) {
if (trace) {
llvm::outs() << "\n";
llvm::outs() << "********** type checking complete **********\n";
for (const auto decl : ast.declarations) {
@@ -63,7 +62,8 @@ void ExecProgram(Nonnull<Arena*> arena, AST ast) {
Nonnull<Expression*> call_main = arena->New<CallExpression>(
source_loc, arena->New<IdentifierExpression>(source_loc, "main"),
arena->New<TupleLiteral>(source_loc));
int result = Interpreter(arena).InterpProgram(ast.declarations, call_main);
int result =
Interpreter(arena, trace).InterpProgram(ast.declarations, call_main);
llvm::outs() << "result: " << result << "\n";
}