forward progress

Author: andrew-johnson-4

SRC/std-apply-macro-candidates.lsts

@@ -9,6 +9,7 @@ let std-apply-macro-candidates(tctx: TContext?, mname: CString, margs: AST, cand
    let t = ASTEOF;
    for Tuple{ctype=first, second:Abs{mlhs=lhs,rhs:App{left:Lit{key:c":"},right:App{mrhs=left}}}} in candidates {
       if not(non-zero(t)) {
+         print("Apply Candidate \{mname}\nLeft: \{mlhs}\nRight: \{margs}\n");
          (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);

SRC/std-destructure-macro.lsts

@@ -0,0 +1,9 @@
+
+let std-destructure-macro(lhs: AST, rhs: AST): AContext? = (
+   let no = None :: AContext?;
+   match (lhs, rhs) {
+      _ => fail("Unexpected std-destructure-macro\nLeft: \{lhs}\nRight: \{rhs}\n");
+   };
+   no
+);
+

SRC/std-direct-destructure-macro.lsts

@@ -3,6 +3,13 @@ let std-direct-destructure-macro(margs: AST, mstruct: AST): AContext? = (
    let no = None :: AContext?;
    match (margs, mstruct) {
       Tuple{ val=first, second:Var{key=key} } => Some{[(key,val)]};
-      _ => no;
+      Tuple{
+         first:App{is-cons:1_u8, lrest=left, val=right },
+         second:App{is-cons:1_u8, rrest=left, right:Var{key=key} }
+      } => (
+         let ctx = std-direct-destructure-macro(lrest, rrest);
+         if ctx.is-some then Some{cons((key,val), ctx.get-or-panic)} else no;
+      );
+      _ => fail("Unexpected std-direct-destructure-macro\nLeft: \{mstruct}\nRight: \{margs}\n");
    }
 );

SRC/unit-orphans.lsts

@@ -24,3 +24,4 @@ let .unroll-seq(t: AST): Vector<AST> = (
       _ => mk-vector(type(AST));
    }
 );
+