From 5803ce704eb9cf9c30235e82856ed738486256e1 Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Wed, 6 Nov 2024 10:50:12 +0100 Subject: Prefer built-in "nub_left" Now that justbuild 1.4 is available, the workaround of defining "nub_left" in terms of "reverse" and "nub_right" is no longer necessary. --- CC/foreign/RULES | 18 +++++++----------- CC/foreign/cmake/EXPRESSIONS | 19 +++++++------------ CC/foreign/make/EXPRESSIONS | 19 +++++++------------ CC/foreign/shell/EXPRESSIONS | 25 ++++++++++--------------- CC/pkgconfig/RULES | 35 ++++++++++++++--------------------- 5 files changed, 45 insertions(+), 71 deletions(-) diff --git a/CC/foreign/RULES b/CC/foreign/RULES index 935d477..e6463f8 100644 --- a/CC/foreign/RULES +++ b/CC/foreign/RULES @@ -31,7 +31,6 @@ , "base-provides-++": ["./", "..", "defaults-base-provides-++"] , "base-provides-list": ["./", "..", "defaults-base-provides-list"] , "artifacts_list": ["./", "../..", "field_artifacts_list"] - , "nub_left": ["", "nub_left"] , "for host": ["transitions", "for host"] } , "config_transitions": @@ -60,17 +59,14 @@ ] , ["provider", "PATH"] , [ "PATH" - , { "type": "++" + , { "type": "nub_left" , "$1": - [ {"type": "var", "name": "PATH"} - , {"type": "CALL_EXPRESSION", "name": "base-provides-++"} - ] - } - ] - , [ "PATH" - , { "type": "let*" - , "bindings": [["list", {"type": "var", "name": "PATH"}]] - , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"} + { "type": "++" + , "$1": + [ {"type": "var", "name": "PATH"} + , {"type": "CALL_EXPRESSION", "name": "base-provides-++"} + ] + } } ] , ["provider", "ENV"] diff --git a/CC/foreign/cmake/EXPRESSIONS b/CC/foreign/cmake/EXPRESSIONS index c8f6dc1..a36725b 100644 --- a/CC/foreign/cmake/EXPRESSIONS +++ b/CC/foreign/cmake/EXPRESSIONS @@ -28,7 +28,6 @@ ] , "imports": { "artifacts": ["", "field_artifacts"] - , "nub_left": ["", "nub_left"] , "flags-cc": ["CC", "flags-cc"] , "flags-cxx": ["CC", "flags-cxx"] , "compiler-cc": ["CC", "compiler-cc"] @@ -228,18 +227,14 @@ , { "type": "join" , "separator": ":" , "$1": - { "type": "let*" - , "bindings": - [ [ "list" - , { "type": "++" - , "$1": - [ {"type": "CALL_EXPRESSION", "name": "foreign-PATH"} - , {"type": "CALL_EXPRESSION", "name": "default-PATH"} - ] - } + { "type": "nub_left" + , "$1": + { "type": "++" + , "$1": + [ {"type": "CALL_EXPRESSION", "name": "foreign-PATH"} + , {"type": "CALL_EXPRESSION", "name": "default-PATH"} ] - ] - , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"} + } } } ] diff --git a/CC/foreign/make/EXPRESSIONS b/CC/foreign/make/EXPRESSIONS index 1707104..68aa728 100644 --- a/CC/foreign/make/EXPRESSIONS +++ b/CC/foreign/make/EXPRESSIONS @@ -30,7 +30,6 @@ ] , "imports": { "artifacts": ["", "field_artifacts"] - , "nub_left": ["", "nub_left"] , "flags-cc": ["CC", "flags-cc"] , "flags-cxx": ["CC", "flags-cxx"] , "compiler-cc": ["CC", "compiler-cc"] @@ -205,18 +204,14 @@ , { "type": "join" , "separator": ":" , "$1": - { "type": "let*" - , "bindings": - [ [ "list" - , { "type": "++" - , "$1": - [ {"type": "CALL_EXPRESSION", "name": "foreign-PATH"} - , {"type": "CALL_EXPRESSION", "name": "default-PATH"} - ] - } + { "type": "nub_left" + , "$1": + { "type": "++" + , "$1": + [ {"type": "CALL_EXPRESSION", "name": "foreign-PATH"} + , {"type": "CALL_EXPRESSION", "name": "default-PATH"} ] - ] - , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"} + } } } ] diff --git a/CC/foreign/shell/EXPRESSIONS b/CC/foreign/shell/EXPRESSIONS index a1dcd0c..a37d315 100644 --- a/CC/foreign/shell/EXPRESSIONS +++ b/CC/foreign/shell/EXPRESSIONS @@ -22,7 +22,6 @@ ] , "imports": { "artifacts": ["", "field_artifacts"] - , "nub_left": ["", "nub_left"] , "flags-cc": ["CC", "flags-cc"] , "flags-cxx": ["CC", "flags-cxx"] , "compiler-cc": ["CC", "compiler-cc"] @@ -194,22 +193,18 @@ , { "type": "join" , "separator": ":" , "$1": - { "type": "let*" - , "bindings": - [ [ "list" - , { "type": "++" - , "$1": - [ {"type": "CALL_EXPRESSION", "name": "foreign-PATH"} - , {"type": "CALL_EXPRESSION", "name": "default-PATH"} - , { "type": "let*" - , "bindings": [["fieldname", "shell defaults"]] - , "body": {"type": "CALL_EXPRESSION", "name": "sh-PATH"} - } - ] + { "type": "nub_left" + , "$1": + { "type": "++" + , "$1": + [ {"type": "CALL_EXPRESSION", "name": "foreign-PATH"} + , {"type": "CALL_EXPRESSION", "name": "default-PATH"} + , { "type": "let*" + , "bindings": [["fieldname", "shell defaults"]] + , "body": {"type": "CALL_EXPRESSION", "name": "sh-PATH"} } ] - ] - , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"} + } } } ] diff --git a/CC/pkgconfig/RULES b/CC/pkgconfig/RULES index 363136f..f72fdf6 100644 --- a/CC/pkgconfig/RULES +++ b/CC/pkgconfig/RULES @@ -14,7 +14,6 @@ , "imports": { "base-provides": ["./", "..", "defaults-base-provides"] , "base-provides-++": ["./", "..", "defaults-base-provides-++"] - , "nub_left": ["", "nub_left"] } , "expression": { "type": "let*" @@ -31,33 +30,27 @@ , ["PATH", {"type": "FIELD", "name": "PATH"}] , ["provider", "PATH"] , [ "PATH" - , { "type": "++" + , { "type": "nub_left" , "$1": - [ {"type": "var", "name": "PATH"} - , {"type": "CALL_EXPRESSION", "name": "base-provides-++"} - ] - } - ] - , [ "PATH" - , { "type": "let*" - , "bindings": [["list", {"type": "var", "name": "PATH"}]] - , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"} + { "type": "++" + , "$1": + [ {"type": "var", "name": "PATH"} + , {"type": "CALL_EXPRESSION", "name": "base-provides-++"} + ] + } } ] , ["PKG_CONFIG_PATH", {"type": "FIELD", "name": "PKG_CONFIG_PATH"}] , ["provider", "PKG_CONFIG_PATH"] , [ "PKG_CONFIG_PATH" - , { "type": "++" + , { "type": "nub_left" , "$1": - [ {"type": "var", "name": "PKG_CONFIG_PATH"} - , {"type": "CALL_EXPRESSION", "name": "base-provides-++"} - ] - } - ] - , [ "PKG_CONFIG_PATH" - , { "type": "let*" - , "bindings": [["list", {"type": "var", "name": "PKG_CONFIG_PATH"}]] - , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"} + { "type": "++" + , "$1": + [ {"type": "var", "name": "PKG_CONFIG_PATH"} + , {"type": "CALL_EXPRESSION", "name": "base-provides-++"} + ] + } } ] ] -- cgit v1.2.3