riyyi
/
blaze
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Everywhere: Do less Collection nodes copying

master
Riyyi 1 year ago
parent
fa4bd63dca
commit
0d43512ea9
10 changed files with 71 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/ast.cpp
  2. 11
      src/ast.h
  3. 2
      src/environment.cpp
  4. 2
      src/environment.h
  5. 12
      src/eval-special-form.cpp
  6. 18
      src/eval.cpp
  7. 2
      src/forward.h
  8. 50
      src/functions.cpp
  9. 2
      src/printer.cpp
  10. 2
      src/reader.cpp

16
src/ast.cpp
Unescape View File

@ -7,6 +7,7 @@
#include <cstdint> // int64_t #include <cstdint> // int64_t
#include <memory> // std::static_pointer_cast #include <memory> // std::static_pointer_cast
#include <string> #include <string>
#include <utility> // std::move
#include <vector> #include <vector>
#include "ast.h" #include "ast.h"
@ -35,6 +36,11 @@ Collection::Collection(const ValueVector& nodes)
{ {
} }
Collection::Collection(ValueVector&& nodes) noexcept
: m_nodes(std::move(nodes))
{
}
Collection::Collection(ValueVectorIt begin, ValueVectorIt end) Collection::Collection(ValueVectorIt begin, ValueVectorIt end)
: m_nodes(ValueVector(begin, end)) : m_nodes(ValueVector(begin, end))
{ {
@ -64,6 +70,11 @@ List::List(const ValueVector& nodes)
{ {
} }
List::List(ValueVector&& nodes) noexcept
: Collection(std::move(nodes))
{
}
List::List(ValueVectorIt begin, ValueVectorIt end) List::List(ValueVectorIt begin, ValueVectorIt end)
: Collection(begin, end) : Collection(begin, end)
{ {
@ -86,6 +97,11 @@ Vector::Vector(const ValueVector& nodes)
{ {
} }
Vector::Vector(ValueVector&& nodes) noexcept
: Collection(std::move(nodes))
{
}
Vector::Vector(ValueVectorIt begin, ValueVectorIt end) Vector::Vector(ValueVectorIt begin, ValueVectorIt end)
: Collection(begin, end) : Collection(begin, end)
{ {

11
src/ast.h
Unescape View File

@ -101,11 +101,18 @@ public:
ValuePtr front() const { return m_nodes.front(); } ValuePtr front() const { return m_nodes.front(); }
ValueVector rest() const; ValueVector rest() const;
const ValueVector& nodes() const { return m_nodes; } ValueVectorConstIt begin() const { return m_nodes.cbegin(); }
ValueVectorConstIt end() const { return m_nodes.cend(); }
ValueVectorConstReverseIt beginReverse() const { return m_nodes.crbegin(); }
ValueVectorConstReverseIt endReverse() const { return m_nodes.crend(); }
const ValueVector& nodesCopy() const { return m_nodes; }
std::span<const ValuePtr> nodesRead() const { return m_nodes; }
protected: protected:
Collection() = default; Collection() = default;
Collection(const ValueVector& nodes); Collection(const ValueVector& nodes);
Collection(ValueVector&& nodes) noexcept;
Collection(ValueVectorIt begin, ValueVectorIt end); Collection(ValueVectorIt begin, ValueVectorIt end);
Collection(ValueVectorConstIt begin, ValueVectorConstIt end); Collection(ValueVectorConstIt begin, ValueVectorConstIt end);
Collection(const Collection& that, ValuePtr meta); Collection(const Collection& that, ValuePtr meta);
@ -129,6 +136,7 @@ class List final : public Collection {
public: public:
List() = default; List() = default;
List(const ValueVector& nodes); List(const ValueVector& nodes);
List(ValueVector&& nodes) noexcept;
List(ValueVectorIt begin, ValueVectorIt end); List(ValueVectorIt begin, ValueVectorIt end);
List(ValueVectorConstIt begin, ValueVectorConstIt end); List(ValueVectorConstIt begin, ValueVectorConstIt end);
List(const List& that, ValuePtr meta); List(const List& that, ValuePtr meta);
@ -154,6 +162,7 @@ class Vector final : public Collection {
public: public:
Vector() = default; Vector() = default;
Vector(const ValueVector& nodes); Vector(const ValueVector& nodes);
Vector(ValueVector&& nodes) noexcept;
Vector(ValueVectorIt begin, ValueVectorIt end); Vector(ValueVectorIt begin, ValueVectorIt end);
Vector(ValueVectorConstIt begin, ValueVectorConstIt end); Vector(ValueVectorConstIt begin, ValueVectorConstIt end);
Vector(const Vector& that, ValuePtr meta); Vector(const Vector& that, ValuePtr meta);

2
src/environment.cpp
Unescape View File

@ -29,7 +29,7 @@ EnvironmentPtr Environment::create(EnvironmentPtr outer)
return env; return env;
} }
EnvironmentPtr Environment::create(const ValuePtr lambda, const ValueVector& arguments) EnvironmentPtr Environment::create(const ValuePtr lambda, ValueVector&& arguments)
{ {
auto lambda_casted = std::static_pointer_cast<Lambda>(lambda); auto lambda_casted = std::static_pointer_cast<Lambda>(lambda);
auto env = create(lambda_casted->env()); auto env = create(lambda_casted->env());

2
src/environment.h
Unescape View File

@ -21,7 +21,7 @@ public:
// Factory functions instead of constructors because it can fail in the bindings/arguments case // Factory functions instead of constructors because it can fail in the bindings/arguments case
static EnvironmentPtr create(); static EnvironmentPtr create();
static EnvironmentPtr create(EnvironmentPtr outer); static EnvironmentPtr create(EnvironmentPtr outer);
static EnvironmentPtr create(const ValuePtr lambda, const ValueVector& arguments); static EnvironmentPtr create(const ValuePtr lambda, ValueVector&& arguments);
bool exists(const std::string& symbol); bool exists(const std::string& symbol);
ValuePtr set(const std::string& symbol, ValuePtr value); ValuePtr set(const std::string& symbol, ValuePtr value);

12
src/eval-special-form.cpp
Unescape View File

@ -73,7 +73,7 @@ ValuePtr Eval::evalFn(const ValueVector& nodes, EnvironmentPtr env)
// First element needs to be a List or Vector // First element needs to be a List or Vector
VALUE_CAST(collection, Collection, nodes.front()); VALUE_CAST(collection, Collection, nodes.front());
const auto& collection_nodes = collection->nodes(); const auto& collection_nodes = collection->nodesRead();
std::vector<std::string> bindings; std::vector<std::string> bindings;
bindings.reserve(collection_nodes.size()); bindings.reserve(collection_nodes.size());
@ -137,7 +137,7 @@ ValuePtr Eval::evalTry(const ValueVector& nodes, EnvironmentPtr env)
Error::the().clearErrors(); Error::the().clearErrors();
VALUE_CAST(catch_list, List, nodes.back()); VALUE_CAST(catch_list, List, nodes.back());
const auto& catch_nodes = catch_list->nodes(); const auto& catch_nodes = catch_list->nodesRead();
CHECK_ARG_COUNT_IS("catch*", catch_nodes.size() - 1, 2); CHECK_ARG_COUNT_IS("catch*", catch_nodes.size() - 1, 2);
VALUE_CAST(catch_symbol, Symbol, catch_nodes.front()); VALUE_CAST(catch_symbol, Symbol, catch_nodes.front());
@ -209,7 +209,7 @@ void Eval::evalLet(const ValueVector& nodes, EnvironmentPtr env)
// First argument needs to be a List or Vector // First argument needs to be a List or Vector
VALUE_CAST(bindings, Collection, nodes.front(), void()); VALUE_CAST(bindings, Collection, nodes.front(), void());
const auto& binding_nodes = bindings->nodes(); const auto& binding_nodes = bindings->nodesRead();
// List or Vector needs to have an even number of elements // List or Vector needs to have an even number of elements
CHECK_ARG_COUNT_EVEN("bindings", binding_nodes.size(), void()); CHECK_ARG_COUNT_EVEN("bindings", binding_nodes.size(), void());
@ -258,7 +258,7 @@ static ValuePtr startsWith(ValuePtr ast, const std::string& symbol)
return nullptr; return nullptr;
} }
const auto& nodes = std::static_pointer_cast<List>(ast)->nodes(); const auto& nodes = std::static_pointer_cast<List>(ast)->nodesRead();
if (nodes.empty() || !isSymbol(nodes.front(), symbol)) { if (nodes.empty() || !isSymbol(nodes.front(), symbol)) {
return nullptr; return nullptr;
@ -294,10 +294,10 @@ static ValuePtr evalQuasiQuoteImpl(ValuePtr ast)
ValuePtr result = makePtr<List>(); ValuePtr result = makePtr<List>();
const auto& nodes = std::static_pointer_cast<Collection>(ast)->nodes(); auto collection = std::static_pointer_cast<Collection>(ast);
// `() or `(1 ~2 3) or `(1 ~@(list 2 2 2) 3) // `() or `(1 ~2 3) or `(1 ~@(list 2 2 2) 3)
for (auto it = nodes.crbegin(); it != nodes.crend(); ++it) { for (auto it = collection->beginReverse(); it != collection->endReverse(); ++it) {
const auto& elt = *it; const auto& elt = *it;
const auto splice_unquote = startsWith(elt, "splice-unquote"); // (list 2 2 2) const auto splice_unquote = startsWith(elt, "splice-unquote"); // (list 2 2 2)

18
src/eval.cpp
Unescape View File

@ -148,7 +148,7 @@ ValuePtr Eval::evalAst(ValuePtr ast, EnvironmentPtr env)
return result; return result;
} }
else if (is<Collection>(ast_raw_ptr)) { else if (is<Collection>(ast_raw_ptr)) {
const auto& nodes = std::static_pointer_cast<Collection>(ast)->nodes(); const auto& nodes = std::static_pointer_cast<Collection>(ast)->nodesRead();
size_t count = nodes.size(); size_t count = nodes.size();
auto evaluated_nodes = ValueVector(count); auto evaluated_nodes = ValueVector(count);
@ -162,11 +162,11 @@ ValuePtr Eval::evalAst(ValuePtr ast, EnvironmentPtr env)
evaluated_nodes.at(i) = eval_node; evaluated_nodes.at(i) = eval_node;
} }
if (is<List>(ast_raw_ptr)) { if (is<Vector>(ast_raw_ptr)) {
return makePtr<List>(evaluated_nodes); return makePtr<Vector>(evaluated_nodes);
} }
return makePtr<Vector>(evaluated_nodes); return makePtr<List>(evaluated_nodes);
} }
else if (is<HashMap>(ast_raw_ptr)) { else if (is<HashMap>(ast_raw_ptr)) {
const auto& elements = std::static_pointer_cast<HashMap>(ast)->elements(); const auto& elements = std::static_pointer_cast<HashMap>(ast)->elements();
@ -239,16 +239,16 @@ ValuePtr Eval::apply(std::shared_ptr<List> evaluated_list)
return nullptr; return nullptr;
} }
auto nodes = evaluated_list->nodes(); auto front = evaluated_list->front();
if (!is<Function>(nodes.front().get())) { if (!is<Function>(front.get())) {
Error::the().add(::format("invalid function: {}", nodes.front())); Error::the().add(::format("invalid function: {}", front));
return nullptr; return nullptr;
} }
auto function = std::static_pointer_cast<Function>(nodes.front())->function(); auto function = std::static_pointer_cast<Function>(front)->function();
return function(nodes.begin() + 1, nodes.end()); return function(evaluated_list->begin() + 1, evaluated_list->end());
} }
} // namespace blaze } // namespace blaze

2
src/forward.h
Unescape View File

@ -18,7 +18,9 @@ class Value;
typedef std::shared_ptr<Value> ValuePtr; typedef std::shared_ptr<Value> ValuePtr;
typedef std::vector<ValuePtr> ValueVector; typedef std::vector<ValuePtr> ValueVector;
typedef ValueVector::iterator ValueVectorIt; typedef ValueVector::iterator ValueVectorIt;
typedef ValueVector::reverse_iterator ValueVectorReverseIt;
typedef ValueVector::const_iterator ValueVectorConstIt; typedef ValueVector::const_iterator ValueVectorConstIt;
typedef ValueVector::const_reverse_iterator ValueVectorConstReverseIt;
class Environment; class Environment;
typedef std::shared_ptr<Environment> EnvironmentPtr; typedef std::shared_ptr<Environment> EnvironmentPtr;

50
src/functions.cpp
Unescape View File

@ -239,16 +239,16 @@ ADD_FUNCTION(
[&equal](ValuePtr lhs, ValuePtr rhs) -> bool { [&equal](ValuePtr lhs, ValuePtr rhs) -> bool {
if ((is<List>(lhs.get()) || is<Vector>(lhs.get())) if ((is<List>(lhs.get()) || is<Vector>(lhs.get()))
&& (is<List>(rhs.get()) || is<Vector>(rhs.get()))) { && (is<List>(rhs.get()) || is<Vector>(rhs.get()))) {
const auto& lhs_nodes = std::static_pointer_cast<Collection>(lhs)->nodes(); auto lhs_collection = std::static_pointer_cast<Collection>(lhs);
const auto& rhs_nodes = std::static_pointer_cast<Collection>(rhs)->nodes(); auto rhs_collection = std::static_pointer_cast<Collection>(rhs);
if (lhs_nodes.size() != rhs_nodes.size()) { if (lhs_collection->size() != rhs_collection->size()) {
return false; return false;
} }
auto lhs_it = lhs_nodes.cbegin(); auto lhs_it = lhs_collection->begin();
auto rhs_it = rhs_nodes.cbegin(); auto rhs_it = rhs_collection->begin();
for (; lhs_it != lhs_nodes.end(); ++lhs_it, ++rhs_it) { for (; lhs_it != lhs_collection->end(); ++lhs_it, ++rhs_it) {
if (!equal(*lhs_it, *rhs_it)) { if (!equal(*lhs_it, *rhs_it)) {
return false; return false;
} }
@ -390,7 +390,7 @@ ADD_FUNCTION(
// Remove atom and function from the argument list, add atom value // Remove atom and function from the argument list, add atom value
begin += 2; begin += 2;
auto arguments = ValueVector(end - begin + 1); auto arguments = ValueVector(SIZE() + 1);
arguments[0] = atom->deref(); arguments[0] = atom->deref();
std::copy(begin, end, arguments.begin() + 1); std::copy(begin, end, arguments.begin() + 1);
@ -401,7 +401,7 @@ ADD_FUNCTION(
} }
else { else {
auto lambda = std::static_pointer_cast<Lambda>(callable); auto lambda = std::static_pointer_cast<Lambda>(callable);
value = eval(lambda->body(), Environment::create(lambda, arguments)); value = eval(lambda->body(), Environment::create(lambda, std::move(arguments)));
} }
return atom->reset(value); return atom->reset(value);
@ -417,7 +417,7 @@ ADD_FUNCTION(
begin++; begin++;
VALUE_CAST(collection, Collection, (*begin)); VALUE_CAST(collection, Collection, (*begin));
const auto& collection_nodes = collection->nodes(); const auto& collection_nodes = collection->nodesRead();
auto result_nodes = ValueVector(collection_nodes.size() + 1); auto result_nodes = ValueVector(collection_nodes.size() + 1);
result_nodes.at(0) = first; result_nodes.at(0) = first;
@ -439,7 +439,7 @@ ADD_FUNCTION(
auto result_nodes = ValueVector(count); auto result_nodes = ValueVector(count);
size_t offset = 0; size_t offset = 0;
for (auto it = begin; it != end; ++it) { for (auto it = begin; it != end; ++it) {
const auto& collection_nodes = std::static_pointer_cast<Collection>(*it)->nodes(); const auto& collection_nodes = std::static_pointer_cast<Collection>(*it)->nodesRead();
std::copy(collection_nodes.begin(), collection_nodes.end(), result_nodes.begin() + offset); std::copy(collection_nodes.begin(), collection_nodes.end(), result_nodes.begin() + offset);
offset += collection_nodes.size(); offset += collection_nodes.size();
} }
@ -459,7 +459,7 @@ ADD_FUNCTION(
VALUE_CAST(collection, Collection, (*begin)); VALUE_CAST(collection, Collection, (*begin));
return makePtr<Vector>(collection->nodes()); return makePtr<Vector>(collection->nodesCopy());
}); });
// (nth (list 1 2 3) 0) // (nth (list 1 2 3) 0)
@ -470,20 +470,15 @@ ADD_FUNCTION(
VALUE_CAST(collection, Collection, (*begin)); VALUE_CAST(collection, Collection, (*begin));
VALUE_CAST(number_node, Number, (*(begin + 1))); VALUE_CAST(number_node, Number, (*(begin + 1)));
auto collection_nodes = collection->nodes(); auto collection_nodes = collection->nodesRead();
auto index = (size_t)number_node->number(); auto index = static_cast<size_t>(number_node->number());
if (number_node->number() < 0 || index >= collection_nodes.size()) { if (number_node->number() < 0 || index >= collection_nodes.size()) {
Error::the().add("index is out of range"); Error::the().add("index is out of range");
return nullptr; return nullptr;
} }
auto result = collection_nodes.begin(); return collection_nodes[index];
for (size_t i = 0; i < index; ++i) {
result++;
}
return *result;
}); });
// (first (list 1 2 3)) -> 1 // (first (list 1 2 3)) -> 1
@ -533,7 +528,7 @@ ADD_FUNCTION(
arguments.reserve(arguments.size() + collection->size()); arguments.reserve(arguments.size() + collection->size());
// Append list nodes to the argument leftovers // Append list nodes to the argument leftovers
auto nodes = collection->nodes(); auto nodes = collection->nodesRead();
for (const auto& node : nodes) { for (const auto& node : nodes) {
arguments.push_back(node); arguments.push_back(node);
} }
@ -545,7 +540,7 @@ ADD_FUNCTION(
} }
else { else {
auto lambda = std::static_pointer_cast<Lambda>(callable); auto lambda = std::static_pointer_cast<Lambda>(callable);
value = eval(lambda->body(), Environment::create(lambda, arguments)); value = eval(lambda->body(), Environment::create(lambda, std::move(arguments)));
} }
return value; return value;
@ -559,7 +554,6 @@ ADD_FUNCTION(
VALUE_CAST(callable, Callable, (*begin)); VALUE_CAST(callable, Callable, (*begin));
VALUE_CAST(collection, Collection, (*(begin + 1))); VALUE_CAST(collection, Collection, (*(begin + 1)));
const auto& collection_nodes = collection->nodes();
size_t count = collection->size(); size_t count = collection->size();
auto nodes = ValueVector(count); auto nodes = ValueVector(count);
@ -567,11 +561,12 @@ ADD_FUNCTION(
if (is<Function>(callable.get())) { if (is<Function>(callable.get())) {
auto function = std::static_pointer_cast<Function>(callable)->function(); auto function = std::static_pointer_cast<Function>(callable)->function();
for (size_t i = 0; i < count; ++i) { for (size_t i = 0; i < count; ++i) {
nodes.at(i) = function(collection_nodes.begin() + i, collection_nodes.begin() + i + 1); nodes.at(i) = function(collection->begin() + i, collection->begin() + i + 1);
} }
} }
else { else {
auto lambda = std::static_pointer_cast<Lambda>(callable); auto lambda = std::static_pointer_cast<Lambda>(callable);
auto collection_nodes = collection->nodesRead();
for (size_t i = 0; i < count; ++i) { for (size_t i = 0; i < count; ++i) {
nodes.at(i) = (eval(lambda->body(), Environment::create(lambda, { collection_nodes[i] }))); nodes.at(i) = (eval(lambda->body(), Environment::create(lambda, { collection_nodes[i] })));
} }
@ -911,7 +906,7 @@ ADD_FUNCTION(
VALUE_CAST(collection, Collection, (*begin)); VALUE_CAST(collection, Collection, (*begin));
begin++; begin++;
const auto& collection_nodes = collection->nodes(); const auto& collection_nodes = collection->nodesRead();
size_t collection_count = collection_nodes.size(); size_t collection_count = collection_nodes.size();
size_t argument_count = SIZE(); size_t argument_count = SIZE();
@ -944,7 +939,10 @@ ADD_FUNCTION(
if (is<Constant>(front_raw_ptr) && std::static_pointer_cast<Constant>(front)->state() == Constant::Nil) { if (is<Constant>(front_raw_ptr) && std::static_pointer_cast<Constant>(front)->state() == Constant::Nil) {
return makePtr<Constant>(); return makePtr<Constant>();
} }
if (is<Collection>(front_raw_ptr)) { if (is<List>(front_raw_ptr)) {
return front;
}
if (is<Vector>(front_raw_ptr)) {
auto collection = std::static_pointer_cast<Collection>(front); auto collection = std::static_pointer_cast<Collection>(front);
if (collection->empty()) { if (collection->empty()) {
@ -955,7 +953,7 @@ ADD_FUNCTION(
return front; return front;
} }
return makePtr<List>(collection->nodes()); return makePtr<List>(collection->nodesCopy());
} }
if (is<String>(front_raw_ptr)) { if (is<String>(front_raw_ptr)) {
auto string = std::static_pointer_cast<String>(front); auto string = std::static_pointer_cast<String>(front);

2
src/printer.cpp
Unescape View File

@ -76,7 +76,7 @@ void Printer::printImpl(ValuePtr node, bool print_readably)
m_print += (is<List>(node_raw_ptr)) ? '(' : '['; m_print += (is<List>(node_raw_ptr)) ? '(' : '[';
m_first_node = false; m_first_node = false;
m_previous_node_is_list = true; m_previous_node_is_list = true;
auto nodes = std::static_pointer_cast<Collection>(node)->nodes(); auto nodes = std::static_pointer_cast<Collection>(node)->nodesRead();
for (auto node : nodes) { for (auto node : nodes) {
printImpl(node, print_readably); printImpl(node, print_readably);
m_previous_node_is_list = false; m_previous_node_is_list = false;

2
src/reader.cpp
Unescape View File

@ -373,7 +373,7 @@ void Reader::dumpImpl(ValuePtr node)
Value* node_raw_ptr = node.get(); Value* node_raw_ptr = node.get();
if (is<Collection>(node_raw_ptr)) { if (is<Collection>(node_raw_ptr)) {
auto nodes = std::static_pointer_cast<List>(node)->nodes(); auto nodes = std::static_pointer_cast<List>(node)->nodesRead();
print("{}", indentation); print("{}", indentation);
print(fg(ruc::format::TerminalColor::Blue), "{}Container", (is<List>(node_raw_ptr)) ? "List" : "Vector"); print(fg(ruc::format::TerminalColor::Blue), "{}Container", (is<List>(node_raw_ptr)) ? "List" : "Vector");
print(" <"); print(" <");

Write Preview
Loading…
Cancel
Save