Refactor flow analysis to track deps on syn and eq subtree vertices

Jenkinsfile

@@ -144,7 +144,8 @@ melt.trynode('silver') {
     // Projects with 'develop' as main branch, we'll try to build specific branch names if they exist
     def github_projects = ["/melt-umn/ableC", "/melt-umn/Oberon0", "/melt-umn/meta-ocaml-lite",
                            "/melt-umn/lambda-calculus", "/melt-umn/rewriting-regex-matching", "/melt-umn/rewriting-optimization-demo",
-                           "/melt-umn/caml-light", "/melt-umn/tree-sharing-demo"]
+                           "/melt-umn/caml-light", "/melt-umn/tree-sharing-demo",
+                           "/melt-umn/foil"]
     // These are not currently maintened: "/internal/ring"
     // Specific other jobs to build
     def specific_jobs = ["/internal/matlab/master"]

check-compile

@@ -9,7 +9,7 @@ set -euo pipefail
 BUILDGRAMMAR=${BUILDGRAMMAR:-"silver:compiler:composed:Default"}
 
 export SILVER_HOME=$PWD
-JVM_ARGS=(-Xss30M -Xmx6G -jar ../jars/silver.compiler.composed.Default.jar --no-stdlib --dont-translate "$@")
+JVM_ARGS=(-Xss30M -Xmx7G -jar ../jars/silver.compiler.composed.Default.jar --no-stdlib --dont-translate "$@")
 export GRAMMAR_PATH="../grammars"
 
 mkdir -p build

grammars/silver/compiler/analysis/typechecking/core/Expr.sv

@@ -5,7 +5,7 @@ import silver:compiler:definition:flow:env;
 attribute upSubst, downSubst, upSubst2, downSubst2, finalSubst occurs on
   Expr, ExprInhs, ExprInh, Exprs, AppExprs, AppExpr, AnnoExpr, AnnoAppExprs;
 
-flowtype Expr = upSubst {forward}, finalType {forward};
+flowtype Expr = upSubst {forward}, upSubst2 {forward, downSubst2}, finalType {forward};
 
 propagate upSubst, downSubst
    on Expr, ExprInhs, ExprInh, Exprs, AppExprs, AppExpr, AnnoExpr, AnnoAppExprs

grammars/silver/compiler/analysis/uniqueness/Expr.sv

@@ -2,7 +2,7 @@ grammar silver:compiler:analysis:uniqueness;
 
 attribute sharedRefs occurs on Expr, Exprs, AppExprs, AppExpr, PrimPatterns, PrimPattern;
 propagate sharedRefs on Expr, Exprs, AppExprs, AppExpr, PrimPatterns, PrimPattern
-  excluding ifThenElse, matchPrimitiveReal, consPattern;
+  excluding ifThenElse, matchPrimitiveReal, consPattern, letp;
 
 aspect production decorationSiteExpr
 top::Expr ::=  '@' e::Expr
@@ -25,9 +25,10 @@ top::Expr ::=  '@' e::Expr
   top.errors <-
     case e.flowVertexInfo of
     -- These are errors because we assume these checks in the translation:
-    | just(lhsVertexType_real()) -> [errFromOrigin(e, s"Cannot share the production LHS.")]
-    | just(forwardVertexType_real()) -> [errFromOrigin(e, s"Cannot share the forward tree.")]
-    | just(anonVertexType(_)) -> [errFromOrigin(e, s"Cannot share an anonymously decorated tree.")]  -- TODO: I think this works now?
+    | just(lhsVertexType()) -> [errFromOrigin(e, s"Cannot share the production LHS.")]
+    | just(forwardVertexType()) -> [errFromOrigin(e, s"Cannot share the forward tree.")]
+    | just(anonVertexType(_, _, _)) -> [errFromOrigin(e, s"Cannot share an anonymously decorated tree.")]  -- TODO: I think this works now?
+    | just(subtermVertexType(_, _, _)) -> [errFromOrigin(e, s"Cannot share a pattern variable.")]  -- Only way this can happen
     | just(v) ->
         -- Check that this tree is shared in at most one non-mutually-exclusive place.
         case lookupSharedRefs(top.frame.fullName, v, top.flowEnv) of
@@ -68,9 +69,10 @@ top::AppExpr ::= e::Expr
     if sigIsShared && isForwardParam then
       case e.flowVertexInfo of
       -- These are errors because we assume these checks in the translation:
-      | just(lhsVertexType_real()) -> [errFromOrigin(e, s"Cannot share the production LHS.")]
-      | just(forwardVertexType_real()) -> [errFromOrigin(e, s"Cannot share the forward tree.")]
-      | just(anonVertexType(_)) -> [errFromOrigin(e, s"Cannot share an anonymously decorated tree.")]  -- TODO: I think this works now?
+      | just(lhsVertexType()) -> [errFromOrigin(e, s"Cannot share the production LHS.")]
+      | just(forwardVertexType()) -> [errFromOrigin(e, s"Cannot share the forward tree.")]
+      | just(anonVertexType(_, _, _)) -> [errFromOrigin(e, s"Cannot share an anonymously decorated tree.")]  -- TODO: I think this works now?
+      | just(subtermVertexType(_, _, _)) -> [errFromOrigin(e, s"Cannot share a pattern variable.")]  -- Only way this can happen
       | just(v) ->
           -- Check that this tree is shared in at most one non-mutually-exclusive place.
           case lookupSharedRefs(top.frame.fullName, v, top.flowEnv) of
@@ -114,3 +116,15 @@ top::PrimPatterns ::= p::PrimPattern _ ps::PrimPatterns
 {
   top.sharedRefs := unionMutuallyExclusiveRefs(p.sharedRefs, ps.sharedRefs);
 }
+
+aspect production letp
+top::Expr ::= la::AssignExpr  e::Expr
+{
+  top.sharedRefs := e.sharedRefs;
+}
+
+aspect production lexicalLocalReference
+top::Expr ::= @q::QName _ _ sr::[(String, SharedRefSite)]
+{
+  top.sharedRefs <- sr;
+}

grammars/silver/compiler/analysis/warnings/flow/FlowTypeCopyEquation.sv

@@ -13,6 +13,9 @@ grammar silver:compiler:analysis:warnings:flow;
 -- The flow environment can give us the authoritative list of those attributes to check.
 -- These may be from `options` and so requires the flowEnv.
 
+-- TODO: Lots of duplicate warnings here when a projected production exceeds a flow type.
+-- Somehow suppress them?  Or filter out edges from tile stitch points that exceed a flow type?
+
 aspect production productionDcl
 top::AGDcl ::= 'abstract' 'production' id::Name d::ProductionImplements ns::ProductionSignature body::ProductionBody
 {
@@ -40,7 +43,7 @@ function raiseImplicitFwdEqFlowTypes
 [Message] ::= config::Decorated CmdArgs  lhsNt::String  prod::String  attr::String  e::FlowEnv  myGraph::ProductionGraph  myFlow::EnvTree<FlowType> 
 {
   -- The actual dependencies for `forward.attr`
-  local fwdFlowDeps :: set:Set<String> = onlyLhsInh(expandGraph([forwardEqVertex(), forwardSynVertex(attr)], myGraph));
+  local fwdFlowDeps :: set:Set<String> = onlyLhsInh(expandGraph(forwardVertexType().synDeps(attr), myGraph));
   -- The flow type for `attr` on `lhsNt`
   local depsForThisAttr :: set:Set<String> = inhDepsForSyn(attr, lhsNt, myFlow);
   -- Actual forwards equation deps not in the flow type for `attr`