Skip to content

[SyntaxParse] Revert syntax parsing changes from the master branch #27675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 35 commits into from
Oct 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
572cfe2
Revert "[SyntaxParse] Parse ObjC keypath expression syntax"
rintaro Oct 14, 2019
b56c543
Revert "Merge pull request #27607 from rintaro/syntaxparse-exprunreso…
rintaro Oct 14, 2019
0e8010d
Revert "Merge pull request #27592 from rintaro/syntaxparse-exprtuple"
rintaro Oct 14, 2019
2f40f24
Revert "Merge pull request #27565 from rintaro/syntaxparse-exprcollec…
rintaro Oct 14, 2019
6f4dc25
Revert "Merge pull request #27544 from rintaro/syntaxparse-attrincomp…
rintaro Oct 14, 2019
cd1a299
Revert "Merge pull request #27531 from rintaro/syntaxparse-matchingto…
rintaro Oct 14, 2019
550865c
Revert "Merge pull request #27528 from rintaro/syntaxparse-rdar55952739"
rintaro Oct 14, 2019
e53ad15
Revert "Merge pull request #27508 from rintaro/syntaxparse-expridenti…
rintaro Oct 14, 2019
c773c3b
Revert "Merge pull request #27485 from rintaro/syntaxparse-decltypeal…
rintaro Oct 14, 2019
4eadbaa
Revert "Merge pull request #27466 from rintaro/syntaxparse-type"
rintaro Oct 14, 2019
fbc7c6c
Revert "Merge pull request #27416 from rintaro/syntaxparse-declassoci…
rintaro Oct 14, 2019
402e791
Revert "Merge pull request #27377 from rintaro/syntaxparse-rdar55711699"
rintaro Oct 14, 2019
bf5aa0a
Revert "Merge pull request #27325 from rintaro/syntaxparse-cctype"
rintaro Oct 14, 2019
045593d
Revert "Merge pull request #27308 from rintaro/parse-debuggercontextc…
rintaro Oct 14, 2019
0165b4f
Revert "Merge pull request #27291 from rintaro/syntaxparses-astgen-si…
rintaro Oct 14, 2019
9fa1760
Revert "Merge pull request #27406 from nathawes/add-syntax-range-asse…
rintaro Oct 14, 2019
baa0ef7
Revert "Merge pull request #27286 from nathawes/r55280477-tuple-type-…
rintaro Oct 14, 2019
8768832
Revert "Merge pull request #27281 from rintaro/reapply-syntaxparse-ge…
rintaro Oct 14, 2019
00613db
Revert "Merge pull request #27230 from rintaro/syntaxparsse-rdar55421…
rintaro Oct 14, 2019
cb00b8f
Revert "Merge pull request #27120 from rintaro/parser-rdar55267292"
rintaro Oct 14, 2019
62408b0
Revert "Merge pull request #27046 from rintaro/syntaxparse-refactor-t…
rintaro Oct 14, 2019
e00fc0c
Revert "Merge pull request #27040 from rintaro/syntaxparse-rdar55075237"
rintaro Oct 14, 2019
601c90d
Revert "Merge pull request #27024 from rintaro/syntaxparse-endloc-com…
rintaro Oct 14, 2019
97a6fbc
Revert "Merge pull request #27000 from rintaro/syntaxparse-roundtrip3"
rintaro Oct 14, 2019
8df497d
Revert "Merge pull request #26974 from rintaro/syntaxparse-roundtrip2"
rintaro Oct 14, 2019
149c875
Revert "Merge pull request #26933 from rintaro/syntaxparse-roundtrip1"
rintaro Oct 14, 2019
71aa44d
Revert "Merge pull request #26914 from rintaro/syntaxparse-genericarg…
rintaro Oct 14, 2019
5a6e14b
Revert "Merge pull request #26952 from rintaro/syntaxparse-type-faile…
rintaro Oct 14, 2019
c2c87db
Revert "Merge pull request #26943 from rintaro/syntaxparse-parsedrawn…
rintaro Oct 14, 2019
570ed93
Revert "Merge pull request #26883 from rintaro/revert-revert-26478-gs…
rintaro Oct 14, 2019
5559cff
Revert "Merge pull request #26664 from rintaro/syntaxparse-memoryleak"
rintaro Oct 14, 2019
8a03e08
Revert "Merge pull request #26403 from rintaro/gsoc-2019-part1"
rintaro Oct 14, 2019
2ec16f0
[Syntax] Make getRaw() return const reference
rintaro Oct 14, 2019
8bfb232
[AST] Always initialize 'TypeRepr *' in TupleTypeElement
rintaro Oct 14, 2019
66d19e6
[Syntax] Accept '_' token as a label for tuple expression
rintaro Oct 14, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions cmake/modules/SwiftHandleGybSources.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,10 @@ function(handle_gyb_sources dependency_out_var_name sources_var_name arch)
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/AttributeNodes.py"
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/AvailabilityNodes.py"
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/CommonNodes.py"
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/CompletionOnlyNodes.py"
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/DeclNodes.py"
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/ExprNodes.py"
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/GenericNodes.py"
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/NodeSerializationCodes.py"
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/PatternNodes.py"
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/SILOnlyNodes.py"
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/StmtNodes.py"
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/TypeNodes.py"
"${SWIFT_SOURCE_DIR}/utils/gyb_syntax_support/Token.py"
Expand Down
2 changes: 0 additions & 2 deletions include/swift/AST/DiagnosticsParse.def
Original file line number Diff line number Diff line change
Expand Up @@ -970,8 +970,6 @@ ERROR(expected_expr_throw,PointsToFirstBadToken,
// Yield Statment
ERROR(expected_expr_yield,PointsToFirstBadToken,
"expected expression in 'yield' statement", ())
ERROR(unexpected_arg_label_yield,none,
"unexpected argument label in 'yield' statement", ())

// Defer Statement
ERROR(expected_lbrace_after_defer,PointsToFirstBadToken,
Expand Down
261 changes: 0 additions & 261 deletions include/swift/Parse/ASTGen.h

This file was deleted.

10 changes: 2 additions & 8 deletions include/swift/Parse/CodeCompletionCallbacks.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ class CodeCompletionCallbacks {
/// completion. This declaration contained the code completion token.
Decl *ParsedDecl = nullptr;

TypeLoc ParsedTypeLoc;

/// True if code completion is done inside a raw value expression of an enum
/// case.
bool InEnumElementRawValue = false;
Expand Down Expand Up @@ -78,10 +76,6 @@ class CodeCompletionCallbacks {
ParsedDecl = D;
}

void setParsedTypeLoc(TypeLoc TyLoc) {
ParsedTypeLoc = TyLoc;
}

void setLeadingSequenceExprs(ArrayRef<Expr *> exprs) {
leadingSequenceExprs.assign(exprs.begin(), exprs.end());
}
Expand Down Expand Up @@ -165,10 +159,10 @@ class CodeCompletionCallbacks {
virtual void completeTypeSimpleBeginning() {};

/// Complete a given type-identifier after we have consumed the dot.
virtual void completeTypeIdentifierWithDot() {};
virtual void completeTypeIdentifierWithDot(IdentTypeRepr *ITR) {};

/// Complete a given type-identifier when there is no trailing dot.
virtual void completeTypeIdentifierWithoutDot() {};
virtual void completeTypeIdentifierWithoutDot(IdentTypeRepr *ITR) {};

/// Complete the beginning of a case statement at the top of switch stmt.
virtual void completeCaseStmtKeyword() {};
Expand Down
Loading