From f8edf81e172a4dd459d2cb687d00424ed888a341 Mon Sep 17 00:00:00 2001
From: Sascha Roloff <sascha.roloff@huawei.com>
Date: Wed, 11 Sep 2024 15:28:49 +0200
Subject: Rules CC: Deduplicate args returned by expressions collecting args
 from dependencies

---
 CC/EXPRESSIONS | 50 ++++++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

(limited to 'CC')

diff --git a/CC/EXPRESSIONS b/CC/EXPRESSIONS
index 2413f98..32022ce 100644
--- a/CC/EXPRESSIONS
+++ b/CC/EXPRESSIONS
@@ -320,18 +320,21 @@
     }
   , "imports": {"list_provider": ["./", "..", "field_list_provider"]}
   , "expression":
-    { "type": "++"
+    { "type": "nub_right"
     , "$1":
-      { "type": "foreach"
-      , "var": "fieldname"
-      , "range": {"type": "var", "name": "deps-fieldnames"}
-      , "body":
-        { "type": "let*"
-        , "bindings":
-          [ ["provider", "compile-args"]
-          , ["transition", {"type": "var", "name": "deps-transition"}]
-          ]
-        , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
+      { "type": "++"
+      , "$1":
+        { "type": "foreach"
+        , "var": "fieldname"
+        , "range": {"type": "var", "name": "deps-fieldnames"}
+        , "body":
+          { "type": "let*"
+          , "bindings":
+            [ ["provider", "compile-args"]
+            , ["transition", {"type": "var", "name": "deps-transition"}]
+            ]
+          , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
+          }
         }
       }
     }
@@ -387,18 +390,21 @@
     }
   , "imports": {"list_provider": ["./", "..", "field_list_provider"]}
   , "expression":
-    { "type": "++"
+    { "type": "nub_right"
     , "$1":
-      { "type": "foreach"
-      , "var": "fieldname"
-      , "range": {"type": "var", "name": "deps-fieldnames"}
-      , "body":
-        { "type": "let*"
-        , "bindings":
-          [ ["provider", "link-args"]
-          , ["transition", {"type": "var", "name": "deps-transition"}]
-          ]
-        , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
+      { "type": "++"
+      , "$1":
+        { "type": "foreach"
+        , "var": "fieldname"
+        , "range": {"type": "var", "name": "deps-fieldnames"}
+        , "body":
+          { "type": "let*"
+          , "bindings":
+            [ ["provider", "link-args"]
+            , ["transition", {"type": "var", "name": "deps-transition"}]
+            ]
+          , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
+          }
         }
       }
     }
-- 
cgit v1.2.3