Merge branch 'just-rules' into rules

2 files changed, 20 insertions, 0 deletions

diff --git a/CC/auto/RULES b/CC/auto/RULES
index d1a147b..65aca1c 100644
--- a/CC/auto/RULES
+++ b/CC/auto/RULES
@@ -163,6 +163,7 @@
     , "default-NON_SYSTEM_TOOLS": ["./", "..", "default-NON_SYSTEM_TOOLS"]
     , "map_provider": ["./", "../..", "field_map_provider"]
     , "sh": ["./", "../../shell", "sh"]
+    , "sh-PATH": ["./", "../../shell", "PATH"]
     }
   , "implicit":
     { "defaults": [["./", "..", "defaults"]]
@@ -278,6 +279,10 @@
                       , "cond": {"type": "var", "name": "ENV_PATH"}
                       , "then": [{"type": "var", "name": "ENV_PATH"}]
                       }
+                    , { "type": "let*"
+                      , "bindings": [["fieldname", "shell defaults"]]
+                      , "body": {"type": "CALL_EXPRESSION", "name": "sh-PATH"}
+                      }
                     ]
                   }
                 }
diff --git a/shell/EXPRESSIONS b/shell/EXPRESSIONS
index 6ab6c7c..722e897 100644
--- a/shell/EXPRESSIONS
+++ b/shell/EXPRESSIONS
@@ -84,4 +84,19 @@
     , "body": {"type": "var", "name": "sh"}
     }
   }
+, "PATH":
+  { "vars": ["fieldname", "defaults-transition"]
+  , "imports": {"list_provider": ["./", "..", "field_list_provider"]}
+  , "expression":
+    { "type": "let*"
+    , "bindings":
+      [ [ "fieldname"
+        , {"type": "var", "name": "fieldname", "default": "defaults"}
+        ]
+      , ["provider", "PATH"]
+      , ["transition", {"type": "var", "name": "defaults-transition"}]
+      ]
+    , "body": {"type": "CALL_EXPRESSION", "name": "list_provider"}
+    }
+  }
 }