interestingly, the def is non null

Author: andrew-johnson-4

PLUGINS/BACKEND/C/std-c-compile-expr.lsts

@@ -2,7 +2,7 @@
 let std-c-compile-expr(ctx: FContext, t: AST, is-stmt: Bool): Fragment = (
    let f = match t {
       Var{ key=key } => (
-         let def = var-to-def-index.lookup(t, ASTEOF);
+         let def = var-to-def(t);
          let e = std-c-fragment-context.lookup(def, mk-fragment());
          if not(non-zero(e)) {
             exit-error( untern("Unable to Find Variable Fragment in Context: \{key}"), t );

SRC/decorate-var-to-def.lsts

@@ -8,6 +8,6 @@ let mark-var-to-def-todo(tctx: Maybe<TContext>, k: CString, tt: Type, t: AST): N
 let decorate-var-to-def(): Nil = (
    for vector Tuple{tctx=first, k=second, tt=third, t=fourth} in decorate-var-to-def-todo {
       let def = defof-var(t, tctx, k, tt);
-      if non-zero(def) then var-to-def-index = var-to-def-index.bind(t, def);
+      if non-zero(def) then mark-var-to-def(t, def);
    }
 );

SRC/infer-global-terms.lsts

@@ -11,7 +11,11 @@ let infer-global-terms(term: AST): AST = (
       Glb{val:Abs{}} => ();
       Glb{k=key, rhs=val} => (
          (_, let new-rhs) = std-infer-expr((None :: TContext?), rhs, false, Used, TAny);
-         if not(is(rhs,new-rhs)) then term = mk-glb(k, new-rhs);
+         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);
+            term = new-term;
+         };
          let kt = normalize(typeof(rhs)) && t1(c"GlobalVariable");
          global-type-context = global-type-context.bind(k.key, kt, term);
          mark-global-as-seen(k.key, kt, TAny);

SRC/var-to-def-index.lsts

@@ -1,2 +1,17 @@
 
 let var-to-def-index = mk-hashtable-is(type(AST), type(AST));
+
+let var-to-def(k: AST): AST = (
+   let def = var-to-def-index.lookup(k, ASTEOF);
+   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
+);
+
+let mark-var-to-def(k: AST, v: AST): Nil = (
+   let sym = var-to-def-index.lookup(v, ASTEOF);
+   if non-zero(sym) then v = sym;
+   var-to-def-index = var-to-def-index.bind(k, v);
+);