Use INFO macro from base.h
Instead of using TERM_YELLOW directly, along with C++'s shit stream based I/O, let's just use the nice macro defined in base.h
This commit is contained in:
38
src/main.cpp
38
src/main.cpp
@@ -59,15 +59,14 @@ int main(int argc, const char *argv[])
|
||||
(void)out_name;
|
||||
|
||||
#if VERBOSE >= 1
|
||||
printf("[%sASSEMBLER%s]: Assembling `%s` to `%s`\n", TERM_YELLOW, TERM_RESET,
|
||||
source_name, out_name);
|
||||
INFO("ASSEMBLER", "Assembling `%s` to `%s`\n", source_name, out_name);
|
||||
#endif
|
||||
|
||||
auto file_source = read_file(source_name);
|
||||
|
||||
#if VERBOSE >= 1
|
||||
printf("[%sASSEMBLER%s]: `%s` -> %lu bytes\n", TERM_YELLOW, TERM_RESET,
|
||||
source_name, file_source.has_value() ? file_source.value().size() : 0);
|
||||
SUCCESS("ASSEMBLER", "`%s` -> %lu bytes\n", source_name,
|
||||
file_source.has_value() ? file_source.value().size() : 0);
|
||||
#endif
|
||||
|
||||
string source_str;
|
||||
@@ -104,19 +103,18 @@ int main(int argc, const char *argv[])
|
||||
else
|
||||
{
|
||||
#if VERBOSE >= 1
|
||||
printf("[%sLEXER%s]: %lu bytes -> %lu tokens\n", TERM_GREEN, TERM_RESET,
|
||||
source_str.size(), tokens.size());
|
||||
SUCCESS("LEXER", "%lu bytes -> %lu tokens\n", source_str.size(),
|
||||
tokens.size());
|
||||
#endif
|
||||
|
||||
#if VERBOSE == 2
|
||||
printf("[%sLEXER%s]: Tokens "
|
||||
"parsed:\n----------------------------------------------------------"
|
||||
"----------------------\n",
|
||||
TERM_GREEN, TERM_RESET);
|
||||
SUCCESS("LEXER", "Tokens parsed:%s\n", "");
|
||||
printf("-------------------------------------------------------------------"
|
||||
"-------------\n");
|
||||
for (auto token : tokens)
|
||||
cout << "\t" << *token << endl;
|
||||
printf("-------------------------------------------------------------"
|
||||
"-------------------\n");
|
||||
printf("-------------------------------------------------------------------"
|
||||
"-------------\n");
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -131,20 +129,18 @@ int main(int argc, const char *argv[])
|
||||
else
|
||||
{
|
||||
#if VERBOSE >= 1
|
||||
printf("[%sPREPROCESSER%s]: %lu tokens -> %lu units\n", TERM_GREEN,
|
||||
TERM_RESET, tokens.size(), units.size());
|
||||
SUCCESS("PREPROCESSER", "%lu tokens -> %lu units\n", tokens.size(),
|
||||
units.size());
|
||||
#endif
|
||||
|
||||
#if VERBOSE == 2
|
||||
printf("[%sPREPROCESSER%s]: Units "
|
||||
"constructed:\n-----------------------------------------------------"
|
||||
"-----"
|
||||
"----------------------\n",
|
||||
TERM_GREEN, TERM_RESET);
|
||||
SUCCESS("PREPROCESSER", "Units constructed:%s\n", "");
|
||||
printf("-------------------------------------------------------------------"
|
||||
"-------------\n");
|
||||
for (auto unit : units)
|
||||
cout << unit << endl;
|
||||
printf("-------------------------------------------------------------"
|
||||
"-------------------\n");
|
||||
printf("-------------------------------------------------------------------"
|
||||
"-------------\n");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
#include <src/lexer.hpp>
|
||||
#include <src/preprocesser.hpp>
|
||||
|
||||
#include <lib/base.h>
|
||||
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
@@ -69,9 +71,10 @@ namespace Preprocesser
|
||||
{
|
||||
i = end;
|
||||
#if VERBOSE >= 2
|
||||
std::cout << "[" TERM_YELLOW "PREPROCESSER" TERM_RESET "]: <" << depth
|
||||
<< "> [" << i << "]:\n\tPreserving definition of `"
|
||||
<< const_name << "` from outer scope\n";
|
||||
INFO("PREPROCESSER",
|
||||
"<%d> [%lu]:\n\t Preserving definition of `%s` from outer "
|
||||
"scope\n",
|
||||
depth, i, const_name.c_str());
|
||||
#endif
|
||||
continue;
|
||||
}
|
||||
@@ -84,8 +87,8 @@ namespace Preprocesser
|
||||
i = end;
|
||||
|
||||
#if VERBOSE >= 2
|
||||
std::cout << "[" TERM_YELLOW "PREPROCESSER" TERM_RESET "]: <" << depth
|
||||
<< "> [" << i << "]:\n\tConstant `" << const_name << "` {\n";
|
||||
INFO("PREPROCESSER", "<%d> [%lu]:\n\tConstant `%s` {\n", depth, i,
|
||||
const_name.c_str());
|
||||
|
||||
for (size_t j = 0; j < body.size(); ++j)
|
||||
{
|
||||
@@ -110,9 +113,8 @@ namespace Preprocesser
|
||||
|
||||
const auto name = tokens[i + 1]->content;
|
||||
#if VERBOSE >= 2
|
||||
std::cout << "[" TERM_YELLOW "PREPROCESSER" TERM_RESET "]: <" << depth
|
||||
<< "> [" << i << "]: (" << *tokens[i] << "): FILENAME=`"
|
||||
<< name << "`\n";
|
||||
INFO("PREPROCESSER", "<%d> [%lu]: (", depth, i);
|
||||
std::cout << *tokens[i] << "): FILENAME=`" << name << "`\n";
|
||||
#endif
|
||||
// If file has never been encountered, let's tokenise, preprocess then
|
||||
// cache the result
|
||||
|
||||
Reference in New Issue
Block a user