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

Support for base: T;, .base, x.base. (#3450)

Browse Source 
No support for `extend base` yet, in an effort to minimize collisions
with #3412.
This commit is contained in:
Richard Smith
2023-12-04 22:45:59 +00:00
committed by GitHub
parent 30155dbb72
commit 7dffa0c7ec
34 changed files with 1088 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/file_test/file_test_base.cpp
+1 -1
View File
@@ -278,7 +278,7 @@ static auto TryConsumeConflictMarker(llvm::StringRef line,
bool* inside_conflict_marker)
-> ErrorOr<bool> {
bool is_start = line.starts_with("<<<<<<<");
bool is_middle = line.starts_with("=======");
bool is_middle = line.starts_with("=======") || line.starts_with("|||||||");
bool is_end = line.starts_with(">>>>>>>");
// When running the test, any conflict marker is an error.