Skip to content

whitespace and typo #104

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.

Sign up for GitHub

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
lattner merged 3 commits into from
Dec 3, 2015
Merged

whitespace and typo #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9575bfa
whitespace
rogergzou Dec 3, 2015
fbbc25a
whitespace and capitalization for TODO's
rogergzou Dec 3, 2015
c8b942b
whitespace
rogergzou Dec 3, 2015
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
2 changes: 1 addition & 1 deletion lib/AST/ASTContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1595,7 +1595,7 @@ ASTContext::takeDelayedConformanceDiags(NormalProtocolConformance *conformance){

size_t ASTContext::getTotalMemory() const {
size_t Size = sizeof(*this) +
//LoadedModules ?
// LoadedModules ?
// ExternalDefinitions ?
llvm::capacity_in_bytes(CanonicalGenericTypeParamTypeNames) +
// RemappedTypes ?
Expand Down
4 changes: 2 additions & 2 deletions lib/Serialization/Deserialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3643,7 +3643,7 @@ Type ModuleFile::getType(TypeID TID) {
bool noreturn = false;
bool throws = false;

//todo add noreturn serialization.
// TODO: add noreturn serialization.
decls_block::PolymorphicFunctionTypeLayout::readRecord(scratch,
inputID,
resultID,
Expand Down Expand Up @@ -3679,7 +3679,7 @@ Type ModuleFile::getType(TypeID TID) {
bool throws = false;
ArrayRef<uint64_t> genericParamIDs;

//todo add noreturn serialization.
// TODO: add noreturn serialization.
decls_block::GenericFunctionTypeLayout::readRecord(scratch,
inputID,
resultID,
Expand Down
8 changes: 4 additions & 4 deletions test/Inputs/comment_to_something_conversion.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,15 @@ enum A012_AttachToEntities {
func f1() {}
// CHECK: {{.*}}DocCommentAsXML=[<Function file="{{.*}}" line="{{.*}}" column="{{.*}}"><Name>f1()</Name><USR>s:FC14swift_ide_test5Brief2f1FT_T_</USR><Declaration>func f1()</Declaration><Abstract><Para>Aaa.</Para></Abstract><Discussion><Para>Bbb.</Para></Discussion></Function>]

///Aaa.
/// Aaa.
///
///> Bbb.
/// Bbb.
Copy link

@thanegill thanegill Dec 3, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I belive these are test comments for the parser. Changes in this file should be reverted.

func f2() {}
// CHECK: {{.*}}DocCommentAsXML=[<Function file="{{.*}}" line="{{.*}}" column="{{.*}}"><Name>f2()</Name><USR>s:FC14swift_ide_test5Brief2f2FT_T_</USR><Declaration>func f2()</Declaration><Abstract><Para>Aaa.</Para></Abstract><Discussion><Para>Bbb.</Para></Discussion></Function>]

///Aaa.
/// Aaa.
///
///Bbb.
/// Bbb.
func f3() {}
// CHECK: {{.*}}DocCommentAsXML=[<Function file="{{.*}}" line="{{.*}}" column="{{.*}}"><Name>f3()</Name><USR>s:FC14swift_ide_test5Brief2f3FT_T_</USR><Declaration>func f3()</Declaration><Abstract><Para>Aaa.</Para></Abstract><Discussion><Para>Bbb.</Para></Discussion></Function>]
}
Expand Down