From addbdf3cf71c6d332bdf86a101a7df544fe5a9a2 Mon Sep 17 00:00:00 2001 From: Roland Reichwein Date: Sat, 24 Oct 2020 19:29:28 +0200 Subject: Minor improvements --- cpp.cpp | 22 +++++++++++----------- tests/test-cpp.cpp | 2 +- tests/test-minicc.cpp | 2 ++ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/cpp.cpp b/cpp.cpp index 48bf764..3b450c2 100644 --- a/cpp.cpp +++ b/cpp.cpp @@ -262,25 +262,25 @@ void CPP::link() // phases of translation, according to standard void CPP::compile(const std::string& code) { - source_charset_map(); + source_charset_map(); // phase 1 - backslash_escape(); + backslash_escape(); // phase 2 - auto pp_tokens = preprocessing_tokenize(code); + auto pp_tokens = preprocessing_tokenize(code); // phase 3 - preprocess(); + preprocess(); // phase 4 - execution_charset_map(); + execution_charset_map(); // phase 5 - concatenate_strings(); + concatenate_strings(); // phase 6 - auto tokens = tokens_from_pptokens(pp_tokens); - m_nodes = analysis(tokens); - translate(); + auto tokens = tokens_from_pptokens(pp_tokens); // phase 7a + m_nodes = analysis(tokens); // phase 7b + translate(); // phase 7c - instantiate(); + instantiate(); // phase 8 - link(); + link(); // phase 9 } std::vector CPP::getCode() diff --git a/tests/test-cpp.cpp b/tests/test-cpp.cpp index 513a3a5..e5b2a1a 100644 --- a/tests/test-cpp.cpp +++ b/tests/test-cpp.cpp @@ -24,7 +24,7 @@ class CppTest: public ::testing::Test { protected: CppTest() { - debug = true; + //debug = true; } ~CppTest() { } diff --git a/tests/test-minicc.cpp b/tests/test-minicc.cpp index baf8b3f..4bb64c8 100644 --- a/tests/test-minicc.cpp +++ b/tests/test-minicc.cpp @@ -1,3 +1,5 @@ +// Main loop of test program + #include "gmock/gmock.h" #include "gtest/gtest.h" -- cgit v1.2.3