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

[Syntax] function-parameter-list is now a SyntaxCollection

Browse Source 
Removes some code duplication.
This commit is contained in:
David Farler
2017-03-02 11:27:41 -08:00
parent e565392f81
commit e70a65882f
4 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/swift/Syntax/DeclSyntax.h
View File

@@ -22,6 +22,7 @@
#include "swift/Syntax/References.h"
#include "swift/Syntax/RawSyntax.h"
#include "swift/Syntax/Syntax.h"
#include "swift/Syntax/SyntaxCollection.h"
#include "swift/Syntax/SyntaxData.h"
#include "swift/Syntax/TokenSyntax.h"
#include "swift/Syntax/TypeSyntax.h"
@@ -420,8 +421,6 @@ class FunctionParameterSyntax final : public Syntax {
friend class SyntaxData;
friend class FunctionParameterSyntaxData;
using DataType = FunctionParameterSyntaxData;
enum class Cursor : CursorIndex {
ExternalName,
LocalName,
@@ -433,10 +432,13 @@ class FunctionParameterSyntax final : public Syntax {
TrailingComma,
};
FunctionParameterSyntax(const RC<SyntaxData> Root,
const DataType *Data);
public:
using DataType = FunctionParameterSyntaxData;
static constexpr SyntaxKind Kind = SyntaxKind::FunctionParameter;
FunctionParameterSyntax(const RC<SyntaxData> Root, const DataType *Data)
: Syntax(Root, Data) {}
/// Get the external name of the parameter, if there is one.
RC<TokenSyntax> getExternalName() const;
@@ -498,27 +500,23 @@ public:
#pragma mark - function-parameter-list Data
class FunctionParameterListSyntaxData final : public SyntaxData {
std::vector<RC<FunctionParameterSyntaxData>> CachedParameters;
public:
static bool classof(const SyntaxData *SD) {
return SD->getKind() == SyntaxKind::FunctionParameterList;
}
};
using FunctionParameterListSyntaxData = SyntaxCollectionData<SyntaxKind::FunctionParameterList, FunctionParameterSyntax>;
#pragma mark - function-parameter-list API
/// parameter-list -> parameteter | parameter ',' parameter-list
class FunctionParameterListSyntax final : public Syntax {
friend struct SyntaxBuilder;
class FunctionParameterListSyntax final : public
SyntaxCollection<SyntaxKind::FunctionParameterList, FunctionParameterSyntax> {
friend struct SyntaxFactory;
friend class Syntax;
friend class SyntaxData;
friend class FunctionParameterListSyntaxData;
using DataType = FunctionParameterListSyntaxData;
FunctionParameterListSyntax(const RC<SyntaxData> Root,
const DataType *Data)
: SyntaxCollection(Root, Data) {}
public:
static bool classof(const Syntax *S) {
return S->getKind() == SyntaxKind::FunctionParameterList;