jyapayne/cppast
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use #line directive to enforce matching line numbers

Browse source 
clang preprocessing output is different on Windows for some reason...
This commit is contained in:
Jonathan Müller 2017-10-10 22:07:36 +02:00
commit 845ef61017
2 changed files with 8 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libclang/parse_functions.cpp
View file

@ -80,7 +80,7 @@ void detail::comment_context::match(cpp_entity& e, const CXCursor& cur) const
{ {
auto pos = clang_getRangeStart(clang_getCursorExtent(cur)); auto pos = clang_getRangeStart(clang_getCursorExtent(cur));
unsigned line; unsigned line;
clang_getSpellingLocation(pos, nullptr, &line, nullptr, nullptr); clang_getPresumedLocation(pos, nullptr, &line, nullptr);
match(e, line); match(e, line);
} }

40
src/libclang/preprocessor.cpp
View file

@ -196,14 +196,10 @@ namespace
{ {
} }
void undo_write() void set_line(unsigned line)
{ {
if (write_ == true && !result_->empty()) *result_ += "#line " + std::to_string(line) + "\n";
{ cur_line_ = line;
if (result_->back() == '\n')
--cur_line_;
result_->pop_back();
}
} }
void write_str(std::string str) void write_str(std::string str)
@ -752,17 +748,8 @@ detail::preprocessor_output detail::preprocess(const libclang_compile_config& co
switch (lm.value().flag) switch (lm.value().flag)
{ {
case linemarker::line_directive: case linemarker::line_directive:
if (file_depth == 0u && lm.value().line > p.cur_line()) if (file_depth == 0u)
{ p.set_line(lm.value().line);
// write the necessary newlines
p.write_str(std::string(lm.value().line - p.cur_line(), '\n'));
DEBUG_ASSERT(p.cur_line() == lm.value().line, detail::assert_handler{});
}
else if (file_depth == 0u)
// current line may be one higher than the expected line,
// because the include directives inserted by -dI have an additional newline
// that is not yet removed
DEBUG_ASSERT(p.cur_line() - lm.value().line <= 1u, detail::assert_handler{});
break; break;
case linemarker::enter_new: case linemarker::enter_new:
@ -771,11 +758,7 @@ detail::preprocessor_output detail::preprocess(const libclang_compile_config& co
// this file is directly included by the given file // this file is directly included by the given file
// and it is not a fake file like builtin or command line // and it is not a fake file like builtin or command line
// remove the trailing newline from the include that brought us here // write include with full path
DEBUG_ASSERT(p.was_newl(), detail::assert_handler{});
p.undo_write();
// and write include with full path
p.write_str("#include \"" + lm.value().file + "\"\n"); p.write_str("#include \"" + lm.value().file + "\"\n");
// note: don't build include here, do it when an #include is encountered // note: don't build include here, do it when an #include is encountered
} }
@ -789,16 +772,7 @@ detail::preprocessor_output detail::preprocess(const libclang_compile_config& co
if (file_depth == 0u) if (file_depth == 0u)
{ {
DEBUG_ASSERT(lm.value().file == path, detail::assert_handler{}); DEBUG_ASSERT(lm.value().file == path, detail::assert_handler{});
p.set_line(lm.value().line);
if (lm.value().line > p.cur_line())
// might happen in weird cases
p.write_str(std::string(lm.value().line - p.cur_line(), '\n'));
else
// difference is 1 if coming from an included file (because newline of include is already written)
// difference is 0 if coming from a builtin file (because no include has been written)
DEBUG_ASSERT(p.cur_line() - lm.value().line <= 1u,
detail::assert_handler{});
p.enable_write(); p.enable_write();
} }
break; break;