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

Main: Fix *ARGV* with 0 arguments

Browse Source
This commit is contained in:
Riyyi
2023-08-17 22:02:10 +02:00
parent ce0443a20e
commit 733d84c124
5 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/step6_file.cpp
+3 -5
View File
@@ -94,11 +94,9 @@ static auto installLambdas(EnvironmentPtr env) -> void
static auto makeArgv(EnvironmentPtr env, std::vector<std::string> arguments) -> void static auto makeArgv(EnvironmentPtr env, std::vector<std::string> arguments) -> void
{ {
size_t count = arguments.size(); size_t count = arguments.size();
auto nodes = ValueVector(count - 1); auto nodes = ValueVector();
if (count > 1) { for (size_t i = 1; i < count; ++i) {
for (size_t i = 1; i < count; ++i) { nodes.push_back(makePtr<String>(arguments[i]));
nodes.at(i) = makePtr<String>(arguments[i]);
}
} }
env->set("*ARGV*", makePtr<List>(nodes)); env->set("*ARGV*", makePtr<List>(nodes));
} }
src/step7_quote.cpp
+3 -5
View File
@@ -94,11 +94,9 @@ static auto installLambdas(EnvironmentPtr env) -> void
static auto makeArgv(EnvironmentPtr env, std::vector<std::string> arguments) -> void static auto makeArgv(EnvironmentPtr env, std::vector<std::string> arguments) -> void
{ {
size_t count = arguments.size(); size_t count = arguments.size();
auto nodes = ValueVector(count - 1); auto nodes = ValueVector();
if (count > 1) { for (size_t i = 1; i < count; ++i) {
for (size_t i = 1; i < count; ++i) { nodes.push_back(makePtr<String>(arguments[i]));
nodes.at(i) = makePtr<String>(arguments[i]);
}
} }
env->set("*ARGV*", makePtr<List>(nodes)); env->set("*ARGV*", makePtr<List>(nodes));
} }
src/step8_macros.cpp
+3 -5
View File
@@ -101,11 +101,9 @@ static auto installLambdas(EnvironmentPtr env) -> void
static auto makeArgv(EnvironmentPtr env, std::vector<std::string> arguments) -> void static auto makeArgv(EnvironmentPtr env, std::vector<std::string> arguments) -> void
{ {
size_t count = arguments.size(); size_t count = arguments.size();
auto nodes = ValueVector(count - 1); auto nodes = ValueVector();
if (count > 1) { for (size_t i = 1; i < count; ++i) {
for (size_t i = 1; i < count; ++i) { nodes.push_back(makePtr<String>(arguments[i]));
nodes.at(i) = makePtr<String>(arguments[i]);
}
} }
env->set("*ARGV*", makePtr<List>(nodes)); env->set("*ARGV*", makePtr<List>(nodes));
} }
src/step9_try.cpp
+3 -5
View File
@@ -101,11 +101,9 @@ static auto installLambdas(EnvironmentPtr env) -> void
static auto makeArgv(EnvironmentPtr env, std::vector<std::string> arguments) -> void static auto makeArgv(EnvironmentPtr env, std::vector<std::string> arguments) -> void
{ {
size_t count = arguments.size(); size_t count = arguments.size();
auto nodes = ValueVector(count - 1); auto nodes = ValueVector();
if (count > 1) { for (size_t i = 1; i < count; ++i) {
for (size_t i = 1; i < count; ++i) { nodes.push_back(makePtr<String>(arguments[i]));
nodes.at(i) = makePtr<String>(arguments[i]);
}
} }
env->set("*ARGV*", makePtr<List>(nodes)); env->set("*ARGV*", makePtr<List>(nodes));
} }
src/stepA_mal.cpp
+18 -5
View File
@@ -113,11 +113,9 @@ static auto installLambdas(EnvironmentPtr env) -> void
static auto makeArgv(EnvironmentPtr env, std::vector<std::string> arguments) -> void static auto makeArgv(EnvironmentPtr env, std::vector<std::string> arguments) -> void
{ {
size_t count = arguments.size(); size_t count = arguments.size();
auto nodes = ValueVector(count - 1); auto nodes = ValueVector();
if (count > 1) { for (size_t i = 1; i < count; ++i) {
for (size_t i = 1; i < count; ++i) { nodes.push_back(makePtr<String>(arguments[i]));
nodes.at(i) = makePtr<String>(arguments[i]);
}
} }
env->set("*ARGV*", makePtr<List>(nodes)); env->set("*ARGV*", makePtr<List>(nodes));
} }
@@ -178,3 +176,18 @@ auto main(int argc, char* argv[]) -> int
return 0; return 0;
} }
// TODO: List of things below
// v Pass stepA tests (implement leftover functions)
// v Make Macro into a subclass of Lambda (?) to simplify some logic
// v Convert std::list -> std::vector, test speed before/after
// v Better way of running mal tests
// - Make Collections/HashMaps const, construct a new one with the added items
// - Basic performance testing macros, enabled in debug builds
// Iterations to beat:
// Debug: ~5k
// Release: ~30k
// New:
// Debug: ~6k
// Release: ~37k