summaryrefslogtreecommitdiff
path: root/CC/EXPRESSIONS
diff options
context:
space:
mode:
authorOliver Reiche <oliver.reiche@huawei.com>2023-02-14 15:40:56 +0100
committerOliver Reiche <oliver.reiche@huawei.com>2023-05-30 15:33:18 +0200
commit52f36d3c99c0327ccba50dede36645432af798df (patch)
tree7bfbfca02704e459ef4cf28954ec5d79fdc28d0a /CC/EXPRESSIONS
parentb09fa46239f251d5499dea26b313e4f9ef9b1aac (diff)
downloadrules-cc-52f36d3c99c0327ccba50dede36645432af798df.tar.gz
rules-cc: Use field_map_provider for default-ENV
Diffstat (limited to 'CC/EXPRESSIONS')
-rw-r--r--CC/EXPRESSIONS43
1 files changed, 11 insertions, 32 deletions
diff --git a/CC/EXPRESSIONS b/CC/EXPRESSIONS
index 8d4e12d..994dbf4 100644
--- a/CC/EXPRESSIONS
+++ b/CC/EXPRESSIONS
@@ -99,7 +99,7 @@
}
, "default-ENV":
{ "vars": ["defaults-transition"]
- , "imports": {"provider_list": ["./", "..", "field_provider_list"]}
+ , "imports": {"map_provider": ["./", "..", "field_map_provider"]}
, "expression":
{ "type": "let*"
, "bindings":
@@ -110,7 +110,7 @@
]
, ["default", {"type": "empty_map"}]
]
- , "body": {"type": "CALL_EXPRESSION", "name": "provider_list"}
+ , "body": {"type": "CALL_EXPRESSION", "name": "map_provider"}
}
}
, "defaults-base-provides":
@@ -847,16 +847,9 @@
, [ "ENV"
, { "type": "map_union"
, "$1":
- { "type": "++"
- , "$1":
- [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
- , [ { "type": "var"
- , "name": "ENV"
- , "default": {"type": "empty_map"}
- }
- ]
- ]
- }
+ [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
+ , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
+ ]
}
]
, ["objects", {"type": "CALL_EXPRESSION", "name": "objects"}]
@@ -1111,16 +1104,9 @@
, [ "ENV"
, { "type": "map_union"
, "$1":
- { "type": "++"
- , "$1":
- [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
- , [ { "type": "var"
- , "name": "ENV"
- , "default": {"type": "empty_map"}
- }
- ]
- ]
- }
+ [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
+ , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
+ ]
}
]
, ["objects", {"type": "CALL_EXPRESSION", "name": "objects"}]
@@ -1434,16 +1420,9 @@
, [ "ENV"
, { "type": "map_union"
, "$1":
- { "type": "++"
- , "$1":
- [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
- , [ { "type": "var"
- , "name": "ENV"
- , "default": {"type": "empty_map"}
- }
- ]
- ]
- }
+ [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
+ , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
+ ]
}
]
, ["hdrs", {"type": "empty_map"}]