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

Update parsing of availability attributes to preserve whether the micro component of a version tuple is missing

Browse Source 
Also added a test for the case when both micro and minor components are missing.


Swift SVN r21591
This commit is contained in:
Devin Coughlin
2014-08-29 20:59:40 +00:00
parent f06c1b54ef
commit d77d6bddd3
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Parse/ParseDecl.cpp
View File

@@ -723,7 +723,7 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
continue;
}
unsigned major = 0, minor = 0, micro = 0;
unsigned major = 0, minor = 0;
StringRef majorPart, minorPart;
std::tie(majorPart, minorPart) = Tok.getText().split('.');
if (majorPart.getAsInteger(10, major) ||
@@ -737,6 +737,7 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
consumeToken();
if (consumeIf(tok::period)) {
unsigned micro = 0;
if (!Tok.is(tok::integer_literal) ||
Tok.getText().getAsInteger(10, micro)) {
// Reject things like 0.1e5 and hex literals.
@@ -748,9 +749,11 @@ bool Parser::parseNewDeclAttribute(DeclAttributes &Attributes, SourceLoc AtLoc,
continue;
}
consumeToken();
VersionArg = clang::VersionTuple(major, minor, micro);
} else {
VersionArg = clang::VersionTuple(major, minor);
}
VersionArg = clang::VersionTuple(major, minor, micro);
break;
}