diff options
Diffstat (limited to 'llvm/unittests/Support/SourceMgrTest.cpp')
| -rw-r--r-- | llvm/unittests/Support/SourceMgrTest.cpp | 116 |
1 files changed, 76 insertions, 40 deletions
diff --git a/llvm/unittests/Support/SourceMgrTest.cpp b/llvm/unittests/Support/SourceMgrTest.cpp index a3079a4..1cce649 100644 --- a/llvm/unittests/Support/SourceMgrTest.cpp +++ b/llvm/unittests/Support/SourceMgrTest.cpp @@ -48,7 +48,8 @@ public: TEST_F(SourceMgrTest, BasicError) { setMainBuffer("aaa bbb\nccc ddd\n", "file.in"); - printMessage(getLoc(4), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(4), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:1:5: error: message\n" "aaa bbb\n" @@ -58,7 +59,8 @@ TEST_F(SourceMgrTest, BasicError) { TEST_F(SourceMgrTest, BasicWarning) { setMainBuffer("aaa bbb\nccc ddd\n", "file.in"); - printMessage(getLoc(4), SourceMgr::DK_Warning, "message", None, None); + printMessage(getLoc(4), SourceMgr::DK_Warning, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:1:5: warning: message\n" "aaa bbb\n" @@ -68,7 +70,8 @@ TEST_F(SourceMgrTest, BasicWarning) { TEST_F(SourceMgrTest, BasicRemark) { setMainBuffer("aaa bbb\nccc ddd\n", "file.in"); - printMessage(getLoc(4), SourceMgr::DK_Remark, "message", None, None); + printMessage(getLoc(4), SourceMgr::DK_Remark, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:1:5: remark: message\n" "aaa bbb\n" @@ -78,7 +81,8 @@ TEST_F(SourceMgrTest, BasicRemark) { TEST_F(SourceMgrTest, BasicNote) { setMainBuffer("aaa bbb\nccc ddd\n", "file.in"); - printMessage(getLoc(4), SourceMgr::DK_Note, "message", None, None); + printMessage(getLoc(4), SourceMgr::DK_Note, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:1:5: note: message\n" "aaa bbb\n" @@ -88,7 +92,8 @@ TEST_F(SourceMgrTest, BasicNote) { TEST_F(SourceMgrTest, LocationAtEndOfLine) { setMainBuffer("aaa bbb\nccc ddd\n", "file.in"); - printMessage(getLoc(6), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(6), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:1:7: error: message\n" "aaa bbb\n" @@ -98,7 +103,8 @@ TEST_F(SourceMgrTest, LocationAtEndOfLine) { TEST_F(SourceMgrTest, LocationAtNewline) { setMainBuffer("aaa bbb\nccc ddd\n", "file.in"); - printMessage(getLoc(7), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(7), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:1:8: error: message\n" "aaa bbb\n" @@ -108,7 +114,8 @@ TEST_F(SourceMgrTest, LocationAtNewline) { TEST_F(SourceMgrTest, LocationAtEmptyBuffer) { setMainBuffer("", "file.in"); - printMessage(getLoc(0), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(0), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:1:1: error: message\n" "\n" @@ -118,7 +125,8 @@ TEST_F(SourceMgrTest, LocationAtEmptyBuffer) { TEST_F(SourceMgrTest, LocationJustOnSoleNewline) { setMainBuffer("\n", "file.in"); - printMessage(getLoc(0), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(0), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:1:1: error: message\n" "\n" @@ -128,7 +136,8 @@ TEST_F(SourceMgrTest, LocationJustOnSoleNewline) { TEST_F(SourceMgrTest, LocationJustAfterSoleNewline) { setMainBuffer("\n", "file.in"); - printMessage(getLoc(1), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(1), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:2:1: error: message\n" "\n" @@ -138,7 +147,8 @@ TEST_F(SourceMgrTest, LocationJustAfterSoleNewline) { TEST_F(SourceMgrTest, LocationJustAfterNonNewline) { setMainBuffer("123", "file.in"); - printMessage(getLoc(3), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(3), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:1:4: error: message\n" "123\n" @@ -148,7 +158,8 @@ TEST_F(SourceMgrTest, LocationJustAfterNonNewline) { TEST_F(SourceMgrTest, LocationOnFirstLineOfMultiline) { setMainBuffer("1234\n6789\n", "file.in"); - printMessage(getLoc(3), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(3), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:1:4: error: message\n" "1234\n" @@ -158,7 +169,8 @@ TEST_F(SourceMgrTest, LocationOnFirstLineOfMultiline) { TEST_F(SourceMgrTest, LocationOnEOLOfFirstLineOfMultiline) { setMainBuffer("1234\n6789\n", "file.in"); - printMessage(getLoc(4), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(4), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:1:5: error: message\n" "1234\n" @@ -168,7 +180,8 @@ TEST_F(SourceMgrTest, LocationOnEOLOfFirstLineOfMultiline) { TEST_F(SourceMgrTest, LocationOnSecondLineOfMultiline) { setMainBuffer("1234\n6789\n", "file.in"); - printMessage(getLoc(5), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(5), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:2:1: error: message\n" "6789\n" @@ -178,7 +191,8 @@ TEST_F(SourceMgrTest, LocationOnSecondLineOfMultiline) { TEST_F(SourceMgrTest, LocationOnSecondLineOfMultilineNoSecondEOL) { setMainBuffer("1234\n6789", "file.in"); - printMessage(getLoc(5), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(5), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:2:1: error: message\n" "6789\n" @@ -188,7 +202,8 @@ TEST_F(SourceMgrTest, LocationOnSecondLineOfMultilineNoSecondEOL) { TEST_F(SourceMgrTest, LocationOnEOLOfSecondSecondLineOfMultiline) { setMainBuffer("1234\n6789\n", "file.in"); - printMessage(getLoc(9), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(9), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:2:5: error: message\n" "6789\n" @@ -218,7 +233,8 @@ TEST_F(SourceMgrTest, LocationBeforeEndOf255ByteBuffer) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "12" // + 2 = 255 bytes , "file.in"); - printMessage(getLoc(253), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(253), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:24:1: error: message\n" "12\n" "^\n", @@ -229,7 +245,8 @@ TEST_F(SourceMgrTest, LocationAtEndOf255ByteBuffer) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "12" // + 2 = 255 bytes , "file.in"); - printMessage(getLoc(254), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(254), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:24:2: error: message\n" "12\n" " ^\n", @@ -240,7 +257,8 @@ TEST_F(SourceMgrTest, LocationPastEndOf255ByteBuffer) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "12" // + 2 = 255 bytes , "file.in"); - printMessage(getLoc(255), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(255), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:24:3: error: message\n" "12\n" " ^\n", @@ -251,7 +269,8 @@ TEST_F(SourceMgrTest, LocationBeforeEndOf255ByteBufferEndingInNewline) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "1\n" // + 2 = 255 bytes , "file.in"); - printMessage(getLoc(253), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(253), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:24:1: error: message\n" "1\n" "^\n", @@ -262,7 +281,8 @@ TEST_F(SourceMgrTest, LocationAtEndOf255ByteBufferEndingInNewline) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "1\n" // + 2 = 255 bytes , "file.in"); - printMessage(getLoc(254), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(254), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:24:2: error: message\n" "1\n" " ^\n", @@ -273,7 +293,8 @@ TEST_F(SourceMgrTest, LocationPastEndOf255ByteBufferEndingInNewline) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "1\n" // + 2 = 255 bytes , "file.in"); - printMessage(getLoc(255), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(255), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:25:1: error: message\n" "\n" "^\n", @@ -288,7 +309,8 @@ TEST_F(SourceMgrTest, LocationBeforeEndOf256ByteBuffer) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "123" // + 3 = 256 bytes , "file.in"); - printMessage(getLoc(254), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(254), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:24:2: error: message\n" "123\n" " ^\n", @@ -299,7 +321,8 @@ TEST_F(SourceMgrTest, LocationAtEndOf256ByteBuffer) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "123" // + 3 = 256 bytes , "file.in"); - printMessage(getLoc(255), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(255), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:24:3: error: message\n" "123\n" " ^\n", @@ -310,7 +333,8 @@ TEST_F(SourceMgrTest, LocationPastEndOf256ByteBuffer) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "123" // + 3 = 256 bytes , "file.in"); - printMessage(getLoc(256), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(256), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:24:4: error: message\n" "123\n" " ^\n", @@ -321,7 +345,8 @@ TEST_F(SourceMgrTest, LocationBeforeEndOf256ByteBufferEndingInNewline) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "12\n" // + 3 = 256 bytes , "file.in"); - printMessage(getLoc(254), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(254), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:24:2: error: message\n" "12\n" " ^\n", @@ -332,7 +357,8 @@ TEST_F(SourceMgrTest, LocationAtEndOf256ByteBufferEndingInNewline) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "12\n" // + 3 = 256 bytes , "file.in"); - printMessage(getLoc(255), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(255), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:24:3: error: message\n" "12\n" " ^\n", @@ -343,7 +369,8 @@ TEST_F(SourceMgrTest, LocationPastEndOf256ByteBufferEndingInNewline) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "12\n" // + 3 = 256 bytes , "file.in"); - printMessage(getLoc(256), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(256), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:25:1: error: message\n" "\n" "^\n", @@ -358,7 +385,8 @@ TEST_F(SourceMgrTest, LocationBeforeEndOf257ByteBuffer) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "1234" // + 4 = 257 bytes , "file.in"); - printMessage(getLoc(255), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(255), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:24:3: error: message\n" "1234\n" " ^\n", @@ -369,7 +397,8 @@ TEST_F(SourceMgrTest, LocationAtEndOf257ByteBuffer) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "1234" // + 4 = 257 bytes , "file.in"); - printMessage(getLoc(256), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(256), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:24:4: error: message\n" "1234\n" " ^\n", @@ -380,7 +409,8 @@ TEST_F(SourceMgrTest, LocationPastEndOf257ByteBuffer) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "1234" // + 4 = 257 bytes , "file.in"); - printMessage(getLoc(257), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(257), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:24:5: error: message\n" "1234\n" " ^\n", @@ -391,7 +421,8 @@ TEST_F(SourceMgrTest, LocationBeforeEndOf257ByteBufferEndingInNewline) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "123\n" // + 4 = 257 bytes , "file.in"); - printMessage(getLoc(255), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(255), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:24:3: error: message\n" "123\n" " ^\n", @@ -402,7 +433,8 @@ TEST_F(SourceMgrTest, LocationAtEndOf257ByteBufferEndingInNewline) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "123\n" // + 4 = 257 bytes , "file.in"); - printMessage(getLoc(256), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(256), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:24:4: error: message\n" "123\n" " ^\n", @@ -413,7 +445,8 @@ TEST_F(SourceMgrTest, LocationPastEndOf257ByteBufferEndingInNewline) { setMainBuffer(STRING_LITERAL_253_BYTES // first 253 bytes "123\n" // + 4 = 257 bytes , "file.in"); - printMessage(getLoc(257), SourceMgr::DK_Error, "message", None, None); + printMessage(getLoc(257), SourceMgr::DK_Error, "message", std::nullopt, + std::nullopt); EXPECT_EQ("file.in:25:1: error: message\n" "\n" "^\n", @@ -422,7 +455,8 @@ TEST_F(SourceMgrTest, LocationPastEndOf257ByteBufferEndingInNewline) { TEST_F(SourceMgrTest, BasicRange) { setMainBuffer("aaa bbb\nccc ddd\n", "file.in"); - printMessage(getLoc(4), SourceMgr::DK_Error, "message", getRange(4, 3), None); + printMessage(getLoc(4), SourceMgr::DK_Error, "message", getRange(4, 3), + std::nullopt); EXPECT_EQ("file.in:1:5: error: message\n" "aaa bbb\n" @@ -432,7 +466,8 @@ TEST_F(SourceMgrTest, BasicRange) { TEST_F(SourceMgrTest, RangeWithTab) { setMainBuffer("aaa\tbbb\nccc ddd\n", "file.in"); - printMessage(getLoc(4), SourceMgr::DK_Error, "message", getRange(3, 3), None); + printMessage(getLoc(4), SourceMgr::DK_Error, "message", getRange(3, 3), + std::nullopt); EXPECT_EQ("file.in:1:5: error: message\n" "aaa bbb\n" @@ -442,7 +477,8 @@ TEST_F(SourceMgrTest, RangeWithTab) { TEST_F(SourceMgrTest, MultiLineRange) { setMainBuffer("aaa bbb\nccc ddd\n", "file.in"); - printMessage(getLoc(4), SourceMgr::DK_Error, "message", getRange(4, 7), None); + printMessage(getLoc(4), SourceMgr::DK_Error, "message", getRange(4, 7), + std::nullopt); EXPECT_EQ("file.in:1:5: error: message\n" "aaa bbb\n" @@ -453,7 +489,7 @@ TEST_F(SourceMgrTest, MultiLineRange) { TEST_F(SourceMgrTest, MultipleRanges) { setMainBuffer("aaa bbb\nccc ddd\n", "file.in"); SMRange Ranges[] = { getRange(0, 3), getRange(4, 3) }; - printMessage(getLoc(4), SourceMgr::DK_Error, "message", Ranges, None); + printMessage(getLoc(4), SourceMgr::DK_Error, "message", Ranges, std::nullopt); EXPECT_EQ("file.in:1:5: error: message\n" "aaa bbb\n" @@ -464,7 +500,7 @@ TEST_F(SourceMgrTest, MultipleRanges) { TEST_F(SourceMgrTest, OverlappingRanges) { setMainBuffer("aaa bbb\nccc ddd\n", "file.in"); SMRange Ranges[] = { getRange(0, 3), getRange(2, 4) }; - printMessage(getLoc(4), SourceMgr::DK_Error, "message", Ranges, None); + printMessage(getLoc(4), SourceMgr::DK_Error, "message", Ranges, std::nullopt); EXPECT_EQ("file.in:1:5: error: message\n" "aaa bbb\n" @@ -474,7 +510,7 @@ TEST_F(SourceMgrTest, OverlappingRanges) { TEST_F(SourceMgrTest, BasicFixit) { setMainBuffer("aaa bbb\nccc ddd\n", "file.in"); - printMessage(getLoc(4), SourceMgr::DK_Error, "message", None, + printMessage(getLoc(4), SourceMgr::DK_Error, "message", std::nullopt, makeArrayRef(SMFixIt(getRange(4, 3), "zzz"))); EXPECT_EQ("file.in:1:5: error: message\n" @@ -486,7 +522,7 @@ TEST_F(SourceMgrTest, BasicFixit) { TEST_F(SourceMgrTest, FixitForTab) { setMainBuffer("aaa\tbbb\nccc ddd\n", "file.in"); - printMessage(getLoc(3), SourceMgr::DK_Error, "message", None, + printMessage(getLoc(3), SourceMgr::DK_Error, "message", std::nullopt, makeArrayRef(SMFixIt(getRange(3, 1), "zzz"))); EXPECT_EQ("file.in:1:4: error: message\n" |