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

Main: Fix compilation of older steps

Browse Source
This commit is contained in:
Riyyi
2023-04-17 15:45:56 +02:00
parent fa79f1296a
commit 88d9253219
8 changed files with 94 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/step0_repl.cpp
+17
View File
@@ -3,6 +3,8 @@
#include <string> // std::getline #include <string> // std::getline
#include <string_view> #include <string_view>
#include "forward.h"
#if 0 #if 0
auto read(std::string_view data) -> std::string_view auto read(std::string_view data) -> std::string_view
{ {
@@ -41,4 +43,19 @@ auto main() -> int
return 0; return 0;
} }
// Below is needed for compilation
namespace blaze {
auto read(std::string_view) -> ValuePtr
{
return {};
}
auto eval(ValuePtr, EnvironmentPtr) -> ValuePtr
{
return {};
}
} // namespace blaze
#endif #endif
src/step1_read_print.cpp
+13 -8
View File
@@ -9,35 +9,40 @@
#include "ast.h" #include "ast.h"
#include "error.h" #include "error.h"
#include "forward.h"
#include "lexer.h" #include "lexer.h"
#include "printer.h" #include "printer.h"
#include "reader.h" #include "reader.h"
#include "settings.h" #include "settings.h"
#if 0 #if 0
auto read(std::string_view input) -> blaze::ASTNodePtr namespace blaze {
auto read(std::string_view input) -> ValuePtr
{ {
blaze::Lexer lexer(input); Lexer lexer(input);
lexer.tokenize(); lexer.tokenize();
if (blaze::Settings::the().get("dump-lexer") == "1") { if (Settings::the().get("dump-lexer") == "1") {
lexer.dump(); lexer.dump();
} }
blaze::Reader reader(std::move(lexer.tokens())); Reader reader(std::move(lexer.tokens()));
reader.read(); reader.read();
if (blaze::Settings::the().get("dump-reader") == "1") { if (Settings::the().get("dump-reader") == "1") {
reader.dump(); reader.dump();
} }
return reader.node(); return reader.node();
} }
auto eval(blaze::ASTNodePtr ast) -> blaze::ASTNodePtr auto eval(ValuePtr ast, EnvironmentPtr) -> ValuePtr
{ {
return ast; return ast;
} }
auto print(blaze::ASTNodePtr exp) -> std::string } // namespace blaze
auto print(blaze::ValuePtr exp) -> std::string
{ {
blaze::Printer printer; blaze::Printer printer;
return printer.print(exp); return printer.print(exp);
@@ -48,7 +53,7 @@ auto rep(std::string_view input) -> void
blaze::Error::the().clearErrors(); blaze::Error::the().clearErrors();
blaze::Error::the().setInput(input); blaze::Error::the().setInput(input);
print("{}\n", print(eval(read(input))).c_str()); print("{}\n", print(blaze::eval(blaze::read(input), nullptr)).c_str());
} }
static auto cleanup(int signal) -> void static auto cleanup(int signal) -> void
src/step2_eval.cpp
+19 -10
View File
@@ -8,7 +8,9 @@
#include "ast.h" #include "ast.h"
#include "environment.h" #include "environment.h"
#include "error.h"
#include "eval.h" #include "eval.h"
#include "forward.h"
#include "lexer.h" #include "lexer.h"
#include "printer.h" #include "printer.h"
#include "reader.h" #include "reader.h"
@@ -16,33 +18,38 @@
#include "settings.h" #include "settings.h"
#if 0 #if 0
auto read(std::string_view input) -> blaze::ASTNodePtr static blaze::EnvironmentPtr s_outer_env = blaze::Environment::create();
namespace blaze {
auto read(std::string_view input) -> ValuePtr
{ {
blaze::Lexer lexer(input); Lexer lexer(input);
lexer.tokenize(); lexer.tokenize();
if (blaze::Settings::the().get("dump-lexer") == "1") { if (Settings::the().get("dump-lexer") == "1") {
lexer.dump(); lexer.dump();
} }
blaze::Reader reader(std::move(lexer.tokens())); Reader reader(std::move(lexer.tokens()));
reader.read(); reader.read();
if (blaze::Settings::the().get("dump-reader") == "1") { if (Settings::the().get("dump-reader") == "1") {
reader.dump(); reader.dump();
} }
return reader.node(); return reader.node();
} }
auto eval(blaze::ASTNodePtr ast) -> blaze::ASTNodePtr auto eval(ValuePtr ast, EnvironmentPtr env) -> ValuePtr
{ {
blaze::GlobalEnvironment env; Eval eval(ast, env);
blaze::Eval eval(ast, &env);
eval.eval(); eval.eval();
return eval.ast(); return eval.ast();
} }
auto print(blaze::ASTNodePtr exp) -> std::string } // namespace blaze
auto print(blaze::ValuePtr exp) -> std::string
{ {
blaze::Printer printer; blaze::Printer printer;
@@ -54,7 +61,7 @@ auto rep(std::string_view input) -> std::string
blaze::Error::the().clearErrors(); blaze::Error::the().clearErrors();
blaze::Error::the().setInput(input); blaze::Error::the().setInput(input);
return print(eval(read(input))); return print(blaze::eval(blaze::read(input), s_outer_env));
} }
static auto cleanup(int signal) -> void static auto cleanup(int signal) -> void
@@ -87,6 +94,8 @@ auto main(int argc, char* argv[]) -> int
std::signal(SIGINT, cleanup); std::signal(SIGINT, cleanup);
std::signal(SIGTERM, cleanup); std::signal(SIGTERM, cleanup);
installFunctions(s_outer_env);
blaze::Readline readline(pretty_print, history_path); blaze::Readline readline(pretty_print, history_path);
std::string input; std::string input;
src/step3_env.cpp
+17 -10
View File
@@ -10,6 +10,7 @@
#include "environment.h" #include "environment.h"
#include "error.h" #include "error.h"
#include "eval.h" #include "eval.h"
#include "forward.h"
#include "lexer.h" #include "lexer.h"
#include "printer.h" #include "printer.h"
#include "reader.h" #include "reader.h"
@@ -17,34 +18,38 @@
#include "settings.h" #include "settings.h"
#if 0 #if 0
static blaze::EnvironmentPtr env = blaze::makePtr<blaze::GlobalEnvironment>(); static blaze::EnvironmentPtr s_outer_env = blaze::Environment::create();
auto read(std::string_view input) -> blaze::ASTNodePtr namespace blaze {
auto read(std::string_view input) -> ValuePtr
{ {
blaze::Lexer lexer(input); Lexer lexer(input);
lexer.tokenize(); lexer.tokenize();
if (blaze::Settings::the().get("dump-lexer") == "1") { if (Settings::the().get("dump-lexer") == "1") {
lexer.dump(); lexer.dump();
} }
blaze::Reader reader(std::move(lexer.tokens())); Reader reader(std::move(lexer.tokens()));
reader.read(); reader.read();
if (blaze::Settings::the().get("dump-reader") == "1") { if (Settings::the().get("dump-reader") == "1") {
reader.dump(); reader.dump();
} }
return reader.node(); return reader.node();
} }
auto eval(blaze::ASTNodePtr ast) -> blaze::ASTNodePtr auto eval(ValuePtr ast, EnvironmentPtr env) -> ValuePtr
{ {
blaze::Eval eval(ast, env); Eval eval(ast, env);
eval.eval(); eval.eval();
return eval.ast(); return eval.ast();
} }
auto print(blaze::ASTNodePtr exp) -> std::string } // namespace blaze
auto print(blaze::ValuePtr exp) -> std::string
{ {
blaze::Printer printer; blaze::Printer printer;
@@ -56,7 +61,7 @@ auto rep(std::string_view input) -> std::string
blaze::Error::the().clearErrors(); blaze::Error::the().clearErrors();
blaze::Error::the().setInput(input); blaze::Error::the().setInput(input);
return print(eval(read(input))); return print(blaze::eval(blaze::read(input), s_outer_env));
} }
static auto cleanup(int signal) -> void static auto cleanup(int signal) -> void
@@ -89,6 +94,8 @@ auto main(int argc, char* argv[]) -> int
std::signal(SIGINT, cleanup); std::signal(SIGINT, cleanup);
std::signal(SIGTERM, cleanup); std::signal(SIGTERM, cleanup);
installFunctions(s_outer_env);
blaze::Readline readline(pretty_print, history_path); blaze::Readline readline(pretty_print, history_path);
std::string input; std::string input;
src/step4_if_fn_do.cpp
+14 -12
View File
@@ -23,9 +23,7 @@ static blaze::EnvironmentPtr s_outer_env = blaze::Environment::create();
static auto cleanup(int signal) -> void; static auto cleanup(int signal) -> void;
static auto installLambdas(blaze::EnvironmentPtr env) -> void; static auto installLambdas(blaze::EnvironmentPtr env) -> void;
static auto rep(std::string_view input, blaze::EnvironmentPtr env) -> std::string; static auto rep(std::string_view input, blaze::EnvironmentPtr env) -> std::string;
static auto read(std::string_view input) -> blaze::ASTNodePtr; static auto print(blaze::ValuePtr exp) -> std::string;
static auto eval(blaze::ASTNodePtr ast, blaze::EnvironmentPtr env) -> blaze::ASTNodePtr;
static auto print(blaze::ASTNodePtr exp) -> std::string;
auto main(int argc, char* argv[]) -> int auto main(int argc, char* argv[]) -> int
{ {
@@ -93,35 +91,39 @@ static auto rep(std::string_view input, blaze::EnvironmentPtr env) -> std::strin
blaze::Error::the().clearErrors(); blaze::Error::the().clearErrors();
blaze::Error::the().setInput(input); blaze::Error::the().setInput(input);
return print(eval(read(input), env)); return print(blaze::eval(blaze::read(input), env));
} }
static auto read(std::string_view input) -> blaze::ASTNodePtr namespace blaze {
auto read(std::string_view input) -> ValuePtr
{ {
blaze::Lexer lexer(input); Lexer lexer(input);
lexer.tokenize(); lexer.tokenize();
if (blaze::Settings::the().get("dump-lexer") == "1") { if (Settings::the().get("dump-lexer") == "1") {
lexer.dump(); lexer.dump();
} }
blaze::Reader reader(std::move(lexer.tokens())); Reader reader(std::move(lexer.tokens()));
reader.read(); reader.read();
if (blaze::Settings::the().get("dump-reader") == "1") { if (Settings::the().get("dump-reader") == "1") {
reader.dump(); reader.dump();
} }
return reader.node(); return reader.node();
} }
static auto eval(blaze::ASTNodePtr ast, blaze::EnvironmentPtr env) -> blaze::ASTNodePtr auto eval(ValuePtr ast, EnvironmentPtr env) -> ValuePtr
{ {
blaze::Eval eval(ast, env); Eval eval(ast, env);
eval.eval(); eval.eval();
return eval.ast(); return eval.ast();
} }
static auto print(blaze::ASTNodePtr exp) -> std::string } // namespace blaze
static auto print(blaze::ValuePtr exp) -> std::string
{ {
blaze::Printer printer; blaze::Printer printer;
src/step5_tco.cpp
+14 -12
View File
@@ -29,9 +29,7 @@ static blaze::EnvironmentPtr s_outer_env = blaze::Environment::create();
static auto cleanup(int signal) -> void; static auto cleanup(int signal) -> void;
static auto installLambdas(blaze::EnvironmentPtr env) -> void; static auto installLambdas(blaze::EnvironmentPtr env) -> void;
static auto rep(std::string_view input, blaze::EnvironmentPtr env) -> std::string; static auto rep(std::string_view input, blaze::EnvironmentPtr env) -> std::string;
static auto read(std::string_view input) -> blaze::ASTNodePtr; static auto print(blaze::ValuePtr exp) -> std::string;
static auto eval(blaze::ASTNodePtr ast, blaze::EnvironmentPtr env) -> blaze::ASTNodePtr;
static auto print(blaze::ASTNodePtr exp) -> std::string;
auto main(int argc, char* argv[]) -> int auto main(int argc, char* argv[]) -> int
{ {
@@ -99,35 +97,39 @@ static auto rep(std::string_view input, blaze::EnvironmentPtr env) -> std::strin
blaze::Error::the().clearErrors(); blaze::Error::the().clearErrors();
blaze::Error::the().setInput(input); blaze::Error::the().setInput(input);
return print(eval(read(input), env)); return print(blaze::eval(blaze::read(input), env));
} }
static auto read(std::string_view input) -> blaze::ASTNodePtr namespace blaze {
auto read(std::string_view input) -> ValuePtr
{ {
blaze::Lexer lexer(input); Lexer lexer(input);
lexer.tokenize(); lexer.tokenize();
if (blaze::Settings::the().get("dump-lexer") == "1") { if (Settings::the().get("dump-lexer") == "1") {
lexer.dump(); lexer.dump();
} }
blaze::Reader reader(std::move(lexer.tokens())); Reader reader(std::move(lexer.tokens()));
reader.read(); reader.read();
if (blaze::Settings::the().get("dump-reader") == "1") { if (Settings::the().get("dump-reader") == "1") {
reader.dump(); reader.dump();
} }
return reader.node(); return reader.node();
} }
static auto eval(blaze::ASTNodePtr ast, blaze::EnvironmentPtr env) -> blaze::ASTNodePtr auto eval(ValuePtr ast, EnvironmentPtr env) -> ValuePtr
{ {
blaze::Eval eval(ast, env); Eval eval(ast, env);
eval.eval(); eval.eval();
return eval.ast(); return eval.ast();
} }
static auto print(blaze::ASTNodePtr exp) -> std::string } // namespace blaze
static auto print(blaze::ValuePtr exp) -> std::string
{ {
blaze::Printer printer; blaze::Printer printer;
src/step7_quote.cpp
-1
View File
@@ -119,7 +119,6 @@ auto main(int argc, char* argv[]) -> int
arg_parser.addOption(dump_reader, 'r', "dump-reader", nullptr, nullptr); arg_parser.addOption(dump_reader, 'r', "dump-reader", nullptr, nullptr);
arg_parser.addOption(pretty_print, 'c', "color", nullptr, nullptr); arg_parser.addOption(pretty_print, 'c', "color", nullptr, nullptr);
arg_parser.addOption(history_path, 'h', "history-path", nullptr, nullptr, nullptr, ruc::ArgParser::Required::Yes); arg_parser.addOption(history_path, 'h', "history-path", nullptr, nullptr, nullptr, ruc::ArgParser::Required::Yes);
// TODO: Add overload for addArgument(std::vector<std::string_view>)
arg_parser.addArgument(arguments, "arguments", nullptr, nullptr, ruc::ArgParser::Required::No); arg_parser.addArgument(arguments, "arguments", nullptr, nullptr, ruc::ArgParser::Required::No);
arg_parser.parse(argc, argv); arg_parser.parse(argc, argv);
src/step8_macros.cpp
-1
View File
@@ -126,7 +126,6 @@ auto main(int argc, char* argv[]) -> int
arg_parser.addOption(dump_reader, 'r', "dump-reader", nullptr, nullptr); arg_parser.addOption(dump_reader, 'r', "dump-reader", nullptr, nullptr);
arg_parser.addOption(pretty_print, 'c', "color", nullptr, nullptr); arg_parser.addOption(pretty_print, 'c', "color", nullptr, nullptr);
arg_parser.addOption(history_path, 'h', "history-path", nullptr, nullptr, nullptr, ruc::ArgParser::Required::Yes); arg_parser.addOption(history_path, 'h', "history-path", nullptr, nullptr, nullptr, ruc::ArgParser::Required::Yes);
// TODO: Add overload for addArgument(std::vector<std::string_view>)
arg_parser.addArgument(arguments, "arguments", nullptr, nullptr, ruc::ArgParser::Required::No); arg_parser.addArgument(arguments, "arguments", nullptr, nullptr, ruc::ArgParser::Required::No);
arg_parser.parse(argc, argv); arg_parser.parse(argc, argv);