HCR-24: Preprocessor now uses single '-' flags.

Signed-off-by: amlal <amlal.elmahrouss@icloud.com>

4 files changed, 21 insertions, 12 deletions

diff --git a/Private/Toolchain/32asm.cc b/Private/Toolchain/32asm.cc
index a22272b..258fa4b 100644
--- a/Private/Toolchain/32asm.cc
+++ b/Private/Toolchain/32asm.cc
@@ -26,6 +26,9 @@
 #include <filesystem>
 #include <fstream>
 #include <iostream>
+#include <vector>
+#include <memory>
+
 
 /////////////////////
 
diff --git a/Private/Toolchain/bin/Source/amd64_to_ae.s b/Private/Toolchain/bin/Source/amd64_to_ae.s
index a819333..040f07b 100644
--- a/Private/Toolchain/bin/Source/amd64_to_ae.s
+++ b/Private/Toolchain/bin/Source/amd64_to_ae.s
@@ -7,7 +7,7 @@ export .text main
     
     retf
 
-    export .text foo
+export .text foo
     mov rdx, rcx
     mov rax, rcx
 
diff --git a/Private/Toolchain/bpp.cc b/Private/Toolchain/bpp.cc
index 38c1029..04fbe91 100644
--- a/Private/Toolchain/bpp.cc
+++ b/Private/Toolchain/bpp.cc
@@ -827,7 +827,7 @@ void bpp_parse_file(std::ifstream &hdr_file, std::ofstream &pp_out) {
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-MPCC_MODULE(HCoreBCCLPreprocessor) {
+MPCC_MODULE(HCorePreprocessor) {
   try {
     bool skip = false;
     bool double_skip = false;
@@ -844,6 +844,12 @@ MPCC_MODULE(HCoreBCCLPreprocessor) {
 
     kMacros.push_back(macro_0);
 
+    details::bpp_macro macro_hcore;
+    macro_hcore.fName = "__MAHROUSS__";
+    macro_hcore.fValue = "1";
+
+    kMacros.push_back(macro_hcore);
+
     for (auto index = 1UL; index < argc; ++index) {
       if (skip) {
         skip = false;
@@ -857,23 +863,23 @@ MPCC_MODULE(HCoreBCCLPreprocessor) {
       }
 
       if (argv[index][0] == '-') {
-        if (strcmp(argv[index], "--version") == 0) {
+        if (strcmp(argv[index], "-version") == 0) {
           printf("%s\n", "bpp v1.11, (c) Mahrouss Logic");
           return 0;
         }
 
         if (strcmp(argv[index], "-h") == 0 ||
-            strcmp(argv[index], "--help") == 0) {
+            strcmp(argv[index], "-help") == 0) {
           printf("%s\n", "bpp v1.11, (c) Mahrouss Logic");
-          printf("%s\n", "--working-dir: set directory to working path.");
-          printf("%s\n", "--include-dir: add directory to include path.");
-          printf("%s\n", "--define: define macro.");
-          printf("%s\n", "--version: print the version.");
+          printf("%s\n", "-working-dir <path>: set directory to working path.");
+          printf("%s\n", "-include-dir <path>: add directory to include path.");
+          printf("%s\n", "-define <name> <value>: define macro.");
+          printf("%s\n", "-version: print the version.");
 
           return 0;
         }
 
-        if (strcmp(argv[index], "--include-dir") == 0) {
+        if (strcmp(argv[index], "-include-dir") == 0) {
           std::string inc = argv[index + 1];
 
           skip = true;
@@ -881,13 +887,13 @@ MPCC_MODULE(HCoreBCCLPreprocessor) {
           kIncludes.push_back(inc);
         }
 
-        if (strcmp(argv[index], "--working-dir") == 0) {
+        if (strcmp(argv[index], "-working-dir") == 0) {
           std::string inc = argv[index + 1];
           skip = true;
           kWorkingDir = inc;
         }
 
-        if (strcmp(argv[index], "--define") == 0 &&
+        if (strcmp(argv[index], "-define") == 0 &&
             argv[index + 1] != nullptr && argv[index + 2] != nullptr) {
           std::string macro_key = argv[index + 1];
 
diff --git a/Private/Toolchain/i64asm.cc b/Private/Toolchain/i64asm.cc
index 40dc630..170b22b 100644
--- a/Private/Toolchain/i64asm.cc
+++ b/Private/Toolchain/i64asm.cc
@@ -516,7 +516,7 @@ std::string CompilerKit::EncoderAMD64::CheckLine(std::string &line,
   }
 
   if (!detail::algorithm::is_valid(line)) {
-    err_str = "Line contains non alphanumeric characters.\nhere -> ";
+    err_str = "Line contains non alphanumeric characters.\nHere -> ";
     err_str += line;
 
     return err_str;