Compare commits
9
Commits
main
...
cd9583ec34
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cd9583ec34
|
||
|
|
0104f96d51
|
||
|
|
abbfcc352a
|
||
|
|
f8975a60d8
|
||
|
|
33dc9ad507
|
||
|
|
956bdd6039
|
||
|
|
151817973f
|
||
|
|
25f4d8efa8
|
||
|
|
569b69263a
|
+1
-1
@@ -18,7 +18,7 @@ struct BEd {
|
|||||||
internal::functions::Function eof_op;
|
internal::functions::Function eof_op;
|
||||||
std::array<std::optional<internal::functions::Suffix>, 26> suffixes;
|
std::array<std::optional<internal::functions::Suffix>, 26> suffixes;
|
||||||
internal::theme::Theme theme;
|
internal::theme::Theme theme;
|
||||||
std::unordered_map<std::string, internal::syntax::Language> languages;
|
std::unordered_map<std::string, internal::syntax::Language *> languages;
|
||||||
internal::io::IO &io;
|
internal::io::IO &io;
|
||||||
internal::vase::AppendStorage append{"/tmp"};
|
internal::vase::AppendStorage append{"/tmp"};
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "clip.h"
|
#include "./types/clip.h"
|
||||||
|
#include "./types/generic.h"
|
||||||
#include "decl.h"
|
#include "decl.h"
|
||||||
#include "generic.h"
|
|
||||||
#include "pch.h"
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ namespace bed::internal::buffer {
|
|||||||
struct Buffer {
|
struct Buffer {
|
||||||
enum struct Kind : uint8_t {
|
enum struct Kind : uint8_t {
|
||||||
Generic,
|
Generic,
|
||||||
Null,
|
History,
|
||||||
Clip,
|
Clip,
|
||||||
Cancel,
|
Cancel,
|
||||||
Shell,
|
Shell,
|
||||||
@@ -26,7 +26,7 @@ struct Buffer {
|
|||||||
std::string name;
|
std::string name;
|
||||||
|
|
||||||
explicit Buffer(std::string name, Kind kind)
|
explicit Buffer(std::string name, Kind kind)
|
||||||
: kind(kind), state(Unmodified), name(name) {};
|
: kind(kind), state(Unmodified), name(std::move(name)) {};
|
||||||
virtual ~Buffer() = default;
|
virtual ~Buffer() = default;
|
||||||
|
|
||||||
virtual bool waste() = 0;
|
virtual bool waste() = 0;
|
||||||
@@ -43,6 +43,7 @@ struct Buffer {
|
|||||||
virtual void join(BEd &ctx, uint64_t start_line, uint64_t end_line) = 0;
|
virtual void join(BEd &ctx, uint64_t start_line, uint64_t end_line) = 0;
|
||||||
virtual void remove(BEd &ctx, uint64_t start_line, uint64_t end_line) = 0;
|
virtual void remove(BEd &ctx, uint64_t start_line, uint64_t end_line) = 0;
|
||||||
virtual void append(BEd &ctx, vase::Shard *text, uint64_t line) = 0;
|
virtual void append(BEd &ctx, vase::Shard *text, uint64_t line) = 0;
|
||||||
|
virtual void replace(BEd &ctx, vase::Shard *text, uint64_t start_line, uint64_t end_line) = 0;
|
||||||
virtual void print(BEd &ctx, uint64_t start_line, uint64_t end_line) = 0;
|
virtual void print(BEd &ctx, uint64_t start_line, uint64_t end_line) = 0;
|
||||||
virtual void number_print(BEd &ctx, uint64_t start_line, uint64_t end_line) = 0;
|
virtual void number_print(BEd &ctx, uint64_t start_line, uint64_t end_line) = 0;
|
||||||
virtual void list_print(BEd &ctx, uint64_t start_line, uint64_t end_line) = 0;
|
virtual void list_print(BEd &ctx, uint64_t start_line, uint64_t end_line) = 0;
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
#include "decl.h"
|
|
||||||
#include "pch.h"
|
|
||||||
|
|
||||||
namespace bed::internal::buffer {
|
|
||||||
struct GenericBuffer : Buffer {
|
|
||||||
vase::Shard *root;
|
|
||||||
std::filesystem::path save_path{};
|
|
||||||
std::string language{};
|
|
||||||
std::optional<syntax::Parser> parser{};
|
|
||||||
|
|
||||||
GenericBuffer(std::string name)
|
|
||||||
: Buffer(name, Kind::Generic), root(nullptr) {};
|
|
||||||
~GenericBuffer();
|
|
||||||
|
|
||||||
bool waste() override;
|
|
||||||
uint64_t lines() override;
|
|
||||||
uint64_t bytes() override;
|
|
||||||
void load(BEd &ctx, vase::Shard *text) override;
|
|
||||||
void set_filename(std::filesystem::path path) override;
|
|
||||||
std::filesystem::path filename() override;
|
|
||||||
vase::Shard *copy(uint64_t start_line, uint64_t end_line) override;
|
|
||||||
void substitute(
|
|
||||||
BEd &ctx, uint64_t start_line, uint64_t end_line,
|
|
||||||
std::string ®ex, std::string &replacement, std::string &options
|
|
||||||
) override;
|
|
||||||
void join(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
|
||||||
void remove(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
|
||||||
void append(BEd &ctx, vase::Shard *text, uint64_t line) override;
|
|
||||||
void print(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
|
||||||
void number_print(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
|
||||||
void list_print(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
|
||||||
uint64_t next_closing(uint64_t start) override;
|
|
||||||
uint64_t prev_closing(uint64_t start) override;
|
|
||||||
uint64_t find_next(std::string_view pattern, uint64_t start) override;
|
|
||||||
uint64_t find_prev(std::string_view pattern, uint64_t start) override;
|
|
||||||
};
|
|
||||||
} // namespace bed::internal::buffer
|
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "decl.h"
|
#include "../decl.h"
|
||||||
#include "pch.h"
|
|
||||||
|
|
||||||
namespace bed::internal::buffer {
|
namespace bed::internal::buffer {
|
||||||
struct ClipBuffer : Buffer {
|
struct ClipBuffer : Buffer {
|
||||||
@@ -24,6 +23,7 @@ struct ClipBuffer : Buffer {
|
|||||||
void join(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
void join(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
||||||
void remove(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
void remove(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
||||||
void append(BEd &ctx, vase::Shard *text, uint64_t line) override;
|
void append(BEd &ctx, vase::Shard *text, uint64_t line) override;
|
||||||
|
void replace(BEd &ctx, vase::Shard *text, uint64_t start_line, uint64_t end_line) override;
|
||||||
void print(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
void print(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
||||||
void number_print(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
void number_print(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
||||||
void list_print(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
void list_print(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../decl.h"
|
||||||
|
#include "history.h"
|
||||||
|
#include "shard.h"
|
||||||
|
|
||||||
|
namespace bed::internal::buffer {
|
||||||
|
struct HistoryItem {
|
||||||
|
syntax::ParserSnapshot parse_state;
|
||||||
|
vase::Shard *text;
|
||||||
|
std::chrono::system_clock::time_point timestamp;
|
||||||
|
std::string summary;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct GenericBuffer : ShardBuffer {
|
||||||
|
uint64_t base_version{0};
|
||||||
|
std::chrono::system_clock::time_point timestamp;
|
||||||
|
std::string action;
|
||||||
|
std::filesystem::path save_path{};
|
||||||
|
std::vector<HistoryItem> undo_stack;
|
||||||
|
std::vector<HistoryItem> redo_stack;
|
||||||
|
|
||||||
|
GenericBuffer(std::string name)
|
||||||
|
: ShardBuffer(name, nullptr, nullptr, Kind::Generic) {}
|
||||||
|
~GenericBuffer();
|
||||||
|
|
||||||
|
void list_history(BEd &ctx);
|
||||||
|
HistoryBuffer *get_history(uint64_t version);
|
||||||
|
void snapshot(std::string action);
|
||||||
|
bool undo(BEd &ctx);
|
||||||
|
bool redo(BEd &ctx);
|
||||||
|
void prune(int = 0);
|
||||||
|
bool waste() override;
|
||||||
|
void load(BEd &ctx, vase::Shard *text) override;
|
||||||
|
void set_filename(std::filesystem::path path) override;
|
||||||
|
std::filesystem::path filename() override;
|
||||||
|
void substitute(
|
||||||
|
BEd &ctx, uint64_t start_line, uint64_t end_line,
|
||||||
|
std::string ®ex, std::string &replacement, std::string &options
|
||||||
|
) override;
|
||||||
|
void join(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
||||||
|
void remove(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
||||||
|
void append(BEd &ctx, vase::Shard *text, uint64_t line) override;
|
||||||
|
void replace(BEd &ctx, vase::Shard *text, uint64_t start_line, uint64_t end_line) override;
|
||||||
|
};
|
||||||
|
} // namespace bed::internal::buffer
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../decl.h"
|
||||||
|
#include "shard.h"
|
||||||
|
|
||||||
|
namespace bed::internal::buffer {
|
||||||
|
struct HistoryBuffer : ShardBuffer {
|
||||||
|
HistoryBuffer(
|
||||||
|
std::string name, vase::Shard *root,
|
||||||
|
const syntax::ParserSnapshot &snapshot
|
||||||
|
) : ShardBuffer(std::move(name), root, snapshot, Kind::History) {}
|
||||||
|
|
||||||
|
bool waste() override {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
void load(BEd &, vase::Shard *) override {
|
||||||
|
throw ed_error("History buffers are read-only.");
|
||||||
|
}
|
||||||
|
void set_filename(std::filesystem::path) override {}
|
||||||
|
std::filesystem::path filename() override {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
void substitute(BEd &, uint64_t, uint64_t, std::string &, std::string &, std::string &) override {
|
||||||
|
throw ed_error("History buffers are read-only.");
|
||||||
|
}
|
||||||
|
void join(BEd &, uint64_t, uint64_t) override {
|
||||||
|
throw ed_error("History buffers are read-only.");
|
||||||
|
}
|
||||||
|
void remove(BEd &, uint64_t, uint64_t) override {
|
||||||
|
throw ed_error("History buffers are read-only.");
|
||||||
|
}
|
||||||
|
void append(BEd &, vase::Shard *, uint64_t) override {
|
||||||
|
throw ed_error("History buffers are read-only.");
|
||||||
|
}
|
||||||
|
void replace(BEd &, vase::Shard *, uint64_t, uint64_t) override {
|
||||||
|
throw ed_error("History buffers are read-only.");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
} // namespace bed::internal::buffer
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../decl.h"
|
||||||
|
|
||||||
|
namespace bed::internal::buffer {
|
||||||
|
struct ShardBuffer : Buffer {
|
||||||
|
vase::Shard *root;
|
||||||
|
syntax::ParserSnapshot parse{};
|
||||||
|
|
||||||
|
ShardBuffer(std::string name, vase::Shard *root, syntax::Language *language, Kind kind)
|
||||||
|
: Buffer(std::move(name), kind), root(root) {
|
||||||
|
vase::Shard::retain(root);
|
||||||
|
if (language)
|
||||||
|
parse = syntax::make_parser(root, lines(), language);
|
||||||
|
}
|
||||||
|
ShardBuffer(
|
||||||
|
std::string name,
|
||||||
|
vase::Shard *root,
|
||||||
|
const syntax::ParserSnapshot &snapshot,
|
||||||
|
Kind kind
|
||||||
|
) : Buffer(std::move(name), kind),
|
||||||
|
root(root),
|
||||||
|
parse(syntax::retain(snapshot)) {
|
||||||
|
vase::Shard::retain(root);
|
||||||
|
}
|
||||||
|
~ShardBuffer() {
|
||||||
|
vase::Shard::release(root);
|
||||||
|
syntax::release(parse);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t lines() override;
|
||||||
|
uint64_t bytes() override;
|
||||||
|
vase::Shard *copy(uint64_t start_line, uint64_t end_line) override;
|
||||||
|
void print(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
||||||
|
void number_print(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
||||||
|
void list_print(BEd &ctx, uint64_t start_line, uint64_t end_line) override;
|
||||||
|
uint64_t next_closing(uint64_t start) override;
|
||||||
|
uint64_t prev_closing(uint64_t start) override;
|
||||||
|
uint64_t find_next(std::string_view pattern, uint64_t start) override;
|
||||||
|
uint64_t find_prev(std::string_view pattern, uint64_t start) override;
|
||||||
|
};
|
||||||
|
} // namespace bed::internal::buffer
|
||||||
@@ -58,12 +58,23 @@ struct IO {
|
|||||||
static volatile std::atomic_bool resized;
|
static volatile std::atomic_bool resized;
|
||||||
static void handle_sigwinch(int);
|
static void handle_sigwinch(int);
|
||||||
|
|
||||||
|
static enum struct Mode {
|
||||||
|
PIPE,
|
||||||
|
TERMINAL
|
||||||
|
} mode;
|
||||||
|
|
||||||
|
std::string pipe_input;
|
||||||
|
std::deque<char> input_queue;
|
||||||
|
|
||||||
IO();
|
IO();
|
||||||
~IO();
|
~IO();
|
||||||
|
|
||||||
IO(const IO &) = delete;
|
IO(const IO &) = delete;
|
||||||
IO &operator=(const IO &) = delete;
|
IO &operator=(const IO &) = delete;
|
||||||
|
|
||||||
|
bool interactive() const {
|
||||||
|
return mode == Mode::TERMINAL;
|
||||||
|
}
|
||||||
void enable_mouse();
|
void enable_mouse();
|
||||||
void disable_mouse();
|
void disable_mouse();
|
||||||
|
|
||||||
@@ -71,14 +82,14 @@ struct IO {
|
|||||||
std::pair<uint16_t, uint16_t> cursor_position();
|
std::pair<uint16_t, uint16_t> cursor_position();
|
||||||
void move_cursor(uint16_t row, uint16_t col);
|
void move_cursor(uint16_t row, uint16_t col);
|
||||||
|
|
||||||
|
std::pair<std::string, bool> read_pipe();
|
||||||
|
|
||||||
KeyEvent read_key();
|
KeyEvent read_key();
|
||||||
void write(const char *, uint64_t);
|
void write(const char *, uint64_t);
|
||||||
void write(std::string_view);
|
void write(std::string_view);
|
||||||
void write_line(std::string_view);
|
void write_line(std::string_view);
|
||||||
void run_pty(const std::string &);
|
void run_pty(const std::string &);
|
||||||
|
|
||||||
std::deque<char> input_queue;
|
|
||||||
|
|
||||||
KeyEvent::ReadResult get_next_byte(char &out);
|
KeyEvent::ReadResult get_next_byte(char &out);
|
||||||
void enqueue_bytes(const std::string &bytes);
|
void enqueue_bytes(const std::string &bytes);
|
||||||
static int utf8_seq_len(uint8_t byte);
|
static int utf8_seq_len(uint8_t byte);
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ struct MarksEngine {
|
|||||||
continue;
|
continue;
|
||||||
if (marks[i].number == UINT64_MAX)
|
if (marks[i].number == UINT64_MAX)
|
||||||
continue;
|
continue;
|
||||||
if (marks[i].number >= start)
|
if (marks[i].number > start)
|
||||||
marks[i].number += count;
|
marks[i].number += count;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "internal/trie/trie.h"
|
#include "internal/trie/trie.h"
|
||||||
|
#include "internal/vase/vase.h"
|
||||||
#include "pch.h"
|
#include "pch.h"
|
||||||
|
|
||||||
namespace bed::internal::syntax {
|
namespace bed::internal::syntax {
|
||||||
@@ -75,7 +76,11 @@ struct ParseEvent {
|
|||||||
|
|
||||||
struct Language {
|
struct Language {
|
||||||
std::function<void *()> none_state;
|
std::function<void *()> none_state;
|
||||||
std::function<void(void **, std::string_view, bool, std::vector<Token> *, std::vector<ParseEvent> *)> parse;
|
std::function<void(
|
||||||
|
void **, std::string_view,
|
||||||
|
bool, std::vector<Token> *, std::vector<ParseEvent> *
|
||||||
|
)>
|
||||||
|
parse;
|
||||||
std::function<void *(void *)> copy;
|
std::function<void *(void *)> copy;
|
||||||
std::function<bool(void *, void *)> equal;
|
std::function<bool(void *, void *)> equal;
|
||||||
std::function<void(void *)> destroy;
|
std::function<void(void *)> destroy;
|
||||||
@@ -85,35 +90,125 @@ struct ParseState {
|
|||||||
static constexpr uint64_t BRANCH_BIT = 1ull << 63;
|
static constexpr uint64_t BRANCH_BIT = 1ull << 63;
|
||||||
static constexpr uint64_t LINES_MASK = ~BRANCH_BIT;
|
static constexpr uint64_t LINES_MASK = ~BRANCH_BIT;
|
||||||
uint64_t header;
|
uint64_t header;
|
||||||
|
uint16_t height;
|
||||||
|
std::atomic_uint16_t refs;
|
||||||
bool is_branch() const {
|
bool is_branch() const {
|
||||||
return header & BRANCH_BIT;
|
return header & BRANCH_BIT;
|
||||||
}
|
}
|
||||||
uint64_t lines() const {
|
uint64_t lines() const {
|
||||||
return header & LINES_MASK;
|
return header & LINES_MASK;
|
||||||
}
|
}
|
||||||
|
explicit ParseState(bool branch, uint64_t lines, uint16_t height)
|
||||||
|
: height(height), refs(1) {
|
||||||
|
header = lines;
|
||||||
|
header |= branch * BRANCH_BIT;
|
||||||
|
};
|
||||||
|
static void retain(ParseState *node);
|
||||||
|
static void release(Language &lang, ParseState *node);
|
||||||
|
static ParseState *build(Language &lang, ParseState **pieces, uint64_t lo, uint64_t hi);
|
||||||
|
static ParseState *splice(
|
||||||
|
Language &lang, ParseState *node, vase::Shard *vase,
|
||||||
|
uint64_t line, uint64_t original, uint64_t final
|
||||||
|
);
|
||||||
|
static ParseState *concat(Language &lang, ParseState *a, ParseState *b);
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ParseStateBranch : ParseState {
|
struct ParseStateBranch : ParseState {
|
||||||
ParseState *left;
|
ParseState *left;
|
||||||
ParseState *right;
|
ParseState *right;
|
||||||
|
ParseStateBranch(ParseState *l, ParseState *r)
|
||||||
|
: ParseState(
|
||||||
|
true, l->lines() + r->lines(),
|
||||||
|
1 + std::max(l->height, r->height)
|
||||||
|
),
|
||||||
|
left(l), right(r) {
|
||||||
|
retain(l);
|
||||||
|
retain(r);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ParseStateLeaf : ParseState {
|
struct ParseStateLeaf : ParseState {
|
||||||
void *state;
|
static constexpr uint64_t MAX_CHUNK = 512;
|
||||||
uint32_t n;
|
uint32_t n{0};
|
||||||
uint32_t cap;
|
|
||||||
uint16_t *blocks;
|
|
||||||
static constexpr uint16_t IS_CLOSING = 0x8000;
|
static constexpr uint16_t IS_CLOSING = 0x8000;
|
||||||
static constexpr uint16_t LINE_MASK = 0x7fff;
|
static constexpr uint16_t LINE_MASK = 0x7fff;
|
||||||
|
uint16_t *blocks{nullptr};
|
||||||
|
void *state;
|
||||||
|
ParseStateLeaf(void *state, uint64_t lines, uint32_t n, uint16_t *blocks_)
|
||||||
|
: ParseState(false, lines, 1), n(n), state(state) {
|
||||||
|
blocks = (uint16_t *)malloc(sizeof(uint16_t) * n);
|
||||||
|
memcpy(blocks, blocks_, sizeof(uint16_t) * n);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
struct ParsePieceBuilder {
|
||||||
|
Language ⟨
|
||||||
|
std::vector<ParseState *> pieces;
|
||||||
|
std::vector<uint16_t> blocks;
|
||||||
|
void *piece_state{nullptr};
|
||||||
|
uint64_t chunk_start{0};
|
||||||
|
uint64_t chunk_lines{0};
|
||||||
|
ParsePieceBuilder(Language &lang, uint64_t first_line)
|
||||||
|
: lang(lang), chunk_start(first_line) {}
|
||||||
|
void add(
|
||||||
|
void *state,
|
||||||
|
uint64_t line,
|
||||||
|
const std::vector<ParseEvent> &events
|
||||||
|
) {
|
||||||
|
if (chunk_lines == 0) {
|
||||||
|
chunk_start = line;
|
||||||
|
piece_state = lang.copy(state);
|
||||||
|
}
|
||||||
|
for (const auto &ev : events) {
|
||||||
|
blocks.push_back(
|
||||||
|
(ev.closing ? ParseStateLeaf::IS_CLOSING : 0)
|
||||||
|
| (line - chunk_start)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
++chunk_lines;
|
||||||
|
if (chunk_lines == ParseStateLeaf::MAX_CHUNK)
|
||||||
|
flush();
|
||||||
|
}
|
||||||
|
void flush() {
|
||||||
|
if (chunk_lines == 0)
|
||||||
|
return;
|
||||||
|
pieces.push_back(new ParseStateLeaf(
|
||||||
|
piece_state,
|
||||||
|
chunk_lines,
|
||||||
|
blocks.size(),
|
||||||
|
blocks.data()
|
||||||
|
));
|
||||||
|
piece_state = nullptr;
|
||||||
|
blocks.clear();
|
||||||
|
chunk_lines = 0;
|
||||||
|
}
|
||||||
|
ParseState *finish() {
|
||||||
|
flush();
|
||||||
|
if (pieces.empty())
|
||||||
|
return nullptr;
|
||||||
|
ParseState *root = ParseState::build(lang, pieces.data(), 0, pieces.size());
|
||||||
|
pieces.clear();
|
||||||
|
return root;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct TreeCursor {
|
struct TreeCursor {
|
||||||
|
Language ⟨
|
||||||
|
ParseState *root;
|
||||||
ParseStateLeaf *leaf = nullptr;
|
ParseStateLeaf *leaf = nullptr;
|
||||||
ParseStateBranch *stack[64];
|
ParseStateBranch *stack[64];
|
||||||
uint8_t depth = 0;
|
uint8_t depth = 0;
|
||||||
bool went_left[64];
|
bool went_left[64];
|
||||||
TreeCursor(ParseState *root, uint64_t target_line, uint64_t *relative);
|
TreeCursor(
|
||||||
|
Language &lang, ParseState *root,
|
||||||
|
uint64_t target_line, uint64_t *relative
|
||||||
|
);
|
||||||
|
~TreeCursor();
|
||||||
|
TreeCursor(const TreeCursor &) = delete;
|
||||||
|
TreeCursor &operator=(const TreeCursor &) = delete;
|
||||||
void next();
|
void next();
|
||||||
void prev();
|
void prev();
|
||||||
|
ParseState *prefix();
|
||||||
|
ParseState *suffix();
|
||||||
};
|
};
|
||||||
} // namespace bed::internal::syntax
|
} // namespace bed::internal::syntax
|
||||||
|
|||||||
@@ -1,50 +1,29 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "decl.h"
|
#include "decl.h"
|
||||||
#include "internal/vase/vase.h"
|
|
||||||
#include "pch.h"
|
#include "pch.h"
|
||||||
|
|
||||||
namespace bed::internal::syntax {
|
namespace bed::internal::syntax {
|
||||||
struct Parser {
|
struct ParserSnapshot {
|
||||||
static constexpr uint64_t MAX_CHUNK = 512;
|
ParseState *root = nullptr;
|
||||||
|
Language *lang = nullptr;
|
||||||
|
};
|
||||||
|
|
||||||
ParseState *root;
|
ParserSnapshot make_parser(vase::Shard *vase, uint64_t lines, Language *lang);
|
||||||
Language lang;
|
ParserSnapshot retain(const ParserSnapshot &snap);
|
||||||
bool in_edit = false;
|
void release(ParserSnapshot &snap);
|
||||||
bool dirty = false;
|
|
||||||
uint64_t dirty_start = 0;
|
|
||||||
uint64_t dirty_end = 0;
|
|
||||||
|
|
||||||
Parser(vase::Shard *, uint64_t, Language);
|
uint64_t next_closing(const ParserSnapshot &snap, uint64_t line);
|
||||||
~Parser();
|
uint64_t prev_opening(const ParserSnapshot &snap, uint64_t line);
|
||||||
Parser(const Parser &) = delete;
|
|
||||||
Parser &operator=(const Parser &) = delete;
|
|
||||||
|
|
||||||
void reset(vase::Shard *, uint64_t, Language);
|
|
||||||
void erase(vase::Shard *, uint64_t, uint64_t);
|
|
||||||
void insert(vase::Shard *, uint64_t, uint64_t);
|
|
||||||
void modify(vase::Shard *, uint64_t, uint64_t);
|
|
||||||
|
|
||||||
void begin_edit();
|
|
||||||
void erase(uint64_t start, uint64_t count);
|
|
||||||
void insert(uint64_t start, uint64_t count);
|
|
||||||
void end_edit(vase::Shard *vase);
|
|
||||||
void mark_dirty(uint64_t start, uint64_t end);
|
|
||||||
|
|
||||||
uint64_t next_closing(uint64_t line);
|
|
||||||
uint64_t prev_opening(uint64_t line);
|
|
||||||
|
|
||||||
std::pair<ParseState *, ParseState *> split_tree(ParseState *node, uint64_t line);
|
|
||||||
ParseState *join_tree(ParseState *a, ParseState *b);
|
|
||||||
|
|
||||||
struct Iterator {
|
struct Iterator {
|
||||||
Parser *p;
|
ParserSnapshot snap;
|
||||||
std::optional<vase::Iterator> it;
|
std::optional<vase::Iterator> it;
|
||||||
void *state;
|
void *state;
|
||||||
uint64_t at;
|
uint64_t at;
|
||||||
std::vector<Token> tokens;
|
std::vector<Token> tokens;
|
||||||
std::vector<ParseEvent> events;
|
std::vector<ParseEvent> events;
|
||||||
Iterator(uint64_t, Parser *, vase::Shard *);
|
Iterator(uint64_t, ParserSnapshot, vase::Shard *);
|
||||||
~Iterator();
|
~Iterator();
|
||||||
Iterator(const Iterator &) = delete;
|
Iterator(const Iterator &) = delete;
|
||||||
Iterator &operator=(const Iterator &) = delete;
|
Iterator &operator=(const Iterator &) = delete;
|
||||||
@@ -52,6 +31,24 @@ struct Parser {
|
|||||||
Iterator &operator=(Iterator &&other);
|
Iterator &operator=(Iterator &&other);
|
||||||
void next();
|
void next();
|
||||||
};
|
};
|
||||||
std::optional<Iterator> get_hl(vase::Shard *, uint64_t);
|
|
||||||
|
std::optional<Iterator> get_hl(const ParserSnapshot &snap, vase::Shard *vase, uint64_t target);
|
||||||
|
|
||||||
|
void insert(ParserSnapshot &snap, vase::Shard *vase, uint64_t start, uint64_t count);
|
||||||
|
void erase(ParserSnapshot &snap, vase::Shard *vase, uint64_t start, uint64_t count);
|
||||||
|
|
||||||
|
struct Edit {
|
||||||
|
ParserSnapshot *target;
|
||||||
|
bool dirty = false;
|
||||||
|
uint64_t dirty_start = 0;
|
||||||
|
uint64_t dirty_end = 0;
|
||||||
|
int64_t edit_delta = 0;
|
||||||
|
|
||||||
|
explicit Edit(ParserSnapshot &snap) : target(&snap) {}
|
||||||
|
|
||||||
|
void mark_dirty(uint64_t start, uint64_t end);
|
||||||
|
void insert(uint64_t start, uint64_t count);
|
||||||
|
void erase(uint64_t start, uint64_t count);
|
||||||
|
void commit(vase::Shard *vase);
|
||||||
};
|
};
|
||||||
} // namespace bed::internal::syntax
|
} // namespace bed::internal::syntax
|
||||||
|
|||||||
@@ -41,6 +41,8 @@ struct CommandIO {
|
|||||||
|
|
||||||
CommandIO(BEd &);
|
CommandIO(BEd &);
|
||||||
std::pair<std::string, bool> run();
|
std::pair<std::string, bool> run();
|
||||||
|
std::pair<std::string, bool> run_pipe();
|
||||||
|
std::pair<std::string, bool> run_terminal();
|
||||||
void redraw();
|
void redraw();
|
||||||
};
|
};
|
||||||
} // namespace bed::internal::ui
|
} // namespace bed::internal::ui
|
||||||
|
|||||||
@@ -15,7 +15,9 @@ struct TextMode {
|
|||||||
|
|
||||||
TextMode(BEd &);
|
TextMode(BEd &);
|
||||||
std::pair<vase::Shard *, bool> run();
|
std::pair<vase::Shard *, bool> run();
|
||||||
void grow(size_t required_height);
|
std::pair<vase::Shard *, bool> run_pipe();
|
||||||
|
std::pair<vase::Shard *, bool> run_terminal();
|
||||||
|
void grow();
|
||||||
void redraw();
|
void redraw();
|
||||||
};
|
};
|
||||||
} // namespace bed::internal::ui
|
} // namespace bed::internal::ui
|
||||||
|
|||||||
@@ -12,13 +12,13 @@ struct Shard {
|
|||||||
Petal
|
Petal
|
||||||
} kind;
|
} kind;
|
||||||
|
|
||||||
uint8_t height;
|
uint16_t height;
|
||||||
std::atomic_uint32_t refs;
|
std::atomic_uint32_t refs;
|
||||||
|
|
||||||
uint64_t length;
|
uint64_t length;
|
||||||
uint64_t lines;
|
uint64_t lines;
|
||||||
|
|
||||||
Shard(Kind kind, uint64_t length, uint64_t lines, uint8_t height)
|
Shard(Kind kind, uint64_t length, uint64_t lines, uint16_t height)
|
||||||
: kind(kind), height(height), refs(1), length(length), lines(lines) {};
|
: kind(kind), height(height), refs(1), length(length), lines(lines) {};
|
||||||
|
|
||||||
static void retain(Shard *n);
|
static void retain(Shard *n);
|
||||||
@@ -62,5 +62,4 @@ struct Petal : Shard {
|
|||||||
source->retain();
|
source->retain();
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace bed::internal::vase
|
} // namespace bed::internal::vase
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ std::string to_string(Shard *root, Range range);
|
|||||||
|
|
||||||
Shard *insert(AppendStorage *ap, Shard *root, Shard *text, uint64_t line);
|
Shard *insert(AppendStorage *ap, Shard *root, Shard *text, uint64_t line);
|
||||||
Shard *erase(Shard *root, uint64_t start, uint64_t end);
|
Shard *erase(Shard *root, uint64_t start, uint64_t end);
|
||||||
|
Shard *replace(Shard *root, Shard *text, uint64_t start, uint64_t end);
|
||||||
Shard *join(Shard *root, uint64_t start, uint64_t end);
|
Shard *join(Shard *root, uint64_t start, uint64_t end);
|
||||||
Shard *copy(Shard *root, uint64_t start, uint64_t end);
|
Shard *copy(Shard *root, uint64_t start, uint64_t end);
|
||||||
void write_file(std::filesystem::path path, Shard *text);
|
void write_file(std::filesystem::path path, Shard *text);
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ BEd::BEd(std::vector<std::string> args, internal::io::IO &io)
|
|||||||
internal::functions::Function::register_posix(*this);
|
internal::functions::Function::register_posix(*this);
|
||||||
internal::functions::Function::register_extented(*this);
|
internal::functions::Function::register_extented(*this);
|
||||||
internal::functions::Suffix::register_suffixes(*this);
|
internal::functions::Suffix::register_suffixes(*this);
|
||||||
|
languages["ruby"] = new internal::syntax::Language(internal::syntax::ruby::lang_ruby());
|
||||||
std::string prompt_ = "";
|
std::string prompt_ = "";
|
||||||
std::string file = "";
|
std::string file = "";
|
||||||
bool suppress = false;
|
bool suppress = false;
|
||||||
@@ -47,6 +48,8 @@ BEd::BEd(std::vector<std::string> args, internal::io::IO &io)
|
|||||||
BEd::~BEd() {
|
BEd::~BEd() {
|
||||||
for (auto &[_, buffer] : buffers)
|
for (auto &[_, buffer] : buffers)
|
||||||
delete buffer;
|
delete buffer;
|
||||||
|
for (auto &[_, lang] : languages)
|
||||||
|
delete lang;
|
||||||
}
|
}
|
||||||
|
|
||||||
void BEd::run() {
|
void BEd::run() {
|
||||||
@@ -162,9 +165,38 @@ void BEd::handle(std::string_view cmd, bool eof) {
|
|||||||
internal::buffer::Buffer &BEd::buffer(const std::string &name) {
|
internal::buffer::Buffer &BEd::buffer(const std::string &name) {
|
||||||
if (name.empty())
|
if (name.empty())
|
||||||
throw ed_error("can't have empty buffer name");
|
throw ed_error("can't have empty buffer name");
|
||||||
|
{
|
||||||
auto it = buffers.find(name);
|
auto it = buffers.find(name);
|
||||||
if (it != buffers.end())
|
if (it != buffers.end())
|
||||||
return *it->second;
|
return *it->second;
|
||||||
|
}
|
||||||
|
constexpr std::string_view prefix = "history/";
|
||||||
|
if (name.starts_with(prefix)) {
|
||||||
|
std::string_view path{name};
|
||||||
|
path.remove_prefix(prefix.size());
|
||||||
|
auto slash = path.rfind('/');
|
||||||
|
if (slash == std::string_view::npos || slash == 0 || slash == path.size() - 1)
|
||||||
|
throw ed_error("invalid history");
|
||||||
|
std::string bufname(path.substr(0, slash));
|
||||||
|
auto version_str = path.substr(slash + 1);
|
||||||
|
std::size_t version;
|
||||||
|
try {
|
||||||
|
version = std::stoull(std::string(version_str));
|
||||||
|
} catch (...) {
|
||||||
|
throw ed_error("invalid history version");
|
||||||
|
}
|
||||||
|
auto it = buffers.find(bufname);
|
||||||
|
if (it != buffers.end()) {
|
||||||
|
auto &buf_ = *it->second;
|
||||||
|
if (buf_.kind != internal::buffer::Buffer::Kind::Generic)
|
||||||
|
throw ed_error("Only normal buffers can have history.");
|
||||||
|
auto &buf = *(internal::buffer::GenericBuffer *)&buf_;
|
||||||
|
auto *history_buf = buf.get_history(version);
|
||||||
|
buffers.emplace(name, history_buf);
|
||||||
|
return *history_buf;
|
||||||
|
}
|
||||||
|
throw ed_error("Buffer has no history.");
|
||||||
|
}
|
||||||
auto *buf = new internal::buffer::GenericBuffer(name);
|
auto *buf = new internal::buffer::GenericBuffer(name);
|
||||||
buffers.emplace(name, buf);
|
buffers.emplace(name, buf);
|
||||||
return *buf;
|
return *buf;
|
||||||
|
|||||||
+256
-181
@@ -3,7 +3,200 @@
|
|||||||
|
|
||||||
namespace bed::internal::buffer {
|
namespace bed::internal::buffer {
|
||||||
GenericBuffer::~GenericBuffer() {
|
GenericBuffer::~GenericBuffer() {
|
||||||
|
for (auto &item : undo_stack) {
|
||||||
|
syntax::release(item.parse_state);
|
||||||
|
vase::Shard::release(item.text);
|
||||||
|
}
|
||||||
|
for (auto &item : redo_stack) {
|
||||||
|
syntax::release(item.parse_state);
|
||||||
|
vase::Shard::release(item.text);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void GenericBuffer::list_history(BEd &ctx) {
|
||||||
|
uint64_t current = base_version + undo_stack.size();
|
||||||
|
for (size_t i = 0; i < undo_stack.size(); ++i) {
|
||||||
|
auto &item = undo_stack[i];
|
||||||
|
uint64_t version = base_version + i;
|
||||||
|
auto time = std::chrono::system_clock::to_time_t(item.timestamp);
|
||||||
|
std::tm tm = *std::localtime(&time);
|
||||||
|
ctx.io.write_line(
|
||||||
|
std::format(
|
||||||
|
" {} {:04}-{:02}-{:02} {:02}:{:02}:{:02} {}",
|
||||||
|
version,
|
||||||
|
tm.tm_year + 1900,
|
||||||
|
tm.tm_mon + 1,
|
||||||
|
tm.tm_mday,
|
||||||
|
tm.tm_hour,
|
||||||
|
tm.tm_min,
|
||||||
|
tm.tm_sec,
|
||||||
|
item.summary
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
{
|
||||||
|
auto time = std::chrono::system_clock::to_time_t(timestamp);
|
||||||
|
std::tm tm = *std::localtime(&time);
|
||||||
|
ctx.io.write_line(
|
||||||
|
std::format(
|
||||||
|
"* {} {:04}-{:02}-{:02} {:02}:{:02}:{:02} {}",
|
||||||
|
current,
|
||||||
|
tm.tm_year + 1900,
|
||||||
|
tm.tm_mon + 1,
|
||||||
|
tm.tm_mday,
|
||||||
|
tm.tm_hour,
|
||||||
|
tm.tm_min,
|
||||||
|
tm.tm_sec,
|
||||||
|
action
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
for (size_t i = 0; i < redo_stack.size(); ++i) {
|
||||||
|
auto &item = redo_stack[redo_stack.size() - 1 - i];
|
||||||
|
uint64_t version = current + i + 1;
|
||||||
|
auto time = std::chrono::system_clock::to_time_t(item.timestamp);
|
||||||
|
std::tm tm = *std::localtime(&time);
|
||||||
|
ctx.io.write_line(
|
||||||
|
std::format(
|
||||||
|
" {} {:04}-{:02}-{:02} {:02}:{:02}:{:02} {}",
|
||||||
|
version,
|
||||||
|
tm.tm_year + 1900,
|
||||||
|
tm.tm_mon + 1,
|
||||||
|
tm.tm_mday,
|
||||||
|
tm.tm_hour,
|
||||||
|
tm.tm_min,
|
||||||
|
tm.tm_sec,
|
||||||
|
item.summary
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
HistoryBuffer *GenericBuffer::get_history(uint64_t version) {
|
||||||
|
uint64_t current = base_version + undo_stack.size();
|
||||||
|
if (version < base_version)
|
||||||
|
throw ed_error("History version has been pruned.");
|
||||||
|
if (version < current) {
|
||||||
|
auto &item = undo_stack[version - base_version];
|
||||||
|
return new HistoryBuffer(name, item.text, item.parse_state);
|
||||||
|
}
|
||||||
|
if (version == current)
|
||||||
|
return new HistoryBuffer(name, root, parse);
|
||||||
|
uint64_t redo_offset = version - current - 1;
|
||||||
|
if (redo_offset >= redo_stack.size())
|
||||||
|
throw ed_error("No such history version.");
|
||||||
|
auto &item = redo_stack[redo_stack.size() - 1 - redo_offset];
|
||||||
|
return new HistoryBuffer(name, item.text, item.parse_state);
|
||||||
|
}
|
||||||
|
|
||||||
|
void GenericBuffer::snapshot(std::string action_) {
|
||||||
|
if (base_version == 0) {
|
||||||
|
base_version++;
|
||||||
|
} else {
|
||||||
|
vase::Shard::retain(root);
|
||||||
|
undo_stack.push_back(
|
||||||
|
HistoryItem{
|
||||||
|
syntax::retain(parse),
|
||||||
|
root,
|
||||||
|
timestamp,
|
||||||
|
action
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
for (auto &item : redo_stack) {
|
||||||
|
syntax::release(item.parse_state);
|
||||||
|
vase::Shard::release(item.text);
|
||||||
|
}
|
||||||
|
redo_stack.clear();
|
||||||
|
timestamp = std::chrono::system_clock::now();
|
||||||
|
action = action_;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GenericBuffer::undo(BEd &ctx) {
|
||||||
|
if (undo_stack.empty())
|
||||||
|
return false;
|
||||||
|
HistoryItem prev = undo_stack.back();
|
||||||
|
undo_stack.pop_back();
|
||||||
|
vase::Shard::retain(root);
|
||||||
|
redo_stack.push_back(
|
||||||
|
HistoryItem{
|
||||||
|
syntax::retain(parse),
|
||||||
|
root,
|
||||||
|
timestamp,
|
||||||
|
action
|
||||||
|
}
|
||||||
|
);
|
||||||
vase::Shard::release(root);
|
vase::Shard::release(root);
|
||||||
|
root = prev.text;
|
||||||
|
syntax::release(parse);
|
||||||
|
parse = prev.parse_state;
|
||||||
|
timestamp = prev.timestamp;
|
||||||
|
action = prev.summary;
|
||||||
|
state = Modified;
|
||||||
|
if (!root) {
|
||||||
|
ctx.prev().buffername = name;
|
||||||
|
ctx.prev().start = 0;
|
||||||
|
ctx.prev().end = 0;
|
||||||
|
} else {
|
||||||
|
ctx.prev().buffername = name;
|
||||||
|
ctx.prev().start = 1;
|
||||||
|
ctx.prev().end = root->lines + 1;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GenericBuffer::redo(BEd &ctx) {
|
||||||
|
if (redo_stack.empty())
|
||||||
|
return false;
|
||||||
|
HistoryItem next = redo_stack.back();
|
||||||
|
redo_stack.pop_back();
|
||||||
|
vase::Shard::retain(root);
|
||||||
|
undo_stack.push_back(
|
||||||
|
HistoryItem{
|
||||||
|
syntax::retain(parse),
|
||||||
|
root,
|
||||||
|
timestamp,
|
||||||
|
action
|
||||||
|
}
|
||||||
|
);
|
||||||
|
vase::Shard::release(root);
|
||||||
|
root = next.text;
|
||||||
|
syntax::release(parse);
|
||||||
|
parse = next.parse_state;
|
||||||
|
timestamp = next.timestamp;
|
||||||
|
action = next.summary;
|
||||||
|
state = Modified;
|
||||||
|
if (!root) {
|
||||||
|
ctx.prev().buffername = name;
|
||||||
|
ctx.prev().start = 0;
|
||||||
|
ctx.prev().end = 0;
|
||||||
|
} else {
|
||||||
|
ctx.prev().buffername = name;
|
||||||
|
ctx.prev().start = 1;
|
||||||
|
ctx.prev().end = root->lines + 1;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void GenericBuffer::prune(int keep) {
|
||||||
|
size_t drop =
|
||||||
|
undo_stack.size() > (size_t)keep
|
||||||
|
? undo_stack.size() - keep
|
||||||
|
: 0;
|
||||||
|
for (size_t i = 0; i < drop; ++i) {
|
||||||
|
syntax::release(undo_stack[i].parse_state);
|
||||||
|
vase::Shard::release(undo_stack[i].text);
|
||||||
|
}
|
||||||
|
undo_stack.erase(
|
||||||
|
undo_stack.begin(),
|
||||||
|
undo_stack.begin() + drop
|
||||||
|
);
|
||||||
|
base_version += drop;
|
||||||
|
for (auto &item : redo_stack) {
|
||||||
|
syntax::release(item.parse_state);
|
||||||
|
vase::Shard::release(item.text);
|
||||||
|
}
|
||||||
|
redo_stack.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GenericBuffer::waste() {
|
bool GenericBuffer::waste() {
|
||||||
@@ -11,19 +204,8 @@ bool GenericBuffer::waste() {
|
|||||||
&& root == nullptr;
|
&& root == nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t GenericBuffer::lines() {
|
|
||||||
if (root)
|
|
||||||
return root->lines + 1;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint64_t GenericBuffer::bytes() {
|
|
||||||
if (root)
|
|
||||||
return root->length + 1;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void GenericBuffer::load(BEd &ctx, vase::Shard *text) {
|
void GenericBuffer::load(BEd &ctx, vase::Shard *text) {
|
||||||
|
snapshot("Load file.");
|
||||||
if (lines())
|
if (lines())
|
||||||
ctx.marks.erase(name, 1, lines());
|
ctx.marks.erase(name, 1, lines());
|
||||||
vase::Shard::release(root);
|
vase::Shard::release(root);
|
||||||
@@ -39,7 +221,9 @@ void GenericBuffer::load(BEd &ctx, vase::Shard *text) {
|
|||||||
ctx.prev().start = 1;
|
ctx.prev().start = 1;
|
||||||
ctx.prev().end = text->lines + 1;
|
ctx.prev().end = text->lines + 1;
|
||||||
}
|
}
|
||||||
parser.emplace(root, lines(), syntax::ruby::lang_ruby());
|
ctx.current() = {name, lines()};
|
||||||
|
syntax::release(parse);
|
||||||
|
parse = syntax::make_parser(root, lines(), ctx.languages["ruby"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GenericBuffer::set_filename(std::filesystem::path path) {
|
void GenericBuffer::set_filename(std::filesystem::path path) {
|
||||||
@@ -51,35 +235,73 @@ std::filesystem::path GenericBuffer::filename() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
void GenericBuffer::append(BEd &ctx, vase::Shard *text, uint64_t line) {
|
void GenericBuffer::append(BEd &ctx, vase::Shard *text, uint64_t line) {
|
||||||
|
if (!text)
|
||||||
|
return;
|
||||||
|
snapshot(std::format("Insert {} lines after line {}", text->lines + 1, line));
|
||||||
ctx.prev().buffername = name;
|
ctx.prev().buffername = name;
|
||||||
ctx.prev().start = line + 1;
|
ctx.prev().start = line + 1;
|
||||||
ctx.prev().end = line + text->lines + 1;
|
ctx.prev().end = line + text->lines + 1;
|
||||||
|
ctx.current() = {name, line + text->lines + 1};
|
||||||
root = vase::insert(&ctx.append, root, text, line);
|
root = vase::insert(&ctx.append, root, text, line);
|
||||||
ctx.marks.insert(name, ctx.prev().start, ctx.prev().end);
|
ctx.marks.insert(name, line, text->lines + 1);
|
||||||
if (parser)
|
if (parse.lang)
|
||||||
parser->insert(root, ctx.prev().start, ctx.prev().end);
|
syntax::insert(parse, root, line, text->lines + 1);
|
||||||
state = Modified;
|
state = Modified;
|
||||||
}
|
}
|
||||||
|
|
||||||
void GenericBuffer::remove(BEd &ctx, uint64_t start_line, uint64_t end_line) {
|
void GenericBuffer::remove(BEd &ctx, uint64_t start_line, uint64_t end_line) {
|
||||||
|
snapshot(std::format("Remove lines {} to {}", start_line, end_line));
|
||||||
root = vase::erase(root, start_line, end_line);
|
root = vase::erase(root, start_line, end_line);
|
||||||
ctx.prev().buffername = name;
|
ctx.prev().buffername = name;
|
||||||
ctx.prev().start = std::min(start_line, lines());
|
uint64_t l = std::min(start_line, lines());
|
||||||
ctx.prev().end = std::min(start_line, lines());
|
ctx.prev().start = l;
|
||||||
|
ctx.prev().end = l;
|
||||||
|
ctx.current() = {name, l};
|
||||||
ctx.marks.erase(name, start_line, end_line - start_line + 1);
|
ctx.marks.erase(name, start_line, end_line - start_line + 1);
|
||||||
if (parser)
|
if (parse.lang)
|
||||||
parser->erase(root, start_line, end_line - start_line + 1);
|
syntax::erase(parse, root, start_line, end_line - start_line + 1);
|
||||||
|
state = Modified;
|
||||||
|
}
|
||||||
|
|
||||||
|
void GenericBuffer::replace(BEd &ctx, vase::Shard *text, uint64_t start_line, uint64_t end_line) {
|
||||||
|
if (!text) {
|
||||||
|
remove(ctx, start_line, end_line);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
snapshot(std::format("Replace lines {} to {} with {} lines", start_line, end_line, text->lines));
|
||||||
|
ctx.prev().buffername = name;
|
||||||
|
ctx.prev().start = start_line;
|
||||||
|
ctx.prev().end = start_line + text->lines;
|
||||||
|
ctx.current() = {name, start_line + text->lines};
|
||||||
|
uint64_t new_count = text->lines + 1;
|
||||||
|
uint64_t old_count = end_line - start_line + 1;
|
||||||
|
root = vase::replace(root, text, start_line, end_line);
|
||||||
|
if (parse.lang) {
|
||||||
|
syntax::Edit edit(parse);
|
||||||
|
edit.erase(start_line, old_count);
|
||||||
|
edit.insert(start_line, new_count);
|
||||||
|
edit.commit(root);
|
||||||
|
}
|
||||||
|
if (new_count > old_count) {
|
||||||
|
uint64_t diff = new_count - old_count;
|
||||||
|
ctx.marks.insert(name, end_line, diff);
|
||||||
|
} else if (new_count < old_count) {
|
||||||
|
uint64_t diff = old_count - new_count;
|
||||||
|
ctx.marks.collapse(name, start_line + new_count - 1, diff);
|
||||||
|
}
|
||||||
state = Modified;
|
state = Modified;
|
||||||
}
|
}
|
||||||
|
|
||||||
void GenericBuffer::join(BEd &ctx, uint64_t start_line, uint64_t end_line) {
|
void GenericBuffer::join(BEd &ctx, uint64_t start_line, uint64_t end_line) {
|
||||||
|
snapshot(std::format("Join lines {} to {}", start_line, end_line));
|
||||||
root = vase::join(root, start_line, end_line);
|
root = vase::join(root, start_line, end_line);
|
||||||
ctx.prev().buffername = name;
|
ctx.prev().buffername = name;
|
||||||
ctx.prev().start = start_line;
|
ctx.prev().start = start_line;
|
||||||
ctx.prev().end = start_line;
|
ctx.prev().end = start_line;
|
||||||
|
ctx.current() = {name, start_line};
|
||||||
ctx.marks.collapse(name, start_line, end_line - start_line);
|
ctx.marks.collapse(name, start_line, end_line - start_line);
|
||||||
if (parser)
|
if (parse.lang)
|
||||||
parser->erase(root, start_line, end_line - start_line);
|
syntax::erase(parse, root, start_line, end_line - start_line);
|
||||||
state = Modified;
|
state = Modified;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -87,11 +309,13 @@ void GenericBuffer::substitute(
|
|||||||
BEd &ctx, uint64_t start_line, uint64_t end_line,
|
BEd &ctx, uint64_t start_line, uint64_t end_line,
|
||||||
std::string ®ex, std::string &replacement, std::string &options
|
std::string ®ex, std::string &replacement, std::string &options
|
||||||
) {
|
) {
|
||||||
|
snapshot(std::format("Substitute /{}/ with /{}/ in lines {} to {}", regex, replacement, start_line, end_line));
|
||||||
ctx.prev().buffername = name;
|
ctx.prev().buffername = name;
|
||||||
ctx.prev().start = start_line;
|
ctx.prev().start = start_line;
|
||||||
ctx.prev().end = end_line;
|
ctx.prev().end = end_line;
|
||||||
if (parser)
|
std::optional<syntax::Edit> edit;
|
||||||
parser->begin_edit();
|
if (parse.lang)
|
||||||
|
edit.emplace(parse);
|
||||||
root = vase::substitute(
|
root = vase::substitute(
|
||||||
&ctx.append,
|
&ctx.append,
|
||||||
root,
|
root,
|
||||||
@@ -103,168 +327,19 @@ void GenericBuffer::substitute(
|
|||||||
[&](uint64_t line, uint64_t old_lines, uint64_t new_lines) {
|
[&](uint64_t line, uint64_t old_lines, uint64_t new_lines) {
|
||||||
if (old_lines) {
|
if (old_lines) {
|
||||||
ctx.marks.erase(name, line, old_lines);
|
ctx.marks.erase(name, line, old_lines);
|
||||||
if (parser)
|
if (edit)
|
||||||
parser->erase(line, old_lines);
|
edit->erase(line, old_lines);
|
||||||
}
|
}
|
||||||
if (new_lines) {
|
if (new_lines) {
|
||||||
ctx.marks.insert(name, line, line + new_lines - 1);
|
ctx.marks.insert(name, line, new_lines);
|
||||||
if (parser)
|
if (edit)
|
||||||
parser->insert(line, line + new_lines - 1);
|
edit->insert(line, new_lines);
|
||||||
}
|
}
|
||||||
|
ctx.current() = {name, line + new_lines};
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
if (parser)
|
if (edit)
|
||||||
parser->end_edit(root);
|
edit->commit(root);
|
||||||
ctx.prev().buffername = name;
|
|
||||||
state = Modified;
|
state = Modified;
|
||||||
}
|
}
|
||||||
|
|
||||||
vase::Shard *GenericBuffer::copy(uint64_t start_line, uint64_t end_line) {
|
|
||||||
return vase::copy(root, start_line, end_line);
|
|
||||||
}
|
|
||||||
|
|
||||||
uint64_t GenericBuffer::find_next(std::string_view pattern, uint64_t start) {
|
|
||||||
return vase::find_next(root, pattern, start);
|
|
||||||
}
|
|
||||||
|
|
||||||
uint64_t GenericBuffer::find_prev(std::string_view pattern, uint64_t start) {
|
|
||||||
return vase::find_prev(root, pattern, start);
|
|
||||||
}
|
|
||||||
|
|
||||||
uint64_t GenericBuffer::next_closing(uint64_t start) {
|
|
||||||
if (parser.has_value()) {
|
|
||||||
uint64_t closing = parser->next_closing(start - 1);
|
|
||||||
if (closing == UINT64_MAX)
|
|
||||||
return lines();
|
|
||||||
return closing + 1;
|
|
||||||
} else {
|
|
||||||
start += 10;
|
|
||||||
if (start > lines())
|
|
||||||
return lines();
|
|
||||||
return start;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
uint64_t GenericBuffer::prev_closing(uint64_t start) {
|
|
||||||
if (parser.has_value()) {
|
|
||||||
return parser->prev_opening(start - 1) + 1;
|
|
||||||
} else {
|
|
||||||
if (start > 10)
|
|
||||||
return start - 10;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void apply(io::IO &io, const Highlight &hl) {
|
|
||||||
io.write("\x1b[0m");
|
|
||||||
const uint8_t r = (hl.fg >> 16) & 0xff;
|
|
||||||
const uint8_t g = (hl.fg >> 8) & 0xff;
|
|
||||||
const uint8_t b = hl.fg & 0xff;
|
|
||||||
io.write(std::format("\x1b[38;2;{};{};{}m", r, g, b));
|
|
||||||
if (hl.bg != 0) {
|
|
||||||
const uint8_t br = (hl.bg >> 16) & 0xff;
|
|
||||||
const uint8_t bg = (hl.bg >> 8) & 0xff;
|
|
||||||
const uint8_t bb = hl.bg & 0xff;
|
|
||||||
io.write(std::format("\x1b[48;2;{};{};{}m", br, bg, bb));
|
|
||||||
}
|
|
||||||
if (hl.flags & Highlight::Bold)
|
|
||||||
io.write("\x1b[1m");
|
|
||||||
if (hl.flags & Highlight::Italic)
|
|
||||||
io.write("\x1b[3m");
|
|
||||||
if (hl.flags & Highlight::Underline)
|
|
||||||
io.write("\x1b[4m");
|
|
||||||
if (hl.flags & Highlight::Strikethrough)
|
|
||||||
io.write("\x1b[9m");
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void reset(io::IO &io) {
|
|
||||||
io.write("\x1b[0m");
|
|
||||||
}
|
|
||||||
|
|
||||||
void GenericBuffer::print(BEd &ctx, uint64_t start_line, uint64_t end_line) {
|
|
||||||
ctx.prev().buffername = name;
|
|
||||||
ctx.prev().start = start_line;
|
|
||||||
ctx.prev().end = end_line;
|
|
||||||
if (parser) {
|
|
||||||
auto it_o = parser->get_hl(root, start_line - 1);
|
|
||||||
auto &it = *it_o;
|
|
||||||
while (start_line <= end_line) {
|
|
||||||
it.next();
|
|
||||||
const std::string &line = it.it->line;
|
|
||||||
const auto &tokens = it.tokens;
|
|
||||||
uint32_t cursor = 0;
|
|
||||||
for (const auto &token : tokens) {
|
|
||||||
const uint32_t start = token.start;
|
|
||||||
const uint32_t end = token.end;
|
|
||||||
if (start > line.size() || end > line.size())
|
|
||||||
break;
|
|
||||||
if (cursor < start)
|
|
||||||
ctx.io.write(line.data() + cursor, start - cursor);
|
|
||||||
const auto highlight = ctx.theme.get(token);
|
|
||||||
apply(ctx.io, highlight);
|
|
||||||
ctx.io.write(line.data() + start, end - start);
|
|
||||||
reset(ctx.io);
|
|
||||||
cursor = end;
|
|
||||||
}
|
|
||||||
if (cursor < line.size())
|
|
||||||
ctx.io.write(line.data() + cursor, line.size() - cursor);
|
|
||||||
ctx.io.write_line("");
|
|
||||||
++start_line;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
vase::Iterator it(root, start_line - 1, Direction::Forward);
|
|
||||||
while (it.next() && start_line++ <= end_line)
|
|
||||||
ctx.io.write_line(it.line);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void GenericBuffer::number_print(BEd &ctx, uint64_t start_line, uint64_t end_line) {
|
|
||||||
ctx.prev().buffername = name;
|
|
||||||
ctx.prev().start = start_line;
|
|
||||||
ctx.prev().end = end_line;
|
|
||||||
uint8_t width = 1;
|
|
||||||
for (uint64_t n = end_line; n >= 10; n /= 10)
|
|
||||||
++width;
|
|
||||||
if (parser) {
|
|
||||||
std::optional<syntax::Parser::Iterator> it_o = parser->get_hl(root, start_line - 1);
|
|
||||||
auto &it = *it_o;
|
|
||||||
while (start_line <= end_line) {
|
|
||||||
it.next();
|
|
||||||
ctx.io.write(std::format("{:>{}}\t", start_line, width));
|
|
||||||
const std::string &line = it.it->line;
|
|
||||||
const auto &tokens = it.tokens;
|
|
||||||
uint32_t cursor = 0;
|
|
||||||
for (const auto &token : tokens) {
|
|
||||||
const uint32_t start = token.start;
|
|
||||||
const uint32_t end = token.end;
|
|
||||||
if (start > line.size() || end > line.size())
|
|
||||||
break;
|
|
||||||
if (cursor < start)
|
|
||||||
ctx.io.write(line.data() + cursor, start - cursor);
|
|
||||||
const auto highlight = ctx.theme.get(token);
|
|
||||||
apply(ctx.io, highlight);
|
|
||||||
ctx.io.write(line.data() + start, end - start);
|
|
||||||
reset(ctx.io);
|
|
||||||
cursor = end;
|
|
||||||
}
|
|
||||||
if (cursor < line.size())
|
|
||||||
ctx.io.write(line.data() + cursor, line.size() - cursor);
|
|
||||||
ctx.io.write_line("");
|
|
||||||
++start_line;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
vase::Iterator it(root, start_line - 1, Direction::Forward);
|
|
||||||
while (it.next() && start_line <= end_line)
|
|
||||||
ctx.io.write_line(std::format("{:>{}}\t{}", start_line++, width, it.line));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void GenericBuffer::list_print(BEd &ctx, uint64_t start_line, uint64_t end_line) {
|
|
||||||
ctx.prev().buffername = name;
|
|
||||||
ctx.prev().start = start_line;
|
|
||||||
ctx.prev().end = end_line;
|
|
||||||
vase::Iterator it(root, start_line - 1, Direction::Forward);
|
|
||||||
while (it.next() && start_line++ <= end_line)
|
|
||||||
ctx.io.write_line(list_string(it.line));
|
|
||||||
}
|
|
||||||
} // namespace bed::internal::buffer
|
} // namespace bed::internal::buffer
|
||||||
|
|||||||
@@ -0,0 +1,171 @@
|
|||||||
|
#include "bed.h"
|
||||||
|
#include "internal/buffer/buffer.h"
|
||||||
|
|
||||||
|
namespace bed::internal::buffer {
|
||||||
|
uint64_t ShardBuffer::lines() {
|
||||||
|
if (root)
|
||||||
|
return root->lines + 1;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t ShardBuffer::bytes() {
|
||||||
|
if (root)
|
||||||
|
return root->length + 1;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
vase::Shard *ShardBuffer::copy(uint64_t start_line, uint64_t end_line) {
|
||||||
|
return vase::copy(root, start_line, end_line);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t ShardBuffer::find_next(std::string_view pattern, uint64_t start) {
|
||||||
|
return vase::find_next(root, pattern, start);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t ShardBuffer::find_prev(std::string_view pattern, uint64_t start) {
|
||||||
|
return vase::find_prev(root, pattern, start);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t ShardBuffer::next_closing(uint64_t start) {
|
||||||
|
if (parse.lang) {
|
||||||
|
uint64_t closing = syntax::next_closing(parse, start - 1);
|
||||||
|
if (closing == UINT64_MAX)
|
||||||
|
return lines();
|
||||||
|
return closing + 1;
|
||||||
|
} else {
|
||||||
|
start += 10;
|
||||||
|
if (start > lines())
|
||||||
|
return lines();
|
||||||
|
return start;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t ShardBuffer::prev_closing(uint64_t start) {
|
||||||
|
if (parse.lang) {
|
||||||
|
return syntax::prev_opening(parse, start - 1) + 1;
|
||||||
|
} else {
|
||||||
|
if (start > 10)
|
||||||
|
return start - 10;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void apply(io::IO &io, const Highlight &hl) {
|
||||||
|
io.write("\x1b[0m");
|
||||||
|
const uint8_t r = (hl.fg >> 16) & 0xff;
|
||||||
|
const uint8_t g = (hl.fg >> 8) & 0xff;
|
||||||
|
const uint8_t b = hl.fg & 0xff;
|
||||||
|
io.write(std::format("\x1b[38;2;{};{};{}m", r, g, b));
|
||||||
|
if (hl.bg != 0) {
|
||||||
|
const uint8_t br = (hl.bg >> 16) & 0xff;
|
||||||
|
const uint8_t bg = (hl.bg >> 8) & 0xff;
|
||||||
|
const uint8_t bb = hl.bg & 0xff;
|
||||||
|
io.write(std::format("\x1b[48;2;{};{};{}m", br, bg, bb));
|
||||||
|
}
|
||||||
|
if (hl.flags & Highlight::Bold)
|
||||||
|
io.write("\x1b[1m");
|
||||||
|
if (hl.flags & Highlight::Italic)
|
||||||
|
io.write("\x1b[3m");
|
||||||
|
if (hl.flags & Highlight::Underline)
|
||||||
|
io.write("\x1b[4m");
|
||||||
|
if (hl.flags & Highlight::Strikethrough)
|
||||||
|
io.write("\x1b[9m");
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void reset(io::IO &io) {
|
||||||
|
io.write("\x1b[0m");
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShardBuffer::print(BEd &ctx, uint64_t start_line, uint64_t end_line) {
|
||||||
|
ctx.prev().buffername = name;
|
||||||
|
ctx.prev().start = start_line;
|
||||||
|
ctx.prev().end = end_line;
|
||||||
|
if (parse.lang) {
|
||||||
|
auto it_o = syntax::get_hl(parse, root, start_line - 1);
|
||||||
|
if (!it_o)
|
||||||
|
goto h;
|
||||||
|
auto &it = *it_o;
|
||||||
|
while (start_line <= end_line) {
|
||||||
|
it.next();
|
||||||
|
const std::string &line = it.it->line;
|
||||||
|
const auto &tokens = it.tokens;
|
||||||
|
uint32_t cursor = 0;
|
||||||
|
for (const auto &token : tokens) {
|
||||||
|
const uint32_t start = token.start;
|
||||||
|
const uint32_t end = token.end;
|
||||||
|
if (start > line.size() || end > line.size())
|
||||||
|
break;
|
||||||
|
if (cursor < start)
|
||||||
|
ctx.io.write(line.data() + cursor, start - cursor);
|
||||||
|
const auto highlight = ctx.theme.get(token);
|
||||||
|
apply(ctx.io, highlight);
|
||||||
|
ctx.io.write(line.data() + start, end - start);
|
||||||
|
reset(ctx.io);
|
||||||
|
cursor = end;
|
||||||
|
}
|
||||||
|
if (cursor < line.size())
|
||||||
|
ctx.io.write(line.data() + cursor, line.size() - cursor);
|
||||||
|
ctx.io.write_line("");
|
||||||
|
++start_line;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
h:
|
||||||
|
vase::Iterator it(root, start_line - 1, Direction::Forward);
|
||||||
|
while (it.next() && start_line++ <= end_line)
|
||||||
|
ctx.io.write_line(it.line);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShardBuffer::number_print(BEd &ctx, uint64_t start_line, uint64_t end_line) {
|
||||||
|
ctx.prev().buffername = name;
|
||||||
|
ctx.prev().start = start_line;
|
||||||
|
ctx.prev().end = end_line;
|
||||||
|
uint8_t width = 1;
|
||||||
|
for (uint64_t n = end_line; n >= 10; n /= 10)
|
||||||
|
++width;
|
||||||
|
if (parse.lang) {
|
||||||
|
std::optional<syntax::Iterator> it_o = syntax::get_hl(parse, root, start_line - 1);
|
||||||
|
if (!it_o)
|
||||||
|
goto h;
|
||||||
|
auto &it = *it_o;
|
||||||
|
while (start_line <= end_line) {
|
||||||
|
it.next();
|
||||||
|
ctx.io.write(std::format("{:>{}}\t", start_line, width));
|
||||||
|
const std::string &line = it.it->line;
|
||||||
|
const auto &tokens = it.tokens;
|
||||||
|
uint32_t cursor = 0;
|
||||||
|
for (const auto &token : tokens) {
|
||||||
|
const uint32_t start = token.start;
|
||||||
|
const uint32_t end = token.end;
|
||||||
|
if (start > line.size() || end > line.size())
|
||||||
|
break;
|
||||||
|
if (cursor < start)
|
||||||
|
ctx.io.write(line.data() + cursor, start - cursor);
|
||||||
|
const auto highlight = ctx.theme.get(token);
|
||||||
|
apply(ctx.io, highlight);
|
||||||
|
ctx.io.write(line.data() + start, end - start);
|
||||||
|
reset(ctx.io);
|
||||||
|
cursor = end;
|
||||||
|
}
|
||||||
|
if (cursor < line.size())
|
||||||
|
ctx.io.write(line.data() + cursor, line.size() - cursor);
|
||||||
|
ctx.io.write_line("");
|
||||||
|
++start_line;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
h:
|
||||||
|
vase::Iterator it(root, start_line - 1, Direction::Forward);
|
||||||
|
while (it.next() && start_line <= end_line)
|
||||||
|
ctx.io.write_line(std::format("{:>{}}\t{}", start_line++, width, it.line));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ShardBuffer::list_print(BEd &ctx, uint64_t start_line, uint64_t end_line) {
|
||||||
|
ctx.prev().buffername = name;
|
||||||
|
ctx.prev().start = start_line;
|
||||||
|
ctx.prev().end = end_line;
|
||||||
|
vase::Iterator it(root, start_line - 1, Direction::Forward);
|
||||||
|
while (it.next() && start_line++ <= end_line)
|
||||||
|
ctx.io.write_line(list_string(it.line));
|
||||||
|
}
|
||||||
|
} // namespace bed::internal::buffer
|
||||||
@@ -54,12 +54,12 @@ std::filesystem::path ClipBuffer::filename() {
|
|||||||
void ClipBuffer::append(BEd &ctx, vase::Shard *text, uint64_t line) {
|
void ClipBuffer::append(BEd &ctx, vase::Shard *text, uint64_t line) {
|
||||||
ctx.prev().buffername = name;
|
ctx.prev().buffername = name;
|
||||||
ctx.prev().start = line + 1;
|
ctx.prev().start = line + 1;
|
||||||
ctx.prev().end = line + text->lines + 1;
|
ctx.prev().end = line + (text ? text->lines + 1 : 0);
|
||||||
auto s = vase::Shard::from_command("xclip -selection clipboard -o", true);
|
auto s = vase::Shard::from_command("xclip -selection clipboard -o", true);
|
||||||
s = vase::insert(&ctx.append, s, text, line);
|
s = vase::insert(&ctx.append, s, text, line);
|
||||||
clip_write(s);
|
clip_write(s);
|
||||||
vase::Shard::release(s);
|
vase::Shard::release(s);
|
||||||
ctx.marks.insert(name, ctx.prev().start, ctx.prev().end);
|
ctx.marks.insert(name, line, text->lines + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ClipBuffer::remove(BEd &ctx, uint64_t start_line, uint64_t end_line) {
|
void ClipBuffer::remove(BEd &ctx, uint64_t start_line, uint64_t end_line) {
|
||||||
@@ -73,6 +73,30 @@ void ClipBuffer::remove(BEd &ctx, uint64_t start_line, uint64_t end_line) {
|
|||||||
ctx.marks.erase(name, start_line, end_line - start_line + 1);
|
ctx.marks.erase(name, start_line, end_line - start_line + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ClipBuffer::replace(BEd &ctx, vase::Shard *text, uint64_t start_line, uint64_t end_line) {
|
||||||
|
if (!text) {
|
||||||
|
remove(ctx, start_line, end_line);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ctx.prev().buffername = name;
|
||||||
|
ctx.prev().start = start_line;
|
||||||
|
ctx.prev().end = start_line + text->lines;
|
||||||
|
uint64_t new_count = text->lines + 1;
|
||||||
|
uint64_t old_count = end_line - start_line + 1;
|
||||||
|
auto s = vase::Shard::from_command("xclip -selection clipboard -o", true);
|
||||||
|
s = vase::replace(s, text, start_line, end_line);
|
||||||
|
clip_write(s);
|
||||||
|
vase::Shard::release(s);
|
||||||
|
if (new_count > old_count) {
|
||||||
|
uint64_t diff = new_count - old_count;
|
||||||
|
ctx.marks.insert(name, end_line, diff);
|
||||||
|
} else if (new_count < old_count) {
|
||||||
|
uint64_t diff = old_count - new_count;
|
||||||
|
ctx.marks.collapse(name, start_line + new_count - 1, diff);
|
||||||
|
}
|
||||||
|
state = Modified;
|
||||||
|
}
|
||||||
|
|
||||||
void ClipBuffer::join(BEd &ctx, uint64_t start_line, uint64_t end_line) {
|
void ClipBuffer::join(BEd &ctx, uint64_t start_line, uint64_t end_line) {
|
||||||
auto s = vase::Shard::from_command("xclip -selection clipboard -o", true);
|
auto s = vase::Shard::from_command("xclip -selection clipboard -o", true);
|
||||||
s = vase::join(s, start_line, end_line);
|
s = vase::join(s, start_line, end_line);
|
||||||
@@ -104,7 +128,7 @@ void ClipBuffer::substitute(
|
|||||||
if (old_lines)
|
if (old_lines)
|
||||||
ctx.marks.erase(name, line, old_lines);
|
ctx.marks.erase(name, line, old_lines);
|
||||||
if (new_lines)
|
if (new_lines)
|
||||||
ctx.marks.insert(name, line, line + new_lines - 1);
|
ctx.marks.insert(name, line, new_lines - 1);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
clip_write(s);
|
clip_write(s);
|
||||||
|
|||||||
@@ -4,6 +4,79 @@
|
|||||||
|
|
||||||
namespace bed::internal::functions {
|
namespace bed::internal::functions {
|
||||||
void Function::register_extented(BEd &ctx) {
|
void Function::register_extented(BEd &ctx) {
|
||||||
|
ctx.functions.insert(
|
||||||
|
"#",
|
||||||
|
Function{
|
||||||
|
.address_kind = Function::AddressKind::None,
|
||||||
|
.argument_kind = Function::ArgumentKind::Any,
|
||||||
|
.input_mode = Function::InputMode::None,
|
||||||
|
.desc = "Comment.",
|
||||||
|
.default_address = "",
|
||||||
|
.accept_zero = false,
|
||||||
|
.pre_text_mode = nullptr,
|
||||||
|
.handle = [](
|
||||||
|
BEd &,
|
||||||
|
const buffer::Address &,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
ctx.functions.insert(
|
||||||
|
"echo",
|
||||||
|
Function{
|
||||||
|
.address_kind = Function::AddressKind::Range,
|
||||||
|
.argument_kind = Function::ArgumentKind::Any,
|
||||||
|
.input_mode = Function::InputMode::None,
|
||||||
|
.desc = "Echo given message.",
|
||||||
|
.default_address = "",
|
||||||
|
.accept_zero = true,
|
||||||
|
.pre_text_mode = nullptr,
|
||||||
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &arg_,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
|
auto &addr = std::get<buffer::Range>(addr_);
|
||||||
|
auto str = std::get<std::string>(arg_);
|
||||||
|
const auto first = str.find_first_not_of(" \t");
|
||||||
|
const auto last = str.find_last_not_of(" \t");
|
||||||
|
if (first == std::string::npos)
|
||||||
|
str.clear();
|
||||||
|
else
|
||||||
|
str = str.substr(first, last - first + 1);
|
||||||
|
for (size_t i = 0; i < str.size();) {
|
||||||
|
if (str[i] == '\\') {
|
||||||
|
if (i + 1 >= str.size())
|
||||||
|
break;
|
||||||
|
str.erase(i++, 1);
|
||||||
|
if (str[i - 1] == 'n')
|
||||||
|
str[i - 1] = '\n';
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (str[i] == '$' && i < str.size() && '1' <= str[i + 1] && str[i + 1] <= '2') {
|
||||||
|
bool one = str[i + 1] == '1';
|
||||||
|
str.erase(i, 2);
|
||||||
|
if (one) {
|
||||||
|
auto start = std::to_string(addr.start);
|
||||||
|
str.insert(i, start);
|
||||||
|
i += start.size();
|
||||||
|
} else {
|
||||||
|
auto end = std::to_string(addr.end);
|
||||||
|
str.insert(i, end);
|
||||||
|
i += end.size();
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
ctx.io.write_line(str);
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
ctx.functions.insert(
|
ctx.functions.insert(
|
||||||
"cd",
|
"cd",
|
||||||
Function{
|
Function{
|
||||||
@@ -14,7 +87,13 @@ void Function::register_extented(BEd &ctx) {
|
|||||||
.default_address = "",
|
.default_address = "",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &, const buffer::Address &, vase::Shard *, const Argument &arg_, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &,
|
||||||
|
const buffer::Address &,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &arg_,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto path = std::get<std::string>(arg_);
|
auto path = std::get<std::string>(arg_);
|
||||||
const auto first = path.find_first_not_of(" \t");
|
const auto first = path.find_first_not_of(" \t");
|
||||||
const auto last = path.find_last_not_of(" \t");
|
const auto last = path.find_last_not_of(" \t");
|
||||||
@@ -46,7 +125,13 @@ void Function::register_extented(BEd &ctx) {
|
|||||||
.default_address = "",
|
.default_address = "",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &, vase::Shard *, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
char cwd[PATH_MAX];
|
char cwd[PATH_MAX];
|
||||||
if (!getcwd(cwd, sizeof(cwd)))
|
if (!getcwd(cwd, sizeof(cwd)))
|
||||||
throw ed_error("Can't determine current directory.");
|
throw ed_error("Can't determine current directory.");
|
||||||
@@ -54,5 +139,88 @@ void Function::register_extented(BEd &ctx) {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
ctx.functions.insert(
|
||||||
|
"x",
|
||||||
|
Function{
|
||||||
|
.address_kind = Function::AddressKind::Range,
|
||||||
|
.argument_kind = Function::ArgumentKind::Range,
|
||||||
|
.input_mode = Function::InputMode::None,
|
||||||
|
.desc = "Exchange a range of lines for another.",
|
||||||
|
.default_address = ".,.",
|
||||||
|
.accept_zero = false,
|
||||||
|
.pre_text_mode = nullptr,
|
||||||
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &arg_,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
|
auto addr = std::get<buffer::Range>(addr_);
|
||||||
|
auto arg = std::get<buffer::Range>(arg_);
|
||||||
|
auto text = ctx.buffer(addr.buffername).copy(addr.start, addr.end);
|
||||||
|
try {
|
||||||
|
ctx.buffer(arg.buffername).replace(ctx, text, arg.start, arg.end);
|
||||||
|
vase::Shard::release(text);
|
||||||
|
} catch (...) {
|
||||||
|
vase::Shard::release(text);
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
ctx.functions.insert(
|
||||||
|
"U",
|
||||||
|
Function{
|
||||||
|
.address_kind = Function::AddressKind::None,
|
||||||
|
.argument_kind = Function::ArgumentKind::None,
|
||||||
|
.input_mode = Function::InputMode::None,
|
||||||
|
.desc = "Redo last undo.",
|
||||||
|
.default_address = "",
|
||||||
|
.accept_zero = false,
|
||||||
|
.pre_text_mode = nullptr,
|
||||||
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
|
auto &addr = std::get<std::string>(addr_);
|
||||||
|
auto &buf_ = ctx.buffer(addr);
|
||||||
|
if (buf_.kind != buffer::Buffer::Kind::Generic)
|
||||||
|
throw ed_error("Can't redo buffer");
|
||||||
|
auto &buf = *(buffer::GenericBuffer *)&buf_;
|
||||||
|
if (!buf.redo(ctx))
|
||||||
|
throw ed_error("Can't redo buffer.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
ctx.functions.insert(
|
||||||
|
"hl",
|
||||||
|
Function{
|
||||||
|
.address_kind = Function::AddressKind::None,
|
||||||
|
.argument_kind = Function::ArgumentKind::None,
|
||||||
|
.input_mode = Function::InputMode::None,
|
||||||
|
.desc = "List history versions.",
|
||||||
|
.default_address = "",
|
||||||
|
.accept_zero = false,
|
||||||
|
.pre_text_mode = nullptr,
|
||||||
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
|
auto &addr = std::get<std::string>(addr_);
|
||||||
|
auto &buf_ = ctx.buffer(addr);
|
||||||
|
if (buf_.kind != buffer::Buffer::Kind::Generic)
|
||||||
|
throw ed_error("Can't redo buffer");
|
||||||
|
auto &buf = *(buffer::GenericBuffer *)&buf_;
|
||||||
|
buf.list_history(ctx);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
} // namespace bed::internal::functions
|
} // namespace bed::internal::functions
|
||||||
|
|||||||
+231
-54
@@ -38,10 +38,15 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = ".",
|
.default_address = ".",
|
||||||
.accept_zero = true,
|
.accept_zero = true,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *text, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *text,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto addr = std::get<buffer::Line>(addr_);
|
auto addr = std::get<buffer::Line>(addr_);
|
||||||
ctx.buffer(addr.buffername).append(ctx, text, addr.number);
|
ctx.buffer(addr.buffername).append(ctx, text, addr.number);
|
||||||
ctx.current() = {ctx.prev().buffername, ctx.prev().end};
|
|
||||||
vase::Shard::release(text);
|
vase::Shard::release(text);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -56,11 +61,15 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = ".,.",
|
.default_address = ".,.",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *text, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *text,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto addr = std::get<buffer::Range>(addr_);
|
auto addr = std::get<buffer::Range>(addr_);
|
||||||
ctx.buffer(addr.buffername).remove(ctx, addr.start, addr.end);
|
ctx.buffer(addr.buffername).replace(ctx, text, addr.start, addr.end);
|
||||||
ctx.buffer(addr.buffername).append(ctx, text, addr.start - 1);
|
|
||||||
ctx.current() = {ctx.prev().buffername, ctx.prev().end};
|
|
||||||
vase::Shard::release(text);
|
vase::Shard::release(text);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -75,10 +84,15 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = ".,.",
|
.default_address = ".,.",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto addr = std::get<buffer::Range>(addr_);
|
auto addr = std::get<buffer::Range>(addr_);
|
||||||
ctx.buffer(addr.buffername).remove(ctx, addr.start, addr.end);
|
ctx.buffer(addr.buffername).remove(ctx, addr.start, addr.end);
|
||||||
ctx.current() = {addr.buffername, addr.start};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@@ -92,7 +106,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = "",
|
.default_address = "",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &arg, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &arg,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto &addr = std::get<std::string>(addr_);
|
auto &addr = std::get<std::string>(addr_);
|
||||||
auto &buf = ctx.buffer(addr);
|
auto &buf = ctx.buffer(addr);
|
||||||
if (buf.state == buffer::Buffer::Modified) {
|
if (buf.state == buffer::Buffer::Modified) {
|
||||||
@@ -121,8 +141,8 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
vase::Shard::release(s);
|
vase::Shard::release(s);
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
|
if (!ctx.suppress_mode)
|
||||||
ctx.io.write_line(std::format("{}", buf.bytes()));
|
ctx.io.write_line(std::format("{}", buf.bytes()));
|
||||||
ctx.current() = {addr, buf.lines()};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@@ -136,7 +156,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = "",
|
.default_address = "",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &arg, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &arg,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto &addr = std::get<std::string>(addr_);
|
auto &addr = std::get<std::string>(addr_);
|
||||||
auto &buf = ctx.buffer(addr);
|
auto &buf = ctx.buffer(addr);
|
||||||
vase::Shard *s = nullptr;
|
vase::Shard *s = nullptr;
|
||||||
@@ -161,8 +187,8 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
vase::Shard::release(s);
|
vase::Shard::release(s);
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
|
if (!ctx.suppress_mode)
|
||||||
ctx.io.write_line(std::format("{}", buf.bytes()));
|
ctx.io.write_line(std::format("{}", buf.bytes()));
|
||||||
ctx.current() = {addr, buf.lines()};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@@ -176,12 +202,15 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = "",
|
.default_address = "",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &arg, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &arg,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto &addr = std::get<std::string>(addr_);
|
auto &addr = std::get<std::string>(addr_);
|
||||||
auto &buf_ = ctx.buffer(addr);
|
auto &buf = ctx.buffer(addr);
|
||||||
if (buf_.kind != buffer::Buffer::Kind::Generic)
|
|
||||||
return;
|
|
||||||
auto &buf = *(buffer::GenericBuffer *)&buf_;
|
|
||||||
if (std::holds_alternative<std::filesystem::path>(arg))
|
if (std::holds_alternative<std::filesystem::path>(arg))
|
||||||
buf.set_filename(std::get<std::filesystem::path>(arg));
|
buf.set_filename(std::get<std::filesystem::path>(arg));
|
||||||
else if (std::holds_alternative<ShellArg>(arg))
|
else if (std::holds_alternative<ShellArg>(arg))
|
||||||
@@ -202,7 +231,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = "",
|
.default_address = "",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &, vase::Shard *, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
ctx.io.write_line(ctx.last_help);
|
ctx.io.write_line(ctx.last_help);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -217,7 +252,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = "",
|
.default_address = "",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &, vase::Shard *, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
ctx.help_mode = !ctx.help_mode;
|
ctx.help_mode = !ctx.help_mode;
|
||||||
if (ctx.help_mode)
|
if (ctx.help_mode)
|
||||||
ctx.io.write_line(ctx.last_help);
|
ctx.io.write_line(ctx.last_help);
|
||||||
@@ -234,12 +275,17 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = ".",
|
.default_address = ".",
|
||||||
.accept_zero = true,
|
.accept_zero = true,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *text, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *text,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto addr = std::get<buffer::Line>(addr_);
|
auto addr = std::get<buffer::Line>(addr_);
|
||||||
if (addr.number)
|
if (addr.number)
|
||||||
addr.number--;
|
addr.number--;
|
||||||
ctx.buffer(addr.buffername).append(ctx, text, addr.number);
|
ctx.buffer(addr.buffername).append(ctx, text, addr.number);
|
||||||
ctx.current() = {ctx.prev().buffername, ctx.prev().end};
|
|
||||||
vase::Shard::release(text);
|
vase::Shard::release(text);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -254,10 +300,15 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = ".,.+1",
|
.default_address = ".,.+1",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto addr = std::get<buffer::Range>(addr_);
|
auto addr = std::get<buffer::Range>(addr_);
|
||||||
ctx.buffer(addr.buffername).join(ctx, addr.start, addr.end);
|
ctx.buffer(addr.buffername).join(ctx, addr.start, addr.end);
|
||||||
ctx.current() = {addr.buffername, addr.start};
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@@ -271,7 +322,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = ".",
|
.default_address = ".",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &arg, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &arg,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto &addr = std::get<buffer::Line>(addr_);
|
auto &addr = std::get<buffer::Line>(addr_);
|
||||||
ctx.mark(std::get<char>(arg), addr);
|
ctx.mark(std::get<char>(arg), addr);
|
||||||
}
|
}
|
||||||
@@ -287,7 +344,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = ".,.",
|
.default_address = ".,.",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto addr = std::get<buffer::Range>(addr_);
|
auto addr = std::get<buffer::Range>(addr_);
|
||||||
ctx.buffer(addr.buffername).list_print(ctx, addr.start, addr.end);
|
ctx.buffer(addr.buffername).list_print(ctx, addr.start, addr.end);
|
||||||
ctx.current() = {addr.buffername, addr.end};
|
ctx.current() = {addr.buffername, addr.end};
|
||||||
@@ -304,7 +367,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = ".,.",
|
.default_address = ".,.",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &arg_, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &arg_,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto addr = std::get<buffer::Range>(addr_);
|
auto addr = std::get<buffer::Range>(addr_);
|
||||||
auto arg = std::get<buffer::Line>(arg_);
|
auto arg = std::get<buffer::Line>(arg_);
|
||||||
if (arg.buffername == addr.buffername
|
if (arg.buffername == addr.buffername
|
||||||
@@ -329,7 +398,6 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
vase::Shard::release(text);
|
vase::Shard::release(text);
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
ctx.current() = {arg.buffername, arg.number + addr.end - addr.start + 1};
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@@ -343,7 +411,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = ".,.",
|
.default_address = ".,.",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto addr = std::get<buffer::Range>(addr_);
|
auto addr = std::get<buffer::Range>(addr_);
|
||||||
ctx.buffer(addr.buffername).number_print(ctx, addr.start, addr.end);
|
ctx.buffer(addr.buffername).number_print(ctx, addr.start, addr.end);
|
||||||
ctx.current() = {addr.buffername, addr.end};
|
ctx.current() = {addr.buffername, addr.end};
|
||||||
@@ -360,7 +434,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = ".,.",
|
.default_address = ".,.",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto addr = std::get<buffer::Range>(addr_);
|
auto addr = std::get<buffer::Range>(addr_);
|
||||||
ctx.buffer(addr.buffername).print(ctx, addr.start, addr.end);
|
ctx.buffer(addr.buffername).print(ctx, addr.start, addr.end);
|
||||||
ctx.current() = {addr.buffername, addr.end};
|
ctx.current() = {addr.buffername, addr.end};
|
||||||
@@ -371,17 +451,28 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
"P",
|
"P",
|
||||||
Function{
|
Function{
|
||||||
.address_kind = Function::AddressKind::None,
|
.address_kind = Function::AddressKind::None,
|
||||||
.argument_kind = Function::ArgumentKind::None,
|
.argument_kind = Function::ArgumentKind::Any,
|
||||||
.input_mode = Function::InputMode::None,
|
.input_mode = Function::InputMode::None,
|
||||||
.desc = "Toggle prompt.",
|
.desc = "Toggle/set prompt.",
|
||||||
.default_address = "",
|
.default_address = "",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &, vase::Shard *, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
ctx.prompt_mode = !ctx.prompt_mode;
|
BEd &ctx,
|
||||||
if (ctx.prompt_mode && !ctx.prompt) {
|
const buffer::Address &,
|
||||||
ctx.prompt = [](BEd &) { return "*"; };
|
vase::Shard *,
|
||||||
|
const Argument &arg_,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
|
auto &arg = std::get<std::string>(arg_);
|
||||||
|
if (arg.size()) {
|
||||||
|
ctx.prompt_mode = true;
|
||||||
|
ctx.prompt = [arg](BEd &) { return arg; };
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
ctx.prompt_mode = !ctx.prompt_mode;
|
||||||
|
if (ctx.prompt_mode && !ctx.prompt)
|
||||||
|
ctx.prompt = [](BEd &) { return "*"; };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@@ -395,7 +486,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = "",
|
.default_address = "",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &, vase::Shard *, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
std::string modified_buffers;
|
std::string modified_buffers;
|
||||||
for (auto &[name, buffer] : ctx.buffers) {
|
for (auto &[name, buffer] : ctx.buffers) {
|
||||||
if (buffer->state == buffer::Buffer::Modified) {
|
if (buffer->state == buffer::Buffer::Modified) {
|
||||||
@@ -420,7 +517,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = "",
|
.default_address = "",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &, const buffer::Address &, vase::Shard *, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &,
|
||||||
|
const buffer::Address &,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
throw fatal_error("Force Quitting", 0);
|
throw fatal_error("Force Quitting", 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -435,7 +538,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = "$",
|
.default_address = "$",
|
||||||
.accept_zero = true,
|
.accept_zero = true,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &arg, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &arg,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto &addr = std::get<buffer::Line>(addr_);
|
auto &addr = std::get<buffer::Line>(addr_);
|
||||||
auto &buf = ctx.buffer(addr.buffername);
|
auto &buf = ctx.buffer(addr.buffername);
|
||||||
vase::Shard *s = nullptr;
|
vase::Shard *s = nullptr;
|
||||||
@@ -456,13 +565,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
};
|
};
|
||||||
try {
|
try {
|
||||||
buf.append(ctx, s, addr.number);
|
buf.append(ctx, s, addr.number);
|
||||||
ctx.io.write_line(std::format("{}", s ? s->length + 1 : 0));
|
|
||||||
ctx.current() = {addr.buffername, addr.number + (s ? s->lines + 1 : 0)};
|
|
||||||
vase::Shard::release(s);
|
vase::Shard::release(s);
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
vase::Shard::release(s);
|
vase::Shard::release(s);
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
|
if (!ctx.suppress_mode)
|
||||||
|
ctx.io.write_line(std::format("{}", s ? s->length + 1 : 0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@@ -476,7 +585,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = ".,.",
|
.default_address = ".,.",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &arg_, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &arg_,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto &addr = std::get<buffer::Range>(addr_);
|
auto &addr = std::get<buffer::Range>(addr_);
|
||||||
auto arg = std::get<RegexArg>(arg_);
|
auto arg = std::get<RegexArg>(arg_);
|
||||||
if (arg.expression == "")
|
if (arg.expression == "")
|
||||||
@@ -509,7 +624,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = ".,.",
|
.default_address = ".,.",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &arg_, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &arg_,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto addr = std::get<buffer::Range>(addr_);
|
auto addr = std::get<buffer::Range>(addr_);
|
||||||
auto arg = std::get<buffer::Line>(arg_);
|
auto arg = std::get<buffer::Line>(arg_);
|
||||||
auto text = ctx.buffer(addr.buffername).copy(addr.start, addr.end);
|
auto text = ctx.buffer(addr.buffername).copy(addr.start, addr.end);
|
||||||
@@ -517,18 +638,39 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
ctx.buffer(arg.buffername).append(ctx, text, arg.number);
|
ctx.buffer(arg.buffername).append(ctx, text, arg.number);
|
||||||
vase::Shard::release(text);
|
vase::Shard::release(text);
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
if (!addr.start) {
|
|
||||||
vase::Shard::release(text);
|
vase::Shard::release(text);
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
ctx.buffer(addr.buffername).append(ctx, text, --addr.start);
|
|
||||||
vase::Shard::release(text);
|
|
||||||
throw;
|
|
||||||
}
|
|
||||||
ctx.current() = {arg.buffername, arg.number + addr.end - addr.start + 1};
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
ctx.functions.insert(
|
||||||
|
"u",
|
||||||
|
Function{
|
||||||
|
.address_kind = Function::AddressKind::None,
|
||||||
|
.argument_kind = Function::ArgumentKind::None,
|
||||||
|
.input_mode = Function::InputMode::None,
|
||||||
|
.desc = "Undo last modification to buffer.",
|
||||||
|
.default_address = "",
|
||||||
|
.accept_zero = false,
|
||||||
|
.pre_text_mode = nullptr,
|
||||||
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
|
auto &addr = std::get<std::string>(addr_);
|
||||||
|
auto &buf_ = ctx.buffer(addr);
|
||||||
|
if (buf_.kind != buffer::Buffer::Kind::Generic)
|
||||||
|
throw ed_error("Can't undo buffer");
|
||||||
|
auto &buf = *(buffer::GenericBuffer *)&buf_;
|
||||||
|
if (!buf.undo(ctx))
|
||||||
|
throw ed_error("Can't undo buffer.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
ctx.functions.insert(
|
ctx.functions.insert(
|
||||||
"w",
|
"w",
|
||||||
Function{
|
Function{
|
||||||
@@ -539,7 +681,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = "0,$",
|
.default_address = "0,$",
|
||||||
.accept_zero = true,
|
.accept_zero = true,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &arg, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &arg,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto addr = std::get<buffer::Range>(addr_);
|
auto addr = std::get<buffer::Range>(addr_);
|
||||||
auto &buf = ctx.buffer(addr.buffername);
|
auto &buf = ctx.buffer(addr.buffername);
|
||||||
vase::Shard *text;
|
vase::Shard *text;
|
||||||
@@ -565,12 +713,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
throw ed_error("Need filename.");
|
throw ed_error("Need filename.");
|
||||||
vase::write_file(path, text);
|
vase::write_file(path, text);
|
||||||
};
|
};
|
||||||
ctx.io.write(std::format("{}\n", text ? text->length + 1 : 0));
|
|
||||||
vase::Shard::release(text);
|
vase::Shard::release(text);
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
vase::Shard::release(text);
|
vase::Shard::release(text);
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
|
if (!ctx.suppress_mode)
|
||||||
|
ctx.io.write(std::format("{}\n", text ? text->length + 1 : 0));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@@ -584,12 +733,21 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = "$",
|
.default_address = "$",
|
||||||
.accept_zero = true,
|
.accept_zero = true,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto &addr = std::get<buffer::Range>(addr_);
|
auto &addr = std::get<buffer::Range>(addr_);
|
||||||
if (addr.start == addr.end)
|
if (addr.start == addr.end)
|
||||||
ctx.io.write_line(std::format(":{}:{}", addr.buffername, addr.start));
|
ctx.io.write_line(std::format(":{}:{}", addr.buffername, addr.start));
|
||||||
else
|
else
|
||||||
ctx.io.write_line(std::format(":{}:{},{}", addr.buffername, addr.start, addr.end));
|
ctx.io.write_line(std::format(":{}:{},{}", addr.buffername, addr.start, addr.end));
|
||||||
|
ctx.prev().buffername = addr.buffername;
|
||||||
|
ctx.prev().start = addr.start;
|
||||||
|
ctx.prev().end = addr.end;
|
||||||
ctx.current() = {addr.buffername, addr.end};
|
ctx.current() = {addr.buffername, addr.end};
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@@ -604,7 +762,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = "",
|
.default_address = "",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &arg_, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &arg_,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto &addr = std::get<std::string>(addr_);
|
auto &addr = std::get<std::string>(addr_);
|
||||||
auto filename = ctx.buffer(addr).filename();
|
auto filename = ctx.buffer(addr).filename();
|
||||||
auto &arg = std::get<ShellArg>(arg_);
|
auto &arg = std::get<ShellArg>(arg_);
|
||||||
@@ -612,6 +776,7 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
if (ctx.escape_command(cmd, filename.string()))
|
if (ctx.escape_command(cmd, filename.string()))
|
||||||
ctx.io.write(cmd + "\n");
|
ctx.io.write(cmd + "\n");
|
||||||
ctx.io.run_pty(cmd);
|
ctx.io.run_pty(cmd);
|
||||||
|
if (!ctx.suppress_mode)
|
||||||
ctx.io.write("!\n");
|
ctx.io.write("!\n");
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@@ -624,7 +789,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = ".+1",
|
.default_address = ".+1",
|
||||||
.accept_zero = true,
|
.accept_zero = true,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &addr_, vase::Shard *, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &addr_,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
auto addr = std::get<buffer::Line>(addr_);
|
auto addr = std::get<buffer::Line>(addr_);
|
||||||
if (addr.number != 0)
|
if (addr.number != 0)
|
||||||
ctx.buffer(addr.buffername).print(ctx, addr.number, addr.number);
|
ctx.buffer(addr.buffername).print(ctx, addr.number, addr.number);
|
||||||
@@ -639,7 +810,13 @@ void Function::register_posix(BEd &ctx) {
|
|||||||
.default_address = "",
|
.default_address = "",
|
||||||
.accept_zero = false,
|
.accept_zero = false,
|
||||||
.pre_text_mode = nullptr,
|
.pre_text_mode = nullptr,
|
||||||
.handle = [](BEd &ctx, const buffer::Address &, vase::Shard *, const Argument &, std::vector<buffer::Line> *) {
|
.handle = [](
|
||||||
|
BEd &ctx,
|
||||||
|
const buffer::Address &,
|
||||||
|
vase::Shard *,
|
||||||
|
const Argument &,
|
||||||
|
std::vector<buffer::Line> *
|
||||||
|
) {
|
||||||
std::string modified_buffers;
|
std::string modified_buffers;
|
||||||
for (auto &[name, buffer] : ctx.buffers) {
|
for (auto &[name, buffer] : ctx.buffers) {
|
||||||
if (buffer->state == buffer::Buffer::Modified) {
|
if (buffer->state == buffer::Buffer::Modified) {
|
||||||
|
|||||||
@@ -1,6 +1,31 @@
|
|||||||
#include "internal/io/io.h"
|
#include "internal/io/io.h"
|
||||||
|
|
||||||
namespace bed::internal::io {
|
namespace bed::internal::io {
|
||||||
|
std::pair<std::string, bool> IO::read_pipe() {
|
||||||
|
char buf[4096];
|
||||||
|
while (true) {
|
||||||
|
auto pos = pipe_input.find('\n');
|
||||||
|
if (pos != std::string::npos) {
|
||||||
|
std::string line = pipe_input.substr(0, pos);
|
||||||
|
pipe_input.erase(0, pos + 1);
|
||||||
|
return {line, false};
|
||||||
|
}
|
||||||
|
ssize_t n = read(STDIN_FILENO, buf, sizeof(buf));
|
||||||
|
if (n > 0) {
|
||||||
|
pipe_input.append(buf, n);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (n == 0) {
|
||||||
|
std::string line = std::move(pipe_input);
|
||||||
|
pipe_input.clear();
|
||||||
|
return {line, true};
|
||||||
|
}
|
||||||
|
if (errno == EINTR)
|
||||||
|
continue;
|
||||||
|
throw fatal_error("Can't read stdin.", 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
KeyEvent::ReadResult IO::get_next_byte(char &out) {
|
KeyEvent::ReadResult IO::get_next_byte(char &out) {
|
||||||
if (!input_queue.empty()) {
|
if (!input_queue.empty()) {
|
||||||
out = input_queue.front();
|
out = input_queue.front();
|
||||||
|
|||||||
+18
-2
@@ -5,8 +5,12 @@ termios IO::orig_termios{};
|
|||||||
termios IO::raw_termios{};
|
termios IO::raw_termios{};
|
||||||
bool IO::cleaned = true;
|
bool IO::cleaned = true;
|
||||||
volatile std::atomic_bool IO::resized(false);
|
volatile std::atomic_bool IO::resized(false);
|
||||||
|
IO::Mode IO::mode = IO::Mode::PIPE;
|
||||||
|
|
||||||
IO::IO() {
|
IO::IO() {
|
||||||
|
if (!isatty(STDIN_FILENO))
|
||||||
|
return;
|
||||||
|
mode = Mode::TERMINAL;
|
||||||
if (tcgetattr(STDIN_FILENO, &orig_termios) == -1)
|
if (tcgetattr(STDIN_FILENO, &orig_termios) == -1)
|
||||||
throw fatal_error("Can't get terminal state.", 1);
|
throw fatal_error("Can't get terminal state.", 1);
|
||||||
struct sigaction sa{};
|
struct sigaction sa{};
|
||||||
@@ -30,16 +34,22 @@ IO::~IO() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void IO::enable_mouse() {
|
void IO::enable_mouse() {
|
||||||
|
if (mode == Mode::PIPE)
|
||||||
|
throw fatal_error("no mouse in pipe mode.", 1);
|
||||||
const char *seq = "\x1b[?1000h";
|
const char *seq = "\x1b[?1000h";
|
||||||
write_all(STDOUT_FILENO, seq, 8);
|
write_all(STDOUT_FILENO, seq, 8);
|
||||||
}
|
}
|
||||||
|
|
||||||
void IO::disable_mouse() {
|
void IO::disable_mouse() {
|
||||||
|
if (mode == Mode::PIPE)
|
||||||
|
throw fatal_error("no mouse in pipe mode.", 1);
|
||||||
const char *seq = "\x1b[?1000l";
|
const char *seq = "\x1b[?1000l";
|
||||||
write_all(STDOUT_FILENO, seq, 8);
|
write_all(STDOUT_FILENO, seq, 8);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::pair<uint16_t, uint16_t> IO::terminal_size() {
|
std::pair<uint16_t, uint16_t> IO::terminal_size() {
|
||||||
|
if (mode == Mode::PIPE)
|
||||||
|
throw fatal_error("no terminal size in pipe mode.", 1);
|
||||||
struct winsize ws{};
|
struct winsize ws{};
|
||||||
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1)
|
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1)
|
||||||
throw fatal_error("Can't get terminal size.", 1);
|
throw fatal_error("Can't get terminal size.", 1);
|
||||||
@@ -47,6 +57,8 @@ std::pair<uint16_t, uint16_t> IO::terminal_size() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::pair<uint16_t, uint16_t> IO::cursor_position() {
|
std::pair<uint16_t, uint16_t> IO::cursor_position() {
|
||||||
|
if (mode == Mode::PIPE)
|
||||||
|
throw fatal_error("no cursor in pipe mode.", 1);
|
||||||
write_all(STDOUT_FILENO, "\x1b[6n", 4);
|
write_all(STDOUT_FILENO, "\x1b[6n", 4);
|
||||||
std::string response;
|
std::string response;
|
||||||
char c;
|
char c;
|
||||||
@@ -69,7 +81,7 @@ std::pair<uint16_t, uint16_t> IO::cursor_position() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void IO::enable_raw() {
|
void IO::enable_raw() {
|
||||||
if (!cleaned)
|
if (!cleaned || mode == Mode::PIPE)
|
||||||
return;
|
return;
|
||||||
std::string os = "\x1b[?2004h";
|
std::string os = "\x1b[?2004h";
|
||||||
write_all(STDOUT_FILENO, os.c_str(), os.size());
|
write_all(STDOUT_FILENO, os.c_str(), os.size());
|
||||||
@@ -79,7 +91,7 @@ void IO::enable_raw() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void IO::cleanup() {
|
void IO::cleanup() {
|
||||||
if (cleaned)
|
if (cleaned || mode == Mode::PIPE)
|
||||||
return;
|
return;
|
||||||
std::string os = "\x1b[?1000l\x1b[?2004l";
|
std::string os = "\x1b[?1000l\x1b[?2004l";
|
||||||
write_all(STDOUT_FILENO, os.c_str(), os.size());
|
write_all(STDOUT_FILENO, os.c_str(), os.size());
|
||||||
@@ -93,6 +105,8 @@ void IO::handle_sigwinch(int) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void IO::move_cursor(uint16_t row, uint16_t col) {
|
void IO::move_cursor(uint16_t row, uint16_t col) {
|
||||||
|
if (mode == Mode::PIPE)
|
||||||
|
return;
|
||||||
char buf[32];
|
char buf[32];
|
||||||
int n = snprintf(buf, sizeof(buf), "\x1b[%u;%uH", row, col);
|
int n = snprintf(buf, sizeof(buf), "\x1b[%u;%uH", row, col);
|
||||||
write_all(STDOUT_FILENO, buf, n);
|
write_all(STDOUT_FILENO, buf, n);
|
||||||
@@ -112,6 +126,8 @@ void IO::write_line(std::string_view s) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void IO::run_pty(const std::string &cmd) {
|
void IO::run_pty(const std::string &cmd) {
|
||||||
|
if (mode == Mode::PIPE)
|
||||||
|
throw ed_error("Shell running not allowed in pipe mode.");
|
||||||
int master_fd = -1;
|
int master_fd = -1;
|
||||||
struct winsize ws{};
|
struct winsize ws{};
|
||||||
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1)
|
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1)
|
||||||
|
|||||||
@@ -165,12 +165,13 @@ void Parser::operation() {
|
|||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
std::string replacement(peek_str(j));
|
std::string replacement(peek_str(j));
|
||||||
|
std::string options;
|
||||||
if (peek(j) != '\0') {
|
if (peek(j) != '\0') {
|
||||||
advance(j + 1);
|
advance(j + 1);
|
||||||
} else {
|
} else {
|
||||||
advance(j);
|
advance(j);
|
||||||
|
options = "p";
|
||||||
}
|
}
|
||||||
std::string options;
|
|
||||||
if (peek() != '\0') {
|
if (peek() != '\0') {
|
||||||
options = std::string(peek_str());
|
options = std::string(peek_str());
|
||||||
advance(peek_str().size());
|
advance(peek_str().size());
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
#include "internal/syntax/parser.h"
|
||||||
|
|
||||||
|
namespace bed::internal::syntax {
|
||||||
|
Iterator::Iterator(uint64_t target, ParserSnapshot p, vase::Shard *vase)
|
||||||
|
: snap(p) {
|
||||||
|
uint64_t offset;
|
||||||
|
TreeCursor c = TreeCursor(*p.lang, p.root, target, &offset);
|
||||||
|
at = target - offset;
|
||||||
|
state = p.lang->copy(c.leaf->state);
|
||||||
|
it = vase::Iterator(vase, at, Direction::Forward);
|
||||||
|
while (at < target) {
|
||||||
|
it->next();
|
||||||
|
tokens.clear();
|
||||||
|
events.clear();
|
||||||
|
p.lang->parse(&state, it->line, at == 0, &tokens, &events);
|
||||||
|
at++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Iterator::~Iterator() {
|
||||||
|
if (state)
|
||||||
|
snap.lang->destroy(state);
|
||||||
|
release(snap);
|
||||||
|
}
|
||||||
|
|
||||||
|
Iterator::Iterator(Iterator &&other)
|
||||||
|
: snap(other.snap),
|
||||||
|
it(std::move(other.it)),
|
||||||
|
state(other.state),
|
||||||
|
tokens(std::move(other.tokens)) {
|
||||||
|
other.snap = {};
|
||||||
|
other.state = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
Iterator &Iterator::operator=(Iterator &&other) {
|
||||||
|
if (this == &other)
|
||||||
|
return *this;
|
||||||
|
if (state)
|
||||||
|
snap.lang->destroy(state);
|
||||||
|
snap = other.snap;
|
||||||
|
it = std::move(other.it);
|
||||||
|
state = other.state;
|
||||||
|
tokens = std::move(other.tokens);
|
||||||
|
other.state = nullptr;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Iterator::next() {
|
||||||
|
it->next();
|
||||||
|
tokens.clear();
|
||||||
|
events.clear();
|
||||||
|
snap.lang->parse(&state, it->line, at++ == 0, &tokens, &events);
|
||||||
|
}
|
||||||
|
} // namespace bed::internal::syntax
|
||||||
+68
-312
@@ -1,265 +1,32 @@
|
|||||||
#include "internal/syntax/parser.h"
|
#include "internal/syntax/parser.h"
|
||||||
|
|
||||||
namespace bed::internal::syntax {
|
namespace bed::internal::syntax {
|
||||||
static void destroy_tree(ParseState *node, Language &lang) {
|
ParserSnapshot make_parser(vase::Shard *vase, uint64_t lines, Language *lang) {
|
||||||
if (!node)
|
ParserSnapshot snap{nullptr, lang};
|
||||||
return;
|
|
||||||
if (node->is_branch()) {
|
|
||||||
auto *branch = (ParseStateBranch *)node;
|
|
||||||
destroy_tree(branch->left, lang);
|
|
||||||
destroy_tree(branch->right, lang);
|
|
||||||
free(branch);
|
|
||||||
} else {
|
|
||||||
auto *leaf = (ParseStateLeaf *)node;
|
|
||||||
if (leaf->state)
|
|
||||||
lang.destroy(leaf->state);
|
|
||||||
if (leaf->blocks)
|
|
||||||
free(leaf->blocks);
|
|
||||||
free(leaf);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static ParseState *make_branch(ParseState *left, ParseState *right) {
|
|
||||||
if (!left)
|
|
||||||
return right;
|
|
||||||
if (!right)
|
|
||||||
return left;
|
|
||||||
auto *branch = (ParseStateBranch *)malloc(sizeof(ParseStateBranch));
|
|
||||||
branch->header = ParseState::BRANCH_BIT + left->lines() + right->lines();
|
|
||||||
branch->left = left;
|
|
||||||
branch->right = right;
|
|
||||||
return branch;
|
|
||||||
}
|
|
||||||
|
|
||||||
static ParseState *build_tree(std::vector<ParseStateLeaf *> &leaves, size_t begin, size_t end) {
|
|
||||||
const size_t count = end - begin;
|
|
||||||
if (count == 0)
|
|
||||||
return nullptr;
|
|
||||||
if (count == 1)
|
|
||||||
return leaves[begin];
|
|
||||||
const size_t mid = begin + count / 2;
|
|
||||||
ParseState *left = build_tree(leaves, begin, mid);
|
|
||||||
ParseState *right = build_tree(leaves, mid, end);
|
|
||||||
return make_branch(left, right);
|
|
||||||
}
|
|
||||||
|
|
||||||
Parser::Parser(vase::Shard *vase, uint64_t lines, Language lang)
|
|
||||||
: root(nullptr), lang(lang) {
|
|
||||||
reset(vase, lines, lang);
|
|
||||||
}
|
|
||||||
|
|
||||||
Parser::~Parser() {
|
|
||||||
destroy_tree(root, lang);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Parser::reset(vase::Shard *vase, uint64_t lines, Language lang_) {
|
|
||||||
destroy_tree(root, lang);
|
|
||||||
root = nullptr;
|
|
||||||
if (lines == 0)
|
if (lines == 0)
|
||||||
return;
|
return snap;
|
||||||
lang = std::move(lang_);
|
if (lang)
|
||||||
std::vector<ParseStateLeaf *> leaves;
|
snap.root = ParseState::splice(*lang, nullptr, vase, 0, 0, lines);
|
||||||
leaves.reserve((lines + MAX_CHUNK - 1) / MAX_CHUNK);
|
return snap;
|
||||||
uint64_t consumed = 0;
|
|
||||||
while (consumed < lines) {
|
|
||||||
auto *leaf = (ParseStateLeaf *)malloc(sizeof(ParseStateLeaf));
|
|
||||||
leaf->state = nullptr;
|
|
||||||
leaf->blocks = nullptr;
|
|
||||||
leaf->n = 0;
|
|
||||||
leaf->cap = 0;
|
|
||||||
uint64_t chunk = std::min(MAX_CHUNK, lines - consumed);
|
|
||||||
leaf->header = chunk;
|
|
||||||
consumed += chunk;
|
|
||||||
leaves.push_back(leaf);
|
|
||||||
}
|
|
||||||
root = build_tree(leaves, 0, leaves.size());
|
|
||||||
modify(vase, 0, lines);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::pair<ParseState *, ParseState *> Parser::split_tree(ParseState *node, uint64_t line) {
|
ParserSnapshot retain(const ParserSnapshot &snap) {
|
||||||
if (!node)
|
if (snap.root)
|
||||||
return {nullptr, nullptr};
|
ParseState::retain(snap.root);
|
||||||
if (line == 0)
|
return snap;
|
||||||
return {nullptr, node};
|
|
||||||
if (line >= node->lines())
|
|
||||||
return {node, nullptr};
|
|
||||||
if (node->is_branch()) {
|
|
||||||
auto *branch = (ParseStateBranch *)node;
|
|
||||||
uint64_t left_lines = branch->left->lines();
|
|
||||||
if (line < left_lines) {
|
|
||||||
auto [a, b] = split_tree(branch->left, line);
|
|
||||||
ParseState *right = join_tree(b, branch->right);
|
|
||||||
free(branch);
|
|
||||||
return {a, right};
|
|
||||||
}
|
|
||||||
if (line == left_lines) {
|
|
||||||
ParseState *left = branch->left;
|
|
||||||
ParseState *right = branch->right;
|
|
||||||
free(branch);
|
|
||||||
return {left, right};
|
|
||||||
}
|
|
||||||
auto [a, b] = split_tree(branch->right, line - left_lines);
|
|
||||||
ParseState *left = join_tree(branch->left, a);
|
|
||||||
free(branch);
|
|
||||||
return {left, b};
|
|
||||||
} else {
|
|
||||||
auto *leaf = (ParseStateLeaf *)node;
|
|
||||||
uint64_t lines = leaf->lines();
|
|
||||||
auto *right = (ParseStateLeaf *)malloc(sizeof(ParseStateLeaf));
|
|
||||||
right->header = lines - line;
|
|
||||||
right->state = nullptr;
|
|
||||||
right->blocks = nullptr;
|
|
||||||
right->n = 0;
|
|
||||||
right->cap = 0;
|
|
||||||
leaf->header = line;
|
|
||||||
leaf->n = 0;
|
|
||||||
return {leaf, right};
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ParseState *Parser::join_tree(ParseState *a, ParseState *b) {
|
void release(ParserSnapshot &snap) {
|
||||||
// TODO: balance
|
if (snap.root && snap.lang)
|
||||||
return make_branch(a, b);
|
ParseState::release(*snap.lang, snap.root);
|
||||||
|
snap.root = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Parser::erase(vase::Shard *vase, uint64_t start, uint64_t count) {
|
uint64_t next_closing(const ParserSnapshot &snap, uint64_t line) {
|
||||||
begin_edit();
|
if (!snap.root || !snap.lang)
|
||||||
erase(start, count);
|
return line + 10;
|
||||||
end_edit(vase);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Parser::insert(vase::Shard *vase, uint64_t start, uint64_t count) {
|
|
||||||
begin_edit();
|
|
||||||
insert(start, count);
|
|
||||||
end_edit(vase);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Parser::modify(vase::Shard *vase, uint64_t target, uint64_t count) {
|
|
||||||
if (count == 0 || !root)
|
|
||||||
return;
|
|
||||||
std::vector<Token> tokens;
|
|
||||||
std::vector<ParseEvent> events;
|
|
||||||
uint64_t offset;
|
|
||||||
TreeCursor c = TreeCursor(root, target, &offset);
|
|
||||||
uint64_t at = target - offset;
|
|
||||||
void *state = nullptr;
|
|
||||||
if (c.leaf->state) {
|
|
||||||
state = lang.copy(c.leaf->state);
|
|
||||||
} else {
|
|
||||||
while (!c.leaf->state) {
|
|
||||||
c.prev();
|
|
||||||
if (!c.leaf) {
|
|
||||||
at = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
at -= c.leaf->lines();
|
|
||||||
}
|
|
||||||
if (c.leaf) {
|
|
||||||
state = lang.copy(c.leaf->state);
|
|
||||||
} else {
|
|
||||||
state = lang.none_state();
|
|
||||||
c = TreeCursor(root, 0, &offset);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
vase::Iterator it(vase, at, Direction::Forward);
|
|
||||||
uint64_t chunk_start = at;
|
|
||||||
uint64_t next_boundary = at + c.leaf->lines();
|
|
||||||
c.leaf->n = 0;
|
|
||||||
while (true) {
|
|
||||||
it.next();
|
|
||||||
if (at == next_boundary) {
|
|
||||||
c.next();
|
|
||||||
if (!c.leaf)
|
|
||||||
break;
|
|
||||||
c.leaf->n = 0;
|
|
||||||
chunk_start = at;
|
|
||||||
next_boundary += c.leaf->lines();
|
|
||||||
if (at >= target + count
|
|
||||||
&& c.leaf->state != nullptr
|
|
||||||
&& lang.equal(state, c.leaf->state))
|
|
||||||
break;
|
|
||||||
if (c.leaf->state)
|
|
||||||
lang.destroy(c.leaf->state);
|
|
||||||
c.leaf->state = lang.copy(state);
|
|
||||||
}
|
|
||||||
tokens.clear();
|
|
||||||
events.clear();
|
|
||||||
lang.parse(&state, it.line, at == 0, &tokens, &events);
|
|
||||||
for (const auto &ev : events) {
|
|
||||||
if (c.leaf->n == c.leaf->cap) {
|
|
||||||
uint32_t cap = c.leaf->cap ? c.leaf->cap * 2 : 8;
|
|
||||||
c.leaf->blocks = (uint16_t *)realloc(c.leaf->blocks, cap * sizeof(uint16_t));
|
|
||||||
c.leaf->cap = cap;
|
|
||||||
}
|
|
||||||
c.leaf->blocks[c.leaf->n++] = ev.closing << 15 | (at - chunk_start);
|
|
||||||
}
|
|
||||||
at++;
|
|
||||||
}
|
|
||||||
lang.destroy(state);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Parser::begin_edit() {
|
|
||||||
in_edit = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Parser::mark_dirty(uint64_t start, uint64_t end) {
|
|
||||||
if (!dirty) {
|
|
||||||
dirty_start = start;
|
|
||||||
dirty_end = end;
|
|
||||||
dirty = true;
|
|
||||||
} else {
|
|
||||||
dirty_start = std::min(dirty_start, start);
|
|
||||||
dirty_end = std::max(dirty_end, end);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void Parser::erase(uint64_t start, uint64_t count) {
|
|
||||||
if (count == 0 || !root)
|
|
||||||
return;
|
|
||||||
auto [a, remaining] = split_tree(root, start);
|
|
||||||
auto [waste, b] = split_tree(remaining, count);
|
|
||||||
destroy_tree(waste, lang);
|
|
||||||
root = join_tree(a, b);
|
|
||||||
mark_dirty(start, start + 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Parser::insert(uint64_t start, uint64_t count) {
|
|
||||||
if (count == 0)
|
|
||||||
return;
|
|
||||||
std::vector<ParseStateLeaf *> leaves;
|
|
||||||
leaves.reserve((count + MAX_CHUNK - 1) / MAX_CHUNK);
|
|
||||||
uint64_t consumed = 0;
|
|
||||||
while (consumed < count) {
|
|
||||||
auto *leaf = (ParseStateLeaf *)malloc(sizeof(ParseStateLeaf));
|
|
||||||
leaf->state = nullptr;
|
|
||||||
leaf->blocks = nullptr;
|
|
||||||
leaf->n = 0;
|
|
||||||
leaf->cap = 0;
|
|
||||||
uint64_t chunk = std::min(MAX_CHUNK, count - consumed);
|
|
||||||
leaf->header = chunk;
|
|
||||||
consumed += chunk;
|
|
||||||
leaves.push_back(leaf);
|
|
||||||
}
|
|
||||||
ParseState *subtree = build_tree(leaves, 0, leaves.size());
|
|
||||||
auto [left, right] = split_tree(root, start);
|
|
||||||
root = join_tree(join_tree(left, subtree), right);
|
|
||||||
mark_dirty(start, start + count);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Parser::end_edit(vase::Shard *vase) {
|
|
||||||
in_edit = false;
|
|
||||||
if (!dirty)
|
|
||||||
return;
|
|
||||||
uint64_t count = dirty_end > dirty_start ? dirty_end - dirty_start : 1;
|
|
||||||
modify(vase, dirty_start, count);
|
|
||||||
dirty = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint64_t Parser::next_closing(uint64_t line) {
|
|
||||||
if (!root)
|
|
||||||
return UINT64_MAX;
|
|
||||||
uint64_t relative = 0;
|
uint64_t relative = 0;
|
||||||
TreeCursor c(root, line, &relative);
|
TreeCursor c(*snap.lang, snap.root, line, &relative);
|
||||||
uint64_t line_offset = line - relative;
|
uint64_t line_offset = line - relative;
|
||||||
int level = 0;
|
int level = 0;
|
||||||
bool first_leaf = true;
|
bool first_leaf = true;
|
||||||
@@ -283,14 +50,14 @@ uint64_t Parser::next_closing(uint64_t line) {
|
|||||||
c.next();
|
c.next();
|
||||||
first_leaf = false;
|
first_leaf = false;
|
||||||
}
|
}
|
||||||
return UINT64_MAX;
|
return (snap.root->lines() - line > 10 ? line + 10 : snap.root->lines());
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t Parser::prev_opening(uint64_t line) {
|
uint64_t prev_opening(const ParserSnapshot &snap, uint64_t line) {
|
||||||
if (!root)
|
if (!snap.root || !snap.lang)
|
||||||
return 0;
|
return 0;
|
||||||
uint64_t relative = 0;
|
uint64_t relative = 0;
|
||||||
TreeCursor c(root, line, &relative);
|
TreeCursor c(*snap.lang, snap.root, line, &relative);
|
||||||
uint64_t line_offset = line - relative;
|
uint64_t line_offset = line - relative;
|
||||||
int level = 0;
|
int level = 0;
|
||||||
bool first_leaf = true;
|
bool first_leaf = true;
|
||||||
@@ -315,77 +82,66 @@ uint64_t Parser::prev_opening(uint64_t line) {
|
|||||||
if (c.leaf)
|
if (c.leaf)
|
||||||
line_offset -= c.leaf->lines();
|
line_offset -= c.leaf->lines();
|
||||||
}
|
}
|
||||||
return 0;
|
return (line > 10 ? line - 10 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::optional<Parser::Iterator> Parser::get_hl(vase::Shard *vase, uint64_t target) {
|
std::optional<Iterator> get_hl(const ParserSnapshot &snap, vase::Shard *vase, uint64_t target) {
|
||||||
if (!root)
|
if (!snap.root || !snap.lang)
|
||||||
return std::nullopt;
|
return std::nullopt;
|
||||||
return Parser::Iterator(target, this, vase);
|
return Iterator(target, retain(snap), vase);
|
||||||
}
|
}
|
||||||
|
|
||||||
Parser::Iterator::Iterator(uint64_t target, Parser *p, vase::Shard *vase) : p(p) {
|
void Edit::mark_dirty(uint64_t start, uint64_t end) {
|
||||||
uint64_t offset;
|
if (!dirty) {
|
||||||
TreeCursor c = TreeCursor(p->root, target, &offset);
|
dirty_start = start;
|
||||||
at = target - offset;
|
dirty_end = end;
|
||||||
if (c.leaf->state) {
|
dirty = true;
|
||||||
state = p->lang.copy(c.leaf->state);
|
|
||||||
} else {
|
} else {
|
||||||
while (!c.leaf->state) {
|
dirty_start = std::min(dirty_start, start);
|
||||||
c.prev();
|
dirty_end = std::max(dirty_end, end);
|
||||||
if (!c.leaf) {
|
|
||||||
at = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
at -= c.leaf->lines();
|
|
||||||
}
|
|
||||||
if (c.leaf) {
|
|
||||||
state = p->lang.copy(c.leaf->state);
|
|
||||||
} else {
|
|
||||||
state = p->lang.none_state();
|
|
||||||
c = TreeCursor(p->root, 0, &offset);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
it = vase::Iterator(vase, at, Direction::Forward);
|
|
||||||
while (at < target) {
|
|
||||||
it->next();
|
|
||||||
tokens.clear();
|
|
||||||
events.clear();
|
|
||||||
p->lang.parse(&state, it->line, at == 0, &tokens, &events);
|
|
||||||
at++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Parser::Iterator::~Iterator() {
|
void Edit::insert(uint64_t start, uint64_t count) {
|
||||||
if (state)
|
if (count == 0)
|
||||||
p->lang.destroy(state);
|
return;
|
||||||
|
uint64_t orig_pos = (uint64_t)((int64_t)start - edit_delta);
|
||||||
|
mark_dirty(orig_pos, orig_pos);
|
||||||
|
edit_delta += (int64_t)count;
|
||||||
}
|
}
|
||||||
|
|
||||||
Parser::Iterator::Iterator(Iterator &&other)
|
void Edit::erase(uint64_t start, uint64_t count) {
|
||||||
: p(other.p),
|
if (count == 0 || !target->root)
|
||||||
it(std::move(other.it)),
|
return;
|
||||||
state(other.state),
|
uint64_t orig_start = (uint64_t)((int64_t)start - edit_delta);
|
||||||
tokens(std::move(other.tokens)) {
|
uint64_t orig_end = orig_start + count;
|
||||||
other.state = nullptr;
|
mark_dirty(orig_start, orig_end);
|
||||||
|
edit_delta -= (int64_t)count;
|
||||||
}
|
}
|
||||||
|
|
||||||
Parser::Iterator &Parser::Iterator::operator=(Iterator &&other) {
|
void Edit::commit(vase::Shard *vase) {
|
||||||
if (this == &other)
|
if (!dirty || !target->lang)
|
||||||
return *this;
|
return;
|
||||||
if (state)
|
uint64_t line = dirty_start;
|
||||||
p->lang.destroy(state);
|
uint64_t original = dirty_end - dirty_start;
|
||||||
p = other.p;
|
uint64_t final = (uint64_t)((int64_t)original + edit_delta);
|
||||||
it = std::move(other.it);
|
ParseState *new_root =
|
||||||
state = other.state;
|
ParseState::splice(*target->lang, target->root, vase, line, original, final);
|
||||||
tokens = std::move(other.tokens);
|
release(*target);
|
||||||
other.state = nullptr;
|
target->root = new_root;
|
||||||
return *this;
|
dirty = false;
|
||||||
|
edit_delta = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Parser::Iterator::next() {
|
void insert(ParserSnapshot &snap, vase::Shard *vase, uint64_t start, uint64_t count) {
|
||||||
it->next();
|
Edit e(snap);
|
||||||
tokens.clear();
|
e.insert(start, count);
|
||||||
events.clear();
|
e.commit(vase);
|
||||||
p->lang.parse(&state, it->line, at++ == 0, &tokens, &events);
|
}
|
||||||
|
|
||||||
|
void erase(ParserSnapshot &snap, vase::Shard *vase, uint64_t start, uint64_t count) {
|
||||||
|
Edit e(snap);
|
||||||
|
e.erase(start, count);
|
||||||
|
e.commit(vase);
|
||||||
}
|
}
|
||||||
} // namespace bed::internal::syntax
|
} // namespace bed::internal::syntax
|
||||||
|
|||||||
@@ -0,0 +1,195 @@
|
|||||||
|
#include "internal/syntax/parser.h"
|
||||||
|
|
||||||
|
namespace bed::internal::syntax {
|
||||||
|
void ParseState::retain(ParseState *n) {
|
||||||
|
if (n)
|
||||||
|
n->refs++;
|
||||||
|
};
|
||||||
|
|
||||||
|
void ParseState::release(Language &lang, ParseState *n) {
|
||||||
|
if (!n || --n->refs > 0)
|
||||||
|
return;
|
||||||
|
if (n->is_branch()) {
|
||||||
|
auto *branch = (ParseStateBranch *)n;
|
||||||
|
release(lang, branch->left);
|
||||||
|
release(lang, branch->right);
|
||||||
|
delete branch;
|
||||||
|
} else {
|
||||||
|
auto *leaf = (ParseStateLeaf *)n;
|
||||||
|
if (leaf->state)
|
||||||
|
lang.destroy(leaf->state);
|
||||||
|
if (leaf->blocks)
|
||||||
|
free(leaf->blocks);
|
||||||
|
delete leaf;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int height(ParseState *n) {
|
||||||
|
return n ? n->height : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int balance_factor(ParseState *n) {
|
||||||
|
ParseStateBranch *b = (ParseStateBranch *)n;
|
||||||
|
return height(b->left) - height(b->right);
|
||||||
|
}
|
||||||
|
|
||||||
|
ParseState *rotate_right(Language &lang, ParseStateBranch *z) {
|
||||||
|
ParseStateBranch *y = (ParseStateBranch *)z->left;
|
||||||
|
ParseState *middle = new ParseStateBranch(y->right, z->right);
|
||||||
|
ParseState *out = new ParseStateBranch(y->left, middle);
|
||||||
|
ParseState::release(lang, middle);
|
||||||
|
ParseState::release(lang, z);
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
ParseState *rotate_left(Language &lang, ParseStateBranch *z) {
|
||||||
|
ParseStateBranch *y = (ParseStateBranch *)z->right;
|
||||||
|
ParseState *middle = new ParseStateBranch(z->left, y->left);
|
||||||
|
ParseState *out = new ParseStateBranch(middle, y->right);
|
||||||
|
ParseState::release(lang, middle);
|
||||||
|
ParseState::release(lang, z);
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
ParseState *balance(Language &lang, ParseState *node) {
|
||||||
|
if (!node || !node->is_branch())
|
||||||
|
return node;
|
||||||
|
ParseStateBranch *b = (ParseStateBranch *)node;
|
||||||
|
int bf = balance_factor(node);
|
||||||
|
if (bf > 1) {
|
||||||
|
ParseStateBranch *left = (ParseStateBranch *)b->left;
|
||||||
|
if (balance_factor(left) < 0) {
|
||||||
|
ParseState::retain(left);
|
||||||
|
auto new_left = rotate_left(lang, left);
|
||||||
|
auto rebuilt = new ParseStateBranch(new_left, b->right);
|
||||||
|
auto result = rotate_right(lang, (ParseStateBranch *)rebuilt);
|
||||||
|
ParseState::release(lang, new_left);
|
||||||
|
ParseState::release(lang, b);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
return rotate_right(lang, b);
|
||||||
|
}
|
||||||
|
if (bf < -1) {
|
||||||
|
ParseStateBranch *right = (ParseStateBranch *)b->right;
|
||||||
|
if (balance_factor(right) > 0) {
|
||||||
|
ParseState::retain(right);
|
||||||
|
auto new_right = rotate_right(lang, right);
|
||||||
|
auto rebuilt = new ParseStateBranch(b->left, new_right);
|
||||||
|
auto result = rotate_left(lang, (ParseStateBranch *)rebuilt);
|
||||||
|
ParseState::release(lang, new_right);
|
||||||
|
ParseState::release(lang, b);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
return rotate_left(lang, b);
|
||||||
|
}
|
||||||
|
return node;
|
||||||
|
}
|
||||||
|
|
||||||
|
ParseState *ParseState::build(Language &lang, ParseState **pieces, uint64_t lo, uint64_t hi) {
|
||||||
|
if (hi - lo == 1)
|
||||||
|
return pieces[lo];
|
||||||
|
uint64_t mid = lo + (hi - lo) / 2;
|
||||||
|
ParseState *left = build(lang, pieces, lo, mid);
|
||||||
|
ParseState *right = build(lang, pieces, mid, hi);
|
||||||
|
ParseState *node = concat(lang, left, right);
|
||||||
|
release(lang, left);
|
||||||
|
release(lang, right);
|
||||||
|
return node;
|
||||||
|
}
|
||||||
|
|
||||||
|
ParseState *ParseState::splice(
|
||||||
|
Language &lang, ParseState *root, vase::Shard *vase,
|
||||||
|
uint64_t line, uint64_t original, uint64_t final
|
||||||
|
) {
|
||||||
|
if (!vase)
|
||||||
|
return nullptr;
|
||||||
|
if (!root || (line == 0 && root->lines() == original)) {
|
||||||
|
vase::Iterator it(vase, 0, Direction::Forward);
|
||||||
|
void *state = lang.none_state();
|
||||||
|
std::vector<Token> tokens;
|
||||||
|
std::vector<ParseEvent> events;
|
||||||
|
ParsePieceBuilder builder(lang, 0);
|
||||||
|
for (uint64_t at = 0; at < final; ++at) {
|
||||||
|
it.next();
|
||||||
|
tokens.clear();
|
||||||
|
events.clear();
|
||||||
|
lang.parse(&state, it.line, at == 0, &tokens, &events);
|
||||||
|
builder.add(state, at, events);
|
||||||
|
}
|
||||||
|
lang.destroy(state);
|
||||||
|
return builder.finish();
|
||||||
|
}
|
||||||
|
uint64_t at;
|
||||||
|
void *state;
|
||||||
|
ParseState *prefix;
|
||||||
|
{
|
||||||
|
uint64_t offset;
|
||||||
|
TreeCursor c = TreeCursor(lang, root, line, &offset);
|
||||||
|
prefix = c.prefix();
|
||||||
|
at = line - offset;
|
||||||
|
state = lang.copy(c.leaf->state);
|
||||||
|
}
|
||||||
|
vase::Iterator it(vase, at, Direction::Forward);
|
||||||
|
std::vector<Token> tokens;
|
||||||
|
std::vector<ParseEvent> events;
|
||||||
|
uint64_t end_in_tree = line + original;
|
||||||
|
uint64_t end_extra;
|
||||||
|
TreeCursor c = TreeCursor(lang, root, end_in_tree, &end_extra);
|
||||||
|
uint64_t end_in_vase = line + final;
|
||||||
|
ParsePieceBuilder builder(lang, at);
|
||||||
|
while (at < end_in_vase + end_extra) {
|
||||||
|
it.next();
|
||||||
|
tokens.clear();
|
||||||
|
events.clear();
|
||||||
|
lang.parse(&state, it.line, at == 0, &tokens, &events);
|
||||||
|
builder.add(state, at, events);
|
||||||
|
++at;
|
||||||
|
}
|
||||||
|
c.next();
|
||||||
|
while (c.leaf) {
|
||||||
|
if (lang.equal(state, c.leaf->state))
|
||||||
|
break;
|
||||||
|
for (uint64_t i = 0; i < c.leaf->lines(); ++i) {
|
||||||
|
it.next();
|
||||||
|
tokens.clear();
|
||||||
|
events.clear();
|
||||||
|
lang.parse(&state, it.line, at == 0, &tokens, &events);
|
||||||
|
builder.add(state, at, events);
|
||||||
|
++at;
|
||||||
|
}
|
||||||
|
c.next();
|
||||||
|
}
|
||||||
|
lang.destroy(state);
|
||||||
|
ParseState *suffix = c.suffix();
|
||||||
|
ParseState *new_stuff = builder.finish();
|
||||||
|
auto a = concat(lang, prefix, new_stuff);
|
||||||
|
release(lang, prefix);
|
||||||
|
release(lang, new_stuff);
|
||||||
|
auto result = concat(lang, a, suffix);
|
||||||
|
release(lang, a);
|
||||||
|
release(lang, suffix);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
ParseState *ParseState::concat(Language &lang, ParseState *a, ParseState *b) {
|
||||||
|
if (!a)
|
||||||
|
return (retain(b), b);
|
||||||
|
if (!b)
|
||||||
|
return (retain(a), a);
|
||||||
|
if (a->height > b->height + 1) {
|
||||||
|
ParseStateBranch *ba = (ParseStateBranch *)a;
|
||||||
|
ParseState *r = concat(lang, ba->right, b);
|
||||||
|
ParseState *out = balance(lang, new ParseStateBranch(ba->left, r));
|
||||||
|
release(lang, r);
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
if (b->height > a->height + 1) {
|
||||||
|
ParseStateBranch *bb = (ParseStateBranch *)b;
|
||||||
|
ParseState *l = concat(lang, a, bb->left);
|
||||||
|
ParseState *out = balance(lang, new ParseStateBranch(l, bb->right));
|
||||||
|
release(lang, l);
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
return balance(lang, new ParseStateBranch(a, b));
|
||||||
|
}
|
||||||
|
} // namespace bed::internal::syntax
|
||||||
@@ -102,7 +102,7 @@ bool handle_escapes(RubyParser &p, std::vector<Token> *tokens, uint32_t &start,
|
|||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|
||||||
bool handle_heredoc(RubyParser &p, std::vector<Token> *tokens) {
|
bool handle_heredoc(RubyParser &p, std::vector<Token> *tokens, std::vector<ParseEvent> *events) {
|
||||||
uint8_t *heredocs = p.state->heredocs();
|
uint8_t *heredocs = p.state->heredocs();
|
||||||
uint32_t start = p.i;
|
uint32_t start = p.i;
|
||||||
if (start == 0) {
|
if (start == 0) {
|
||||||
@@ -114,6 +114,7 @@ bool handle_heredoc(RubyParser &p, std::vector<Token> *tokens) {
|
|||||||
&& memcmp(p.line.data() + start, heredocs + 1, heredoc_len) == 0) {
|
&& memcmp(p.line.data() + start, heredocs + 1, heredoc_len) == 0) {
|
||||||
if (!p.dequeue_doc(heredoc_len))
|
if (!p.dequeue_doc(heredoc_len))
|
||||||
p.current().state = RubyState::RubyInternalState::NONE;
|
p.current().state = RubyState::RubyInternalState::NONE;
|
||||||
|
events->push_back(true);
|
||||||
tokens->push_back({p.i, p.len(), Token::Annotation});
|
tokens->push_back({p.i, p.len(), Token::Annotation});
|
||||||
p.current().flags |= RubyState::RubyInternalState::EXPECTING_EXPRESSION;
|
p.current().flags |= RubyState::RubyInternalState::EXPECTING_EXPRESSION;
|
||||||
return true;
|
return true;
|
||||||
@@ -366,6 +367,7 @@ bool handle_syntax(RubyParser &p, std::vector<Token> *tokens, std::vector<ParseE
|
|||||||
return false;
|
return false;
|
||||||
p.current().flags &= ~RubyState::RubyInternalState::EXPECTING_EXPRESSION;
|
p.current().flags &= ~RubyState::RubyInternalState::EXPECTING_EXPRESSION;
|
||||||
if (!delim.empty()) {
|
if (!delim.empty()) {
|
||||||
|
events->push_back(false);
|
||||||
tokens->push_back({s, p.i + j, Token::Annotation});
|
tokens->push_back({s, p.i + j, Token::Annotation});
|
||||||
uint8_t header = delim.size();
|
uint8_t header = delim.size();
|
||||||
if (interpolation)
|
if (interpolation)
|
||||||
@@ -1073,7 +1075,7 @@ void ruby_parse(
|
|||||||
}
|
}
|
||||||
if (!p.heredoc_start_line
|
if (!p.heredoc_start_line
|
||||||
&& p.current().state == RubyState::RubyInternalState::HEREDOC) {
|
&& p.current().state == RubyState::RubyInternalState::HEREDOC) {
|
||||||
if (handle_heredoc(p, tokens))
|
if (handle_heredoc(p, tokens, events))
|
||||||
return;
|
return;
|
||||||
else
|
else
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
@@ -1,7 +1,19 @@
|
|||||||
#include "internal/syntax/decl.h"
|
#include "internal/syntax/decl.h"
|
||||||
|
|
||||||
namespace bed::internal::syntax {
|
namespace bed::internal::syntax {
|
||||||
TreeCursor::TreeCursor(ParseState *root, uint64_t target_line, uint64_t *relative) {
|
TreeCursor::~TreeCursor() {
|
||||||
|
ParseState::release(lang, root);
|
||||||
|
}
|
||||||
|
|
||||||
|
TreeCursor::TreeCursor(
|
||||||
|
Language &lang, ParseState *root,
|
||||||
|
uint64_t target_line, uint64_t *relative
|
||||||
|
) : lang(lang), root(root) {
|
||||||
|
if (!root) {
|
||||||
|
*relative = 0;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
ParseState::retain(root);
|
||||||
ParseState *node = root;
|
ParseState *node = root;
|
||||||
while (node->is_branch()) {
|
while (node->is_branch()) {
|
||||||
auto *branch = (ParseStateBranch *)node;
|
auto *branch = (ParseStateBranch *)node;
|
||||||
@@ -63,4 +75,42 @@ void TreeCursor::prev() {
|
|||||||
}
|
}
|
||||||
leaf = nullptr;
|
leaf = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ParseState *TreeCursor::prefix() {
|
||||||
|
ParseState *result = nullptr;
|
||||||
|
for (uint8_t i = 0; i < depth; ++i) {
|
||||||
|
if (went_left[i])
|
||||||
|
continue;
|
||||||
|
auto *branch = stack[i];
|
||||||
|
ParseState *piece = branch->left;
|
||||||
|
if (!result) {
|
||||||
|
ParseState::retain(piece);
|
||||||
|
result = piece;
|
||||||
|
} else {
|
||||||
|
ParseState *next = ParseState::concat(lang, result, piece);
|
||||||
|
ParseState::release(lang, result);
|
||||||
|
result = next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
ParseState *TreeCursor::suffix() {
|
||||||
|
ParseState *result = nullptr;
|
||||||
|
for (uint8_t i = depth; i-- > 0;) {
|
||||||
|
if (!went_left[i])
|
||||||
|
continue;
|
||||||
|
auto *branch = stack[i];
|
||||||
|
ParseState *piece = branch->right;
|
||||||
|
if (!result) {
|
||||||
|
ParseState::retain(piece);
|
||||||
|
result = piece;
|
||||||
|
} else {
|
||||||
|
ParseState *next = ParseState::concat(lang, result, piece);
|
||||||
|
ParseState::release(lang, result);
|
||||||
|
result = next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
} // namespace bed::internal::syntax
|
} // namespace bed::internal::syntax
|
||||||
|
|||||||
@@ -69,6 +69,17 @@ CommandIO::CommandIO(BEd &bed) : bed(bed) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::pair<std::string, bool> CommandIO::run() {
|
std::pair<std::string, bool> CommandIO::run() {
|
||||||
|
if (!bed.io.interactive())
|
||||||
|
return run_pipe();
|
||||||
|
return run_terminal();
|
||||||
|
}
|
||||||
|
|
||||||
|
std::pair<std::string, bool> CommandIO::run_pipe() {
|
||||||
|
bed.io.write(prompt);
|
||||||
|
return bed.io.read_pipe();
|
||||||
|
}
|
||||||
|
|
||||||
|
std::pair<std::string, bool> CommandIO::run_terminal() {
|
||||||
auto [row, col] = bed.io.cursor_position();
|
auto [row, col] = bed.io.cursor_position();
|
||||||
auto [rows, cols] = bed.io.terminal_size();
|
auto [rows, cols] = bed.io.terminal_size();
|
||||||
if (row > rows)
|
if (row > rows)
|
||||||
|
|||||||
@@ -7,6 +7,23 @@ TextMode::TextMode(BEd &bed) : bed(bed) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::pair<vase::Shard *, bool> TextMode::run() {
|
std::pair<vase::Shard *, bool> TextMode::run() {
|
||||||
|
if (!bed.io.interactive())
|
||||||
|
return run_pipe();
|
||||||
|
return run_terminal();
|
||||||
|
}
|
||||||
|
|
||||||
|
std::pair<vase::Shard *, bool> TextMode::run_pipe() {
|
||||||
|
cmd.clear();
|
||||||
|
while (true) {
|
||||||
|
auto [str, eof] = bed.io.read_pipe();
|
||||||
|
if (str == "." || eof)
|
||||||
|
break;
|
||||||
|
cmd += str + "\n";
|
||||||
|
}
|
||||||
|
return {vase::Shard::from_string(cmd.data(), cmd.length(), true), false};
|
||||||
|
}
|
||||||
|
|
||||||
|
std::pair<vase::Shard *, bool> TextMode::run_terminal() {
|
||||||
auto [row, col] = bed.io.cursor_position();
|
auto [row, col] = bed.io.cursor_position();
|
||||||
auto [rows, cols] = bed.io.terminal_size();
|
auto [rows, cols] = bed.io.terminal_size();
|
||||||
if (row > rows)
|
if (row > rows)
|
||||||
@@ -42,9 +59,8 @@ std::pair<vase::Shard *, bool> TextMode::run() {
|
|||||||
cmd.erase(--cursor, 1);
|
cmd.erase(--cursor, 1);
|
||||||
}
|
}
|
||||||
} else if (res.text[0] == '\n') {
|
} else if (res.text[0] == '\n') {
|
||||||
size_t lines = 1 + std::count(cmd.begin(), cmd.end(), '\n');
|
|
||||||
grow(lines + 1);
|
|
||||||
cmd.insert(cursor++, 1, '\n');
|
cmd.insert(cursor++, 1, '\n');
|
||||||
|
grow();
|
||||||
} else {
|
} else {
|
||||||
cmd.insert(cursor, res.text);
|
cmd.insert(cursor, res.text);
|
||||||
cursor += res.text.size();
|
cursor += res.text.size();
|
||||||
@@ -55,6 +71,7 @@ std::pair<vase::Shard *, bool> TextMode::run() {
|
|||||||
case io::KeyEvent::KeyType::PASTE:
|
case io::KeyEvent::KeyType::PASTE:
|
||||||
cmd.insert(cursor, res.text);
|
cmd.insert(cursor, res.text);
|
||||||
cursor += res.text.size();
|
cursor += res.text.size();
|
||||||
|
grow();
|
||||||
break;
|
break;
|
||||||
case io::KeyEvent::KeyType::SPECIAL:
|
case io::KeyEvent::KeyType::SPECIAL:
|
||||||
switch (res.special_key) {
|
switch (res.special_key) {
|
||||||
@@ -123,16 +140,22 @@ std::pair<vase::Shard *, bool> TextMode::run() {
|
|||||||
cursor = cmd.size();
|
cursor = cmd.size();
|
||||||
running = false;
|
running = false;
|
||||||
}
|
}
|
||||||
|
if (cmd.size() == 2 && cmd.compare(0, 2, ".\n") == 0) {
|
||||||
|
cmd.clear();
|
||||||
|
cursor = 0;
|
||||||
|
running = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t total_lines = 1 + std::count(cmd.begin(), cmd.end(), '\n');
|
size_t total_lines = cmd.size() ? 1 + std::count(cmd.begin(), cmd.end(), '\n') : 0;
|
||||||
uint16_t last_row = start + total_lines;
|
uint16_t last_row = start + total_lines;
|
||||||
bed.io.move_cursor(last_row, 1);
|
bed.io.move_cursor(last_row, 1);
|
||||||
bed.io.write("\n", 1);
|
bed.io.write("\n", 1);
|
||||||
return {vase::Shard::from_string(cmd.data(), cmd.length(), true), false};
|
return {vase::Shard::from_string(cmd.data(), cmd.length(), true), false};
|
||||||
}
|
}
|
||||||
|
|
||||||
void TextMode::grow(size_t required_height) {
|
void TextMode::grow() {
|
||||||
|
size_t required_height = 1 + std::count(cmd.begin(), cmd.end(), '\n');
|
||||||
auto [rows, cols] = bed.io.terminal_size();
|
auto [rows, cols] = bed.io.terminal_size();
|
||||||
term_height = rows;
|
term_height = rows;
|
||||||
term_width = cols;
|
term_width = cols;
|
||||||
|
|||||||
@@ -90,12 +90,7 @@ Shard *substitute(
|
|||||||
if (matches.empty())
|
if (matches.empty())
|
||||||
return root;
|
return root;
|
||||||
std::vector<ReplacePart> replace_parts = parse_replace(ap, replace);
|
std::vector<ReplacePart> replace_parts = parse_replace(ap, replace);
|
||||||
struct Edit {
|
uint64_t current_line = 1;
|
||||||
uint64_t line;
|
|
||||||
uint64_t old_lines;
|
|
||||||
uint64_t new_lines;
|
|
||||||
};
|
|
||||||
uint64_t orig_line = start;
|
|
||||||
int64_t line_delta = 0;
|
int64_t line_delta = 0;
|
||||||
std::vector<Shard *> pieces;
|
std::vector<Shard *> pieces;
|
||||||
pieces.reserve(matches.size() * 2 + 1);
|
pieces.reserve(matches.size() * 2 + 1);
|
||||||
@@ -109,7 +104,7 @@ Shard *substitute(
|
|||||||
Shard::release(remaining);
|
Shard::release(remaining);
|
||||||
pieces.push_back(keep);
|
pieces.push_back(keep);
|
||||||
remaining = rest;
|
remaining = rest;
|
||||||
orig_line += keep ? keep->lines : 0;
|
current_line += keep ? keep->lines : 0;
|
||||||
}
|
}
|
||||||
auto [dropped, rest2] = Shard::split(remaining, match.end - match.start);
|
auto [dropped, rest2] = Shard::split(remaining, match.end - match.start);
|
||||||
Shard::release(remaining);
|
Shard::release(remaining);
|
||||||
@@ -152,13 +147,11 @@ Shard *substitute(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Shard::release(dropped);
|
Shard::release(dropped);
|
||||||
if (old_lines || new_lines) {
|
uint64_t report_line = (uint64_t)((int64_t)current_line + line_delta);
|
||||||
uint64_t report_line = (uint64_t)((int64_t)orig_line + line_delta);
|
|
||||||
if (on_edit)
|
if (on_edit)
|
||||||
on_edit(report_line, old_lines, new_lines);
|
on_edit(report_line, old_lines, new_lines);
|
||||||
line_delta += (int64_t)new_lines - (int64_t)old_lines;
|
line_delta += (int64_t)new_lines - (int64_t)old_lines;
|
||||||
}
|
current_line += old_lines;
|
||||||
orig_line += old_lines;
|
|
||||||
cursor = match.end;
|
cursor = match.end;
|
||||||
}
|
}
|
||||||
pieces.push_back(remaining);
|
pieces.push_back(remaining);
|
||||||
|
|||||||
@@ -173,6 +173,8 @@ Shard *insert(AppendStorage *ap, Shard *root, Shard *text, uint64_t line) {
|
|||||||
Shard::retain(text);
|
Shard::retain(text);
|
||||||
return text;
|
return text;
|
||||||
}
|
}
|
||||||
|
if (!text)
|
||||||
|
return root;
|
||||||
if (line > root->lines + 1)
|
if (line > root->lines + 1)
|
||||||
throw ed_error("line out of range");
|
throw ed_error("line out of range");
|
||||||
Shard::retain(text);
|
Shard::retain(text);
|
||||||
@@ -201,6 +203,34 @@ Shard *insert(AppendStorage *ap, Shard *root, Shard *text, uint64_t line) {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Shard *replace(Shard *root, Shard *text, uint64_t start, uint64_t end) {
|
||||||
|
if (!start || !end)
|
||||||
|
throw ed_error("Invalid range.");
|
||||||
|
start--;
|
||||||
|
end--;
|
||||||
|
if (!root)
|
||||||
|
throw ed_error("line range out of bounds");
|
||||||
|
uint64_t line_count = root->lines + 1;
|
||||||
|
if (start > end || end >= line_count)
|
||||||
|
throw ed_error("line range out of bounds");
|
||||||
|
uint64_t start_offset = offset_of(root, start);
|
||||||
|
uint64_t end_offset =
|
||||||
|
(end + 1 == line_count)
|
||||||
|
? root->length
|
||||||
|
: offset_of(root, end + 1) - 1;
|
||||||
|
auto [left, rest] = Shard::split(root, start_offset);
|
||||||
|
auto [middle, right] = Shard::split(rest, end_offset - start_offset);
|
||||||
|
Shard *a = Shard::concat(left, text);
|
||||||
|
Shard *new_root = Shard::concat(a, right);
|
||||||
|
Shard::release(left);
|
||||||
|
Shard::release(rest);
|
||||||
|
Shard::release(middle);
|
||||||
|
Shard::release(right);
|
||||||
|
Shard::release(a);
|
||||||
|
Shard::release(root);
|
||||||
|
return new_root;
|
||||||
|
}
|
||||||
|
|
||||||
Shard *erase(Shard *root, uint64_t start, uint64_t end) {
|
Shard *erase(Shard *root, uint64_t start, uint64_t end) {
|
||||||
if (!start || !end)
|
if (!start || !end)
|
||||||
throw ed_error("Invalid range.");
|
throw ed_error("Invalid range.");
|
||||||
|
|||||||
Reference in New Issue
Block a user