[GOIL] Mac OS X makefiles back. Arm64, X86_64 and universal binaries …

…are built. Fix Cygwin detection in unix makefile
TrampolineRTOS · Dec 4, 2023 · 510f084 · 510f084
1 parent 88860b1
commit 510f084
Show file tree

Hide file tree

Showing 90 changed files with 2,872 additions and 5,361 deletions.
diff --git a/goil/build/libpm/bdd/C_BDD.cpp b/goil/build/libpm/bdd/C_BDD.cpp
@@ -624,7 +624,7 @@ void C_build_values64_array::action (const bool tableauDesValeurs [],
 void C_BDD::buildValue64Array (TC_UniqueArray <uint64_t> & outValuesArray,
                                const uint32_t inVariableCount) const {
   MF_Assert(inVariableCount < 64, "inVariableCount == %ld >= 64", (int64_t) inVariableCount, 0) ;
-  outValuesArray.setCountToZero () ;
+  outValuesArray.removeAllKeepingCapacity () ;
   C_build_values64_array builder (& outValuesArray) ;
   bool * tableauDesValeurs = nullptr ;
   macroMyNewArray (tableauDesValeurs, bool, inVariableCount) ;
@@ -671,7 +671,7 @@ void C_build_values_array::action (const bool tableauDesValeurs [],
 
 void C_BDD::buildValueArray (TC_UniqueArray <TC_Array <bool> > & outValuesArray,
                              const uint32_t inVariableCount) const {
-  outValuesArray.setCountToZero () ;
+  outValuesArray.removeAllKeepingCapacity () ;
   C_build_values_array builder (& outValuesArray) ;
   bool * tableauDesValeurs = nullptr ;
   macroMyNewArray (tableauDesValeurs, bool, inVariableCount) ;
@@ -720,7 +720,7 @@ action (const bool tableauDesValeurs [],
 void C_BDD::
 buildLittleEndianStringValueArray (TC_UniqueArray <C_String> & outValuesArray,
                                    const uint32_t inVariableCount) const {
-  outValuesArray.setCountToZero () ;
+  outValuesArray.removeAllKeepingCapacity () ;
   cLittleEndianStringValueBuilder builder (& outValuesArray) ;
   bool * tableauDesValeurs = nullptr ;
   macroMyNewArray (tableauDesValeurs, bool, inVariableCount) ;
@@ -763,7 +763,7 @@ action (const bool tableauDesValeurs [],
 void C_BDD::
 buildBigEndianStringValueArray (TC_UniqueArray <C_String> & outValuesArray,
                                 const uint32_t inVariableCount) const {
-  outValuesArray.setCountToZero () ;
+  outValuesArray.removeAllKeepingCapacity () ;
   cBuildBigEndianStringValueArray builder (& outValuesArray) ;
   bool * tableauDesValeurs = nullptr ;
   macroMyNewArray (tableauDesValeurs, bool, inVariableCount) ;
@@ -1395,7 +1395,7 @@ void cBuildArrayForSet::action (const bool inValuesArray [],
 void C_BDD::getBoolArray (TC_UniqueArray <bool> & outArray,
                           const uint32_t inMaxValues,
                           const uint32_t inBitSize) const {
-  outArray.setCountToZero () ;
+  outArray.removeAllKeepingCapacity () ;
   outArray.setCapacity ((int32_t) inMaxValues) ;
   outArray.appendObjects ((int32_t) inMaxValues, false) ;
   cBuildArrayForSet s (outArray) ;
@@ -1620,7 +1620,7 @@ void C_BDD::getArray2 (TC_UniqueArray <TC_UniqueArray <uint64_t> > & outArray,
                        const uint32_t inMaxValueCount,
                        const uint32_t inBitSize1,
                        const uint32_t inBitSize2) const {
-  outArray.setCountToZero () ;
+  outArray.removeAllKeepingCapacity () ;
   outArray.setCapacityUsingSwap ((int32_t) inMaxValueCount) ;
   for (uint32_t i=0 ; i<inMaxValueCount ; i++) {
     outArray.appendDefaultObjectUsingSwap () ;

diff --git a/goil/build/libpm/bdd/C_BDD.h b/goil/build/libpm/bdd/C_BDD.h
@@ -23,9 +23,9 @@
 //----------------------------------------------------------------------------------------------------------------------
 
 #include "utilities/M_machine.h"
-#include "utilities/PMUInt128.h"
-#include "collections/TC_UniqueArray.h"
-#include "collections/TC_Array.h"
+#include "big-integers/PMUInt128.h"
+#include "generic-arraies/TC_UniqueArray.h"
+#include "generic-arraies/TC_Array.h"
 #include "big-integers/C_BigInt.h"
 
 //----------------------------------------------------------------------------------------------------------------------
@@ -40,16 +40,16 @@ class AC_OutputStream ;
 
 //----------------------------------------------------------------------------------------------------------------------
 
-class C_BDD {
+class C_BDD final {
 //--- enum for comparison operators
   public: enum compareEnum {kEqual, kNotEqual, kLowerOrEqual,
-                             kStrictLower, kGreaterOrEqual, kStrictGreater} ;
+                            kStrictLower, kGreaterOrEqual, kStrictGreater} ;
 
 //--- Constructors and destructor
   public: C_BDD (void) ; // Get a false BDD
   private: C_BDD (const uint32_t inInternalValue) ; // Internal, do not use
   public: C_BDD (const uint32_t inVariable, const bool inSign) ;
-  public: virtual ~C_BDD (void) ;
+  public: ~C_BDD (void) ;
 
 //--- Control copy
   public: C_BDD (const C_BDD & inSource) ;

diff --git a/goil/build/libpm/bdd/C_Relation.h b/goil/build/libpm/bdd/C_Relation.h
@@ -15,32 +15,32 @@
 
 //----------------------------------------------------------------------------------------------------------------------
 
-class C_Relation {
+class C_Relation final {
 //--- Default constructor (no variable, empty)
   public: C_Relation (void) ;
 
 //--- Constructor (One variable, type, empty or full)
   public: C_Relation (const C_String & inVariableName,
-                       const C_RelationSingleType & inVariableType,
-                       const bool isFull) ;
+                      const C_RelationSingleType & inVariableType,
+                      const bool isFull) ;
 
 //--- Constructor (variables, empty or full)
   public: C_Relation (const C_RelationConfiguration & inConfiguration,
-                       const bool isFull) ;
+                      const bool isFull) ;
 
 //--- Private constructor (variables, eBDD)
   private: C_Relation (const C_RelationConfiguration & inConfiguration,
-                        const C_BDD inBDD) ;
+                       const C_BDD inBDD) ;
 
 //--- Constructor (Variable compared with constant)
   public: C_Relation (const C_RelationConfiguration & inConfiguration,
-                       const int32_t inVariableIndex,
-                       const C_BDD::compareEnum inComparaison,
-                       const uint64_t inConstant
-                       COMMA_LOCATION_ARGS) ;
+                      const int32_t inVariableIndex,
+                      const C_BDD::compareEnum inComparaison,
+                      const uint64_t inConstant
+                      COMMA_LOCATION_ARGS) ;
 
 //--- Destructor
-  public: virtual ~ C_Relation (void) ;
+  public: ~ C_Relation (void) ;
 
 //--- Handling copy
   public: C_Relation (const C_Relation & inSource) ;

diff --git a/goil/build/libpm/bdd/C_RelationConfiguration.h b/goil/build/libpm/bdd/C_RelationConfiguration.h
@@ -14,12 +14,12 @@
 
 //----------------------------------------------------------------------------------------------------------------------
 
-class C_RelationConfiguration {
+class C_RelationConfiguration final {
 //--- Default constructor (no variable, empty)
   public: C_RelationConfiguration (void) ;
 
 //--- Destructor
-  public: virtual ~ C_RelationConfiguration (void) ;
+  public: ~ C_RelationConfiguration (void) ;
 
 //--- Handling copy
   public: C_RelationConfiguration (const C_RelationConfiguration & inSource) ;

diff --git a/goil/build/libpm/bdd/C_RelationSingleType.h b/goil/build/libpm/bdd/C_RelationSingleType.h
@@ -13,7 +13,7 @@
 
 //----------------------------------------------------------------------------------------------------------------------
 
-class C_RelationSingleType {
+class C_RelationSingleType final {
 //--- Internal class
   public: class cType ;
 
@@ -38,7 +38,7 @@ class C_RelationSingleType {
                                   COMMA_LOCATION_ARGS) const ;
 
 //--- Destructor
-  public: virtual ~ C_RelationSingleType (void) ;
+  public: ~ C_RelationSingleType (void) ;
 
 //--- Handling copy
   public: C_RelationSingleType (const C_RelationSingleType & inSource) ;