summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CC/EXPRESSIONS43
-rw-r--r--CC/RULES1
-rw-r--r--CC/auto/RULES13
-rw-r--r--CC/foreign/cmake/EXPRESSIONS20
-rw-r--r--CC/foreign/make/EXPRESSIONS190
-rw-r--r--CC/pkgconfig/EXPRESSIONS13
-rw-r--r--CC/prebuilt/EXPRESSIONS13
7 files changed, 113 insertions, 180 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"}]
diff --git a/CC/RULES b/CC/RULES
index b8e04d1..cf4fe19 100644
--- a/CC/RULES
+++ b/CC/RULES
@@ -113,6 +113,7 @@
}
]
, ["provider", "ENV"]
+ , ["default", {"type": "empty_map"}]
, [ "ENV"
, { "type": "if"
, "cond": {"type": "var", "name": "PATH"}
diff --git a/CC/auto/RULES b/CC/auto/RULES
index e04289c..fb75a64 100644
--- a/CC/auto/RULES
+++ b/CC/auto/RULES
@@ -204,16 +204,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"}}
+ ]
}
]
, [ "c.flags"
diff --git a/CC/foreign/cmake/EXPRESSIONS b/CC/foreign/cmake/EXPRESSIONS
index 8977d5a..e1f019b 100644
--- a/CC/foreign/cmake/EXPRESSIONS
+++ b/CC/foreign/cmake/EXPRESSIONS
@@ -84,20 +84,12 @@
, [ "ENV"
, { "type": "map_union"
, "$1":
- { "type": "++"
- , "$1":
- [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
- , [ { "type": "var"
- , "name": "ENV"
- , "default": {"type": "empty_map"}
- }
- ]
- , [ { "type": "env"
- , "vars": ["CC", "CXX", "CXXFLAGS", "CFLAGS", "LDFLAGS"]
- }
- ]
- ]
- }
+ [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
+ , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
+ , { "type": "env"
+ , "vars": ["CC", "CXX", "CXXFLAGS", "CFLAGS", "LDFLAGS"]
+ }
+ ]
}
]
, [ "AR"
diff --git a/CC/foreign/make/EXPRESSIONS b/CC/foreign/make/EXPRESSIONS
index e853b29..85179a9 100644
--- a/CC/foreign/make/EXPRESSIONS
+++ b/CC/foreign/make/EXPRESSIONS
@@ -80,115 +80,97 @@
, [ "ENV"
, { "type": "map_union"
, "$1":
- { "type": "++"
- , "$1":
- [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
- , [ { "type": "var"
- , "name": "ENV"
- , "default": {"type": "empty_map"}
- }
- ]
- , [ { "type": "singleton_map"
- , "key":
- { "type": "if"
- , "cond": {"type": "var", "name": "var_cc"}
- , "then":
- {"type": "join", "$1": {"type": "var", "name": "var_cc"}}
- , "else": "CC"
- }
- , "value": {"type": "var", "name": "CC"}
- }
- ]
- , [ { "type": "singleton_map"
- , "key":
- { "type": "if"
- , "cond": {"type": "var", "name": "var_cxx"}
- , "then":
- { "type": "join"
- , "$1": {"type": "var", "name": "var_cxx"}
- }
- , "else": "CXX"
- }
- , "value": {"type": "var", "name": "CXX"}
- }
- ]
- , [ { "type": "singleton_map"
- , "key":
- { "type": "if"
- , "cond": {"type": "var", "name": "var_ccflags"}
- , "then":
- { "type": "join"
- , "$1": {"type": "var", "name": "var_ccflags"}
- }
- , "else": "CFLAGS"
- }
- , "value": {"type": "var", "name": "CFLAGS"}
- }
- ]
- , [ { "type": "singleton_map"
- , "key":
- { "type": "if"
- , "cond": {"type": "var", "name": "var_cxxflags"}
- , "then":
- { "type": "join"
- , "$1": {"type": "var", "name": "var_cxxflags"}
- }
- , "else": "CXXFLAGS"
- }
- , "value": {"type": "var", "name": "CXXFLAGS"}
+ [ {"type": "CALL_EXPRESSION", "name": "default-ENV"}
+ , {"type": "var", "name": "ENV", "default": {"type": "empty_map"}}
+ , { "type": "singleton_map"
+ , "key":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "var_cc"}
+ , "then":
+ {"type": "join", "$1": {"type": "var", "name": "var_cc"}}
+ , "else": "CC"
+ }
+ , "value": {"type": "var", "name": "CC"}
+ }
+ , { "type": "singleton_map"
+ , "key":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "var_cxx"}
+ , "then":
+ {"type": "join", "$1": {"type": "var", "name": "var_cxx"}}
+ , "else": "CXX"
+ }
+ , "value": {"type": "var", "name": "CXX"}
+ }
+ , { "type": "singleton_map"
+ , "key":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "var_ccflags"}
+ , "then":
+ { "type": "join"
+ , "$1": {"type": "var", "name": "var_ccflags"}
}
- ]
- , [ { "type": "singleton_map"
- , "key":
- { "type": "if"
- , "cond": {"type": "var", "name": "var_ldflags"}
- , "then":
- { "type": "join"
- , "$1": {"type": "var", "name": "var_ldflags"}
- }
- , "else": "LDFLAGS"
- }
- , "value": {"type": "var", "name": "LDFLAGS"}
+ , "else": "CFLAGS"
+ }
+ , "value": {"type": "var", "name": "CFLAGS"}
+ }
+ , { "type": "singleton_map"
+ , "key":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "var_cxxflags"}
+ , "then":
+ { "type": "join"
+ , "$1": {"type": "var", "name": "var_cxxflags"}
}
- ]
- , [ { "type": "singleton_map"
- , "key":
- { "type": "if"
- , "cond": {"type": "var", "name": "var_ar"}
- , "then":
- {"type": "join", "$1": {"type": "var", "name": "var_ar"}}
- , "else": "AR"
- }
- , "value": {"type": "var", "name": "AR"}
+ , "else": "CXXFLAGS"
+ }
+ , "value": {"type": "var", "name": "CXXFLAGS"}
+ }
+ , { "type": "singleton_map"
+ , "key":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "var_ldflags"}
+ , "then":
+ { "type": "join"
+ , "$1": {"type": "var", "name": "var_ldflags"}
}
- ]
- , [ { "type": "singleton_map"
- , "key":
- { "type": "if"
- , "cond": {"type": "var", "name": "var_prefix"}
- , "then":
- { "type": "join"
- , "$1": {"type": "var", "name": "var_prefix"}
- }
- , "else": "PREFIX"
- }
- , "value":
- { "type": "if"
- , "cond": {"type": "var", "name": "make_prefix"}
- , "then":
- { "type": "join"
- , "separator": "/"
- , "$1":
- { "type": "++"
- , "$1": [[""], {"type": "var", "name": "make_prefix"}]
- }
- }
- , "else": {"type": "var", "name": "PREFIX", "default": "/"}
+ , "else": "LDFLAGS"
+ }
+ , "value": {"type": "var", "name": "LDFLAGS"}
+ }
+ , { "type": "singleton_map"
+ , "key":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "var_ar"}
+ , "then":
+ {"type": "join", "$1": {"type": "var", "name": "var_ar"}}
+ , "else": "AR"
+ }
+ , "value": {"type": "var", "name": "AR"}
+ }
+ , { "type": "singleton_map"
+ , "key":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "var_prefix"}
+ , "then":
+ {"type": "join", "$1": {"type": "var", "name": "var_prefix"}}
+ , "else": "PREFIX"
+ }
+ , "value":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "make_prefix"}
+ , "then":
+ { "type": "join"
+ , "separator": "/"
+ , "$1":
+ { "type": "++"
+ , "$1": [[""], {"type": "var", "name": "make_prefix"}]
}
}
- ]
- ]
- }
+ , "else": {"type": "var", "name": "PREFIX", "default": "/"}
+ }
+ }
+ ]
}
]
, [ "script"
diff --git a/CC/pkgconfig/EXPRESSIONS b/CC/pkgconfig/EXPRESSIONS
index c770421..4c174c4 100644
--- a/CC/pkgconfig/EXPRESSIONS
+++ b/CC/pkgconfig/EXPRESSIONS
@@ -7,16 +7,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"}}
+ ]
}
]
, [ "cflags-filename"
diff --git a/CC/prebuilt/EXPRESSIONS b/CC/prebuilt/EXPRESSIONS
index 6b7169a..c404bec 100644
--- a/CC/prebuilt/EXPRESSIONS
+++ b/CC/prebuilt/EXPRESSIONS
@@ -234,16 +234,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"}}
+ ]
}
]
, [ "main-pkg-config"
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-06 09:47:00 +0000