Compilation is now deterministic.

grame-cncm · Dec 19, 2024 · 5ad5720 · 5ad5720
1 parent 87c523c
commit 5ad5720
Show file tree

Hide file tree

Showing 236 changed files with 48,522 additions and 41,301 deletions.
diff --git a/architecture/faust/dsp/faust-dynamic-engine.h b/architecture/faust/dsp/faust-dynamic-engine.h
@@ -56,14 +56,14 @@ extern "C" {
 
 #ifndef CTree_DEFINED
 #ifdef _MSC_VER
-    typedef void CTreeBase;
+    typedef void CTree;
 #else
-    typedef struct {} CTreeBase;
+    typedef struct {} CTree;
 #endif
 #endif
 
-    typedef CTreeBase* Box;
-    typedef CTreeBase* Signal;
+    typedef CTree* Box;
+    typedef CTree* Signal;
 
     /**
      * @brief Opaque structure representing a DSP object.

diff --git a/architecture/faust/dsp/libfaust-box-c.h b/architecture/faust/dsp/libfaust-box-c.h
@@ -40,14 +40,14 @@
 
 #ifdef _MSC_VER
 #define CTree_DEFINED
-typedef void CTreeBase;
+typedef void CTree;
 #else
 #define CTree_DEFINED
-typedef struct {} CTreeBase;
+typedef struct {} CTree;
 #endif
 
-typedef CTreeBase* Signal;
-typedef CTreeBase* Box;
+typedef CTree* Signal;
+typedef CTree* Box;
 
 enum SType { kSInt, kSReal };
 

diff --git a/architecture/faust/dsp/libfaust-box.h b/architecture/faust/dsp/libfaust-box.h
@@ -39,12 +39,12 @@
 /**
  * Opaque types.
  */
-class LIBFAUST_API CTreeBase;
-typedef std::vector<CTreeBase*> tvec;
+class LIBFAUST_API CTree;
+typedef std::vector<CTree*> tvec;
 
-typedef CTreeBase* Signal;
-typedef CTreeBase* Box;
-typedef CTreeBase* Tree;
+typedef CTree* Signal;
+typedef CTree* Box;
+typedef CTree* Tree;
 
 typedef Tree (*prim0)();
 typedef Tree (*prim1)(Tree x);

diff --git a/architecture/faust/dsp/libfaust-signal-c.h b/architecture/faust/dsp/libfaust-signal-c.h
@@ -39,13 +39,13 @@
  */
 
 #ifdef _MSC_VER
-typedef void CTreeBase;
+typedef void CTree;
 #else
-typedef struct {} CTreeBase;
+typedef struct {} CTree;
 #endif
 
-typedef CTreeBase* Signal;
-typedef CTreeBase* Box;
+typedef CTree* Signal;
+typedef CTree* Box;
 
 enum SType { kSInt, kSReal };
 

diff --git a/architecture/faust/dsp/libfaust-signal.h b/architecture/faust/dsp/libfaust-signal.h
@@ -40,12 +40,12 @@
 /**
  * Opaque types.
  */
-class LIBFAUST_API CTreeBase;
-typedef std::vector<CTreeBase*> tvec;
+class LIBFAUST_API CTree;
+typedef std::vector<CTree*> tvec;
 
-typedef CTreeBase* Signal;
-typedef CTreeBase* Box;
-typedef CTreeBase* Tree;
+typedef CTree* Signal;
+typedef CTree* Box;
+typedef CTree* Tree;
 
 typedef Tree (*prim0)();
 typedef Tree (*prim1)(Tree x);

diff --git a/build/lint.query b/build/lint.query
@@ -1,8 +1,8 @@
-# Check for a pointer comparison between CTreeBase* / Symbol*
+# Check for a pointer comparison between CTree* / Symbol*
 
 let hasTargetComparisonNoBind binaryOperator(
   hasAnyOperatorName("<", ">", "<=", ">="),
-  hasEitherOperand(hasType(hasUnqualifiedDesugaredType(pointerType(pointee(hasDeclaration(namedDecl(hasAnyName("CTreeBase", "Symbol"))))).bind("pointer-type"))))
+  hasEitherOperand(hasType(hasUnqualifiedDesugaredType(pointerType(pointee(hasDeclaration(namedDecl(hasAnyName("CTree", "Symbol"))))).bind("pointer-type"))))
 )
 
 # Or a function call to a function in the STL which has one of those pointer comparisons

diff --git a/compiler/DirectedGraph/DirectedGraph.hh b/compiler/DirectedGraph/DirectedGraph.hh
@@ -25,10 +25,10 @@
 // to represent the time dependency between computations.
 //===========================================================
 
-template <typename N>
+template <typename N, typename Comparator = std::less<N>>
 class digraph {
     using TWeights      = std::set<int>;
-    using TDestinations = std::map<N, TWeights>;
+    using TDestinations = std::map<N, TWeights, Comparator>;
 
     static inline const TWeights gEmptyWeights;
 
@@ -38,8 +38,8 @@ class digraph {
     // have integer values attached.
     class internalgraph {
        private:
-        std::set<N>                fNodes;        // {n1,n2,...}
-        std::map<N, TDestinations> fConnections;  // {(ni -{d1,d2,...}-> nj),...}
+        std::set<N, Comparator>                fNodes;        // {n1,n2,...}
+        std::map<N, TDestinations, Comparator> fConnections;  // {(ni -{d1,d2,...}-> nj),...}
 
        public:
 #if 0
@@ -70,10 +70,13 @@ class digraph {
         //----------------------------------------------------------------------
 
         // returns the set of nodes of the graph
-        [[nodiscard]] const std::set<N>& nodes() const { return fNodes; }
+        [[nodiscard]] const std::set<N, Comparator>& nodes() const { return fNodes; }
 
         // returns the set of nodes of the graph
-        [[nodiscard]] const std::map<N, TDestinations>& connections() const { return fConnections; }
+        [[nodiscard]] const std::map<N, TDestinations, Comparator>& connections() const
+        {
+            return fConnections;
+        }
 
         // Returns the destinations of node n in the graph
         [[nodiscard]] const TDestinations& destinations(const N& n) const
@@ -205,10 +208,10 @@ class digraph {
     //--------------------------------------------------------------------------
 
     // returns the set of nodes of the graph
-    [[nodiscard]] const std::set<N>& nodes() const { return fContent->nodes(); }
+    [[nodiscard]] const std::set<N, Comparator>& nodes() const { return fContent->nodes(); }
 
     // returns the set of nodes of the graph
-    [[nodiscard]] const std::map<N, TDestinations>& connections() const
+    [[nodiscard]] const std::map<N, TDestinations, Comparator>& connections() const
     {
         return fContent->connections();
     }