happyz
/
llama.cpp
mirror of https://github.com/ggerganov/llama.cpp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

snake_case everywhere

This commit is contained in:
Xuan Son Nguyen 2026-03-19 23:16:10 +01:00
parent 718bfb0777
commit 6aba54e7d7
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/server/server-tools.cpp
View File

@ -539,8 +539,8 @@ struct server_tool_edit_file : server_tool {
"Each change targets a 1-based inclusive line range and has a mode: " "Each change targets a 1-based inclusive line range and has a mode: "
"\"replace\" (replace lines with content), " "\"replace\" (replace lines with content), "
"\"delete\" (remove lines, content must be empty string), " "\"delete\" (remove lines, content must be empty string), "
"\"append\" (insert content after lineEnd). " "\"append\" (insert content after line_end). "
"Set lineStart to -1 to target the end of file (lineEnd is ignored in that case). " "Set line_start to -1 to target the end of file (line_end is ignored in that case). "
"Changes must not overlap. They are applied in reverse line order automatically."}, "Changes must not overlap. They are applied in reverse line order automatically."},
{"parameters", { {"parameters", {
{"type", "object"}, {"type", "object"},
@ -552,12 +552,12 @@ struct server_tool_edit_file : server_tool {
{"items", { {"items", {
{"type", "object"}, {"type", "object"},
{"properties", { {"properties", {
{"mode", {{"type", "string"}, {"description", "\"replace\", \"delete\", or \"append\""}}}, {"mode", {{"type", "string"}, {"description", "\"replace\", \"delete\", or \"append\""}}},
{"lineStart", {{"type", "integer"}, {"description", "First line of the range (1-based); use -1 for end of file"}}}, {"line_start", {{"type", "integer"}, {"description", "First line of the range (1-based); use -1 for end of file"}}},
{"lineEnd", {{"type", "integer"}, {"description", "Last line of the range (1-based, inclusive); ignored when lineStart is -1"}}}, {"line_end", {{"type", "integer"}, {"description", "Last line of the range (1-based, inclusive); ignored when line_start is -1"}}},
{"content", {{"type", "string"}, {"description", "Content to insert; must be empty string for delete mode"}}}, {"content", {{"type", "string"}, {"description", "Content to insert; must be empty string for delete mode"}}},
}}, }},
{"required", json::array({"mode", "lineStart", "lineEnd", "content"})}, {"required", json::array({"mode", "line_start", "line_end", "content"})},
}}, }},
}}, }},
}}, }},
@ -589,7 +589,7 @@ struct server_tool_edit_file : server_tool {
} }
fin.close(); fin.close();
// validate and collect changes, then sort descending by lineStart // validate and collect changes, then sort descending by line_start
struct change_entry { struct change_entry {
std::string mode; std::string mode;
int line_start; // 1-based int line_start; // 1-based
@ -602,8 +602,8 @@ struct server_tool_edit_file : server_tool {
for (const auto & ch : changes) { for (const auto & ch : changes) {
change_entry e; change_entry e;
e.mode = ch.at("mode").get<std::string>(); e.mode = ch.at("mode").get<std::string>();
e.line_start = ch.at("lineStart").get<int>(); e.line_start = ch.at("line_start").get<int>();
e.line_end = ch.at("lineEnd").get<int>(); e.line_end = ch.at("line_end").get<int>();
e.content = ch.at("content").get<std::string>(); e.content = ch.at("content").get<std::string>();
if (e.mode != "replace" && e.mode != "delete" && e.mode != "append") { if (e.mode != "replace" && e.mode != "delete" && e.mode != "append") {
@ -614,7 +614,7 @@ struct server_tool_edit_file : server_tool {
} }
int n = (int) lines.size(); int n = (int) lines.size();
if (e.line_start == -1) { if (e.line_start == -1) {
// -1 means end of file; lineEnd is ignored — normalize to point past last line // -1 means end of file; line_end is ignored — normalize to point past last line
e.line_start = n + 1; e.line_start = n + 1;
e.line_end = n + 1; e.line_end = n + 1;
} else { } else {
@ -622,7 +622,7 @@ struct server_tool_edit_file : server_tool {
return {{"error", string_format("invalid line range [%d, %d]", e.line_start, e.line_end)}}; return {{"error", string_format("invalid line range [%d, %d]", e.line_start, e.line_end)}};
} }
if (e.line_end > n) { if (e.line_end > n) {
return {{"error", string_format("lineEnd %d exceeds file length %d", e.line_end, n)}}; return {{"error", string_format("line_end %d exceeds file length %d", e.line_end, n)}};
} }
} }
entries.push_back(std::move(e)); entries.push_back(std::move(e));
@ -657,7 +657,7 @@ struct server_tool_edit_file : server_tool {
} else if (e.mode == "delete") { } else if (e.mode == "delete") {
lines.erase(lines.begin() + idx_start, lines.begin() + idx_end + 1); lines.erase(lines.begin() + idx_start, lines.begin() + idx_end + 1);
} else { // append } else { // append
// idx_end + 1 may equal lines.size() when lineStart == -1 (end of file) // idx_end + 1 may equal lines.size() when line_start == -1 (end of file)
lines.insert(lines.begin() + idx_end + 1, new_lines.begin(), new_lines.end()); lines.insert(lines.begin() + idx_end + 1, new_lines.begin(), new_lines.end());
} }
} }