pointer to wrong def

Author: andrew-johnson-4

PLATFORM/C/LIB/common-macros.lsts

@@ -1,7 +1,7 @@
 
-#typed macro macro::let(lhs: lazy, rhs: lazy): lazy = (
-#   (fn(lhs) = ()) (rhs)
-#);
+typed macro macro::let(lhs: lazy, rhs: lazy): lazy = (
+   (fn(lhs) = ()) (rhs)
+);
 
 typed macro macro::for(item: lazy, iter: List<?>, loop: lazy): lazy = (
    let uuid(iter-term) = iter;

PLUGINS/FRONTEND/LSTS/lsts-parse.lsts

@@ -1061,16 +1061,16 @@ let lsts-parse-small-expression(tokens: List<Token>): Tuple<AST,List<Token>> = (
          lsts-parse-expect(c"=", tokens); tokens = tail(tokens);
          let rhs-rest = lsts-parse-small-expression(tokens);
          tokens = rhs-rest.second;
-         #base = mk-app(
-         #   mk-var(with-location(mk-token("macro::let"),loc)),
-         #   mk-cons(lhs-rest.first, rhs-rest.first)
-         #);
          base = mk-app(
-            mk-app(
-               mk-var(with-location(mk-token("let"),loc)),
-               lhs-rest.first
-            ), rhs-rest.first
+            mk-var(with-location(mk-token("macro::let"),loc)),
+            mk-cons(lhs-rest.first, rhs-rest.first)
          );
+         #base = mk-app(
+         #   mk-app(
+         #      mk-var(with-location(mk-token("let"),loc)),
+         #      lhs-rest.first
+         #   ), rhs-rest.first
+         #);
       );
       [Token{key:c"while"}.. rest] => (
          let loc = head(tokens).location; tokens = rest;

SRC/std-apply-macro-candidates.lsts

@@ -11,11 +11,10 @@ let std-apply-macro-candidates(tctx: TContext?, mname: CString, margs: AST, cand
       if not(non-zero(t)) {
          (let new-tctx, let mctx) = std-try-destructure-macro(tctx, margs, ctype, mlhs);
          if mctx.is-some then mctx = union(mctx, Some{extract-uuids(mrhs)});
-         if mctx.is-some then t = with-location(substitute(mctx.get-or-panic, mrhs.unique), margs.location);
+         if mctx.is-some then t = with-location(substitute(mctx.get-or-panic, mrhs), margs.location);
       }
    };
    if not(non-zero(t)) then fail("Macro Application failed match during destructuring: \{mname}\n");
-   print("Applied Macro: \{mname}\nTerm: \{t}\n");
    (tctx, t) = std-infer-expr(tctx, t, false, Used, TAny);
    (tctx, t)
 );

SRC/std-infer-expr.lsts

@@ -70,14 +70,14 @@ let std-infer-expr(tctx: Maybe<TContext>, term: AST, is-scoped: Bool, used: IsUs
             (_, let new-t) = std-infer-expr(tctx-inner, t, false, Tail, TAny);
             (_, let new-f) = std-infer-expr(tctx, f, false, Tail, TAny);
             if not(is(cond,new-cond)) || not(is(t,new-t)) || not(is(f,new-f))
-            then { term = mk-app(mk-app(mk-app(ifv,new-cond),new-t),new-f) };
+            then { cond = new-cond; t = new-t; f = new-f; term = mk-app(mk-app(mk-app(ifv,new-cond),new-t),new-f) };
          } else {
             (tctx, let new-cond) = std-infer-expr(tctx, cond, false, Used, TAny);
             (let tctx-t, let new-t) = std-infer-expr(tctx, t, false, Tail, TAny);
             (_, let new-f) = std-infer-expr(tctx, f, false, Tail, TAny);
             tctx = tctx-t;
             if not(is(cond,new-cond)) || not(is(t,new-t)) || not(is(f,new-f))
-            then { term = mk-app(mk-app(mk-app(ifv,new-cond),new-t),new-f) };
+            then { cond = new-cond; t = new-t; f = new-f; term = mk-app(mk-app(mk-app(ifv,new-cond),new-t),new-f) };
          };
          ascript-normal(term, typeof(t)); # TODO: use MGU to merge true and false branches
       );