delay typechecking as long as possible

Author: andrew-johnson-4

PLATFORM/C/LIB/common-macros.lsts

@@ -7,14 +7,14 @@ typed macro macro::set(lhs: lazy, rhs: lazy): lazy = (
    mov(rhs, lhs)
 );
 
-#typed macro macro::set(base field: macro::lhs-field, rhs: lazy): lazy = (
-#   macro::concat(l"set.", field) (base, rhs)
-#);
-
 typed macro macro::set(base index: macro::lhs-index, rhs: lazy): lazy = (
    $"set[]"( $"macro::lhs-as-rhs"(base), index, rhs )
 );
 
+#typed macro macro::set(base field: macro::lhs-field, rhs: lazy): lazy = (
+#   macro::concat(l"set.", field) (base, rhs)
+#);
+
 typed macro macro::lhs-as-rhs(v: macro::variable): lazy = (
    v
 );

SRC/std-apply-macro-candidates.lsts

@@ -12,9 +12,9 @@ let std-apply-macro-candidates(tctx: TContext?, mname: CString, margs: AST, cand
          (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-preserve(substitute(mctx.get-or-panic, mrhs), margs.location);
+         if not(non-zero(t)) then print("Rejected Candidate \{mname} \{mlhs}\n");
       }
    };
-   (tctx, t) = std-infer-expr(tctx, t, false, Used, TAny);
    (tctx, t)
 );
 

SRC/std-apply-macro.lsts

@@ -49,6 +49,7 @@ let std-apply-macro(tctx: Maybe<TContext>, mname: CString, margs: AST, strong: B
    (tctx, let result) = std-apply-macro-candidates(tctx, mname, margs, candidates);
    if strong && not(non-zero(result)) then exit-error("Failed to Apply Macro: \{mname}", margs);
    print("Applied Macro \{mname} \{margs}\nResult: \{result}\n");
+   if strong then (tctx, result) = std-infer-expr(tctx, result, false, Used, TAny);
    (tctx, result)
 );
 
@@ -67,6 +68,7 @@ let std-infer-peeped-arguments(tctx: Maybe<TContext>, t: AST, peep: Type): (Type
          }
       );
       TAny{} => (ta, t);
+      TVar{} => (ta, t);
       _ => (
          (_, t) = std-infer-expr(tctx, t, false, Used, TAny);
          (typeof(t), t);