Consolidate ASTTokenizable conformations into one file

yanagiba · Sep 1, 2017 · 29426d8 · 29426d8
1 parent 09e29b2
commit 29426d8
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 164 deletions.
diff --git a/...orm/Tokenizer/Tokenizer+Declaration.swift → Sources/Transform/ASTTokenizable+AST.swift b/...orm/Tokenizer/Tokenizer+Declaration.swift → Sources/Transform/ASTTokenizable+AST.swift
@@ -16,6 +16,18 @@
 
 import AST
 
+// MARK: - ASTNode
+
+extension ASTNode: ASTTokenizable {}
+
+// MARK: - Attribute
+
+extension Attribute: ASTTokenizable {}
+extension Attribute.ArgumentClause: ASTTokenizable {}
+extension Attribute.ArgumentClause.BalancedToken: ASTTokenizable {}
+
+// MARK: - Declaration
+
 extension ProtocolDeclaration.InitializerMember: ASTTokenizable {}
 extension GetterSetterBlock.GetterClause: ASTTokenizable {}
 extension GetterSetterBlock.SetterClause: ASTTokenizable {}
@@ -44,3 +56,51 @@ extension ProtocolDeclaration.PropertyMember: ASTTokenizable {}
 extension ProtocolDeclaration.SubscriptMember: ASTTokenizable {}
 extension ProtocolDeclaration.AssociativityTypeMember: ASTTokenizable {}
 extension VariableDeclaration.Body: ASTTokenizable {}
+
+// MARK: - Expression
+
+extension ClosureExpression.Signature: ASTTokenizable {}
+extension ClosureExpression.Signature.CaptureItem: ASTTokenizable {}
+extension ClosureExpression.Signature.CaptureItem.Specifier: ASTTokenizable {}
+extension ClosureExpression.Signature.ParameterClause: ASTTokenizable {}
+extension ClosureExpression.Signature.ParameterClause.Parameter: ASTTokenizable {}
+extension FunctionCallExpression.Argument: ASTTokenizable {}
+extension TupleExpression.Element: ASTTokenizable {}
+extension DictionaryEntry: ASTTokenizable {}
+extension SubscriptArgument: ASTTokenizable {}
+
+// MARK: -  Generic
+
+extension GenericParameterClause: ASTTokenizable {}
+extension GenericParameterClause.GenericParameter: ASTTokenizable {}
+extension GenericWhereClause: ASTTokenizable {}
+extension GenericWhereClause.Requirement: ASTTokenizable {}
+extension GenericArgumentClause: ASTTokenizable {}
+
+// MARK: - Pattern
+
+extension PatternBase: ASTTokenizable {}
+extension TuplePattern.Element: ASTTokenizable {}
+
+// MARK: -  statement
+
+extension DoStatement.CatchClause: ASTTokenizable {}
+extension IfStatement.ElseClause: ASTTokenizable {}
+extension SwitchStatement.Case: ASTTokenizable {}
+extension SwitchStatement.Case.Item: ASTTokenizable {}
+extension Condition: ASTTokenizable {}
+extension AvailabilityCondition: ASTTokenizable {}
+extension AvailabilityCondition.Argument: ASTTokenizable {}
+
+// MARK: - Type
+
+extension TypeBase: ASTTokenizable {}
+extension FunctionType.Argument: ASTTokenizable {}
+extension TupleType.Element: ASTTokenizable {}
+extension TypeAnnotation: ASTTokenizable {}
+extension TypeIdentifier.TypeName: ASTTokenizable {}
+extension TypeInheritanceClause: ASTTokenizable {}
+
+// MARK: - Throws
+
+extension ThrowsKind: ASTTokenizable {}
diff --git a/.../Transform/Tokenizer/ASTTokenizable.swift → Sources/Transform/ASTTokenizable.swift b/.../Transform/Tokenizer/ASTTokenizable.swift → Sources/Transform/ASTTokenizable.swift
@@ -30,7 +30,3 @@ extension ASTTokenizable {
         return Token(origin: self, node: node, kind: kind, value: value)
     }
 }
-
-
-// TODO: Remove and make it per element?
-extension ASTNode: ASTTokenizable {}
diff --git a/Sources/Transform/Tokenizer/Tokenizer+Attribute.swift b/Sources/Transform/Tokenizer/Tokenizer+Attribute.swift
diff --git a/Sources/Transform/Tokenizer/Tokenizer+Expression.swift b/Sources/Transform/Tokenizer/Tokenizer+Expression.swift
diff --git a/Sources/Transform/Tokenizer/Tokenizer+Generic.swift b/Sources/Transform/Tokenizer/Tokenizer+Generic.swift
diff --git a/Sources/Transform/Tokenizer/Tokenizer+Pattern.swift b/Sources/Transform/Tokenizer/Tokenizer+Pattern.swift
diff --git a/Sources/Transform/Tokenizer/Tokenizer+Statement.swift b/Sources/Transform/Tokenizer/Tokenizer+Statement.swift
diff --git a/Sources/Transform/Tokenizer/Tokenizer+Types.swift b/Sources/Transform/Tokenizer/Tokenizer+Types.swift
diff --git a/Sources/Transform/Tokenizer/Tokenizer+Util.swift b/Sources/Transform/Tokenizer/Tokenizer+Util.swift