forward progress

Author: andrew-johnson-4

PLUGINS/BACKEND/C/compile-c.lm

@@ -14,7 +14,7 @@ plugins-backend-c-compile := λ . (: (
                (set global-ctx (.bind(
                   global-ctx k kt fragment
                )))
-               (set std-c-fragment-context (.bind( std-c-fragment-context g-t fragment )))
+               (set std-c-fragment-context (.bind( std-c-fragment-context (def-to-sym g-t) fragment )))
             ) (
                (let clean-tt (.without-tag kt))
                (let mid (mangle-identifier( k clean-tt )))
@@ -25,13 +25,13 @@ plugins-backend-c-compile := λ . (: (
                   (set global-ctx (.bind(
                      global-ctx k kt fragment
                   )))
-                  (set std-c-fragment-context (.bind( std-c-fragment-context g-t fragment )))
+                  (set std-c-fragment-context (.bind( std-c-fragment-context (def-to-sym g-t) fragment )))
                ) (
                   (let repr-tt (&&( clean-tt (t1 'GlobalVariable_s) )))
                   (set global-ctx (.bind(
                      global-ctx k repr-tt fragment
                   )))
-                  (set std-c-fragment-context (.bind( std-c-fragment-context g-t fragment )))
+                  (set std-c-fragment-context (.bind( std-c-fragment-context (def-to-sym g-t) fragment )))
                ))
             ))
          ))

SRC/infer-global-terms.lsts

@@ -13,7 +13,7 @@ let infer-global-terms(term: AST): AST = (
          (_, let new-rhs) = std-infer-expr((None :: TContext?), rhs, false, Used, TAny);
          if not(is(rhs,new-rhs)) then {
             let new-term = mk-glb(k, new-rhs);
-            var-to-def-index = var-to-def-index.bind(term,new-term);
+            mark-var-to-def(new-term, term);
             term = new-term;
          };
          let kt = normalize(typeof(rhs)) && t1(c"GlobalVariable");

SRC/std-infer-expr.lsts

@@ -98,7 +98,11 @@ let std-infer-expr(tctx: Maybe<TContext>, term: AST, is-scoped: Bool, used: IsUs
          let rough-tt = typeof(term);
          if rough-tt.is-arrow && not(rough-tt.is-open) {
             (_, let new-val) = std-infer-expr(tctx, val, is-scoped, Used, TAny);
-            if not(is(val,new-val)) then { term = mk-glb(key,new-val); };
+            if not(is(val,new-val)) then {
+               let new-term = mk-glb(key,new-val);
+               mark-var-to-def(new-term, term);
+               term = new-term;
+            };
          };
       );
       Var{key=key, token=token} => (

SRC/var-to-def-index.lsts

@@ -6,8 +6,12 @@ let var-to-def(k: AST): AST = (
    if not(non-zero(def)) {
       exit-error( untern("Unable to Find Symlink in Context: \{k}"), k );
    };
-   let sym = var-to-def-index.lookup(def, ASTEOF);
-   if non-zero(sym) then sym else def
+   def-to-sym(def)
+);
+
+let def-to-sym(k: AST): AST = (
+   let sym = var-to-def-index.lookup(k, ASTEOF);
+   if non-zero(sym) then sym else k
 );
 
 let mark-var-to-def(k: AST, v: AST): Nil = (