mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-17 02:28:14 +00:00
Separate parsing from type-checking and evaluation. (#345)
This change caused the syntax error in undef2.6c ("fun" instead of "fn") to be
detected as one would expect, thus the changed golden file.
This commit is contained in:
1 parent
62ff5597e4
commit
2f83c4be48
3 files changed
+32
-8
No files matched your search
@@ -6,12 +6,12 @@
|
||||
#include <cstring>
|
||||
#include <iostream>
|
||||
|
||||
#include "executable_semantics/syntax/parser.h"
|
||||
#include "executable_semantics/syntax/syntax_helpers.h"
|
||||
#include "executable_semantics/tracing_flag.h"
|
||||
#include "llvm/Support/CommandLine.h"
|
||||
|
||||
extern FILE* yyin;
|
||||
extern auto yyparse() -> int; // NOLINT(readability-identifier-naming)
|
||||
|
||||
int main(int argc, char* argv[]) {
|
||||
// yydebug = 1;
|
||||
@@ -34,5 +34,22 @@ int main(int argc, char* argv[]) {
|
||||
if (quiet_option) {
|
||||
Carbon::tracing_output = false;
|
||||
}
|
||||
return yyparse();
|
||||
|
||||
// No AST yet
|
||||
std::optional<Carbon::AST> parsedInput = std::nullopt;
|
||||
|
||||
// Parse and handle syntax errors
|
||||
auto syntaxErrorCode = yyparse(parsedInput);
|
||||
if (syntaxErrorCode != 0) {
|
||||
return syntaxErrorCode;
|
||||
}
|
||||
|
||||
if (parsedInput == std::nullopt) {
|
||||
std::cerr << "Internal error: parser validated syntax yet didn't produce "
|
||||
"an AST.\n";
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Typecheck and run the parsed program.
|
||||
Carbon::ExecProgram(*parsedInput);
|
||||
}
|
||||
Reference in new issue
Block a user