RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:27:45 +00:00
Code Issues Activity Actions

Coding style fixes.

Browse source
This commit is contained in:
Andreas Kling 2018-12-04 01:41:14 +01:00
parent 476df3b6f7
commit 51092c5b9d
4 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Editor/.gitignore vendored
View file

@ -1,2 +1,3 @@
*.o *.o
cuki cuki
log

2
Editor/FileReader.cpp
View file

@ -21,7 +21,7 @@ bool FileReader::can_read() const
std::string FileReader::read_line() std::string FileReader::read_line()
{ {
if (!m_file) { if (!m_file) {
fprintf(stderr, "Error: FileReader::readLine() called on invalid FileReader for '%s'\n", m_path.c_str()); fprintf(stderr, "Error: FileReader::read_line() called on invalid FileReader for '%s'\n", m_path.c_str());
return std::string(); return std::string();
} }

34
Editor/Line.cpp
View file

@ -53,35 +53,35 @@ void Line::insert(size_t index, const std::string& text)
return; return;
} }
auto chunkAddress = chunkIndexForPosition(index); auto chunk_address = chunk_index_for_position(index);
auto chunkIndex = std::get<0>(chunkAddress); auto chunk_index = std::get<0>(chunk_address);
auto& chunk = m_chunks[chunkIndex]; auto& chunk = m_chunks[chunk_index];
auto indexInChunk = std::get<1>(chunkAddress); auto index_in_chunk = std::get<1>(chunk_address);
static FILE* f = fopen("log", "a"); static FILE* f = fopen("log", "a");
fprintf(f, "#Column:%zu, Chunk:%zu, Index:%zu\n", index, chunkIndex, indexInChunk); fprintf(f, "#Column:%zu, Chunk:%zu, Index:%zu\n", index, chunk_index, index_in_chunk);
auto leftString = chunk.data().substr(0, indexInChunk); auto left_string = chunk.data().substr(0, index_in_chunk);
auto rightString = chunk.data().substr(indexInChunk, chunk.length() - indexInChunk); auto right_string = chunk.data().substr(index_in_chunk, chunk.length() - index_in_chunk);
fprintf(f, "#{\"%s\", \"%s\", \"%s\"}\n", leftString.c_str(), text.c_str(), rightString.c_str()); fprintf(f, "#{\"%s\", \"%s\", \"%s\"}\n", left_string.c_str(), text.c_str(), right_string.c_str());
fflush(f); fflush(f);
Chunk leftChunk { leftString }; Chunk left_chunk { left_string };
Chunk midChunk { text }; Chunk mid_chunk { text };
Chunk rightChunk { rightString }; Chunk right_chunk { right_string };
auto iterator = m_chunks.begin() + chunkIndex; auto iterator = m_chunks.begin() + chunk_index;
m_chunks.erase(iterator); m_chunks.erase(iterator);
iterator = m_chunks.begin() + chunkIndex; iterator = m_chunks.begin() + chunk_index;
// Note reverse insertion order! // Note reverse insertion order!
m_chunks.insert(iterator, rightChunk); m_chunks.insert(iterator, right_chunk);
m_chunks.insert(iterator, midChunk); m_chunks.insert(iterator, mid_chunk);
m_chunks.insert(iterator, leftChunk); m_chunks.insert(iterator, left_chunk);
} }
std::tuple<size_t, size_t> Line::chunkIndexForPosition(size_t position) std::tuple<size_t, size_t> Line::chunk_index_for_position(size_t position)
{ {
ASSERT(position < length()); ASSERT(position < length());
size_t seen { 0 }; size_t seen { 0 };

2
Editor/Line.h
View file

@ -34,7 +34,7 @@ private:
void append(const std::string&); void append(const std::string&);
void prepend(const std::string&); void prepend(const std::string&);
std::tuple<size_t, size_t> chunkIndexForPosition(size_t); std::tuple<size_t, size_t> chunk_index_for_position(size_t);
std::deque<Chunk> m_chunks; std::deque<Chunk> m_chunks;
}; };