rules: Use new 'env' expression

4 files changed, 18 insertions, 85 deletions

diff --git a/rules/CC/EXPRESSIONS b/rules/CC/EXPRESSIONS
index 48f40a2b..5153b2d4 100644
--- a/rules/CC/EXPRESSIONS
+++ b/rules/CC/EXPRESSIONS
@@ -506,18 +506,7 @@
       , "provides":
         { "type": "map_union"
         , "$1":
-          [ { "type": "singleton_map"
-            , "key": "compile-deps"
-            , "value": {"type": "var", "name": "compile-deps"}
-            }
-          , { "type": "singleton_map"
-            , "key": "link-deps"
-            , "value": {"type": "var", "name": "link-deps"}
-            }
-          , { "type": "singleton_map"
-            , "key": "link-args"
-            , "value": {"type": "var", "name": "link-args"}
-            }
+          [ {"type": "env", "vars": ["compile-deps", "link-deps", "link-args"]}
           , { "type": "var"
             , "name": "extra-provides"
             , "default": {"type": "empty_map"}
diff --git a/rules/CC/RULES b/rules/CC/RULES
index 6fdab85a..ac81da28 100644
--- a/rules/CC/RULES
+++ b/rules/CC/RULES
@@ -103,33 +103,8 @@
     , "body":
       { "type": "RESULT"
       , "provides":
-        { "type": "map_union"
-        , "$1":
-          [ { "type": "singleton_map"
-            , "key": "CC"
-            , "value": {"type": "var", "name": "CC"}
-            }
-          , { "type": "singleton_map"
-            , "key": "CXX"
-            , "value": {"type": "var", "name": "CXX"}
-            }
-          , { "type": "singleton_map"
-            , "key": "CFLAGS"
-            , "value": {"type": "var", "name": "CFLAGS"}
-            }
-          , { "type": "singleton_map"
-            , "key": "CXXFLAGS"
-            , "value": {"type": "var", "name": "CXXFLAGS"}
-            }
-          , { "type": "singleton_map"
-            , "key": "AR"
-            , "value": {"type": "var", "name": "AR"}
-            }
-          , { "type": "singleton_map"
-            , "key": "ENV"
-            , "value": {"type": "var", "name": "ENV"}
-            }
-          ]
+        { "type": "env"
+        , "vars": ["CC", "CXX", "CFLAGS", "CXXFLAGS", "AR", "ENV"]
         }
       }
     }
diff --git a/rules/proto/RULES b/rules/proto/RULES
index 9c7c1a2d..95fb87ad 100644
--- a/rules/proto/RULES
+++ b/rules/proto/RULES
@@ -76,51 +76,24 @@
           , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
           }
         ]
-      , [ "node"
-        , { "type": "ABSTRACT_NODE"
-          , "node_type":
-            { "type": "if"
-            , "cond": {"type": "FIELD", "name": "service"}
-            , "then": "service library"
-            , "else": "library"
-            }
-          , "target_fields":
-            { "type": "map_union"
-            , "$1":
-              [ { "type": "singleton_map"
-                , "key": "srcs"
-                , "value": {"type": "var", "name": "srcs"}
-                }
-              , { "type": "singleton_map"
-                , "key": "deps"
-                , "value": {"type": "var", "name": "deps"}
-                }
-              ]
-            }
-          , "string_fields":
-            { "type": "map_union"
-            , "$1":
-              [ { "type": "singleton_map"
-                , "key": "name"
-                , "value": [{"type": "var", "name": "name"}]
-                }
-              , { "type": "singleton_map"
-                , "key": "stage"
-                , "value": [{"type": "var", "name": "stage"}]
-                }
-              ]
+      , ["name", [{"type": "var", "name": "name"}]]
+      , ["stage", [{"type": "var", "name": "stage"}]]
+      , [ "proto"
+        , [ { "type": "ABSTRACT_NODE"
+            , "node_type":
+              { "type": "if"
+              , "cond": {"type": "FIELD", "name": "service"}
+              , "then": "service library"
+              , "else": "library"
+              }
+            , "target_fields": {"type": "env", "vars": ["srcs", "deps"]}
+            , "string_fields": {"type": "env", "vars": ["name", "stage"]}
             }
-          }
+          ]
         ]
       ]
     , "body":
-      { "type": "RESULT"
-      , "provides":
-        { "type": "singleton_map"
-        , "key": "proto"
-        , "value": [{"type": "var", "name": "node"}]
-        }
-      }
+      {"type": "RESULT", "provides": {"type": "env", "vars": ["proto"]}}
     }
   }
 }
diff --git a/rules/shell/test/EXPRESSIONS b/rules/shell/test/EXPRESSIONS
index 6d163f3e..24bf9ec1 100644
--- a/rules/shell/test/EXPRESSIONS
+++ b/rules/shell/test/EXPRESSIONS
@@ -25,11 +25,7 @@
                     , "dep": {"type": "var", "name": "runner"}
                     }
                   }
-                , "body":
-                  { "type": "singleton_map"
-                  , "key": "runner"
-                  , "value": {"type": "var", "name": "runner"}
-                  }
+                , "body": {"type": "env", "vars": ["runner"]}
                 }
               }
             }