averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert generic-requirement-list to SyntaxCollection, implement function-declaration

Browse Source 
This mostly wraps up the first cut of function-declaration.

https://bugs.swift.org/browse/SR-4043
This commit is contained in:
David Farler
2017-03-02 17:01:18 -08:00
parent ceb3babbc6
commit bb4253e3d3
8 changed files with 234 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
include/swift/Syntax/GenericSyntax.h
View File

@@ -19,6 +19,7 @@
#define SWIFT_SYNTAX_GENERICSYNTAX_H
#include "swift/Syntax/References.h"
#include "swift/Syntax/SyntaxCollection.h"
#include "swift/Syntax/SyntaxData.h"
#include "swift/Syntax/TokenSyntax.h"
@@ -30,10 +31,50 @@ class TypeSyntaxData;
class TypeIdentifierSyntax;
class TypeIdentifierSyntaxData;
#pragma mark - generic-requirement Data
class GenericRequirementSyntaxData : public SyntaxData {
friend class GenericRequirementSyntax;
friend class SyntaxData;
protected:
GenericRequirementSyntaxData(const RC<RawSyntax> Raw,
const SyntaxData *Parent = nullptr,
const CursorIndex IndexInParent = 0)
: SyntaxData(Raw, Parent, IndexInParent) {}
public:
static bool classof(const SyntaxData *SD) {
return SD->getKind() == SyntaxKind::ConformanceRequirement ||
SD->getKind() == SyntaxKind::SameTypeRequirement;
}
};
#pragma mark - generic-requirement API
class GenericRequirementSyntax : public Syntax {
friend class Syntax;
friend class SyntaxData;
friend class GenericRequirementSyntaxData;
public:
using DataType = GenericRequirementSyntaxData;
GenericRequirementSyntax(const RC<SyntaxData> Root, const DataType *Data)
: Syntax(Root, Data) {}
static bool classof(const Syntax *S) {
return S->getKind() == SyntaxKind::ConformanceRequirement ||
S->getKind() == SyntaxKind::SameTypeRequirement;
}
};
#pragma mark - conformance-requirement Data
class ConformanceRequirementSyntaxData final : public SyntaxData {
class ConformanceRequirementSyntaxData final
: public GenericRequirementSyntaxData {
friend class SyntaxData;
RC<TypeIdentifierSyntaxData> CachedConformingTypeIdentifier;
RC<TypeSyntaxData> InheritedType;
@@ -44,18 +85,24 @@ class ConformanceRequirementSyntaxData final : public SyntaxData {
make(RC<RawSyntax> Raw, const SyntaxData *Parent = nullptr,
CursorIndex IndexInParent = 0);
static RC<ConformanceRequirementSyntaxData> makeBlank();
public:
static bool classof(const SyntaxData *S) {
return S->getKind() == SyntaxKind::ConformanceRequirement;
}
static bool classof(const GenericRequirementSyntaxData *SD) {
return SD->getKind() == SyntaxKind::ConformanceRequirement;
}
};
#pragma mark - conformance-requirement API
/// conformance-requirement -> type-identifier : type-identifier
class ConformanceRequirementSyntax final : public Syntax {
class ConformanceRequirementSyntax final : public GenericRequirementSyntax {
friend class ConformanceRequirementSyntaxData;
friend class SyntaxData;
friend class Syntax;
enum Cursor : CursorIndex {
LeftTypeIdentifier,
@@ -73,6 +120,8 @@ class ConformanceRequirementSyntax final : public Syntax {
static ConformanceRequirementSyntax makeBlank();
public:
using DataType = ConformanceRequirementSyntaxData;
/// Return the conforming "left-hand" type identifier in the
/// conformance requirement.
TypeIdentifierSyntax getConformingTypeIdentifier() const;
@@ -99,13 +148,18 @@ public:
static bool classof(const Syntax *S) {
return S->getKind() == SyntaxKind::ConformanceRequirement;
}
static bool classof(const GenericRequirementSyntax *S) {
return S->getKind() == SyntaxKind::ConformanceRequirement;
}
};
#pragma mark - same-type-requirement Data
class SameTypeRequirementSyntaxData final : public SyntaxData {
class SameTypeRequirementSyntaxData final
: public GenericRequirementSyntaxData {
friend struct SyntaxFactory;
friend class SyntaxData;
RC<TypeIdentifierSyntaxData> CachedLeftTypeIdentifier;
RC<TypeSyntaxData> CachedRightType;
@@ -129,8 +183,9 @@ static bool classof(const SyntaxData *S) {
/// same-type-requirement -> type-identifier == type
class SameTypeRequirementSyntax final : public Syntax {
friend struct SyntaxFactory;
friend class Syntax;
friend class SyntaxData;
friend class SameTypeRequirementSyntaxData;
enum Cursor : CursorIndex {
LeftTypeIdentifier,
EqualityToken,
@@ -141,6 +196,7 @@ class SameTypeRequirementSyntax final : public Syntax {
const SameTypeRequirementSyntaxData *Data);
public:
using DataType = SameTypeRequirementSyntaxData;
/// Return the type identifier on the left side of the same-type requirement.
TypeIdentifierSyntax getLeftTypeIdentifier() const;
@@ -480,6 +536,35 @@ public:
}
};
#pragma mark - generic-requirement-list Data
using GenericRequirementListSyntaxData =
SyntaxCollectionData<SyntaxKind::GenericRequirementList,
GenericRequirementSyntax>;
#pragma mark - generic-requirement-list API
/// requirement-list -> requirement | requirement ',' requirement-list
///
/// requirement -> conformance-requirement | same-type-requirement
class GenericRequirementListSyntax final
: public SyntaxCollection<SyntaxKind::GenericRequirementList,
GenericRequirementSyntax> {
friend struct SyntaxFactory;
friend class Syntax;
friend class SyntaxData;
using DataType = GenericRequirementListSyntaxData;
GenericRequirementListSyntax(const RC<SyntaxData> Root,
const DataType *Data)
: SyntaxCollection(Root, Data) {}
public:
static bool classof(const Syntax *S) {
return S->getKind() == SyntaxKind::GenericRequirementList;
}
};
#pragma mark - generic-argument-clause Builder
class GenericArgumentClauseBuilder {
@@ -502,47 +587,6 @@ public:
GenericArgumentClauseSyntax build() const;
};
#pragma mark - generic-requirement-list Data
class GenericRequirementListSyntaxData final : public SyntaxData {
friend class SyntaxData;
GenericRequirementListSyntaxData(RC<RawSyntax> Raw,
const SyntaxData *Parent = nullptr,
CursorIndex IndexInParent = 0);
static RC<GenericRequirementListSyntaxData>
make(RC<RawSyntax> Raw, const SyntaxData *Parent = nullptr,
CursorIndex IndexInParent = 0);
static RC<GenericRequirementListSyntaxData> makeBlank();
public:
static bool classof(const SyntaxData *S) {
return S->getKind() == SyntaxKind::GenericRequirementList;
}
};
#pragma mark - generic-requirement-list API
/// requirement-list -> requirement | requirement ',' requirement-list
///
/// requirement -> conformance-requirement | same-type-requirement
class GenericRequirementListSyntax final : public Syntax {
friend struct SyntaxFactory;
GenericRequirementListSyntax(RC<SyntaxData> Root,
GenericRequirementListSyntaxData *Data);
static GenericRequirementListSyntax make(RC<RawSyntax> Raw);
static GenericRequirementListSyntax makeBlank();
public:
// TODO: getRequirement(unsigned n) const;
// TODO: withAddedRequirement(llvm::Optional<RC<TokenSyntax>> MaybeComma,
// GenericRequirementSyntax NewRequirement) const;
static bool classof(const Syntax *S) {
return S->getKind() == SyntaxKind::GenericRequirementList;
}
};
#pragma mark - generic-where-clause Data
class GenericWhereClauseSyntaxData final : public SyntaxData {
@@ -551,12 +595,12 @@ class GenericWhereClauseSyntaxData final : public SyntaxData {
RC<GenericRequirementListSyntaxData> CachedRequirementList;
GenericWhereClauseSyntaxData(RC<RawSyntax> Raw,
GenericWhereClauseSyntaxData(const RC<RawSyntax> Raw,
const SyntaxData *Parent = nullptr,
CursorIndex IndexInParent = 0);
static RC<GenericWhereClauseSyntaxData> make(RC<RawSyntax> Raw,
const SyntaxData *Parent = nullptr,
CursorIndex IndexInParent = 0);
const CursorIndex IndexInParent = 0);
static RC<GenericWhereClauseSyntaxData>
make(const RC<RawSyntax> Raw, const SyntaxData *Parent = nullptr,
const CursorIndex IndexInParent = 0);
static RC<GenericWhereClauseSyntaxData> makeBlank();
public:
@@ -570,12 +614,16 @@ public:
/// generic-where-clause -> 'where' requirement-list
class GenericWhereClauseSyntax final : public Syntax {
friend struct SyntaxFactory;
friend class Syntax;
friend class SyntaxData;
friend class GenericWhereClauseSyntaxData;
enum class Cursor : CursorIndex {
WhereToken,
WhereKeyword,
RequirementList,
};
using DataType = GenericWhereClauseSyntaxData;
GenericWhereClauseSyntax(RC<SyntaxData> Root,
const GenericWhereClauseSyntaxData *Data);

3
include/swift/Syntax/Syntax.h
View File

@@ -52,7 +52,6 @@ class Syntax {
friend class SyntaxData;
friend class LegacyASTTransformer;
friend class sema::Semantics;
using DataType = SyntaxData;
#define SYNTAX(Id, Parent) friend class Id##Syntax;
#include "swift/Syntax/SyntaxKinds.def"
@@ -75,6 +74,8 @@ protected:
}
public:
using DataType = SyntaxData;
Syntax(const RC<SyntaxData> Root, const SyntaxData *Data);
/// Get the kind of syntax.

9
include/swift/Syntax/SyntaxFactory.h
View File

@@ -101,6 +101,7 @@ struct SyntaxFactory {
RC<TokenSyntax> Identifier,
llvm::Optional<GenericParameterClauseSyntax> GenericParams,
FunctionSignatureSyntax Signature,
llvm::Optional<GenericWhereClauseSyntax> GenericWhereClause,
llvm::Optional<CodeBlockStmtSyntax> Body);
/// Make a function declaration with all missing elements.
@@ -594,6 +595,14 @@ struct SyntaxFactory {
makeSameTypeRequirement(TypeIdentifierSyntax LeftTypeIdentifier,
RC<TokenSyntax> EqualityToken, TypeSyntax RightType);
/// Make a list of generic requirements with the given loosely collected
/// requirements/
static GenericRequirementListSyntax makeGenericRequirementList(
std::vector<GenericRequirementSyntax> &Requirements);
/// Make an empty list of generic requirements.
static GenericRequirementListSyntax makeBlankGenericRequirementList();
/// Make a same-type requirement with all elements marked as missing.
static SameTypeRequirementSyntax makeBlankSameTypeRequirement();

5
include/swift/Syntax/SyntaxKinds.def
View File

@@ -53,8 +53,9 @@ SYNTAX(GenericWhereClause, Syntax)
SYNTAX(GenericRequirementList, Syntax)
SYNTAX(GenericArgumentClause, Syntax)
SYNTAX(GenericArgumentList, Syntax)
SYNTAX(ConformanceRequirement, Syntax)
SYNTAX(SameTypeRequirement, Syntax)
ABSTRACT_SYNTAX(GenericRequirementSyntax, Syntax)
SYNTAX(ConformanceRequirement, GenericRequirementSyntax)
SYNTAX(SameTypeRequirement, GenericRequirementSyntax)
SYNTAX(TypeArgumentList, Syntax)
// Types