carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-06 10:54:49 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Update LLVM and switch to std::optional. (#2424)

Browse Source 
LLVM's bazel build has changed a bit, so this updates the tree for that.

LLVM is also moving `llvm::Optional` to match the standard API, but it seemed simpler to just switch to `std::optional`.

Co-authored-by: Jon Ross-Perkins <jperkins@google.com>
This commit is contained in:
Chandler Carruth
2022-12-01 09:22:43 -08:00
committed by GitHub
co-authored by Jon Ross-Perkins
parent 16bbdbbdb8
commit 94cf343b05
22 changed files with 85 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parser/precedence.cpp
+4 -4
View File
@@ -194,7 +194,7 @@ auto PrecedenceGroup::ForType() -> PrecedenceGroup {
}
auto PrecedenceGroup::ForLeading(TokenKind kind)
-> llvm::Optional<PrecedenceGroup> {
-> std::optional<PrecedenceGroup> {
switch (kind) {
case TokenKind::Star():
return PrecedenceGroup(TermPrefix);
@@ -211,12 +211,12 @@ auto PrecedenceGroup::ForLeading(TokenKind kind)
return PrecedenceGroup(BitwisePrefix);
default:
return llvm::None;
return std::nullopt;
}
}
auto PrecedenceGroup::ForTrailing(TokenKind kind, bool infix)
-> llvm::Optional<Trailing> {
-> std::optional<Trailing> {
switch (kind) {
// Assignment operators.
case TokenKind::Equal():
@@ -311,7 +311,7 @@ auto PrecedenceGroup::ForTrailing(TokenKind kind, bool infix)
break;
}
return llvm::None;
return std::nullopt;
}
auto PrecedenceGroup::GetPriority(PrecedenceGroup left, PrecedenceGroup right)