Skip to content

Commit cac5c2e

Browse files
committed
!!! [DNM] Disable parser roundripping until init accessor swift-syntax changes land
1 parent 4bc8c3d commit cac5c2e

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

lib/Parse/ParseDecl.cpp

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,10 @@ extern "C" void swift_ASTGen_buildTopLevelASTNodes(void *sourceFile,
207207
/// decl-sil-stage [[only in SIL mode]
208208
/// \endverbatim
209209
void Parser::parseTopLevelItems(SmallVectorImpl<ASTNode> &items) {
210-
#if SWIFT_SWIFT_PARSER
211-
Optional<DiagnosticTransaction> existingParsingTransaction;
212-
parseSourceFileViaASTGen(items, existingParsingTransaction);
213-
#endif
210+
//#if SWIFT_SWIFT_PARSER
211+
// Optional<DiagnosticTransaction> existingParsingTransaction;
212+
// parseSourceFileViaASTGen(items, existingParsingTransaction);
213+
//#endif
214214

215215
// Prime the lexer.
216216
if (Tok.is(tok::NUM_TOKENS))
@@ -259,8 +259,8 @@ void Parser::parseTopLevelItems(SmallVectorImpl<ASTNode> &items) {
259259
}
260260

261261
#if SWIFT_SWIFT_PARSER
262-
if (existingParsingTransaction)
263-
existingParsingTransaction->abort();
262+
// if (existingParsingTransaction)
263+
// existingParsingTransaction->abort();
264264

265265
using ParsingFlags = SourceFile::ParsingFlags;
266266
const auto parsingOpts = SF.getParsingOptions();
@@ -285,12 +285,13 @@ void Parser::parseTopLevelItems(SmallVectorImpl<ASTNode> &items) {
285285
diagnose(loc, diag::parser_round_trip_error);
286286
return;
287287
}
288+
/*
288289
if (parsingOpts.contains(ParsingFlags::ValidateNewParserDiagnostics) &&
289290
!Context.Diags.hadAnyError()) {
290291
auto hadSyntaxError = swift_ASTGen_emitParserDiagnostics(
291292
&Context.Diags, exportedSourceFile,
292-
/*emitOnlyErrors=*/true,
293-
/*downgradePlaceholderErrorsToWarnings=*/
293+
/emitOnlyErrors=/true,
294+
/downgradePlaceholderErrorsToWarnings=/
294295
Context.LangOpts.Playground ||
295296
Context.LangOpts.WarnOnEditorPlaceholder);
296297
if (hadSyntaxError) {
@@ -305,6 +306,7 @@ void Parser::parseTopLevelItems(SmallVectorImpl<ASTNode> &items) {
305306
diagnose(loc, diag::parser_new_parser_errors);
306307
}
307308
}
309+
*/
308310
#endif
309311
}
310312

@@ -7508,8 +7510,8 @@ void Parser::parseTopLevelAccessors(
75087510
}
75097511

75107512
void Parser::parseExpandedAttributeList(SmallVectorImpl<ASTNode> &items) {
7511-
Optional<DiagnosticTransaction> transaction;
7512-
parseSourceFileViaASTGen(items, transaction, /*suppressDiagnostics*/true);
7513+
// Optional<DiagnosticTransaction> transaction;
7514+
// parseSourceFileViaASTGen(items, transaction, /*suppressDiagnostics*/true);
75137515

75147516
if (Tok.is(tok::NUM_TOKENS))
75157517
consumeTokenWithoutFeedingReceiver();
@@ -7535,8 +7537,8 @@ void Parser::parseExpandedAttributeList(SmallVectorImpl<ASTNode> &items) {
75357537
}
75367538

75377539
void Parser::parseExpandedMemberList(SmallVectorImpl<ASTNode> &items) {
7538-
Optional<DiagnosticTransaction> transaction;
7539-
parseSourceFileViaASTGen(items, transaction, /*suppressDiagnostics*/true);
7540+
// Optional<DiagnosticTransaction> transaction;
7541+
// parseSourceFileViaASTGen(items, transaction, /*suppressDiagnostics*/true);
75407542

75417543
if (Tok.is(tok::NUM_TOKENS))
75427544
consumeTokenWithoutFeedingReceiver();

0 commit comments

Comments
 (0)