Merge pull request #63 from ne-foss-org/compiler_kit-source-tweaks

[CHORE] Source code tweaks.

7 files changed, 10 insertions, 14 deletions

diff --git a/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cpp b/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cpp
index 2c5fde8..a2417ae 100644
--- a/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cpp
+++ b/src/CompilerKit/src/CodeGenerator+AssemblyFactory.cpp
@@ -17,7 +17,7 @@
 namespace CompilerKit {
 ///! @brief Compile for specific format (ELF, PEF, AE)
 Int32 AssemblyFactory::Compile(STLString sourceFile, const Int32& arch) {
-  if (sourceFile.length() < 1) return NECTAR_UNIMPLEMENTED;
+  if (sourceFile.length() == 0) return NECTAR_UNIMPLEMENTED;
 
   if (!this->fMounted) return NECTAR_UNIMPLEMENTED;
   if (arch != this->fMounted->Arch()) return NECTAR_INVALID_ARCH;
@@ -27,7 +27,7 @@ Int32 AssemblyFactory::Compile(STLString sourceFile, const Int32& arch) {
 
 ///! @brief mount assembly backend.
 void AssemblyFactory::Mount(WeakRef<IAssembly> mount_ptr) {
-  if (mount_ptr && !this->fMounted) {
+  if (mount_ptr.Leak() && !this->fMounted) {
     this->fMounted = mount_ptr.Leak();
   }
 }
diff --git a/src/CompilerKit/src/Linkers/DynamicLinker64+PEF.cpp b/src/CompilerKit/src/Linkers/DynamicLinker64+PEF.cpp
index 476c7f7..c48bdb2 100644
--- a/src/CompilerKit/src/Linkers/DynamicLinker64+PEF.cpp
+++ b/src/CompilerKit/src/Linkers/DynamicLinker64+PEF.cpp
@@ -147,7 +147,6 @@ NECTAR_MODULE(DynamicLinker64PEF) {
         kOutput.erase(kOutput.find(kPefExt), strlen(kPefExt));
 
       kOutput += kPefDylibExt;
-
       is_executable = false;
 
       continue;
diff --git a/src/CompilerKit/src/Preprocessors/Preprocessor+Generic.cpp b/src/CompilerKit/src/Preprocessors/Preprocessor+Generic.cpp
index 49c2145..47df994 100644
--- a/src/CompilerKit/src/Preprocessors/Preprocessor+Generic.cpp
+++ b/src/CompilerKit/src/Preprocessors/Preprocessor+Generic.cpp
@@ -17,11 +17,11 @@
 #define kMacroPrefix '#'
 
 /// @author Amlal El Mahrouss (amlal@nekernel.org)
-/// @file Preprocessor+Generic.cc
+/// @file Preprocessor+Generic.cpp
 /// @brief Nectar Preprocessor.
 
-typedef Int32 (*pp_parser_fn_t)(CompilerKit::STLString& line, std::ifstream& hdr_file,
-                                std::ofstream& pp_out);
+using pp_parser_fn_t = Int32 (*)(CompilerKit::STLString&, std::ifstream&,
+                                std::ofstream&);
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/CompilerKit/test/Linkers/DynamicLinker64+MachO.test.cc b/src/CompilerKit/test/Linkers/DynamicLinker64+MachO.test.cpp
index f73d6fd..a08abc5 100644
--- a/src/CompilerKit/test/Linkers/DynamicLinker64+MachO.test.cc
+++ b/src/CompilerKit/test/Linkers/DynamicLinker64+MachO.test.cpp
@@ -23,6 +23,5 @@ Int32 main(Int32 argc, char** argv) {
 }
 
 TEST(LinkerRunMachO, LinkerExitsCorrectly) {
-  EXPECT_TRUE(kArgc > 1);
   EXPECT_TRUE(DynamicLinker64MachO(kArgc, kArgv) == 0);
 }
diff --git a/src/CompilerKit/test/Linkers/DynamicLinker64+PEF.test.cc b/src/CompilerKit/test/Linkers/DynamicLinker64+PEF.test.cpp
index 6c4d061..7cd3645 100644
--- a/src/CompilerKit/test/Linkers/DynamicLinker64+PEF.test.cc
+++ b/src/CompilerKit/test/Linkers/DynamicLinker64+PEF.test.cpp
@@ -23,6 +23,5 @@ Int32 main(Int32 argc, char** argv) {
 }
 
 TEST(LinkerRunPEF, LinkerExitsCorrectly) {
-  EXPECT_TRUE(kArgc > 1);
   EXPECT_TRUE(DynamicLinker64PEF(kArgc, kArgv) == 0);
 }
diff --git a/src/CompilerKit/test/Linkers/ck-linker-test-osx-posix.json b/src/CompilerKit/test/Linkers/ck-linker-test-osx-posix.json
index 0f197d1..14eb174 100644
--- a/src/CompilerKit/test/Linkers/ck-linker-test-osx-posix.json
+++ b/src/CompilerKit/test/Linkers/ck-linker-test-osx-posix.json
@@ -9,9 +9,9 @@
     "/usr/include/"
   ],
   "sources_path": [
-    "DynamicLinker64+MachO.test.cc"
+    "DynamicLinker64+MachO.test.cpp"
   ],
-  "output_name": "LinkerTest.o",
+  "output_name": "LinkerTest+OSX.o",
   "compiler_flags": [
       "-fPIC",
       "-lgtest",
diff --git a/src/CompilerKit/test/Linkers/ck-linker-test-pef-posix.json b/src/CompilerKit/test/Linkers/ck-linker-test-pef-posix.json
index 97e8604..b1ee0d7 100644
--- a/src/CompilerKit/test/Linkers/ck-linker-test-pef-posix.json
+++ b/src/CompilerKit/test/Linkers/ck-linker-test-pef-posix.json
@@ -9,13 +9,12 @@
     "/usr/include/"
   ],
   "sources_path": [
-    "DynamicLinker64+PEF64.test.cc"
+    "DynamicLinker64+PEF.test.cpp"
   ],
-  "output_name": "LinkerTest.o",
+  "output_name": "LinkerTest+PEF.o",
   "compiler_flags": [
       "-fPIC",
-      "-lgtest",
-      "-lCompilerKit"
+      "-lgtest"
   ],
   "cpp_macros": [
     "__NECTAR__=202505",