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

Switch executable semantics to use ErrorBuilder directly and relocate macros (#1184)

Browse Source
This commit is contained in:
Jon Meow
2022-04-13 09:05:21 -07:00
committed by GitHub
parent 6542506cdc
commit 87e58f5db3
37 changed files with 327 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/syntax/BUILD
+1 -1
View File
@@ -85,7 +85,7 @@ cc_library(
"//executable_semantics/ast:pattern",
"//executable_semantics/ast:value_category",
"//executable_semantics/common:arena",
"//executable_semantics/common:error",
"//executable_semantics/common:error_builders",
"//executable_semantics/common:nonnull",
"@llvm-project//llvm:Support",
],
executable_semantics/syntax/parse.cpp
+5 -4
View File
@@ -6,7 +6,7 @@
#include "common/check.h"
#include "common/error.h"
#include "executable_semantics/common/error.h"
#include "executable_semantics/common/error_builders.h"
#include "executable_semantics/syntax/lexer.h"
#include "executable_semantics/syntax/parse_and_lex_context.h"
#include "executable_semantics/syntax/parser.h"
@@ -41,10 +41,11 @@ auto ParseImpl(yyscan_t scanner, Nonnull<Arena*> arena,
auto Parse(Nonnull<Arena*> arena, std::string_view input_file_name, bool trace)
-> ErrorOr<AST> {
FILE* input_file = fopen(std::string(input_file_name).c_str(), "r");
std::string name_str(input_file_name);
FILE* input_file = fopen(name_str.c_str(), "r");
if (input_file == nullptr) {
return FATAL_PROGRAM_ERROR_NO_LINE() << "Error opening '" << input_file_name
<< "': " << std::strerror(errno);
return ProgramError(SourceLocation(name_str.c_str(), 0))
<< "Error opening file: " << std::strerror(errno);
}
// Prepare the lexer.