This is an archive of the discontinued LLVM Phabricator instance.

Differential D126934

[clang-format] NFC Sort names of format token types
ClosedPublic

Authored by sstwcw on Jun 2 2022, 6:00 PM.

Details

Reviewers
HazardyKnusperkeks
MyDeveloperDay
curdeius
owenpan
Commits
rG1f69f7ea9af4: [clang-format] NFC Sort names of format token types
Summary

Suggested by HazardyKnusperkeks in D126845.

Diff Detail

Event Timeline

sstwcw created this revision.Jun 2 2022, 6:00 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 2 2022, 6:00 PM
sstwcw requested review of this revision.Jun 2 2022, 6:00 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 2 2022, 6:00 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B167652: Diff 433930.Jun 2 2022, 6:33 PM
owenpan added inline comments.Jun 2 2022, 7:07 PM
clang/lib/Format/FormatToken.h
39–45

Also use case-insensitive sorting and move them to just below CppCastLParen on line 55.

43–44

Can you swap them back? I think we want case-insensitive sorting.

sstwcw updated this revision to Diff 435760.Jun 9 2022, 6:54 PM

use case-insensitive sorting

sstwcw marked 2 inline comments as done.Jun 9 2022, 6:56 PM
Harbormaster completed remote builds in B168974: Diff 435760.Jun 9 2022, 7:23 PM
owenpan accepted this revision.Jun 9 2022, 8:29 PM

LGTM

This revision is now accepted and ready to land.Jun 9 2022, 8:29 PM
HazardyKnusperkeks accepted this revision.Jun 13 2022, 3:36 AM
This revision was landed with ongoing or failed builds.Jun 25 2022, 5:26 AM
Closed by commit rG1f69f7ea9af4: [clang-format] NFC Sort names of format token types (authored by sstwcw). · Explain Why
This revision was automatically updated to reflect the committed changes.
sstwcw added a commit: rG1f69f7ea9af4: [clang-format] NFC Sort names of format token types.

Revision Contents

PathSize
clang/
lib/
Format/
18 lines

Diff 439978

clang/lib/Format/FormatToken.h

Show All 30 Lines#define LIST_TOKEN_TYPES \
TYPE(AttributeColon) \ TYPE(AttributeColon) \
TYPE(AttributeMacro) \ TYPE(AttributeMacro) \
TYPE(AttributeParen) \ TYPE(AttributeParen) \
TYPE(AttributeSquare) \ TYPE(AttributeSquare) \
TYPE(BinaryOperator) \ TYPE(BinaryOperator) \
TYPE(BitFieldColon) \ TYPE(BitFieldColon) \
TYPE(BlockComment) \ TYPE(BlockComment) \
TYPE(BracedListLBrace) \ TYPE(BracedListLBrace) \
TYPE(CastRParen) \ TYPE(CastRParen) \
TYPE(ClassLBrace) \ TYPE(ClassLBrace) \
TYPE(CompoundRequirementLBrace) \ TYPE(CompoundRequirementLBrace) \
TYPE(ConditionalExpr) \ TYPE(ConditionalExpr) \
TYPE(ConflictAlternative) \ TYPE(ConflictAlternative) \
TYPE(ConflictEnd) \ TYPE(ConflictEnd) \
owenpanUnsubmitted
Done
ReplyInline Actions

Can you swap them back? I think we want case-insensitive sorting.

owenpan: Can you swap them back? I think we want case-insensitive sorting.
TYPE(ConflictStart) \ TYPE(ConflictStart) \
owenpanUnsubmitted
Done
ReplyInline Actions

Also use case-insensitive sorting and move them to just below CppCastLParen on line 55.

owenpan: Also use case-insensitive sorting and move them to just below `CppCastLParen` on line 55.
/* l_brace of if/for/while */ \ /* l_brace of if/for/while */ \
TYPE(ControlStatementLBrace) \ TYPE(ControlStatementLBrace) \
TYPE(CppCastLParen) \ TYPE(CppCastLParen) \
TYPE(CSharpGenericTypeConstraint) \
TYPE(CSharpGenericTypeConstraintColon) \
TYPE(CSharpGenericTypeConstraintComma) \
TYPE(CSharpNamedArgumentColon) \
TYPE(CSharpNullable) \
TYPE(CSharpNullConditionalLSquare) \
TYPE(CSharpStringLiteral) \
TYPE(CtorInitializerColon) \ TYPE(CtorInitializerColon) \
TYPE(CtorInitializerComma) \ TYPE(CtorInitializerComma) \
TYPE(DesignatedInitializerLSquare) \ TYPE(DesignatedInitializerLSquare) \
TYPE(DesignatedInitializerPeriod) \ TYPE(DesignatedInitializerPeriod) \
TYPE(DictLiteral) \ TYPE(DictLiteral) \
TYPE(ElseLBrace) \ TYPE(ElseLBrace) \
TYPE(EnumLBrace) \ TYPE(EnumLBrace) \
TYPE(FatArrow) \ TYPE(FatArrow) \
TYPE(ForEachMacro) \ TYPE(ForEachMacro) \
TYPE(FunctionAnnotationRParen) \ TYPE(FunctionAnnotationRParen) \
TYPE(FunctionDeclarationName) \ TYPE(FunctionDeclarationName) \
TYPE(FunctionLBrace) \ TYPE(FunctionLBrace) \
TYPE(FunctionLikeOrFreestandingMacro) \ TYPE(FunctionLikeOrFreestandingMacro) \
TYPE(FunctionTypeLParen) \ TYPE(FunctionTypeLParen) \
TYPE(IfMacro) \ TYPE(IfMacro) \
TYPE(ImplicitStringLiteral) \ TYPE(ImplicitStringLiteral) \
TYPE(InheritanceColon) \ TYPE(InheritanceColon) \
TYPE(InheritanceComma) \ TYPE(InheritanceComma) \
TYPE(InlineASMBrace) \ TYPE(InlineASMBrace) \
TYPE(InlineASMColon) \ TYPE(InlineASMColon) \
TYPE(InlineASMSymbolicNameLSquare) \ TYPE(InlineASMSymbolicNameLSquare) \
TYPE(JavaAnnotation) \ TYPE(JavaAnnotation) \
TYPE(JsAndAndEqual) \
TYPE(JsComputedPropertyName) \ TYPE(JsComputedPropertyName) \
TYPE(JsExponentiation) \ TYPE(JsExponentiation) \
TYPE(JsExponentiationEqual) \ TYPE(JsExponentiationEqual) \
TYPE(JsPipePipeEqual) \ TYPE(JsPipePipeEqual) \
TYPE(JsPrivateIdentifier) \ TYPE(JsPrivateIdentifier) \
TYPE(JsTypeColon) \ TYPE(JsTypeColon) \
TYPE(JsTypeOperator) \ TYPE(JsTypeOperator) \
TYPE(JsTypeOptionalQuestion) \ TYPE(JsTypeOptionalQuestion) \
TYPE(JsAndAndEqual) \
TYPE(LambdaArrow) \ TYPE(LambdaArrow) \
TYPE(LambdaLBrace) \ TYPE(LambdaLBrace) \
TYPE(LambdaLSquare) \ TYPE(LambdaLSquare) \
TYPE(LeadingJavaAnnotation) \ TYPE(LeadingJavaAnnotation) \
TYPE(LineComment) \ TYPE(LineComment) \
TYPE(MacroBlockBegin) \ TYPE(MacroBlockBegin) \
TYPE(MacroBlockEnd) \ TYPE(MacroBlockEnd) \
TYPE(ModulePartitionColon) \ TYPE(ModulePartitionColon) \
TYPE(NamespaceMacro) \ TYPE(NamespaceMacro) \
TYPE(NonNullAssertion) \ TYPE(NonNullAssertion) \
TYPE(NullCoalescingEqual) \ TYPE(NullCoalescingEqual) \
TYPE(NullCoalescingOperator) \ TYPE(NullCoalescingOperator) \
TYPE(NullPropagatingOperator) \ TYPE(NullPropagatingOperator) \
TYPE(ObjCBlockLBrace) \ TYPE(ObjCBlockLBrace) \
TYPE(ObjCBlockLParen) \ TYPE(ObjCBlockLParen) \
TYPE(ObjCDecl) \ TYPE(ObjCDecl) \
TYPE(ObjCForIn) \ TYPE(ObjCForIn) \
TYPE(ObjCMethodExpr) \ TYPE(ObjCMethodExpr) \
TYPE(ObjCMethodSpecifier) \ TYPE(ObjCMethodSpecifier) \
TYPE(ObjCProperty) \ TYPE(ObjCProperty) \
TYPE(ObjCStringLiteral) \ TYPE(ObjCStringLiteral) \
TYPE(OverloadedOperator) \ TYPE(OverloadedOperator) \
TYPE(OverloadedOperatorLParen) \ TYPE(OverloadedOperatorLParen) \
TYPE(PointerOrReference) \ TYPE(PointerOrReference) \
TYPE(ProtoExtensionLSquare) \
TYPE(PureVirtualSpecifier) \ TYPE(PureVirtualSpecifier) \
TYPE(RangeBasedForLoopColon) \ TYPE(RangeBasedForLoopColon) \
TYPE(RecordLBrace) \ TYPE(RecordLBrace) \
TYPE(RegexLiteral) \ TYPE(RegexLiteral) \
TYPE(RequiresClause) \ TYPE(RequiresClause) \
TYPE(RequiresClauseInARequiresExpression) \ TYPE(RequiresClauseInARequiresExpression) \
TYPE(RequiresExpression) \ TYPE(RequiresExpression) \
TYPE(RequiresExpressionLBrace) \ TYPE(RequiresExpressionLBrace) \
TYPE(RequiresExpressionLParen) \ TYPE(RequiresExpressionLParen) \
TYPE(SelectorName) \ TYPE(SelectorName) \
TYPE(StartOfName) \ TYPE(StartOfName) \
TYPE(StatementAttributeLikeMacro) \ TYPE(StatementAttributeLikeMacro) \
TYPE(StatementMacro) \ TYPE(StatementMacro) \
TYPE(StructLBrace) \ TYPE(StructLBrace) \
TYPE(StructuredBindingLSquare) \ TYPE(StructuredBindingLSquare) \
TYPE(TemplateCloser) \ TYPE(TemplateCloser) \
TYPE(TemplateOpener) \ TYPE(TemplateOpener) \
TYPE(TemplateString) \ TYPE(TemplateString) \
TYPE(ProtoExtensionLSquare) \
TYPE(TrailingAnnotation) \ TYPE(TrailingAnnotation) \
TYPE(TrailingReturnArrow) \ TYPE(TrailingReturnArrow) \
TYPE(TrailingUnaryOperator) \ TYPE(TrailingUnaryOperator) \
TYPE(TypeDeclarationParen) \ TYPE(TypeDeclarationParen) \
TYPE(TypenameMacro) \ TYPE(TypenameMacro) \
TYPE(UnaryOperator) \ TYPE(UnaryOperator) \
TYPE(UnionLBrace) \ TYPE(UnionLBrace) \
TYPE(UntouchableMacroFunc) \ TYPE(UntouchableMacroFunc) \
TYPE(CSharpStringLiteral) \
TYPE(CSharpNamedArgumentColon) \
TYPE(CSharpNullable) \
TYPE(CSharpNullConditionalLSquare) \
TYPE(CSharpGenericTypeConstraint) \
TYPE(CSharpGenericTypeConstraintColon) \
TYPE(CSharpGenericTypeConstraintComma) \
TYPE(Unknown) TYPE(Unknown)
/// Determines the semantic type of a syntactic token, e.g. whether "<" is a /// Determines the semantic type of a syntactic token, e.g. whether "<" is a
/// template opener or binary operator. /// template opener or binary operator.
enum TokenType : uint8_t { enum TokenType : uint8_t {
#define TYPE(X) TT_##X, #define TYPE(X) TT_##X,
LIST_TOKEN_TYPES LIST_TOKEN_TYPES
#undef TYPE #undef TYPE
▲ Show 20 Lines • Show All 1,102 Lines • Show Last 20 Lines